Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-08 19:27:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix a menu resource leak

Browse source 
svn path=/trunk/; revision=25320
This commit is contained in:
Ged Murphy 2007-01-05 22:55:49 +00:00
parent f0ae8b4726
commit 057b027ea2
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -956,19 +956,21 @@ void TaskManager_OnTabWndSelChange(void)
ShowWindow(hPerformancePage, SW_HIDE); ShowWindow(hPerformancePage, SW_HIDE);
BringWindowToTop(hApplicationPage); BringWindowToTop(hApplicationPage);
LoadString(hInst, IDS_MENU_LARGEICONS, szTemp, 256); LoadString(hInst, IDS_MENU_LARGEICONS, szTemp, 256);
AppendMenu(hViewMenu, MF_STRING, ID_VIEW_LARGE, szTemp); AppendMenu(hViewMenu, MF_STRING, ID_VIEW_LARGE, szTemp);
LoadString(hInst, IDS_MENU_SMALLICONS, szTemp, 256); LoadString(hInst, IDS_MENU_SMALLICONS, szTemp, 256);
AppendMenu(hViewMenu, MF_STRING, ID_VIEW_SMALL, szTemp); AppendMenu(hViewMenu, MF_STRING, ID_VIEW_SMALL, szTemp);
LoadString(hInst, IDS_MENU_DETAILS, szTemp, 256); LoadString(hInst, IDS_MENU_DETAILS, szTemp, 256);
AppendMenu(hViewMenu, MF_STRING, ID_VIEW_DETAILS, szTemp); AppendMenu(hViewMenu, MF_STRING, ID_VIEW_DETAILS, szTemp);
//RemoveMenu(hMenu, 3, MF_BYPOSITION);
if (GetMenuItemCount(hMenu) <= 4) { if (GetMenuItemCount(hMenu) <= 4) {
hSubMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_WINDOWSMENU)); hSubMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_WINDOWSMENU));
LoadString(hInst, IDS_MENU_WINDOWS, szTemp, 256); LoadString(hInst, IDS_MENU_WINDOWS, szTemp, 256);
InsertMenu(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT)hSubMenu, szTemp); InsertMenu(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT)hSubMenu, szTemp);
DrawMenuBar(hMainWnd); DrawMenuBar(hMainWnd);
@ -1001,7 +1003,7 @@ void TaskManager_OnTabWndSelChange(void)
CheckMenuItem(hOptionsMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND|MF_CHECKED); CheckMenuItem(hOptionsMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND|MF_CHECKED);
if (GetMenuItemCount(hMenu) > 4) if (GetMenuItemCount(hMenu) > 4)
{ {
RemoveMenu(hMenu, 3, MF_BYPOSITION); DeleteMenu(hMenu, 3, MF_BYPOSITION);
DrawMenuBar(hMainWnd); DrawMenuBar(hMainWnd);
} }
/* /*
@ -1016,7 +1018,7 @@ void TaskManager_OnTabWndSelChange(void)
ShowWindow(hPerformancePage, SW_SHOW); ShowWindow(hPerformancePage, SW_SHOW);
BringWindowToTop(hPerformancePage); BringWindowToTop(hPerformancePage);
if (GetMenuItemCount(hMenu) > 4) { if (GetMenuItemCount(hMenu) > 4) {
RemoveMenu(hMenu, 3, MF_BYPOSITION); DeleteMenu(hMenu, 3, MF_BYPOSITION);
DrawMenuBar(hMainWnd); DrawMenuBar(hMainWnd);
} }
hSubMenu = CreatePopupMenu(); hSubMenu = CreatePopupMenu();