From ba42d89a337c1d1b9d2cd7634ef4a9dfb7d99767 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Fri, 11 Jan 2008 17:14:11 +0000 Subject: [PATCH] - Fix a crash condition when BOINC is started as a standard user account without the 'create global named objects' user right on Vista. - WINSETUP: Make sure that BOINC Tray is started for all users on the system. - WINSETUP: If the 'All users can control BOINC' checkbox is checked then put the BOINC Manager startup short cut in the 'all users' startup directory otherwise put it in the 'users' startup directory. clientlib/win/ IdleTracker.cpp win_build/installerv2/ BOINC.ism win_build/installerv2/redist/Windows/src/boinccas/ boinccas.rc win_build/installerv2/redist/Windows/Win32/ boinccas.dll boinccas95.dll win_build/installerv2/redist/Windows/x64/ boinccas.dll boinccas95.dll svn path=/trunk/boinc/; revision=14531 --- checkin_notes | 22 ++++++++++ clientlib/win/IdleTracker.cpp | 39 ++++++++++-------- win_build/installerv2/BOINC.ism | Bin 207552 -> 208332 bytes .../redist/Windows/Win32/boinccas.dll | Bin 110592 -> 110592 bytes .../redist/Windows/Win32/boinccas95.dll | Bin 114688 -> 114688 bytes .../redist/Windows/src/boinccas/boinccas.rc | 8 ++-- .../redist/Windows/x64/boinccas.dll | Bin 141824 -> 141824 bytes .../redist/Windows/x64/boinccas95.dll | Bin 163328 -> 163328 bytes 8 files changed, 47 insertions(+), 22 deletions(-) diff --git a/checkin_notes b/checkin_notes index 5300d6d95e..aa98d60756 100644 --- a/checkin_notes +++ b/checkin_notes @@ -314,3 +314,25 @@ David Jan 10 2008 client/ cs_prefs.C + +Rom Jan 11 2008 + - Fix a crash condition when BOINC is started as a standard user account + without the 'create global named objects' user right on Vista. + - WINSETUP: Make sure that BOINC Tray is started for all users on the + system. + - WINSETUP: If the 'All users can control BOINC' checkbox is checked then + put the BOINC Manager startup short cut in the 'all users' startup directory + otherwise put it in the 'users' startup directory. + + clientlib/win/ + IdleTracker.cpp + win_build/installerv2/ + BOINC.ism + win_build/installerv2/redist/Windows/src/boinccas/ + boinccas.rc + win_build/installerv2/redist/Windows/Win32/ + boinccas.dll + boinccas95.dll + win_build/installerv2/redist/Windows/x64/ + boinccas.dll + boinccas95.dll diff --git a/clientlib/win/IdleTracker.cpp b/clientlib/win/IdleTracker.cpp index b5313c8993..c86f46a36e 100644 --- a/clientlib/win/IdleTracker.cpp +++ b/clientlib/win/IdleTracker.cpp @@ -104,26 +104,29 @@ EXTERN_C __declspec(dllexport) DWORD BOINCGetIdleTickCount() if ( g_bIsWindows2000Compatible ) { - LASTINPUTINFO lii; - ZeroMemory( &lii, sizeof(lii) ); - lii.cbSize = sizeof(lii); - g_fnGetLastInputInfo( &lii ); - - /** - * If both values are greater than the system tick count then - * the system must have looped back to the begining. - **/ - if ( ( dwCurrentTickCount < lii.dwTime ) && - ( dwCurrentTickCount < g_pSystemWideIdleData->dwLastTick ) ) + if ( g_pSystemWideIdleData ) { - lii.dwTime = dwCurrentTickCount; - g_pSystemWideIdleData->dwLastTick = dwCurrentTickCount; + LASTINPUTINFO lii; + ZeroMemory( &lii, sizeof(lii) ); + lii.cbSize = sizeof(lii); + g_fnGetLastInputInfo( &lii ); + + /** + * If both values are greater than the system tick count then + * the system must have looped back to the beginning. + **/ + if ( ( dwCurrentTickCount < lii.dwTime ) && + ( dwCurrentTickCount < g_pSystemWideIdleData->dwLastTick ) ) + { + lii.dwTime = dwCurrentTickCount; + g_pSystemWideIdleData->dwLastTick = dwCurrentTickCount; + } + + if ( lii.dwTime > g_pSystemWideIdleData->dwLastTick ) + g_pSystemWideIdleData->dwLastTick = lii.dwTime; + + dwLastTickCount = g_pSystemWideIdleData->dwLastTick; } - - if ( lii.dwTime > g_pSystemWideIdleData->dwLastTick ) - g_pSystemWideIdleData->dwLastTick = lii.dwTime; - - dwLastTickCount = g_pSystemWideIdleData->dwLastTick; } else { diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism index e646d875c1144e6a2eaf908072d6629f005e2b00..9f3c19241364c825312b30d37da4e7a3e76903df 100644 GIT binary patch delta 4515 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 HhN%1>Q41x+ diff --git a/win_build/installerv2/redist/Windows/Win32/boinccas.dll b/win_build/installerv2/redist/Windows/Win32/boinccas.dll index e9990b1d31ba7be825df57ee4ad270b0861e8f6f..ba26fdb5b0bbe936fe7a8e3a0a9de8e2fa72d2ba 100644 GIT binary patch delta 101 zcmZp8z}E19ZNdxY&Q)y_U;8rMN@=!Y+-}9l=p_IW+TJe6=xQ$zwa?|OQi7t-%sJar xbq-EEzx_@C;|eK=f^0@#QBHFP5MX35pMJN2@g<|__T!C=-i$z6xS8>-4gmk7B~AbU delta 101 zcmZp8z}E19ZNdxY=Iv<{U;8rMF>JPC+-}9l=p_IW+TJe6=xQ(UIMsG$SEj*d=tquTL!y^9x delta 101 zcmZo@U~gz(pYVaXXM5Vj&%R9Ca+{qPw>vR1HW`3~wjVcSRMip)a0uG%B%J3swR5sv yAIqcj+y6u}dPss5xR)~aN^=@9fB++d(e%3$7+*3PY(GAc(VG!S3r}Wzs{;U-VI%th diff --git a/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc b/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc index 83dda5c49a..0e8ec4b45f 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc +++ b/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,50 - PRODUCTVERSION 1,0,0,50 + FILEVERSION 1,0,0,55 + PRODUCTVERSION 1,0,0,55 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "BOINC Dynamic Link Library" - VALUE "FileVersion", "1.0.0.50" + VALUE "FileVersion", "1.0.0.55" VALUE "InternalName", "BOINC" VALUE "LegalCopyright", "Copyright (C) 2005-2007" VALUE "OriginalFilename", "BOINC.dll" VALUE "ProductName", " BOINC Dynamic Link Library" - VALUE "ProductVersion", "1.0.0.50" + VALUE "ProductVersion", "1.0.0.55" END END BLOCK "VarFileInfo" diff --git a/win_build/installerv2/redist/Windows/x64/boinccas.dll b/win_build/installerv2/redist/Windows/x64/boinccas.dll index 3385b0f60595952598f0ca73f8405d8da53a915c..e2dfba73944ffa37414532032b725ce0b70fa405 100644 GIT binary patch delta 102 zcmZp;!qISrW5NsOd8^tczV>BKi}PFrrP z*qibR@@>DelF`8xtU&xd<6c8fBL)y)WH6e3SAppzqrvv$icH>&Kw4Ot=`9-oi^d_i diff --git a/win_build/installerv2/redist/Windows/x64/boinccas95.dll b/win_build/installerv2/redist/Windows/x64/boinccas95.dll index 84194d8565a0d2a3c1fa943465fd5c29003a17a2..be1474542c4f2a7d538d4e87b0e192962e4df1ef 100644 GIT binary patch delta 102 zcmZqp!`bkMbHWSeWvkjIzV>AnOJ{DjX54Pg$Y^;AB(}Z$G-Iuqz^q!AUWd;dzAI99 zr}nRW!M>e^iOIkLtiarfX|55cIRgkVGMG=lTf+2`(RBOqQYLRkAT3qrvv$rA*$8Kw7w*=`9-oL3$;9