From 822f0dc7b763aefaf6a7efe094ab287a4aed45a4 Mon Sep 17 00:00:00 2001 From: Vladislav Salikov Date: Sat, 3 May 2025 17:07:44 +0300 Subject: [PATCH 1/7] Dropped toolset to v142. --- wCenterWindow/wCenterWindow.vcxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wCenterWindow/wCenterWindow.vcxproj b/wCenterWindow/wCenterWindow.vcxproj index 3c201a1..fa56458 100644 --- a/wCenterWindow/wCenterWindow.vcxproj +++ b/wCenterWindow/wCenterWindow.vcxproj @@ -30,26 +30,26 @@ Application true - v143 + v142 Unicode Application false - v143 + v142 true Unicode Application true - v143 + v142 Unicode Application false - v143 + v142 true Unicode From 386f2df1da4d282ca71b80720dfbe01ff7caed41 Mon Sep 17 00:00:00 2001 From: Vladislav Salikov Date: Sat, 3 May 2025 17:09:31 +0300 Subject: [PATCH 2/7] Changed path to logfile in debug mode. --- wCenterWindow/CLogger.cpp | 2 +- wCenterWindow/wCenterWindow.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wCenterWindow/CLogger.cpp b/wCenterWindow/CLogger.cpp index deac95d..a5f5c13 100644 --- a/wCenterWindow/CLogger.cpp +++ b/wCenterWindow/CLogger.cpp @@ -44,7 +44,7 @@ void CLogger::Init() { if (std::filesystem::exists(log_path)) std::filesystem::rename(log_path, bak_path); #ifdef _DEBUG - log_path = L"D:\\test.log"; + log_path = L"test.log"; #endif fsLogFile.open(log_path, std::ios::trunc); if (fsLogFile.is_open()) { diff --git a/wCenterWindow/wCenterWindow.cpp b/wCenterWindow/wCenterWindow.cpp index 6a971fd..d89f37b 100644 --- a/wCenterWindow/wCenterWindow.cpp +++ b/wCenterWindow/wCenterWindow.cpp @@ -5,6 +5,8 @@ // TODO: Make the automatic updater (download, unzip and replace executable). // TODO: Change keyboard low-level hook to RegisterHotKey function. (Is it really needed?) +#pragma warning( disable : 28251 ) + #include "framework.h" #include "wCenterWindow.h" #include "updater.h" From 75b31b54894f92a8378c9573c5cd80d05ce4b6c4 Mon Sep 17 00:00:00 2001 From: Vladislav Salikov Date: Fri, 9 May 2025 14:23:09 +0300 Subject: [PATCH 3/7] Fixed logging codepage. So it should work on Windows 7. --- wCenterWindow/CLogger.cpp | 21 +++++++++++++++------ wCenterWindow/CLogger.h | 17 +++++++++-------- wCenterWindow/wCenterWindow.vcxproj | 6 ++++-- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/wCenterWindow/CLogger.cpp b/wCenterWindow/CLogger.cpp index a5f5c13..7655ffc 100644 --- a/wCenterWindow/CLogger.cpp +++ b/wCenterWindow/CLogger.cpp @@ -1,4 +1,4 @@ -// wCenterWindow +// wCenterWindow // CLogger.cpp #include "CLogger.h" @@ -6,6 +6,15 @@ #include #include +// Convert a wide Unicode string to an UTF8 string +std::string CLogger::ConvU16U8(const std::wstring& wstr) { + if (wstr.empty()) return std::string(); + int size = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], wstr.size(), NULL, 0, NULL, NULL); + std::string str_out(size, 0); + WideCharToMultiByte(CP_UTF8, 0, &wstr[0], wstr.size(), &str_out[0], size, NULL, NULL); + return str_out; +} + inline wchar_t* CLogger::GetTimeStamp() { GetLocalTime(<); StringCchPrintfW(logTimeBuffer, _countof(logTimeBuffer), L"%d-%02d-%02d %02d:%02d:%02d.%03d | ", lt.wYear, lt.wMonth, lt.wDay, lt.wHour, lt.wMinute, lt.wSecond, lt.wMilliseconds); @@ -19,7 +28,7 @@ void CLogger::Out(const wchar_t* fmt, ...) { EnterCriticalSection(&cs); StringCchVPrintfW(logBuffer, _countof(logBuffer), fmt, args); va_end(args); - fsLogFile << GetTimeStamp() << logBuffer << std::endl; + fsLogFile << ConvU16U8(GetTimeStamp()) << ConvU16U8(logBuffer) << std::endl; LeaveCriticalSection(&cs); } } @@ -50,9 +59,9 @@ void CLogger::Init() { if (fsLogFile.is_open()) { InitializeCriticalSection(&cs); fsLogFile << "\xEF\xBB\xBF"; // (0xEF, 0xBB, 0xBF) - UTF-8 BOM - fsLogFile.imbue(std::locale("en-US.utf8")); - fsLogFile << GetTimeStamp() << "[ " << szAppTitleVer.c_str() << " ] Start log." << std::endl; - fsLogFile << GetTimeStamp() << "Logfile: \"" << log_path.native() << "\"" << std::endl; + fsLogFile.imbue(std::locale(".UTF-8")); + fsLogFile << ConvU16U8(GetTimeStamp()) << "[ " << ConvU16U8(szAppTitleVer).c_str() << " ] Start log." << std::endl; + fsLogFile << ConvU16U8(GetTimeStamp()) << "Logfile: \"" << ConvU16U8(log_path.native()) << "\"" << std::endl; } else { MessageBoxW(NULL, L"Warning!\nCan't create log file! Working without logging.", szAppTitle.c_str(), MB_OK | MB_ICONWARNING | MB_SYSTEMMODAL); @@ -67,7 +76,7 @@ CLogger::CLogger(const wchar_t* _appTitle) { CLogger::~CLogger() { if (fsLogFile) { - fsLogFile << GetTimeStamp() << "Stop log." << std::endl; + fsLogFile << ConvU16U8(GetTimeStamp()) << "Stop log." << std::endl; fsLogFile.close(); DeleteCriticalSection(&cs); } diff --git a/wCenterWindow/CLogger.h b/wCenterWindow/CLogger.h index ade8a24..a1255e3 100644 --- a/wCenterWindow/CLogger.h +++ b/wCenterWindow/CLogger.h @@ -1,4 +1,4 @@ -// wCenterWindow +// wCenterWindow // CLogger.h #pragma once @@ -16,14 +16,15 @@ public: private: SYSTEMTIME lt; CRITICAL_SECTION cs; - wchar_t logTimeBuffer[28]{ 0 }; - wchar_t logBuffer[MAX_LOGBUFFER_LENGTH]{ 0 }; - std::wofstream fsLogFile; - std::wstring szAppTitle{ 0 }; - std::wstring szAppVersion{ 0 }; - std::wstring szAppPlatform{ 0 }; - std::wstring szAppTitleVer{ 0 }; + wchar_t logTimeBuffer[28] { 0 }; + wchar_t logBuffer[MAX_LOGBUFFER_LENGTH] { 0 }; + std::ofstream fsLogFile; + std::wstring szAppTitle { 0 }; + std::wstring szAppVersion { 0 }; + std::wstring szAppPlatform { 0 }; + std::wstring szAppTitleVer { 0 }; + std::string ConvU16U8(const std::wstring&); inline wchar_t* GetTimeStamp(); void Init(); }; diff --git a/wCenterWindow/wCenterWindow.vcxproj b/wCenterWindow/wCenterWindow.vcxproj index fa56458..58862e4 100644 --- a/wCenterWindow/wCenterWindow.vcxproj +++ b/wCenterWindow/wCenterWindow.vcxproj @@ -100,6 +100,7 @@ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) false stdcpp17 + MultiThreadedDebug Windows @@ -123,7 +124,7 @@ true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) false - MultiThreadedDLL + MultiThreaded stdcpp17 @@ -147,6 +148,7 @@ _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true stdcpp17 + MultiThreadedDebug Windows @@ -170,7 +172,7 @@ NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true stdcpp17 - MultiThreadedDLL + MultiThreaded Windows From 3f646683aa4cf2836ec79f66510da347cc0adbbc Mon Sep 17 00:00:00 2001 From: Vladislav Salikov Date: Fri, 9 May 2025 14:55:53 +0300 Subject: [PATCH 4/7] Fixed updater's logging codepage. --- wCenterWindow/updater.cpp | 4 ++-- wCenterWindow/wCenterWindow.vcxproj.user | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/wCenterWindow/updater.cpp b/wCenterWindow/updater.cpp index 92c9962..4044be1 100644 --- a/wCenterWindow/updater.cpp +++ b/wCenterWindow/updater.cpp @@ -1,4 +1,4 @@ -// wCenterWindow +// wCenterWindow // updater.h #include "wCenterWindow.h" @@ -49,7 +49,7 @@ UINT WINAPI Updater(void*) { it = obj.find("message"), it2; if (it != obj.end()) { std::string u = (*it).second.get(); - logger.Out(L"[UPDT] %s(%d): Error! The url is %s", TEXT(__FUNCTION__), __LINE__, u); + logger.Out(L"[UPDT] %s(%d): Error! The url is %S", TEXT(__FUNCTION__), __LINE__, u); return 102; _endthreadex(102); } diff --git a/wCenterWindow/wCenterWindow.vcxproj.user b/wCenterWindow/wCenterWindow.vcxproj.user index 246778c..3f889cd 100644 --- a/wCenterWindow/wCenterWindow.vcxproj.user +++ b/wCenterWindow/wCenterWindow.vcxproj.user @@ -1,7 +1,8 @@  - /noupdate + + WindowsLocalDebugger @@ -10,7 +11,8 @@ - /noupdate + + WindowsLocalDebugger From 8bfa651cb9de2f49a9c0d8629df41a9beb8e7350 Mon Sep 17 00:00:00 2001 From: Vladislav Salikov Date: Fri, 9 May 2025 16:19:39 +0300 Subject: [PATCH 5/7] Fixed updater's logging. --- wCenterWindow/updater.cpp | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/wCenterWindow/updater.cpp b/wCenterWindow/updater.cpp index 4044be1..4a92b27 100644 --- a/wCenterWindow/updater.cpp +++ b/wCenterWindow/updater.cpp @@ -46,13 +46,6 @@ UINT WINAPI Updater(void*) { logger.Out(L"[UPDT] %s(%d): Parsing JSON object", TEXT(__FUNCTION__), __LINE__); obj = json.get(); - it = obj.find("message"), it2; - if (it != obj.end()) { - std::string u = (*it).second.get(); - logger.Out(L"[UPDT] %s(%d): Error! The url is %S", TEXT(__FUNCTION__), __LINE__, u); - return 102; - _endthreadex(102); - } for (it = obj.begin(); it != obj.end(); it++) { if ((*it).first == "tag_name") j_tag_name = ConvertUtf8ToWide((*it).second.to_str()); @@ -70,8 +63,8 @@ UINT WINAPI Updater(void*) { } else { logger.Out(L"[UPDT] %s(%d): Error! Cannot recognize JSON object!", TEXT(__FUNCTION__), __LINE__); - return 103; - _endthreadex(103); + return 102; + _endthreadex(102); } size_t pos = 0; @@ -127,14 +120,13 @@ bool GetLatestRelease(const std::wstring& urn) { if (hRequest != NULL) { BOOL isSend = HttpSendRequestW(hRequest, NULL, 0, 0, 0); if (isSend) { - char szData[1024]{ 0 }; + char szData[1024] { 0 }; DWORD dwBytesRead = 0; std::string buffer; do { InternetReadFile(hRequest, szData, sizeof(szData), &dwBytesRead); buffer.append(szData, dwBytesRead); - } - while (dwBytesRead != 0); + } while (dwBytesRead != 0); picojson::parse(json, buffer); std::string jerr = picojson::get_last_error(); @@ -144,7 +136,18 @@ bool GetLatestRelease(const std::wstring& urn) { MessageBoxW(NULL, L"Error while parsing JSON object!", szTitle, MB_OK | MB_ICONERROR); ret = false; } - + else { + picojson::object obj = json.get(); + std::string msg, sts; + if (auto search = obj.find("message"); search != obj.end()) { + msg = (search->first) + ": " + (search->second).get(); + } + if (auto search = obj.find("status"); search != obj.end()) { + sts = (search->first) + ": " + (search->second).get(); + } + logger.Out(L"[UPDT] %s(%d): Error! %s", TEXT(__FUNCTION__), __LINE__, ConvertUtf8ToWide(msg + ", " + sts).c_str()); + ret = false; + } } else { err = GetLastError(); From 9a9b82b981e3939f8ad75cddaff2a29a54b0359f Mon Sep 17 00:00:00 2001 From: Vladislav Salikov Date: Fri, 9 May 2025 16:36:09 +0300 Subject: [PATCH 6/7] Added ES_NUMBER flag to editboxes of Manual Editing Dialog. --- wCenterWindow/wCenterWindow.cpp | 3 ++- wCenterWindow/wCenterWindow.rc | Bin 11864 -> 5815 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/wCenterWindow/wCenterWindow.cpp b/wCenterWindow/wCenterWindow.cpp index d89f37b..9e685d9 100644 --- a/wCenterWindow/wCenterWindow.cpp +++ b/wCenterWindow/wCenterWindow.cpp @@ -1,7 +1,8 @@ -// wCenterWindow +// wCenterWindow // wCenterWindow.cpp // TODO: Split main cpp-file to separate files. +// TODO: Make Updater's errors as Windows notifications. // TODO: Make the automatic updater (download, unzip and replace executable). // TODO: Change keyboard low-level hook to RegisterHotKey function. (Is it really needed?) diff --git a/wCenterWindow/wCenterWindow.rc b/wCenterWindow/wCenterWindow.rc index df3a1ec14329ee73d18303c5381de74a5c443e65..d23e96ec6927d983b296895344e753cdc1fa4c07 100644 GIT binary patch literal 5815 zcmc&&-E!JW629jtI?Bby6)iTH_#}HL&=^!lNR)m8u1Xb_(Eut7iPA_RK9x7yi+!Yh zh3y_$Ac38;$#QBZjxCL*d%pge{+WOO^Iw;jFpd^kD$->RpCeHOF$~_nhZRqF7UVpH zjEl6$797MPi?(^Yb$Qu(8zqal2stR#*Y;Xzwcdt&86_OFiR<~gVb2|=>9%Fw&E30k z-!@&OJ>wuGh<~_;y3EoI;*c@jp;Q_)6-t}|;d*g+$^C<)V@khDc}t0S5-Yvb+FZYRn=^M0s$maO7Ptl^!X zMC2=OjxHlE_8J%H6VVdhlztJu({5+z6Rzz$12)%9^8&tqhx$iPbB1$f`4=ryvxdGl zWIzu%H8c%(q=M`B>l1U|ZJk{#awitri-3KGrN>Gv`b<(65G|8=7ek*$l2! z`swy=ROobWTCR6zGSJ<*%e-6L^58qYjBQ;rZyjyS%6IwEVME9EExnw&HD*kA@7(fj zz$}kB_&jyz18w3Nw$);@k~vPX+1#@yW83vwa+8lLC}S7gHIHM^ThFqmwxdrSZBk+(#1r-U zO6`48J2&b_wFKiB!;vR9ApOwUt2Q9sG&i5AA9`xR??-@0djJdMJ9{VT9LUDVhowcGs}RZk7w8>yWSAEds~ zQ2(30M?6}s^It=MqoUTky`MopV&qH`KI#5v;lJvDp5d8Hy}^Io>)wB(lPY?mM_RT= zC(+aTE}pv|JNm%XT$gs~ooAzo?~eMu=h@ctk#%`qp4oDiA`Nc$>4vNOgAGpjHNPDtMF9v|XllKGrCirMLc~Fw9(IXc^Y6EkiLTlNWRM&^L5u z8WwXwKTsS3-)RU}pJTXG*kK__LjTLGPb$Y;urFt-QsJ+W)mWs7loGe3XV^vg8sc=v zMGl4zUxT>du#JNSX4++x;cT7)PehS%2)5feT43}>x~OD?S$Gpfi2!^Rk;u^r0KW#9 zB*YWGZbTb%n=$ts?asi|Pz7!Jd;DH~Q+A~BVo&@DD3f$sY-zD_WJ-ceB!u%t$;R|kC<7;pe6_HAuaNDyZthk z1_!Ng`(?gvu=o)^_ASD&Q{g%O+u+V-#&a?7e3oPl_~NlWqt{5MA-}1W{?dIq^%3Pbb1yJf8gi>E3n~C~FS^OSCOtVF(uiUp> z%Avz(@IEU4U*)uy_WB3XR{fpwnP&onijgeScD7KIJ@x-1M7ntvB`ffPhnP$2x}Jme zIA&&()l6$((Jd3PMK$+fDAO|SO$|%8r={6wtu~p=Wr1*53e8CO>>sahN2jtzEguzc z9SPWG=_(60u#ibu$o_OuWEq9yV39{(F|5dF3J*^Zkj3xKf#;a;9!vy^e+KukPV-0p zq(Yh@KQ07m;dt42+`or+<0uSc4&$`Ic-1fRJWVdz#Puc4pYP%Cun7|C`gs`T#5P@m zi2lHgl7z5L1x{kpz)9+>OQ5f^Gb*5fa^wCXC8#w<-b=AgcaUen6NTVC{asqXBA}Ec zQd*ChYJ+IPm@X00t=#$kk{H}qoc2s0$U)#a%Zu%vpNA0dFO#&`hS-PRzr?NvEQ|#C z5iHhx@d!&)ZAmBE(0`(?G$`U+m2&TGNJ~Y1Ez+QRo`Fc6r3v1Z1P}&KO4N80m3`JP?l$L55C&OS4@hcnNk{V1}oA znYgIiZj)kK4ZQmww zoCYD4W;y?sOY0v|m-Wqoyh)80R5iyrA|2WG?*~GFCaFNub(%gN5qZWK?;H-}lqioj zcqi60&WPdVKy5Usu+~hmDCO`_ESG4bD1kK($k{h(_H@K*tj)%C@4)a`S*7wk@u zP4F$+V2lbW9+K0^ml`|Ax3Fm#)^MQ`h+TD%gBXn-K9MUY=zQpLvWIEpv_HSxI&b}g ph4gDx2Ijgm4$7QZDgDX4>Gl2=@94_+s3JHswuTAF-lyHye*nVk0;~W4 literal 11864 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 From 5f6e1cd068d755e3dca44842ee2eb25c339f9a52 Mon Sep 17 00:00:00 2001 From: Vladislav Salikov Date: Fri, 9 May 2025 16:48:53 +0300 Subject: [PATCH 7/7] Release v1.3.10 --- Version.ini | Bin 1070 -> 517 bytes wCenterWindow/wCenterWindow.cpp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Version.ini b/Version.ini index 2a6b4bb85be65f65ee9cca5a15202823bf912ed3..0932f85a943c94d80ffdba1320c96b0256008db2 100644 GIT binary patch literal 517 zcmZ9J!EVAZ42JJ{3h%&isIVjAuoX=l)(NQ+Xqt8~NdT`+QY9{^&$h!JX|FJMg$W_$ zV156W#Ik?BzGraCt!EoI42GeSOlTnq7k%dmPsVD<~MH$2VX8h;u zvE>kxr0W_Dr5cY=Vog;z0#*o{?B)6L%)%xesbN`}_`@#K|DI4Y9W9*xmJ6a7n<@?s MY&$pvu571%0Uq(IV*mgE literal 1070 zcmaizPfx-?5XI+g;&-SAjvCREF&-3RJcuD7ff(bVP=pEv(iRL~Uj4mkf%*r{2DbZl z=DjzwyC3hD7TB9LY-lsf`A@B9G2fBR!4K`g6w&pajGZ}qCms>|t|Feu7ybf1vgd79 z&DP`|^BdR_=Co7^z=syH-tgBf*%O&Kb8h2GY_umff^%Jo%lE|P_)KsRcpZV=FwB>8DdPOOP zbwxEPQN<0B19fWVJ_GA}w}&`dz_Yd^=cwji!BHx_5zv}Ci>i5?cdKY3pBUQ6| a-vRo?eHQz~oiAYM`^z1(n}ZI^SM>=Eu&dwz diff --git a/wCenterWindow/wCenterWindow.cpp b/wCenterWindow/wCenterWindow.cpp index 9e685d9..785ef90 100644 --- a/wCenterWindow/wCenterWindow.cpp +++ b/wCenterWindow/wCenterWindow.cpp @@ -231,7 +231,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd HeapFree(hHeap, NULL, szWinClassBuffer); HeapFree(hHeap, NULL, szWinTitleBuffer); - logger.Out(L"Exit from the %s() function, msg.wParam = 0x%0*tX", TEXT(__FUNCTION__), (sizeof(UINT_PTR) * 2), static_cast(msg.wParam)); + logger.Out(L"Exit from the %s() function, msg.wParam = 0x%p", TEXT(__FUNCTION__), msg.wParam); return static_cast(msg.wParam); }