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

SS: On Windows, make path strings Unicode compatible in ss coordinator 

svn path=/trunk/boinc/; revision=17273
This commit is contained in:
Charlie Fenton 2009-02-14 01:43:08 +00:00
parent bb05206440
commit ab8d50e594
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
checkin_notes
View File

@ -1595,3 +1595,9 @@ David 13 Feb 2009
lib/
gui_rpc_client_ops.cpp
gui_rpc_client.h
Charlie 13 Feb 2009
- SS: On Windows, make path strings Unicode compatible in ss coordinator.
clientscr/
screensaver.cpp

14
clientscr/screensaver.cpp
View File

@ -41,9 +41,15 @@
#include "gui_rpc_client.h"
#include "screensaver_win.h"
#include "str_util.h"
#define PATH_SEPARATOR "\\"
// Allow for Unicode wide characters
#define PATH_SEPARATOR (_T("\\"))
#define THE_DEFAULT_SS_EXECUTABLE (_T(DEFAULT_SS_EXECUTABLE))
#define THE_SS_CONFIG_FILE (_T(SS_CONFIG_FILE))
#else
// Using (_T()) here causes compiler errors on Mac
#define PATH_SEPARATOR "/"
#define THE_DEFAULT_SS_EXECUTABLE DEFAULT_SS_EXECUTABLE
#define THE_SS_CONFIG_FILE SS_CONFIG_FILE
#endif
#ifdef __APPLE__
@ -321,7 +327,7 @@ int CScreensaver::launch_default_screensaver(char *dir_path, int& graphics_appli
strlcpy(full_path, dir_path, sizeof(full_path));
strlcat(full_path, PATH_SEPARATOR, sizeof(full_path));
strlcat(full_path, DEFAULT_SS_EXECUTABLE, sizeof(full_path));
strlcat(full_path, THE_DEFAULT_SS_EXECUTABLE, sizeof(full_path));
// For unknown reasons, the graphics application exits with
// "RegisterProcess failed (error = -50)" unless we pass its
@ -404,7 +410,7 @@ retval = 0;
#endif
strlcpy(full_path, default_ss_dir_path, sizeof(full_path));
strlcat(full_path, PATH_SEPARATOR, sizeof(full_path));
strlcat(full_path, DEFAULT_SS_EXECUTABLE, sizeof(full_path));
strlcat(full_path, THE_DEFAULT_SS_EXECUTABLE, sizeof(full_path));
if (boinc_file_exists(full_path)) {
m_bDefault_ss_exists = true;
@ -760,7 +766,7 @@ void CScreensaver::GetDisplayPeriods(char *dir_path) {
strlcpy(buf, dir_path, sizeof(buf));
strlcat(buf, PATH_SEPARATOR, sizeof(buf));
strlcat(buf, SS_CONFIG_FILE, sizeof(buf));
strlcat(buf, THE_SS_CONFIG_FILE, sizeof(buf));
f = boinc_fopen(buf, "r");
if (!f) return;