Changeset 371df23 in nscp

Timestamp:

09/18/08 07:30:15 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

bb8b6d1

Parents:

08f0346

Message:

• Added option [EventLog?] lookup_names=0 to disable the evetlog name lookup (default is on)

Files:

• AutoBuild.h (modified) (1 diff)
• changelog (modified) (1 diff)
• include/config.h (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (4 diffs)
• modules/CheckEventLog/CheckEventLog.h (modified) (1 diff)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,4,30
-#define PRODUCTVER     0,3,4,30
-#define STRFILEVER     _T("0.3.4.30")
-#define STRPRODUCTVER  _T("0.3.4.30")
-#define STRPRODUCTDATE  _T("2008-09-16")
+#define FILEVER        0,3,4,32
+#define PRODUCTVER     0,3,4,32
+#define STRFILEVER     _T("0.3.4.32")
+#define STRPRODUCTVER  _T("0.3.4.32")
+#define STRPRODUCTDATE  _T("2008-09-18")
 #endif // AUTOBUILD_H

changelog

@@ -6 +6 @@
 
 2008-09-17 MickeM - 0.3.4 RC-6
+ * Added option [EventLog] lookup_names=0 to disable the evetlog name lookup (default is on)
+
+2008-09-17 MickeM
  * Fixed issue on all filters so == takes the "usual" 2 equalsigns (old still works).
  * Added so tray icon can get "propper" name from core for "description".

include/config.h

@@ -159 +159 @@
 #define EVENTLOG_DEBUG _T("debug")
 #define EVENTLOG_DEBUG_DEFAULT 0
+#define EVENTLOG_LOOKUP_NAMES _T("lookup_names")
+#define EVENTLOG_LOOKUP_NAMES_DEFAULT 1
 #define EVENTLOG_SYNTAX _T("syntax")
 #define EVENTLOG_SYNTAX_DEFAULT _T("")

modules/CheckEventLog/CheckEventLog.cpp

@@ -48 +48 @@
     NSCModuleHelper::registerCommand(_T("CheckEventLog"), _T("Check for errors in the event logger!"));
     debug_ = NSCModuleHelper::getSettingsInt(EVENTLOG_SECTION_TITLE, EVENTLOG_DEBUG, EVENTLOG_DEBUG_DEFAULT)==1;
+    lookup_names_ = NSCModuleHelper::getSettingsInt(EVENTLOG_SECTION_TITLE, EVENTLOG_LOOKUP_NAMES, EVENTLOG_LOOKUP_NAMES_DEFAULT)==1;
     syntax_ = NSCModuleHelper::getSettingsString(EVENTLOG_SECTION_TITLE, EVENTLOG_SYNTAX, EVENTLOG_SYNTAX_DEFAULT);
     buffer_ = NSCModuleHelper::getSettingsInt(EVENTLOG_SECTION_TITLE, EVENTLOG_BUFFER, EVENTLOG_BUFFER_DEFAULT);
@@ -168 +169 @@
 }
 
-std::wstring load_string(std::wstring module, UINT id, DWORD bufferSize = 2048) {
-  //HMODULE hModule = LoadLibrary(module.c_str());
-  HMODULE hModule = LoadLibraryEx(module.c_str(), NULL, LOAD_LIBRARY_AS_DATAFILE);
-  //HMODULE hModule = GetModuleHandle(module.c_str());
-  if (hModule == NULL) {
-    return _T("failed to load: ") + module + _T("( reson: ") + error::lookup::last_error();
-  }
-
-  std::wstring rName = _T("1");
-  std::wstring ret;
-  HRSRC rsSrc = FindResource(hModule, rName.c_str(), RT_MESSAGETABLE);
-  if (rsSrc == NULL)
-    ret = _T("Failed to load string ") + strEx::itos(id) + _T(" reason was: ") + error::lookup::last_error(); 
-  /*
-  TCHAR *buffer = new TCHAR[bufferSize+1];
-  if (LoadString(hModule, id, buffer, bufferSize) != 0) {
-    ret = buffer;
-  } else {
-    ret = _T("Failed to load string ") + strEx::itos(id) + _T(" reason was: ") + error::lookup::last_error(); 
-  }
-  NSC_DEBUG_MSG_STD(buffer);
-  delete [] buffer;
-  */
-  return ret;
-
-}
 std::wstring find_eventlog_name(std::wstring name) {
   try {
@@ -206 +181 @@
         strEx::replace(real_name, _T("\n"), _T(""));
         strEx::replace(real_name, _T("\r"), _T(""));
-        //strEx::replace(real_name, _T("\m"), _T(""));
-        //NSC_DEBUG_MSG_STD(_T("Found file: ") + real_name + _T(" for ") + *cit);
         if (real_name == name)
           return *cit;
@@ -608 +581 @@
 
   for (std::list<std::wstring>::const_iterator cit2 = files.begin(); cit2 != files.end(); ++cit2) {
-    std::wstring name = find_eventlog_name(*cit2);
-    if ((*cit2) != name) {
-      NSC_DEBUG_MSG_STD(_T("Opening alternative log: ") + name);
+    std::wstring name = *cit2;
+    if (lookup_names_) {
+      name = find_eventlog_name(*cit2);
+      if ((*cit2) != name) {
+        NSC_DEBUG_MSG_STD(_T("Opening alternative log: ") + name);
+      }
     }
     HANDLE hLog = OpenEventLog(NULL, name.c_str());

modules/CheckEventLog/CheckEventLog.h

@@ -32 +32 @@
   std::wstring syntax_;
   DWORD buffer_;
+  bool lookup_names_;
 
 public: