From 76282d0a20422392f1db7d338fa4e3508174c29f Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 11 Oct 2012 19:22:34 +0000
Subject: [PATCH] 	- Win compile fixes. 		For now, include
 psapi.lib in various project properties. 		Try to figure out a
 different way.

svn path=/trunk/boinc/; revision=26149
---
 api/boinc_api.cpp                         |  2 +-
 checkin_notes                             | 14 ++++++++++++++
 client/app_start.cpp                      |  2 +-
 lib/boinc_win.h                           |  1 +
 win_build/boinc_ss.vcproj                 |  2 +-
 win_build/example_app_multi_thread.vcproj |  2 +-
 win_build/sleeper.vcproj                  |  2 +-
 win_build/uc2.vcproj                      |  2 +-
 win_build/uc2_graphics.vcproj             |  2 +-
 win_build/vboxwrapper.vcproj              |  2 +-
 win_build/wrapper.vcproj                  |  2 +-
 11 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index 5c4092bb4c..87bca9f2d5 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -387,7 +387,7 @@ static bool client_dead() {
         // Windows doesn't have waitpid() :-(
         //
         DWORD pids[4096], nb;
-        BOOL r = EnumProcesses(pids, sizeof(pids), nb);
+        BOOL r = EnumProcesses(pids, sizeof(pids), &nb);
         if (!r) return false;
         int n = nb/sizeof(DWORD);
         for (int i=0; i<n; i++) {
diff --git a/checkin_notes b/checkin_notes
index bd19f20d11..5054f5c200 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6129,3 +6129,17 @@ David  11 Oct 2012
     lib/
         app_ipc.cpp,h
         proc_control.cpp
+
+David  11 Oct 2012
+	- Win compile fixes.
+		For now, include psapi.lib in various project properties.
+		Try to figure out a different way.
+
+	api/
+		boinc_api.cpp
+	client/
+		app_start.cpp
+	lib/
+		boinc_win.h
+	win_build/
+		various .proj files
diff --git a/client/app_start.cpp b/client/app_start.cpp
index c876c5df0c..000784bd8c 100644
--- a/client/app_start.cpp
+++ b/client/app_start.cpp
@@ -219,7 +219,7 @@ void ACTIVE_TASK::init_app_init_data(APP_INIT_DATA& aid) {
     strcpy(aid.authenticator, wup->project->authenticator);
     aid.slot = slot;
 #ifdef _WIN32
-    if (strstr(gstate.hostinfo.os_name, "Windows 2000")) {
+    if (strstr(gstate.host_info.os_name, "Windows 2000")) {
         // Win2K immediately reuses PIDs, so can't use this mechanism
         //
         aid.client_pid = 0;
diff --git a/lib/boinc_win.h b/lib/boinc_win.h
index 99a20c1767..8e745a9df1 100644
--- a/lib/boinc_win.h
+++ b/lib/boinc_win.h
@@ -96,6 +96,7 @@
 #include <shlobj.h>
 #include <userenv.h>
 #include <aclapi.h>
+#include <psapi.h>
 #include <iphlpapi.h>
 
 #if !defined(__CYGWIN32__) || defined(USE_WINSOCK)
diff --git a/win_build/boinc_ss.vcproj b/win_build/boinc_ss.vcproj
index 5ecb4e5a60..dbb15ede84 100644
--- a/win_build/boinc_ss.vcproj
+++ b/win_build/boinc_ss.vcproj
@@ -287,7 +287,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib delayimp.lib wsock32.lib advapi32.lib freetype2410_D.lib ftgl_static_D.lib $(NOINHERIT)"
+				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib delayimp.lib wsock32.lib advapi32.lib freetype2410_D.lib ftgl_static_D.lib psapi.lib $(NOINHERIT)"
 				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\boincscr.exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
diff --git a/win_build/example_app_multi_thread.vcproj b/win_build/example_app_multi_thread.vcproj
index 0d449147d4..76716293fa 100644
--- a/win_build/example_app_multi_thread.vcproj
+++ b/win_build/example_app_multi_thread.vcproj
@@ -279,7 +279,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib ole32.lib delayimp.lib"
+				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib ole32.lib delayimp.lib psapi.lib"
 				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\multi_thread_6.1_windows_intelx86.exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
diff --git a/win_build/sleeper.vcproj b/win_build/sleeper.vcproj
index 2748285e8e..f1820b6b1b 100644
--- a/win_build/sleeper.vcproj
+++ b/win_build/sleeper.vcproj
@@ -278,7 +278,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib"
+				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib psapi.lib glu32.lib ole32.lib"
 				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\sleeper_6.1_windows_intelx86.exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
diff --git a/win_build/uc2.vcproj b/win_build/uc2.vcproj
index 3b526574e3..f273673bfa 100644
--- a/win_build/uc2.vcproj
+++ b/win_build/uc2.vcproj
@@ -278,7 +278,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib ole32.lib delayimp.lib"
+				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib ole32.lib delayimp.lib psapi.lib"
 				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName).exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
diff --git a/win_build/uc2_graphics.vcproj b/win_build/uc2_graphics.vcproj
index 15c0eeabff..b4022f2f0e 100644
--- a/win_build/uc2_graphics.vcproj
+++ b/win_build/uc2_graphics.vcproj
@@ -283,7 +283,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib delayimp.lib freetype2410_D.lib ftgl_static_D.lib"
+				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib psapi.lib glu32.lib ole32.lib delayimp.lib freetype2410_D.lib ftgl_static_D.lib"
 				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName).exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
diff --git a/win_build/vboxwrapper.vcproj b/win_build/vboxwrapper.vcproj
index 08971da3fe..26375a40b4 100644
--- a/win_build/vboxwrapper.vcproj
+++ b/win_build/vboxwrapper.vcproj
@@ -278,7 +278,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib"
+				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib ole32.lib psapi.lib wsock32.lib"
 				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_6.1_windows_intelx86.exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
diff --git a/win_build/wrapper.vcproj b/win_build/wrapper.vcproj
index a0c313550f..74ed84762d 100644
--- a/win_build/wrapper.vcproj
+++ b/win_build/wrapper.vcproj
@@ -278,7 +278,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib ole32.lib"
+				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib ole32.lib psapi.lib"
 				OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\wrapper_6.1_windows_intelx86.exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"