Changeset febff5f in nscp

Timestamp:

03/11/08 06:57:12 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

d76af81, 8484679

Parents:

7f596ce

Message:

0.3.1 release

Files:

• AutoBuild.h (modified) (1 diff)
• changelog (modified) (2 diffs)
• include/REGSettings.h (modified) (2 diffs)
• include/Settings.h (modified) (2 diffs)
• modules/FileLogger/FileLogger.cpp (modified) (5 diffs)
• modules/FileLogger/FileLogger.h (modified) (2 diffs)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,1,9
-#define PRODUCTVER     0,3,1,9
-#define STRFILEVER     _T("0.3.1.9")
-#define STRPRODUCTVER  _T("0.3.1.9")
-#define STRPRODUCTDATE  _T("2008-03-06")
+#define FILEVER        0,3,1,12
+#define PRODUCTVER     0,3,1,12
+#define STRFILEVER     _T("0.3.1.12")
+#define STRPRODUCTVER  _T("0.3.1.12")
+#define STRPRODUCTDATE  _T("2008-03-11")
 #endif // AUTOBUILD_H

changelog

@@ -6 +6 @@
  * Improved socket performance (would be nice if we could be used as a "hub")
  * "The message is blocked by User Interface Privilege Isolation, Administrative applications that need to see it can allow it through by calling ChangeWindowMessageFilter after making sure the necessary security precautions are in place. "
+
+2007-03-11 MickeM
+ ! 0.3.1 Released
 
 2008-03-08 MickeM
@@ -16 +19 @@
  + Since log module is loaded "after" the client has booted I added a "hello" message that prints the current version
     (if you find this annoying let me know, I will make it optional :)
+ * Fixed some issues in the registry handling
 
 2008-03-06 MickeM

include/REGSettings.h

@@ -77 +77 @@
     }
     DWORD cbData = static_cast<DWORD>(wcslen(value));
-    BYTE *bData = new BYTE[cbData+1];
-    wcsncpy_s(reinterpret_cast<TCHAR*>(bData), cbData+1, value, cbData);
-    BOOL bRet = RegSetValueEx(hTemp, lpszKey, NULL, REG_SZ, bData, cbData);
+    TCHAR *bData = new TCHAR[cbData+2];
+    wcsncpy_s(bData, cbData+1, value, cbData);
+    BOOL bRet = RegSetValueEx(hTemp, lpszKey, NULL, REG_SZ, reinterpret_cast<BYTE*>(bData), cbData);
     RegCloseKey(hTemp);
     delete [] bData;
@@ -115 +115 @@
     if (lRet == ERROR_SUCCESS) {
       if (type == REG_SZ) {
-        if (cbData < data_length-1) {
+        if (cbData == 0)
+          return _T("");
+        else if (cbData < data_length-1) {
           bData[cbData] = 0;
-          ret = reinterpret_cast<LPCTSTR>(bData);
+          const TCHAR *ptr = reinterpret_cast<TCHAR*>(bData);
+          ret = ptr;
         } else {
           std::wcout << _T("getString_::Buffersize to small: ") << lpszPath << "." << lpszKey << ": " << type << std::endl;

include/Settings.h

@@ -104 +104 @@
     bool bNew = false;
     TSettings *sM = settingsManager;
+    if (settingsManager == NULL)
+      throw SettingsException(_T("No settings method specified, cannot start"));
     if ((type != -1)&&(type != settingsManager->getActiveTypeID())) {
       if (type == REGSettings::getType()) {
@@ -161 +163 @@
     bool bNew = false;
     TSettings *sM = settingsManager;
+    if (settingsManager == NULL)
+      throw SettingsException(_T("No settings method specified, cannot start"));
     if ((type != -1)&&(type != settingsManager->getActiveTypeID())) {
       if (type == REGSettings::getType()) {

modules/FileLogger/FileLogger.cpp

@@ -25 +25 @@
 #include <sys/timeb.h>
 #include <time.h>
+#include <utils.h>
 
 FileLogger gFileLogger;
@@ -34 +35 @@
 }
 
-FileLogger::FileLogger() {
+FileLogger::FileLogger() : init_(false) {
 }
 FileLogger::~FileLogger() {
@@ -53 +54 @@
   getFileName();
   format_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_DATEMASK, LOG_DATEMASK_DEFAULT);
+  init_ = true;
+  std::wstring hello = _T("Starting to log for: ") + NSCModuleHelper::getApplicationName() + _T(" - ") + NSCModuleHelper::getApplicationVersionString();
+  handleMessage(NSCAPI::log, __FILEW__, __LINE__, hello.c_str());
   return true;
 }
@@ -64 +68 @@
   return true;
 }
-void FileLogger::handleMessage(int msgType, TCHAR* file, int line, TCHAR* message) {
+void FileLogger::writeEntry(std::wstring line) {
+  DWORD numberOfBytesWritten;
+  HANDLE hFile = ::CreateFile(file_.c_str(), GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+  if (hFile == INVALID_HANDLE_VALUE) {
+    hFile = ::CreateFile(file_.c_str(), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (hFile == INVALID_HANDLE_VALUE) {
+      std::wcout << _T("Failed to write to log file: ") << file_ << std::endl;
+      return;
+    }
+    WORD wBOM = 0xFEFF;
+    ::WriteFile(hFile, &wBOM, sizeof(WORD), &numberOfBytesWritten, NULL);
+  }
+  //::WriteFile(hFile, &wBOM, sizeof(WORD), &NumberOfBytesWritten, NULL);
+  if (::SetFilePointer(hFile, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER) {
+    std::wcout << _T("Failed to move pointer to end of file...") << std::endl;
+  }
+  ::WriteFile(hFile, line.c_str(), (line.length())*(sizeof(TCHAR)), &numberOfBytesWritten, NULL);
+  ::CloseHandle(hFile);
+}
+
+void FileLogger::handleMessage(int msgType, TCHAR* file, int line, const TCHAR* message) {
+  if (!init_)
+    return;
   TCHAR buffer[65];
-  std::wofstream stream(file_.c_str(), std::ios::app);
   __time64_t ltime;
   _time64( &ltime );
@@ -79 +104 @@
     wcsncpy_s(buffer, 64, _T("???"), 63);
   }
-  stream << buffer << _T(": ") << NSCHelper::translateMessageType(msgType) << _T(":") << file << _T(":") << line << _T(": ") << message << std::endl;
+  writeEntry(std::wstring(buffer) + _T(": ") + 
+    NSCHelper::translateMessageType(msgType) + _T(":") + 
+    std::wstring(file) + _T(":") + strEx::itos(line) +_T(": ") + 
+    message + _T("\r\n"));
 }
 

modules/FileLogger/FileLogger.h

@@ -27 +27 @@
   std::wstring file_;
   std::wstring format_;
+  bool init_;
 
 public:
@@ -50 +51 @@
   bool hasCommandHandler();
   bool hasMessageHandler();
-  void handleMessage(int msgType, TCHAR* file, int line, TCHAR* message);
+  void handleMessage(int msgType, TCHAR* file, int line, const TCHAR* message);
   int handleCommand(TCHAR* command, TCHAR **argument, TCHAR *returnBuffer, int returnBufferLen);
+  void writeEntry(std::wstring line);