system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 18:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

regedit: Pass updated REG_SZ and REG_EXPAND_SZ data via 'struct edit_params'.

Browse source 
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
This commit is contained in:
Hugh McMaster 2022-07-11 21:39:32 +10:00 committed by Alexandre Julliard
parent b00a4b66b9
commit 72fced0236
1 changed files with 42 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
programs/regedit/edit.c
View file

@ -81,29 +81,53 @@ static void WINAPIV error_code_messagebox(HWND hwnd, unsigned int msg_id, ...)
va_end(ap); va_end(ap);
} }
static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam) static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params)
{ {
HWND hwndValue; HWND hwndValue;
unsigned int len; unsigned int len;
WCHAR *buf;
LONG ret;
hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA);
len = GetWindowTextLengthW(hwndValue);
buf = malloc((len + 1) * sizeof(WCHAR));
len = GetWindowTextW(hwndValue, buf, len + 1);
free(params->data);
params->data = buf;
params->size = (len + 1) * sizeof(WCHAR);
ret = RegSetValueExW(params->hkey, params->value_name, 0, params->type, (BYTE *)params->data, params->size);
if (ret) error_code_messagebox(hwndDlg, IDS_SET_VALUE_FAILED);
free(params->data);
params->data = NULL;
return !ret;
}
static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
struct edit_params *params;
int ret = 0;
switch (msg) switch (msg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
params = (struct edit_params *)lparam;
SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params);
SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName);
SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, stringValueData); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, params->data);
return TRUE; return TRUE;
case WM_COMMAND: case WM_COMMAND:
switch (LOWORD(wparam)) switch (LOWORD(wparam))
{ {
case IDOK: case IDOK:
hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA); params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER);
len = GetWindowTextLengthW(hwndValue); ret = update_registry_value(hwndDlg, params);
stringValueData = realloc(stringValueData, (len + 1) * sizeof(WCHAR));
if (!GetWindowTextW(hwndValue, stringValueData, len + 1))
*stringValueData = 0;
/* fall through */ /* fall through */
case IDCANCEL: case IDCANCEL:
EndDialog(hwndDlg, wparam); EndDialog(hwndDlg, ret);
return TRUE; return TRUE;
} }
} }
@ -281,11 +305,12 @@ done:
BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName)
{ {
BOOL result = FALSE; HKEY hKey;
DWORD type; DWORD type;
LONG lRet; LONG lRet;
HKEY hKey;
LONG len; LONG len;
struct edit_params params;
BOOL result = FALSE;
lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey);
if (lRet) { if (lRet) {
@ -296,12 +321,14 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName)
editValueName = valueName ? valueName : g_pszDefaultValueName; editValueName = valueName ? valueName : g_pszDefaultValueName;
if(!(stringValueData = read_value(hwnd, hKey, valueName, &type, &len))) goto done; if(!(stringValueData = read_value(hwnd, hKey, valueName, &type, &len))) goto done;
params.hkey = hKey;
params.value_name = valueName;
params.type = type;
params.data = stringValueData;
params.size = len;
if ( (type == REG_SZ) || (type == REG_EXPAND_SZ) ) { if ( (type == REG_SZ) || (type == REG_EXPAND_SZ) ) {
if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_STRING), hwnd, modify_string_dlgproc) == IDOK) { result = DialogBoxParamW(0, MAKEINTRESOURCEW(IDD_EDIT_STRING), hwnd, modify_string_dlgproc, (LPARAM)&params);
lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, (lstrlenW(stringValueData) + 1) * sizeof(WCHAR));
if (lRet == ERROR_SUCCESS) result = TRUE;
else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED);
}
} else if ( type == REG_DWORD ) { } else if ( type == REG_DWORD ) {
DWORD value = *((DWORD*)stringValueData); DWORD value = *((DWORD*)stringValueData);
stringValueData = realloc(stringValueData, 64); stringValueData = realloc(stringValueData, 64);
@ -383,13 +410,6 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName)
} }
else /* hex data types */ else /* hex data types */
{ {
struct edit_params params;
params.hkey = hKey;
params.value_name = valueName;
params.type = type;
params.data = stringValueData;
params.size = len;
result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd, result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd,
bin_modify_dlgproc, (LPARAM)&params); bin_modify_dlgproc, (LPARAM)&params);
} }