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

Added check for error allocating heap memory.

Browse Source
This commit is contained in:
dreamforceinc
2023-11-28 23:38:50 +03:00
parent 1a3e3ef4b1
commit 4bfcf90e2a
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wCenterWindow/resource.h
View File

@@ -20,9 +20,10 @@
#define IDS_ERR_POPUP 118 #define IDS_ERR_POPUP 118
#define IDS_ERR_HOOK 119 #define IDS_ERR_HOOK 119
#define IDS_ERR_TIMER 120 #define IDS_ERR_TIMER 120
#define IDS_ERR_MAXMIN 121 #define IDS_ERR_HEAP 121
#define IDS_RUNNING 122 #define IDS_ERR_MAXMIN 122
#define IDT_TIMER 123 #define IDS_RUNNING 123
#define IDT_TIMER 124
#define IDR_MAINFRAME 128 #define IDR_MAINFRAME 128
#define IDD_MANUAL_EDITING 129 #define IDD_MANUAL_EDITING 129
#define IDC_EDIT_X 1000 #define IDC_EDIT_X 1000
@@ -50,6 +51,6 @@
#define _APS_NEXT_RESOURCE_VALUE 130 #define _APS_NEXT_RESOURCE_VALUE 130
#define _APS_NEXT_COMMAND_VALUE 32771 #define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1015 #define _APS_NEXT_CONTROL_VALUE 1015
#define _APS_NEXT_SYMED_VALUE 124 #define _APS_NEXT_SYMED_VALUE 125
#endif #endif
#endif #endif

19
wCenterWindow/wCenterWindow.cpp
View File

@@ -36,7 +36,7 @@ CLogger logger(TEXT(PRODUCT_NAME), TEXT(VERSION_STR));
NOTIFYICONDATAW nid = { 0 }; NOTIFYICONDATAW nid = { 0 };
MENUITEMINFO mii = { 0 }; MENUITEMINFO mii = { 0 };
LPVOID szBuffer; LPVOID szWinTitleBuffer = nullptr;
// {2D7B7F30-4B5F-4380-9807-57D7A2E37F6C} // {2D7B7F30-4B5F-4380-9807-57D7A2E37F6C}
// static const GUID guid = { 0x2d7b7f30, 0x4b5f, 0x4380, { 0x98, 0x7, 0x57, 0xd7, 0xa2, 0xe3, 0x7f, 0x6c } }; // static const GUID guid = { 0x2d7b7f30, 0x4b5f, 0x4380, { 0x98, 0x7, 0x57, 0xd7, 0xa2, 0xe3, 0x7f, 0x6c } };
@@ -157,7 +157,12 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd
HandlingTrayIcon(); HandlingTrayIcon();
hHeap = GetProcessHeap(); hHeap = GetProcessHeap();
szBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, MAX_WINTITLE_BUFFER_LENGTH); szWinTitleBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, MAX_WINTITLE_BUFFER_LENGTH);
if (nullptr == szWinTitleBuffer)
{
ShowError(IDS_ERR_HEAP);
return FALSE;
}
MSG msg; MSG msg;
BOOL bRet; BOOL bRet;
@@ -182,9 +187,9 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd
Shell_NotifyIconW(NIM_DELETE, &nid); Shell_NotifyIconW(NIM_DELETE, &nid);
DestroyIcon(hIcon); DestroyIcon(hIcon);
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%08X", TEXT(__FUNCTION__), (int)msg.wParam);
HeapFree(hHeap, NULL, szBuffer); HeapFree(hHeap, NULL, szWinTitleBuffer);
CloseHandle(hUpdater); CloseHandle(hUpdater);
return (int)msg.wParam; return (int)msg.wParam;
@@ -502,14 +507,14 @@ BOOL CALLBACK DlgProc(HWND hDlg, UINT dlgmsg, WPARAM wParam, LPARAM lParam)
BOOL IsWindowApprooved(HWND hFW) BOOL IsWindowApprooved(HWND hFW)
{ {
logger.Out(L"Entering the %s() function, handle = 0x%08X", TEXT(__FUNCTION__), hFW); logger.Out(L"Entering the %s() function", TEXT(__FUNCTION__));
bool bApprooved = FALSE; bool bApprooved = FALSE;
if (hFW) if (hFW)
{ {
if (GetWindowTextW(hFW, (LPWSTR)szBuffer, MAX_WINTITLE_BUFFER_LENGTH)) if (GetWindowTextW(hFW, (LPWSTR)szWinTitleBuffer, MAX_WINTITLE_BUFFER_LENGTH))
{ {
logger.Out(L"%s(%d): Window title: '%s'", TEXT(__FUNCTION__), __LINE__, (LPWSTR)szBuffer); logger.Out(L"%s(%d): Window handle: 0x%08X. Title: '%s'", TEXT(__FUNCTION__), __LINE__, hFW, (LPWSTR)szWinTitleBuffer);
} }
if (IsIconic(hFW)) if (IsIconic(hFW))

BIN
wCenterWindow/wCenterWindow.rc
View File

Binary file not shown.