Changeset b21f30b in nscp

Timestamp:

11/10/09 19:49:47 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

2677e15

Parents:

b4ab033

Message:

removed com helpers

Files:

• include/settings/settings_ini.hpp (modified) (1 diff)
• service/NSClient++.cpp (modified) (5 diffs)
• service/NSClient++.h (modified) (4 diffs)
• service/StdAfx.h (modified) (2 diffs)
• service/settings_manager_impl.h (modified) (2 diffs)

include/settings/settings_ini.hpp

@@ -4 +4 @@
 #include <map>
 #include <settings/Settings.h>
-#include <simpleini/SimpleIni.h>
+#include <simpleini/simpleini.h>
 #include <error.hpp>
 

service/NSClient++.cpp

@@ -25 +25 @@
 //#ifdef DEBUG
 #include <crtdbg.h>
-#include "boost/filesystem.hpp" 
 //#endif
 #endif
@@ -798 +797 @@
   }
 */
+#ifdef WIN32
   try {
     com_helper_.initialize();
@@ -807 +807 @@
     return false;
   }
+#endif
   if (boot) {
     try {
@@ -912 +913 @@
     }
   }
+#ifdef WIN32
   LOG_DEBUG_STD(_T("Stopping: COM helper"));
   try {
@@ -920 +922 @@
     LOG_ERROR_STD(_T("Unknown exception uniniating COM..."));
   }
+#endif
   /*
   LOG_DEBUG_STD(_T("Stopping: Socket Helpers"));

service/NSClient++.h

@@ -28 +28 @@
 //#include <MutexRW.h>
 #include <map>
+#ifdef WIN32
 #include <com_helpers.hpp>
+#endif
 //#include <nsclient_session.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/locks.hpp>
 #include <boost/thread/shared_mutex.hpp>
-
 
 /**
@@ -108 +109 @@
   typedef enum log_status {log_unknown, log_looking, log_debug, log_nodebug };
   log_status debug_;
+#ifdef WIN32
   com_helper::initialize_com com_helper_;
+#endif
   /*
   std::auto_ptr<nsclient_session::shared_client_session> shared_client_;
@@ -192 +195 @@
 std::wstring Decrypt(std::wstring str, unsigned int algorithm = NSCAPI::encryption_xor);
 
+#ifndef __FILEW__
+#define R(x) _T(x)
+#define __FILEW__ R(__FILE__)
+#endif
 //////////////////////////////////////////////////////////////////////////
 // Log macros to simplify logging
@@ -199 +206 @@
 #define LOG_ERROR_STD(msg) LOG_ERROR(((std::wstring)msg).c_str())
 #define LOG_ERROR(msg) \
-  NSAPIMessage(NSCAPI::error, _T(__FILE__), __LINE__, msg)
+  NSAPIMessage(NSCAPI::error, __FILEW__, __LINE__, msg)
 #define LOG_CRITICAL_STD(msg) LOG_CRITICAL(((std::wstring)msg).c_str())
 #define LOG_CRITICAL(msg) \
-  NSAPIMessage(NSCAPI::critical, _T(__FILE__), __LINE__, msg)
+  NSAPIMessage(NSCAPI::critical, __FILEW__, __LINE__, msg)
 #define LOG_MESSAGE_STD(msg) LOG_MESSAGE(((std::wstring)msg).c_str())
 #define LOG_MESSAGE(msg) \
-  NSAPIMessage(NSCAPI::log, _T(__FILE__), __LINE__, msg)
+  NSAPIMessage(NSCAPI::log, __FILEW__, __LINE__, msg)
 
 #define LOG_DEBUG_STD(msg) LOG_DEBUG(((std::wstring)msg).c_str())
 #define LOG_DEBUG(msg) \
-  NSAPIMessage(NSCAPI::debug, _T(__FILE__), __LINE__, msg)
+  NSAPIMessage(NSCAPI::debug, __FILEW__, __LINE__, msg)
 /*
 #define LOG_DEBUG_STD(msg)

service/StdAfx.h

@@ -20 +20 @@
 ***************************************************************************/
 #pragma once
+#include <types.hpp>
+
 #ifdef WIN32
 #define _WINSOCKAPI_
@@ -48 +50 @@
 
 #include <boost/algorithm/string.hpp>
+#include <boost/filesystem.hpp>
+
 #ifdef MEMCHECK
 #include <vld.h>

service/settings_manager_impl.h

@@ -4 +4 @@
 #include <settings/Settings.h>
 #include <settings/settings_ini.hpp>
+#ifdef WIN32
 #include <settings/settings_old.hpp>
 #include <settings/settings_registry.hpp>
+#endif
 
 namespace settings_manager {
@@ -59 +61 @@
     Settings::SettingsInterface* create_instance(settings_type type, std::wstring context) {
       get_logger()->debug(__FILEW__, __LINE__, _T("Trying to create: ") + SettingsCore::type_to_string(type) + _T(": ") + context);
+#ifdef WIN32
       if (type == SettingsCore::old_ini_file) {
         old_ = true;
         return new Settings::OLDSettings(this, context);
       } 
+      if (type == SettingsCore::registry)
+        return new Settings::REGSettings(this, context);
+#endif
       if (type == SettingsCore::ini_file)
         return new Settings::INISettings(this, context);
-      if (type == SettingsCore::registry)
-        return new Settings::REGSettings(this, context);
       throw SettingsException(_T("Undefined settings type: ") + SettingsCore::type_to_string(type));
     }