regedit: Don't expand items on initial tree creation.

The Message TVM_EXPAND is captured in treeview_notify, then passes g_pChildWnd->hTreeWnd on to OnTreeExpanding which hasn't been initialized yet. The function get_last_key is already called after the hTreeWnd has been assigned to select the previous selected item (if it exists). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

regedit: Don't expand items on initial tree creation.
006d3f33 · Alistair Leslie-Hughes · Alexandre Julliard · 760b0de7 · 006d3f33 · 006d3f33
Commit 006d3f33 authored Aug 20, 2018 by Alistair Leslie-Hughes Committed by Alexandre Julliard Aug 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

childwnd.c programs/regedit/childwnd.c +10 -5

treeview.c programs/regedit/treeview.c +0 -3

No files found.
--- a/programs/regedit/childwnd.c
+++ b/programs/regedit/childwnd.c
@@ -240,16 +240,21 @@ static void get_last_key(HWND hwndTV)

    if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL) == ERROR_SUCCESS)
    {
+        HTREEITEM selection = NULL;
        if (RegQueryValueExW(hkey, wszLastKey, NULL, NULL, (LPBYTE)wszVal, &dwSize) == ERROR_SUCCESS)
        {
-            HTREEITEM selection;
-            if (!strcmpW(wszVal, g_pChildWnd->szPath))
-                selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0);
-            else
+            if (strcmpW(wszVal, g_pChildWnd->szPath))
                selection = FindPathInTree(hwndTV, wszVal);
-            SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)selection);
        }

+        if(!selection)
+        {
+            selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0);
+            SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)selection );
+        }
+        else
+            SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)selection);
+
        RegCloseKey(hkey);
    }
 }

--- a/programs/regedit/treeview.c
+++ b/programs/regedit/treeview.c
@@ -572,9 +572,6 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName)
    if (!AddEntryToTree(hwndTV, hRoot, hkcc, HKEY_CURRENT_CONFIG, 1)) return FALSE;
    if (!AddEntryToTree(hwndTV, hRoot, hkdd, HKEY_DYN_DATA, 1)) return FALSE;

-    /* expand and select host name */
-    SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot );
-    SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot);
    return TRUE;
 }