no message

svn path=/trunk/boinc/; revision=739

client/win/res/icon.ico

@@ -1 +1 @@
-
  و&(
( @
<04><02><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><03><><EFBFBD>?<3F>ـ<1F><1F><1F><1F><0F><1F><0F><1F><0F><1F><0F><1F><0F><1F><0F>ِ<1F>ـ?<3F><><7F><EFBFBD><07><>
<01><><1F><>ـ<D980>ِ?<3F><1F><1F><1F><1F><1F><1F><1F><1F><1F><1F>ِ<1F><1F>?<3F><EFBFBD><7F><EFBFBD><07><><EFBFBD><EFBFBD><EFBFBD>( 
<04><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ا<>اكاكاكااا<0F>?ااااااااا<D8A7><0F>?
+
  è&(
( @
€€€€€€€€€€ÀÀÀ€€€ÿÿÿÿÿÿÿÿÿÿÿÿÌÀÀÌàÀÌÀàÀÌÌDD@ÌÌÄDDDDDÌÄDDDDDDÌÌDDDDDDDDÌÀÌOÿÿôDDDDLÌÌOÿÿÿÿDDDLÌÀîàOôOôOÿDDLÌÌÌîDDOôDOôD@ÌÀîDDOôDDÿDNîÌDDOôDDÿDNÌÀDDOôDOÿDÌODOÿÿÿô@ÌÀÌOÿÿÿÿôDDÌÌÀÌDDOôÿDDDLÌÌÀÌDDOôOÿDDLÌÌÌÌÌÌOôDOôD@ÌÌÀDOôDOÿD@ÌÌÀDOôDDÿôLÌÀOÿôDDÿôLÌÀOÿÿDÿÿôàÀÀOÿÿÿÿ@îDÿÿD@îÌDDàÌÀÌÀÌÀÌÀÀÿÿ¿ÿïÿ?ÿçÿÿãþÿñþÿððÿøþøøüáŒÀà
€àð?øüø
øðà@ÁÀ?‡À?ÀÀÿÀ
ÿ€<0F>ÿˆÇÿ˜ÿçÿüÿ÷ÿýÿÿ( 
À€€€€€€€€€ÀÀÀ€€€ÿÿÿÿÿÿÿÿÿÿÿÿDDDD‡DDDDD@Oÿø„DHOHôÿDHDHôDôHDHôDøHDHø‡ô€OÿÿøD@DHôøDHHôHôHHôD÷HÿôDÿH‡÷<E280A1>÷€HÿDˆøÿàÀÀÀÀÀÀÀÀðàààøþ?

client/win/res/iconhigh.ico

@@ -1 +1 @@
-
  è&(
( @
€€€€€€€€€€ÀÀÀ€€€ÿÿÿÿÿÿÿÿÿÿÿÿ™™	™™™<E284A2><E284A2>	™™™™<E284A2>	<09>	™™™™™	<09>	™™™™™<E284A2>™<EFBFBD>	™™™™™™™<E284A2>	™™™™™™	™<>	™™™™™™<E284A2>	™<>	™™™™<E284A2>™<EFBFBD>	™<>	™™™™	™<>™™<E284A2>	™™™<E284A2>™™™™™<E284A2>	™™	™™™™™<E284A2>™™™™™™<E284A2>	™™™™™™™<E284A2>	™™™™™™<E284A2>	™™™™™™	™<>	™™™<E284A2>	™™<E284A2>	™<>	™™™™™™<E284A2>	™<>	™™™™<E284A2>	™<>™<EFBFBD>	™™™™<E284A2>	™™<E284A2>	™™™™<E284A2>	™	<09>	™™™™<E284A2>	<09><>	™™™™<E284A2>	<09>	™™™™		™™™<E284A2>	™™ÿü?ÿøÿøø?øððàÀÀ€
€
€
€
€
€
ÀÀàððøøøÿøÿÿü?ÿ( 
À€€€€€€€€€ÀÀÀ€€€ÿÿÿÿÿÿÿÿÿÿÿÿ	™™<E284A2>	™<>		™™<E284A2>		™™<E284A2><E284A2>™	™™<E284A2>™™	™™	™™	™™™™™™™™	™™™™	™™	™		™™	<09>	™™		™™	<09>øÀÀÀ€
€
ÀÀÀÀ
+
  Х&(
( @
──────────ююю───ЪЪЪЪЪЪЪЪЪЪЪЪ≥°≥≥≥л≥≥ю≥≥≥≥и≥≥л	≥≥≥░Юи≥≥░ли≥≥≥░Юи≥≥≥░лл≥≥DD@л≥≥≥≥°лдDDDDD≥≥≥≥	°лдDDDDDD≥≥≥°л≥≥лDDDDDDDD≥°лю≥лOЪЪТDDDDLлл	OЪЪЪЪDDDLли░	░НЮOТOТOЪDDLл≥░ллНDDOТDOТD@°люНDDOТDDЪDNН≥≥°лDDOТDDЪDN≥≥≥≥люDDOТDOЪD≥≥≥≥≥°лODOЪЪЪТ@ли≥≥≥≥≥лOЪЪЪЪТDDлли≥≥≥°лDDOТЪDDDLлли	≥°лDDOТOЪDDLллл	≥лллOТDOТDI≥≥░	°ллиDOТDOЪDI≥≥░лли≥DOТDDЪТL≥≥ли≥≥OЪТDDЪТL≥≥ли≥≥≥OЪЪDЪЪТЮи░ю≥≥≥OЪЪЪЪ@Н	≥≥≥DЪЪDI	≥░НлDD≥≥░	░Ю°ли≥≥≥░лю░	°л≥≥≥≥ю≥≥л≥≥≥юи≥ЪЭ?ЪОюЪГЪБПППЮю
──
─

──
─
ю─pПЬЧGЪГЪюВЪЭ?Ъ( 
ю─────────ююю───ЪЪЪЪЪЪЪЪЪЪЪЪD≥░DDD┤DDDDDIOЪЬ└DH	OHТЪDH░≥DHТDТH≥≥DHТDЬH≥≥DHЬ┤Т┴≥≥OЪЪЬDI≥≥DHТЬDH≥≥≥HТHТH≥	≤HТDВH░≤ЪТDЪH≈┤В▐В┴≤HЪD	≈┬░ЬЮюю─
─
ююПЬ

client/win/resource.h

@@ -59,13 +59,15 @@
 #define ID_FILE_CLEARMESSAGES           40028
 #define ID_SETTINGS_PROXYSERVER         40029
 #define ID_FILE_SHOWGRAPHICS            40030
+#define ID_STATUSICON_RESUME            40031
+#define ID_FILE_RESUME                  40032
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        128
-#define _APS_NEXT_COMMAND_VALUE         40031
+#define _APS_NEXT_COMMAND_VALUE         40033
 #define _APS_NEXT_CONTROL_VALUE         1019
 #define _APS_NEXT_SYMED_VALUE           101
 #endif

client/win/resource.rc

@@ -179,8 +179,8 @@ BEGIN
         MENUITEM "Clear &Messages",             ID_FILE_CLEARMESSAGES
         MENUITEM "Clear &Inactive",             ID_FILE_CLEARINACTIVE
         MENUITEM SEPARATOR
-        MENUITEM "&Hide",                       ID_FILE_HIDE
         MENUITEM "&Suspend",                    ID_FILE_SUSPEND
+        MENUITEM "&Resume",                     ID_FILE_RESUME
         MENUITEM SEPARATOR
         MENUITEM "E&xit",                       ID_FILE_EXIT
     END
@@ -201,8 +201,8 @@ IDR_CONTEXT MENU DISCARDABLE
 BEGIN
     POPUP "Status Icon"
     BEGIN
-        MENUITEM "Hide",                        ID_STATUSICON_HIDE
         MENUITEM "Suspend",                     ID_STATUSICON_SUSPEND
+        MENUITEM "Resume",                      ID_STATUSICON_RESUME
         MENUITEM SEPARATOR
         MENUITEM "Exit",                        ID_STATUSICON_EXIT
     END

client/win/wingui.cpp

@@ -1245,14 +1245,10 @@ void CPieChartCtrl::OnPaint()
 //				otherwise shows the currently running window
 BOOL CMyApp::InitInstance()
 {
-	CWnd* pBoincWnd;
-	pBoincWnd = CWnd::FindWindow(NULL, WND_TITLE);
-	if(pBoincWnd) {
-		if(pBoincWnd->GetExStyle() & WS_EX_TOOLWINDOW) {
-			pBoincWnd->ShowWindow(SW_SHOW);
-			pBoincWnd->SetForegroundWindow();
-			return FALSE;
-		}
+	if(CreateMutex(NULL, false, "BOINC_MUTEX") == 0 || GetLastError() == ERROR_ALREADY_EXISTS) {
+		UINT nShowMsg = RegisterWindowMessage("BOINC_SHOW_MESSAGE");
+		PostMessage(HWND_BROADCAST, nShowMsg, 0, 0);
+		return FALSE;
 	}
     m_pMainWnd = new CMainWindow();
 	m_pMainWnd->ShowWindow(SW_SHOW);
@@ -1270,6 +1266,7 @@ BEGIN_MESSAGE_MAP(CMainWindow, CWnd)
     ON_COMMAND(ID_FILE_CLEARMESSAGES, OnCommandFileClearMessages)
     ON_COMMAND(ID_FILE_HIDE, OnCommandHide)
     ON_COMMAND(ID_FILE_SUSPEND, OnCommandSuspend)
+    ON_COMMAND(ID_FILE_RESUME, OnCommandResume)
     ON_COMMAND(ID_FILE_EXIT, OnCommandExit)
     ON_COMMAND(ID_SETTINGS_LOGIN, OnCommandSettingsLogin)
     ON_COMMAND(ID_SETTINGS_QUIT, OnCommandSettingsQuit)
@@ -1279,6 +1276,7 @@ BEGIN_MESSAGE_MAP(CMainWindow, CWnd)
     ON_COMMAND(ID_PROJECT_QUIT, OnCommandProjectQuit)
     ON_COMMAND(ID_STATUSICON_HIDE, OnCommandHide)
     ON_COMMAND(ID_STATUSICON_SUSPEND, OnCommandSuspend)
+    ON_COMMAND(ID_STATUSICON_RESUME, OnCommandResume)
     ON_COMMAND(ID_STATUSICON_EXIT, OnCommandExit)
     ON_WM_CREATE()
     ON_WM_RBUTTONDOWN()
@@ -1808,6 +1806,24 @@ void CMainWindow::PostNcDestroy()
     delete this;
 }
 
+//////////
+// CMainWindow::DefWindowProc
+// arguments:	message: message received
+//				wParam: message's wparam
+//				lParam: message's lparam
+// returns:		dependent on message
+// function:	handles any messages not handled by the window previously
+LRESULT CMainWindow::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
+{
+	UINT uShowMsg = RegisterWindowMessage("BOINC_SHOW_MESSAGE");
+	if(uShowMsg == message) {
+		ShowWindow(SW_SHOW);
+		SetForegroundWindow();
+		return 0;
+	}
+	return CWnd::DefWindowProc(message, wParam, lParam);
+}
+
 //////////
 // CMainWindow::OnClose
 // arguments:	void
@@ -2017,27 +2033,43 @@ void CMainWindow::OnCommandHide()
 // CMainWindow::OnCommandSuspend
 // arguments:	void
 // returns:		void
-// function:	suspends or unsuspends the window
+// function:	suspends client
 void CMainWindow::OnCommandSuspend()
 {
+	gstate.suspend_requested = true;
+	m_bSuspend = true;
+
 	CMenu* pMainMenu;
 	CMenu* pFileMenu;
 	pMainMenu = GetMenu();
 	if(pMainMenu) {
 		pFileMenu = pMainMenu->GetSubMenu(0);
 	}
-	if(m_bSuspend) {
-		gstate.suspend_requested = false;
-		m_bSuspend = false;
-		if(pFileMenu) {
-			pFileMenu->CheckMenuItem(ID_FILE_SUSPEND, MF_UNCHECKED);
-		}
-	} else {
-		gstate.suspend_requested = true;
-		m_bSuspend = true;
-		if(pFileMenu) {
-			pFileMenu->CheckMenuItem(ID_FILE_SUSPEND, MF_CHECKED);
-		}
+	if(pFileMenu) {
+		pFileMenu->EnableMenuItem(ID_FILE_SUSPEND, MF_GRAYED);
+		pFileMenu->EnableMenuItem(ID_FILE_RESUME, MF_ENABLED);
+	}
+}
+
+//////////
+// CMainWindow::OnCommandResume
+// arguments:	void
+// returns:		void
+// function:	resumes client
+void CMainWindow::OnCommandResume()
+{
+	gstate.suspend_requested = false;
+	m_bSuspend = false;
+
+	CMenu* pMainMenu;
+	CMenu* pFileMenu;
+	pMainMenu = GetMenu();
+	if(pMainMenu) {
+		pFileMenu = pMainMenu->GetSubMenu(0);
+	}
+	if(pFileMenu) {
+		pFileMenu->EnableMenuItem(ID_FILE_SUSPEND, MF_ENABLED);
+		pFileMenu->EnableMenuItem(ID_FILE_RESUME, MF_GRAYED);
 	}
 }
 
@@ -2096,8 +2128,8 @@ int CMainWindow::OnCreate(LPCREATESTRUCT lpcs)
 
     g_myWnd = this;
 	m_nIconState = ICON_OFF;
-	m_bMessage = false;
 	m_bSuspend = false;
+	m_bMessage = false;
 	m_nContextItem = -1;
 
 	// load main menu
@@ -2185,8 +2217,7 @@ int CMainWindow::OnCreate(LPCREATESTRUCT lpcs)
 	m_TabCtrl.SetFont(&m_Font);
 	m_UsagePieCtrl.SetFont(&m_Font);
 
-	// remove button from taskbar and add status icon in taskbar
-	ModifyStyleEx(WS_EX_APPWINDOW, WS_EX_TOOLWINDOW);
+	// add status icon to taskbar
 	SetStatusIcon(ICON_NORMAL);
 
 	// take care of other things
@@ -2226,6 +2257,7 @@ int CMainWindow::OnCreate(LPCREATESTRUCT lpcs)
 
 	LoadUserSettings();
 	UpdateGUI(&gstate);
+	OnCommandResume();
 
     return 0;
 }
@@ -2425,15 +2457,10 @@ LRESULT CMainWindow::OnStatusIcon(WPARAM wParam, LPARAM lParam)
 			Menu.DestroyMenu();
 			return FALSE;
 		}
-		if(IsWindowVisible()) {
-			pSubmenu->CheckMenuItem(ID_STATUSICON_HIDE, MF_UNCHECKED);
-		} else {
-			pSubmenu->CheckMenuItem(ID_STATUSICON_HIDE, MF_CHECKED);
-		}
 		if(m_bSuspend) {
-			pSubmenu->CheckMenuItem(ID_STATUSICON_SUSPEND, MF_CHECKED);
+			pSubmenu->EnableMenuItem(ID_STATUSICON_SUSPEND, MF_GRAYED);
 		} else {
-			pSubmenu->CheckMenuItem(ID_STATUSICON_SUSPEND, MF_UNCHECKED);
+			pSubmenu->EnableMenuItem(ID_STATUSICON_RESUME, MF_GRAYED);
 		}
 		pSubmenu->TrackPopupMenu(TPM_LEFTALIGN|TPM_RIGHTBUTTON, point.x, point.y, this);
 		Menu.DestroyMenu();

client/win/wingui.h

@@ -40,6 +40,7 @@
 // constants
 
 #define WND_TITLE			"BOINC"		// window's title
+#define REGISTER_WND_CLASS	AfxRegisterWndClass(CS_VREDRAW|CS_HREDRAW, ::LoadCursor(NULL, IDC_ARROW),	(HBRUSH)::GetStockObject(WHITE_BRUSH), ::LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICON)))		// registering window's class
 
 #ifndef IDC_HAND
 #define IDC_HAND			MAKEINTRESOURCE(32649)	// hand pointer, the "hidden resource"
@@ -252,6 +253,7 @@ protected:
 	DWORD					GetUserIdleTime();
 	void					Syncronize(CProgressListCtrl*, vector<void*>*);
     virtual void			PostNcDestroy();
+	LRESULT					DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
 
     afx_msg void			OnClose();
 	afx_msg void			OnCommandSettingsQuit();
@@ -265,6 +267,7 @@ protected:
 	afx_msg void			OnCommandFileClearMessages();
 	afx_msg void			OnCommandHide();
 	afx_msg void			OnCommandSuspend();
+	afx_msg void			OnCommandResume();
 	afx_msg void			OnCommandExit();
     afx_msg int				OnCreate(LPCREATESTRUCT);
 	afx_msg BOOL			OnNotify(WPARAM, LPARAM, LRESULT*);

todo

@@ -8,12 +8,9 @@ get benchmark working as separate process
 validate in crontab
 
 Windows client
-    "bring up graphics" button/menu item in core client
     make mini-logo
     test uninstall
-    fix "unable to calculate"
     xfers: show file size,
-    completed results: show final CPU time
 -----------------------
 
 test feeder reread-DB mechanism