ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regedit: Use shared code to add favourite key items to the 'Remove' listbox. 

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hugh McMaster 2017-06-06 08:01:07 +00:00 committed by Alexandre Julliard
parent 1fb0e25cfb
commit 75fed2d5a1
1 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
programs/regedit/framewnd.c
View File

@ -215,15 +215,15 @@ static void add_remove_modify_menu_items(HMENU hMenu)
} }
} }
static void add_favourite_key_menu_items(HMENU hMenu) static int add_favourite_key_items(HMENU hMenu, HWND hList)
{ {
HKEY hkey; HKEY hkey;
LONG rc; LONG rc;
DWORD num_values, max_value_len, value_len, type, i; DWORD num_values, max_value_len, value_len, type, i = 0;
WCHAR *value_name; WCHAR *value_name;
rc = RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ, &hkey); rc = RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ, &hkey);
if (rc != ERROR_SUCCESS) return; if (rc != ERROR_SUCCESS) return 0;
rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, &num_values, rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, &num_values,
&max_value_len, NULL, NULL, NULL); &max_value_len, NULL, NULL, NULL);
@ -239,19 +239,25 @@ static void add_favourite_key_menu_items(HMENU hMenu)
value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR));
CHECK_ENOUGH_MEMORY(value_name); CHECK_ENOUGH_MEMORY(value_name);
AppendMenuW(hMenu, MF_SEPARATOR, 0, 0); if (hMenu) AppendMenuW(hMenu, MF_SEPARATOR, 0, 0);
for (i = 0; i < num_values; i++) for (i = 0; i < num_values; i++)
{ {
value_len = max_value_len; value_len = max_value_len;
rc = RegEnumValueW(hkey, i, value_name, &value_len, NULL, &type, NULL, NULL); rc = RegEnumValueW(hkey, i, value_name, &value_len, NULL, &type, NULL, NULL);
if (rc == ERROR_SUCCESS && type == REG_SZ) if (rc == ERROR_SUCCESS && type == REG_SZ)
{
if (hMenu)
AppendMenuW(hMenu, MF_ENABLED | MF_STRING, ID_FAVORITE_FIRST + i, value_name); AppendMenuW(hMenu, MF_ENABLED | MF_STRING, ID_FAVORITE_FIRST + i, value_name);
else if (hList)
SendMessageW(hList, LB_ADDSTRING, 0, (LPARAM)value_name);
}
} }
HeapFree(GetProcessHeap(), 0, value_name); HeapFree(GetProcessHeap(), 0, value_name);
exit: exit:
RegCloseKey(hkey); RegCloseKey(hkey);
return i;
} }
static void OnInitMenuPopup(HWND hWnd, HMENU hMenu) static void OnInitMenuPopup(HWND hWnd, HMENU hMenu)
@ -263,7 +269,7 @@ static void OnInitMenuPopup(HWND hWnd, HMENU hMenu)
while (GetMenuItemCount(hMenu) > 2) while (GetMenuItemCount(hMenu) > 2)
DeleteMenu(hMenu, 2, MF_BYPOSITION); DeleteMenu(hMenu, 2, MF_BYPOSITION);
add_favourite_key_menu_items(hMenu); add_favourite_key_items(hMenu, NULL);
} }
UpdateMenuItems(hMenu); UpdateMenuItems(hMenu);
@ -710,35 +716,11 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w
HWND hwndList = GetDlgItem(hwndDlg, IDC_NAME_LIST); HWND hwndList = GetDlgItem(hwndDlg, IDC_NAME_LIST);
switch(uMsg) { switch(uMsg) {
case WM_INITDIALOG: { case WM_INITDIALOG:
HKEY hKey; if (!add_favourite_key_items(NULL, hwndList))
int i = 0;
EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);
if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey,
0, KEY_READ, &hKey) == ERROR_SUCCESS) {
WCHAR namebuf[KEY_MAX_LEN];
BYTE valuebuf[4096];
DWORD ksize, vsize, type;
LONG error;
do {
ksize = KEY_MAX_LEN;
vsize = sizeof(valuebuf);
error = RegEnumValueW(hKey, i, namebuf, &ksize, NULL, &type, valuebuf, &vsize);
if (error != ERROR_SUCCESS)
break;
if (type == REG_SZ) {
SendMessageW(hwndList, LB_ADDSTRING, 0, (LPARAM)namebuf);
}
i++;
} while(error == ERROR_SUCCESS);
RegCloseKey(hKey);
}
else
return FALSE; return FALSE;
EnableWindow(GetDlgItem(hwndDlg, IDOK), i != 0);
SendMessageW(hwndList, LB_SETCURSEL, 0, 0); SendMessageW(hwndList, LB_SETCURSEL, 0, 0);
return TRUE; return TRUE;
}
case WM_COMMAND: case WM_COMMAND:
switch(LOWORD(wParam)) { switch(LOWORD(wParam)) {
case IDC_NAME_LIST: case IDC_NAME_LIST: