From a55ba85413a05e81918a895d1511ff514787b8ba Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Thu, 30 Mar 2006 22:04:14 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=9771 --- checkin_notes | 16 +++++++++++++++- clientlib/win/boinc_dll.cpp | 13 ++++++------- win_build/installerv2/BOINC.ism | Bin 205312 -> 206336 bytes 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/checkin_notes b/checkin_notes index c0945d5495..3c120a8ab9 100755 --- a/checkin_notes +++ b/checkin_notes @@ -3383,7 +3383,7 @@ Walt 28 Mar 2006 clientgui/ BOINCDialupManager.cpp -Rom 30 Mar 2006 (HEAD) +Rom 28 Mar 2006 (HEAD) - Tag for 5.3.30 release, all platforms boinc_core_release_5_3_30 @@ -3422,3 +3422,17 @@ David 30 Mar 2006 api/ gutil.C gutil_text.C + +Rom 30 Mar 2006 + - Make the SENS initialization code non fatal when an error + occurs. + - Change the Windows installer so that the DLLs that BOINC + is dependant on are are contained in a seperate component + that is always installed and removed duplicate references + from the install type specific compinents. This shrinks + the install package by 2MB. + + clientlib/win/ + boinc_dll.cpp + win_build/installerv2/ + BOINC.ism diff --git a/clientlib/win/boinc_dll.cpp b/clientlib/win/boinc_dll.cpp index 3258280c34..f1ae93b533 100755 --- a/clientlib/win/boinc_dll.cpp +++ b/clientlib/win/boinc_dll.cpp @@ -40,16 +40,15 @@ public: EXTERN_C __declspec(dllexport) BOOL ClientLibraryStartup() { - - // Startup the COM Framework - if (FAILED(CoInitializeEx(NULL, NULL))) - return FALSE; - if (!IdleTrackerStartup()) return FALSE; + if (IsWindows2000Compatible()) { - if (!NetworkTrackerStartup()) - return FALSE; + // For now try to start it up and ignore any possible + // error from this. It is not critical path even though + // we might be using it more in the future. + CoInitializeEx(NULL, NULL); + NetworkTrackerStartup(); } return TRUE; diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism index 52070506e0be8284b1a6c2aa0ad076ee03ea1bca..821289a3f72a2fe24c65d639a6205fcb405fea8e 100644 GIT binary patch delta 3618 zcmai13vg7`8NUC2?rv@#_vZa1gapU~!{WY^l~?u|0+^&p6jIbBB*APANhFH|86==m zXFw$0h7%D)P^jS4N_Hl<7CL}hw4hk0ovPDH!FI+$DWas!7+dIncN1`?&h(!B?)hK$ zod5ji{O6qQe>c}EgCR>0gk;r)Qw#}2Wvk8TmG2;G7Qsm~ zp_brMFQLs)MpU($%cdBbh^kXvYy~``4zh~WF!AdMeT4OdZR)4&8D%B+AN4eyfe1bkVe5K#Y_w%MqVW#?P!qv^G` zt<=%8q%4nJYI10|CF=R_U+=eO`}0Xt&txL66%X2v#_K7N6Hajo9tMK+V!7e?!}<2Rqt3 zd!juDJ#{s;USE4pdska;ZTtGh_O*|MTH9;7dc!T9oi=~l=1{oC7i?^5sHv^CSXOn1 zx?1P7_qE#_TG~S0o^|1HcUSe=?sYv;K1$uPv8`zIH{4s}^#^@*ce`t9?{D-s-BaJx zT<@PheWIV~h3;Bk;l1r^dqdq_wM~T!<`+7w=8cYk)8_HJEGDlz&sk}*+uUxGhlXRa zRrswAo5$-kSJ*bG$<3vkg8_@p?W}ZE2HnmIchDYi27)eoz#Md1DqU_T#m3{ZP7M72 z_fOqh%o{6hPK({+beOzmi`iuN*eoWu$67(JN~_gpcRH*t+onbe$Ws4YZ(VJmrrK8% zo3!Sj(`j+JeStu*(q|6@?Ufcs(B*fyf*!laRT;24EjH4{=0RQ3Tv{HD|3oyr-Ce6g z4=%GVvHhSl@?`VVkog0u<@J%Y6$|9D|3AKYG(fXCvZiB)A!2MAXHt7#PfJ(Zns)WW z&TMtTnxsfU*Jm&suE(_hSqxTwEDiD_k3I5^qBcBvXlitxgN`}2IW|jheW>;?5lJ}61JroBPBa7!tkyX14|G-F~OOS+2 zK~m=qH8ZLsd?+4iZ#uBY4`Sr=J#zsJ>WsZJ0MzQe%jms-?>Txuv~LFFsL$*pwR&#f zC&`rf!XavXDuEs~^1`7+oya9`vdGKU{VRZ}C-=J}#-4FD{Gw4hcvOrSUm1tt*Nk}w z&l3GEW%v2~;j2bG_=WhA@ml_21w_r51mnP6)u3of8u&&2lPuV#jc0*z%7_z6k>v=C zGb`9qbA?3eOe6>538GNLtF5rmCDN7%!mnd~=`PXOSu`RpGEbz@7ftA_^ieL+sf2i8 zo_5j-ZWiC(6?U)cr8ggNLIyuo0rC9WZ!t-0u7vZ+hZlo1(gcvAK?B@`!)+i|UjZ2v zEXJew29~hx?0J?c7D-&*Cy&YF@?{V)730x?$!Nt)4B-hJl#k1&^2;OZ@7?qQyR7sXhik9{kbmfZgQY-w4zrf1k8+0`2I7O04TCd;y zK0nZsF6qJ#NjT6_2sZ{=j_gD$9_z@O~6KQ3L=7*jqd4yP=#0fJ6;E(?ce@b&a zol?h0X{At|9!(>PFU{_ZFD)|jem#dQ8erA>DMPddIRgFX~fREB?{lf9sCBZ`=vfu2ETyU z;7b?-z~%Cgyhq+IUy)0dGUW!E$&%unx5_ zE@wBgnMFG&M%xK`&g`0~b^7T^T3=?zVYkS<(WvORta*Hc$YMb{L~J4dR%B;&Egv~5J?#j#@kpY4zo`($N56!TMYtcpKz4Y!qSbhsQ2kKg7u1#AJQ$!_=3@$a_=OkTUo z>9=_N_JG5+Nv#iO^P;cuulz&^<>%j_ zyeNZG%6`o3id`uu+$Y-=C)IaId{+jW#oaPHrXbFU##0bVq-8RHKw^FB*Bv?9cM>ze zZiPKGlESdmch)tKaHIc?^13c zU!2bJB$|lLCjt9;XF6*t{RgD7>55GIrz}ZKFDZi1KM5LEe-!*u2Fql#lv%uG6pQuY zu`&htz!sQaI7^{3hssw>FA0iX^mVA<1z9iZ%3XyAcR^Kb<;1#rsb4ST?X4%Kl_;Tf z#81?W>O`S{t_dLUV=c5RY*Cn>|4CtI_>p9`ATxIP)NkSqJ*|zsD;~R_e!M7))?`i= z^B7~-6>W7E8-lFpRoCCw-nuSK*UyH~gB{_}>J93^=1gOZkeEoG&<3IV%@cFjG+?|uhxzrn!cs{`VREx9G0t%7O;9yeFn4PG&L*fQ@ccayO7NT d_0+Rfc&DV|t_8ztKXBTNukwpkctW?i_rGU=(#HS* delta 3650 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 cWu@i9Qq