*** empty log message ***

svn path=/trunk/boinc/; revision=12102

checkin_notes

@@ -1746,3 +1746,15 @@ David  15 Feb 2007
     client/
         cs_apps.C
         makefile_sim
+
+Rom    17 Feb 2007
+    - WININSTALL: Use the Unicode version of ShutdownBOINCManager on NT based
+        platforms and use the ANSI version on 9X based platforms.
+        
+    win_build/installerv2/redist/Windows/src/boinccas/
+        CAShutdownBOINCManager.cpp
+        boinccas95.def
+        boinccas95.vcproj
+    win_build/installerv2/redist/Windows/x86
+        boinccas.dll
+        boinccas95.dll

win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINCManager.cpp

@@ -20,7 +20,9 @@
 
 #include "stdafx.h"
 #include "boinccas.h"
+#ifdef _UNICODE
 #include "terminate.h"
+#endif
 #include "CAShutdownBOINCManager.h"
 
 #define CUSTOMACTION_NAME               _T("CAShutdownBOINCManager")
@@ -109,8 +111,10 @@ UINT CAShutdownBOINCManager::OnExecution()
 
     }
 
+#ifdef _UNICODE
     TerminateProcessEx( tstring(_T("boincmgr.exe")) );
     TerminateProcessEx( tstring(_T("gridrepublic.exe")) );
+#endif
     return ERROR_SUCCESS;
 }
 

win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc

@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,15
- PRODUCTVERSION 1,0,0,15
+ FILEVERSION 1,0,0,20
+ PRODUCTVERSION 1,0,0,20
  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.15"
+            VALUE "FileVersion", "1.0.0.20"
             VALUE "InternalName", "BOINC"
-            VALUE "LegalCopyright", "Copyright (C) 2005"
+            VALUE "LegalCopyright", "Copyright (C) 2005-2007"
             VALUE "OriginalFilename", "BOINC.dll"
             VALUE "ProductName", " BOINC Dynamic Link Library"
-            VALUE "ProductVersion", "1.0.0.15"
+            VALUE "ProductVersion", "1.0.0.20"
         END
     END
     BLOCK "VarFileInfo"

win_build/installerv2/redist/Windows/src/boinccas/boinccas95.def

@@ -10,3 +10,5 @@ EXPORTS
 	MigrateCPDNBBC
 	RestoreSetupState
 	SaveSetupState
+	ShutdownBOINCManager
+

win_build/installerv2/redist/Windows/src/boinccas/boinccas95.vcproj

@@ -141,6 +141,9 @@
 			<File
 				RelativePath=".\CASaveSetupState.cpp">
 			</File>
+			<File
+				RelativePath=".\CAShutdownBOINCManager.cpp">
+			</File>
 			<File
 				RelativePath=".\CAValidateSetupType.cpp">
 			</File>
@@ -178,6 +181,9 @@
 			<File
 				RelativePath=".\CASaveSetupState.h">
 			</File>
+			<File
+				RelativePath=".\CAShutdownBOINCManager.h">
+			</File>
 			<File
 				RelativePath=".\CAValidateSetupType.h">
 			</File>