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

[REGEDIT]

Browse source 
Fix tree-view's image-list handle leakage when application quits.
Loosely based on a patch by Edijs Kolesnicovičs and Grégory Macário Harbs

NOTE: Always cleanup / destroy (or, try to) things in the reverse way they are created / initialized (i.e. in a symmetrical way). Therefore, destry the associated tree-view's image-list in the DestroyTreeView function, which is the opposite of CreateTreeView (which calls InitTreeViewImageLists). The same mechanism is already used by the list-view. For completeness, add a parameter to the DestroyTreeView function (a handle to a tree-view) so that we can pass to it the global tree-view's handle (see what's done in WM_DESTROY message handling in ChildWndProc).

CORE-6856 #resolve #comment Should be fixed in revision r59371. See the commit log for more details. Thanks :)

svn path=/trunk/; revision=59371
This commit is contained in:
Hermès Bélusca-Maïto 2013-06-29 19:22:00 +00:00
parent fefd11144a
commit 024afb5abf
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/applications/regedit/childwnd.c
View file

@ -439,8 +439,8 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
}
goto def;
case WM_DESTROY:
DestroyTreeView();
DestroyListView(g_pChildWnd->hListWnd);
DestroyTreeView(g_pChildWnd->hTreeWnd);
DestroyMainMenu();
HeapFree(GetProcessHeap(), 0, g_pChildWnd);
g_pChildWnd = NULL;

6
reactos/base/applications/regedit/main.h
View file

@ -129,9 +129,9 @@ extern HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name);
extern HWND StartKeyRename(HWND hwndTV);
extern BOOL CreateNewKey(HWND hwndTV, HTREEITEM hItem);
extern BOOL SelectNode(HWND hwndTV, LPCWSTR keyPath);
extern void DestroyTreeView( void );
extern void DestroyListView( HWND hwndLV );
extern void DestroyMainMenu( void );
extern void DestroyTreeView(HWND hwndTV);
extern void DestroyListView(HWND hwndLV);
extern void DestroyMainMenu(void);
/* edit.c */
extern BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCWSTR valueName, BOOL EditBin);

11
reactos/base/applications/regedit/treeview.c
View file

@ -651,10 +651,15 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, HMENU id)
return hwndTV;
}
void DestroyTreeView()
void DestroyTreeView(HWND hwndTV)
{
if (pathBuffer)
HeapFree(GetProcessHeap(), 0, pathBuffer);
HIMAGELIST himl;
if (pathBuffer) HeapFree(GetProcessHeap(), 0, pathBuffer);
/* Destroy the image list associated with the tree view control */
himl = TreeView_GetImageList(hwndTV, TVSIL_NORMAL);
if (himl) ImageList_Destroy(himl);
}
BOOL SelectNode(HWND hwndTV, LPCWSTR keyPath)