Changeset 9567d4b in nscp for modules/SysTray

Timestamp:

06/15/08 19:18:21 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

739db5a

Parents:

367bf20

Message:

2008-05-?? MickeM

• BREAKING CHANGE! -- THe API function NSCLoadPlugin has been changed to take an integer to define the load-status

2008-06-?? MickeM

• BREAKING CHANGE! -- New settings API as well as new WEBConfiguration UI (nothing is finnished yet but I wanted to check things into the SVN since it is a lot of changes now :)

2008-05-14 MickeM

• Fixed memoryleak in the service checker.

I am really sorry I usualy write better code then this.

2008-05-11 MickeM

• BREAKING CHANGE! -- Changed PDH options to a more uniform design:

auto_detect_pdh and dont_use_pdh_index has been removed and instead there is a new method option that takes various values.

Location:

modules/SysTray

Files:

• SysTray.cpp (modified) (1 diff)
• SysTray.h (modified) (1 diff)

modules/SysTray/SysTray.cpp

@@ -35 +35 @@
 SysTray::SysTray() : icon(_T("SysTray")) {}
 SysTray::~SysTray() {}
-bool SysTray::loadModule() {
-  try {
-    if ((serviceControll::GetServiceType(SZSERVICENAME)&SERVICE_INTERACTIVE_PROCESS)!=SERVICE_INTERACTIVE_PROCESS) {
+bool SysTray::loadModule(NSCAPI::moduleLoadMode mode) {
+  if (mode == NSCAPI::normalStart) {
+    try {
+      if ((serviceControll::GetServiceType(SZSERVICENAME)&SERVICE_INTERACTIVE_PROCESS)!=SERVICE_INTERACTIVE_PROCESS) {
+        NSC_LOG_ERROR(_T("SysTray is not installed (or it cannot interact with the desktop) SysTray won't be loaded. Run ") SZAPPNAME _T(" SysTray install to change this."));
+        return true;
+      }
+    } catch (serviceControll::SCException e) {
       NSC_LOG_ERROR(_T("SysTray is not installed (or it cannot interact with the desktop) SysTray won't be loaded. Run ") SZAPPNAME _T(" SysTray install to change this."));
       return true;
     }
-  } catch (serviceControll::SCException e) {
-    NSC_LOG_ERROR(_T("SysTray is not installed (or it cannot interact with the desktop) SysTray won't be loaded. Run ") SZAPPNAME _T(" SysTray install to change this."));
-    return true;
+    icon.createThread();
   }
-  icon.createThread();
   return true;
 }

modules/SysTray/SysTray.h

@@ -53 +53 @@
   virtual ~SysTray();
   // Module calls
-  bool loadModule();
+  bool loadModule(NSCAPI::moduleLoadMode mode);
   bool unloadModule();
   void setLogWindow(HWND hWnd);