[boinc] 01/03: Imported Upstream version 7.2.47+dfsg
Guo Yixuan
yixuan-guest at moszumanska.debian.org
Sun Apr 6 00:55:43 UTC 2014
This is an automated email from the git hooks/post-receive script.
yixuan-guest pushed a commit to branch master
in repository boinc.
commit bf5535df26dc34d01306b609c5ebfdf709f03a90
Author: Guo Yixuan <culu.gyx at gmail.com>
Date: Sat Apr 5 20:45:38 2014 -0400
Imported Upstream version 7.2.47+dfsg
---
client/gui_rpc_server_ops.cpp | 3 +-
client/win/res/wcg.ico | Bin 353118 -> 445726 bytes
clientgui/BOINCTaskBar.cpp | 3 --
clientgui/res/wcg.ico | Bin 353118 -> 445726 bytes
clientgui/res/wcgdisconnect.ico | Bin 445726 -> 35710 bytes
clientgui/res/wcgsnooze.ico | Bin 445726 -> 26054 bytes
.../World Community Grid/background_image.png | Bin 600463 -> 161527 bytes
clientgui/skins/World Community Grid/skin.xml | 48 +-------------------
clientgui/skins/World Community Grid/wcg_32.png | Bin 2546 -> 838 bytes
clientgui/skins/World Community Grid/wcg_pause.png | Bin 615 -> 658 bytes
clientgui/skins/World Community Grid/wcg_play.png | Bin 583 -> 531 bytes
clientgui/skins/World Community Grid/wcg_stop.png | Bin 497 -> 688 bytes
clientscr/res/boinc_logo_black.jpg | Bin 0 -> 36235 bytes
clientscr/res/gridrepublic_ss_logo.jpg | Bin 0 -> 9366 bytes
clientscr/res/progress_ss_logo.jpg | Bin 0 -> 5696 bytes
clientscr/res/wcg.bmp | Bin 135254 -> 108054 bytes
clientscr/res/wcg.ico | Bin 353118 -> 445726 bytes
clientscr/res/wcg_ss_logo.jpg | Bin 0 -> 16309 bytes
clientscr/ss_app.cpp | 27 ++++++++++--
configure.ac | 2 +-
lib/common_defs.h | 7 ++-
lib/win_util.cpp | 49 +++++++++++++++++++++
lib/win_util.h | 1 +
23 files changed, 81 insertions(+), 59 deletions(-)
diff --git a/client/gui_rpc_server_ops.cpp b/client/gui_rpc_server_ops.cpp
index 9a1f87d..f3c470e 100644
--- a/client/gui_rpc_server_ops.cpp
+++ b/client/gui_rpc_server_ops.cpp
@@ -599,8 +599,7 @@ static void handle_get_screensaver_tasks(GUI_RPC_CONN& grc) {
);
for (i=0; i<gstate.active_tasks.active_tasks.size(); i++) {
atp = gstate.active_tasks.active_tasks[i];
- if ((atp->task_state() == PROCESS_EXECUTING) ||
- ((atp->task_state() == PROCESS_SUSPENDED) && (gstate.suspend_reason == SUSPEND_REASON_CPU_THROTTLE))) {
+ if (atp->scheduler_state == CPU_SCHED_SCHEDULED) {
atp->result->write_gui(grc.mfout);
}
}
diff --git a/client/win/res/wcg.ico b/client/win/res/wcg.ico
index 30ae255..389b91b 100644
Binary files a/client/win/res/wcg.ico and b/client/win/res/wcg.ico differ
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index 0d11543..1fdb54f 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -83,9 +83,6 @@ END_EVENT_TABLE()
CTaskBarIcon::CTaskBarIcon(wxString title, wxIconBundle* icon, wxIconBundle* iconDisconnected, wxIconBundle* iconSnooze
-#ifdef __WXMAC__
-, wxTaskBarIconType iconType
-#endif
) :
#ifdef __WXMAC__
wxTaskBarIcon(DOCK)
diff --git a/clientgui/res/wcg.ico b/clientgui/res/wcg.ico
index 30ae255..389b91b 100644
Binary files a/clientgui/res/wcg.ico and b/clientgui/res/wcg.ico differ
diff --git a/clientgui/res/wcgdisconnect.ico b/clientgui/res/wcgdisconnect.ico
index b42be92..21e9875 100644
Binary files a/clientgui/res/wcgdisconnect.ico and b/clientgui/res/wcgdisconnect.ico differ
diff --git a/clientgui/res/wcgsnooze.ico b/clientgui/res/wcgsnooze.ico
index 6df3c67..509321f 100644
Binary files a/clientgui/res/wcgsnooze.ico and b/clientgui/res/wcgsnooze.ico differ
diff --git a/clientgui/skins/World Community Grid/background_image.png b/clientgui/skins/World Community Grid/background_image.png
index bb6bbbd..bf44f96 100644
Binary files a/clientgui/skins/World Community Grid/background_image.png and b/clientgui/skins/World Community Grid/background_image.png differ
diff --git a/clientgui/skins/World Community Grid/skin.xml b/clientgui/skins/World Community Grid/skin.xml
index 386d9eb..93d0ad5 100644
--- a/clientgui/skins/World Community Grid/skin.xml
+++ b/clientgui/skins/World Community Grid/skin.xml
@@ -24,60 +24,14 @@
<imagesrc>Red_dot.png</imagesrc>
</image>
</workunit_suspended_image>
- <notice_alert_color>36:117:107</notice_alert_color>
+ <notice_alert_color>0:100:157</notice_alert_color>
</simple>
<advanced>
<application_name>World Community Grid - BOINC Manager</application_name>
<application_short_name>World Community Grid</application_short_name>
-
- <application_logo>wcg_about.png</application_logo>
- <application_icon>
-
- <image>
-
- <imagesrc>wcg_play.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
-
- </image>
-
- </application_icon>
-
- <application_icon32>
-
- <image>
-
- <imagesrc>wcg_32.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
-
- </image>
-
- </application_icon32>
-
- <application_disconnected_icon>
-
- <image>
-
- <imagesrc>wcg_stop.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
-
- </image>
-
- </application_disconnected_icon>
-
- <application_snooze_icon>
-
- <image>
-
- <imagesrc>wcg_pause.png</imagesrc>
- <transparency_mask>255:0:255</transparency_mask>
-
- </image>
-
- </application_snooze_icon>
<organization_name>World Community Grid</organization_name>
<organization_website>http://www.worldcommunitygrid.org</organization_website>
<organization_help_url>http://www.worldcommunitygrid.org/boinc.do</organization_help_url>
-
</advanced>
</en>
</skin>
diff --git a/clientgui/skins/World Community Grid/wcg_32.png b/clientgui/skins/World Community Grid/wcg_32.png
index 67de6ca..f375154 100644
Binary files a/clientgui/skins/World Community Grid/wcg_32.png and b/clientgui/skins/World Community Grid/wcg_32.png differ
diff --git a/clientgui/skins/World Community Grid/wcg_pause.png b/clientgui/skins/World Community Grid/wcg_pause.png
index 0f52a04..e269666 100644
Binary files a/clientgui/skins/World Community Grid/wcg_pause.png and b/clientgui/skins/World Community Grid/wcg_pause.png differ
diff --git a/clientgui/skins/World Community Grid/wcg_play.png b/clientgui/skins/World Community Grid/wcg_play.png
index 387a754..f0c9b5a 100644
Binary files a/clientgui/skins/World Community Grid/wcg_play.png and b/clientgui/skins/World Community Grid/wcg_play.png differ
diff --git a/clientgui/skins/World Community Grid/wcg_stop.png b/clientgui/skins/World Community Grid/wcg_stop.png
index fb2211b..d1791bc 100644
Binary files a/clientgui/skins/World Community Grid/wcg_stop.png and b/clientgui/skins/World Community Grid/wcg_stop.png differ
diff --git a/clientscr/res/boinc_logo_black.jpg b/clientscr/res/boinc_logo_black.jpg
new file mode 100644
index 0000000..64fb6b4
Binary files /dev/null and b/clientscr/res/boinc_logo_black.jpg differ
diff --git a/clientscr/res/gridrepublic_ss_logo.jpg b/clientscr/res/gridrepublic_ss_logo.jpg
new file mode 100644
index 0000000..1a789a0
Binary files /dev/null and b/clientscr/res/gridrepublic_ss_logo.jpg differ
diff --git a/clientscr/res/progress_ss_logo.jpg b/clientscr/res/progress_ss_logo.jpg
new file mode 100644
index 0000000..0edd905
Binary files /dev/null and b/clientscr/res/progress_ss_logo.jpg differ
diff --git a/clientscr/res/wcg.bmp b/clientscr/res/wcg.bmp
index f670772..2ba1e27 100644
Binary files a/clientscr/res/wcg.bmp and b/clientscr/res/wcg.bmp differ
diff --git a/clientscr/res/wcg.ico b/clientscr/res/wcg.ico
index 30ae255..389b91b 100644
Binary files a/clientscr/res/wcg.ico and b/clientscr/res/wcg.ico differ
diff --git a/clientscr/res/wcg_ss_logo.jpg b/clientscr/res/wcg_ss_logo.jpg
new file mode 100644
index 0000000..6bd3253
Binary files /dev/null and b/clientscr/res/wcg_ss_logo.jpg differ
diff --git a/clientscr/ss_app.cpp b/clientscr/ss_app.cpp
index 2dde307..6c7558a 100644
--- a/clientscr/ss_app.cpp
+++ b/clientscr/ss_app.cpp
@@ -85,12 +85,18 @@ char* brand_name = "BOINC";
char* logo_file = "boinc_logo_black.jpg";
# else
// These defines are used only on Windows builds
-#ifdef _GRIDREPUBLIC
+#if defined(_GRIDREPUBLIC)
const char* brand_name = "GridRepublic";
const char* logo_file = "gridrepublic_ss_logo.jpg";
#elif defined(_CHARITYENGINE)
const char* brand_name = "Charity Engine";
const char* logo_file = "CE_ss_logo.jpg";
+#elif defined(_PROGRESSTHRUPROCESSORS)
+const char* brand_name = "Progress Thru Processors";
+const char* logo_file = "progress_ss_logo.jpg";
+#elif defined(_WCG)
+const char* brand_name = "World Community Grid";
+const char* logo_file = "wcg_ss_logo.jpg";
#else
const char* brand_name = "BOINC";
const char* logo_file = "boinc_logo_black.jpg";
@@ -163,6 +169,9 @@ PROJECT_IMAGES* get_project_images(PROJECT* p) {
#endif
+
+
+
// set up lighting model
//
static void init_lights() {
@@ -466,12 +475,18 @@ void boinc_app_key_release(int, int){}
void app_graphics_init() {
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+
+#ifdef _WIN32
+ chdir_to_install_dir();
+#endif
+
ttf_load_fonts(".");
-#ifdef _WCG
- logo.load_image_file("wcg.bmp");
-#else
logo.load_image_file(logo_file);
+
+#ifdef _WIN32
+ chdir_to_data_dir();
#endif
+
init_lights();
}
@@ -535,8 +550,12 @@ int main(int argc, char** argv) {
#endif
boinc_graphics_loop(argc, argv, "BOINC screensaver");
+
boinc_finish_diag();
+
#ifdef _WIN32
WinsockCleanup();
#endif
+
+ return 0;
}
diff --git a/configure.ac b/configure.ac
index 971ea8e..2b79f8c 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.2.44)
+AC_INIT(BOINC, 7.2.47)
AC_CONFIG_MACRO_DIR([m4])
LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
AC_SUBST([LIBBOINC_VERSION])
diff --git a/lib/common_defs.h b/lib/common_defs.h
index 4134bd6..2c52c7c 100644
--- a/lib/common_defs.h
+++ b/lib/common_defs.h
@@ -89,8 +89,11 @@
// (used internally within the client;
// changed to MSG_USER_ALERT before passing to manager)
-// bitmap defs for task_suspend_reason, network_suspend_reason
-// Note: doesn't need to be a bitmap, but keep for compatibility
+// values for suspend_reason, network_suspend_reason
+// Notes:
+// - doesn't need to be a bitmap, but keep for compatibility
+// - with new CPU throttling implementation (separate thread)
+// CLIENT_STATE.suspend_reason will never be SUSPEND_REASON_CPU_THROTTLE.
//
enum SUSPEND_REASON {
SUSPEND_REASON_BATTERIES = 1,
diff --git a/lib/win_util.cpp b/lib/win_util.cpp
index d1588da..041f582 100644
--- a/lib/win_util.cpp
+++ b/lib/win_util.cpp
@@ -205,6 +205,55 @@ BOOL TerminateProcessById( DWORD dwProcessID ) {
}
+void chdir_to_install_dir() {
+ LONG lReturnValue;
+ HKEY hkSetupHive;
+ LPSTR lpszRegistryValue = NULL;
+ char szPath[MAX_PATH];
+ DWORD dwSize = 0;
+
+ // change the current directory to the boinc data directory if it exists
+ lReturnValue = RegOpenKeyExA(
+ HKEY_LOCAL_MACHINE,
+ "SOFTWARE\\Space Sciences Laboratory, U.C. Berkeley\\BOINC Setup",
+ 0,
+ KEY_READ,
+ &hkSetupHive
+ );
+ if (lReturnValue == ERROR_SUCCESS) {
+ // How large does our buffer need to be?
+ lReturnValue = RegQueryValueExA(
+ hkSetupHive,
+ "INSTALLDIR",
+ NULL,
+ NULL,
+ NULL,
+ &dwSize
+ );
+ if (lReturnValue != ERROR_FILE_NOT_FOUND) {
+ // Allocate the buffer space.
+ lpszRegistryValue = (LPSTR) malloc(dwSize);
+ (*lpszRegistryValue) = NULL;
+
+ // Now get the data
+ lReturnValue = RegQueryValueExA(
+ hkSetupHive,
+ "INSTALLDIR",
+ NULL,
+ NULL,
+ (LPBYTE)lpszRegistryValue,
+ &dwSize
+ );
+
+ SetCurrentDirectoryA(lpszRegistryValue);
+ }
+ }
+
+ if (hkSetupHive) RegCloseKey(hkSetupHive);
+ if (lpszRegistryValue) free(lpszRegistryValue);
+}
+
+
void chdir_to_data_dir() {
LONG lReturnValue;
HKEY hkSetupHive;
diff --git a/lib/win_util.h b/lib/win_util.h
index 688cfb3..e7cf4e0 100644
--- a/lib/win_util.h
+++ b/lib/win_util.h
@@ -21,6 +21,7 @@
extern BOOL IsWindows2000Compatible();extern BOOL IsTerminalServicesEnabled();
extern BOOL ValidateProductSuite(LPSTR SuiteName);
extern BOOL TerminateProcessById(DWORD dwProcessId);
+extern void chdir_to_install_dir();
extern void chdir_to_data_dir();
extern bool is_remote_desktop();
--
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