[PATCH 4/7] regedit: Combine error() and error_code_messagebox()
Hugh McMaster
hugh.mcmaster at outlook.com
Sun Jan 29 05:57:24 CST 2017
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
programs/regedit/edit.c | 23 +++++++++--------------
programs/regedit/framewnd.c | 2 +-
programs/regedit/main.h | 2 +-
3 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c
index 83ad79e..332f741 100644
--- a/programs/regedit/edit.c
+++ b/programs/regedit/edit.c
@@ -99,20 +99,15 @@ static INT messagebox(HWND hwnd, INT buttons, INT titleId, INT resId, ...)
return result;
}
-void error(HWND hwnd, INT resId, ...)
+void error_code_messagebox(HWND hwnd, unsigned int msg_id, ...)
{
va_list ap;
- va_start(ap, resId);
- vmessagebox(hwnd, MB_OK | MB_ICONERROR, IDS_ERROR, resId, ap);
+ va_start(ap, msg_id);
+ vmessagebox(hwnd, MB_OK|MB_ICONERROR, IDS_ERROR, msg_id, ap);
va_end(ap);
}
-static void error_code_messagebox(HWND hwnd, unsigned int msg_id)
-{
- vmessagebox(hwnd, MB_OK|MB_ICONERROR, IDS_ERROR, msg_id, NULL);
-}
-
static BOOL change_dword_base(HWND hwndDlg, BOOL toHex)
{
static const WCHAR percent_u[] = {'%','u',0};
@@ -237,17 +232,17 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType,
*buffer = '\0';
return buffer;
}
- error(hwnd, IDS_BAD_VALUE, valueName);
+ error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName);
goto done;
}
if ( *lpType == REG_DWORD ) valueDataLen = sizeof(DWORD);
if (!(buffer = HeapAlloc(GetProcessHeap(), 0, valueDataLen+sizeof(WCHAR)))) {
- error(hwnd, IDS_TOO_BIG_VALUE, valueDataLen);
+ error_code_messagebox(hwnd, IDS_TOO_BIG_VALUE, valueDataLen);
goto done;
}
lRet = RegQueryValueExW(hKey, valueName, 0, 0, (LPBYTE)buffer, &valueDataLen);
if (lRet != ERROR_SUCCESS) {
- error(hwnd, IDS_BAD_VALUE, valueName);
+ error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName);
goto done;
}
if((valueDataLen % sizeof(WCHAR)) == 0)
@@ -398,7 +393,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName)
else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED);
}
} else {
- error(hwnd, IDS_UNSUPPORTED_TYPE, type);
+ error_code_messagebox(hwnd, IDS_UNSUPPORTED_TYPE, type);
}
done:
@@ -425,7 +420,7 @@ BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath)
lRet = SHDeleteKeyW(hKeyRoot, keyPath);
if (lRet != ERROR_SUCCESS) {
- error(hwnd, IDS_BAD_KEY, keyPath);
+ error_code_messagebox(hwnd, IDS_BAD_KEY, keyPath);
goto done;
}
result = TRUE;
@@ -454,7 +449,7 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, B
lRet = RegDeleteValueW(hKey, valueName ? valueName : &empty);
if (lRet != ERROR_SUCCESS && valueName) {
- error(hwnd, IDS_BAD_VALUE, valueName);
+ error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName);
}
if (lRet != ERROR_SUCCESS) goto done;
result = TRUE;
diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c
index 43c581b..018759e 100644
--- a/programs/regedit/framewnd.c
+++ b/programs/regedit/framewnd.c
@@ -773,7 +773,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
SetFocus(g_pChildWnd->hTreeWnd);
}
} else {
- error(hWnd, IDS_NOTFOUND, searchString);
+ error_code_messagebox(hWnd, IDS_NOTFOUND, searchString);
}
}
break;
diff --git a/programs/regedit/main.h b/programs/regedit/main.h
index 8b6eede..87d2bff 100644
--- a/programs/regedit/main.h
+++ b/programs/regedit/main.h
@@ -143,7 +143,7 @@ extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath);
extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox);
extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName);
extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName);
-extern void error(HWND hwnd, INT resId, ...);
+extern void error_code_messagebox(HWND hwnd, unsigned int msg_id, ...);
/* hexedit.c */
extern void HexEdit_Register(void);
--
2.7.4
More information about the wine-patches
mailing list