Increased revision.

Changed main "ghost" window to a message-only window.

.gitignore

@@ -326,7 +326,7 @@ var/
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
+#*.manifest
 *.spec
 
 # Installer logs

README.md

@@ -1,2 +1,12 @@
 # wCenterWindow
-This program centers the current active window by a 'LCTRL + LWIN + C' hotkey.
+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.
+
+```Use workarea``` option 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.

wCenterWindow.sln

@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.1000
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31112.23
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wCenterWindow", "wCenterWindow\wCenterWindow.vcxproj", "{6A775901-6C34-4E96-B359-C11C76A520BB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wCenterWindow", "wCenterWindow\wCenterWindow.vcxproj", "{F1A1603A-F5D0-47B8-8E4B-CF17747BCFBA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,19 +13,19 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6A775901-6C34-4E96-B359-C11C76A520BB}.Debug|x64.ActiveCfg = Debug|x64
-		{6A775901-6C34-4E96-B359-C11C76A520BB}.Debug|x64.Build.0 = Debug|x64
-		{6A775901-6C34-4E96-B359-C11C76A520BB}.Debug|x86.ActiveCfg = Debug|Win32
-		{6A775901-6C34-4E96-B359-C11C76A520BB}.Debug|x86.Build.0 = Debug|Win32
-		{6A775901-6C34-4E96-B359-C11C76A520BB}.Release|x64.ActiveCfg = Release|x64
-		{6A775901-6C34-4E96-B359-C11C76A520BB}.Release|x64.Build.0 = Release|x64
-		{6A775901-6C34-4E96-B359-C11C76A520BB}.Release|x86.ActiveCfg = Release|Win32
-		{6A775901-6C34-4E96-B359-C11C76A520BB}.Release|x86.Build.0 = Release|Win32
+		{F1A1603A-F5D0-47B8-8E4B-CF17747BCFBA}.Debug|x64.ActiveCfg = Debug|x64
+		{F1A1603A-F5D0-47B8-8E4B-CF17747BCFBA}.Debug|x64.Build.0 = Debug|x64
+		{F1A1603A-F5D0-47B8-8E4B-CF17747BCFBA}.Debug|x86.ActiveCfg = Debug|Win32
+		{F1A1603A-F5D0-47B8-8E4B-CF17747BCFBA}.Debug|x86.Build.0 = Debug|Win32
+		{F1A1603A-F5D0-47B8-8E4B-CF17747BCFBA}.Release|x64.ActiveCfg = Release|x64
+		{F1A1603A-F5D0-47B8-8E4B-CF17747BCFBA}.Release|x64.Build.0 = Release|x64
+		{F1A1603A-F5D0-47B8-8E4B-CF17747BCFBA}.Release|x86.ActiveCfg = Release|Win32
+		{F1A1603A-F5D0-47B8-8E4B-CF17747BCFBA}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {CAD0B026-63B6-4645-9B26-22CD0E1049B7}
+		SolutionGuid = {83F3F9B6-B00E-4705-9C92-19308AAC038B}
 	EndGlobalSection
 EndGlobal

wCenterWindow/Logger.cpp

@@ -0,0 +1,76 @@
+// wCenterWindow, v2.3.3
+// Logger.cpp
+//
+#include "framework.h"
+
+#define TS_LEN 30
+#define PATH_LEN 1024
+
+std::wofstream logfile;
+extern WCHAR szTitle[];
+extern LPVOID szBuffer;
+namespace fs = std::filesystem;
+
+std::wstring PrintTitle()
+{
+	wchar_t szWinTitle[2048];
+	StringCchPrintf(szWinTitle, 2048, L"%s", szBuffer);
+	return szWinTitle;
+}
+
+std::wstring GetTimeStamp()
+{
+	SYSTEMTIME lt;
+	GetLocalTime(&lt);
+	wchar_t ts[TS_LEN];
+	StringCchPrintfW(ts, TS_LEN, L"%d-%02d-%02d %02d:%02d:%02d.%03d - ", lt.wYear, lt.wMonth, lt.wDay, lt.wHour, lt.wMinute, lt.wSecond, lt.wMilliseconds);
+	return ts;
+}
+
+void OpenLogFile()
+{
+	wchar_t lpszPath[PATH_LEN]{};
+	DWORD dwPathLength = GetModuleFileNameW(NULL, lpszPath, PATH_LEN);
+	DWORD dwError = GetLastError();
+	if (ERROR_INSUFFICIENT_BUFFER == dwError)
+	{
+		MessageBoxW(NULL, L"Path to logfile is too long! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING);
+		return;
+	}
+	if (NULL == dwPathLength)
+	{
+		MessageBoxW(NULL, L"Can't get module filename! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING);
+		return;
+	}
+
+	fs::path log_path = lpszPath;
+	log_path.replace_extension(L".log");
+	fs::path bak_path = log_path;
+	bak_path.replace_extension(L".bak");
+
+	if (fs::exists(log_path)) fs::rename(log_path, bak_path);
+#ifdef _DEBUG
+	log_path = L"d:\\test.log";
+#endif
+	logfile.open(log_path);
+	if (logfile.is_open())
+	{
+		diag_log(L"Start logging.");
+		diag_log(L"Logfile:", log_path);
+		diag_log(log_path, L"successfully opened.");
+	}
+	else
+	{
+		MessageBoxW(NULL, L"Can't open logfile! Working without logging.", (LPCWSTR)szTitle, MB_OK | MB_ICONWARNING);
+	}
+	return;
+}
+
+void CloseLogFile()
+{
+	if (logfile)
+	{
+		diag_log(L"End logging.");
+		logfile.close();
+	}
+}

wCenterWindow/Logger.h

@@ -0,0 +1,60 @@
+// wCenterWindow, v2.3.3
+// Logger.h
+//
+#pragma once
+#include "framework.h"
+
+extern std::wofstream logfile;
+std::wstring GetTimeStamp();
+std::wstring PrintTitle();
+
+template <typename T1>
+void diag_log(T1 arg1)
+{
+	logfile << GetTimeStamp() << arg1 << std::endl;
+}
+
+template <typename T1, typename T2>
+void diag_log(T1 arg1, T2 arg2)
+{
+	logfile << GetTimeStamp() << arg1 << ' ' << arg2 << std::endl;
+}
+
+template <typename T1, typename T2, typename T3>
+void diag_log(T1 arg1, T2 arg2, T3 arg3)
+{
+	logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << std::endl;
+}
+
+template <typename T1, typename T2, typename T3, typename T4>
+void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4)
+{
+	logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << std::endl;
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
+{
+	logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << std::endl;
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
+void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6)
+{
+	logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << ' ' << arg6 << std::endl;
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
+void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7)
+{
+	logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << ' ' << arg6 << ' ' << arg7 << std::endl;
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
+void diag_log(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8)
+{
+	logfile << GetTimeStamp() << arg1 << ' ' << arg2 << ' ' << arg3 << ' ' << arg4 << ' ' << arg5 << ' ' << arg6 << ' ' << arg7 << ' ' << arg8 << std::endl;
+}
+
+void OpenLogFile();
+void CloseLogFile();

wCenterWindow/Resource.h

@@ -1,27 +0,0 @@
-// resource.h 
-#define IDS_APP_TITLE		100
-#define IDS_CLASSNAME		101
-#define IDS_HELPTEXT		102
-#define	IDI_TRAYICON		103
-#define IDR_MENU			104
-#define ID_POPUPMENU_HELP	105
-#define ID_POPUPMENU_EXIT	106
-#define IDS_ERR_MAIN		107
-#define IDS_ERR_WND			108
-#define IDS_ERR_ICON		109
-#define IDS_ERR_MENU		110
-#define IDS_ERR_POPUP		111
-#define IDS_ERR_HOOK		112
-#define IDS_RUNNING			113
-#define IDC_STATIC			-1
-
-// Next default values for new objects
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC					1
-#define _APS_NEXT_RESOURCE_VALUE	129
-#define _APS_NEXT_COMMAND_VALUE		32771
-#define _APS_NEXT_CONTROL_VALUE		1000
-#define _APS_NEXT_SYMED_VALUE		110
-#endif
-#endif

wCenterWindow/framework.h

@@ -1,15 +1,26 @@
-// header.h: включаемый файл для стандартных системных включаемых файлов
-// или включаемые файлы для конкретного проекта
+// header.h : include file for standard system include files,
+// or project specific include files
+//
+
 #pragma once
 
 #include "targetver.h"
-#define WIN32_LEAN_AND_MEAN             // Исключите редко используемые компоненты из заголовков Windows
-// Файлы заголовков Windows
-#include <windows.h>
+#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
+
+// Windows Header Files
+#include <iostream>
+#include <fstream>
+#include <filesystem>
+#include <string>
 #include <strsafe.h>
+#include <windows.h>
 #include <shellapi.h>
-// Файлы заголовков среды выполнения C
-#include <stdlib.h>
-#include <malloc.h>
-#include <memory.h>
-#include <tchar.h>
+#include <CommCtrl.h>
+
+// C RunTime Header Files
+//#include <stdlib.h>
+//#include <malloc.h>
+//#include <memory.h>
+
+// Project Specific Header Files
+#include "Logger.h"

wCenterWindow/resource.h

@@ -0,0 +1,47 @@
+//{{NO_DEPENDENCIES}}
+// 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_WND                     114
+#define IDS_ERR_ICON                    115
+#define IDS_ERR_MENU                    116
+#define IDS_ERR_POPUP                   117
+#define IDS_ERR_HOOK                    118
+#define IDS_ERR_MAXMIN                  119
+#define IDS_RUNNING                     121
+#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_STATIC                      -1
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC                     1
+#define _APS_NEXT_RESOURCE_VALUE        130
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1010
+#define _APS_NEXT_SYMED_VALUE           122
+#endif
+#endif

wCenterWindow/targetver.h

@@ -1,2 +1,6 @@
-#pragma once
+#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 <SDKDDKVer.h>

wCenterWindow/wCenterWindow.cpp

@@ -1,159 +1,320 @@
-// wCenterWindow.cpp : Определяет точку входа для приложения.
+// wCenterWindow, v2.3.3
+//
+// TODO: More verbose logs - partially done.
+// TODO: More verbose error messages 
+// TODO: Window's title in logs (Impossible?)
 
 #include "framework.h"
 #include "wCenterWindow.h"
 
-#define MAX_LOADSTRING 80
-#define WM_WCW	WM_USER + 0x7F00
+#define KEY_I 0x49
+#define KEY_C 0x43
+#define KEY_V 0x56
 
-// Глобальные переменные:
-HINSTANCE		hInst;						// Текущий экземпляр
-WCHAR			szTitle[MAX_LOADSTRING];	// Текст строки заголовка
-WCHAR			szClass[MAX_LOADSTRING];	// Имя класса главного окна
-WCHAR			szHelp[MAX_LOADSTRING];		// Текст описания
-HHOOK			KeyboardHook;
-HICON			hIcon;
-HMENU			hMenu, hPopup;
-HWND			hWnd;
-NOTIFYICONDATA	nid = { 0 };
-KBDLLHOOKSTRUCT	*pkhs;
-BOOL			pressed = FALSE, showIcon = TRUE;
-BOOL			bLCTRL = FALSE, bLWIN = FALSE, bKEYI = FALSE, bKEYC = FALSE;
-int				dtCenterX, dtCenterY;
+#define BUF_LEN 4096
+#define MAX_LOADSTRING 50
+#define WM_WCW	0x8F00
 
-// Прототипы функций
-ATOM				MyRegisterClass(HINSTANCE);
-VOID				ShowError(HINSTANCE, UINT);
+// Global variables:
+HINSTANCE			hInst;									// Instance
+WCHAR				szTitle[MAX_LOADSTRING];				// Window's title
+WCHAR				szClass[MAX_LOADSTRING];				// Window's class
+WCHAR				szAbout[MAX_LOADSTRING * 12];			// Description text
+WCHAR				szWinTitle[256];
+WCHAR				szWinClass[256];
+WCHAR				szWinCore[] = TEXT("Windows.UI.Core.CoreWindow");
+HANDLE				hHeap = NULL;
+HHOOK				hMouseHook = NULL, hKbdHook = NULL;		// Hook's handles
+HICON				hIcon = NULL;
+HMENU				hMenu = NULL, hPopup = NULL;
+HWND				hWnd = NULL, hFgWnd = NULL, hTaskBar = NULL, hDesktop = NULL, hProgman = NULL;
+BOOL				bKPressed = FALSE, bMPressed = FALSE, bShowIcon = TRUE, bWorkArea = TRUE;
+BOOL				bLCTRL = FALSE, bLWIN = FALSE, bKEYV = FALSE;
+
+RECT				rcFW = { 0 };
+NOTIFYICONDATAW		nid = { 0 };
+LPKBDLLHOOKSTRUCT	pkhs = { 0 };
+MENUITEMINFO		mii = { 0 };
+
+LPVOID				szBuffer;
+
+// {2D7B7F30-4B5F-4380-9807-57D7A2E37F6C}
+static const GUID	guid = { 0x2d7b7f30, 0x4b5f, 0x4380, { 0x98, 0x7, 0x57, 0xd7, 0xa2, 0xe3, 0x7f, 0x6c } };
+
+// Forward declarations of functions included in this code module:
+VOID				HandlingTrayIcon();
+VOID				ShowError(UINT);
+BOOL				CheckWindow(HWND);
+BOOL	CALLBACK	DlgProc(HWND, UINT, WPARAM, LPARAM);
 LRESULT CALLBACK	WndProc(HWND, UINT, WPARAM, LPARAM);
 LRESULT CALLBACK	KeyboardHookProc(int, WPARAM, LPARAM);
-BOOL				CreateTrayIcon();
+LRESULT CALLBACK	MouseHookProc(int, WPARAM, LPARAM);
+INT_PTR CALLBACK    About(HWND, UINT, WPARAM, LPARAM);
 
-// Точка входа
-int APIENTRY wWinMain(_In_		HINSTANCE	hInstance,
-					  _In_opt_	HINSTANCE	hPrevInstance,
-					  _In_		LPWSTR		lpCmdLine,
-					  _In_		int			nCmdShow)
+
+
+VOID MoveWindowToMonitorCenter(HWND hwnd, BOOL bWorkArea, BOOL bResize)
 {
-	UNREFERENCED_PARAMETER(hPrevInstance);
-	UNREFERENCED_PARAMETER(lpCmdLine);
+	//diag_log(L"Entering MoveWindowToMonitorCenter(): hwnd =", hwnd, L"Title:", (LPWSTR)szBuffer);
+	diag_log(L"Entering MoveWindowToMonitorCenter(): hwnd =", hwnd);
 
-	LoadStringW(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
-	LoadStringW(hInstance, IDS_CLASSNAME, szClass, MAX_LOADSTRING);
-	if (FindWindow(szClass, NULL))
-	{
-		ShowError(hInstance, IDS_RUNNING);
-		return FALSE;
-	}
-	MyRegisterClass(hInstance);
+	RECT fgwrc = { 0 };
+	GetWindowRect(hwnd, &fgwrc);
+	LONG nWidth = fgwrc.right - fgwrc.left;
+	LONG nHeight = fgwrc.bottom - fgwrc.top;
 
-	hWnd = CreateWindowExW(0, szClass, szTitle, 0, 0, 0, 0, 0, NULL, NULL, hInstance, NULL);
-	if (!hWnd)
-	{
-		ShowError(hInstance, IDS_ERR_WND);
-		return FALSE;
-	}
+	diag_log(L"Moving window from x =", fgwrc.left, L"y =", fgwrc.top);
 
-	if (showIcon)
+	MONITORINFO mi = { 0 };
+	mi.cbSize = sizeof(MONITORINFO);
+	GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST), &mi);
+	RECT area = { 0 };
+	if (bWorkArea)
 	{
-		if (!CreateTrayIcon())
-		{
-			ShowError(hInstance, IDS_ERR_ICON);
-			SendMessage(hWnd, WM_CLOSE, NULL, NULL);
-		}
-	}
-
-	hMenu = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_MENU));
-	if (!hMenu)
-	{
-		ShowError(hInstance, IDS_ERR_MENU);
-		SendMessage(hWnd, WM_CLOSE, NULL, NULL);
-	}
-
-	hPopup = GetSubMenu(hMenu, 0);
-	if (!hPopup)
-	{
-		ShowError(hInstance, IDS_ERR_POPUP);
-		SendMessage(hWnd, WM_CLOSE, NULL, NULL);
-	}
-
-	KeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, hInstance, NULL);
-	if (!KeyboardHook)
-	{
-		ShowError(hInstance, IDS_ERR_HOOK);
-		SendMessage(hWnd, WM_CLOSE, NULL, NULL);
-	}
-
-	LoadStringW(hInstance, IDS_HELPTEXT, szHelp, MAX_LOADSTRING);
-	RECT dtrc = { 0 };
-	SystemParametersInfo(SPI_GETWORKAREA, NULL, &dtrc, FALSE);
-	dtCenterX = dtrc.right / 2, dtCenterY = dtrc.bottom / 2;
-
-	MSG msg;
-	BOOL bRet;
-
-	while ((bRet = GetMessage(&msg, NULL, 0, 0)) != 0)
-	{
-		if (bRet == -1)
-		{
-			ShowError(hInstance, IDS_ERR_MAIN);
-			return -1;
+		area.bottom = mi.rcWork.bottom;
+		area.left = mi.rcWork.left;
+		area.right = mi.rcWork.right;
+		area.top = mi.rcWork.top;
 	}
 	else
 	{
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
+		area.bottom = mi.rcMonitor.bottom;
+		area.left = mi.rcMonitor.left;
+		area.right = mi.rcMonitor.right;
+		area.top = mi.rcMonitor.top;
 	}
-	}
-	return (int)msg.wParam;
+
+	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;
+
+	SendMessageW(hwnd, WM_ENTERSIZEMOVE, NULL, NULL);
+	MoveWindow(hwnd, x, y, nWidth, nHeight, TRUE);
+	SendMessageW(hwnd, WM_EXITSIZEMOVE, NULL, NULL);
+
+	diag_log(L"Moving window to x =", x, L"y =", y);
+	diag_log(L"Quiting MoveWindowToMonitorCenter()");
 }
 
+
 ATOM MyRegisterClass(HINSTANCE hInstance)
 {
 	WNDCLASSEX wcex = { 0 };
 	wcex.cbSize = sizeof(WNDCLASSEX);
 	wcex.lpfnWndProc = WndProc;
 	wcex.hInstance = hInstance;
-	wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_TRAYICON));
-	wcex.hCursor = LoadCursor(nullptr, IDC_ARROW);
+	wcex.hIcon = LoadIconW(hInstance, MAKEINTRESOURCE(IDI_TRAYICON));
+	wcex.hCursor = LoadCursorW(nullptr, IDC_ARROW);
 	wcex.lpszClassName = szClass;
 	wcex.hIconSm = wcex.hIcon;
 	hIcon = wcex.hIcon;
-	return RegisterClassEx(&wcex);
+	return RegisterClassExW(&wcex);
+}
+
+
+int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
+{
+	UNREFERENCED_PARAMETER(hPrevInstance);
+	UNREFERENCED_PARAMETER(lpCmdLine);
+
+	OpenLogFile();
+	diag_log(L"Entering WinMain()");
+
+	hInst = hInstance;
+
+	LoadStringW(hInstance, IDS_APP_TITLE, szTitle, _countof(szTitle));
+	LoadStringW(hInstance, IDS_CLASSNAME, szClass, _countof(szClass));
+
+	if (FindWindowW(szClass, NULL))
+	{
+		ShowError(IDS_RUNNING);
+		return FALSE;
+	}
+
+	MyRegisterClass(hInstance);
+	hWnd = CreateWindowExW(0, szClass, szTitle, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, hInstance, NULL);
+	if (!hWnd)
+	{
+		ShowError(IDS_ERR_WND);
+		return FALSE;
+	}
+
+	int nArgs = 0;
+	LPWSTR* szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs);
+
+	diag_log(L"Arguments:", nArgs - 1);
+	for (int i = 1; i < nArgs; i++)
+	{
+		diag_log(L"Argument", i, L":", szArglist[i]);
+	}
+
+	(nArgs >= 2 && 0 == lstrcmpiW(szArglist[1], L"/hide")) ? bShowIcon = FALSE : bShowIcon = TRUE;
+	LocalFree(szArglist);
+	HandlingTrayIcon();
+
+	hHeap = GetProcessHeap();
+	szBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, BUF_LEN);
+
+	hTaskBar = FindWindowW(L"Shell_TrayWnd", NULL);
+	hProgman = FindWindowW(L"Progman", NULL);
+	hDesktop = GetDesktopWindow();
+
+	MSG msg;
+	BOOL bRet;
+
+	while ((bRet = GetMessageW(&msg, NULL, 0, 0)) != 0)
+	{
+		if (bRet == -1)
+		{
+			ShowError(IDS_ERR_MAIN);
+			return -1;
+		}
+		else
+		{
+			TranslateMessage(&msg);
+			DispatchMessageW(&msg);
+		}
+	}
+
+	if (hMouseHook) UnhookWindowsHookEx(hMouseHook);
+	if (hKbdHook) UnhookWindowsHookEx(hKbdHook);
+	if (hMenu) DestroyMenu(hMenu);
+	Shell_NotifyIconW(NIM_DELETE, &nid);
+
+	diag_log(L"Quiting WinMain(), msg.wParam =", (int)msg.wParam);
+	CloseLogFile();
+	HeapFree(hHeap, NULL, szBuffer);
+
+	return (int)msg.wParam;
 }
 
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
 	switch (message)
 	{
+		case WM_CREATE:
+		{
+			hMenu = LoadMenuW(hInst, MAKEINTRESOURCE(IDR_MENU));
+			if (!hMenu)
+			{
+				diag_log(L"Loading context menu failed!");
+				ShowError(IDS_ERR_MENU);
+				SendMessageW(hWnd, WM_CLOSE, NULL, NULL);
+			}
+			diag_log(L"Context menu successfully loaded");
+
+			hPopup = GetSubMenu(hMenu, 0);
+			if (!hPopup)
+			{
+				diag_log(L"Creating popup menu failed!");
+				ShowError(IDS_ERR_POPUP);
+				SendMessageW(hWnd, WM_CLOSE, NULL, NULL);
+			}
+			diag_log(L"Popup menu successfully created");
+
+			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.uCallbackMessage = WM_WCW;
+			nid.hIcon = hIcon;
+			nid.uID = IDI_TRAYICON;
+			nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
+			nid.dwInfoFlags = NIIF_NONE;
+			nid.dwState = NIS_HIDDEN;
+			nid.dwStateMask = NIS_HIDDEN;
+			StringCchCopyW(nid.szTip, _countof(nid.szTip), szTitle);
+
+			hMouseHook = SetWindowsHookExW(WH_MOUSE_LL, MouseHookProc, hInst, NULL);
+			if (!hMouseHook)
+			{
+				diag_log(L"Creating mouse hook failed!");
+				ShowError(IDS_ERR_HOOK);
+				SendMessageW(hWnd, WM_CLOSE, NULL, NULL);
+			}
+			diag_log(L"Mouse hook was successfully set");
+
+			hKbdHook = SetWindowsHookExW(WH_KEYBOARD_LL, KeyboardHookProc, hInst, NULL);
+			if (!hKbdHook)
+			{
+				diag_log(L"Creating keyboard hook failed!");
+				ShowError(IDS_ERR_HOOK);
+				SendMessageW(hWnd, WM_CLOSE, NULL, NULL);
+			}
+			diag_log(L"Keyboard hook was successfully set");
+
+			LoadStringW(hInst, IDS_ABOUT, szAbout, _countof(szAbout));
+			break;
+		}
+
 		case WM_WCW:
-		if (lParam == WM_RBUTTONDOWN && wParam == IDI_TRAYICON)
+		{
+			if ((lParam == WM_RBUTTONDOWN || lParam == WM_LBUTTONDOWN) && wParam == IDI_TRAYICON)
 			{
 				SetForegroundWindow(hWnd);
 				POINT pt;
 				GetCursorPos(&pt);
 				int idMenu = TrackPopupMenu(hPopup, TPM_RETURNCMD, pt.x, pt.y, 0, hWnd, NULL);
-			if (idMenu == ID_POPUPMENU_HELP && !pressed)
+				if (idMenu == ID_POPUPMENU_ICON)
 				{
-				pressed = TRUE;
-				if (MessageBox(hWnd, szHelp, szTitle, MB_OK | MB_TOPMOST) == IDOK) pressed = FALSE;
+					bShowIcon = FALSE;
+					HandlingTrayIcon();
 				}
-			if (idMenu == ID_POPUPMENU_EXIT) SendMessage(hWnd, WM_CLOSE, NULL, NULL);
+				if (idMenu == ID_POPUPMENU_AREA)
+				{
+					bWorkArea = !bWorkArea;
+					bWorkArea ? mii.fState = MFS_CHECKED : mii.fState = MFS_UNCHECKED;
+					SetMenuItemInfoW(hPopup, ID_POPUPMENU_AREA, FALSE, &mii);
+					diag_log(L"Changed 'Use workarea' option to", bWorkArea);
+				}
+				if (idMenu == ID_POPUPMENU_ABOUT && !bKPressed)
+				{
+					bKPressed = TRUE;
+					diag_log(L"Opening 'About' dialog");
+					DialogBoxW(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, (DLGPROC)About);
+					bKPressed = FALSE;
+				}
+				if (idMenu == ID_POPUPMENU_EXIT) SendMessageW(hWnd, WM_CLOSE, NULL, NULL);
 			}
 			break;
+		}
 
 		case WM_DESTROY:
-		if (KeyboardHook) UnhookWindowsHookEx(KeyboardHook);
-		if (hMenu) DestroyMenu(hMenu);
-		Shell_NotifyIcon(NIM_DELETE, &nid);
+		{
 			PostQuitMessage(0);
 			break;
+		}
 
 		default:
-		return DefWindowProc(hWnd, message, wParam, lParam);
+			return DefWindowProcW(hWnd, message, wParam, lParam);
 	}
 	return 0;
 }
 
+LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam)
+{
+	if (wParam == WM_MBUTTONUP) bMPressed = FALSE;
+	if (wParam == WM_MBUTTONDOWN && bLCTRL && bLWIN && !bMPressed)
+	{
+		diag_log(L"Pressed LCTRL + LWIN + MMB");
+		bMPressed = TRUE;
+		hFgWnd = GetForegroundWindow();
+		BOOL bApproved = CheckWindow(hFgWnd);
+		if (bApproved) MoveWindowToMonitorCenter(hFgWnd, bWorkArea, FALSE);
+		else hFgWnd = NULL;
+	}
+	return CallNextHookEx(NULL, nCode, wParam, lParam);
+}
+
 LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam)
 {
 	pkhs = (KBDLLHOOKSTRUCT*)lParam;
@@ -162,7 +323,7 @@ LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam)
 	{
 		if (pkhs->vkCode == VK_LCONTROL) bLCTRL = FALSE;
 		if (pkhs->vkCode == VK_LWIN) bLWIN = FALSE;
-		pressed = FALSE;
+		bKPressed = FALSE;
 	}
 
 	if (wParam == WM_KEYDOWN)
@@ -170,78 +331,190 @@ LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam)
 		if (pkhs->vkCode == VK_LCONTROL) bLCTRL = TRUE;
 		if (pkhs->vkCode == VK_LWIN) bLWIN = TRUE;
 
-		if (bLCTRL && bLWIN && pkhs->vkCode == 0x49 && !pressed)	// 'I' key
+		if (bLCTRL && bLWIN && pkhs->vkCode == KEY_I && !bKPressed)	// 'I' key
 		{
-			pressed = TRUE;
-			showIcon = !showIcon;
-			if (showIcon)
-			{
-				if (!CreateTrayIcon())
-				{
-					ShowError(GetModuleHandle(NULL), IDS_ERR_ICON);
-					showIcon = FALSE;
-				}
-			}
-			else
-			{
-				Shell_NotifyIcon(NIM_DELETE, &nid);
-			}
+			diag_log(L"Pressed LCTRL + LWIN + I");
+			bKPressed = TRUE;
+			bShowIcon = !bShowIcon;
+			HandlingTrayIcon();
+			return TRUE;
 		}
 
-		if (bLCTRL && bLWIN && pkhs->vkCode == 0x43 && !pressed)	// 'C' key
+		if (bLCTRL && bLWIN && pkhs->vkCode == KEY_C && !bKPressed && !bKEYV)	// 'C' key
 		{
-			pressed = TRUE;
-			HWND fgWindow = GetForegroundWindow();
-			if (fgWindow)
-			{
-				HWND parentWindow = fgWindow;
-				while (TRUE)
-				{
-					parentWindow = GetParent(fgWindow);
-					if (parentWindow) fgWindow = parentWindow;
-					else break;
+			diag_log(L"Pressed LCTRL + LWIN + C");
+			bKPressed = TRUE;
+			hFgWnd = GetForegroundWindow();
+			BOOL bApproved = CheckWindow(hFgWnd);
+			if (bApproved) MoveWindowToMonitorCenter(hFgWnd, bWorkArea, FALSE);
+			else hFgWnd = NULL;
+			return TRUE;
 		}
-				WINDOWPLACEMENT wp = { 0 };
-				wp.length = sizeof(WINDOWPLACEMENT);
-				GetWindowPlacement(fgWindow, &wp);
-				if (wp.showCmd == SW_SHOWNORMAL)
+
+		if (bLCTRL && bLWIN && pkhs->vkCode == KEY_V && !bKPressed && !bKEYV)	// 'V' key
 		{
-					int fgW = wp.rcNormalPosition.right - wp.rcNormalPosition.left;
-					int fgH = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;
-					int fgX = dtCenterX - (fgW / 2);
-					int fgY = dtCenterY - (fgH / 2);
-					wp.rcNormalPosition.left = fgX;
-					wp.rcNormalPosition.top = fgY;
-					wp.rcNormalPosition.right = fgX + fgW;
-					wp.rcNormalPosition.bottom = fgY + fgH;
-					SendMessage(fgWindow, WM_ENTERSIZEMOVE, NULL, NULL);
-					SetWindowPlacement(fgWindow, &wp);
-					SendMessage(fgWindow, WM_EXITSIZEMOVE, NULL, NULL);
-				}
+			diag_log(L"Pressed LCTRL + LWIN + V");
+			bKPressed = TRUE; bKEYV = TRUE;
+			hFgWnd = GetForegroundWindow();
+			BOOL bApproved = CheckWindow(hFgWnd);
+			if (bApproved)
+			{
+				diag_log(L"Opening 'Manual editing' dialog");
+				DialogBoxW(hInst, MAKEINTRESOURCE(IDD_MANUAL_EDITING), hFgWnd, (DLGPROC)DlgProc);
+				SetForegroundWindow(hFgWnd);
 			}
+			else hFgWnd = NULL;
+			bKEYV = FALSE;
+			return TRUE;
 		}
 	}
 	return CallNextHookEx(NULL, nCode, wParam, lParam);
 }
 
-BOOL CreateTrayIcon()
+BOOL CALLBACK DlgProc(HWND hDlg, UINT dlgmsg, WPARAM wParam, LPARAM lParam)
 {
-	nid.cbSize = sizeof(NOTIFYICONDATA);
-	nid.hWnd = hWnd;
-	nid.uVersion = NOTIFYICON_VERSION;
-	nid.uCallbackMessage = WM_WCW;
-	nid.hIcon = hIcon;
-	nid.uID = IDI_TRAYICON;
-	nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
-	nid.dwInfoFlags = NIIF_INFO;
-	StringCchCopy(nid.szTip, sizeof(nid.szTip), szTitle);
-	return Shell_NotifyIcon(NIM_ADD, &nid);
+	int x, y, w, h;
+	switch (dlgmsg)
+	{
+		case WM_INITDIALOG:
+		{
+			SetWindowTextW(hDlg, szTitle);
+			GetWindowTextW(hFgWnd, szWinTitle, _countof(szWinTitle));
+			GetClassNameW(hFgWnd, szWinClass, _countof(szWinClass));
+			GetWindowRect(hFgWnd, &rcFW);
+			x = rcFW.left;
+			y = rcFW.top;
+			w = rcFW.right - rcFW.left;
+			h = rcFW.bottom - rcFW.top;
+			SetDlgItemInt(hDlg, IDC_EDIT_X, x, TRUE);
+			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);
+			UpdateWindow(hDlg);
+			break;
+		}
+		case WM_COMMAND:
+			switch (LOWORD(wParam))
+			{
+				case IDC_BUTTON_SET:
+				{
+					x = GetDlgItemInt(hDlg, IDC_EDIT_X, NULL, TRUE);
+					y = GetDlgItemInt(hDlg, IDC_EDIT_Y, NULL, TRUE);
+					w = GetDlgItemInt(hDlg, IDC_EDIT_WIDTH, NULL, FALSE);
+					h = GetDlgItemInt(hDlg, IDC_EDIT_HEIGHT, NULL, FALSE);
+					SendMessageW(hFgWnd, WM_ENTERSIZEMOVE, NULL, NULL);
+					MoveWindow(hFgWnd, x, y, w, h, TRUE);
+					SendMessageW(hFgWnd, WM_EXITSIZEMOVE, NULL, NULL);
+					return TRUE;
+					break;
+				}
+				case IDCANCEL:
+				case IDC_BUTTON_CLOSE:
+				{
+					EndDialog(hDlg, LOWORD(wParam));
+					diag_log(L"Closing 'Manual editing' dialog");
+					break;
+				}
+			}
+	}
+	return FALSE;
 }
 
-VOID ShowError(HINSTANCE hInstance, UINT uID)
+BOOL CheckWindow(HWND hFW)
 {
-	WCHAR szErrorText[MAX_LOADSTRING]; // Текст ошибки
-	LoadStringW(hInstance, uID, szErrorText, MAX_LOADSTRING);
-	MessageBox(hWnd, szErrorText, szTitle, MB_OK | MB_ICONERROR);
+	diag_log(L"Entering CheckWindow(), hwnd=", hFW);
+	GetClassNameW(hFW, szWinClass, _countof(szWinClass));
+	if (hFW)
+	{
+		if (wcscmp(szWinClass, szWinCore) != 0)
+		{
+			if (hFW != hDesktop && hFW != hTaskBar && hFW != hProgman)
+			{
+				if (!IsIconic(hFW) && !IsZoomed(hFW))
+				{
+					GetWindowTextW(hFW, (LPWSTR)szBuffer, BUF_LEN - sizeof(WCHAR));
+					diag_log(L"Window with hwnd=", hFW, L"is approved");
+					return TRUE;
+				}
+				else ShowError(IDS_ERR_MAXMIN);
+			}
+		}
+	}
+	diag_log(L"Window with hwnd=", hFW, L"is not approved!");
+	diag_log(L"Quiting CheckWindow()");
+	return FALSE;
 }
 
+VOID HandlingTrayIcon()
+{
+	diag_log(L"Entering HandlingTrayIcon(), bShowIcon =", bShowIcon);
+	if (bShowIcon)
+	{
+		BOOL bResult1 = Shell_NotifyIconW(NIM_ADD, &nid);
+		diag_log(L"Shell_NotifyIconW(NIM_ADD):", bResult1);
+		BOOL bResult2 = Shell_NotifyIconW(NIM_SETVERSION, &nid);
+		diag_log(L"Shell_NotifyIconW(NIM_SETVERSION):", bResult2);
+		if (!bResult1 || !bResult2)
+		{
+			diag_log(L"Error creating trayicon.");
+			ShowError(IDS_ERR_ICON);
+			bShowIcon = FALSE;
+		}
+	}
+	else
+	{
+		Shell_NotifyIconW(NIM_DELETE, &nid);
+	}
+	diag_log(L"Quiting HandlingTrayIcon()");
+}
+
+VOID ShowError(UINT uID)
+{
+	WCHAR szErrorText[MAX_LOADSTRING]; // Error's text
+	LoadStringW(hInst, uID, szErrorText, _countof(szErrorText));
+	MessageBoxW(hWnd, szErrorText, szTitle, 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:
+		{
+			SetDlgItemTextW(hDlg, IDC_ABOUTHELP, szAbout);
+			return (INT_PTR)TRUE;
+			break;
+		}
+
+		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);
+				diag_log(L"Pressed donation link");
+				return (INT_PTR)TRUE;
+			}
+			break;
+		}
+
+		case WM_COMMAND:
+			if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
+			{
+				EndDialog(hDlg, LOWORD(wParam));
+				diag_log(L"Closing 'About' dialog");
+				return (INT_PTR)TRUE;
+			}
+			break;
+	}
+	return (INT_PTR)FALSE;
+}

wCenterWindow/wCenterWindow.h

@@ -1,2 +1,3 @@
 #pragma once
+
 #include "resource.h"

wCenterWindow/wCenterWindow.manifest

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+
+  <description>Centers windows by hotkey (C++)</description>
+
+  <assemblyIdentity
+      version="2.3.3.0"
+      processorArchitecture="x86"
+      name="W0LF.wCenterWindow.C++"
+      type="win32">
+  </assemblyIdentity>
+
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+        type="Win32" 
+        name="Microsoft.Windows.Common-Controls" 
+        version="6.0.0.0" 
+        publicKeyToken="6595b64144ccf1df" 
+        language="*" 
+        processorArchitecture="*"/>
+    </dependentAssembly>
+  </dependency>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!--ID Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!--ID Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!--ID Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!--ID Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!--ID Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+</assembly>

wCenterWindow/wCenterWindow.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,36 +19,37 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{6A775901-6C34-4E96-B359-C11C76A520BB}</ProjectGuid>
+    <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{f1a1603a-f5d0-47b8-8e4b-cf17747bcfba}</ProjectGuid>
     <RootNamespace>wCenterWindow</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <XPDeprecationWarning>false</XPDeprecationWarning>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -73,100 +74,109 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <CopyCppRuntimeToOutputDir>false</CopyCppRuntimeToOutputDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
+      <ConformanceMode>false</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectName).manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <DebugInformationFormat>None</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <AssemblyDebug>false</AssemblyDebug>
+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectName).manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="framework.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="Logger.h" />
+    <ClInclude Include="Resource.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="wCenterWindow.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="Logger.cpp" />
     <ClCompile Include="wCenterWindow.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="wCenterWindow.rc" />
   </ItemGroup>
   <ItemGroup>
+    <Image Include="small.ico" />
     <Image Include="wCenterWindow.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="wCenterWindow.manifest" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

wCenterWindow/wCenterWindow.vcxproj.filters

@@ -1,46 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Исходные файлы">
+    <Filter Include="Source Files">
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
-    <Filter Include="Файлы заголовков">
+    <Filter Include="Header Files">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
     </Filter>
-    <Filter Include="Файлы ресурсов">
+    <Filter Include="Resource Files">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="framework.h">
-      <Filter>Файлы заголовков</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="targetver.h">
-      <Filter>Файлы заголовков</Filter>
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Resource.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="wCenterWindow.h">
-      <Filter>Файлы заголовков</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Файлы заголовков</Filter>
+    <ClInclude Include="Logger.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="wCenterWindow.cpp">
-      <Filter>Исходные файлы</Filter>
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Logger.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="wCenterWindow.rc">
-      <Filter>Файлы ресурсов</Filter>
+      <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
+    <Image Include="small.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
     <Image Include="wCenterWindow.ico">
-      <Filter>Файлы ресурсов</Filter>
+      <Filter>Resource Files</Filter>
     </Image>
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="wCenterWindow.manifest">
+      <Filter>Resource Files</Filter>
+    </Manifest>
+  </ItemGroup>
 </Project>

wCenterWindow/wCenterWindow.vcxproj.user

@@ -0,0 +1,7 @@
+<?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>/test1 /test2</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>