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

*** empty log message *** 

svn path=/trunk/boinc/; revision=2019
This commit is contained in:
Dan Werthimer 2003-08-07 23:32:41 +00:00
parent 1b03e2c37a
commit 2e939bf2b5
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/gutil.C
View File

@ -1,3 +1,4 @@
//#include <afx.h> // for ASSERT
// The contents of this file are subject to the BOINC Public License // The contents of this file are subject to the BOINC Public License
// Version 1.0 (the "License"); you may not use this file except in // Version 1.0 (the "License"); you may not use this file except in
// compliance with the License. You may obtain a copy of the License at // compliance with the License. You may obtain a copy of the License at
@ -445,6 +446,7 @@ int init_texture(char* filename) {
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER, GL_LINEAR);
err = glGetError(); err = glGetError();
if (err) return err; if (err) return err;
//ASSERT(0);
glTexImage2D( glTexImage2D(
GL_TEXTURE_2D, GL_TEXTURE_2D,
0, 0,
@ -459,7 +461,10 @@ int init_texture(char* filename) {
pixels // dimension of PPM file MUST be power of 2 pixels // dimension of PPM file MUST be power of 2
); );
err = glGetError(); err = glGetError();
if (err) return err; if (err) {
fprintf(stderr, "glTexImage2D returned error # %d: %s\n", err, gluErrorString(err));
return err;
}
return 0; return 0;
} }
struct Vertex struct Vertex

9
client/win/win_screensaver.cpp
View File

@ -93,8 +93,11 @@ void RunSaver( void ) {
if(boinc_mutex != NULL && GetLastError() != ERROR_ALREADY_EXISTS) { if(boinc_mutex != NULL && GetLastError() != ERROR_ALREADY_EXISTS) {
CloseHandle(boinc_mutex); CloseHandle(boinc_mutex);
// Get the path to the client // Get the path to the client
UtilGetRegStr( "ClientPath", client_path ); if (!UtilGetRegStr( "ClientPath", client_path ) ||
UtilGetRegStr( "ClientDir", client_dir ); UtilGetRegStr( "ClientDir", client_dir ))
{
return /* error */;
}
memset( &process_info, 0, sizeof( process_info ) ); memset( &process_info, 0, sizeof( process_info ) );
memset( &startup_info, 0, sizeof( startup_info ) ); memset( &startup_info, 0, sizeof( startup_info ) );
@ -112,6 +115,8 @@ void RunSaver( void ) {
client_dir, // start in the standard client directory client_dir, // start in the standard client directory
&startup_info, &startup_info,
&process_info ); &process_info );
// wait up to 3 seconds for BOINC to start
WaitForInputIdle(process_info.hProcess, 3000);
} }
BOINC_SS_START_MSG = RegisterWindowMessage( START_SS_MSG ); BOINC_SS_START_MSG = RegisterWindowMessage( START_SS_MSG );

2
client/win/win_util.cpp
View File

@ -144,6 +144,8 @@ int UtilGetRegStr(char *name, char *str)
DWORD size = 128; DWORD size = 128;
HKEY boinc_key; HKEY boinc_key;
*str = 0;
if ( OSVersion == OS_WIN95 ) { if ( OSVersion == OS_WIN95 ) {
error = RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SOFTWARE\\BOINC", error = RegOpenKeyEx( HKEY_LOCAL_MACHINE, "SOFTWARE\\BOINC",
0, KEY_ALL_ACCESS, &boinc_key ); 0, KEY_ALL_ACCESS, &boinc_key );