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

regedit: Fall back to tree root on invalid path. 

Signed-off-by: Jakub Bartmiński <jakub.bartm@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jakub Bartmiński 2017-04-03 21:39:46 +02:00 committed by Alexandre Julliard
parent 69608af0a9
commit 9e35dd1545
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/regedit/treeview.c
View File

@ -132,13 +132,16 @@ static LPWSTR get_path_component(LPCWSTR *lplpKeyName) {
HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) { HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) {
TVITEMEXW tvi; TVITEMEXW tvi;
WCHAR buf[261]; /* tree view has 260 character limitation on item name */ WCHAR buf[261]; /* tree view has 260 character limitation on item name */
HTREEITEM hItem, hOldItem; HTREEITEM hRoot, hItem, hOldItem;
BOOL valid_path;
buf[260] = '\0'; buf[260] = '\0';
hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_ROOT, 0); hRoot = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_ROOT, 0);
hItem = hRoot;
SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem );
hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)hItem); hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)hItem);
hOldItem = hItem; hOldItem = hItem;
valid_path = FALSE;
while(1) { while(1) {
LPWSTR lpItemName = get_path_component(&lpKeyName); LPWSTR lpItemName = get_path_component(&lpKeyName);
@ -150,6 +153,7 @@ HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) {
tvi.cchTextMax = 260; tvi.cchTextMax = 260;
SendMessageW(hwndTV, TVM_GETITEMW, 0, (LPARAM) &tvi); SendMessageW(hwndTV, TVM_GETITEMW, 0, (LPARAM) &tvi);
if (!lstrcmpiW(tvi.pszText, lpItemName)) { if (!lstrcmpiW(tvi.pszText, lpItemName)) {
valid_path = TRUE;
SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem );
if (!lpKeyName) if (!lpKeyName)
{ {
@ -164,10 +168,10 @@ HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) {
} }
HeapFree(GetProcessHeap(), 0, lpItemName); HeapFree(GetProcessHeap(), 0, lpItemName);
if (!hItem) if (!hItem)
return hOldItem; return valid_path ? hOldItem : hRoot;
} }
else else
return hItem; return valid_path ? hItem : hRoot;
} }
} }