diff --git a/checkin_notes b/checkin_notes index 8a607cb8e4..50441ba702 100755 --- a/checkin_notes +++ b/checkin_notes @@ -9077,3 +9077,17 @@ David 9 Jan 2004 user_posts.php sched/ handle_request.C + +David 9 Jan 2004 + - added project files for VC++ 7.0, and fixed a few compile warnings + + client/ + app.C + cs_benchmark.C + cs_scheduler.C + net_xfer.C + win/ + stackwalker.h + win_build/ + boinc.sln + *.vcproj diff --git a/client/app.C b/client/app.C index b6ac18abc4..90bc18a7c0 100644 --- a/client/app.C +++ b/client/app.C @@ -601,8 +601,9 @@ bool ACTIVE_TASK_SET::check_app_exited() { #ifdef _WIN32 unsigned long exit_code; bool found = false; + unsigned int i; - for (int i=0; ipid_handle, &exit_code)) { if (exit_code != STILL_ACTIVE) { diff --git a/client/cs_benchmark.C b/client/cs_benchmark.C index 9545f6d158..71d1d57b7d 100644 --- a/client/cs_benchmark.C +++ b/client/cs_benchmark.C @@ -174,7 +174,7 @@ int CLIENT_STATE::check_cpu_benchmarks() { DWORD exit_code = 0; GetExitCodeThread(cpu_benchmarks_handle, &exit_code); if(exit_code == STILL_ACTIVE) { - if(time(NULL) > cpu_benchmarks_start + MAX_CPU_BENCHMARKS_SECONDS) { + if(time(0) > cpu_benchmarks_start + MAX_CPU_BENCHMARKS_SECONDS) { msg_printf(NULL, MSG_ERROR, "CPU benchmarks timed out, using default values"); TerminateThread(cpu_benchmarks_handle, 0); CloseHandle(cpu_benchmarks_handle); diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C index e7f72d8e2b..63d3cab8ee 100644 --- a/client/cs_scheduler.C +++ b/client/cs_scheduler.C @@ -26,7 +26,11 @@ #include #include #include +#ifdef _WIN32 +#include +#else #include +#endif #include "crypt.h" #include "error_numbers.h" @@ -234,7 +238,7 @@ int CLIENT_STATE::read_trickle_files(PROJECT* project, FILE* f) { if (strstr(fname, "trickle_") != fname) continue; q = fname + strlen("trickle_"); p = strrchr(fname, '_'); - if (p <= q); continue; + if (p <= q) continue; *p = 0; strcpy(result_name, q); t = atoi(p+1); diff --git a/client/net_xfer.C b/client/net_xfer.C index 24d2e7f0cf..7aa2764963 100644 --- a/client/net_xfer.C +++ b/client/net_xfer.C @@ -18,6 +18,9 @@ // // Revision History: // $Log$ +// Revision 1.78 2004/01/10 06:40:44 davea +// *** empty log message *** +// // Revision 1.77 2003/12/12 23:13:01 davea // *** empty log message *** // @@ -361,7 +364,7 @@ int NET_XFER_SET::net_sleep(double x) { // int NET_XFER_SET::do_select(double& bytes_transferred, double timeout) { int n, fd, retval, nsocks_queried; - socklen_t i; + unsigned int i; NET_XFER *nxp; struct timeval tv; diff --git a/client/win/Stackwalker.h b/client/win/Stackwalker.h index f430473a5a..ed919e602d 100755 --- a/client/win/Stackwalker.h +++ b/client/win/Stackwalker.h @@ -26,7 +26,7 @@ #endif // Only MS VC++ 5 to 7 -#if (_MSC_VER < 1100) || (_MSC_VER > 1300) +#if (_MSC_VER < 1100) || (_MSC_VER > 1400) #error Only MS VC++ 5/6/7 supported. Check if the '_CrtMemBlockHeader' has not changed with this compiler! #endif diff --git a/lib/parse.h b/lib/parse.h index c0d4e9318b..a2779f50e6 100644 --- a/lib/parse.h +++ b/lib/parse.h @@ -42,6 +42,7 @@ extern void replace_element(char* buf, char* start, char* end, char* replacement extern char* sgets(char* buf, int len, char* &in); extern bool extract_xml_record(const std::string &field, const char *tag, std::string &record); +#if 0 class InvalidBase64Exception { }; @@ -52,3 +53,5 @@ inline string r_base64_decode (string const& from) throw(InvalidBase64Exception) { return r_base64_decode(from.c_str(), from.length()); } + +#endif \ No newline at end of file diff --git a/win_build/RSAEuro.vcproj b/win_build/RSAEuro.vcproj new file mode 100644 index 0000000000..6f1bd54fa5 --- /dev/null +++ b/win_build/RSAEuro.vcproj @@ -0,0 +1,430 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/boinc.sln b/win_build/boinc.sln new file mode 100644 index 0000000000..bb94da91a2 --- /dev/null +++ b/win_build/boinc.sln @@ -0,0 +1,78 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RSAEuro", "RSAEuro.vcproj", "{264D5059-0A60-4B6E-8979-245BC31141FE}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_cli", "boinc_cli.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}" + ProjectSection(ProjectDependencies) = postProject + {264D5059-0A60-4B6E-8979-245BC31141FE} = {264D5059-0A60-4B6E-8979-245BC31141FE} + {21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174} + {0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_dll", "boinc_dll.vcproj", "{0B6B4994-5C4B-49F3-B717-17603AFB789E}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_gui", "boinc_gui.vcproj", "{EB493826-9025-41CE-8F7B-8D7549FAF79B}" + ProjectSection(ProjectDependencies) = postProject + {264D5059-0A60-4B6E-8979-245BC31141FE} = {264D5059-0A60-4B6E-8979-245BC31141FE} + {21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174} + {0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_ss", "boinc_ss.vcproj", "{21E7357D-41D8-444C-A120-18064B497174}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "upper_case", "upper_case.vcproj", "{48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc", "boinc.vcproj", "{7B303283-CC77-4B25-BE1B-66E80ADB105A}" + ProjectSection(ProjectDependencies) = postProject + {264D5059-0A60-4B6E-8979-245BC31141FE} = {264D5059-0A60-4B6E-8979-245BC31141FE} + {21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174} + {0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {264D5059-0A60-4B6E-8979-245BC31141FE}.Debug.ActiveCfg = Debug|Win32 + {264D5059-0A60-4B6E-8979-245BC31141FE}.Debug.Build.0 = Debug|Win32 + {264D5059-0A60-4B6E-8979-245BC31141FE}.Release.ActiveCfg = Release|Win32 + {264D5059-0A60-4B6E-8979-245BC31141FE}.Release.Build.0 = Release|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.ActiveCfg = Debug|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.Build.0 = Debug|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Release.ActiveCfg = Release|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Release.Build.0 = Release|Win32 + {0B6B4994-5C4B-49F3-B717-17603AFB789E}.Debug.ActiveCfg = Debug|Win32 + {0B6B4994-5C4B-49F3-B717-17603AFB789E}.Debug.Build.0 = Debug|Win32 + {0B6B4994-5C4B-49F3-B717-17603AFB789E}.Release.ActiveCfg = Release|Win32 + {0B6B4994-5C4B-49F3-B717-17603AFB789E}.Release.Build.0 = Release|Win32 + {EB493826-9025-41CE-8F7B-8D7549FAF79B}.Debug.ActiveCfg = Debug|Win32 + {EB493826-9025-41CE-8F7B-8D7549FAF79B}.Debug.Build.0 = Debug|Win32 + {EB493826-9025-41CE-8F7B-8D7549FAF79B}.Release.ActiveCfg = Release|Win32 + {EB493826-9025-41CE-8F7B-8D7549FAF79B}.Release.Build.0 = Release|Win32 + {21E7357D-41D8-444C-A120-18064B497174}.Debug.ActiveCfg = Debug|Win32 + {21E7357D-41D8-444C-A120-18064B497174}.Debug.Build.0 = Debug|Win32 + {21E7357D-41D8-444C-A120-18064B497174}.Release.ActiveCfg = Release|Win32 + {21E7357D-41D8-444C-A120-18064B497174}.Release.Build.0 = Release|Win32 + {48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Debug.ActiveCfg = Debug|Win32 + {48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Debug.Build.0 = Debug|Win32 + {48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Release.ActiveCfg = Release|Win32 + {48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Release.Build.0 = Release|Win32 + {7B303283-CC77-4B25-BE1B-66E80ADB105A}.Debug.ActiveCfg = Debug|Win32 + {7B303283-CC77-4B25-BE1B-66E80ADB105A}.Debug.Build.0 = Debug|Win32 + {7B303283-CC77-4B25-BE1B-66E80ADB105A}.Release.ActiveCfg = Release|Win32 + {7B303283-CC77-4B25-BE1B-66E80ADB105A}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/win_build/boinc.vcproj b/win_build/boinc.vcproj new file mode 100644 index 0000000000..b26c1b9215 --- /dev/null +++ b/win_build/boinc.vcproj @@ -0,0 +1,1489 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/boinc_cli.vcproj b/win_build/boinc_cli.vcproj new file mode 100644 index 0000000000..069ebb80fe --- /dev/null +++ b/win_build/boinc_cli.vcproj @@ -0,0 +1,1196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/boinc_dll.vcproj b/win_build/boinc_dll.vcproj new file mode 100644 index 0000000000..4f22424939 --- /dev/null +++ b/win_build/boinc_dll.vcproj @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/boinc_gui.vcproj b/win_build/boinc_gui.vcproj new file mode 100644 index 0000000000..180f78752f --- /dev/null +++ b/win_build/boinc_gui.vcproj @@ -0,0 +1,1489 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/boinc_ss.vcproj b/win_build/boinc_ss.vcproj new file mode 100644 index 0000000000..1d157f41bc --- /dev/null +++ b/win_build/boinc_ss.vcproj @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/upper_case.vcproj b/win_build/upper_case.vcproj new file mode 100644 index 0000000000..42e5bc3de1 --- /dev/null +++ b/win_build/upper_case.vcproj @@ -0,0 +1,383 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +