Release 1.3.9

Also edited LICENSE and README.md files.

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-2024 Vladislav Salikov aka W0LF
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,23 +1,34 @@
 ## wCenterWindow
 
-This program centers the current active window by a `LCTRL + LWIN + C` hotkey,
-or pressing `LCTRL + LWIN + MMB` (Middle Mouse Button).
+Copyright (c) 2020-2024 Vladislav Salikov aka W0LF.<br>
+Program icon made by Kirill Topov.
+
+---
+
+This program centers the current active window by a `LCTRL + LWIN + C` hotkey, or pressing `LCTRL + LWIN + MMB` (Middle Mouse Button).
 
 `LCTRL + LWIN + V` - manual editing of size and position of the window.
 
-You can use `LCTRL + LWIN + I` hotkey for hide/show trayicon.
-You can also use commandline option `/hide` for hide trayicon at startup.
-The `/noupdate` option is used to disable check for updates. By default, the check is repeated once a day.
+`LCTRL + LWIN + I` hotkey is used to hide/show trayicon.
+You can also use commandline option `/hide` to hide trayicon at startup.
 
-`Use workarea` option means that the window is centered without a taskbar, otherwise, the full resolution of the monitor will be used.
+The `/noupdate` commandline option is used to disable check for updates. By default, the program checks for updates upon startup and once a day.
 
-If some windows does not centers you should run wCenterWindow with administrative rights.
+The `Use workarea` option (at popup menu) means that the window is centered without a taskbar, otherwise, the full resolution of the monitor will be used.
+
+If some windows does not centers, you should run wCenterWindow with administrative rights.
 
 ## Automatic startup
 
-Usually, to start the application when Windows starts, it is enough to put the application's shortcut in the "Startup" folder -\
-"C:\Users\\<*Your user name*>\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup". (The easiest way to get there - press 'WIN + R' and type 'shell:startup').\
+Usually, to start the application when Windows starts, it is enough to put the application's shortcut in the "Startup" folder - 
+"C:\Users\\<*Your user name*>\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup". 
+(The easiest way to get there - press 'WIN + R' and type `shell:startup`).<br>
 However, in this case wCenterWindow will not be able to work with windows that are open with elevated privileges.
-And if you enable the "Run as administrator" option in the shortcut, then wCenterWindow will not start. This is related to the security of Windows (maybe only in 10/11, I did not check).\
-This behavior can be bypassed by creating a task in the Task Scheduler with the "Run with highest privileges" option.\
+And if you enable the "Run as administrator" option in the shortcut, then wCenterWindow will not start. This is related to the security of Windows (maybe only in 10/11, I did not check).
+This behavior can be bypassed by creating a task in the Task Scheduler with the "Run with highest privileges" option.<br>
 **Note:** If you run wCenterWindow via the Task Scheduler, I highly recommend enabling the "Delay task for" option for 15-30 seconds, otherwise you may get an error message "Can't create tray icon".
+
+## License
+
+This software is licensed under a [MIT License](https://mit-license.org).<br>
+This software uses the [PicoJSON](https://github.com/kazuho/picojson) - a C++ JSON parser / serializer by Kazuho Oku.

Update_Version.ps1

@@ -45,6 +45,7 @@ function makeVersionString([string]$vmaj, [string]$vmin, [string]$vbld, [string]
 [string]$buildDateTime = [string]$vs = [string]$vn = [string]$intName = [string]$origName = $null
 [int]$pys = [int]$spanDays = [int]$spanSecs = $null
 [int]$currentYear = [int]$currentMonth = [int]$currentDay = [int]$currentHour = [int]$currentMinute = [int]$currentSecond = $null
+[string]$platformArch = $args[0]
 [string]$iniFile = ".\Version.ini"
 #endregion
 
@@ -103,8 +104,8 @@ $currentSecond = $date.Second
 $buildDateTime = "Build date: $($date.GetDateTimeFormats('u').Replace('Z', ''))"
 $spanDays = [math]::Round((New-TimeSpan -Start $(Get-Date -Month 1 -Day 1 -Year 2000) -End $date).TotalDays)
 $spanSecs = [math]::Round((New-TimeSpan -Start $($date.Date) -End $($date.DateTime)).TotalSeconds)
-if ($pys -eq $currentYear) { $pcf = "Copyright (C) $pys by $pa" } else { $pcf = "Copyright (C) $pys-$currentYear by $pa" }
-$intName = "$pn-C++"
+if ($pys -eq $currentYear) { $pcf = "Copyright (c) $pys $pa" } else { $pcf = "Copyright (c) $pys-$currentYear $pa" }
+$intName = "$pn-$platformArch-C++"
 $origName = "$pn.exe"
 $verMajor = getValue $verMajor
 $verMinor = getValue $verMinor
@@ -125,6 +126,8 @@ else {
 	$pnf = "$pn v$vs"
 }
 
+$pnf = "$pn v$vs ($platformArch)"
+
 #region Save all variables to file
 "// $pn" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode
 "// VersionInfo.h" | Out-File -FilePath ".\VersionInfo.h" -Encoding unicode -Append
@@ -157,6 +160,7 @@ else {
 # echo "            verPatch: [$verPatch]"
 # echo ""
 # echo "          aboutBuild: [$aboutBuild]"
+# echo "        platformArch: [$platformArch]"
 # echo "     productNameFull: [$pnf]"
 # echo "productCopyrightFull: [$pcf]"
 # echo "        internalName: [$intName]"

pre-build.cmd

@@ -1,16 +1,22 @@
 @ECHO OFF
 
+:: In VisualStudio add to Pre-Build events:
+:: "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)"
+:: Then in "Resource Includes..." add '#include "VersionInfo.rc"' into 'Compile-time Directives'
+
 REM In VisualStudio add to Pre-Build events:
-REM "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)"
+REM "$(SolutionDir)pre-build.cmd" "$(SolutionDir)" "$(ProjectDir)" "$(PlatformTarget)"
 REM Then in "Resource Includes..." add '#include "VersionInfo.rc"' into 'Compile-time Directives'
 
 IF "%~1" == "" GOTO :no_args
 IF "%~2" == "" GOTO :no_args
+IF "%~3" == "" GOTO :no_args
 SET solutionDir=%1
 SET projectDir=%2
+SET platformArch=%3
 
 CD /D %solutionDir%
-powershell -ExecutionPolicy RemoteSigned -File Update_Version.ps1
+powershell -ExecutionPolicy RemoteSigned -File Update_Version.ps1 %platformArch%
 MOVE /Y %solutionDir%VersionInfo.h %projectDir%VersionInfo.h
 EXIT
 

wCenterWindow/CLogger.cpp

@@ -1,11 +1,14 @@
 // wCenterWindow
 // CLogger.cpp
+
 #include "CLogger.h"
+#include <string>
 #include <filesystem>
+#include <strsafe.h>
 
 inline wchar_t* CLogger::GetTimeStamp() {
     GetLocalTime(&lt);
-	swprintf_s(logTimeBuffer, L"%d-%02d-%02d %02d:%02d:%02d.%03d | ", lt.wYear, lt.wMonth, lt.wDay, lt.wHour, lt.wMinute, lt.wSecond, lt.wMilliseconds);
+    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);
     return logTimeBuffer;
 }
 
@@ -14,7 +17,7 @@ void CLogger::Out(const wchar_t* fmt, ...) {
         va_list args;
         va_start(args, fmt);
         EnterCriticalSection(&cs);
-		_vsnwprintf_s(logBuffer, _countof(logBuffer), _TRUNCATE, fmt, args);
+        StringCchVPrintfW(logBuffer, _countof(logBuffer), fmt, args);
         va_end(args);
         fsLogFile << GetTimeStamp() << logBuffer << std::endl;
         LeaveCriticalSection(&cs);
@@ -22,16 +25,15 @@ void CLogger::Out(const wchar_t* fmt, ...) {
 }
 
 void CLogger::Init() {
-	InitializeCriticalSection(&cs);
     wchar_t szPath[MAX_PATH] = { 0 };
     DWORD dwPathLength = GetModuleFileNameW(NULL, szPath, MAX_PATH);
     DWORD dwError = GetLastError();
     if (ERROR_INSUFFICIENT_BUFFER == dwError) {
-		MessageBoxW(NULL, L"Warning!\nPath to log file is too long! Working without logging.", szAppTitle.c_str(), MB_OK | MB_ICONWARNING);
+        MessageBoxW(NULL, L"Warning!\nPath to log file is too long! Working without logging.", szAppTitle.c_str(), MB_OK | MB_ICONWARNING | MB_SYSTEMMODAL);
         return;
     }
     if (NULL == dwPathLength) {
-		MessageBoxW(NULL, L"Warning!\nCan't get application's filename! Working without logging.", szAppTitle.c_str(), MB_OK | MB_ICONWARNING);
+        MessageBoxW(NULL, L"Warning!\nCan't get application's filename! Working without logging.", szAppTitle.c_str(), MB_OK | MB_ICONWARNING | MB_SYSTEMMODAL);
         return;
     }
 
@@ -46,13 +48,14 @@ void CLogger::Init() {
 #endif
     fsLogFile.open(log_path, std::ios::trunc);
     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;
     }
     else {
-		MessageBoxW(NULL, L"Warning!\nCan't create log file! Working without logging.", szAppTitle.c_str(), MB_OK | MB_ICONWARNING);
+        MessageBoxW(NULL, L"Warning!\nCan't create log file! Working without logging.", szAppTitle.c_str(), MB_OK | MB_ICONWARNING | MB_SYSTEMMODAL);
     }
 }
 
@@ -62,13 +65,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() {
     if (fsLogFile) {
         fsLogFile << GetTimeStamp() << "Stop log." << std::endl;

wCenterWindow/CLogger.h

@@ -1,29 +1,27 @@
 // wCenterWindow
 // CLogger.h
+
 #pragma once
 #include <Windows.h>
 #include <fstream>
 
 #define MAX_LOGBUFFER_LENGTH 512
 
-class CLogger
-{
+class CLogger {
 public:
     void Out(const wchar_t*, ...);
     CLogger(const wchar_t*);
-	CLogger(const wchar_t*, const wchar_t*);
     ~CLogger();
 
 private:
     SYSTEMTIME lt;
     CRITICAL_SECTION cs;
-	HANDLE hLoggerThread = NULL;
-	HANDLE hLoggerEvent = NULL;
     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 };
 
     inline wchar_t* GetTimeStamp();

wCenterWindow/framework.h

@@ -1,6 +1,6 @@
 // wCenterWindow
 // framework.h
-//
+
 #pragma once
 #include "targetver.h"
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers

wCenterWindow/resource.h

@@ -2,44 +2,38 @@
 // Microsoft Visual C++ generated include file.
 // Used by wCenterWindow.rc
 //
-#define IDS_CLASSNAME                   102
-#define IDS_APP_TITLE                   103
-#define IDD_ABOUTBOX                    104
-#define IDI_TRAYICON                    105
-#define IDR_MENU                        106
-#define ID_POPUPMENU_ICON               107
-#define ID_POPUPMENU_AREA               108
-#define ID_POPUPMENU_ABOUT              110
-#define ID_POPUPMENU_EXIT               111
-#define IDS_ABOUT                       112
-#define IDS_ERR_MAIN                    113
-#define IDS_ERR_CLASS                   114
-#define IDS_ERR_WND                     115
-#define IDS_ERR_ICON                    116
-#define IDS_ERR_MENU                    117
-#define IDS_ERR_POPUP                   118
-#define IDS_ERR_HOOK                    119
-#define IDS_ERR_TIMER                   120
-#define IDS_ERR_MAXMIN                  121
-#define IDS_RUNNING                     122
-#define IDT_TIMER                       123
-#define IDR_MAINFRAME                   128
-#define IDD_MANUAL_EDITING              129
-#define IDC_EDIT_X                      1000
-#define IDC_EDIT_Y                      1001
-#define IDC_EDIT_WIDTH                  1002
-#define IDC_EDIT_HEIGHT                 1003
-#define IDC_EDIT_TITLE                  1004
-#define IDC_EDIT_CLASS                  1005
-#define IDC_BUTTON_SET                  1006
-#define IDC_BUTTON_CLOSE                1007
-#define IDC_ABOUTHELP                   1008
-#define IDC_DONATIONLINK                1009
-#define IDC_DONATIONTEXT                1010
-#define IDC_ABOUT_PROGNAME              1011
-#define IDC_ABOUT_COPYRIGHT             1012
-#define IDC_ABOUT_BUILDTIME             1013
-#define IDC_ABOUTEDIT                   1014
+#define IDS_CLASSNAME                   100
+#define IDS_APP_TITLE                   101
+#define IDI_TRAYICON                    102
+#define IDR_MENU                        103
+#define ID_POPUPMENU_ICON               104
+#define ID_POPUPMENU_AREA               105
+#define ID_POPUPMENU_HELP               106
+#define ID_POPUPMENU_ABOUT              107
+#define ID_POPUPMENU_EXIT               108
+#define IDS_HELP                        109
+#define IDS_ERR_MAIN                    110
+#define IDS_ERR_CLASS                   111
+#define IDS_ERR_WND                     112
+#define IDS_ERR_ICON                    113
+#define IDS_ERR_MENU                    114
+#define IDS_ERR_POPUP                   115
+#define IDS_ERR_HOOK                    116
+#define IDS_ERR_TIMER                   117
+#define IDS_ERR_HEAP                    118
+#define IDS_ERR_MAXMIN                  119
+#define IDS_RUNNING                     120
+#define IDT_TIMER                       121
+#define IDD_MANUAL_EDITING              1000
+#define IDC_EDIT_X                      1001
+#define IDC_EDIT_Y                      1002
+#define IDC_EDIT_WIDTH                  1003
+#define IDC_EDIT_HEIGHT                 1004
+#define IDC_EDIT_TITLE                  1005
+#define IDC_EDIT_CLASS                  1006
+#define IDC_BUTTON_SET                  1007
+#define IDC_BUTTON_CENTER               1008
+#define IDC_BUTTON_CLOSE                1009
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
@@ -47,9 +41,9 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        130
+#define _APS_NEXT_RESOURCE_VALUE        200
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1015
-#define _APS_NEXT_SYMED_VALUE           124
+#define _APS_NEXT_CONTROL_VALUE         1010
+#define _APS_NEXT_SYMED_VALUE           122
 #endif
 #endif

wCenterWindow/targetver.h

@@ -1,6 +1,12 @@
+// wCenterWindow
+// targetver.h
 #pragma once
 
 // // Including SDKDDKVer.h defines the highest available Windows platform.
 // If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
 // set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+#include <winsdkver.h>
+#define WINVER       0x0601
+#define _WIN32_WINNT 0x0601
+#define _WIN32_IE    0x0601
 #include <SDKDDKVer.h>

wCenterWindow/updater.cpp

@@ -1,6 +1,6 @@
 // wCenterWindow
 // updater.h
-//
+
 #include "wCenterWindow.h"
 #include "updater.h"
 #include "picojson.h"
@@ -11,8 +11,7 @@
 
 picojson::value json;
 
-struct Version
-{
+struct Version {
     UINT Major = 0;
     UINT Minor = 0;
     UINT Build = 0;
@@ -24,17 +23,18 @@ void FillVersionStructure(Version& ver, const std::wstring& str);
 std::vector<std::wstring> Split(const std::wstring& s, wchar_t delim);
 std::wstring ConvertUtf8ToWide(const std::string& str);
 
-UINT WINAPI Updater(LPVOID)
-{
+UINT WINAPI Updater(void*) {
     logger.Out(L"Entering the %s() function", TEXT(__FUNCTION__));
+    logger.Out(L"[UPDT] Sleeping %d seconds", T0);
 
-	if (!GetLatestRelease(GITHUB_URI))
-	{
+    Sleep(T0 * 1000); // 10 seconds
+
+    if (!GetLatestRelease(GITHUB_URI)) {
         logger.Out(L"[UPDT] %s(%d): Failed getting releases!", TEXT(__FUNCTION__), __LINE__);
 
         MessageBoxW(NULL, L"Failed getting releases!", szTitle, MB_OK | MB_ICONERROR);
-		_endthreadex(101);
         return 101;
+        _endthreadex(101);
     }
 
     std::wstring j_tag_name, j_file_name, j_file_ext, j_file_url, j_page_url;
@@ -42,30 +42,25 @@ UINT WINAPI Updater(LPVOID)
     picojson::object obj, obj2;
     picojson::object::iterator it, it2;
 
-	if (json.is<picojson::object>())
-	{
+    if (json.is<picojson::object>()) {
         logger.Out(L"[UPDT] %s(%d): Parsing JSON object", TEXT(__FUNCTION__), __LINE__);
 
         obj = json.get<picojson::object>();
         it = obj.find("message"), it2;
-		if (it != obj.end())
-		{
+        if (it != obj.end()) {
             std::string u = (*it).second.get<std::string>();
             logger.Out(L"[UPDT] %s(%d): Error! The url is %s", TEXT(__FUNCTION__), __LINE__, u);
-			_endthreadex(102);
             return 102;
+            _endthreadex(102);
         }
 
-		for (it = obj.begin(); it != obj.end(); it++)
-		{
+        for (it = obj.begin(); it != obj.end(); it++) {
             if ((*it).first == "tag_name") j_tag_name = ConvertUtf8ToWide((*it).second.to_str());
             if ((*it).first == "html_url") j_page_url = ConvertUtf8ToWide((*it).second.to_str());
-			if ((*it).first == "assets" && (*it).second.is<picojson::array>())
-			{
+            if ((*it).first == "assets" && (*it).second.is<picojson::array>()) {
                 picojson::array a = (*it).second.get<picojson::array>();
                 obj2 = a[0].get<picojson::object>();
-				for (it2 = obj2.begin(); it2 != obj2.end(); it2++)
-				{
+                for (it2 = obj2.begin(); it2 != obj2.end(); it2++) {
                     if ((*it2).first == "name") j_file_name = ConvertUtf8ToWide((*it2).second.to_str());
                     if ((*it2).first == "browser_download_url") j_file_url = ConvertUtf8ToWide((*it2).second.to_str());
                     if ((*it2).first == "size") j_file_size = static_cast<int64_t>((*it2).second.get<double>());
@@ -73,11 +68,10 @@ UINT WINAPI Updater(LPVOID)
             }
         }
     }
-	else
-	{
+    else {
         logger.Out(L"[UPDT] %s(%d): Error! Cannot recognize JSON object!", TEXT(__FUNCTION__), __LINE__);
-		_endthreadex(103);
         return 103;
+        _endthreadex(103);
     }
 
     size_t pos = 0;
@@ -94,34 +88,29 @@ UINT WINAPI Updater(LPVOID)
     FillVersionStructure(verApp, TEXT(VERSION_STR));
     FillVersionStructure(verGh, gh_version);
 
-	if ((verGh.Major > verApp.Major) || (verGh.Minor > verApp.Minor) || (verGh.Build > verApp.Build) || (verGh.Patch > verApp.Patch))
-	{
+    if ((verGh.Major > verApp.Major) || (verGh.Minor > verApp.Minor) || (verGh.Build > verApp.Build) || (verGh.Patch > verApp.Patch)) {
 
         logger.Out(L"[UPDT] %s(%d): An update is available!", TEXT(__FUNCTION__), __LINE__);
 
-		if (IDYES == MessageBoxW(NULL, L"An update is available!\nDo you want to open the download page?", szTitle, MB_YESNO | MB_ICONINFORMATION))
-		{
+        if (IDYES == MessageBoxW(NULL, L"An update is available!\nDo you want to open the download page?", szTitle, MB_YESNO | MB_ICONINFORMATION)) {
             logger.Out(L"[UPDT] %s(%d): Opening download page by default browser", TEXT(__FUNCTION__), __LINE__);
             ShellExecuteW(NULL, L"open", j_page_url.c_str(), NULL, NULL, SW_SHOW);
         }
-		else
-		{
+        else {
             logger.Out(L"[UPDT] %s(%d): The user refused the update", TEXT(__FUNCTION__), __LINE__);
         }
     }
-	else
-	{
+    else {
         logger.Out(L"[UPDT] %s(%d): No updates is available", TEXT(__FUNCTION__), __LINE__);
     }
 
     logger.Out(L"[UPDT] Exit from the %s() function", TEXT(__FUNCTION__));
 
-	_endthreadex(0);
     return 0;
+    _endthreadex(0);
 }
 
-bool GetLatestRelease(const std::wstring& urn)
-{
+bool GetLatestRelease(const std::wstring& urn) {
     std::wstring user_agent = L"User-Agent: ";
     user_agent.append(szTitle);
     const std::wstring url = GITHUB_URL;
@@ -131,60 +120,53 @@ bool GetLatestRelease(const std::wstring& urn)
     logger.Out(L"[UPDT] %s(%d): %s", TEXT(__FUNCTION__), __LINE__, user_agent.c_str());
 
     HINTERNET hInternet = InternetOpenW(user_agent.c_str(), INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
-	if (hInternet != NULL)
-	{
+    if (hInternet != NULL) {
         HINTERNET hConnect = InternetConnectW(hInternet, url.c_str(), INTERNET_DEFAULT_HTTPS_PORT, L"", L"", INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0);
-		if (hConnect != NULL)
-		{
+        if (hConnect != NULL) {
             HINTERNET hRequest = HttpOpenRequestW(hConnect, L"GET", urn.c_str(), NULL, NULL, NULL, INTERNET_FLAG_SECURE | INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_UI, 0);
-			if (hRequest != NULL)
-			{
+            if (hRequest != NULL) {
                 BOOL isSend = HttpSendRequestW(hRequest, NULL, 0, 0, 0);
-				if (isSend)
-				{
+                if (isSend) {
                     char szData[1024]{ 0 };
                     DWORD dwBytesRead = 0;
                     std::string buffer;
-					do
-					{
+                    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();
-					if (!jerr.empty())
-					{
-						std::cout << jerr << std::endl;
+                    if (!jerr.empty()) {
+                        logger.Out(L"[UPDT] %s(%d): Error while parsing JSON object: %s", TEXT(__FUNCTION__), __LINE__, ConvertUtf8ToWide(jerr));
+
+                        MessageBoxW(NULL, L"Error while parsing JSON object!", szTitle, MB_OK | MB_ICONERROR);
                         ret = false;
                     }
 
                 }
-				else
-				{
+                else {
                     err = GetLastError();
                     logger.Out(L"[UPDT] %s(%d): HttpSendRequestW() error: %d", TEXT(__FUNCTION__), __LINE__, err);
                     ret = false;
                 }
             }
-			else
-			{
+            else {
                 err = GetLastError();
                 logger.Out(L"[UPDT] %s(%d): HttpOpenRequestW() error: %d", TEXT(__FUNCTION__), __LINE__, err);
                 ret = false;
             }
             InternetCloseHandle(hRequest);
         }
-		else
-		{
+        else {
             err = GetLastError();
             logger.Out(L"[UPDT] %s(%d): InternetConnectW() error: %d", TEXT(__FUNCTION__), __LINE__, err);
             ret = false;
         }
         InternetCloseHandle(hConnect);
     }
-	else
-	{
+    else {
         err = GetLastError();
         logger.Out(L"[UPDT] %s(%d): InternetOpenW() error: %d", TEXT(__FUNCTION__), __LINE__, err);
         ret = false;
@@ -193,8 +175,7 @@ bool GetLatestRelease(const std::wstring& urn)
     return ret;
 }
 
-std::vector<std::wstring> Split(const std::wstring& s, wchar_t delim)
-{
+std::vector<std::wstring> Split(const std::wstring& s, wchar_t delim) {
     std::vector<std::wstring> result;
     std::wstringstream ss(s);
     std::wstring item;
@@ -202,8 +183,7 @@ std::vector<std::wstring> Split(const std::wstring& s, wchar_t delim)
     return result;
 }
 
-void FillVersionStructure(Version& ver, const std::wstring& str)
-{
+void FillVersionStructure(Version& ver, const std::wstring& str) {
     std::vector<std::wstring> v;
     v = Split(str, '.');
     if (v.size() < 4) v.push_back(L"0");
@@ -213,8 +193,7 @@ void FillVersionStructure(Version& ver, const std::wstring& str)
     ver.Patch = std::stoul(v[3]);
 }
 
-std::wstring ConvertUtf8ToWide(const std::string& str)
-{
+std::wstring ConvertUtf8ToWide(const std::string& str) {
     int count = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.length(), NULL, 0);
     std::wstring wstr(count, 0);
     MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.length(), &wstr[0], count);

wCenterWindow/updater.h

@@ -1,5 +1,5 @@
 // wCenterWindow
 // updater.h
-//
+
 #pragma once
 UINT WINAPI Updater(void*);

wCenterWindow/wCenterWindow.cpp

@@ -1,15 +1,15 @@
 // wCenterWindow
 // wCenterWindow.cpp
-// 
-// TODO: Licensing.
-// TODO: Change keyboard low-level hook to RegisterHotKey function.
-// TODO: Make x64 version.
-//
+
+// TODO: Split main cpp-file to separate files.
+// TODO: Make the automatic updater (download, unzip and replace executable).
+// TODO: Change keyboard low-level hook to RegisterHotKey function. (Is it really needed?)
+
 #include "framework.h"
 #include "wCenterWindow.h"
 #include "updater.h"
 
-#define NO_DONATION
+//#define NO_DONATION
 #define KEY_I 0x49
 #define KEY_C 0x43
 #define KEY_V 0x56
@@ -18,41 +18,33 @@
 #define WM_WCW (WM_APP + 0x0F00)
 
 // Global variables:
-HINSTANCE			hInst;																			// Instance
 WCHAR szTitle[MAX_LOADSTRING]{ 0 }; // wCenterWindow's title
-WCHAR				szClass[MAX_LOADSTRING]{ 0 };													// Window's class
-WCHAR				szWinTitle[256]{ 0 };
-WCHAR				szWinClass[256]{ 0 };
-HANDLE				hHeap = NULL, hUpdater = NULL;
-UINT				dwUpdaterID = 0;
-HHOOK				hMouseHook = NULL, hKbdHook = NULL;												// Hook's handles
-HICON				hIcon = NULL;
-HMENU				hMenu = NULL, hPopup = NULL;
-HWND				hWnd = NULL, hFgWnd = NULL;
+HICON            hIconSmall = NULL, hIconLarge = NULL;
+HMENU            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));
+UINT             uMsgRestore = 0;
+CLogger          logger(TEXT(PRODUCT_NAME_FULL));
 
 NOTIFYICONDATAW  nid = { 0 };
-MENUITEMINFO		mii = { 0 };
+MENUITEMINFOW    mii = { 0 };
 
-LPVOID				szBuffer;
-
-// {2D7B7F30-4B5F-4380-9807-57D7A2E37F6C}
-// static const GUID	guid = { 0x2d7b7f30, 0x4b5f, 0x4380, { 0x98, 0x7, 0x57, 0xd7, 0xa2, 0xe3, 0x7f, 0x6c } };
+LPVOID           szWinTitleBuffer = nullptr;
+LPVOID           szWinClassBuffer = nullptr;
 
 // Forward declarations of functions included in this code module:
 VOID             HandlingTrayIcon();
-VOID				ShowError(UINT);
+VOID             ShowError(UINT, LPCWSTR);
+VOID             ShowPopupMenu(HWND, POINT);
 BOOL             IsWindowApprooved(HWND);
-BOOL	CALLBACK	DlgProc(HWND, UINT, WPARAM, LPARAM);
 LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 LRESULT CALLBACK KeyboardHookProc(int, WPARAM, LPARAM);
 LRESULT CALLBACK MouseHookProc(int, WPARAM, LPARAM);
-INT_PTR CALLBACK	About(HWND, UINT, WPARAM, LPARAM);
+INT_PTR	CALLBACK DlgProc(HWND, UINT, WPARAM, LPARAM);
+HRESULT CALLBACK AboutCallback(HWND, UINT, WPARAM, LPARAM, LONG_PTR);
 
-VOID MoveWindowToMonitorCenter(HWND hwnd, BOOL bWorkArea, BOOL bResize)
-{
+static VOID MoveWindowToMonitorCenter(HWND hwnd, BOOL bWorkArea, BOOL bResize) {
     logger.Out(L"Entering the %s() function", TEXT(__FUNCTION__));
 
     RECT fgwrc = { 0 };
@@ -66,29 +58,33 @@ VOID MoveWindowToMonitorCenter(HWND hwnd, BOOL bWorkArea, BOOL bResize)
     mi.cbSize = sizeof(MONITORINFO);
     GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST), &mi);
     RECT area = { 0 };
-	if (bWorkArea)
-	{
+    if (bWorkArea) {
         area.bottom = mi.rcWork.bottom;
         area.left = mi.rcWork.left;
         area.right = mi.rcWork.right;
         area.top = mi.rcWork.top;
     }
-	else
-	{
+    else {
         area.bottom = mi.rcMonitor.bottom;
         area.left = mi.rcMonitor.left;
         area.right = mi.rcMonitor.right;
         area.top = mi.rcMonitor.top;
     }
 
-	int aw = area.right - area.left;
-	int ah = area.bottom - area.top;
-	if (nWidth > aw && bResize) nWidth = aw;
-	if (nHeight > ah && bResize) nHeight = ah;
-	if (area.left < 0) aw = -aw;
-	if (area.top < 0) ah = -ah;
-	int x = (aw - nWidth) / 2;
-	int y = (ah - nHeight) / 2;
+    LONG aw = area.right - area.left;
+    LONG ah = area.bottom - area.top;
+    if ((nWidth > aw) && bResize) nWidth = aw;
+    if ((nHeight > ah) && bResize) nHeight = ah;
+    if (area.left < 0) {
+        aw = -aw;
+        area.left = 0;
+    }
+    if (area.top < 0) {
+        ah = -ah;
+        area.top = 0;
+    }
+    int x = area.left + (aw - nWidth) / 2;
+    int y = area.top + (ah - nHeight) / 2;
 
     logger.Out(L"%s(%d): Moving the window to %d, %d", TEXT(__FUNCTION__), __LINE__, x, y);
 
@@ -99,17 +95,15 @@ VOID MoveWindowToMonitorCenter(HWND hwnd, BOOL bWorkArea, BOOL bResize)
     logger.Out(L"Exit from the %s() function", TEXT(__FUNCTION__));
 }
 
-int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
-{
-	hInst = hInstance;
+int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) {
+    WCHAR szClass[MAX_LOADSTRING]{ 0 }; // Window's class
 
     LoadStringW(hInstance, IDS_APP_TITLE, szTitle, _countof(szTitle));
     LoadStringW(hInstance, IDS_CLASSNAME, szClass, _countof(szClass));
 
-	if (FindWindowW(szClass, NULL))
-	{
-		ShowError(IDS_RUNNING);
-		return FALSE;
+    if (FindWindowW(szClass, NULL)) {
+        ShowError(IDS_RUNNING, szTitle);
+        return -10;
     }
 
     logger.Out(L"Entering the %s() function", TEXT(__FUNCTION__));
@@ -119,10 +113,8 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd
 
     logger.Out(L"Arguments count: %d", nArgs - 1);
 
-	if (nArgs > 1)
-	{
-		for (int i = 1; i < nArgs; i++)
-		{
+    if (nArgs > 1) {
+        for (int i = 1; i < nArgs; i++) {
             logger.Out(L"Argument %d: %s", i, szArglist[i]);
             if (0 == lstrcmpiW(szArglist[i], L"/hide")) fShowIcon = FALSE;
             if (0 == lstrcmpiW(szArglist[i], L"/noupdate")) fCheckUpdates = FALSE;
@@ -131,188 +123,203 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd
     }
     LocalFree(szArglist);
 
-	WNDCLASSEX wcex = { 0 };
-	wcex.cbSize = sizeof(WNDCLASSEX);
+    LoadIconMetric(hInstance, MAKEINTRESOURCEW(IDI_TRAYICON), LIM_LARGE, &hIconLarge);
+    LoadIconMetric(hInstance, MAKEINTRESOURCEW(IDI_TRAYICON), LIM_SMALL, &hIconSmall);
+
+    WNDCLASSEXW wcex = { 0 };
+    wcex.cbSize = sizeof(WNDCLASSEXW);
     wcex.lpfnWndProc = WndProc;
     wcex.hInstance = hInstance;
-	wcex.hIcon = LoadIconW(hInstance, MAKEINTRESOURCE(IDI_TRAYICON));
-	LoadIconMetric(hInst, MAKEINTRESOURCE(IDI_TRAYICON), LIM_LARGE, &(wcex.hIcon));
+    wcex.hIcon = hIconLarge;
     wcex.hCursor = LoadCursorW(nullptr, IDC_ARROW);
     wcex.lpszClassName = szClass;
-	wcex.hIconSm = wcex.hIcon;
-	hIcon = wcex.hIcon;
-	if (!RegisterClassExW(&wcex))
-	{
-		ShowError(IDS_ERR_CLASS);
-		return FALSE;
+    wcex.hIconSm = hIconSmall;
+    if (!RegisterClassExW(&wcex)) {
+        ShowError(IDS_ERR_CLASS, szTitle);
+        return -9;
     }
 
-	hWnd = CreateWindowExW(0, szClass, szTitle, 0, 0, 0, 0, 0, NULL, NULL, hInstance, NULL);
-	if (!hWnd)
-	{
-		ShowError(IDS_ERR_WND);
-		return FALSE;
+    HWND hMainWnd = CreateWindowExW(0, szClass, szTitle, 0, 0, 0, 0, 0, NULL, NULL, hInstance, NULL);
+    if (!hMainWnd) {
+        ShowError(IDS_ERR_WND, szTitle);
+        return -8;
     }
 
+#ifndef _DEBUG
+    HHOOK hMouseHook = SetWindowsHookExW(WH_MOUSE_LL, MouseHookProc, GetModuleHandleW(NULL), NULL);
+    if (!hMouseHook) {
+        logger.Out(L"%s(%d): Mouse hook creation failed!", TEXT(__FUNCTION__), __LINE__);
+
+        ShowError(IDS_ERR_HOOK, szTitle);
+        return -7;
+    }
+    logger.Out(L"%s(%d): The mouse hook was successfully installed", TEXT(__FUNCTION__), __LINE__);
+#endif // !_DEBUG
+
+    HHOOK hKbdHook = SetWindowsHookExW(WH_KEYBOARD_LL, KeyboardHookProc, GetModuleHandleW(NULL), NULL);
+    if (!hKbdHook) {
+        logger.Out(L"%s(%d): Keyboard hook creation failed!", TEXT(__FUNCTION__), __LINE__);
+
+        ShowError(IDS_ERR_HOOK, szTitle);
+        return -6;
+    }
+    logger.Out(L"%s(%d): The keyboard hook was successfully installed", TEXT(__FUNCTION__), __LINE__);
+
+    HMENU hMenu = LoadMenuW(hInstance, MAKEINTRESOURCE(IDR_MENU));
+    if (!hMenu) {
+        logger.Out(L"%s(%d): Loading context menu failed!", TEXT(__FUNCTION__), __LINE__);
+        ShowError(IDS_ERR_MENU, szTitle);
+        return -5;
+    }
+    logger.Out(L"%s(%d): Context menu successfully loaded", TEXT(__FUNCTION__), __LINE__);
+
+    hPopup = GetSubMenu(hMenu, 0);
+    if (!hPopup) {
+        logger.Out(L"%s(%d): Creating popup menu failed!", TEXT(__FUNCTION__), __LINE__);
+        ShowError(IDS_ERR_POPUP, szTitle);
+        return -4;
+    }
+    logger.Out(L"%s(%d): Popup menu successfully created", TEXT(__FUNCTION__), __LINE__);
+
+    mii.cbSize = sizeof(MENUITEMINFOW);
+    mii.fMask = MIIM_STATE;
+    bWorkArea ? mii.fState = MFS_CHECKED : mii.fState = MFS_UNCHECKED;
+    SetMenuItemInfoW(hPopup, ID_POPUPMENU_AREA, FALSE, &mii);
+
     HandlingTrayIcon();
 
-	hHeap = GetProcessHeap();
-	szBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, MAX_WINTITLE_BUFFER_LENGTH);
+    HANDLE hHeap = GetProcessHeap();
+
+    szWinTitleBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, MAX_WINTITLE_BUFFER_LENGTH);
+    if (nullptr == szWinTitleBuffer) {
+        ShowError(IDS_ERR_HEAP, szTitle);
+        return -3;
+    }
+
+    szWinClassBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, MAX_WINTITLE_BUFFER_LENGTH);
+    if (nullptr == szWinClassBuffer) {
+        ShowError(IDS_ERR_HEAP, szTitle);
+        return -2;
+    }
 
     MSG msg;
     BOOL bRet;
 
-	while ((bRet = GetMessageW(&msg, NULL, 0, 0)) != 0)
-	{
-		if (bRet == -1)
-		{
-			ShowError(IDS_ERR_MAIN);
+    while ((bRet = GetMessageW(&msg, NULL, 0, 0)) != 0) {
+        if (bRet == -1) {
+            ShowError(IDS_ERR_MAIN, szTitle);
             return -1;
         }
-		else
-		{
+        else {
             TranslateMessage(&msg);
             DispatchMessageW(&msg);
         }
     }
 
+#ifndef _DEBUG
     if (hMouseHook) UnhookWindowsHookEx(hMouseHook);
+#endif // !_DEBUG
     if (hKbdHook) UnhookWindowsHookEx(hKbdHook);
     if (hMenu) DestroyMenu(hMenu);
     Shell_NotifyIconW(NIM_DELETE, &nid);
-	DestroyIcon(hIcon);
+    KillTimer(hMainWnd, IDT_TIMER);
+    DestroyIcon(hIconSmall);
+    DestroyIcon(hIconLarge);
+    HeapFree(hHeap, NULL, szWinClassBuffer);
+    HeapFree(hHeap, NULL, szWinTitleBuffer);
 
-	logger.Out(L"Exit from the %s() function, msg.wParam = %d", TEXT(__FUNCTION__), (int)msg.wParam);
+    logger.Out(L"Exit from the %s() function, msg.wParam = 0x%0*tX", TEXT(__FUNCTION__), (sizeof(UINT_PTR) * 2), static_cast<UINT_PTR>(msg.wParam));
 
-	HeapFree(hHeap, NULL, szBuffer);
-	CloseHandle(hUpdater);
-
-	return (int)msg.wParam;
+    return static_cast<UINT_PTR>(msg.wParam);
 }
 
-LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-	switch (message)
-	{
+LRESULT CALLBACK WndProc(HWND hMainWnd, UINT message, WPARAM wParam, LPARAM lParam) {
+    switch (message) {
         case WM_CREATE:
         {
             logger.Out(L"%s(%d): Recived WM_CREATE message", TEXT(__FUNCTION__), __LINE__);
 
-			hMenu = LoadMenuW(hInst, MAKEINTRESOURCE(IDR_MENU));
-			if (!hMenu)
-			{
-				logger.Out(L"%s(%d): Loading context menu failed!", TEXT(__FUNCTION__), __LINE__);
-				ShowError(IDS_ERR_MENU);
-				PostQuitMessage(0);
-			}
-			logger.Out(L"%s(%d): Context menu successfully loaded", TEXT(__FUNCTION__), __LINE__);
-
-			hPopup = GetSubMenu(hMenu, 0);
-			if (!hPopup)
-			{
-				logger.Out(L"%s(%d): Creating popup menu failed!", TEXT(__FUNCTION__), __LINE__);
-				ShowError(IDS_ERR_POPUP);
-				PostQuitMessage(0);
-			}
-			logger.Out(L"%s(%d): Popup menu successfully created", TEXT(__FUNCTION__), __LINE__);
-
-			mii.cbSize = sizeof(MENUITEMINFO);
-			mii.fMask = MIIM_STATE;
-			bWorkArea ? mii.fState = MFS_CHECKED : mii.fState = MFS_UNCHECKED;
-			SetMenuItemInfoW(hPopup, ID_POPUPMENU_AREA, FALSE, &mii);
-
             nid.cbSize = sizeof(NOTIFYICONDATAW);
-			nid.hWnd = hWnd;
-			nid.uVersion = NOTIFYICON_VERSION;
+            nid.hWnd = hMainWnd;
+            nid.uVersion = NOTIFYICON_VERSION_4;
             nid.uCallbackMessage = WM_WCW;
-			nid.hIcon = hIcon;
+            nid.hIcon = hIconSmall;
             nid.uID = IDI_TRAYICON;
-			nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
+            nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP | NIF_SHOWTIP;
             StringCchCopyW(nid.szTip, _countof(nid.szTip), szTitle);
 
-			if (fCheckUpdates)
-			{
-				if (!SetTimer(hWnd, IDT_TIMER, 30000, NULL))										// 30 seconds
+            uMsgRestore = RegisterWindowMessageW(L"TaskbarCreated");
+            if (!uMsgRestore) {
+                logger.Out(L"%s(%d): Registering 'TaskbarCreated' message failed!", TEXT(__FUNCTION__), __LINE__);
+            }
+            logger.Out(L"%s(%d): The 'TaskbarCreated' message successfully registered", TEXT(__FUNCTION__), __LINE__);
+
+            if (fCheckUpdates) {
+                if (!SetTimer(hMainWnd, IDT_TIMER, (T1 * 1000 - T0 * 1000), NULL)) // 50 seconds
                 {
                     logger.Out(L"%s(%d): Creating timer failed!", TEXT(__FUNCTION__), __LINE__);
-					ShowError(IDS_ERR_TIMER);
+                    ShowError(IDS_ERR_TIMER, szTitle);
                     fCheckUpdates = FALSE;
                 }
-				logger.Out(L"%s(%d): Timer successfully created", TEXT(__FUNCTION__), __LINE__);
+                logger.Out(L"%s(%d): Timer successfully created (%d sec)", TEXT(__FUNCTION__), __LINE__, (T1 - T0));
             }
-
-#ifndef _DEBUG
-			hMouseHook = SetWindowsHookExW(WH_MOUSE_LL, MouseHookProc, hInst, NULL);
-			if (!hMouseHook)
-			{
-				logger.Out(L"%s(%d): Mouse hook creation failed!", TEXT(__FUNCTION__), __LINE__);
-
-				ShowError(IDS_ERR_HOOK);
-				PostQuitMessage(0);
-			}
-			logger.Out(L"%s(%d): The mouse hook was successfully installed", TEXT(__FUNCTION__), __LINE__);
-#endif // !_DEBUG
-
-			hKbdHook = SetWindowsHookExW(WH_KEYBOARD_LL, KeyboardHookProc, hInst, NULL);
-			if (!hKbdHook)
-			{
-				logger.Out(L"%s(%d): Keyboard hook creation failed!", TEXT(__FUNCTION__), __LINE__);
-
-				ShowError(IDS_ERR_HOOK);
-				PostQuitMessage(0);
-			}
-			logger.Out(L"%s(%d): The keyboard hook was successfully installed", TEXT(__FUNCTION__), __LINE__);
             break;
         }
 
         case WM_TIMER:
         {
-			if (fCheckUpdates)
-			{
-				logger.Out(L"%s(%d): Checking for updates is enabled, fCheckUpdates = %s", TEXT(__FUNCTION__), __LINE__, fCheckUpdates ? L"True" : L"False");
+            if (fCheckUpdates) {
+                logger.Out(L"%s(%d): Checking for updates is enabled", TEXT(__FUNCTION__), __LINE__);
 
-				hUpdater = (HANDLE)_beginthreadex(NULL, 0, &Updater, NULL, 0, &dwUpdaterID);
-				if (NULL == hUpdater)
-				{
+                HANDLE hUpdater = reinterpret_cast<HANDLE>(_beginthreadex(NULL, 0, &Updater, NULL, 0, NULL));
+                if (NULL == hUpdater) {
                     DWORD dwLastError = GetLastError();
                     logger.Out(L"%s(%d): Creating Updater thread failed! Error: %d", TEXT(__FUNCTION__), __LINE__, dwLastError);
                 }
-				else
-				{
-					if (!SetTimer(hWnd, IDT_TIMER, 86400000, NULL))									// 1 day
+                else {
+                    if (!SetTimer(hMainWnd, IDT_TIMER, (T2 * 1000), NULL)) // 1 day
                     {
                         logger.Out(L"%s(%d): Creating timer failed!", TEXT(__FUNCTION__), __LINE__);
-						ShowError(IDS_ERR_TIMER);
+                        ShowError(IDS_ERR_TIMER, szTitle);
                         fCheckUpdates = FALSE;
                     }
-					logger.Out(L"%s(%d): Timer successfully created", TEXT(__FUNCTION__), __LINE__);
+                    logger.Out(L"%s(%d): Timer successfully created (%d sec)", TEXT(__FUNCTION__), __LINE__, T2);
+                    CloseHandle(hUpdater);
                 }
             }
-			else
-			{
-				logger.Out(L"%s(%d): Checking for updates is disabled, fCheckUpdates = %s", TEXT(__FUNCTION__), __LINE__, fCheckUpdates ? L"True" : L"False");
+            else {
+                logger.Out(L"%s(%d): Checking for updates is disabled", TEXT(__FUNCTION__), __LINE__);
             }
             break;
         }
 
-		case WM_WCW:																				// Popup menu handler
+        // Popup menu handler
+        case WM_WCW:
         {
-			if (IDI_TRAYICON == wParam && (WM_RBUTTONDOWN == lParam || WM_LBUTTONDOWN == lParam))
-			{
-				logger.Out(L"%s(%d): Entering the WM_WCW message handler", TEXT(__FUNCTION__), __LINE__);
+            if (WM_CONTEXTMENU == LOWORD(lParam)) {
+                logger.Out(L"%s(%d): Recived WM_CONTEXTMENU message", TEXT(__FUNCTION__), __LINE__);
 
-				SetForegroundWindow(hWnd);
-				POINT pt;
-				GetCursorPos(&pt);
-				int idMenu = TrackPopupMenu(hPopup, TPM_RETURNCMD, pt.x, pt.y, 0, hWnd, NULL);
-				if (ID_POPUPMENU_ICON == idMenu)
+                POINT pt{ GET_X_LPARAM(wParam), GET_Y_LPARAM(wParam) };
+                ShowPopupMenu(hMainWnd, pt);
+            }
+            break;
+        }
+
+        case WM_COMMAND:
+        {
+            int wmId = LOWORD(wParam);
+
+            // Parse the menu selections:
+            switch (wmId) {
+                case ID_POPUPMENU_ICON:
                 {
                     logger.Out(L"%s(%d): Pressed the 'Hide icon' menuitem", TEXT(__FUNCTION__), __LINE__);
 
                     fShowIcon = FALSE;
                     HandlingTrayIcon();
+                    break;
                 }
-				if (ID_POPUPMENU_AREA == idMenu)
+                case ID_POPUPMENU_AREA:
                 {
                     logger.Out(L"%s(%d): Pressed the 'Use workarea' menuitem", TEXT(__FUNCTION__), __LINE__);
 
@@ -320,30 +327,71 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                     bWorkArea ? mii.fState = MFS_CHECKED : mii.fState = MFS_UNCHECKED;
                     SetMenuItemInfoW(hPopup, ID_POPUPMENU_AREA, FALSE, &mii);
                     logger.Out(L"%s(%d): Changed 'Use workarea' option to %s", TEXT(__FUNCTION__), __LINE__, bWorkArea ? L"True" : L"False");
+                    break;
                 }
-				if (ID_POPUPMENU_ABOUT == idMenu && !bKPressed)
+                case ID_POPUPMENU_HELP:
                 {
+                    if (!bKPressed) {
+                        logger.Out(L"%s(%d): Pressed the 'Help' menuitem", TEXT(__FUNCTION__), __LINE__);
+
+                        bKPressed = TRUE;
+                        WCHAR szHelp[MAX_LOADSTRING * 15];
+                        LoadStringW(GetModuleHandleW(NULL), IDS_HELP, szHelp, _countof(szHelp));
+                        MessageBoxW(hMainWnd, szHelp, szTitle, MB_OK | MB_ICONINFORMATION);
+                        bKPressed = FALSE;
+                    }
+                    break;
+                }
+                case ID_POPUPMENU_ABOUT:
+                {
+                    if (!bKPressed) {
                         logger.Out(L"%s(%d): Pressed the 'About' menuitem", TEXT(__FUNCTION__), __LINE__);
 
                         bKPressed = TRUE;
-					DialogBoxW(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, (DLGPROC)About);
+                        WCHAR szContent[MAX_LOADSTRING * 6] = { 0 };
+                        StringCchPrintfW(szContent, ARRAYSIZE(szContent),
+                            L"%s\n%s\n\n%s\n%s\n%s",
+                            TEXT(PRODUCT_COPYRIGHT),
+                            L"Program icon made by Kirill Topov.",
+                            L"This software is licensed under a <A HREF=\"https://mit-license.org\">MIT License</A>.",
+                            L"This software uses the <A HREF=\"https://github.com/kazuho/picojson\">PicoJSON</A> - a C++ JSON parser/serializer by Kazuho Oku.",
+#ifndef NO_DONATION
+                            L"\n<A HREF=\"https://www.paypal.com/paypalme/VladislavSalikov\">Donate via PayPal</A>"
+#else
+                            L""
+#endif // !NO_DONATION
+                        );
+
+                        TASKDIALOGCONFIG tdc = { 0 };
+                        tdc.cbSize = sizeof(tdc);
+                        tdc.hInstance = GetModuleHandleW(NULL);
+                        tdc.dwFlags = TDF_ENABLE_HYPERLINKS | TDF_ALLOW_DIALOG_CANCELLATION | TDF_USE_HICON_MAIN | TDF_SIZE_TO_CONTENT;
+                        tdc.dwCommonButtons = TDCBF_OK_BUTTON;
+                        tdc.pszWindowTitle = L"About";
+                        tdc.hMainIcon = hIconLarge;
+                        tdc.pszMainInstruction = TEXT(PRODUCT_NAME_FULL);
+                        tdc.pszContent = szContent;
+                        tdc.pfCallback = AboutCallback;
+                        TaskDialogIndirect(&tdc, NULL, NULL, NULL);
+
                         bKPressed = FALSE;
                     }
-				if (ID_POPUPMENU_EXIT == idMenu)
+                    break;
+                }
+                case ID_POPUPMENU_EXIT:
                 {
                     logger.Out(L"%s(%d): Pressed the 'Exit' menuitem", TEXT(__FUNCTION__), __LINE__);
 
-					PostQuitMessage(0);
+                    DestroyWindow(hMainWnd);
+                    break;
                 }
-
-				logger.Out(L"%s(%d): Exit from the WM_WCW message handler", TEXT(__FUNCTION__), __LINE__);
             }
             break;
         }
 
         case WM_QUERYENDSESSION:
         {
-			logger.Out(L"%s(%d): Recieved the WM_QUERYENDSESSION message, lParam = 0x%08X", TEXT(__FUNCTION__), __LINE__, (long)lParam);
+            logger.Out(L"%s(%d): Recieved the WM_QUERYENDSESSION message, lParam = 0x%p", TEXT(__FUNCTION__), __LINE__, lParam);
 
             PostQuitMessage(0);
             return TRUE;
@@ -358,16 +406,23 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             break;
         }
 
-		default: return DefWindowProcW(hWnd, message, wParam, lParam);
+        default:
+        {
+            if (message == uMsgRestore) {
+                logger.Out(L"%s(%d): Recieved the 'TaskbarCreated' message", TEXT(__FUNCTION__), __LINE__);
+
+                HandlingTrayIcon();
+                break;
+            }
+            return DefWindowProcW(hMainWnd, message, wParam, lParam);
+        }
     }
     return 0;
 }
 
-LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam)
-{
+LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam) {
     if (WM_MBUTTONUP == wParam) bMPressed = FALSE;
-	if (WM_MBUTTONDOWN == wParam && bLCTRL && bLWIN && !bMPressed)
-	{
+    if (WM_MBUTTONDOWN == wParam && bLCTRL && bLWIN && !bMPressed) {
         logger.Out(L"%s(%d): Pressed LCTRL + LWIN + MMB", TEXT(__FUNCTION__), __LINE__);
 
         bMPressed = TRUE;
@@ -378,24 +433,21 @@ LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam)
     return CallNextHookEx(NULL, nCode, wParam, lParam);
 }
 
-LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam)
-{
+LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam) {
     LPKBDLLHOOKSTRUCT pkhs = { 0 };
-	pkhs = (LPKBDLLHOOKSTRUCT)lParam;
-	if (WM_KEYUP == wParam)
-	{
+    pkhs = reinterpret_cast<LPKBDLLHOOKSTRUCT>(lParam);
+    if (WM_KEYUP == wParam) {
         if (VK_LCONTROL == pkhs->vkCode) bLCTRL = FALSE;
         if (VK_LWIN == pkhs->vkCode) bLWIN = FALSE;
         bKPressed = FALSE;
     }
 
-	if (WM_KEYDOWN == wParam)
-	{
+    if (WM_KEYDOWN == wParam) {
         if (VK_LCONTROL == pkhs->vkCode) bLCTRL = TRUE;
         if (VK_LWIN == pkhs->vkCode) bLWIN = TRUE;
 
-		if (KEY_I == pkhs->vkCode && bLCTRL && bLWIN && !bKPressed)									// 'I' key
-		{
+        // 'I' key
+        if (KEY_I == pkhs->vkCode && bLCTRL && bLWIN && !bKPressed) {
             logger.Out(L"%s(%d): Pressed LCTRL + LWIN + I", TEXT(__FUNCTION__), __LINE__);
 
             bKPressed = TRUE;
@@ -404,8 +456,8 @@ LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam)
             return TRUE;
         }
 
-		if (KEY_C == pkhs->vkCode && bLCTRL && bLWIN && !bKPressed && !bKEYV)						// 'C' key
-		{
+        // 'C' key
+        if (KEY_C == pkhs->vkCode && bLCTRL && bLWIN && !bKPressed && !bKEYV) {
             logger.Out(L"%s(%d): Pressed LCTRL + LWIN + C", TEXT(__FUNCTION__), __LINE__);
 
             bKPressed = TRUE;
@@ -415,17 +467,16 @@ LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam)
             return TRUE;
         }
 
-		if (KEY_V == pkhs->vkCode && bLCTRL && bLWIN && !bKPressed && !bKEYV)						// 'V' key
-		{
+        // 'V' key
+        if (KEY_V == pkhs->vkCode && bLCTRL && bLWIN && !bKPressed && !bKEYV) {
             logger.Out(L"%s(%d): Pressed LCTRL + LWIN + V", TEXT(__FUNCTION__), __LINE__);
 
             bKPressed = TRUE; bKEYV = TRUE;
             hFgWnd = GetForegroundWindow();
-			if (IsWindowApprooved(hFgWnd))
-			{
+            if (IsWindowApprooved(hFgWnd)) {
                 logger.Out(L"%s(%d): Opening the 'Manual editing' dialog", TEXT(__FUNCTION__), __LINE__);
 
-				DialogBoxW(hInst, MAKEINTRESOURCE(IDD_MANUAL_EDITING), hFgWnd, (DLGPROC)DlgProc);
+                DialogBoxParamW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDD_MANUAL_EDITING), hFgWnd, static_cast<DLGPROC>(DlgProc), 0L);
                 SetForegroundWindow(hFgWnd);
             }
             else hFgWnd = NULL;
@@ -436,19 +487,16 @@ LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam)
     return CallNextHookEx(NULL, nCode, wParam, lParam);
 }
 
-BOOL CALLBACK DlgProc(HWND hDlg, UINT dlgmsg, WPARAM wParam, LPARAM lParam)
-{
+INT_PTR CALLBACK DlgProc(HWND hDlg, UINT dlgmsg, WPARAM wParam, LPARAM lParam) {
     RECT rcFW = { 0 };
     int x, y, w, h;
-	switch (dlgmsg)
-	{
+    switch (dlgmsg) {
         case WM_INITDIALOG:
         {
             logger.Out(L"%s(%d): Initializing the 'Manual editing' dialog", TEXT(__FUNCTION__), __LINE__);
 
             SetWindowTextW(hDlg, szTitle);
-			GetWindowTextW(hFgWnd, szWinTitle, _countof(szWinTitle));
-			GetClassNameW(hFgWnd, szWinClass, _countof(szWinClass));
+            GetClassNameW(hFgWnd, static_cast<LPWSTR>(szWinClassBuffer), MAX_WINTITLE_BUFFER_LENGTH);
             GetWindowRect(hFgWnd, &rcFW);
             x = rcFW.left;
             y = rcFW.top;
@@ -458,16 +506,15 @@ BOOL CALLBACK DlgProc(HWND hDlg, UINT dlgmsg, WPARAM wParam, LPARAM lParam)
             SetDlgItemInt(hDlg, IDC_EDIT_Y, y, TRUE);
             SetDlgItemInt(hDlg, IDC_EDIT_WIDTH, w, FALSE);
             SetDlgItemInt(hDlg, IDC_EDIT_HEIGHT, h, FALSE);
-			SetDlgItemTextW(hDlg, IDC_EDIT_TITLE, szWinTitle);
-			SetDlgItemTextW(hDlg, IDC_EDIT_CLASS, szWinClass);
+            SetDlgItemTextW(hDlg, IDC_EDIT_TITLE, static_cast<LPCWSTR>(szWinTitleBuffer));
+            SetDlgItemTextW(hDlg, IDC_EDIT_CLASS, static_cast<LPCWSTR>(szWinClassBuffer));
             UpdateWindow(hDlg);
             break;
         }
 
         case WM_COMMAND:
         {
-			switch (LOWORD(wParam))
-			{
+            switch (LOWORD(wParam)) {
                 case IDC_BUTTON_SET:
                 {
                     logger.Out(L"%s(%d): Pressed the 'Set' button", TEXT(__FUNCTION__), __LINE__);
@@ -480,9 +527,19 @@ BOOL CALLBACK DlgProc(HWND hDlg, UINT dlgmsg, WPARAM wParam, LPARAM lParam)
                     MoveWindow(hFgWnd, x, y, w, h, TRUE);
                     SendMessageW(hFgWnd, WM_EXITSIZEMOVE, NULL, NULL);
 
-					logger.Out(L"%s(%d): Window with handle 0x%08X was moved to %d, %d", TEXT(__FUNCTION__), __LINE__, hFgWnd, x, y);
+                    logger.Out(L"%s(%d): Window with handle 0x%p was moved to %d, %d", TEXT(__FUNCTION__), __LINE__, hFgWnd, x, y);
 
-					return TRUE;
+                    return static_cast<INT_PTR>(TRUE);
+                    break;
+                }
+                case IDC_BUTTON_CENTER:
+                {
+                    logger.Out(L"%s(%d): Pressed the 'Center' button", TEXT(__FUNCTION__), __LINE__);
+
+                    bKPressed = TRUE;
+                    if (IsWindowApprooved(hFgWnd)) MoveWindowToMonitorCenter(hFgWnd, bWorkArea, FALSE);
+                    else hFgWnd = NULL;
+                    return static_cast<INT_PTR>(TRUE);
                     break;
                 }
                 case IDCANCEL:
@@ -497,50 +554,41 @@ BOOL CALLBACK DlgProc(HWND hDlg, UINT dlgmsg, WPARAM wParam, LPARAM lParam)
             break;
         }
     }
-	return FALSE;
+    return static_cast<INT_PTR>(FALSE);
 }
 
-BOOL IsWindowApprooved(HWND hFW)
-{
-	logger.Out(L"Entering the %s() function, handle = 0x%08X", TEXT(__FUNCTION__), hFW);
+BOOL IsWindowApprooved(HWND hFW) {
+    logger.Out(L"Entering the %s() function", TEXT(__FUNCTION__));
 
-	bool bApprooved = FALSE;
-	if (hFW)
-	{
-		if (GetWindowTextW(hFW, (LPWSTR)szBuffer, MAX_WINTITLE_BUFFER_LENGTH))
-		{
-			logger.Out(L"%s(%d): Window title: '%s'", TEXT(__FUNCTION__), __LINE__, (LPWSTR)szBuffer);
+    BOOL bApprooved = FALSE;
+    if (hFW) {
+        if (GetWindowTextW(hFW, reinterpret_cast<LPWSTR>(szWinTitleBuffer), MAX_WINTITLE_BUFFER_LENGTH)) {
+            logger.Out(L"%s(%d): Window handle: 0x%p. Title: '%s'", TEXT(__FUNCTION__), __LINE__, hFW, reinterpret_cast<LPWSTR>(szWinTitleBuffer));
         }
 
-		if (IsIconic(hFW))
-		{
+        if (IsIconic(hFW)) {
             logger.Out(L"%s(%d): The window is iconified", TEXT(__FUNCTION__), __LINE__);
         }
 
-		if (IsZoomed(hFW))
-		{
+        if (IsZoomed(hFW)) {
             logger.Out(L"%s(%d): The window is maximized", TEXT(__FUNCTION__), __LINE__);
         }
 
         LONG_PTR wlp = GetWindowLongPtrW(hFW, GWL_STYLE);
-		if (wlp & WS_CAPTION)
-		{
-			if (!IsIconic(hFW) && !IsZoomed(hFW))
-			{
+        if (wlp & WS_CAPTION) {
+            if (!IsIconic(hFW) && !IsZoomed(hFW)) {
                 logger.Out(L"%s(%d): The window is approved!", TEXT(__FUNCTION__), __LINE__);
 
                 bApprooved = TRUE;
             }
-			else ShowError(IDS_ERR_MAXMIN);
+            else ShowError(IDS_ERR_MAXMIN, szTitle);
         }
-		else
-		{
+        else {
             logger.Out(L"%s(%d): The window has no caption!", TEXT(__FUNCTION__), __LINE__);
         }
     }
 
-	if (!bApprooved)
-	{
+    if (!bApprooved) {
         logger.Out(L"%s(%d): The window is not approved!", TEXT(__FUNCTION__), __LINE__);
     }
 
@@ -549,112 +597,48 @@ BOOL IsWindowApprooved(HWND hFW)
     return bApprooved;
 }
 
-VOID HandlingTrayIcon()
-{
+VOID HandlingTrayIcon() {
     logger.Out(L"Entering the %s() function, fShowIcon = %s", TEXT(__FUNCTION__), fShowIcon ? L"True" : L"False");
 
-	if (fShowIcon)
-	{
-		bool bResult1 = Shell_NotifyIconW(NIM_ADD, &nid);
-		logger.Out(L"%s(%d): Shell_NotifyIconW(NIM_ADD): %s", TEXT(__FUNCTION__), __LINE__, bResult1 ? L"True" : L"False");
+    if (fShowIcon) {
+        BOOL bResult1 = Shell_NotifyIconW(NIM_ADD, &nid);
+        logger.Out(L"%s(%d): Shell_NotifyIconW(NIM_ADD) returned %s", TEXT(__FUNCTION__), __LINE__, bResult1 ? L"True" : L"False");
 
-		bool bResult2 = Shell_NotifyIconW(NIM_SETVERSION, &nid);
-		logger.Out(L"%s(%d): Shell_NotifyIconW(NIM_SETVERSION): %s", TEXT(__FUNCTION__), __LINE__, bResult2 ? L"True" : L"False");
+        BOOL bResult2 = Shell_NotifyIconW(NIM_SETVERSION, &nid);
+        logger.Out(L"%s(%d): Shell_NotifyIconW(NIM_SETVERSION) returned %s", TEXT(__FUNCTION__), __LINE__, bResult2 ? L"True" : L"False");
 
-		if (!bResult1 || !bResult2)
-		{
+        if (!bResult1 || !bResult2) {
             logger.Out(L"%s(%d): Error creating trayicon!", TEXT(__FUNCTION__), __LINE__);
 
-			ShowError(IDS_ERR_ICON);
+            ShowError(IDS_ERR_ICON, szTitle);
             Shell_NotifyIconW(NIM_DELETE, &nid);
             fShowIcon = FALSE;
         }
-		else
-		{
-			Shell_NotifyIconW(NIM_MODIFY, &nid);
     }
-	}
-	else
-	{
+    else {
         Shell_NotifyIconW(NIM_DELETE, &nid);
     }
 
     logger.Out(L"Exit from the %s() function", TEXT(__FUNCTION__));
 }
 
-VOID ShowError(UINT uID)
-{
+VOID ShowError(UINT uID, LPCWSTR szAppTitle) {
     WCHAR szErrorText[MAX_LOADSTRING]; // Error's text
-	LoadStringW(hInst, uID, szErrorText, _countof(szErrorText));
-	MessageBoxW(NULL, szErrorText, szTitle, MB_OK | MB_ICONERROR | MB_TOPMOST);
+    LoadStringW(GetModuleHandleW(NULL), uID, szErrorText, _countof(szErrorText));
+    MessageBoxW(hFgWnd, szErrorText, szAppTitle, MB_OK | MB_ICONERROR | MB_TOPMOST);
 }
 
-INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-	INITCOMMONCONTROLSEX icex = { 0 };
-	icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
-	icex.dwICC = ICC_LINK_CLASS;
-	InitCommonControlsEx(&icex);
-
-	switch (message)
-	{
-		case WM_INITDIALOG:
-		{
-			logger.Out(L"%s(%d): Initializing the 'About' dialog", TEXT(__FUNCTION__), __LINE__);
-
-			WCHAR szAboutProgName[MAX_LOADSTRING];
-			WCHAR szAboutCopyright[MAX_LOADSTRING];
-			WCHAR szAboutBuildTime[MAX_LOADSTRING];
-			WCHAR szAboutHelp[MAX_LOADSTRING * 12];
-			MultiByteToWideChar(1251, 0, PRODUCT_NAME_FULL, _countof(PRODUCT_NAME_FULL), szAboutProgName, MAX_LOADSTRING);
-			MultiByteToWideChar(1251, 0, PRODUCT_COPYRIGHT, _countof(PRODUCT_COPYRIGHT), szAboutCopyright, MAX_LOADSTRING);
-			MultiByteToWideChar(1251, 0, ABOUT_BUILD, _countof(ABOUT_BUILD), szAboutBuildTime, MAX_LOADSTRING);
-			LoadStringW(hInst, IDS_ABOUT, szAboutHelp, _countof(szAboutHelp));
-			SetDlgItemTextW(hDlg, IDC_ABOUT_PROGNAME, szAboutProgName);
-			SetDlgItemTextW(hDlg, IDC_ABOUT_COPYRIGHT, szAboutCopyright);
-			SetDlgItemTextW(hDlg, IDC_ABOUT_BUILDTIME, szAboutBuildTime);
-			SetDlgItemTextW(hDlg, IDC_ABOUTEDIT, szAboutHelp);
-#ifdef NO_DONATION
-			HWND hLink = GetDlgItem(hDlg, IDC_DONATIONLINK);
-			if (hLink) DestroyWindow(hLink);
-			HWND hText = GetDlgItem(hDlg, IDC_DONATIONTEXT);
-			if (hText) DestroyWindow(hText);
-#endif // !NO_DONATION
-
-			logger.Out(L"%s(%d): End of initializing the 'About' dialog", TEXT(__FUNCTION__), __LINE__);
-
-			return (INT_PTR)TRUE;
-			break;
+VOID ShowPopupMenu(HWND hMainWnd, POINT pt) {
+    SetForegroundWindow(hMainWnd);
+    UINT uFlags = TPM_RIGHTBUTTON;
+    GetSystemMetrics(SM_MENUDROPALIGNMENT) != 0 ? uFlags |= TPM_RIGHTALIGN : uFlags |= TPM_LEFTALIGN;
+    TrackPopupMenuEx(hPopup, uFlags, pt.x, pt.y, hMainWnd, NULL);
+    PostMessageW(hMainWnd, WM_NULL, 0, 0);
 }
 
-		case WM_NOTIFY:
-		{
-			LPNMHDR pNMHdr = (LPNMHDR)lParam;
-			if ((NM_CLICK == pNMHdr->code || NM_RETURN == pNMHdr->code) && IDC_DONATIONLINK == pNMHdr->idFrom)
-			{
-				PNMLINK pNMLink = (PNMLINK)pNMHdr;
-				LITEM item = pNMLink->item;
-				ShellExecuteW(NULL, L"open", item.szUrl, NULL, NULL, SW_SHOW);
-
-				logger.Out(L"%s(%d): Pressed the donation link! :-)", TEXT(__FUNCTION__), __LINE__);
-
-				return (INT_PTR)TRUE;
+HRESULT CALLBACK AboutCallback(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, LONG_PTR lpRefData) {
+    if (TDN_HYPERLINK_CLICKED == uMsg) {
+        ShellExecuteW(hDlg, L"open", reinterpret_cast<LPCWSTR>(lParam), NULL, NULL, SW_SHOW);
     }
-			break;
-		}
-
-		case WM_COMMAND:
-		{
-			if (IDOK == LOWORD(wParam) || IDCANCEL == LOWORD(wParam))
-			{
-				EndDialog(hDlg, LOWORD(wParam));
-
-				logger.Out(L"%s(%d): Closing the 'About' dialog", TEXT(__FUNCTION__), __LINE__);
-
-				return (INT_PTR)TRUE;
-			}
-			break;
-		}
-	}
-	return (INT_PTR)FALSE;
+    return S_OK;
 }

wCenterWindow/wCenterWindow.h

@@ -1,10 +1,20 @@
 // wCenterWindow
 // wCenterWindow.h
-//
+
 #pragma once
 #include "resource.h"
 
-#define MAX_LOADSTRING 50
+#define T0 10
+#define T1 60
+#define T2 86400
+
+#ifdef _WIN64
+#define ARCH 64
+#else
+#define ARCH 86
+#endif
+
+#define MAX_LOADSTRING 64
 
 // Windows Header Files
 #include <fstream>
@@ -14,6 +24,7 @@
 #include <vector>
 #include <strsafe.h>
 #include <windows.h>
+#include <windowsx.h>
 #include <wininet.h>
 #include <shellapi.h>
 #include <CommCtrl.h>

wCenterWindow/wCenterWindow.vcxproj

@@ -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,14 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </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 +177,14 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </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>

wCenterWindow/wCenterWindow.vcxproj.filters

@@ -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>

wCenterWindow/wCenterWindow.vcxproj.user

@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>
-    </LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>/noupdate</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerCommandArguments>/noupdate</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerCommandArguments>
+    </LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>