mirror of https://github.com/BOINC/boinc.git
- Cleanup various warnings
- WINSCR: Implement new configuration dialog with new parameters
- WINSCR: Remove crufty code
- WINSCR: Update copyrights in resource files
client/
app.cpp
clientscr/
boinc_ss.h
boinc_ss.rc
boinc_ss_opengl.h
boinc_ss_opengl.rc
clientscr/
screensaver.cpp, .h
screensaver_win.cpp, .h
lib/
common_defs.h
crypt.cpp
idlemon_win.cpp
win_util.cpp
samples/worker/
worker.cpp
win_build/
boinc_ss.vcproj
multi_thread.vcproj
sleeper.vcproj
ss_app.vcproj
uc2_graphics.vcproj
svn path=/trunk/boinc/; revision=19923
This commit is contained in:
Rom Walton
parent
3cb29867e7
commit
2d25b6698d
|
|
@ -10116,3 +10116,33 @@ Charlie 16 Dec 2009
|
|||
|
||||
mac_installer/
|
||||
uninstall.cpp
|
||||
|
||||
Rom 16 Dec 2009
|
||||
- Cleanup various warnings
|
||||
- WINSCR: Implement new configuration dialog with new parameters
|
||||
- WINSCR: Remove crufty code
|
||||
- WINSCR: Update copyrights in resource files
|
||||
|
||||
client/
|
||||
app.cpp
|
||||
clientscr/
|
||||
boinc_ss.h
|
||||
boinc_ss.rc
|
||||
boinc_ss_opengl.h
|
||||
boinc_ss_opengl.rc
|
||||
clientscr/
|
||||
screensaver.cpp, .h
|
||||
screensaver_win.cpp, .h
|
||||
lib/
|
||||
common_defs.h
|
||||
crypt.cpp
|
||||
idlemon_win.cpp
|
||||
win_util.cpp
|
||||
samples/worker/
|
||||
worker.cpp
|
||||
win_build/
|
||||
boinc_ss.vcproj
|
||||
multi_thread.vcproj
|
||||
sleeper.vcproj
|
||||
ss_app.vcproj
|
||||
uc2_graphics.vcproj
|
||||
|
|
|
|||
|
|
@ -810,7 +810,7 @@ void MSG_QUEUE::msg_queue_poll(MSG_CHANNEL& channel) {
|
|||
// if the last message in the buffer is "msg", remove it and return 1
|
||||
//
|
||||
int MSG_QUEUE::msg_queue_purge(const char* msg) {
|
||||
int count = msgs.size();
|
||||
int count = (int)msgs.size();
|
||||
if (!count) return 0;
|
||||
vector<string>::iterator iter = msgs.begin();
|
||||
for (int i=0; i<count-1; i++) {
|
||||
|
|
|
|||
|
|
@ -2,25 +2,28 @@
|
|||
// Microsoft Visual C++ generated include file.
|
||||
// Used by boinc_ss.rc
|
||||
//
|
||||
#define IDI_MAIN_ICON 1
|
||||
#define IDS_DESCRIPTION 1
|
||||
#define IDS_SHORTCUTNAME 2
|
||||
#define DLG_CONFIG 104
|
||||
#define IDB_BOINCSPLAT 108
|
||||
#define IDC_BLANK 1000
|
||||
#define IDC_BLANK_TIME 1001
|
||||
#define IDS_ERR_GENERIC 2100
|
||||
#define IDS_ERR_BOINCNOTDETECTED 2101
|
||||
#define IDS_ERR_BOINCSUSPENDED 2103
|
||||
#define IDS_ERR_BOINCNOAPPSEXECUTING 2104
|
||||
#define IDI_MAIN_ICON 1
|
||||
#define IDS_DESCRIPTION 1
|
||||
#define IDS_SHORTCUTNAME 2
|
||||
#define DLG_CONFIG 104
|
||||
#define IDB_BOINC 108
|
||||
#define IDC_SLIDER_BLANKTIME 1008
|
||||
#define IDC_SLIDER_DEFAULTTIME 1010
|
||||
#define IDC_SLIDER_RUNTIME 1011
|
||||
#define IDC_SLIDER_SWITCHTIME 1012
|
||||
#define IDS_ERR_GENERIC 2100
|
||||
#define IDS_ERR_BOINCNOTDETECTED 2101
|
||||
#define IDS_ERR_BOINCSUSPENDED 2103
|
||||
#define IDS_ERR_BOINCNOAPPSEXECUTING 2104
|
||||
#define IDS_ERR_BOINCNOAPPSEXECUTINGNOPROJECTSDETECTED 2105
|
||||
#define IDS_ERR_BOINCNOGRAPHICSAPPSEXECUTING 2106
|
||||
#define IDS_ERR_BOINCSCREENSAVERLOADING 2107
|
||||
#define IDS_ERR_BOINCSCREENSAVERLOADING 2107
|
||||
#define IDS_ERR_BOINCAPPFOUNDGRAPHICSLOADING 2108
|
||||
#define IDS_ERR_BOINCSHUTDOWNEVENT 2109
|
||||
#define IDS_ERR_OUTOFMEMORY 2110
|
||||
#define IDS_ERR_NOPREVIEW 2112
|
||||
#define IDS_ERR_DAEMONALLOWSNOGRAPHICS 2113
|
||||
#define IDS_ERR_BOINCSHUTDOWNEVENT 2109
|
||||
#define IDS_ERR_OUTOFMEMORY 2110
|
||||
#define IDS_ERR_NOPREVIEW 2112
|
||||
#define IDS_ERR_DAEMONALLOWSNOGRAPHICS 2113
|
||||
#define IDC_STATIC -1
|
||||
|
||||
// Next default values for new objects
|
||||
//
|
||||
|
|
@ -29,7 +32,7 @@
|
|||
#define _APS_3D_CONTROLS 1
|
||||
#define _APS_NEXT_RESOURCE_VALUE 109
|
||||
#define _APS_NEXT_COMMAND_VALUE 40000
|
||||
#define _APS_NEXT_CONTROL_VALUE 1007
|
||||
#define _APS_NEXT_CONTROL_VALUE 1010
|
||||
#define _APS_NEXT_SYMED_VALUE 102
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ BEGIN
|
|||
VALUE "FileDescription", "GridRepublic Screensaver"
|
||||
VALUE "FileVersion", BOINC_VERSION_STRING "\0"
|
||||
VALUE "InternalName", "boinc_ss"
|
||||
VALUE "LegalCopyright", "© 2003-2009 University of California"
|
||||
VALUE "LegalCopyright", "© 2003-2010 University of California"
|
||||
VALUE "OriginalFilename", "boinc.scr"
|
||||
VALUE "ProductName", "BOINC client"
|
||||
VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
|
||||
|
|
@ -150,7 +150,7 @@ BEGIN
|
|||
VALUE "FileDescription", "Progress Thru Processors Screensaver"
|
||||
VALUE "FileVersion", BOINC_VERSION_STRING "\0"
|
||||
VALUE "InternalName", "boinc_ss"
|
||||
VALUE "LegalCopyright", "© 2003-2009 University of California"
|
||||
VALUE "LegalCopyright", "© 2003-2010 University of California"
|
||||
VALUE "OriginalFilename", "boinc.scr"
|
||||
VALUE "ProductName", "BOINC client"
|
||||
VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
|
||||
|
|
@ -185,7 +185,7 @@ BEGIN
|
|||
VALUE "FileDescription", "World Community Grid Screensaver"
|
||||
VALUE "FileVersion", BOINC_VERSION_STRING "\0"
|
||||
VALUE "InternalName", "boinc_ss"
|
||||
VALUE "LegalCopyright", "© 2003-2009 University of California"
|
||||
VALUE "LegalCopyright", "© 2003-2010 University of California"
|
||||
VALUE "OriginalFilename", "boinc.scr"
|
||||
VALUE "ProductName", "BOINC client"
|
||||
VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
|
||||
|
|
@ -220,7 +220,7 @@ BEGIN
|
|||
VALUE "FileDescription", "BOINC Screensaver"
|
||||
VALUE "FileVersion", BOINC_VERSION_STRING "\0"
|
||||
VALUE "InternalName", "boinc_ss"
|
||||
VALUE "LegalCopyright", "© 2003-2009 University of California"
|
||||
VALUE "LegalCopyright", "© 2003-2010 University of California"
|
||||
VALUE "OriginalFilename", "boinc.scr"
|
||||
VALUE "ProductName", "BOINC client"
|
||||
VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
|
||||
|
|
@ -239,20 +239,227 @@ END
|
|||
// Dialog
|
||||
//
|
||||
|
||||
DLG_CONFIG DIALOGEX 50, 50, 186, 76
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION |
|
||||
WS_SYSMENU
|
||||
CAPTION "Config dialog"
|
||||
#if defined(_GRIDREPUBLIC)
|
||||
|
||||
DLG_CONFIG DIALOGEX 50, 50, 249, 200
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "GridRepublic Screensaver Configuration"
|
||||
FONT 8, "MS Sans Serif", 0, 0, 0x0
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,7,55,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,129,55,50,14
|
||||
CONTROL "Go to blank screen",IDC_BLANK,"Button",BS_AUTOCHECKBOX |
|
||||
WS_TABSTOP,7,7,76,10
|
||||
LTEXT "Minutes until blank:",IDC_STATIC,7,31,62,8
|
||||
EDITTEXT IDC_BLANK_TIME,77,28,40,14,ES_AUTOHSCROLL
|
||||
DEFPUSHBUTTON "OK",IDOK,137,181,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,194,181,50,14
|
||||
LTEXT "Blank screensaver after:",IDC_STATIC,7,7,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_BLANKTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,20,220,15
|
||||
CTEXT "1",IDC_STATIC,20,36,8,8
|
||||
CTEXT "2",IDC_STATIC,44,36,8,8
|
||||
CTEXT "5",IDC_STATIC,70,36,8,8
|
||||
CTEXT "10",IDC_STATIC,95,36,8,8
|
||||
CTEXT "15",IDC_STATIC,121,36,8,8
|
||||
CTEXT "30",IDC_STATIC,146,36,8,8
|
||||
CTEXT "45",IDC_STATIC,171,36,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,36,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,36,22,8
|
||||
LTEXT "Run GridRepublic screensaver for:",IDC_STATIC,7,49,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_DEFAULTTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,63,220,15
|
||||
CTEXT "1",IDC_STATIC,20,79,8,8
|
||||
CTEXT "2",IDC_STATIC,44,79,8,8
|
||||
CTEXT "5",IDC_STATIC,70,79,8,8
|
||||
CTEXT "10",IDC_STATIC,95,79,8,8
|
||||
CTEXT "15",IDC_STATIC,121,79,8,8
|
||||
CTEXT "30",IDC_STATIC,146,79,8,8
|
||||
CTEXT "45",IDC_STATIC,171,79,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,79,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,79,22,8
|
||||
LTEXT "Run Application screensavers for:",IDC_STATIC,7,92,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_RUNTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,106,220,15
|
||||
CTEXT "1",IDC_STATIC,20,122,8,8
|
||||
CTEXT "2",IDC_STATIC,44,122,8,8
|
||||
CTEXT "5",IDC_STATIC,70,122,8,8
|
||||
CTEXT "10",IDC_STATIC,95,122,8,8
|
||||
CTEXT "15",IDC_STATIC,121,122,8,8
|
||||
CTEXT "30",IDC_STATIC,146,122,8,8
|
||||
CTEXT "45",IDC_STATIC,171,122,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,122,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,122,22,8
|
||||
LTEXT "Switch among Application screensavers every:",IDC_STATIC,7,135,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_SWITCHTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,148,220,15
|
||||
CTEXT "1",IDC_STATIC,20,164,8,8
|
||||
CTEXT "2",IDC_STATIC,44,164,8,8
|
||||
CTEXT "5",IDC_STATIC,70,164,8,8
|
||||
CTEXT "10",IDC_STATIC,95,164,8,8
|
||||
CTEXT "15",IDC_STATIC,121,164,8,8
|
||||
CTEXT "30",IDC_STATIC,146,164,8,8
|
||||
CTEXT "45",IDC_STATIC,171,164,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,164,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,164,22,8
|
||||
END
|
||||
|
||||
#elif defined(_PROGRESSTHRUPROCESSORS)
|
||||
|
||||
DLG_CONFIG DIALOGEX 50, 50, 249, 200
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Progress Thru Processors Screensaver Configuration"
|
||||
FONT 8, "MS Sans Serif", 0, 0, 0x0
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,137,181,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,194,181,50,14
|
||||
LTEXT "Blank screensaver after:",IDC_STATIC,7,7,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_BLANKTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,20,220,15
|
||||
CTEXT "1",IDC_STATIC,20,36,8,8
|
||||
CTEXT "2",IDC_STATIC,44,36,8,8
|
||||
CTEXT "5",IDC_STATIC,70,36,8,8
|
||||
CTEXT "10",IDC_STATIC,95,36,8,8
|
||||
CTEXT "15",IDC_STATIC,121,36,8,8
|
||||
CTEXT "30",IDC_STATIC,146,36,8,8
|
||||
CTEXT "45",IDC_STATIC,171,36,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,36,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,36,22,8
|
||||
LTEXT "Run Progress Thru Processors screensaver for:",IDC_STATIC,7,49,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_DEFAULTTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,63,220,15
|
||||
CTEXT "1",IDC_STATIC,20,79,8,8
|
||||
CTEXT "2",IDC_STATIC,44,79,8,8
|
||||
CTEXT "5",IDC_STATIC,70,79,8,8
|
||||
CTEXT "10",IDC_STATIC,95,79,8,8
|
||||
CTEXT "15",IDC_STATIC,121,79,8,8
|
||||
CTEXT "30",IDC_STATIC,146,79,8,8
|
||||
CTEXT "45",IDC_STATIC,171,79,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,79,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,79,22,8
|
||||
LTEXT "Run Application screensavers for:",IDC_STATIC,7,92,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_RUNTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,106,220,15
|
||||
CTEXT "1",IDC_STATIC,20,122,8,8
|
||||
CTEXT "2",IDC_STATIC,44,122,8,8
|
||||
CTEXT "5",IDC_STATIC,70,122,8,8
|
||||
CTEXT "10",IDC_STATIC,95,122,8,8
|
||||
CTEXT "15",IDC_STATIC,121,122,8,8
|
||||
CTEXT "30",IDC_STATIC,146,122,8,8
|
||||
CTEXT "45",IDC_STATIC,171,122,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,122,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,122,22,8
|
||||
LTEXT "Switch among Application screensavers every:",IDC_STATIC,7,135,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_SWITCHTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,148,220,15
|
||||
CTEXT "1",IDC_STATIC,20,164,8,8
|
||||
CTEXT "2",IDC_STATIC,44,164,8,8
|
||||
CTEXT "5",IDC_STATIC,70,164,8,8
|
||||
CTEXT "10",IDC_STATIC,95,164,8,8
|
||||
CTEXT "15",IDC_STATIC,121,164,8,8
|
||||
CTEXT "30",IDC_STATIC,146,164,8,8
|
||||
CTEXT "45",IDC_STATIC,171,164,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,164,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,164,22,8
|
||||
END
|
||||
|
||||
#elif defined(_WCG)
|
||||
|
||||
DLG_CONFIG DIALOGEX 50, 50, 249, 200
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "World Community Grid Screensaver Configuration"
|
||||
FONT 8, "MS Sans Serif", 0, 0, 0x0
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,137,181,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,194,181,50,14
|
||||
LTEXT "Blank screensaver after:",IDC_STATIC,7,7,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_BLANKTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,20,220,15
|
||||
CTEXT "1",IDC_STATIC,20,36,8,8
|
||||
CTEXT "2",IDC_STATIC,44,36,8,8
|
||||
CTEXT "5",IDC_STATIC,70,36,8,8
|
||||
CTEXT "10",IDC_STATIC,95,36,8,8
|
||||
CTEXT "15",IDC_STATIC,121,36,8,8
|
||||
CTEXT "30",IDC_STATIC,146,36,8,8
|
||||
CTEXT "45",IDC_STATIC,171,36,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,36,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,36,22,8
|
||||
LTEXT "Run World Community Grid screensaver for:",IDC_STATIC,7,49,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_DEFAULTTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,63,220,15
|
||||
CTEXT "1",IDC_STATIC,20,79,8,8
|
||||
CTEXT "2",IDC_STATIC,44,79,8,8
|
||||
CTEXT "5",IDC_STATIC,70,79,8,8
|
||||
CTEXT "10",IDC_STATIC,95,79,8,8
|
||||
CTEXT "15",IDC_STATIC,121,79,8,8
|
||||
CTEXT "30",IDC_STATIC,146,79,8,8
|
||||
CTEXT "45",IDC_STATIC,171,79,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,79,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,79,22,8
|
||||
LTEXT "Run Application screensavers for:",IDC_STATIC,7,92,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_RUNTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,106,220,15
|
||||
CTEXT "1",IDC_STATIC,20,122,8,8
|
||||
CTEXT "2",IDC_STATIC,44,122,8,8
|
||||
CTEXT "5",IDC_STATIC,70,122,8,8
|
||||
CTEXT "10",IDC_STATIC,95,122,8,8
|
||||
CTEXT "15",IDC_STATIC,121,122,8,8
|
||||
CTEXT "30",IDC_STATIC,146,122,8,8
|
||||
CTEXT "45",IDC_STATIC,171,122,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,122,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,122,22,8
|
||||
LTEXT "Switch among Application screensavers every:",IDC_STATIC,7,135,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_SWITCHTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,148,220,15
|
||||
CTEXT "1",IDC_STATIC,20,164,8,8
|
||||
CTEXT "2",IDC_STATIC,44,164,8,8
|
||||
CTEXT "5",IDC_STATIC,70,164,8,8
|
||||
CTEXT "10",IDC_STATIC,95,164,8,8
|
||||
CTEXT "15",IDC_STATIC,121,164,8,8
|
||||
CTEXT "30",IDC_STATIC,146,164,8,8
|
||||
CTEXT "45",IDC_STATIC,171,164,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,164,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,164,22,8
|
||||
END
|
||||
|
||||
#else
|
||||
|
||||
DLG_CONFIG DIALOGEX 50, 50, 249, 200
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "BOINC Screensaver Configuration"
|
||||
FONT 8, "MS Sans Serif", 0, 0, 0x0
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,137,181,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,194,181,50,14
|
||||
LTEXT "Blank screensaver after:",IDC_STATIC,7,7,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_BLANKTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,20,220,15
|
||||
CTEXT "1",IDC_STATIC,20,36,8,8
|
||||
CTEXT "2",IDC_STATIC,44,36,8,8
|
||||
CTEXT "5",IDC_STATIC,70,36,8,8
|
||||
CTEXT "10",IDC_STATIC,95,36,8,8
|
||||
CTEXT "15",IDC_STATIC,121,36,8,8
|
||||
CTEXT "30",IDC_STATIC,146,36,8,8
|
||||
CTEXT "45",IDC_STATIC,171,36,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,36,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,36,22,8
|
||||
LTEXT "Run BOINC screensaver for:",IDC_STATIC,7,49,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_DEFAULTTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,63,220,15
|
||||
CTEXT "1",IDC_STATIC,20,79,8,8
|
||||
CTEXT "2",IDC_STATIC,44,79,8,8
|
||||
CTEXT "5",IDC_STATIC,70,79,8,8
|
||||
CTEXT "10",IDC_STATIC,95,79,8,8
|
||||
CTEXT "15",IDC_STATIC,121,79,8,8
|
||||
CTEXT "30",IDC_STATIC,146,79,8,8
|
||||
CTEXT "45",IDC_STATIC,171,79,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,79,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,79,22,8
|
||||
LTEXT "Run Application screensavers for:",IDC_STATIC,7,92,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_RUNTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,106,220,15
|
||||
CTEXT "1",IDC_STATIC,20,122,8,8
|
||||
CTEXT "2",IDC_STATIC,44,122,8,8
|
||||
CTEXT "5",IDC_STATIC,70,122,8,8
|
||||
CTEXT "10",IDC_STATIC,95,122,8,8
|
||||
CTEXT "15",IDC_STATIC,121,122,8,8
|
||||
CTEXT "30",IDC_STATIC,146,122,8,8
|
||||
CTEXT "45",IDC_STATIC,171,122,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,122,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,122,22,8
|
||||
LTEXT "Switch among Application screensavers every:",IDC_STATIC,7,135,237,14,SS_CENTERIMAGE
|
||||
CONTROL "",IDC_SLIDER_SWITCHTIME,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,15,148,220,15
|
||||
CTEXT "1",IDC_STATIC,20,164,8,8
|
||||
CTEXT "2",IDC_STATIC,44,164,8,8
|
||||
CTEXT "5",IDC_STATIC,70,164,8,8
|
||||
CTEXT "10",IDC_STATIC,95,164,8,8
|
||||
CTEXT "15",IDC_STATIC,121,164,8,8
|
||||
CTEXT "30",IDC_STATIC,146,164,8,8
|
||||
CTEXT "45",IDC_STATIC,171,164,8,8
|
||||
CTEXT "1hr",IDC_STATIC,194,164,10,8
|
||||
CTEXT "Never",IDC_STATIC,213,164,22,8
|
||||
END
|
||||
|
||||
#endif
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
|
|
|
|||
|
|
@ -3,24 +3,6 @@
|
|||
// Used by boinc_ss.rc
|
||||
//
|
||||
#define IDI_MAIN_ICON 1
|
||||
#define IDS_DESCRIPTION 1
|
||||
#define IDS_SHORTCUTNAME 2
|
||||
#define DLG_CONFIG 104
|
||||
#define IDB_BOINCSPLAT 108
|
||||
#define IDC_BLANK 1000
|
||||
#define IDC_BLANK_TIME 1001
|
||||
#define IDS_ERR_GENERIC 2100
|
||||
#define IDS_ERR_BOINCNOTDETECTED 2101
|
||||
#define IDS_ERR_BOINCSUSPENDED 2103
|
||||
#define IDS_ERR_BOINCNOAPPSEXECUTING 2104
|
||||
#define IDS_ERR_BOINCNOAPPSEXECUTINGNOPROJECTSDETECTED 2105
|
||||
#define IDS_ERR_BOINCNOGRAPHICSAPPSEXECUTING 2106
|
||||
#define IDS_ERR_BOINCSCREENSAVERLOADING 2107
|
||||
#define IDS_ERR_BOINCAPPFOUNDGRAPHICSLOADING 2108
|
||||
#define IDS_ERR_BOINCSHUTDOWNEVENT 2109
|
||||
#define IDS_ERR_OUTOFMEMORY 2110
|
||||
#define IDS_ERR_NOPREVIEW 2112
|
||||
#define IDS_ERR_DAEMONALLOWSNOGRAPHICS 2113
|
||||
|
||||
// Next default values for new objects
|
||||
//
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// Microsoft Visual C++ generated resource script.
|
||||
//
|
||||
#include "boinc_ss.h"
|
||||
#include "boinc_ss_opengl.h"
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -65,7 +65,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
|||
|
||||
1 TEXTINCLUDE
|
||||
BEGIN
|
||||
"boinc_ss.h\0"
|
||||
"boinc_ss_opengl.h\0"
|
||||
END
|
||||
|
||||
2 TEXTINCLUDE
|
||||
|
|
@ -119,7 +119,7 @@ BEGIN
|
|||
VALUE "FileDescription", "BOINC Screensaver"
|
||||
VALUE "FileVersion", BOINC_VERSION_STRING "\0"
|
||||
VALUE "InternalName", "boinc_ss"
|
||||
VALUE "LegalCopyright", "© 2003-2008 University of California"
|
||||
VALUE "LegalCopyright", "© 2003-2010 University of California"
|
||||
VALUE "OriginalFilename", "boinc.scr"
|
||||
VALUE "ProductName", "BOINC client"
|
||||
VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
|
||||
|
|
@ -154,7 +154,7 @@ BEGIN
|
|||
VALUE "FileDescription", "BOINC Screensaver"
|
||||
VALUE "FileVersion", BOINC_VERSION_STRING "\0"
|
||||
VALUE "InternalName", "boinc_ss"
|
||||
VALUE "LegalCopyright", "© 2003-2008 University of California"
|
||||
VALUE "LegalCopyright", "© 2003-2010 University of California"
|
||||
VALUE "OriginalFilename", "boinc.scr"
|
||||
VALUE "ProductName", "BOINC client"
|
||||
VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
|
||||
|
|
@ -189,7 +189,7 @@ BEGIN
|
|||
VALUE "FileDescription", "BOINC Screensaver"
|
||||
VALUE "FileVersion", BOINC_VERSION_STRING "\0"
|
||||
VALUE "InternalName", "boinc_ss"
|
||||
VALUE "LegalCopyright", "© 2003-2008 University of California"
|
||||
VALUE "LegalCopyright", "© 2003-2010 University of California"
|
||||
VALUE "OriginalFilename", "boinc.scr"
|
||||
VALUE "ProductName", "BOINC client"
|
||||
VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
|
||||
|
|
@ -203,130 +203,6 @@ END
|
|||
|
||||
#endif
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Dialog
|
||||
//
|
||||
|
||||
DLG_CONFIG DIALOGEX 50, 50, 186, 76
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION |
|
||||
WS_SYSMENU
|
||||
CAPTION "Config dialog"
|
||||
FONT 8, "MS Sans Serif", 0, 0, 0x0
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,7,55,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,129,55,50,14
|
||||
CONTROL "Go to blank screen",IDC_BLANK,"Button",BS_AUTOCHECKBOX |
|
||||
WS_TABSTOP,7,7,76,10
|
||||
LTEXT "Minutes until blank:",IDC_STATIC,7,31,62,8
|
||||
EDITTEXT IDC_BLANK_TIME,77,28,40,14,ES_AUTOHSCROLL
|
||||
END
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Bitmap
|
||||
//
|
||||
|
||||
#if defined(_GRIDREPUBLIC)
|
||||
|
||||
IDB_BOINCSPLAT BITMAP "res\\gridrepublic.bmp"
|
||||
|
||||
#elif defined(_WCG)
|
||||
|
||||
IDB_BOINCSPLAT BITMAP "res\\wcg.bmp"
|
||||
|
||||
#else
|
||||
|
||||
IDB_BOINCSPLAT BITMAP "res\\boinc.bmp"
|
||||
|
||||
#endif
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// String Table
|
||||
//
|
||||
|
||||
#if defined(_GRIDREPUBLIC)
|
||||
|
||||
STRINGTABLE
|
||||
BEGIN
|
||||
IDS_ERR_GENERIC "There was an unspecified problem\nwith the GridRepublic screensaver."
|
||||
IDS_ERR_BOINCNOTDETECTED
|
||||
"GridRepublic is not running.\n\nPlease launch GridRepublic to display graphics."
|
||||
IDS_ERR_BOINCSUSPENDED "GridRepublic is currently suspended."
|
||||
IDS_ERR_BOINCNOAPPSEXECUTING
|
||||
"GridRepublic is currently idle."
|
||||
IDS_ERR_BOINCNOAPPSEXECUTINGNOPROJECTSDETECTED
|
||||
"GridRepublic is not attached to any projects.\nYou can attach to projects using\nthe GridRepublic website."
|
||||
IDS_ERR_BOINCNOGRAPHICSAPPSEXECUTING
|
||||
"GridRepublic system status:\n\n"
|
||||
IDS_ERR_BOINCSCREENSAVERLOADING
|
||||
"GridRepublic screensaver loading"
|
||||
IDS_ERR_BOINCAPPFOUNDGRAPHICSLOADING
|
||||
"Application found, graphics loading...\n\nPlease wait..."
|
||||
IDS_ERR_BOINCSHUTDOWNEVENT
|
||||
"Gridrepublic screensaver shutting down."
|
||||
IDS_ERR_DAEMONALLOWSNOGRAPHICS
|
||||
"Gridrepublic screensaver cannot display graphics \nfrom older applications when configured to \nrun as a Windows service."
|
||||
END
|
||||
|
||||
#elif defined(_WCG)
|
||||
|
||||
STRINGTABLE
|
||||
BEGIN
|
||||
IDS_ERR_GENERIC "There was an unspecified problem\nwith the World Community Grid screensaver."
|
||||
IDS_ERR_BOINCNOTDETECTED
|
||||
"World Community Grid is not running.\n\nPlease launch World Community Grid\nto display graphics."
|
||||
IDS_ERR_BOINCSUSPENDED "World Community Grid is currently suspended."
|
||||
IDS_ERR_BOINCNOAPPSEXECUTING
|
||||
"World Community Grid is currently idle."
|
||||
IDS_ERR_BOINCNOAPPSEXECUTINGNOPROJECTSDETECTED
|
||||
"World Community Grid is not attached\nto any projects.\nYou can attach to projects using\nthe Attach to project wizard\nin the tools menu."
|
||||
IDS_ERR_BOINCNOGRAPHICSAPPSEXECUTING
|
||||
"World Community Grid system status:\n\n"
|
||||
IDS_ERR_BOINCSCREENSAVERLOADING
|
||||
"World Community Grid screensaver loading"
|
||||
IDS_ERR_BOINCAPPFOUNDGRAPHICSLOADING
|
||||
"Application found, graphics loading...\n\nPlease wait..."
|
||||
IDS_ERR_BOINCSHUTDOWNEVENT
|
||||
"World Community Grid\nscreensaver shutting down."
|
||||
IDS_ERR_DAEMONALLOWSNOGRAPHICS
|
||||
"World Community Grid screensaver cannot display graphics \nfrom older applications when configured to \nrun as a Windows service."
|
||||
END
|
||||
|
||||
#else
|
||||
|
||||
STRINGTABLE
|
||||
BEGIN
|
||||
IDS_ERR_GENERIC "There was an unspecified problem\nwith the BOINC screensaver."
|
||||
IDS_ERR_BOINCNOTDETECTED
|
||||
"BOINC is not running.\n\nPlease launch BOINC to display graphics."
|
||||
IDS_ERR_BOINCSUSPENDED "BOINC is currently suspended."
|
||||
IDS_ERR_BOINCNOAPPSEXECUTING
|
||||
"BOINC is currently idle."
|
||||
IDS_ERR_BOINCNOAPPSEXECUTINGNOPROJECTSDETECTED
|
||||
"BOINC is not attached to any projects.\nYou can attach to projects using\nthe BOINC Manager."
|
||||
IDS_ERR_BOINCNOGRAPHICSAPPSEXECUTING
|
||||
"BOINC system status:\n\n"
|
||||
IDS_ERR_BOINCSCREENSAVERLOADING
|
||||
"BOINC screensaver loading"
|
||||
IDS_ERR_BOINCAPPFOUNDGRAPHICSLOADING
|
||||
"Application found, graphics loading...\n\nPlease wait..."
|
||||
IDS_ERR_BOINCSHUTDOWNEVENT
|
||||
"BOINC screensaver shutting down."
|
||||
IDS_ERR_DAEMONALLOWSNOGRAPHICS
|
||||
"BOINC screensaver cannot display graphics \nfrom older applications when configured to \nrun as a Windows service."
|
||||
END
|
||||
|
||||
#endif
|
||||
|
||||
STRINGTABLE
|
||||
BEGIN
|
||||
IDS_ERR_OUTOFMEMORY "Not enough memory."
|
||||
IDS_ERR_NOPREVIEW "No preview available"
|
||||
END
|
||||
|
||||
#endif // English (U.S.) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
|
|||
|
|
@ -681,7 +681,7 @@ void *CScreensaver::DataManagementProc()
|
|||
// Is the current graphics app's associated task still running?
|
||||
|
||||
if ((m_hGraphicsApplication) || (graphics_app_result_ptr)) {
|
||||
iResultCount = results.results.size();
|
||||
iResultCount = (int)results.results.size();
|
||||
graphics_app_result_ptr = NULL;
|
||||
|
||||
// Find the current task in the new results vector (if it still exists)
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#define __SCREENSAVER_H__
|
||||
|
||||
// Default values, overriden by screensaver config file ss_config.xml
|
||||
#define GFX_BLANK_PERIOD 0 /* 0 minutes */
|
||||
#define GFX_DEFAULT_PERIOD 120 /* if default OpenGL screensaver exists, display it for 2 minutes */
|
||||
#define GFX_SCIENCE_PERIOD 600 /* Display various science graphics apps for 10 minutes */
|
||||
#define GFX_CHANGE_PERIOD 300 /* if > 1 CPUs, change screensaver every 5 minutes */
|
||||
|
|
@ -51,6 +52,7 @@ enum SS_PHASE {
|
|||
// The following are still used by the Mac:
|
||||
#define SCRAPPERR_BOINCSCREENSAVERLOADING 0x82000008
|
||||
#define SCRAPPERR_SCREENSAVERBLANKED 0x82000012
|
||||
|
||||
// The following are new codes used by the Mac:
|
||||
#define SCRAPPERR_CANTLAUNCHDEFAULTGFXAPP 0x82000014
|
||||
#define SCRAPPERR_DEFAULTGFXAPPCANTCONNECT 0x82000015
|
||||
|
|
|
|||
|
|
@ -21,14 +21,6 @@
|
|||
//
|
||||
|
||||
#include "boinc_win.h"
|
||||
|
||||
#include <windowsx.h>
|
||||
#include <mmsystem.h>
|
||||
#include <regstr.h>
|
||||
#include <strsafe.h>
|
||||
#include <mmsystem.h>
|
||||
#define COMPILE_MULTIMON_STUBS
|
||||
|
||||
#include "boinc_ss.h"
|
||||
#include "diagnostics.h"
|
||||
#include "common_defs.h"
|
||||
|
|
@ -37,12 +29,11 @@
|
|||
#include "screensaver.h"
|
||||
#include "screensaver_win.h"
|
||||
|
||||
#ifdef _DEBUG
|
||||
#ifndef UNUSED
|
||||
#define UNUSED(x)
|
||||
#else
|
||||
#define UNUSED(x) x
|
||||
#endif
|
||||
|
||||
|
||||
static CScreensaver* gspScreensaver = NULL;
|
||||
|
||||
const UINT WM_SETTIMER = RegisterWindowMessage(TEXT("BOINCSetTimer"));
|
||||
|
|
@ -50,6 +41,17 @@ const UINT WM_INTERRUPTSAVER = RegisterWindowMessage(TEXT("
|
|||
const UINT WM_BOINCSFW = RegisterWindowMessage(TEXT("BOINCSetForegroundWindow"));
|
||||
|
||||
|
||||
#define REG_ENABLE_BLANK _T("Blank")
|
||||
#define REG_BLANK_TIME _T("Blank Time")
|
||||
#define REG_DEFAULT_TIME _T("Default Time")
|
||||
#define REG_RUN_TIME _T("Run Time")
|
||||
#define REG_SWITCH_TIME _T("Switch Time")
|
||||
|
||||
|
||||
#define MAXSLIDERTIC 8 // Zero indexed arrays
|
||||
const DWORD dwTableSliderPositionToTime[] = {1, 2, 5, 10, 15, 30, 45, 60, 0};
|
||||
|
||||
|
||||
INT WINAPI WinMain(
|
||||
HINSTANCE hInstance, HINSTANCE UNUSED(hPrevInstance), LPSTR UNUSED(lpCmdLine), int UNUSED(nCmdShow)
|
||||
) {
|
||||
|
|
@ -57,8 +59,6 @@ INT WINAPI WinMain(
|
|||
CScreensaver BOINCSS;
|
||||
int retval;
|
||||
WSADATA wsdata;
|
||||
DWORD dwVal;
|
||||
DWORD dwSize = sizeof(dwVal);
|
||||
|
||||
|
||||
#ifdef _DEBUG
|
||||
|
|
@ -83,6 +83,12 @@ INT WINAPI WinMain(
|
|||
// Initialize the CRT random number generator.
|
||||
srand((unsigned int)time(0));
|
||||
|
||||
// Initialize Windows Common Controls
|
||||
INITCOMMONCONTROLSEX InitCtrls;
|
||||
InitCtrls.dwSize = sizeof(InitCtrls);
|
||||
InitCtrls.dwICC = ICC_WIN95_CLASSES;
|
||||
InitCommonControlsEx(&InitCtrls);
|
||||
|
||||
// Initialize the Windows sockets interface.
|
||||
retval = WSAStartup(MAKEWORD(1, 1), &wsdata);
|
||||
if (retval) {
|
||||
|
|
@ -180,40 +186,65 @@ HRESULT CScreensaver::Create(HINSTANCE hInstance) {
|
|||
|
||||
// Retrieve the locations of the install directory and data directory
|
||||
bReturnValue = UtilGetRegDirectoryStr(_T("DATADIR"), m_strBOINCDataDirectory);
|
||||
BOINCTRACE("CScreensaver::Create - BOINC Data Directory '%s'\n", m_strBOINCDataDirectory.c_str());
|
||||
bReturnValue = UtilGetRegDirectoryStr(_T("INSTALLDIR"), m_strBOINCInstallDirectory);
|
||||
BOINCTRACE("CScreensaver::Create - BOINC Install Directory '%s'\n", m_strBOINCInstallDirectory.c_str());
|
||||
|
||||
|
||||
// Retrieve the blank screen flag so we can determine if we are
|
||||
// suppose to actually blank the screen at some point.
|
||||
bReturnValue = UtilGetRegKey(REG_BLANK_NAME, m_dwBlankScreen);
|
||||
BOINCTRACE("CScreensaver::Create - Get Reg Key REG_BLANK_NAME return value '%d'\n", bReturnValue);
|
||||
if (!bReturnValue) m_dwBlankScreen = 0;
|
||||
// Get the last set of saved values, if not set
|
||||
// use the configuration file, if not set, use defaults.
|
||||
// Normalize on Seconds...
|
||||
if (!UtilGetRegKey(REG_ENABLE_BLANK, m_dwBlankScreen)) {
|
||||
m_dwBlankScreen = 0;
|
||||
}
|
||||
if (!UtilGetRegKey(REG_BLANK_TIME, m_dwBlankTime)) {
|
||||
m_dwBlankTime = GFX_BLANK_PERIOD;
|
||||
} else {
|
||||
// Registry stores minutes
|
||||
m_dwBlankTime *= 60;
|
||||
}
|
||||
if (!UtilGetRegKey(REG_DEFAULT_TIME, m_dwDefaultTime)) {
|
||||
m_dwDefaultTime = (DWORD)periods.GFXDefaultPeriod;
|
||||
} else {
|
||||
// Registry stores minutes
|
||||
m_dwDefaultTime *= 60;
|
||||
}
|
||||
if (!UtilGetRegKey(REG_RUN_TIME, m_dwRunTime)) {
|
||||
m_dwRunTime = (DWORD)periods.GFXSciencePeriod;
|
||||
} else {
|
||||
// Registry stores minutes
|
||||
m_dwRunTime *= 60;
|
||||
}
|
||||
if (!UtilGetRegKey(REG_SWITCH_TIME, m_dwSwitchTime)) {
|
||||
m_dwSwitchTime = (DWORD)periods.GFXChangePeriod;
|
||||
} else {
|
||||
// Registry stores minutes
|
||||
m_dwSwitchTime *= 60;
|
||||
}
|
||||
|
||||
// Retrieve the blank screen timeout
|
||||
// make sure you check return value of registry queries
|
||||
// in case the item in question doesn't happen to exist.
|
||||
bReturnValue = UtilGetRegKey(REG_BLANK_TIME, m_dwBlankTime);
|
||||
BOINCTRACE("CScreensaver::Create - Get Reg Key REG_BLANK_TIME return value '%d'\n", bReturnValue);
|
||||
if (!bReturnValue) m_dwBlankTime = 5;
|
||||
// Set the legacy value if needed
|
||||
if (!m_dwBlankScreen) {
|
||||
m_dwBlankTime = 0;
|
||||
}
|
||||
|
||||
//TODO: Update m_fGFXDefaultPeriod, m_fGFXSciencePeriod, m_fGFXChangePeriod from registry if present
|
||||
// Otherwise use values in periods struct returned from GetDefaultDisplayPeriods() call above.
|
||||
// Convert values as stored into floating point values to be used
|
||||
// at runtime
|
||||
m_fGFXDefaultPeriod = (double)m_dwDefaultTime;
|
||||
m_fGFXSciencePeriod = (double)m_dwRunTime;
|
||||
m_fGFXChangePeriod = (double)m_dwSwitchTime;
|
||||
|
||||
// Save the value back to the registry in case this is the first
|
||||
// execution and so we need the default value later.
|
||||
bReturnValue = UtilSetRegKey(REG_BLANK_NAME, m_dwBlankScreen);
|
||||
BOINCTRACE("CScreensaver::Create - Set Reg Key REG_BLANK_NAME return value '%d'\n", bReturnValue);
|
||||
|
||||
bReturnValue = UtilSetRegKey(REG_BLANK_TIME, m_dwBlankTime);
|
||||
BOINCTRACE("CScreensaver::Create - Set Reg Key REG_BLANK_TIME return value '%d'\n", bReturnValue);
|
||||
// Store in minutes
|
||||
UtilSetRegKey(REG_ENABLE_BLANK, m_dwBlankScreen);
|
||||
UtilSetRegKey(REG_BLANK_TIME, m_dwBlankTime ? m_dwBlankTime / 60 : 0);
|
||||
UtilSetRegKey(REG_DEFAULT_TIME, m_dwDefaultTime ? m_dwDefaultTime / 60 : 0);
|
||||
UtilSetRegKey(REG_RUN_TIME, m_dwRunTime ? m_dwRunTime / 60 : 0);
|
||||
UtilSetRegKey(REG_SWITCH_TIME, m_dwSwitchTime ? m_dwSwitchTime / 60 : 0);
|
||||
|
||||
|
||||
// Calculate the estimated blank time by adding the current time
|
||||
// and and the user specified time which is in minutes
|
||||
// and and the user specified time.
|
||||
if (m_dwBlankTime > 0) {
|
||||
m_dwBlankTime = (DWORD)time(0) + (m_dwBlankTime * 60);
|
||||
m_dwBlankTime = (DWORD)time(0) + m_dwBlankTime;
|
||||
}
|
||||
|
||||
// Create the infrastructure mutexes so we can properly aquire them to report
|
||||
|
|
@ -482,8 +513,16 @@ VOID CScreensaver::EnumMonitors(VOID) {
|
|||
|
||||
pMonitorInfoNew = &m_Monitors[m_dwNumMonitors];
|
||||
ZeroMemory(pMonitorInfoNew, sizeof(INTERNALMONITORINFO));
|
||||
StringCchCopy(pMonitorInfoNew->strDeviceName, 128, dispdev.DeviceString);
|
||||
StringCchCopy(pMonitorInfoNew->strMonitorName, 128, dispdev2.DeviceString);
|
||||
strncpy(
|
||||
pMonitorInfoNew->strDeviceName,
|
||||
dispdev.DeviceString,
|
||||
sizeof(pMonitorInfoNew->strDeviceName) * sizeof(TCHAR)
|
||||
);
|
||||
strncpy(
|
||||
pMonitorInfoNew->strMonitorName,
|
||||
dispdev2.DeviceString,
|
||||
sizeof(pMonitorInfoNew->strMonitorName) * sizeof(TCHAR)
|
||||
);
|
||||
|
||||
if (dispdev.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) {
|
||||
EnumDisplaySettings(dispdev.DeviceName, ENUM_CURRENT_SETTINGS, &devmode);
|
||||
|
|
@ -661,7 +700,7 @@ BOOL CScreensaver::GetError(
|
|||
hrError = m_hrError;
|
||||
|
||||
if (NULL != pszError) {
|
||||
StringCbCopyN(pszError, iErrorSize, m_szError, sizeof(m_szError) * sizeof(TCHAR));
|
||||
strncpy(pszError, m_szError, iErrorSize);
|
||||
}
|
||||
|
||||
bRetVal = TRUE;
|
||||
|
|
@ -744,19 +783,13 @@ BOOL CScreensaver::GetTextForError(
|
|||
) {
|
||||
const DWORD dwErrorMap[][2] = {
|
||||
// HRESULT, stringID
|
||||
E_FAIL, IDS_ERR_GENERIC,
|
||||
E_OUTOFMEMORY, IDS_ERR_OUTOFMEMORY,
|
||||
(const DWORD)E_FAIL, IDS_ERR_GENERIC,
|
||||
(const DWORD)E_OUTOFMEMORY, IDS_ERR_OUTOFMEMORY,
|
||||
SCRAPPERR_NOPREVIEW, IDS_ERR_NOPREVIEW,
|
||||
SCRAPPERR_BOINCSCREENSAVERLOADING, IDS_ERR_BOINCSCREENSAVERLOADING,
|
||||
SCRAPPERR_BOINCSHUTDOWNEVENT, IDS_ERR_BOINCSHUTDOWNEVENT,
|
||||
SCRAPPERR_BOINCAPPFOUNDGRAPHICSLOADING, IDS_ERR_BOINCAPPFOUNDGRAPHICSLOADING,
|
||||
|
||||
SCRAPPERR_BOINCNOTDETECTED, IDS_ERR_BOINCNOTDETECTED,
|
||||
SCRAPPERR_BOINCSUSPENDED, IDS_ERR_BOINCSUSPENDED,
|
||||
SCRAPPERR_BOINCNOAPPSEXECUTING, IDS_ERR_BOINCNOAPPSEXECUTING,
|
||||
SCRAPPERR_BOINCNOPROJECTSDETECTED, IDS_ERR_BOINCNOAPPSEXECUTINGNOPROJECTSDETECTED,
|
||||
SCRAPPERR_BOINCNOGRAPHICSAPPSEXECUTING, IDS_ERR_BOINCNOGRAPHICSAPPSEXECUTING,
|
||||
SCRAPPERR_DAEMONALLOWSNOGRAPHICS, IDS_ERR_DAEMONALLOWSNOGRAPHICS
|
||||
};
|
||||
const DWORD dwErrorMapSize = sizeof(dwErrorMap) / sizeof(DWORD[2]);
|
||||
|
||||
|
|
@ -1256,8 +1289,8 @@ LRESULT CScreensaver::SaverProc(
|
|||
if (m_SaverMode != sm_test) {
|
||||
static INT xPrev = -1;
|
||||
static INT yPrev = -1;
|
||||
INT xCur = GET_X_LPARAM(lParam);
|
||||
INT yCur = GET_Y_LPARAM(lParam);
|
||||
INT xCur = LOWORD(lParam);
|
||||
INT yCur = HIWORD(lParam);
|
||||
if (xCur != xPrev || yCur != yPrev) {
|
||||
xPrev = xCur;
|
||||
yPrev = yCur;
|
||||
|
|
@ -1340,43 +1373,135 @@ LRESULT CScreensaver::SaverProc(
|
|||
|
||||
|
||||
|
||||
INT_PTR CScreensaver::ConfigureDialogProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM UNUSED(lParam)) {
|
||||
DWORD screen_blank=0, blank_time=0;
|
||||
char buf[256];
|
||||
int retval;
|
||||
DWORD CScreensaver::ConvertSliderPositionToTime( DWORD dwPosition ) {
|
||||
return dwTableSliderPositionToTime[dwPosition];
|
||||
}
|
||||
|
||||
switch (msg) {
|
||||
case WM_INITDIALOG:
|
||||
// make sure you check return value of registry queries
|
||||
// in case the item in question doesn't happen to exist.
|
||||
retval = UtilGetRegKey(REG_BLANK_NAME, screen_blank);
|
||||
if (retval < 0) {
|
||||
screen_blank=0;
|
||||
|
||||
|
||||
|
||||
DWORD CScreensaver::ConvertTimeToSliderPosition( DWORD dwMinutes ) {
|
||||
DWORD dwPosition = 0;
|
||||
if (0 >= dwMinutes) {
|
||||
dwPosition = MAXSLIDERTIC; // Never
|
||||
} else {
|
||||
for (unsigned int i = 0; i <= MAXSLIDERTIC - 1; i++) {
|
||||
if (dwTableSliderPositionToTime[i] <= dwMinutes) {
|
||||
dwPosition = i;
|
||||
}
|
||||
CheckDlgButton(hwnd, IDC_BLANK, screen_blank);
|
||||
}
|
||||
}
|
||||
return dwPosition;
|
||||
}
|
||||
|
||||
retval = UtilGetRegKey(REG_BLANK_TIME, blank_time);
|
||||
if (retval < 0) { blank_time=0; }
|
||||
_ltot(blank_time, buf, 10);
|
||||
SetDlgItemText(hwnd, IDC_BLANK_TIME, buf);
|
||||
|
||||
return TRUE;
|
||||
case WM_COMMAND:
|
||||
int id=LOWORD(wParam);
|
||||
if (id==IDOK) {
|
||||
|
||||
screen_blank = (IsDlgButtonChecked(hwnd, IDC_BLANK) == BST_CHECKED);
|
||||
UtilSetRegKey(REG_BLANK_NAME, screen_blank);
|
||||
|
||||
GetDlgItemText(hwnd, IDC_BLANK_TIME, buf, 256);
|
||||
blank_time = atoi(buf);
|
||||
UtilSetRegKey(REG_BLANK_TIME, blank_time);
|
||||
VOID CScreensaver::InitializeDefaultSlider( HWND hwndDlg, UINT uControl ) {
|
||||
HWND hwndSlider = GetDlgItem(hwndDlg, uControl);
|
||||
if (hwndSlider) {
|
||||
SendMessage(hwndSlider, TBM_SETRANGE, TRUE, MAKELONG(0, MAXSLIDERTIC));
|
||||
SendMessage(hwndSlider, TBM_SETLINESIZE, 0, 1);
|
||||
SendMessage(hwndSlider, TBM_SETPAGESIZE, 0, 1);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if (id == IDOK || id == IDCANCEL) {
|
||||
EndDialog(hwnd, id);
|
||||
|
||||
|
||||
|
||||
DWORD CScreensaver::GetSliderPosition( HWND hwndDlg, UINT uControl ) {
|
||||
HWND hwndSlider = GetDlgItem(hwndDlg, uControl);
|
||||
if (hwndSlider) {
|
||||
return SendMessage(hwndSlider, TBM_GETPOS, 0, 0);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
VOID CScreensaver::SetSliderPosition( HWND hwndDlg, UINT uControl, DWORD dwPosition ) {
|
||||
HWND hwndSlider = GetDlgItem(hwndDlg, uControl);
|
||||
if (hwndSlider) {
|
||||
SendMessage(hwndSlider, TBM_SETPOS, TRUE, dwPosition);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
INT_PTR CScreensaver::ConfigureDialogProc(
|
||||
HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM UNUSED(lParam)
|
||||
){
|
||||
DWORD dwEnableBlankTime = 0;
|
||||
DWORD dwBlankTime = 0;
|
||||
DWORD dwDefaultTime = 0;
|
||||
DWORD dwRunTime = 0;
|
||||
DWORD dwSwitchTime = 0;
|
||||
|
||||
switch (uMsg) {
|
||||
case WM_INITDIALOG:
|
||||
// Initialize slider controls
|
||||
InitializeDefaultSlider(hWnd, IDC_SLIDER_BLANKTIME);
|
||||
InitializeDefaultSlider(hWnd, IDC_SLIDER_DEFAULTTIME);
|
||||
InitializeDefaultSlider(hWnd, IDC_SLIDER_RUNTIME);
|
||||
InitializeDefaultSlider(hWnd, IDC_SLIDER_SWITCHTIME);
|
||||
|
||||
// Get the last set of saved values, if nothing is set
|
||||
// use defaults.
|
||||
if (!UtilGetRegKey(REG_ENABLE_BLANK, dwEnableBlankTime)) {
|
||||
dwEnableBlankTime = 0;
|
||||
}
|
||||
if (!UtilGetRegKey(REG_BLANK_TIME, dwBlankTime)) {
|
||||
dwBlankTime = GFX_BLANK_PERIOD ? GFX_BLANK_PERIOD / 60 : 0;
|
||||
}
|
||||
if (!UtilGetRegKey(REG_DEFAULT_TIME, dwDefaultTime)) {
|
||||
dwDefaultTime = GFX_DEFAULT_PERIOD ? GFX_DEFAULT_PERIOD / 60 : 0;
|
||||
}
|
||||
if (!UtilGetRegKey(REG_RUN_TIME, dwRunTime)) {
|
||||
dwRunTime = GFX_SCIENCE_PERIOD ? GFX_SCIENCE_PERIOD / 60 : 0;
|
||||
}
|
||||
if (!UtilGetRegKey(REG_SWITCH_TIME, dwSwitchTime)) {
|
||||
dwSwitchTime = GFX_CHANGE_PERIOD ? GFX_CHANGE_PERIOD / 60 : 0;
|
||||
}
|
||||
|
||||
// Set the legacy value if needed
|
||||
if (!dwEnableBlankTime) {
|
||||
dwBlankTime = 0;
|
||||
}
|
||||
|
||||
// Update Slider Controls with previously saved values
|
||||
SetSliderPosition(hWnd, IDC_SLIDER_BLANKTIME, ConvertTimeToSliderPosition(dwBlankTime));
|
||||
SetSliderPosition(hWnd, IDC_SLIDER_DEFAULTTIME, ConvertTimeToSliderPosition(dwDefaultTime));
|
||||
SetSliderPosition(hWnd, IDC_SLIDER_RUNTIME, ConvertTimeToSliderPosition(dwRunTime));
|
||||
SetSliderPosition(hWnd, IDC_SLIDER_SWITCHTIME, ConvertTimeToSliderPosition(dwSwitchTime));
|
||||
|
||||
return TRUE;
|
||||
case WM_COMMAND:
|
||||
switch(LOWORD(wParam))
|
||||
{
|
||||
case IDOK:
|
||||
dwBlankTime = ConvertSliderPositionToTime(GetSliderPosition(hWnd, IDC_SLIDER_BLANKTIME));
|
||||
dwDefaultTime = ConvertSliderPositionToTime(GetSliderPosition(hWnd, IDC_SLIDER_DEFAULTTIME));
|
||||
dwRunTime = ConvertSliderPositionToTime(GetSliderPosition(hWnd, IDC_SLIDER_RUNTIME));
|
||||
dwSwitchTime = ConvertSliderPositionToTime(GetSliderPosition(hWnd, IDC_SLIDER_SWITCHTIME));
|
||||
|
||||
// Set the legacy value if needed
|
||||
if (dwBlankTime) {
|
||||
dwEnableBlankTime = 1;
|
||||
}
|
||||
break;
|
||||
|
||||
UtilSetRegKey(REG_ENABLE_BLANK, dwEnableBlankTime);
|
||||
UtilSetRegKey(REG_BLANK_TIME, dwBlankTime);
|
||||
UtilSetRegKey(REG_DEFAULT_TIME, dwDefaultTime);
|
||||
UtilSetRegKey(REG_RUN_TIME, dwRunTime);
|
||||
UtilSetRegKey(REG_SWITCH_TIME, dwSwitchTime);
|
||||
|
||||
// Fall Through
|
||||
case IDCANCEL:
|
||||
EndDialog(hWnd, wParam);
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
|
@ -1589,7 +1714,7 @@ VOID CScreensaver::DoPaint(HWND hwnd, HDC hdc, LPPAINTSTRUCT lpps) {
|
|||
|
||||
static HBRUSH hbrushBlack = (HBRUSH)GetStockObject(BLACK_BRUSH);
|
||||
static HBRUSH hbrushRed = (HBRUSH)CreateSolidBrush(RGB(255,0,0));
|
||||
static HBITMAP hbmp = LoadBitmap(m_hInstance, MAKEINTRESOURCE(IDB_BOINCSPLAT));
|
||||
static HBITMAP hbmp = LoadBitmap(m_hInstance, MAKEINTRESOURCE(IDB_BOINC));
|
||||
|
||||
|
||||
// Start off with a black screen and then draw on top of it.
|
||||
|
|
@ -1618,7 +1743,7 @@ VOID CScreensaver::DoPaint(HWND hwnd, HDC hdc, LPPAINTSTRUCT lpps) {
|
|||
// it. the bitmap is centered in the rectangle by adding 2
|
||||
// to the left and top coordinates of the bitmap rectangle,
|
||||
// and subtracting 4 from the right and bottom coordinates.
|
||||
BITMAP bm;
|
||||
BITMAP bm;
|
||||
GetObject(hbmp, sizeof(BITMAP), (LPSTR)&bm);
|
||||
|
||||
long left = rc.left + (pMonitorInfo->widthError - 4 - bm.bmWidth)/2;
|
||||
|
|
@ -1630,13 +1755,25 @@ VOID CScreensaver::DoPaint(HWND hwnd, HDC hdc, LPPAINTSTRUCT lpps) {
|
|||
SetTextColor(hdc, RGB(255,255,255)); // Red
|
||||
|
||||
// Set font
|
||||
HFONT hf;
|
||||
hf = CreateFont(0, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, "Arial Narrow");
|
||||
HFONT hFont;
|
||||
hFont = CreateFont(
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
FW_DONTCARE,
|
||||
FALSE,
|
||||
FALSE,
|
||||
0,
|
||||
ANSI_CHARSET,
|
||||
OUT_DEFAULT_PRECIS,
|
||||
CLIP_DEFAULT_PRECIS,
|
||||
DEFAULT_QUALITY,
|
||||
DEFAULT_PITCH | FF_SWISS,
|
||||
"Arial Narrow"
|
||||
);
|
||||
|
||||
if(hf)
|
||||
{
|
||||
SelectObject(hdc, hf);
|
||||
}
|
||||
if(hFont) SelectObject(hdc, hFont);
|
||||
|
||||
// Try using the "Arial Narrow" font, if that fails use whatever
|
||||
// the system default font is. Something is better than nothing.
|
||||
|
|
@ -1646,10 +1783,7 @@ VOID CScreensaver::DoPaint(HWND hwnd, HDC hdc, LPPAINTSTRUCT lpps) {
|
|||
rc2.top += bm.bmHeight+20;
|
||||
DrawText(hdc, szError, -1, &rc2, DT_CENTER);
|
||||
|
||||
if(hf)
|
||||
{
|
||||
DeleteObject(hf);
|
||||
}
|
||||
if(hFont) DeleteObject(hFont);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@
|
|||
#define _SCREENSAVER_WIN_H
|
||||
|
||||
|
||||
#include <multimon.h>
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Constants
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
@ -123,8 +121,13 @@ protected:
|
|||
BOOL m_bErrorMode; // Whether to display an error
|
||||
HRESULT m_hrError; // Error code to display
|
||||
TCHAR m_szError[400]; // Error message text
|
||||
|
||||
// Variables for configuration management
|
||||
DWORD m_dwBlankScreen;
|
||||
DWORD m_dwBlankTime;
|
||||
DWORD m_dwDefaultTime;
|
||||
DWORD m_dwRunTime;
|
||||
DWORD m_dwSwitchTime;
|
||||
std::string m_strBOINCInstallDirectory;
|
||||
std::string m_strBOINCDataDirectory;
|
||||
|
||||
|
|
@ -225,6 +228,12 @@ protected:
|
|||
void DrawTransparentBitmap(HDC hdc, HBITMAP hBitmap, LONG xStart, LONG yStart, COLORREF cTransparentColor);
|
||||
|
||||
LRESULT SaverProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
|
||||
|
||||
DWORD ConvertSliderPositionToTime( DWORD dwPosition );
|
||||
DWORD ConvertTimeToSliderPosition( DWORD dwMinutes );
|
||||
VOID InitializeDefaultSlider( HWND hwndDlg, UINT uControl );
|
||||
DWORD GetSliderPosition( HWND hwndDlg, UINT uControl );
|
||||
VOID SetSliderPosition( HWND hwndDlg, UINT uControl, DWORD dwPosition );
|
||||
INT_PTR ConfigureDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
|
||||
|
||||
static LRESULT CALLBACK SaverProcStub( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
|
||||
|
|
|
|||
|
|
@ -182,20 +182,14 @@ struct VERSION_INFO {
|
|||
bool greater_than(VERSION_INFO&);
|
||||
};
|
||||
|
||||
#ifdef _WIN32
|
||||
#define RUN_MUTEX "BoincSingleInstance"
|
||||
#define REG_BLANK_NAME "Blank"
|
||||
#define REG_BLANK_TIME "Blank Time"
|
||||
#define REG_STARTUP_NAME "BOINC"
|
||||
#define CLIENT_AUTH_FILENAME "client_auth.xml"
|
||||
#else
|
||||
#define LOCK_FILE_NAME "lockfile"
|
||||
#endif
|
||||
|
||||
#define GRAPHICS_APP_FILENAME "graphics_app"
|
||||
#define ASSIGNED_WU_STR "asgn"
|
||||
#define RUN_MUTEX "BoincSingleInstance"
|
||||
#define CLIENT_AUTH_FILENAME "client_auth.xml"
|
||||
#define LOCK_FILE_NAME "lockfile"
|
||||
#define GRAPHICS_APP_FILENAME "graphics_app"
|
||||
#define ASSIGNED_WU_STR "asgn"
|
||||
#define GUI_RPC_PASSWD_FILE "gui_rpc_auth.cfg"
|
||||
#define SS_CONFIG_FILE "ss_config.xml"
|
||||
|
||||
#ifdef _WIN32
|
||||
#define DEFAULT_SS_EXECUTABLE "boincscr.exe"
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -593,7 +593,7 @@ char *check_validity(
|
|||
FILE* of = boinc_fopen(origFile, "r");
|
||||
if (!of) return NULL;
|
||||
MD5_Init(&md5CTX);
|
||||
while (0 != (rbytes = fread(rbuf, 1, sizeof(rbuf), of))) {
|
||||
while (0 != (rbytes = (int)fread(rbuf, 1, sizeof(rbuf), of))) {
|
||||
MD5_Update(&md5CTX, rbuf, rbytes);
|
||||
}
|
||||
MD5_Final(md5_md, &md5CTX);
|
||||
|
|
@ -641,7 +641,7 @@ int cert_verify_file(
|
|||
FILE* of = boinc_fopen(origFile, "r");
|
||||
if (!of) return false;
|
||||
MD5_Init(&md5CTX);
|
||||
while (0 != (rbytes = fread(rbuf, 1, sizeof(rbuf), of))) {
|
||||
while (0 != (rbytes = (int)fread(rbuf, 1, sizeof(rbuf), of))) {
|
||||
MD5_Update(&md5CTX, rbuf, rbytes);
|
||||
}
|
||||
MD5_Final(md5_md, &md5CTX);
|
||||
|
|
|
|||
|
|
@ -129,8 +129,6 @@ bool startup_idle_monitor() {
|
|||
0,
|
||||
0
|
||||
);
|
||||
|
||||
_ASSERT( g_pSystemWideIdleData );
|
||||
}
|
||||
|
||||
if( !bExists && g_pSystemWideIdleData )
|
||||
|
|
@ -200,8 +198,6 @@ bool attach_idle_monitor() {
|
|||
0,
|
||||
0
|
||||
);
|
||||
|
||||
_ASSERT( g_pSystemWideIdleData );
|
||||
}
|
||||
|
||||
if( !bExists && g_pSystemWideIdleData )
|
||||
|
|
|
|||
|
|
@ -355,17 +355,19 @@ BOOL AddAceToWindowStation(HWINSTA hwinsta, PSID psid)
|
|||
pace = (ACCESS_ALLOWED_ACE *)HeapAlloc(
|
||||
GetProcessHeap(),
|
||||
HEAP_ZERO_MEMORY,
|
||||
sizeof(ACCESS_ALLOWED_ACE) + GetLengthSid(psid) -
|
||||
sizeof(DWORD));
|
||||
sizeof(ACCESS_ALLOWED_ACE) + GetLengthSid(psid) - sizeof(DWORD)
|
||||
);
|
||||
|
||||
if (pace == NULL)
|
||||
throw;
|
||||
|
||||
pace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE;
|
||||
pace->Header.AceFlags = CONTAINER_INHERIT_ACE |
|
||||
INHERIT_ONLY_ACE | OBJECT_INHERIT_ACE;
|
||||
pace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE) +
|
||||
GetLengthSid(psid) - sizeof(DWORD);
|
||||
INHERIT_ONLY_ACE |
|
||||
OBJECT_INHERIT_ACE;
|
||||
pace->Header.AceSize = (WORD)sizeof(ACCESS_ALLOWED_ACE) +
|
||||
(WORD)GetLengthSid(psid) -
|
||||
(WORD)sizeof(DWORD);
|
||||
pace->Mask = GENERIC_ALL;
|
||||
|
||||
if (!CopySid(GetLengthSid(psid), &pace->SidStart, psid))
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ int main(int argc, char** argv) {
|
|||
fgets(buf, 256, stdin);
|
||||
fputs(buf, stdout);
|
||||
|
||||
int start = time(0);
|
||||
int start = (int)time(0);
|
||||
int nsec = 10;
|
||||
if (argc > 1) nsec = atoi(argv[1]);
|
||||
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmtd.lib libcpmtd.lib wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib userenv.lib"
|
||||
AdditionalDependencies="libcmtd.lib libcpmtd.lib wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib comctl32.lib userenv.lib $(NOINHERIT)"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc.scr"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="true"
|
||||
|
|
@ -195,7 +195,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmtd.lib libcpmtd.lib wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib"
|
||||
AdditionalDependencies="libcmtd.lib libcpmtd.lib wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib comctl32.lib userenv.lib $(NOINHERIT)"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc.scr"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="true"
|
||||
|
|
@ -303,7 +303,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmt.lib libcpmt.lib wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib userenv.lib $(NOINHERIT)"
|
||||
AdditionalDependencies="libcmt.lib libcpmt.lib wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib comctl32.lib userenv.lib $(NOINHERIT)"
|
||||
ShowProgress="0"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc.scr"
|
||||
LinkIncremental="1"
|
||||
|
|
@ -412,439 +412,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmt.lib libcpmt.lib wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib"
|
||||
ShowProgress="0"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc.scr"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreAllDefaultLibraries="true"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc_scr.pdb"
|
||||
SubSystem="2"
|
||||
OptimizeReferences="2"
|
||||
SetChecksum="true"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
EmbedManifest="true"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Samples - Debug|Win32"
|
||||
OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="1"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\Build\Debug/boinc_ss.tlb"
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../,../api/,../lib,../client/"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_WINDOWS;_CONSOLE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
BufferSecurityCheck="true"
|
||||
FloatingPointModel="2"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
|
||||
AssemblerListingLocation=""
|
||||
ObjectFile="$(IntDir)\"
|
||||
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
|
||||
BrowseInformation="0"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4127;4702;4244"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"
|
||||
AdditionalIncludeDirectories="../"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmtd.lib libcpmtd.lib wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib userenv.lib"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc.scr"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreAllDefaultLibraries="true"
|
||||
IgnoreDefaultLibraryNames=""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc_scr.pdb"
|
||||
SubSystem="2"
|
||||
StackReserveSize="0"
|
||||
StackCommitSize="0"
|
||||
OptimizeReferences="0"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
EmbedManifest="true"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Samples - Debug|x64"
|
||||
OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="1"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="3"
|
||||
TypeLibraryName=".\Build\Debug/boinc_ss.tlb"
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../,../api/,../lib,../client/"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_WINDOWS;_CONSOLE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
BufferSecurityCheck="true"
|
||||
FloatingPointModel="2"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
|
||||
AssemblerListingLocation=""
|
||||
ObjectFile="$(IntDir)\"
|
||||
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
|
||||
BrowseInformation="0"
|
||||
WarningLevel="4"
|
||||
SuppressStartupBanner="true"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4127;4702;4244"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"
|
||||
AdditionalIncludeDirectories="../"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmtd.lib libcpmtd.lib wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc.scr"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreAllDefaultLibraries="true"
|
||||
IgnoreDefaultLibraryNames=""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc_scr.pdb"
|
||||
SubSystem="2"
|
||||
StackReserveSize="0"
|
||||
StackCommitSize="0"
|
||||
OptimizeReferences="0"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
EmbedManifest="true"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Samples - Release|Win32"
|
||||
OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="1"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\Build\Release/boinc_ss.tlb"
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="3"
|
||||
AdditionalIncludeDirectories="../api/,../lib/,../client,.."
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_WINDOWS;_CONSOLE"
|
||||
StringPooling="false"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="false"
|
||||
FloatingPointModel="2"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
|
||||
AssemblerListingLocation=""
|
||||
ObjectFile="$(IntDir)\"
|
||||
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
|
||||
BrowseInformation="0"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4127;4702;4244"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"
|
||||
AdditionalIncludeDirectories=".."
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmt.lib libcpmt.lib wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib userenv.lib"
|
||||
ShowProgress="0"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc.scr"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreAllDefaultLibraries="true"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc_scr.pdb"
|
||||
SubSystem="2"
|
||||
OptimizeReferences="2"
|
||||
SetChecksum="true"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
EmbedManifest="true"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Samples - Release|x64"
|
||||
OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="1"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="3"
|
||||
TypeLibraryName=".\Build\Release/boinc_ss.tlb"
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="3"
|
||||
AdditionalIncludeDirectories="../api/,../lib/,../client,.."
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_WINDOWS;_CONSOLE"
|
||||
StringPooling="false"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="false"
|
||||
FloatingPointModel="2"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
|
||||
AssemblerListingLocation=""
|
||||
ObjectFile="$(IntDir)\"
|
||||
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
|
||||
BrowseInformation="0"
|
||||
WarningLevel="4"
|
||||
SuppressStartupBanner="true"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4127;4702;4244"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"
|
||||
AdditionalIncludeDirectories=".."
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmt.lib libcpmt.lib wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib"
|
||||
AdditionalDependencies="libcmt.lib libcpmt.lib wsock32.lib wininet.lib winmm.lib kernel32.lib user32.lib gdi32.lib advapi32.lib comctl32.lib userenv.lib $(NOINHERIT)"
|
||||
ShowProgress="0"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\boinc.scr"
|
||||
LinkIncremental="1"
|
||||
|
|
@ -1152,6 +720,10 @@
|
|||
RelativePath="..\lib\stackwalker_win.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\stdafx.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\lib\util.h"
|
||||
>
|
||||
|
|
@ -1196,5 +768,9 @@
|
|||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
<Global
|
||||
Name="RESOURCE_FILE"
|
||||
Value="\Src\BOINCSVN\trunk\boinc\clientscr\boinc_ss.rc"
|
||||
/>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
InlineFunctionExpansion="1"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE;APP_GRAPHICS"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
StringPooling="false"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="true"
|
||||
|
|
@ -153,7 +153,7 @@
|
|||
InlineFunctionExpansion="1"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
StringPooling="false"
|
||||
ExceptionHandling="1"
|
||||
RuntimeLibrary="0"
|
||||
|
|
@ -252,7 +252,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
|
|
@ -349,7 +349,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
|
|
@ -411,400 +411,6 @@
|
|||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Samples - Debug|Win32"
|
||||
OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=""
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
|
||||
BrowseInformation="0"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="4"
|
||||
CompileAs="2"
|
||||
ForcedIncludeFiles=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib ole32.lib delayimp.lib"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\multi_thread_6.1_windows_intelx86.exe"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreAllDefaultLibraries="true"
|
||||
DelayLoadDLLs=""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\multi_thread_6.1_windows_intelx86.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Samples - Debug|x64"
|
||||
OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="3"
|
||||
TypeLibraryName=""
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
|
||||
BrowseInformation="0"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
ForcedIncludeFiles=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib delayimp.lib"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\multi_thread_6.1_windows_x86_64.exe"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreAllDefaultLibraries="true"
|
||||
DelayLoadDLLs=""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\multi_thread_6.1_windows_x86_64.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Samples - Release|Win32"
|
||||
OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=""
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE;APP_GRAPHICS"
|
||||
StringPooling="false"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="true"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
|
||||
BrowseInformation="0"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib libcmt.lib libcpmt.lib"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\multi_thread_6.1_windows_intelx86.exe"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreAllDefaultLibraries="true"
|
||||
DelayLoadDLLs=""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\multi_thread_6.1_windows_intelx86.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Samples - Release|x64"
|
||||
OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="3"
|
||||
TypeLibraryName=""
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE"
|
||||
StringPooling="false"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="true"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
|
||||
BrowseInformation="0"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="opengl32.lib glu32.lib odbc32.lib odbccp32.lib libcmt.lib libcpmt.lib"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\multi_thread_6.1_windows_x86_64.exe"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreAllDefaultLibraries="true"
|
||||
DelayLoadDLLs=""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\multi_thread_6.1_windows_x86_64.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
InlineFunctionExpansion="1"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
StringPooling="false"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="true"
|
||||
|
|
@ -153,7 +153,7 @@
|
|||
InlineFunctionExpansion="1"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
StringPooling="false"
|
||||
ExceptionHandling="1"
|
||||
RuntimeLibrary="0"
|
||||
|
|
@ -252,7 +252,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
|
|
@ -349,7 +349,7 @@
|
|||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
|
|
@ -411,400 +411,6 @@
|
|||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Samples - Debug|Win32"
|
||||
OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=""
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
|
||||
BrowseInformation="0"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="4"
|
||||
CompileAs="2"
|
||||
ForcedIncludeFiles=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\sleeper_6.1_windows_intelx86.exe"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreAllDefaultLibraries="true"
|
||||
DelayLoadDLLs=""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\sleeper_6.1_windows_intelx86.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Samples - Debug|x64"
|
||||
OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="3"
|
||||
TypeLibraryName=""
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
|
||||
BrowseInformation="0"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
ForcedIncludeFiles=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\sleeper_6.1_windows_x86_64.exe"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreAllDefaultLibraries="true"
|
||||
DelayLoadDLLs=""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\sleeper_6.1_windows_x86_64.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Samples - Release|Win32"
|
||||
OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=""
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE"
|
||||
StringPooling="false"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="true"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
|
||||
BrowseInformation="0"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmt.lib libcpmt.lib"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\sleeper_6.1_windows_intelx86.exe"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreAllDefaultLibraries="true"
|
||||
DelayLoadDLLs=""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\sleeper_6.1_windows_intelx86.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Samples - Release|x64"
|
||||
OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="3"
|
||||
TypeLibraryName=""
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories=".;../;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE"
|
||||
StringPooling="false"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="true"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
|
||||
BrowseInformation="0"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libcmt.lib libcpmt.lib"
|
||||
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\sleeper_6.1_windows_x86_64.exe"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="true"
|
||||
IgnoreAllDefaultLibraries="true"
|
||||
DelayLoadDLLs=""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\sleeper_6.1_windows_x86_64.pdb"
|
||||
SubSystem="2"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305;4244"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -167,6 +168,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305;4244"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -265,6 +267,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="4"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305;4244"
|
||||
ForcedIncludeFiles=""
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -363,6 +366,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305;4244"
|
||||
ForcedIncludeFiles=""
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -461,6 +465,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="4"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305;4244"
|
||||
ForcedIncludeFiles=""
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -559,6 +564,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305;4244"
|
||||
ForcedIncludeFiles=""
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -660,6 +666,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305;4244"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -761,6 +768,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305;4244"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -166,6 +167,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -263,6 +265,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="4"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305"
|
||||
ForcedIncludeFiles=""
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -360,6 +363,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305"
|
||||
ForcedIncludeFiles=""
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -457,6 +461,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="4"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305"
|
||||
ForcedIncludeFiles=""
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -554,6 +559,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305"
|
||||
ForcedIncludeFiles=""
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -654,6 +660,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
|
|
@ -754,6 +761,7 @@
|
|||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4305"
|
||||
ForcedIncludeFiles="boinc_win.h"
|
||||
/>
|
||||
<Tool
|
||||
|
|
|
|||
Loading…
Reference in New Issue