Mege OEM

log4z.cpp

@@ -56,6 +56,7 @@
 #include <shlwapi.h>
 #include <process.h>
 #pragma comment(lib, "shlwapi")
+#pragma comment(lib, "User32.lib")
 #pragma warning(disable:4996)
 
 #else
@@ -1161,15 +1162,24 @@ LogerManager::~LogerManager()
 
 void LogerManager::showColorText(const char *text, int level)
 {
+
+#ifdef WIN32
+    char oem[LOG4Z_LOG_BUF_SIZE] = { 0 };
+    CharToOemBuffA(text, oem, LOG4Z_LOG_BUF_SIZE);
+#endif
+
     if (level <= LOG_LEVEL_DEBUG || level > LOG_LEVEL_FATAL)
     {
+#ifdef WIN32
+        printf("%s", oem);
+#else
         printf("%s", text);
+#endif
         return;
     }
 #ifndef WIN32
     printf("%s%s\e[0m", LOG_COLOR[level], text);
 #else
-
     AutoLock l(_scLock);
     HANDLE hStd = ::GetStdHandle(STD_OUTPUT_HANDLE);
     if (hStd == INVALID_HANDLE_VALUE) return;
@@ -1178,10 +1188,10 @@ void LogerManager::showColorText(const char *text, int level)
     {
         return;
     }
-    else 
+    else
     {
         SetConsoleTextAttribute(hStd, LOG_COLOR[level]);
-        printf("%s", text);
+        printf("%s", oem);
         SetConsoleTextAttribute(hStd, oldInfo.wAttributes);
     }
 #endif
@@ -1876,4 +1886,3 @@ ILog4zManager * ILog4zManager::getInstance()
 
 _ZSUMMER_LOG4Z_END
 _ZSUMMER_END
-

log4z.h

@@ -244,15 +244,10 @@ const bool LOG4Z_DEFAULT_MONTHDIR = false;
 const int LOG4Z_DEFAULT_LIMITSIZE = 100;
 //! default logger show suffix (file name and line number) 
 const bool LOG4Z_DEFAULT_SHOWSUFFIX = true;
-
 ///////////////////////////////////////////////////////////////////////////
 //! -----------------------------------------------------------------------
 //////////////////////////////////////////////////////////////////////////
 
-
-
-
-
 #ifndef _ZSUMMER_BEGIN
 #define _ZSUMMER_BEGIN namespace zsummer {
 #endif  
@@ -262,9 +257,6 @@ const bool LOG4Z_DEFAULT_SHOWSUFFIX = true;
 _ZSUMMER_BEGIN
 _ZSUMMER_LOG4Z_BEGIN
 
-
-
-
 //! log4z class
 class ILog4zManager
 {
@@ -641,8 +633,3 @@ _ZSUMMER_LOG4Z_END
 _ZSUMMER_END
 
 #endif
-
-
-
-
-

test/fast_test.cpp

@@ -77,6 +77,7 @@ int main(int argc, char *argv[])
 	// sorry guys, this test is in russian
 	LOGI("const char[]: ANSI->OEM test, Ýòà ñòðîêà äîëæíà áûòü ÷èòàåìà â ëîãôàéëå (1251) è â êîíñîëè (866)");
 	LOGI("Stream: " << "ANSI->OEM test, Ýòà ñòðîêà äîëæíà áûòü ÷èòàåìà â ëîãôàéëå (1251) è â êîíñîëè (866)");
+	LOGT("Stream: " << "ANSI->OEM test, Ýòà ñòðîêà äîëæíà áûòü ÷èòàåìà â ëîãôàéëå (1251) è â êîíñîëè (866)");
 
 	//begin test wstring(utf-16) log string input....
 	WCHAR checkWCHAR[100] = L"ANSI->OEM test, Ýòà ñòðîêà äîëæíà áûòü ÷èòàåìà â ëîãôàéëå (1251)";