W0LF/wCenterWindow-1
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Added platform architecture information to About dialog and CLogger::Out() method.

Browse Source
This commit is contained in:
dreamforceinc
2023-12-07 20:53:38 +03:00
parent f558df6bf9
commit b8ce96ee99
7 changed files with 22 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wCenterWindow/CLogger.cpp
View File

@@ -64,27 +64,6 @@ CLogger::CLogger(const wchar_t* _appTitle) {
Init();
}
CLogger::CLogger(const wchar_t* _appTitle, const wchar_t* _appVersion) {
szAppTitle = _appTitle; szAppVersion = _appVersion;
szAppTitleVer = _appTitle;
szAppTitleVer.append(L", v").append(_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;

3
wCenterWindow/CLogger.h
View File

@@ -11,9 +11,6 @@ class CLogger
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:

5
wCenterWindow/wCenterWindow.cpp
View File

@@ -31,10 +31,7 @@ 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), ARCH);
//CLogger logger(TEXT(PRODUCT_NAME), TEXT(VERSION_STR));
//CLogger logger(TEXT(PRODUCT_NAME), ARCH);
CLogger logger(TEXT(PRODUCT_NAME));
CLogger logger(TEXT(PRODUCT_NAME_FULL));
NOTIFYICONDATAW nid = { 0 };
MENUITEMINFO mii = { 0 };

12
wCenterWindow/wCenterWindow.vcxproj
View File

@@ -112,7 +112,7 @@
</ManifestFromManagedAssembly>
</Manifest>
<PreBuildEvent>
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)"</Command>
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -137,7 +137,7 @@
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PreBuildEvent>
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)"</Command>
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -151,13 +151,13 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>comctl32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Manifest>
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PreBuildEvent>
<Command>powershell -File "$(SolutionDir)Update_Version.ps1" move /y "$(SolutionDir)VersionInfo.h" "$(ProjectDir)"</Command>
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -176,13 +176,13 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>comctl32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Manifest>
<AdditionalManifestFiles>%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PreBuildEvent>
<Command>powershell -File "$(SolutionDir)Update_Version.ps1" move /y "$(SolutionDir)VersionInfo.h" "$(ProjectDir)"</Command>
<Command>"$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>

13
wCenterWindow/wCenterWindow.vcxproj.filters
View File

@@ -27,27 +27,24 @@
<ClInclude Include="wCenterWindow.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="logger.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="globals.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="picojson.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="updater.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CLogger.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="wCenterWindow.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="logger.cpp">
<ClCompile Include="updater.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="updater.cpp">
<ClCompile Include="CLogger.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>