diff --git a/client/hostinfo_win.C b/client/hostinfo_win.C index c0c5588f4b..d8123a48d1 100644 --- a/client/hostinfo_win.C +++ b/client/hostinfo_win.C @@ -388,6 +388,11 @@ int get_os_information( // Check to see if a processor feature is available for use +#ifdef _WIN64 +BOOL test_processor_feature(DWORD /*feature*/) { + return 0; +} +#else BOOL test_processor_feature(DWORD feature) { __try { switch (feature) { @@ -423,7 +428,7 @@ BOOL test_processor_feature(DWORD feature) { } return 1; } - +#endif // Detect to see if a processor feature is available for use diff --git a/client/win/boinc_cli.rc b/client/win/boinc_cli.rc index 263edfd052..1bcb329a02 100644 --- a/client/win/boinc_cli.rc +++ b/client/win/boinc_cli.rc @@ -34,17 +34,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_MAIN_ICON ICON "res\\icon.ico" #endif -///////////////////////////////////////////////////////////////////////////// -// -// Assembly Manifest -// - -#ifndef MANIFEST_RESOURCE_ID -#define MANIFEST_RESOURCE_ID 1 -#endif - -MANIFEST_RESOURCE_ID RT_MANIFEST "boinc.exe.manifest" - ///////////////////////////////////////////////////////////////////////////// #endif // Neutral resources diff --git a/client/win/boinc_cmd.rc b/client/win/boinc_cmd.rc index 9e3bdf322e..e80741f3eb 100644 --- a/client/win/boinc_cmd.rc +++ b/client/win/boinc_cmd.rc @@ -41,17 +41,6 @@ IDI_MAIN_ICON ICON "res\\icon.ico" #endif -///////////////////////////////////////////////////////////////////////////// -// -// Assembly Manifest -// - -#ifndef MANIFEST_RESOURCE_ID -#define MANIFEST_RESOURCE_ID 1 -#endif - -MANIFEST_RESOURCE_ID RT_MANIFEST "boinccmd.exe.manifest" - ///////////////////////////////////////////////////////////////////////////// #endif // Neutral resources diff --git a/client/win/boinc_ss.rc b/client/win/boinc_ss.rc index 39141611cf..c95d0c294c 100755 --- a/client/win/boinc_ss.rc +++ b/client/win/boinc_ss.rc @@ -43,17 +43,6 @@ IDI_MAIN_ICON ICON "res\\icon.ico" #endif -///////////////////////////////////////////////////////////////////////////// -// -// Assembly Manifest -// - -#ifndef MANIFEST_RESOURCE_ID -#define MANIFEST_RESOURCE_ID 1 -#endif - -MANIFEST_RESOURCE_ID RT_MANIFEST "boinc.scr.manifest" - ///////////////////////////////////////////////////////////////////////////// #endif // Neutral resources diff --git a/client/win/boinccmd.exe.manifest b/client/win/boinccmd.exe.manifest deleted file mode 100644 index e2a85395be..0000000000 --- a/client/win/boinccmd.exe.manifest +++ /dev/null @@ -1,12 +0,0 @@ - - - - BOINC Manager (commandline) - - - - - - - - diff --git a/clientgui/BOINCGUIApp.rc b/clientgui/BOINCGUIApp.rc index 1e023d4819..c49dddb0d8 100644 --- a/clientgui/BOINCGUIApp.rc +++ b/clientgui/BOINCGUIApp.rc @@ -45,16 +45,6 @@ APP_ICON ICON "res\\boincguiApp.ico" ///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -// -// Assembly Manifest -// - -#ifndef MANIFEST_RESOURCE_ID -#define MANIFEST_RESOURCE_ID 1 -#endif - -MANIFEST_RESOURCE_ID RT_MANIFEST "boincmgr.exe.manifest" ///////////////////////////////////////////////////////////////////////////// diff --git a/clientgui/boincmgr.exe.manifest b/clientgui/boincmgr.exe.manifest deleted file mode 100644 index b67ddd00ea..0000000000 --- a/clientgui/boincmgr.exe.manifest +++ /dev/null @@ -1,12 +0,0 @@ - - - - BOINC Manager - - - - - - - - diff --git a/lib/stackwalker_win.cpp b/lib/stackwalker_win.cpp index 7e62da7a36..8834d6a485 100644 --- a/lib/stackwalker_win.cpp +++ b/lib/stackwalker_win.cpp @@ -768,12 +768,19 @@ static void ShowStackRM(HANDLE hThread, CONTEXT& Context) // Notes: will have to be #ifdef-ed for Alphas; MIPSes are dead anyway, // and good riddance. memset( &StackFrame, '\0', sizeof(STACKFRAME64) ); - StackFrame.AddrPC.Offset = Context.Eip; +#if defined(_WIN64) && defined(_M_X64) + StackFrame.AddrPC.Offset = Context.Rip; + StackFrame.AddrPC.Mode = AddrModeFlat; + StackFrame.AddrFrame.Offset = Context.Rbp; + StackFrame.AddrFrame.Mode = AddrModeFlat; +#else + StackFrame.AddrPC.Offset = Context.Eip; StackFrame.AddrPC.Mode = AddrModeFlat; StackFrame.AddrFrame.Offset = Context.Ebp; StackFrame.AddrFrame.Mode = AddrModeFlat; +#endif - memset( pSymbol, '\0', sizeof(SymbolBuffer) ); + memset( pSymbol, '\0', sizeof(SymbolBuffer) ); pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO); pSymbol->MaxNameLen = MAX_SYM_NAME; @@ -794,6 +801,19 @@ static void ShowStackRM(HANDLE hThread, CONTEXT& Context) // if this returns ERROR_INVALID_ADDRESS (487) or ERROR_NOACCESS (998), you can // assume that either you are done, or that the stack is so hosed that the next // deeper frame could not be found. +#if defined(_WIN64) && defined(_M_X64) + bRetVal = pSW( + IMAGE_FILE_MACHINE_AMD64, + g_hProcess, + hThread, + &StackFrame, + &Context, + NULL, + (PFUNCTION_TABLE_ACCESS_ROUTINE64)pSFTA, + (PGET_MODULE_BASE_ROUTINE64)pSGMB, + NULL + ); +#else bRetVal = pSW( IMAGE_FILE_MACHINE_I386, g_hProcess, @@ -805,7 +825,7 @@ static void ShowStackRM(HANDLE hThread, CONTEXT& Context) (PGET_MODULE_BASE_ROUTINE64)pSGMB, NULL ); - +#endif if (!bRetVal) break; diff --git a/lib/stackwalker_win.h b/lib/stackwalker_win.h index 98c035bace..1104878023 100644 --- a/lib/stackwalker_win.h +++ b/lib/stackwalker_win.h @@ -22,11 +22,6 @@ #ifndef __STACKWALKER_H__ #define __STACKWALKER_H__ -// Only valid in the following environment: Intel platform, MS VC++ 5/6/7/8 -#ifndef _X86_ -#error Only INTEL envirnoments are supported! -#endif - // Make extern "C", so it will also work with normal C-Programs #ifdef __cplusplus extern "C" { diff --git a/win_build/.cvsignore b/win_build/.cvsignore index 00d56c0356..4d42fc839c 100644 --- a/win_build/.cvsignore +++ b/win_build/.cvsignore @@ -15,4 +15,7 @@ boinc_ss.vcproj.ROMWNET.romw.user boinccmd.vcproj.ROMWNET.romw.user boincmgr_curl.vcproj.ROMWNET.romw.user libboinc.vcproj.ROMWNET.romw.user -updater.vcproj.ROMWNET.romw.user \ No newline at end of file +updater.vcproj.ROMWNET.romw.user +sim.vcproj.ROMWNET.romw.user +boinc.pvk +boinc.spc \ No newline at end of file diff --git a/win_build/boinc.sln b/win_build/boinc.sln index 512a93ba7f..402b5c0824 100644 --- a/win_build/boinc.sln +++ b/win_build/boinc.sln @@ -24,51 +24,119 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincmgr", "boincmgr_curl.v EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libboinc", "libboinc.vcproj", "{E8F6BD7E-461A-4733-B7D8-37B09A099ED8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "updater", "updater.vcproj", "{B865A797-36AF-4059-9D52-8FF4F9B132D5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincupdater", "updater.vcproj", "{B865A797-36AF-4059-9D52-8FF4F9B132D5}" ProjectSection(ProjectDependencies) = postProject {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} = {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sim", "sim.vcproj", "{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincsim", "sim.vcproj", "{B950E31B-C075-4F6D-8A2B-25EAE9D46C93}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + ReleaseSigned|Win32 = ReleaseSigned|Win32 + ReleaseSigned|x64 = ReleaseSigned|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|Win32.ActiveCfg = Debug|Win32 {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|Win32.Build.0 = Debug|Win32 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|x64.ActiveCfg = Debug|x64 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|x64.Build.0 = Debug|x64 {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Release|Win32.ActiveCfg = Release|Win32 {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Release|Win32.Build.0 = Release|Win32 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Release|x64.ActiveCfg = Release|x64 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Release|x64.Build.0 = Release|x64 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Win32 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.ReleaseSigned|Win32.Build.0 = ReleaseSigned|Win32 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|x64 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.ReleaseSigned|x64.Build.0 = ReleaseSigned|x64 {B06280CB-82A4-46DE-8956-602643078BDF}.Debug|Win32.ActiveCfg = Debug|Win32 {B06280CB-82A4-46DE-8956-602643078BDF}.Debug|Win32.Build.0 = Debug|Win32 + {B06280CB-82A4-46DE-8956-602643078BDF}.Debug|x64.ActiveCfg = Debug|x64 + {B06280CB-82A4-46DE-8956-602643078BDF}.Debug|x64.Build.0 = Debug|x64 {B06280CB-82A4-46DE-8956-602643078BDF}.Release|Win32.ActiveCfg = Release|Win32 {B06280CB-82A4-46DE-8956-602643078BDF}.Release|Win32.Build.0 = Release|Win32 + {B06280CB-82A4-46DE-8956-602643078BDF}.Release|x64.ActiveCfg = Release|x64 + {B06280CB-82A4-46DE-8956-602643078BDF}.Release|x64.Build.0 = Release|x64 + {B06280CB-82A4-46DE-8956-602643078BDF}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Win32 + {B06280CB-82A4-46DE-8956-602643078BDF}.ReleaseSigned|Win32.Build.0 = ReleaseSigned|Win32 + {B06280CB-82A4-46DE-8956-602643078BDF}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|x64 + {B06280CB-82A4-46DE-8956-602643078BDF}.ReleaseSigned|x64.Build.0 = ReleaseSigned|x64 {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|Win32.ActiveCfg = Debug|Win32 {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|Win32.Build.0 = Debug|Win32 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|x64.ActiveCfg = Debug|x64 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|x64.Build.0 = Debug|x64 {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Release|Win32.ActiveCfg = Release|Win32 {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Release|Win32.Build.0 = Release|Win32 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Release|x64.ActiveCfg = Release|x64 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Release|x64.Build.0 = Release|x64 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Win32 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.ReleaseSigned|Win32.Build.0 = ReleaseSigned|Win32 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|x64 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.ReleaseSigned|x64.Build.0 = ReleaseSigned|x64 {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|Win32.ActiveCfg = Debug|Win32 {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|Win32.Build.0 = Debug|Win32 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|x64.ActiveCfg = Debug|x64 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|x64.Build.0 = Debug|x64 {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release|Win32.ActiveCfg = Release|Win32 {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release|Win32.Build.0 = Release|Win32 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release|x64.ActiveCfg = Release|x64 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release|x64.Build.0 = Release|x64 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Win32 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.ReleaseSigned|Win32.Build.0 = ReleaseSigned|Win32 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|x64 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.ReleaseSigned|x64.Build.0 = ReleaseSigned|x64 {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|Win32.ActiveCfg = Debug|Win32 {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|Win32.Build.0 = Debug|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|x64.ActiveCfg = Debug|x64 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|x64.Build.0 = Debug|x64 {06113715-AC51-4E91-8B9D-C987CABE0920}.Release|Win32.ActiveCfg = Release|Win32 {06113715-AC51-4E91-8B9D-C987CABE0920}.Release|Win32.Build.0 = Release|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Release|x64.ActiveCfg = Release|x64 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Release|x64.Build.0 = Release|x64 + {06113715-AC51-4E91-8B9D-C987CABE0920}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.ReleaseSigned|Win32.Build.0 = ReleaseSigned|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|x64 + {06113715-AC51-4E91-8B9D-C987CABE0920}.ReleaseSigned|x64.Build.0 = ReleaseSigned|x64 {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|Win32.ActiveCfg = Debug|Win32 {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|Win32.Build.0 = Debug|Win32 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|x64.ActiveCfg = Debug|x64 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|x64.Build.0 = Debug|x64 {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|Win32.ActiveCfg = Release|Win32 {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|Win32.Build.0 = Release|Win32 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|x64.ActiveCfg = Release|x64 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|x64.Build.0 = Release|x64 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Win32 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.ReleaseSigned|Win32.Build.0 = ReleaseSigned|Win32 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|x64 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.ReleaseSigned|x64.Build.0 = ReleaseSigned|x64 {B865A797-36AF-4059-9D52-8FF4F9B132D5}.Debug|Win32.ActiveCfg = Debug|Win32 {B865A797-36AF-4059-9D52-8FF4F9B132D5}.Debug|Win32.Build.0 = Debug|Win32 + {B865A797-36AF-4059-9D52-8FF4F9B132D5}.Debug|x64.ActiveCfg = Debug|x64 + {B865A797-36AF-4059-9D52-8FF4F9B132D5}.Debug|x64.Build.0 = Debug|x64 {B865A797-36AF-4059-9D52-8FF4F9B132D5}.Release|Win32.ActiveCfg = Release|Win32 {B865A797-36AF-4059-9D52-8FF4F9B132D5}.Release|Win32.Build.0 = Release|Win32 + {B865A797-36AF-4059-9D52-8FF4F9B132D5}.Release|x64.ActiveCfg = Release|x64 + {B865A797-36AF-4059-9D52-8FF4F9B132D5}.Release|x64.Build.0 = Release|x64 + {B865A797-36AF-4059-9D52-8FF4F9B132D5}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Win32 + {B865A797-36AF-4059-9D52-8FF4F9B132D5}.ReleaseSigned|Win32.Build.0 = ReleaseSigned|Win32 + {B865A797-36AF-4059-9D52-8FF4F9B132D5}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|x64 + {B865A797-36AF-4059-9D52-8FF4F9B132D5}.ReleaseSigned|x64.Build.0 = ReleaseSigned|x64 {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Debug|Win32.ActiveCfg = Debug|Win32 {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Debug|Win32.Build.0 = Debug|Win32 + {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Debug|x64.ActiveCfg = Debug|x64 + {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Debug|x64.Build.0 = Debug|x64 {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Release|Win32.ActiveCfg = Release|Win32 {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Release|Win32.Build.0 = Release|Win32 + {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Release|x64.ActiveCfg = Release|x64 + {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.Release|x64.Build.0 = Release|x64 + {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Win32 + {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.ReleaseSigned|Win32.Build.0 = ReleaseSigned|Win32 + {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|x64 + {B950E31B-C075-4F6D-8A2B-25EAE9D46C93}.ReleaseSigned|x64.Build.0 = ReleaseSigned|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win_build/boinc_cli_curl.vcproj b/win_build/boinc_cli_curl.vcproj index 21baf7f34f..ab3aeb2c71 100644 --- a/win_build/boinc_cli_curl.vcproj +++ b/win_build/boinc_cli_curl.vcproj @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -275,6 +718,52 @@ CompileAs="2" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +boinc_post_bld_rules.cmd "$(SolutionDir)" "$(OutDir)" "$(PlatformName)" +"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -263,6 +678,38 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -327,6 +763,48 @@ PreprocessorDefinitions="" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/boincmgr_curl.vcproj b/win_build/boincmgr_curl.vcproj index 029a2a8562..d22220d8b3 100644 --- a/win_build/boincmgr_curl.vcproj +++ b/win_build/boincmgr_curl.vcproj @@ -11,14 +11,17 @@ + + + + + + + + + + + + + + + + + + + + + @@ -184,7 +282,8 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -241,6 +631,14 @@ AdditionalIncludeDirectories="$(WXWIN)\include;$(WXWIN)\contrib\include;.." /> + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1479,6 +2285,17 @@ CompileAs="2" /> + + + @@ -1492,6 +2309,41 @@ CompileAs="2" /> + + + + + + + + + + + + + + + + + + @@ -1542,6 +2418,14 @@ UsePrecompiledHeader="1" /> + + + @@ -1550,6 +2434,30 @@ UsePrecompiledHeader="1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -175,6 +458,14 @@ CompileAs="2" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/updater.vcproj b/win_build/updater.vcproj index 33eb43ee10..59220489e2 100644 --- a/win_build/updater.vcproj +++ b/win_build/updater.vcproj @@ -2,7 +2,7 @@ @@ -10,14 +10,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/win/boinc.exe.manifest b/win_build/vistaadminrequired.xml similarity index 74% rename from client/win/boinc.exe.manifest rename to win_build/vistaadminrequired.xml index 130614afc5..88c5c52353 100644 --- a/client/win/boinc.exe.manifest +++ b/win_build/vistaadminrequired.xml @@ -1,7 +1,5 @@ - - BOINC diff --git a/client/win/boinc.scr.manifest b/win_build/vistaadminrequiredui.xml similarity index 72% rename from client/win/boinc.scr.manifest rename to win_build/vistaadminrequiredui.xml index 68bc2aabc5..6a38ef2d32 100644 --- a/client/win/boinc.scr.manifest +++ b/win_build/vistaadminrequiredui.xml @@ -1,7 +1,5 @@ - - BOINC Screensaver