Changeset a34b229 in nscp for helpers

Timestamp:

09/09/08 10:11:36 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

7221dc8

Parents:

dc59b0e

Message:

2008-09-09 MickeM

• Fixed issue with & and some commands via check_nt.
• Fixed a crash on exit (which I added in Rc1).
• Added 10 "bytes" the CPU buffer: (#174) + Added new option to [EventLog?] section buffer_size to change the size of the buffer used when scanning the evenlotg (defaults to 64k).
• Fixed error handling in CHeckEventLog so errors are repoorted properly (#184)

Location:

helpers/systray_helper

Files:

• ReadMe.txt (deleted)
• TrayWidget.cpp (modified) (10 diffs)
• TrayWidget.h (modified) (1 diff)
• res/standby.ico (added)

helpers/systray_helper/TrayWidget.cpp

@@ -33 +33 @@
 
 logging::file_logger g_log_instance(_T("nsclient++"),_T("systray.log"));
+HINSTANCE ghInstance = NULL;
+TrayWidget *gTrayInstance = NULL;
 
 #define LOG_ERROR_FILE(x) g_log_instance.log(_T("error"), __FILEW__, __LINE__, std::wstring(x).c_str());
@@ -41 +43 @@
 
 #define LOG_ERROR_TO_TRAY(x) gTrayInstance->log(_T("error"), __FILEW__, __LINE__, std::wstring(x).c_str());
+#define LOG_MESSAGE_TO_TRAY(x) gTrayInstance->log(_T("message"), __FILEW__, __LINE__, std::wstring(x).c_str());
 
 #if WINVER < 0x0600
@@ -52 +55 @@
     HMODULE hMod = GetModuleHandle(TEXT("user32"));
     if (hMod == NULL)
-      return false;
+      return FALSE;
     fnChangeWindowMessageFilter = (LPFN_CHANGEWINDOWMESSAGEFILTER)GetProcAddress(hMod,"ChangeWindowMessageFilter");
   }
   if (fnChangeWindowMessageFilter == NULL) {
-    return true;
-  }
+    LOG_ERROR_FILE(_T("Could not find ChangeWindowMessageFilter: ") + error::lookup::last_error());
+    return TRUE;
+  }
+  LOG_ERROR_FILE(_T("registred windows thingy..."));
   return fnChangeWindowMessageFilter(message,what);
 }
@@ -72 +77 @@
   return _T("");
 }
-HINSTANCE ghInstance = NULL;
-TrayWidget *gTrayInstance = NULL;
 TrayWidget::TrayWidget(std::wstring cmdLine) {
   strEx::splitList list = strEx::splitEx(cmdLine, _T(" "));
@@ -124 +127 @@
 
 
+
 void TrayWidget::createDialog(HINSTANCE hInstance) {
+  LOG_MESSAGE_TRAY(_T("Creating dialog..."));
   ghInstance = hInstance;
-  hDlgWnd = ::CreateDialog(hInstance,MAKEINTRESOURCE(IDD_NSTRAYDLG),NULL,TrayIcon::DialogProc);
-  if ((hDlgWnd == NULL)||!IsWindow(hDlgWnd)) {
-    LOG_ERROR_TRAY(_T("Failed to create windows: ") + error::lookup::last_error());
-  }
+  //hDlgWnd = ::CreateDialog(hInstance,MAKEINTRESOURCE(IDD_NSTRAYDLG),NULL,TrayIcon::DialogProc);
+  //if ((hDlgWnd == NULL)||!IsWindow(hDlgWnd)) {
+//    LOG_ERROR_TRAY(_T("Failed to create windows: ") + error::lookup::last_error());
+//  }
+
+  WNDCLASSEX wndclass;
+  wndclass.lpszMenuName=NULL;
+  wndclass.cbSize=sizeof(wndclass);
+  wndclass.lpfnWndProc=TrayIcon::DialogProc;
+  wndclass.cbClsExtra=0;
+  wndclass.cbWndExtra=0;
+  wndclass.hInstance=hInstance;
+  wndclass.hIcon=NULL;
+  wndclass.hbrBackground=(HBRUSH)GetStockObject(WHITE_BRUSH);
+  wndclass.hCursor=LoadCursor(NULL,IDC_ARROW);
+  wndclass.hIconSm=NULL;
+  wndclass.lpszClassName=_T("NSClient_pp_TrayClass");
+  wndclass.style=0;
+  // register task bar restore event after crash
+  //WM_TASKBARCREATED=RegisterWindowMessage(TEXT("TaskbarCreated"));
+  //MyChangeWindowMessageFilter(WM_TASKBARCREATED, MSGFLT_ADD); 
 
   UINT UDM_TASKBARCREATED = RegisterWindowMessage(_T("TaskbarCreated"));
@@ -139 +161 @@
   }
 
+  if (!RegisterClassEx(&wndclass)) {
+    LOG_ERROR_TRAY(_T("Failed to register window class: ") + error::lookup::last_error());
+  }
+
+  MSG msg;
+  hDlgWnd=CreateWindow(_T("NSClient_pp_TrayClass"),NULL,0,CW_USEDEFAULT,CW_USEDEFAULT,CW_USEDEFAULT,CW_USEDEFAULT,NULL,NULL,hInstance,NULL);
+  if(hDlgWnd==NULL)
+  {
+    LOG_ERROR_TRAY(_T("Failed to create window: ") + error::lookup::last_error());
+    return;
+  }
+  while(GetMessage(&msg,NULL,0,0))
+  {
+    if (msg.message == WM_MY_CLOSE) {
+      ::DestroyWindow(hDlgWnd);
+    } else if (msg.message == UDM_TASKBARCREATED) {
+      LOG_MESSAGE_TRAY(_T("Recreating systray icon..."));
+      TrayIcon::addIcon(msg.hwnd);
+    } else {
+      TranslateMessage(&msg);
+      DispatchMessage(&msg);
+    }
+  }
+  return;
+  
+  /*
   MSG Msg;
   BOOL bRet;
@@ -158 +206 @@
     } 
   }
+  */
 }
 
@@ -529 +578 @@
 namespace TrayIcon
 {
+  UINT UDM_TASKBARCREATED = -1;
   HMENU hPopupMenu_ = NULL;
 }
-INT_PTR CALLBACK TrayIcon::DialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
+//LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
+LRESULT CALLBACK TrayIcon::DialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
 {
+  if (uMsg == UDM_TASKBARCREATED) {
+    addIcon(hwndDlg);
+    LOG_MESSAGE_TO_TRAY(_T("UDM_TASKBARCREATED"));
+  }
+
   switch (uMsg) 
   {
@@ -542 +598 @@
     return 0;
 
+  case WM_CREATE:
   case WM_INITDIALOG:
+    LOG_MESSAGE_TO_TRAY(_T("WM_INITDIALOG"));
+
+
+    UDM_TASKBARCREATED = RegisterWindowMessage(_T("TaskbarCreated"));
+    if (UDM_TASKBARCREATED == 0) {
+      LOG_MESSAGE_TO_TRAY(_T("Failed to register 'TaskbarCreated': ") + error::lookup::last_error());
+    }
+    if (!ChangeWindowMessageFilter(UDM_TASKBARCREATED, MSGFLT_ADD)) {
+      LOG_MESSAGE_TO_TRAY(_T("Failed to cchange window filter: ") + error::lookup::last_error());
+    }
+
     addIcon(hwndDlg);
     break;
@@ -601 +669 @@
     break;
   }
-  return FALSE;
+  return DefWindowProc(hwndDlg,uMsg,wParam,lParam);
+  //return FALSE;
 }
 void TrayIcon::addIcon(HWND hWnd) {

helpers/systray_helper/TrayWidget.h

@@ -75 +75 @@
 namespace TrayIcon
 {
-  INT_PTR CALLBACK DialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);
+  LRESULT CALLBACK DialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);
   INT_PTR CALLBACK InjectDialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);
   INT_PTR CALLBACK LogDialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);