Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 11:47:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

[TASKMGR]

Browse source 
fix HMENU leak in TaskManager_OnTabWndSelChange
CORE-8705

svn path=/trunk/; revision=64972
This commit is contained in:
Christoph von Wittich 2014-10-24 20:41:25 +00:00
parent 40369c24e3
commit 2c42dec0d7
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/base/applications/taskmgr/taskmgr.c
View file

@ -38,6 +38,8 @@ HWND hMainWnd; /* Main Window */
HWND hStatusWnd; /* Status Bar Window */ HWND hStatusWnd; /* Status Bar Window */
HWND hTabWnd; /* Tab Control Window */ HWND hTabWnd; /* Tab Control Window */
HMENU hWindowMenu = NULL;
int nMinimumWidth; /* Minimum width of the dialog (OnSize()'s cx) */ int nMinimumWidth; /* Minimum width of the dialog (OnSize()'s cx) */
int nMinimumHeight; /* Minimum height of the dialog (OnSize()'s cy) */ int nMinimumHeight; /* Minimum height of the dialog (OnSize()'s cy) */
@ -187,6 +189,8 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
SaveSettings(); SaveSettings();
PerfDataUninitialize(); PerfDataUninitialize();
CloseHandle(hMutex); CloseHandle(hMutex);
if (hWindowMenu)
DestroyMenu(hWindowMenu);
return 0; return 0;
} }
@ -974,6 +978,8 @@ void TaskManager_OnTabWndSelChange(void)
RemoveMenu(hViewMenu, i, MF_BYPOSITION); RemoveMenu(hViewMenu, i, MF_BYPOSITION);
} }
RemoveMenu(hOptionsMenu, 3, MF_BYPOSITION); RemoveMenu(hOptionsMenu, 3, MF_BYPOSITION);
if (hWindowMenu)
DestroyMenu(hWindowMenu);
switch (TaskManagerSettings.ActiveTabPage) { switch (TaskManagerSettings.ActiveTabPage) {
case 0: case 0:
ShowWindow(hApplicationPage, SW_SHOW); ShowWindow(hApplicationPage, SW_SHOW);
@ -991,10 +997,10 @@ void TaskManager_OnTabWndSelChange(void)
AppendMenuW(hViewMenu, MF_STRING, ID_VIEW_DETAILS, szTemp); AppendMenuW(hViewMenu, MF_STRING, ID_VIEW_DETAILS, szTemp);
if (GetMenuItemCount(hMenu) <= 5) { if (GetMenuItemCount(hMenu) <= 5) {
hSubMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_WINDOWSMENU)); hWindowMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_WINDOWSMENU));
LoadStringW(hInst, IDS_MENU_WINDOWS, szTemp, 256); LoadStringW(hInst, IDS_MENU_WINDOWS, szTemp, 256);
InsertMenuW(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT_PTR) hSubMenu, szTemp); InsertMenuW(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT_PTR) hWindowMenu, szTemp);
DrawMenuBar(hMainWnd); DrawMenuBar(hMainWnd);
} }