[boinc] 01/03: Imported Upstream version 7.4.23+dfsg
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Fri Oct 17 15:23:09 UTC 2014
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to annotated tag debian/7.4.23+dfsg-1
in repository boinc.
commit 96f5b8f2364d3a33d55476fa0d4ea372fe58c515
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Oct 17 17:10:27 2014 +0200
Imported Upstream version 7.4.23+dfsg
---
.gitignore | 42 +++
android/.gitignore | 11 +
android/BOINC/AndroidManifest.xml | 4 +-
api/boinc_opencl.cpp | 125 +++++--
client/boinc_cmd.cpp | 32 +-
client/hostinfo_unix.cpp | 14 +-
client/win/boinc_cli.h | 16 -
client/win/boinc_cli.rc | 288 --------------
client/win/boinc_cmd.h | 16 -
client/win/boinc_cmd.rc | 287 --------------
client/win/boinc_log.h | 16 -
client/win/boinc_log.rc | 250 -------------
clientctrl/boincsvcctrl.h | 16 -
clientctrl/boincsvcctrl.rc | 269 --------------
clientgui/BOINCGUIApp.rc | 283 --------------
clientgui/BOINCTaskBar.cpp | 10 +-
clientgui/resource.h | 17 -
clientscr/boinc_ss.h | 38 --
clientscr/boinc_ss.rc | 660 ---------------------------------
clientscr/boinc_ss_opengl.h | 17 -
clientscr/boinc_ss_opengl.rc | 251 -------------
clienttray/boinc_tray.h | 17 -
clienttray/boinc_tray.rc | 264 -------------
configure.ac | 2 +-
lib/app_ipc.cpp | 9 +-
lib/gui_rpc_client.cpp | 2 +-
lib/opencl_boinc.h | 2 +-
samples/vboxwrapper/vboxwrapper_win.h | 16 -
samples/vboxwrapper/vboxwrapper_win.rc | 79 ----
samples/wrapper/wrapper_win.h | 16 -
samples/wrapper/wrapper_win.rc | 79 ----
31 files changed, 196 insertions(+), 2952 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a592c25
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,42 @@
+# Which files and directories are safe to ignore
+#
+
+# Visual Studio project files
+*.user
+*.ncb
+*.suo
+
+# Visual Studio build directories
+/win_build/Build/
+
+# Installshield build directories
+/win_build/installerv2/BOINC
+/win_build/installerv2/BOINC_vbox
+/win_build/installerv2/BOINCx64
+/win_build/installerv2/BOINCx64_vbox
+/win_build/installerv2/WCG
+/win_build/installerv2/Progress
+
+# Visual Studio Build Directories for BOINCCAS
+/win_build/installerv2/redist/Windows/src/boinccas/Debug
+/win_build/installerv2/redist/Windows/src/boinccas/Debug95
+/win_build/installerv2/redist/Windows/src/boinccas/Release
+/win_build/installerv2/redist/Windows/src/boinccas/Release95
+/win_build/installerv2/redist/Windows/src/boinccas/x64
+
+#
+*.pfx
+*.pvk
+*.spc
+*.o
+*.lo
+*.a
+*.la
+*.in
+/client/Makefile
+/win_build/*.filters
+/win_build/boinc.sdf
+/win_build/boinc.opensdf
+/win_build/ipch
+/win_build/installerv2/redist/Windows/src/boinccas/*.filters
+/win_build/installerv2/redist/Windows/src/boinccas/boinccas.sdf
diff --git a/android/.gitignore b/android/.gitignore
new file mode 100644
index 0000000..dade7f7
--- /dev/null
+++ b/android/.gitignore
@@ -0,0 +1,11 @@
+BOINC/assets/arm*
+BOINC/assets/mips*
+BOINC/assets/x86*
+*/bin
+*/gen
+*/libs/
+*/obj/
+.DS_Store
+._.DS_Store
+*.apk
+.metadata
diff --git a/android/BOINC/AndroidManifest.xml b/android/BOINC/AndroidManifest.xml
index 75fbf63..88ee33a 100644
--- a/android/BOINC/AndroidManifest.xml
+++ b/android/BOINC/AndroidManifest.xml
@@ -20,8 +20,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="edu.berkeley.boinc"
android:installLocation="internalOnly"
- android:versionCode="97"
- android:versionName="7.4.22" > <!-- installation on SD card would break boot receiver -->
+ android:versionCode="98"
+ android:versionName="7.4.23" > <!-- installation on SD card would break boot receiver -->
<!-- Add Google Play store metadata informing the store we can run on tablets and other large screen devices -->
diff --git a/api/boinc_opencl.cpp b/api/boinc_opencl.cpp
index 7b0fa9a..908bdf8 100644
--- a/api/boinc_opencl.cpp
+++ b/api/boinc_opencl.cpp
@@ -41,6 +41,8 @@
#include "boinc_opencl.h"
+static int compareBOINCVersionTo(int toMajor, int toMinor, int toRelease);
+
// A few complicating factors:
// Windows & Linux have a separate OpenCL platform for each vendor
// (NVIDIA, AMD, Intel).
@@ -95,7 +97,7 @@ int boinc_get_opencl_ids_aux(
int device_num_for_type = -1;
int device_index;
- if ((!type) || (!strlen(type))) return CL_DEVICE_NOT_FOUND;
+ if ((!type) || (!strlen(type))) return CL_INVALID_DEVICE_TYPE;
retval = clGetPlatformIDs(MAX_OPENCL_PLATFORMS, platforms, &num_platforms);
if (num_platforms == 0) return CL_DEVICE_NOT_FOUND;
@@ -110,25 +112,23 @@ int boinc_get_opencl_ids_aux(
// Use gpu_opencl_dev_index if available
if (opencl_device_index >= 0) {
- if (opencl_device_index >= (int)num_devices) {
- fprintf(stderr, "Invalid OpenCL GPU index: %d \n", opencl_device_index);
- return CL_INVALID_DEVICE;
- }
+ if (opencl_device_index < (int)num_devices) {
+ device_id = devices[opencl_device_index];
+ retval = get_vendor(device_id, vendor, sizeof(vendor));
+ if (retval != CL_SUCCESS) continue;
- device_id = devices[opencl_device_index];
- retval = get_vendor(device_id, vendor, sizeof(vendor));
- if (retval != CL_SUCCESS) continue;
-
- if (!strcmp(vendor, type)) {
- *device = device_id;
- *platform = platforms[platform_index];
- return 0;
+ if (!strcmp(vendor, type)) {
+ *device = device_id;
+ *platform = platforms[platform_index];
+ return 0;
+ }
}
-
+
continue;
}
- // Older versions of init_data.xml don't have gpu_opencl_dev_index field
+ // Older versions of init_data.xml don't have the gpu_opencl_dev_index
+ // field so use the value of gpu_device_num.
// NOTE: This may return the wrong device on older versions of BOINC if
// OpenCL does not recognize all GPU models detected by CUDA or CAL
for (device_index=0; device_index<(int)num_devices; ++device_index) {
@@ -147,6 +147,9 @@ int boinc_get_opencl_ids_aux(
}
}
+ fprintf(stderr, "GPU not found: type=%s, opencl_device_index=%d, device_num=%d\n",
+ type, opencl_device_index, device_num);
+
return CL_DEVICE_NOT_FOUND;
}
@@ -157,14 +160,15 @@ int boinc_get_opencl_ids_aux(
// type: may be PROC_TYPE_NVIDIA_GPU, PROC_TYPE_AMD_GPU or PROC_TYPE_INTEL_GPU
// (it may also be 0, but then it will fail on older clients.)
//
-// The argc, argv and type arguments are ignored for 7.0.12 or later clients.
+// The argc, argv and type arguments are ignored for 6.13.3 or later clients.
//
// returns
// - 0 if success
// - ERR_FOPEN if init_data.xml missing
// - ERR_XML_PARSE if can't parse init_data.xml
// - CL_INVALID_DEVICE_TYPE if unable to get gpu_type information
-// - ERR_NOT_FOUND if unable to get opencl_device_index or gpu device_num
+// - CL_INVALID_DEVICE if unable to get opencl_device_index or gpu device_num
+// - CL_DEVICE_NOT_FOUND if the requested device was not found
// - an OpenCL error number if OpenCL error
//
int boinc_get_opencl_ids(
@@ -203,24 +207,39 @@ int boinc_get_opencl_ids(
}
if (aid.gpu_opencl_dev_index < 0) {
- // Older versions of init_data.xml don't have gpu_opencl_dev_index field
- //
+ if (compareBOINCVersionTo(7,0,12) >= 0) {
+ // gpu_opencl_dev_index was added in BOINC version 7.0.12.
+ // A gpu_opencl_dev_index value of -1 in version 7.0.12 or later
+ // means BOINC client did not assign an OpenCL GPU to this task.
+ fprintf(stderr, "Illegal value for gpu_opencl_dev_index: %d in BOINC Client %d.%d.%d\n",
+ aid.gpu_opencl_dev_index, aid.major_version, aid.minor_version, aid.release);
+ return CL_INVALID_DEVICE;
+ }
+
+ // Older versions of init_data.xml don't have the gpu_opencl_dev_index
+ // field so use the value of gpu_device_num if available.
gpu_device_num = aid.gpu_device_num;
if (gpu_device_num < 0) {
- // Even older versions of init_data.xml don't have gpu_device_num field
- for (i=0; i<argc-1; i++) {
- if ((!strcmp(argv[i], "--device")) || (!strcmp(argv[i], "-device"))) {
- gpu_device_num = atoi(argv[i+1]);
- break;
+ if (compareBOINCVersionTo(6,13,3) < 0) {
+ // gpu_device_num and gpu_type fields were added in BOINC version 6.13.3.
+ // Very old versions of init_data.xml don't have gpu_device_num field
+ // but instead pass the device number as a command-line argument.
+ for (i=0; i<argc-1; i++) {
+ if ((!strcmp(argv[i], "--device")) || (!strcmp(argv[i], "-device"))) {
+ gpu_device_num = atoi(argv[i+1]);
+ break;
+ }
}
}
+
+ if (gpu_device_num < 0) {
+ // BOINC client apparently did not assign a GPU to this task.
+ fprintf(stderr, "Illegal value for gpu_device_num: %d in BOINC Client %d.%d.%d\n",
+ aid.gpu_device_num, aid.major_version, aid.minor_version, aid.release);
+ return CL_INVALID_DEVICE;
+ }
}
- }
-
- if ((aid.gpu_opencl_dev_index < 0) && (gpu_device_num < 0)) {
- fprintf(stderr, "GPU device # not found in %s\n", INIT_DATA_FILE);
- return ERR_NOT_FOUND;
- }
+ } // End if (aid.gpu_opencl_dev_index < 0)
retval = boinc_get_opencl_ids_aux(
gpu_type, aid.gpu_opencl_dev_index, gpu_device_num, device, platform
@@ -236,7 +255,9 @@ int boinc_get_opencl_ids(
// - 0 if success
// - ERR_FOPEN if init_data.xml missing
// - ERR_XML_PARSE if can't parse init_data.xml
-// - ERR_NOT_FOUND if missing <gpu_type> or <gpu_device_num> fields
+// - CL_INVALID_DEVICE_TYPE if unable to get gpu_type information
+// - CL_INVALID_DEVICE if unable to get opencl_device_index or gpu device_num
+// - CL_DEVICE_NOT_FOUND if the requested device was not found
// - an OpenCL error number if OpenCL error
//
int boinc_get_opencl_ids(cl_device_id* device, cl_platform_id* platform) {
@@ -249,12 +270,29 @@ int boinc_get_opencl_ids(cl_device_id* device, cl_platform_id* platform) {
if (!strlen(aid.gpu_type)) {
fprintf(stderr, "GPU type not found in %s\n", INIT_DATA_FILE);
- return ERR_NOT_FOUND;
+ return CL_INVALID_DEVICE_TYPE;
}
- if ((aid.gpu_opencl_dev_index < 0) && (aid.gpu_device_num < 0)) {
- fprintf(stderr, "GPU device # not found in %s\n", INIT_DATA_FILE);
- return ERR_NOT_FOUND;
+ if (aid.gpu_opencl_dev_index < 0) {
+ if (compareBOINCVersionTo(7,0,12) >= 0) {
+ // gpu_opencl_dev_index was added in BOINC version 7.0.12.
+ // A gpu_opencl_dev_index value of -1 in version 7.0.12 or
+ // later means BOINC did not assign an OpenCL GPU to this task.
+ fprintf(stderr, "Illegal value for gpu_opencl_dev_index: %d in BOINC Client %d.%d.%d\n",
+ aid.gpu_opencl_dev_index, aid.major_version, aid.minor_version, aid.release);
+ return CL_INVALID_DEVICE;
+ }
+
+ if (aid.gpu_device_num < 0) {
+ if (compareBOINCVersionTo(6,13,3) >= 0) {
+ // gpu_device_num and gpu_type fields were added in BOINC version 6.13.3.
+ // A gpu_device_num value of -1 in version 6.13.3 or later means
+ // BOINC did not assign a GPU to this task.
+ fprintf(stderr, "Illegal value for gpu_device_num: %d in BOINC Client %d.%d.%d\n",
+ aid.gpu_device_num, aid.major_version, aid.minor_version, aid.release);
+ return CL_INVALID_DEVICE;
+ }
+ }
}
retval = boinc_get_opencl_ids_aux(
@@ -263,3 +301,20 @@ int boinc_get_opencl_ids(cl_device_id* device, cl_platform_id* platform) {
return retval;
}
+
+static int compareBOINCVersionTo(int toMajor, int toMinor, int toRelease) {
+ APP_INIT_DATA aid;
+
+ boinc_get_init_data(aid);
+
+ if (aid.major_version < toMajor) return -1;
+ if (aid.major_version > toMajor) return 1;
+ if (aid.minor_version < toMinor) return -1;
+ if (aid.minor_version > toMinor) return 1;
+ if (aid.release < toRelease) return -1;
+ if (aid.release > toRelease) return 1;
+ return 0;
+}
+
+
+
diff --git a/client/boinc_cmd.cpp b/client/boinc_cmd.cpp
index 652aa09..f578aff 100644
--- a/client/boinc_cmd.cpp
+++ b/client/boinc_cmd.cpp
@@ -127,7 +127,7 @@ int main(int argc, char** argv) {
MESSAGES messages;
NOTICES notices;
char passwd_buf[256], hostname_buf[256], *hostname=0;
- char* passwd = passwd_buf, *p;
+ char* passwd = passwd_buf, *p, *q;
bool unix_domain = false;
#ifdef _WIN32
@@ -154,11 +154,33 @@ int main(int argc, char** argv) {
if (!strcmp(argv[i], "--host")) {
if (++i == argc) usage();
strlcpy(hostname_buf, argv[i], sizeof(hostname_buf));
- hostname = hostname_buf;
- p = strchr(hostname, ':');
+
+ // see if port is specified.
+ // syntax:
+ // [a:b:..]:port for IPv6
+ // a.b.c.d:port for IPv4
+ // hostname:port for domain names
+ //
+ p = strchr(hostname_buf, '[');
if (p) {
- port = atoi(p+1);
- *p=0;
+ q = strchr(p, ']');
+ if (!q) {
+ fprintf(stderr, "invalid IPv6 syntax: %s\n", hostname_buf);
+ exit(1);
+ }
+ hostname = p+1;
+ *q = 0;
+ port = atoi(q+1);
+ } else {
+ hostname = hostname_buf;
+ p = strchr(hostname, ':');
+ if (p) {
+ q = strchr(p+1, ':');
+ if (!q) {
+ port = atoi(p+1);
+ *p=0;
+ }
+ }
}
i++;
}
diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp
index 55e68fb..c25a63c 100644
--- a/client/hostinfo_unix.cpp
+++ b/client/hostinfo_unix.cpp
@@ -1226,7 +1226,7 @@ bool isDualGPUMacBook() {
int HOST_INFO::get_virtualbox_version() {
char path[MAXPATHLEN];
char cmd [MAXPATHLEN+35];
- char *newlinePtr;
+ char buf[256];
FILE* fd;
safe_strcpy(path, "/usr/bin/VBoxManage");
@@ -1239,11 +1239,13 @@ int HOST_INFO::get_virtualbox_version() {
safe_strcat(cmd, " --version");
fd = popen(cmd, "r");
if (fd) {
- if (fgets(virtualbox_version, sizeof(virtualbox_version), fd)) {
- newlinePtr = strchr(virtualbox_version, '\n');
- if (newlinePtr) *newlinePtr = '\0';
- newlinePtr = strchr(virtualbox_version, '\r');
- if (newlinePtr) *newlinePtr = '\0';
+ if (fgets(buf, sizeof(buf), fd)) {
+ strip_whitespace(buf);
+ int n, a,b,c;
+ n = sscanf(buf, "%d.%d.%d", &a, &b, &c);
+ if (n == 3) {
+ strcpy(virtualbox_version, buf);
+ }
}
pclose(fd);
}
diff --git a/client/win/boinc_cli.h b/client/win/boinc_cli.h
deleted file mode 100644
index feddfe4..0000000
--- a/client/win/boinc_cli.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by boinc_cli.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#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_SYMED_VALUE 102
-#endif
-#endif
diff --git a/client/win/boinc_cli.rc b/client/win/boinc_cli.rc
deleted file mode 100644
index a7cb501..0000000
--- a/client/win/boinc_cli.rc
+++ /dev/null
@@ -1,288 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "boinc_cli.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winresrc.h"
-#include "version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-#if defined(_GRIDREPUBLIC)
-
-#elif defined(_PROGRESSTHRUPROCESSORS)
-IDI_MAIN_ICON ICON "res\\progress.ico"
-#elif defined(_CHARITYENGINE)
-IDI_MAIN_ICON ICON "res\\ce.ico"
-#elif defined(_WCG)
-IDI_MAIN_ICON ICON "res\\wcg.ico"
-#else
-IDI_MAIN_ICON ICON "res\\boinc.ico"
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-
-#endif // Neutral resources
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "boinc_cli.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""winresrc.h""\r\n"
- "#include ""version.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Visual Studio 2005 Compatibility
-//
-#ifndef IDC_STATIC
-#define IDC_STATIC (-1) // all static controls
-#endif
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-#if defined (_GRIDREPUBLIC)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "GridRepublic"
- VALUE "FileDescription", "BOINC client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_cli"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinc.exe"
- VALUE "ProductName", "BOINC core client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_PROGRESSTHRUPROCESSORS)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Progress Thru Processors"
- VALUE "FileDescription", "BOINC client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_cli"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinc.exe"
- VALUE "ProductName", "BOINC core client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_CHARITYENGINE)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Charity Engine"
- VALUE "FileDescription", "BOINC client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_cli"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinc.exe"
- VALUE "ProductName", "BOINC core client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_WCG)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "World Community Grid"
- VALUE "FileDescription", "BOINC client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_cli"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinc.exe"
- VALUE "ProductName", "BOINC core client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#else
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Space Sciences Laboratory"
- VALUE "FileDescription", "BOINC client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_cli"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinc.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/client/win/boinc_cmd.h b/client/win/boinc_cmd.h
deleted file mode 100644
index 71f85b3..0000000
--- a/client/win/boinc_cmd.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by boinc_cmd.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#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_SYMED_VALUE 102
-#endif
-#endif
diff --git a/client/win/boinc_cmd.rc b/client/win/boinc_cmd.rc
deleted file mode 100644
index e7cd075..0000000
--- a/client/win/boinc_cmd.rc
+++ /dev/null
@@ -1,287 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "boinc_cmd.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winresrc.h"
-#include "version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-#if defined(_GRIDREPUBLIC)
-
-#elif defined(_PROGRESSTHRUPROCESSORS)
-
-#elif defined(_CHARITYENGINE)
-
-#elif defined(_WCG)
-IDI_MAIN_ICON ICON "res\\wcg.ico"
-#else
-IDI_MAIN_ICON ICON "res\\boinc.ico"
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-
-#endif // Neutral resources
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "boinc_cmd.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""winresrc.h""\r\n"
- "#include ""version.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Visual Studio 2005 Compatibility
-//
-#ifndef IDC_STATIC
-#define IDC_STATIC (-1) // all static controls
-#endif
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-#if defined(_GRIDREPUBLIC)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "GridRepublic"
- VALUE "FileDescription", "BOINC Command Line Client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinccmd"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinccmd.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_PROGRESSTHRUPROCESSORS)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Progress Thru Processors"
- VALUE "FileDescription", "BOINC Command Line Client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinccmd"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinccmd.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_CHARITYENGINE)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Charity Engine"
- VALUE "FileDescription", "BOINC Command Line Client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinccmd"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinccmd.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_WCG)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "World Community Grid"
- VALUE "FileDescription", "BOINC Command Line Client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinccmd"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinccmd.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#else
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Space Sciences Laboratory"
- VALUE "FileDescription", "BOINC Command Line Client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinccmd"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinccmd.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/client/win/boinc_log.h b/client/win/boinc_log.h
deleted file mode 100644
index 71f85b3..0000000
--- a/client/win/boinc_log.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by boinc_cmd.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#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_SYMED_VALUE 102
-#endif
-#endif
diff --git a/client/win/boinc_log.rc b/client/win/boinc_log.rc
deleted file mode 100644
index 29b1cf2..0000000
--- a/client/win/boinc_log.rc
+++ /dev/null
@@ -1,250 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "boinc_cmd.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winresrc.h"
-#include "version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-#if defined(_GRIDREPUBLIC)
-
-#elif defined(_PROGRESSTHRUPROCESSORS)
-
-#elif defined(_WCG)
-IDI_MAIN_ICON ICON "res\\wcg.ico"
-#else
-IDI_MAIN_ICON ICON "res\\boinc.ico"
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-
-#endif // Neutral resources
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "boinc_log.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""winresrc.h""\r\n"
- "#include ""version.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Visual Studio 2005 Compatibility
-//
-#ifndef IDC_STATIC
-#define IDC_STATIC (-1) // all static controls
-#endif
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-#if defined(_GRIDREPUBLIC)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "GridRepublic"
- VALUE "FileDescription", "BOINC Log Conversion Client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinclog"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinclog.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_PROGRESSTHRUPROCESSORS)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Progress Thru Processors"
- VALUE "FileDescription", "BOINC Log Conversion Client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinclog"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinclog.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_WCG)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "World Community Grid"
- VALUE "FileDescription", "BOINC Log Conversion Client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinclog"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinclog.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#else
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Space Sciences Laboratory"
- VALUE "FileDescription", "BOINC Log Conversion Client"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinclog"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinclog.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/clientctrl/boincsvcctrl.h b/clientctrl/boincsvcctrl.h
deleted file mode 100644
index 7266821..0000000
--- a/clientctrl/boincsvcctrl.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by boincsvcctrl.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#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_SYMED_VALUE 102
-#endif
-#endif
diff --git a/clientctrl/boincsvcctrl.rc b/clientctrl/boincsvcctrl.rc
deleted file mode 100644
index 15cb95f..0000000
--- a/clientctrl/boincsvcctrl.rc
+++ /dev/null
@@ -1,269 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "boincsvcctrl.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winresrc.h"
-#include "version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-
-#endif // Neutral resources
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "boincsvcctrl.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""winresrc.h""\r\n"
- "#include ""version.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Visual Studio 2005 Compatibility
-//
-#ifndef IDC_STATIC
-#define IDC_STATIC (-1) // all static controls
-#endif
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-#if defined (_GRIDREPUBLIC)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "GridRepublic"
- VALUE "FileDescription", "BOINC service controller"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boincsvcctrl"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boincsvcctrl.exe"
- VALUE "ProductName", "BOINC core client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_PROGRESSTHRUPROCESSORS)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Progress Thru Processors"
- VALUE "FileDescription", "BOINC service controller"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boincsvcctrl"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boincsvcctrl.exe"
- VALUE "ProductName", "BOINC core client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_CHARITYENGINE)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Charity Engine"
- VALUE "FileDescription", "BOINC service controller"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boincsvcctrl"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boincsvcctrl.exe"
- VALUE "ProductName", "BOINC core client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_WCG)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "World Community Grid"
- VALUE "FileDescription", "BOINC service controller"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boincsvcctrl"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boincsvcctrl.exe"
- VALUE "ProductName", "BOINC core client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#else
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Space Sciences Laboratory"
- VALUE "FileDescription", "BOINC service controller"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boincsvcctrl"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boincsvcctrl.exe"
- VALUE "ProductName", "BOINC core client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/clientgui/BOINCGUIApp.rc b/clientgui/BOINCGUIApp.rc
deleted file mode 100644
index 619ebbb..0000000
--- a/clientgui/BOINCGUIApp.rc
+++ /dev/null
@@ -1,283 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <wx/msw/wx.rc>
-#include "version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-
-#endif // Neutral resources
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Cursor
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-#if defined(_GRIDREPUBLIC)
-boinc ICON "res\\gridrepublic.ico"
-#elif defined(_PROGRESSTHRUPROCESSORS)
-boinc ICON "res\\progress.ico"
-#elif defined(_CHARITYENGINE)
-boinc ICON "res\\ce.ico"
-#elif defined(_WCG)
-boinc ICON "res\\wcg.ico"
-#else
-boinc ICON "res\\boinc.ico"
-#endif
-
-boincdisconnect ICON "res\\boincdisconnect.ico"
-boincsnooze ICON "res\\boincsnooze.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "#include <wx/msw/wx.rc>\r\n"
- "#include ""win_config.h""\r\n"
- "\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-#if defined(_GRIDREPUBLIC)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "GridRepublic"
- VALUE "FileDescription", "GridRepublic for Windows"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boincmgr"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "gridrepublic.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_PROGRESSTHRUPROCESSORS)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Progress Thru Processors"
- VALUE "FileDescription", "Progress Thru Processors for Windows"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boincmgr"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "progressthruprocessors.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_CHARITYENGINE)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Charity Engine"
- VALUE "FileDescription", "Charity Engine for Windows"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boincmgr"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "progressthruprocessors.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_WCG)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "World Community Grid"
- VALUE "FileDescription", "World Community Grid for Windows"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boincmgr"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "worldcommunitygrid.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#else
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Space Sciences Laboratory"
- VALUE "FileDescription", "BOINC Manager for Windows"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boincmgr"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boincmgr.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index 680347c..3f226af 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -509,10 +509,12 @@ wxMenu *CTaskBarIcon::BuildContextMenu() {
wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
// Prevent recursive entry of CMainDocument::RequestRPC()
- if (!pDoc->WaitingForRPC()) {
- // Account managers have a different menu arrangement
- pDoc->rpc.acct_mgr_info(ami);
- is_acct_mgr_detected = ami.acct_mgr_url.size() ? true : false;
+ if (!pDoc->WaitingForRPC()) {
+ if (pDoc->IsConnected()) {
+ // Account managers have a different menu arrangement
+ pDoc->rpc.acct_mgr_info(ami);
+ is_acct_mgr_detected = ami.acct_mgr_url.size() ? true : false;
+ }
}
if (is_acct_mgr_detected) {
diff --git a/clientgui/resource.h b/clientgui/resource.h
deleted file mode 100644
index ecc55ad..0000000
--- a/clientgui/resource.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by BOINCGUIApp.rc
-//
-#define ICON_BOINCGUIAPP 0
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC 1
-#define _APS_NEXT_RESOURCE_VALUE 110
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
diff --git a/clientscr/boinc_ss.h b/clientscr/boinc_ss.h
deleted file mode 100644
index 7b560d4..0000000
--- a/clientscr/boinc_ss.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// 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_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_BOINCAPPFOUNDGRAPHICSLOADING 2108
-#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
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 109
-#define _APS_NEXT_COMMAND_VALUE 40000
-#define _APS_NEXT_CONTROL_VALUE 1010
-#define _APS_NEXT_SYMED_VALUE 102
-#endif
-#endif
diff --git a/clientscr/boinc_ss.rc b/clientscr/boinc_ss.rc
deleted file mode 100644
index 7e9bcfb..0000000
--- a/clientscr/boinc_ss.rc
+++ /dev/null
@@ -1,660 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "boinc_ss.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winresrc.h"
-#include "version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-#if defined(_GRIDREPUBLIC)
-IDI_MAIN_ICON ICON "res\\gridrepublic.ico"
-#elif defined(_PROGRESSTHRUPROCESSORS)
-IDI_MAIN_ICON ICON "res\\progress.ico"
-#elif defined(_CHARITYENGINE)
-IDI_MAIN_ICON ICON "res\\ce.ico"
-#elif defined(_WCG)
-IDI_MAIN_ICON ICON "res\\wcg.ico"
-#else
-IDI_MAIN_ICON ICON "res\\boinc.ico"
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-
-#endif // Neutral resources
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "boinc_ss.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""winresrc.h""\r\n"
- "#include ""version.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Visual Studio 2005 Compatibility
-//
-#ifndef IDC_STATIC
-#define IDC_STATIC (-1) // all static controls
-#endif
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-#if defined(_GRIDREPUBLIC)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "GridRepublic"
- VALUE "FileDescription", "GridRepublic Screensaver"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_ss"
- VALUE "LegalCopyright", "� 2003-2012 University of California"
- VALUE "OriginalFilename", "boinc.scr"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_PROGRESSTHRUPROCESSORS)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Progress Thru Processors"
- VALUE "FileDescription", "Progress Thru Processors Screensaver"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_ss"
- VALUE "LegalCopyright", "� 2003-2012 University of California"
- VALUE "OriginalFilename", "boinc.scr"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_CHARITYENGINE)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Charity Engine"
- VALUE "FileDescription", "Charity Engine Screensaver"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_ss"
- VALUE "LegalCopyright", "� 2003-2012 University of California"
- VALUE "OriginalFilename", "boinc.scr"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_WCG)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "World Community Grid"
- VALUE "FileDescription", "World Community Grid Screensaver"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_ss"
- VALUE "LegalCopyright", "� 2003-2012 University of California"
- VALUE "OriginalFilename", "boinc.scr"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#else
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Space Sciences Laboratory"
- VALUE "FileDescription", "BOINC Screensaver"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_ss"
- VALUE "LegalCopyright", "� 2003-2012 University of California"
- VALUE "OriginalFilename", "boinc.scr"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 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,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 project 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 between project 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 project 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 between project 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 project 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 between project 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 project 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 between project 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
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-#if defined(_GRIDREPUBLIC)
-IDB_BOINC BITMAP "res\\gridrepublic.bmp"
-#elif defined(_PROGRESSTHRUPROCESSORS)
-IDB_BOINC BITMAP "res\\progress.bmp"
-#elif defined(_CHARITYENGINE)
-IDB_BOINCSPLAT BITMAP "res\\ce.bmp"
-#elif defined(_WCG)
-IDB_BOINC BITMAP "res\\wcg.bmp"
-#else
-IDB_BOINC BITMAP "res\\boinc.bmp"
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-#if defined(_GRIDREPUBLIC)
-
-STRINGTABLE
-BEGIN
- IDS_DESCRIPTION "GridRepublic"
- 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_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(_PROGRESSTHRUPROCESSORS)
-
-STRINGTABLE
-BEGIN
- IDS_DESCRIPTION "Progress Thru Processors"
- IDS_ERR_GENERIC "There was an unspecified problem\nwith the Progress Thru Processors screensaver."
- IDS_ERR_BOINCNOTDETECTED
- "Progress Thru Processors is not running.\n\nPlease launch Progress Thru Processors\nto display graphics."
- IDS_ERR_BOINCSUSPENDED "Progress Thru Processors is currently suspended."
- IDS_ERR_BOINCNOAPPSEXECUTING
- "Progress Thru Processors is currently idle."
- IDS_ERR_BOINCNOAPPSEXECUTINGNOPROJECTSDETECTED
- "Progress Thru Processors is not attached\nto any projects.\nYou can attach to projects using\nthe Attach to project wizard\nin the tools menu."
- IDS_ERR_BOINCNOGRAPHICSAPPSEXECUTING
- "Progress Thru Processors system status:\n\n"
- IDS_ERR_BOINCSCREENSAVERLOADING
- "Progress Thru Processors screensaver loading"
- IDS_ERR_DAEMONALLOWSNOGRAPHICS
- "Progress Thru Processors screensaver cannot display graphics \nfrom older applications when configured to \nrun as a Windows service."
-END
-
-#elif defined(_CHARITYENGINE)
-
-STRINGTABLE
-BEGIN
- IDS_DESCRIPTION "Charity Engine"
- IDS_ERR_GENERIC "There was an unspecified problem\nwith the Charity Engine screensaver."
- IDS_ERR_BOINCNOTDETECTED
- "Charity Engine is not running.\n\nPlease launch Charity Engine\nto display graphics."
- IDS_ERR_BOINCSUSPENDED "Charity Engine is currently suspended."
- IDS_ERR_BOINCNOAPPSEXECUTING
- "Charity Engine is currently idle."
- IDS_ERR_BOINCNOAPPSEXECUTINGNOPROJECTSDETECTED
- "Charity Engine is not attached\nto any projects.\nYou can attach to projects using\nthe Attach to project wizard\nin the tools menu."
- IDS_ERR_BOINCNOGRAPHICSAPPSEXECUTING
- "Charity Engine system status:\n\n"
- IDS_ERR_BOINCSCREENSAVERLOADING
- "Charity Engine screensaver loading"
- IDS_ERR_DAEMONALLOWSNOGRAPHICS
- "Charity Engine screensaver cannot display graphics \nfrom older applications when configured to \nrun as a Windows service."
-END
-
-#elif defined(_WCG)
-
-STRINGTABLE
-BEGIN
- IDS_DESCRIPTION "World Community Grid"
- 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_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_DESCRIPTION "BOINC"
- 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_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_BOINCAPPFOUNDGRAPHICSLOADING
- "Application found, graphics loading...\n\nPlease wait..."
- IDS_ERR_OUTOFMEMORY "Not enough memory."
- IDS_ERR_NOPREVIEW "No preview available"
-END
-
-
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/clientscr/boinc_ss_opengl.h b/clientscr/boinc_ss_opengl.h
deleted file mode 100644
index 50ec622..0000000
--- a/clientscr/boinc_ss_opengl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by boinc_ss.rc
-//
-#define IDI_MAIN_ICON 1
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#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_SYMED_VALUE 102
-#endif
-#endif
diff --git a/clientscr/boinc_ss_opengl.rc b/clientscr/boinc_ss_opengl.rc
deleted file mode 100644
index 6e6df2c..0000000
--- a/clientscr/boinc_ss_opengl.rc
+++ /dev/null
@@ -1,251 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "boinc_ss_opengl.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winresrc.h"
-#include "version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-#if defined(_GRIDREPUBLIC)
-IDI_MAIN_ICON ICON "res\\gridrepublic.ico"
-#elif defined(_CHARITYENGINE)
-IDI_MAIN_ICON ICON "res\\ce.ico"
-#elif defined(_WCG)
-IDI_MAIN_ICON ICON "res\\wcg.ico"
-#else
-IDI_MAIN_ICON ICON "res\\boinc.ico"
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-
-#endif // Neutral resources
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "boinc_ss_opengl.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""winresrc.h""\r\n"
- "#include ""version.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Visual Studio 2005 Compatibility
-//
-#ifndef IDC_STATIC
-#define IDC_STATIC (-1) // all static controls
-#endif
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-#if defined(_GRIDREPUBLIC)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "GridRepublic"
- VALUE "FileDescription", "BOINC Screensaver"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_ss"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinc.scr"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_CHARITYENGINE)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Charity Engine"
- VALUE "FileDescription", "Charity Engine Screensaver"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_ss"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinc.scr"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_WCG)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "World Community Grid"
- VALUE "FileDescription", "BOINC Screensaver"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_ss"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinc.scr"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#else
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Space Sciences Laboratory"
- VALUE "FileDescription", "BOINC Screensaver"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinc_ss"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinc.scr"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/clienttray/boinc_tray.h b/clienttray/boinc_tray.h
deleted file mode 100644
index 8e81c17..0000000
--- a/clienttray/boinc_tray.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by boinc_tray.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC 1
-#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 110
-#define _APS_NEXT_COMMAND_VALUE 40000
-#define _APS_NEXT_CONTROL_VALUE 1020
-#define _APS_NEXT_SYMED_VALUE 102
-#endif
-#endif
diff --git a/clienttray/boinc_tray.rc b/clienttray/boinc_tray.rc
deleted file mode 100644
index 0bea1e0..0000000
--- a/clienttray/boinc_tray.rc
+++ /dev/null
@@ -1,264 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "boinc_tray.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winresrc.h"
-#include "version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-#if defined(_GRIDREPUBLIC)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "GridRepublic"
- VALUE "FileDescription", "GridRepublic System Tray for Windows"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinctray"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinctray.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_PROGRESSTHRUPROCESSORS)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Progress Thru Processors"
- VALUE "FileDescription", "Progress Thru Processors System Tray for Windows"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinctray"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinctray.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_CHARITYENGINE)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Charity Engine"
- VALUE "FileDescription", "Charity Engine System Tray for Windows"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinctray"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinctray.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#elif defined(_WCG)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "World Community Grid"
- VALUE "FileDescription", "World Community Grid System Tray for Windows"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinctray"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinctray.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#else
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Space Sciences Laboratory"
- VALUE "FileDescription", "BOINC System Tray for Windows"
- VALUE "FileVersion", BOINC_VERSION_STRING "\0"
- VALUE "InternalName", "boinctray"
- VALUE "LegalCopyright", "� 2003-2013 University of California"
- VALUE "OriginalFilename", "boinctray.exe"
- VALUE "ProductName", "BOINC client"
- VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif
-
-#endif // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "boinc_tray.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""winresrc.h""\r\n"
- "#include ""version.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/configure.ac b/configure.ac
index a7df008..de4f12e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
AC_PREREQ(2.58)
dnl Set the BOINC version here. You can also use the set-version script.
-AC_INIT(BOINC, 7.4.22)
+AC_INIT(BOINC, 7.4.23)
AC_CONFIG_MACRO_DIR([m4])
LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
AC_SUBST([LIBBOINC_VERSION])
diff --git a/lib/app_ipc.cpp b/lib/app_ipc.cpp
index 3aa6066..737e45c 100644
--- a/lib/app_ipc.cpp
+++ b/lib/app_ipc.cpp
@@ -35,7 +35,7 @@
#include "app_ipc.h"
-#ifdef _MSC_VER
+#if !defined(HAVE_STRDUP) && defined(HAVE__STRDUP)
#define strdup _strdup
#endif
@@ -281,9 +281,14 @@ void APP_INIT_DATA::clear() {
fraction_done_start = 0;
fraction_done_end = 0;
checkpoint_period = 0;
+ // gpu_type is an empty string for client versions before 6.13.3 without this
+ // field or (on newer clients) if BOINC did not assign an OpenCL GPU to task.
strcpy(gpu_type, "");
+ // gpu_device_num < 0 for client versions before 6.13.3 without this field
+ // or (on newer clients) if BOINC did not assign an OpenCL GPU to task.
gpu_device_num = -1;
- // -1 means an older version without gpu_opencl_dev_index field
+ // gpu_opencl_dev_index < 0 for client versions before 7.0.12 without this
+ // field or (on newer clients) if BOINC did not assign any GPU to task.
gpu_opencl_dev_index = -1;
gpu_usage = 0;
ncpus = 0;
diff --git a/lib/gui_rpc_client.cpp b/lib/gui_rpc_client.cpp
index bedb3dd..35d361d 100644
--- a/lib/gui_rpc_client.cpp
+++ b/lib/gui_rpc_client.cpp
@@ -95,7 +95,7 @@ int RPC_CLIENT::get_ip_addr(const char* host, int port) {
//printf("trying port %d\n", htons(addr.sin_port));
int retval;
if (host) {
- retval = resolve_hostname(host, addr);
+ retval = resolve_hostname_or_ip_addr(host, addr);
if (retval) {
return ERR_GETHOSTBYNAME;
}
diff --git a/lib/opencl_boinc.h b/lib/opencl_boinc.h
index 7e16aa6..3041552 100644
--- a/lib/opencl_boinc.h
+++ b/lib/opencl_boinc.h
@@ -63,7 +63,7 @@ struct OPENCL_DEVICE_PROP {
double peak_flops; // temp used in scan process
COPROC_USAGE is_used; // temp used in scan process
double opencl_available_ram; // temp used in scan process
- int opencl_device_index; // zero-based device number within this COPROC type
+ int opencl_device_index; // zero-based device number within this OpenCL platform
void write_xml(MIOFILE&, const char* tag, bool temp_file=false);
int parse(XML_PARSER&, const char* end_tag);
diff --git a/samples/vboxwrapper/vboxwrapper_win.h b/samples/vboxwrapper/vboxwrapper_win.h
deleted file mode 100644
index 751fad7..0000000
--- a/samples/vboxwrapper/vboxwrapper_win.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by boinc_ss.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 109
-#define _APS_NEXT_COMMAND_VALUE 40000
-#define _APS_NEXT_CONTROL_VALUE 1010
-#define _APS_NEXT_SYMED_VALUE 102
-#endif
-#endif
diff --git a/samples/vboxwrapper/vboxwrapper_win.rc b/samples/vboxwrapper/vboxwrapper_win.rc
deleted file mode 100644
index 00370fb..0000000
--- a/samples/vboxwrapper/vboxwrapper_win.rc
+++ /dev/null
@@ -1,79 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "vboxwrapper_win.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winresrc.h"
-#include "version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,VBOXWRAPPER_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,VBOXWRAPPER_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Space Sciences Laboratory"
- VALUE "FileDescription", "BOINC VirtualBox Wrapper"
- VALUE "FileVersion", BOINC_MAJOR_VERSION "." BOINC_MINOR_VERSION "." VBOXWRAPPER_RELEASE "\0"
- VALUE "InternalName", "vboxwrapper"
- VALUE "LegalCopyright", "� 2011-2014 University of California"
- VALUE "OriginalFilename", "vboxwrapper.exe"
- VALUE "ProductName", "BOINC VirtualBox Wrapper"
- VALUE "ProductVersion", BOINC_MAJOR_VERSION "." BOINC_MINOR_VERSION "." VBOXWRAPPER_RELEASE "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-#endif
diff --git a/samples/wrapper/wrapper_win.h b/samples/wrapper/wrapper_win.h
deleted file mode 100644
index 751fad7..0000000
--- a/samples/wrapper/wrapper_win.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by boinc_ss.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 109
-#define _APS_NEXT_COMMAND_VALUE 40000
-#define _APS_NEXT_CONTROL_VALUE 1010
-#define _APS_NEXT_SYMED_VALUE 102
-#endif
-#endif
diff --git a/samples/wrapper/wrapper_win.rc b/samples/wrapper/wrapper_win.rc
deleted file mode 100644
index c2cc384..0000000
--- a/samples/wrapper/wrapper_win.rc
+++ /dev/null
@@ -1,79 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "wrapper_win.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winresrc.h"
-#include "version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,WRAPPER_RELEASE,0
- PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,WRAPPER_RELEASE,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Space Sciences Laboratory"
- VALUE "FileDescription", "BOINC Wrapper"
- VALUE "FileVersion", BOINC_MAJOR_VERSION "." BOINC_MINOR_VERSION "." WRAPPER_RELEASE "\0"
- VALUE "InternalName", "vboxwrapper"
- VALUE "LegalCopyright", "� 2011-2014 University of California"
- VALUE "OriginalFilename", "wrapper.exe"
- VALUE "ProductName", "BOINC Wrapper"
- VALUE "ProductVersion", BOINC_MAJOR_VERSION "." BOINC_MINOR_VERSION "." WRAPPER_RELEASE "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-#endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list