[PATCH v2 3/3] regedit: Directly use RegQueryValueExW() instead of a helper function

Hugh McMaster wine at gitlab.winehq.org
Wed Jul 6 08:24:07 CDT 2022


From: Hugh McMaster <hugh.mcmaster at outlook.com>

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/regedit/edit.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c
index b70176fbbc2..ca512d3f557 100644
--- a/programs/regedit/edit.c
+++ b/programs/regedit/edit.c
@@ -178,11 +178,6 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara
     return FALSE;
 }
 
-static BOOL value_exists(HWND hwnd, HKEY hKey, const WCHAR *value_name)
-{
-    return !RegQueryValueExW(hKey, value_name, NULL, NULL, NULL, NULL);
-}
-
 static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, LONG *len)
 {
     DWORD valueDataLen;
@@ -523,7 +518,7 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC
 	return FALSE;
     }
 
-    if (value_exists(hwnd, hKey, newName)) {
+    if (RegQueryValueExW(hKey, newName, NULL, NULL, NULL, NULL)) {
         error_code_messagebox(hwnd, IDS_VALUE_EXISTS, oldName);
         goto done;
     }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/392



More information about the wine-devel mailing list