Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- Compile fixes for Win 

svn path=/trunk/boinc/; revision=13652
This commit is contained in:
David Anderson 2007-09-25 16:39:30 +00:00
parent f1f5930579
commit be7ad65989
5 changed files with 12 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
checkin_notes
View File

@ -8732,3 +8732,15 @@ David 25 Sept 2007
common_defs.h common_defs.h
gui_rpc_client.h gui_rpc_client.h
gui_rpc_client_ops.C gui_rpc_client_ops.C
David 25 Sept 2007
- compile fixes for Win
client/
sim_util.C
clientgui/
BOINCGUIApp.cpp
clientscr/
screensaver_win.cpp
win_build/
boinc_cli_curl.vcproj

2
client/sim_util.C
View File

@ -285,9 +285,7 @@ ACTIVE_TASK::ACTIVE_TASK() {
scheduler_state = CPU_SCHED_UNINITIALIZED; scheduler_state = CPU_SCHED_UNINITIALIZED;
signal = 0; signal = 0;
strcpy(slot_dir, ""); strcpy(slot_dir, "");
is_ss_app = false;
graphics_mode_acked = MODE_UNSUPPORTED; graphics_mode_acked = MODE_UNSUPPORTED;
graphics_mode_before_ss = MODE_HIDE_GRAPHICS;
graphics_mode_ack_timeout = 0; graphics_mode_ack_timeout = 0;
exit_requested = false; exit_requested = false;
fraction_done = 0; fraction_done = 0;

5
clientgui/BOINCGUIApp.cpp
View File

@ -496,7 +496,6 @@ bool CBOINCGUIApp::IsBOINCCoreRunning() {
wxLogTrace(wxT("Function Start/End"), wxT("CBOINCGUIApp::IsBOINCCoreRunning - Function Begin")); wxLogTrace(wxT("Function Start/End"), wxT("CBOINCGUIApp::IsBOINCCoreRunning - Function Begin"));
int retval; int retval;
int scrsave_mode;
bool running = false; bool running = false;
RPC_CLIENT rpc; RPC_CLIENT rpc;
@ -507,8 +506,6 @@ bool CBOINCGUIApp::IsBOINCCoreRunning() {
} else { } else {
retval = rpc.init("localhost"); // synchronous is OK since local retval = rpc.init("localhost"); // synchronous is OK since local
wxLogTrace(wxT("Function Status"), wxT("CBOINCGUIApp::IsBOINCCoreRunning - Connecting to core client returned '%d'"), retval); wxLogTrace(wxT("Function Status"), wxT("CBOINCGUIApp::IsBOINCCoreRunning - Connecting to core client returned '%d'"), retval);
retval = rpc.get_screensaver_mode(scrsave_mode);
wxLogTrace(wxT("Function Status"), wxT("CBOINCGUIApp::IsBOINCCoreRunning - Requesting screen saver mode... retval '%d', scrsave_mode '%d'"), retval, scrsave_mode);
running = (retval == 0); running = (retval == 0);
rpc.close(); rpc.close();
} }
@ -519,7 +516,6 @@ bool CBOINCGUIApp::IsBOINCCoreRunning() {
(TickCount() < (120*60)); // If system has been up for less than 2 minutes (TickCount() < (120*60)); // If system has been up for less than 2 minutes
for (int i=0; i<10; i++) { for (int i=0; i<10; i++) {
retval = rpc.init("localhost"); // synchronous is OK since local retval = rpc.init("localhost"); // synchronous is OK since local
retval = rpc.get_screensaver_mode(scrsave_mode);
running = (retval == 0); running = (retval == 0);
rpc.close(); rpc.close();
if (running) break; if (running) break;
@ -528,7 +524,6 @@ bool CBOINCGUIApp::IsBOINCCoreRunning() {
} }
#else #else
retval = rpc.init("localhost"); // synchronous is OK since local retval = rpc.init("localhost"); // synchronous is OK since local
retval = rpc.get_screensaver_mode(scrsave_mode);
running = (retval == 0); running = (retval == 0);
rpc.close(); rpc.close();
#endif #endif

10
clientscr/screensaver_win.cpp
View File

@ -311,16 +311,6 @@ INT CScreensaver::Run() {
DoConfig(); DoConfig();
} }
break; break;
case sm_test:
int iCurrentStatus;
rpc.init(NULL);
rpc.get_screensaver_mode(iCurrentStatus);
rpc.close();
break;
case sm_preview: case sm_preview:
case sm_full: case sm_full:
// Create the data management thread to talk with the daemon // Create the data management thread to talk with the daemon

78
win_build/boinc_cli_curl.vcproj
View File

@ -2106,80 +2106,6 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\client\ss_logic.C"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"
CompileAs="2"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"
CompileAs="2"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
CompileAs="2"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
CompileAs="2"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseSigned|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
CompileAs="2"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseSigned|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
CompileAs="2"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\Client\time_stats.C" RelativePath="..\Client\time_stats.C"
> >
@ -2383,10 +2309,6 @@
RelativePath="..\client\scheduler_op.h" RelativePath="..\client\scheduler_op.h"
> >
</File> </File>
<File
RelativePath="..\client\ss_logic.h"
>
</File>
<File <File
RelativePath="..\client\time_stats.h" RelativePath="..\client\time_stats.h"
> >