Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 13:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KBSWITCH] Fix menu handle leak

Browse source
This commit is contained in:
Katayama Hirofumi MZ 2022-08-24 09:11:36 +09:00
parent b4f73f040f
commit f974f02881
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
base/applications/kbswitch/kbswitch.c
View file

@ -437,7 +437,8 @@ VOID DoUnregisterAltShiftHotKeys(HWND hwnd)
LRESULT CALLBACK LRESULT CALLBACK
WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{ {
static HMENU hRightPopupMenu; static HMENU s_hMenu;
static HMENU s_hRightPopupMenu;
static UINT s_uTaskbarRestart; static UINT s_uTaskbarRestart;
switch (Message) switch (Message)
@ -446,7 +447,9 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{ {
SetHooks(); SetHooks();
AddTrayIcon(hwnd); AddTrayIcon(hwnd);
hRightPopupMenu = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0);
s_hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP));
s_hRightPopupMenu = GetSubMenu(s_hMenu, 0);
ActivateLayout(hwnd, ulCurrentLayoutNum); ActivateLayout(hwnd, ulCurrentLayoutNum);
s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated"));
@ -502,7 +505,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
} }
else else
{ {
TrackPopupMenu(hRightPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); TrackPopupMenu(s_hRightPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL);
} }
PostMessage(hwnd, WM_NULL, 0, 0); PostMessage(hwnd, WM_NULL, 0, 0);
@ -558,7 +561,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{ {
DoUnregisterAltShiftHotKeys(hwnd); DoUnregisterAltShiftHotKeys(hwnd);
DeleteHooks(); DeleteHooks();
DestroyMenu(hRightPopupMenu); DestroyMenu(s_hMenu);
DelTrayIcon(hwnd); DelTrayIcon(hwnd);
PostQuitMessage(0); PostQuitMessage(0);