Module: wine Branch: master Commit: c193bffb3e1210e5575544f5f045b95560fbf950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c193bffb3e1210e5575544f5f0...
Author: Hugh McMaster hugh.mcmaster@outlook.com Date: Thu Jul 27 12:25:17 2017 +0000
regedit: Use the heap_*() functions in childwnd.c where possible.
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
programs/regedit/childwnd.c | 26 +++++++++++++------------- programs/regedit/regproc.c | 4 ++-- programs/regedit/regproc.h | 8 +++++--- 3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index f2359c4..d6a7d51 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -109,7 +109,7 @@ static LPWSTR CombinePaths(LPCWSTR pPaths[], int nPaths) { len += lstrlenW(pPaths[i])+1; } } - combined = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + combined = heap_xalloc(len * sizeof(WCHAR)); *combined = '\0'; for (i=0, pos=0; i<nPaths; i++) { if (pPaths[i] && *pPaths[i]) { @@ -132,7 +132,7 @@ static LPWSTR GetPathRoot(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { HKEY hRootKey = NULL; if (!hItem) hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); - HeapFree(GetProcessHeap(), 0, GetItemPath(hwndTV, hItem, &hRootKey)); + heap_free(GetItemPath(hwndTV, hItem, &hRootKey)); if (!bFull && !hRootKey) return NULL; if (hRootKey) @@ -153,8 +153,8 @@ LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { parts[0] = GetPathRoot(hwndTV, hItem, bFull); parts[1] = GetItemPath(hwndTV, hItem, &hRootKey); ret = CombinePaths((LPCWSTR *)parts, 2); - HeapFree(GetProcessHeap(), 0, parts[0]); - HeapFree(GetProcessHeap(), 0, parts[1]); + heap_free(parts[0]); + heap_free(parts[1]); return ret; }
@@ -175,7 +175,7 @@ static void OnTreeSelectionChanged(HWND hwndTV, HWND hwndLV, HTREEITEM hItem, BO
keyPath = GetItemPath(hwndTV, hItem, &hRootKey); RefreshListView(hwndLV, hRootKey, keyPath, NULL); - HeapFree(GetProcessHeap(), 0, keyPath); + heap_free(keyPath); } UpdateStatusBar(); } @@ -277,7 +277,7 @@ static void set_last_key(HWND hwndTV) value = GetItemFullPath(g_pChildWnd->hTreeWnd, selection, FALSE); RegSetValueExW(hkey, wszLastKey, 0, REG_SZ, (LPBYTE)value, (lstrlenW(value) + 1) * sizeof(WCHAR)); if (selection != root) - HeapFree(GetProcessHeap(), 0, value); + heap_free(value); RegCloseKey(hkey); } } @@ -309,7 +309,7 @@ static int treeview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam WCHAR *path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); BOOL res = RenameKey(hWnd, hRootKey, path, dispInfo->item.pszText);
- HeapFree(GetProcessHeap(), 0, path); + heap_free(path);
if (res) { @@ -322,7 +322,7 @@ static int treeview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam
path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); update_listview_path(path); - HeapFree(GetProcessHeap(), 0, path); + heap_free(path);
UpdateStatusBar(); } @@ -396,8 +396,8 @@ static int listview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; LINE_INFO *info = (LINE_INFO *)nmlv->lParam;
- HeapFree(GetProcessHeap(), 0, info->name); - HeapFree(GetProcessHeap(), 0, info); + heap_free(info->name); + heap_free(info); break; } case LVN_ENDLABELEDITW: @@ -416,7 +416,7 @@ static int listview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam dispInfo->item.iItem, (LPARAM)&dispInfo->item); }
- HeapFree(GetProcessHeap(), 0, oldName); + heap_free(oldName); return 0; } case LVN_GETDISPINFOW: @@ -444,7 +444,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa { switch (message) { case WM_CREATE: - g_pChildWnd = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd)); + g_pChildWnd = heap_xalloc(sizeof(ChildWnd)); if (!g_pChildWnd) return 0; LoadStringW(hInst, IDS_REGISTRY_ROOT_NAME, g_pChildWnd->szPath, MAX_PATH); g_pChildWnd->nSplitPos = 250; @@ -476,7 +476,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa goto def; case WM_DESTROY: set_last_key(g_pChildWnd->hTreeWnd); - HeapFree(GetProcessHeap(), 0, g_pChildWnd); + heap_free(g_pChildWnd); g_pChildWnd = NULL; PostQuitMessage(0); break; diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 6f94c0f..aae7738 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -44,7 +44,7 @@ static HKEY reg_class_keys[] = {
#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A))
-static void *heap_xalloc(size_t size) +void *heap_xalloc(size_t size) { void *buf = HeapAlloc(GetProcessHeap(), 0, size); if (!buf) @@ -73,7 +73,7 @@ static void *heap_xrealloc(void *buf, size_t size) return new_buf; }
-static BOOL heap_free(void *buf) +BOOL heap_free(void *buf) { return HeapFree(GetProcessHeap(), 0, buf); } diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 81ac3e3..a0ed438 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -36,7 +36,9 @@ if (!(p)) \ void __cdecl output_message(unsigned int id, ...); void __cdecl error_exit(unsigned int id, ...);
-BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format); -BOOL import_registry_file(FILE *in); +char *GetMultiByteString(const WCHAR *strW); +void *heap_xalloc(size_t size); +BOOL heap_free(void *buf); +BOOL import_registry_file(FILE *reg_file); void delete_registry_key(WCHAR *reg_key_name); -CHAR* GetMultiByteString(const WCHAR* strW); +BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format);