diff --git a/wCenterWindow/CLogger.cpp b/wCenterWindow/CLogger.cpp index e3c7af7..b95d67a 100644 --- a/wCenterWindow/CLogger.cpp +++ b/wCenterWindow/CLogger.cpp @@ -1,6 +1,7 @@ // wCenterWindow // CLogger.cpp #include "CLogger.h" +#include #include #include @@ -70,6 +71,20 @@ CLogger::CLogger(const wchar_t* _appTitle, const wchar_t* _appVersion) { Init(); } +CLogger::CLogger(const wchar_t* _appTitle, const uint8_t _appPlatform) { + szAppTitle = _appTitle; szAppPlatform = std::to_wstring(_appPlatform); + szAppTitleVer = _appTitle; + szAppTitleVer.append(L" (x").append(szAppPlatform).append(L")"); + Init(); +} + +CLogger::CLogger(const wchar_t* _appTitle, const wchar_t* _appVersion, const uint8_t _appPlatform) { + szAppTitle = _appTitle; szAppVersion = _appVersion; szAppPlatform = std::to_wstring(_appPlatform); + szAppTitleVer = _appTitle; + szAppTitleVer.append(L", v").append(_appVersion).append(L" (x").append(szAppPlatform).append(L")"); + Init(); +} + CLogger::~CLogger() { if (fsLogFile) { fsLogFile << GetTimeStamp() << "Stop log." << std::endl; diff --git a/wCenterWindow/CLogger.h b/wCenterWindow/CLogger.h index 0f6bd33..bacb5e3 100644 --- a/wCenterWindow/CLogger.h +++ b/wCenterWindow/CLogger.h @@ -12,6 +12,8 @@ public: void Out(const wchar_t*, ...); CLogger(const wchar_t*); CLogger(const wchar_t*, const wchar_t*); + CLogger(const wchar_t*, const uint8_t); + CLogger(const wchar_t*, const wchar_t*, const uint8_t); ~CLogger(); private: @@ -24,6 +26,7 @@ private: std::wofstream fsLogFile; std::wstring szAppTitle{ 0 }; std::wstring szAppVersion{ 0 }; + std::wstring szAppPlatform{ 0 }; std::wstring szAppTitleVer{ 0 }; inline wchar_t* GetTimeStamp(); diff --git a/wCenterWindow/wCenterWindow.cpp b/wCenterWindow/wCenterWindow.cpp index 1ebfe0b..89b6bff 100644 --- a/wCenterWindow/wCenterWindow.cpp +++ b/wCenterWindow/wCenterWindow.cpp @@ -31,7 +31,10 @@ HMENU hMenu = NULL, hPopup = NULL; HWND hFgWnd = NULL; BOOL bKPressed = FALSE, bMPressed = FALSE, fShowIcon = TRUE, fCheckUpdates = TRUE, bWorkArea = TRUE; BOOL bLCTRL = FALSE, bLWIN = FALSE, bKEYV = FALSE; -CLogger logger(TEXT(PRODUCT_NAME), TEXT(VERSION_STR)); +//CLogger logger(TEXT(PRODUCT_NAME), TEXT(VERSION_STR), ARCH); +//CLogger logger(TEXT(PRODUCT_NAME), TEXT(VERSION_STR)); +//CLogger logger(TEXT(PRODUCT_NAME), ARCH); +CLogger logger(TEXT(PRODUCT_NAME)); NOTIFYICONDATAW nid = { 0 }; MENUITEMINFO mii = { 0 }; diff --git a/wCenterWindow/wCenterWindow.h b/wCenterWindow/wCenterWindow.h index 7599514..997542b 100644 --- a/wCenterWindow/wCenterWindow.h +++ b/wCenterWindow/wCenterWindow.h @@ -8,6 +8,12 @@ #define T1 60 #define T2 86400 +#ifdef _WIN64 +#define ARCH 64 +#else +#define ARCH 86 +#endif + #define MAX_LOADSTRING 50 // Windows Header Files