* Sync with recent trunk (r52637).
[reactos.git] / base / applications / regedit / childwnd.c
index 6675e21..378d2e7 100644 (file)
@@ -49,12 +49,12 @@ static void draw_splitbar(HWND hWnd, int x)
 
     if(!SizingPattern)
     {
-      const DWORD Pattern[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA};
-      SizingPattern = CreateBitmap(8, 8, 1, 1, Pattern);
+        const DWORD Pattern[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA};
+        SizingPattern = CreateBitmap(8, 8, 1, 1, Pattern);
     }
     if(!SizingBrush)
     {
-      SizingBrush = CreatePatternBrush(SizingPattern);
+        SizingBrush = CreatePatternBrush(SizingPattern);
     }
     GetClientRect(hWnd, &rt);
     rt.left = x - SPLIT_WIDTH/2;
@@ -65,21 +65,24 @@ static void draw_splitbar(HWND hWnd, int x)
     ReleaseDC(hWnd, hdc);
 }
 
-static void ResizeWnd(ChildWnd* pChildWnd, int cx, int cy)
+static void ResizeWnd(int cx, int cy)
 {
-    HDWP hdwp = BeginDeferWindowPos(2);
-    RECT rt, rs;
-
+    HDWP hdwp = BeginDeferWindowPos(3);
+    RECT rt, rs, rb;
+    const int tHeight = 18;
     SetRect(&rt, 0, 0, cx, cy);
     cy = 0;
-    if (hStatusBar != NULL) {
+    if (hStatusBar != NULL)
+    {
         GetWindowRect(hStatusBar, &rs);
-        cy = rs.bottom - rs.top + 8;
+        cy = rs.bottom - rs.top;
     }
-    cx = pChildWnd->nSplitPos + SPLIT_WIDTH/2;
-       DeferWindowPos(hdwp, pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left, 23, SWP_NOZORDER|SWP_NOACTIVATE);
-    DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top + 25, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
-    DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx  , rt.top + 25, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
+    GetWindowRect(g_pChildWnd->hAddressBtnWnd, &rb);
+    cx = g_pChildWnd->nSplitPos + SPLIT_WIDTH/2;
+    DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - tHeight-2, tHeight, SWP_NOZORDER|SWP_NOACTIVATE);
+    DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, 0, rt.right - tHeight, rt.top, tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE);
+    DeferWindowPos(hdwp, g_pChildWnd->hTreeWnd, 0, rt.left, rt.top + tHeight+2, g_pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
+    DeferWindowPos(hdwp, g_pChildWnd->hListWnd, 0, rt.left+cx, rt.top + tHeight+2, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
     EndDeferWindowPos(hdwp);
 }
 
@@ -108,7 +111,7 @@ static void finish_splitbar(HWND hWnd, int x)
     last_split = -1;
     GetClientRect(hWnd, &rt);
     g_pChildWnd->nSplitPos = x;
-    ResizeWnd(g_pChildWnd, rt.right, rt.bottom);
+    ResizeWnd(rt.right, rt.bottom);
     ReleaseCapture();
 }
 
@@ -122,7 +125,6 @@ static void finish_splitbar(HWND hWnd, int x)
 
 static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    ChildWnd* pChildWnd = g_pChildWnd;
     HTREEITEM hSelection;
     HKEY hRootKey;
     LPCTSTR keyPath, s;
@@ -130,7 +132,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     UNREFERENCED_PARAMETER(message);
 
-    switch (wID) {
+    switch (wID)
+    {
         /* Parse the menu selections: */
     case ID_REGISTRY_EXIT:
         DestroyWindow(hWnd);
@@ -139,39 +142,39 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         /* TODO */
         break;
     case ID_TREE_EXPANDBRANCH:
-        (void)TreeView_Expand(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd), TVE_EXPAND);
+        (void)TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_EXPAND);
         break;
     case ID_TREE_COLLAPSEBRANCH:
-        (void)TreeView_Expand(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd), TVE_COLLAPSE);
+        (void)TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_COLLAPSE);
         break;
     case ID_TREE_RENAME:
-        SetFocus(pChildWnd->hTreeWnd);
-        (void)TreeView_EditLabel(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd));
+        SetFocus(g_pChildWnd->hTreeWnd);
+        (void)TreeView_EditLabel(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd));
         break;
     case ID_TREE_DELETE:
-        hSelection = TreeView_GetSelection(pChildWnd->hTreeWnd);
-        keyPath = GetItemPath(pChildWnd->hTreeWnd, hSelection, &hRootKey);
+        hSelection = TreeView_GetSelection(g_pChildWnd->hTreeWnd);
+        keyPath = GetItemPath(g_pChildWnd->hTreeWnd, hSelection, &hRootKey);
 
         if (keyPath == 0 || *keyPath == 0)
         {
-           MessageBeep(MB_ICONHAND);
-        } else
-        if (DeleteKey(hWnd, hRootKey, keyPath))
-          DeleteNode(g_pChildWnd->hTreeWnd, 0);
+            MessageBeep(MB_ICONHAND);
+        }
+        else if (DeleteKey(hWnd, hRootKey, keyPath))
+            DeleteNode(g_pChildWnd->hTreeWnd, 0);
         break;
-       case ID_TREE_EXPORT:
-        ExportRegistryFile(pChildWnd->hTreeWnd);
+    case ID_TREE_EXPORT:
+        ExportRegistryFile(g_pChildWnd->hTreeWnd);
         break;
-       case ID_EDIT_FIND:
+    case ID_EDIT_FIND:
         FindDialog(hWnd);
         break;
     case ID_EDIT_COPYKEYNAME:
-        hSelection = TreeView_GetSelection(pChildWnd->hTreeWnd);
-        keyPath = GetItemPath(pChildWnd->hTreeWnd, hSelection, &hRootKey);
+        hSelection = TreeView_GetSelection(g_pChildWnd->hTreeWnd);
+        keyPath = GetItemPath(g_pChildWnd->hTreeWnd, hSelection, &hRootKey);
         CopyKeyName(hWnd, hRootKey, keyPath);
         break;
     case ID_EDIT_NEW_KEY:
-        CreateNewKey(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd));
+        CreateNewKey(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd));
         break;
     case ID_EDIT_NEW_STRINGVALUE:
     case ID_EDIT_NEW_BINARYVALUE:
@@ -179,20 +182,20 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         SendMessage(hFrameWnd, WM_COMMAND, wParam, lParam);
         break;
     case ID_SWITCH_PANELS:
-        pChildWnd->nFocusPanel = !pChildWnd->nFocusPanel;
-        SetFocus(pChildWnd->nFocusPanel? pChildWnd->hListWnd: pChildWnd->hTreeWnd);
+        g_pChildWnd->nFocusPanel = !g_pChildWnd->nFocusPanel;
+        SetFocus(g_pChildWnd->nFocusPanel? g_pChildWnd->hListWnd: g_pChildWnd->hTreeWnd);
         break;
     default:
         if ((wID >= ID_TREE_SUGGESTION_MIN) && (wID <= ID_TREE_SUGGESTION_MAX))
-               {
+        {
             s = Suggestions;
             while(wID > ID_TREE_SUGGESTION_MIN)
             {
                 if (*s)
                     s += _tcslen(s) + 1;
-                               wID--;
+                wID--;
             }
-            SelectNode(pChildWnd->hTreeWnd, s);
+            SelectNode(g_pChildWnd->hTreeWnd, s);
             break;
         }
         return FALSE;
@@ -208,95 +211,95 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 #define MIN(a,b)       ((a < b) ? (a) : (b))
 
 static void SuggestKeys(HKEY hRootKey, LPCTSTR pszKeyPath, LPTSTR pszSuggestions,
-       size_t iSuggestionsLength)
+                        size_t iSuggestionsLength)
 {
-       TCHAR szBuffer[256];
-       TCHAR szLastFound[256];
-       size_t i;
-       HKEY hOtherKey, hSubKey;
-       BOOL bFound;
-
-       memset(pszSuggestions, 0, iSuggestionsLength * sizeof(*pszSuggestions));
-       iSuggestionsLength--;
-
-       /* Are we a root key in HKEY_CLASSES_ROOT? */
-       if ((hRootKey == HKEY_CLASSES_ROOT) && pszKeyPath[0] && !_tcschr(pszKeyPath, TEXT('\\')))
-       {
-               do
-               {
-                       bFound = FALSE;
-
-                       /* Check default key */
-                       if (QueryStringValue(hRootKey, pszKeyPath, NULL,
-                               szBuffer, COUNT_OF(szBuffer)) == ERROR_SUCCESS)
-                       {
-                               /* Sanity check this key; it cannot be empty, nor can it be a
-                                * loop back */
-                               if ((szBuffer[0] != '\0') && _tcsicmp(szBuffer, pszKeyPath))
-                               {
-                                       if (RegOpenKey(hRootKey, szBuffer, &hOtherKey) == ERROR_SUCCESS)
-                                       {
-                                               lstrcpyn(pszSuggestions, TEXT("HKCR\\"), (int) iSuggestionsLength);
-                                               i = _tcslen(pszSuggestions);
-                                               pszSuggestions += i;
-                                       iSuggestionsLength -= i;
-
-                                               lstrcpyn(pszSuggestions, szBuffer, (int) iSuggestionsLength);
-                                               i = MIN(_tcslen(pszSuggestions) + 1, iSuggestionsLength);
-                                               pszSuggestions += i;
-                                               iSuggestionsLength -= i;
-                                               RegCloseKey(hOtherKey);
-
-                                               bFound = TRUE;
-                                               _tcscpy(szLastFound, szBuffer);
-                                               pszKeyPath = szLastFound;
-                                       }
-                               }
-                       }
-               }
-               while(bFound && (iSuggestionsLength > 0));
-
-               /* Check CLSID key */
-               if (RegOpenKey(hRootKey, pszKeyPath, &hSubKey) == ERROR_SUCCESS)
-               {
-                       if (QueryStringValue(hSubKey, TEXT("CLSID"), NULL, szBuffer, 
-                                            COUNT_OF(szBuffer)) == ERROR_SUCCESS)
-                       {
-                               lstrcpyn(pszSuggestions, TEXT("HKCR\\CLSID\\"), (int) iSuggestionsLength);
-                               i = _tcslen(pszSuggestions);
-                               pszSuggestions += i;
-                               iSuggestionsLength -= i;
-
-                               lstrcpyn(pszSuggestions, szBuffer, (int) iSuggestionsLength);
-                               i = MIN(_tcslen(pszSuggestions) + 1, iSuggestionsLength);
-                               pszSuggestions += i;
-                               iSuggestionsLength -= i;
-                       }
-                       RegCloseKey(hSubKey);
-               }
-       }
+    TCHAR szBuffer[256];
+    TCHAR szLastFound[256];
+    size_t i;
+    HKEY hOtherKey, hSubKey;
+    BOOL bFound;
+
+    memset(pszSuggestions, 0, iSuggestionsLength * sizeof(*pszSuggestions));
+    iSuggestionsLength--;
+
+    /* Are we a root key in HKEY_CLASSES_ROOT? */
+    if ((hRootKey == HKEY_CLASSES_ROOT) && pszKeyPath[0] && !_tcschr(pszKeyPath, TEXT('\\')))
+    {
+        do
+        {
+            bFound = FALSE;
+
+            /* Check default key */
+            if (QueryStringValue(hRootKey, pszKeyPath, NULL,
+                                 szBuffer, COUNT_OF(szBuffer)) == ERROR_SUCCESS)
+            {
+                /* Sanity check this key; it cannot be empty, nor can it be a
+                 * loop back */
+                if ((szBuffer[0] != '\0') && _tcsicmp(szBuffer, pszKeyPath))
+                {
+                    if (RegOpenKey(hRootKey, szBuffer, &hOtherKey) == ERROR_SUCCESS)
+                    {
+                        lstrcpyn(pszSuggestions, TEXT("HKCR\\"), (int) iSuggestionsLength);
+                        i = _tcslen(pszSuggestions);
+                        pszSuggestions += i;
+                        iSuggestionsLength -= i;
+
+                        lstrcpyn(pszSuggestions, szBuffer, (int) iSuggestionsLength);
+                        i = MIN(_tcslen(pszSuggestions) + 1, iSuggestionsLength);
+                        pszSuggestions += i;
+                        iSuggestionsLength -= i;
+                        RegCloseKey(hOtherKey);
+
+                        bFound = TRUE;
+                        _tcscpy(szLastFound, szBuffer);
+                        pszKeyPath = szLastFound;
+                    }
+                }
+            }
+        }
+        while(bFound && (iSuggestionsLength > 0));
+
+        /* Check CLSID key */
+        if (RegOpenKey(hRootKey, pszKeyPath, &hSubKey) == ERROR_SUCCESS)
+        {
+            if (QueryStringValue(hSubKey, TEXT("CLSID"), NULL, szBuffer,
+                                 COUNT_OF(szBuffer)) == ERROR_SUCCESS)
+            {
+                lstrcpyn(pszSuggestions, TEXT("HKCR\\CLSID\\"), (int) iSuggestionsLength);
+                i = _tcslen(pszSuggestions);
+                pszSuggestions += i;
+                iSuggestionsLength -= i;
+
+                lstrcpyn(pszSuggestions, szBuffer, (int) iSuggestionsLength);
+                i = MIN(_tcslen(pszSuggestions) + 1, iSuggestionsLength);
+                pszSuggestions += i;
+                iSuggestionsLength -= i;
+            }
+            RegCloseKey(hSubKey);
+        }
+    }
 }
 
 
 LRESULT CALLBACK AddressBarProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     WNDPROC oldwndproc;
-       static TCHAR s_szNode[256];
+    static TCHAR s_szNode[256];
     oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWL_USERDATA);
 
-       switch (uMsg)
+    switch (uMsg)
     {
-               case WM_KEYUP:
-                       if (wParam == VK_RETURN)
-                       {
-                               GetWindowText(hwnd, s_szNode, sizeof(s_szNode) / sizeof(s_szNode[0]));
-                               SelectNode(g_pChildWnd->hTreeWnd, s_szNode);
-                       }
-                       break;
-               default:
-                       break;
-       }
-       return CallWindowProc(oldwndproc, hwnd, uMsg, wParam, lParam);
+    case WM_KEYUP:
+        if (wParam == VK_RETURN)
+        {
+            GetWindowText(hwnd, s_szNode, sizeof(s_szNode) / sizeof(s_szNode[0]));
+            SelectNode(g_pChildWnd->hTreeWnd, s_szNode);
+        }
+        break;
+    default:
+        break;
+    }
+    return CallWindowProc(oldwndproc, hwnd, uMsg, wParam, lParam);
 }
 
 /*******************************************************************************
@@ -313,48 +316,60 @@ LRESULT CALLBACK AddressBarProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar
 LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     BOOL Result;
-    ChildWnd* pChildWnd = g_pChildWnd;
 
-    switch (message) {
+    switch (message)
+    {
     case WM_CREATE:
     {
-               WNDPROC oldproc;
+        WNDPROC oldproc;
         HFONT hFont;
         TCHAR buffer[MAX_PATH];
         /* load "My Computer" string */
         LoadString(hInst, IDS_MY_COMPUTER, buffer, sizeof(buffer)/sizeof(TCHAR));
 
-           g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd));
-
-        if (!pChildWnd) return 0;
-        _tcsncpy(pChildWnd->szPath, buffer, MAX_PATH);
-        pChildWnd->nSplitPos = 250;
-        pChildWnd->hWnd = hWnd;
-               pChildWnd->hAddressBarWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Edit"), NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP,
-                                                                               CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
-                                                                               hWnd, (HMENU)0, hInst, 0);
-               pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW);
-        pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, pChildWnd->szPath*/);
-        SetFocus(pChildWnd->hTreeWnd);
-
-        /* set the address bar font */
-        if (pChildWnd->hAddressBarWnd)
+        g_pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd));
+        if (!g_pChildWnd) return 0;
+
+        _tcsncpy(g_pChildWnd->szPath, buffer, MAX_PATH);
+        g_pChildWnd->nSplitPos = 250;
+        g_pChildWnd->hWnd = hWnd;
+        g_pChildWnd->hAddressBarWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Edit"), NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP,
+                                    CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+                                    hWnd, (HMENU)0, hInst, 0);
+        g_pChildWnd->hAddressBtnWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Button"), _T("ยป"), WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_DEFPUSHBUTTON,
+                                    CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+                                    hWnd, (HMENU)0, hInst, 0);
+        g_pChildWnd->hTreeWnd = CreateTreeView(hWnd, g_pChildWnd->szPath, (HMENU) TREE_WINDOW);
+        g_pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, g_pChildWnd->szPath*/);
+        SetFocus(g_pChildWnd->hTreeWnd);
+
+        /* set the address bar and button font */
+        if ((g_pChildWnd->hAddressBarWnd) && (g_pChildWnd->hAddressBtnWnd))
         {
             hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
-            SendMessage(pChildWnd->hAddressBarWnd,
+            SendMessage(g_pChildWnd->hAddressBarWnd,
+                        WM_SETFONT,
+                        (WPARAM)hFont,
+                        0);
+            SendMessage(g_pChildWnd->hAddressBtnWnd,
                         WM_SETFONT,
                         (WPARAM)hFont,
                         0);
         }
-
-               /* Subclass the AddressBar */
-               oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_WNDPROC);
-        SetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_USERDATA, (DWORD_PTR)oldproc);
-        SetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_WNDPROC, (DWORD_PTR)AddressBarProc);
-               break;
+        /* Subclass the AddressBar */
+        oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWL_WNDPROC);
+        SetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWL_USERDATA, (DWORD_PTR)oldproc);
+        SetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWL_WNDPROC, (DWORD_PTR)AddressBarProc);
+        break;
     }
     case WM_COMMAND:
-        if (!_CmdWndProc(hWnd, message, wParam, lParam)) {
+        if(HIWORD(wParam) == BN_CLICKED)
+        {
+            PostMessage(g_pChildWnd->hAddressBarWnd, WM_KEYUP, VK_RETURN, 0);
+        }
+
+        if (!_CmdWndProc(hWnd, message, wParam, lParam))
+        {
             goto def;
         }
         break;
@@ -362,39 +377,44 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
         OnPaint(hWnd);
         return 0;
     case WM_SETCURSOR:
-        if (LOWORD(lParam) == HTCLIENT) {
+        if (LOWORD(lParam) == HTCLIENT)
+        {
             POINT pt;
             GetCursorPos(&pt);
             ScreenToClient(hWnd, &pt);
-            if (pt.x>=pChildWnd->nSplitPos-SPLIT_WIDTH/2 && pt.x<pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) {
+            if (pt.x>=g_pChildWnd->nSplitPos-SPLIT_WIDTH/2 && pt.x<g_pChildWnd->nSplitPos+SPLIT_WIDTH/2+1)
+            {
                 SetCursor(LoadCursor(0, IDC_SIZEWE));
                 return TRUE;
             }
         }
         goto def;
     case WM_DESTROY:
-               DestroyTreeView();
-               DestroyListView(pChildWnd->hListWnd);
-               DestroyMainMenu();
-        HeapFree(GetProcessHeap(), 0, pChildWnd);
-        pChildWnd = NULL;
+        DestroyTreeView();
+        DestroyListView(g_pChildWnd->hListWnd);
+        DestroyMainMenu();
+        HeapFree(GetProcessHeap(), 0, g_pChildWnd);
+        g_pChildWnd = NULL;
         PostQuitMessage(0);
         break;
-    case WM_LBUTTONDOWN: {
-            RECT rt;
-            int x = (short)LOWORD(lParam);
-            GetClientRect(hWnd, &rt);
-            if (x>=pChildWnd->nSplitPos-SPLIT_WIDTH/2 && x<pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) {
-                last_split = pChildWnd->nSplitPos;
-                draw_splitbar(hWnd, last_split);
-                SetCapture(hWnd);
-            }
-            break;
+    case WM_LBUTTONDOWN:
+    {
+        RECT rt;
+        int x = (short)LOWORD(lParam);
+        GetClientRect(hWnd, &rt);
+        if (x>=g_pChildWnd->nSplitPos-SPLIT_WIDTH/2 && x<g_pChildWnd->nSplitPos+SPLIT_WIDTH/2+1)
+        {
+            last_split = g_pChildWnd->nSplitPos;
+            draw_splitbar(hWnd, last_split);
+            SetCapture(hWnd);
         }
+        break;
+    }
 
     case WM_LBUTTONUP:
     case WM_RBUTTONDOWN:
-        if (GetCapture() == hWnd) {
+        if (GetCapture() == hWnd)
+        {
             finish_splitbar(hWnd, LOWORD(lParam));
         }
         break;
@@ -406,11 +426,12 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 
     case WM_KEYDOWN:
         if (wParam == VK_ESCAPE)
-            if (GetCapture() == hWnd) {
+            if (GetCapture() == hWnd)
+            {
                 RECT rt;
                 draw_splitbar(hWnd, last_split);
                 GetClientRect(hWnd, &rt);
-                ResizeWnd(pChildWnd, rt.right, rt.bottom);
+                ResizeWnd(rt.right, rt.bottom);
                 last_split = -1;
                 ReleaseCapture();
                 SetCursor(LoadCursor(0, IDC_ARROW));
@@ -418,43 +439,45 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
         break;
 
     case WM_MOUSEMOVE:
-        if (GetCapture() == hWnd) {
+        if (GetCapture() == hWnd)
+        {
             HDC hdc;
             RECT rt;
             HGDIOBJ OldObj;
             int x = LOWORD(lParam);
             if(!SizingPattern)
             {
-              const DWORD Pattern[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA};
-              SizingPattern = CreateBitmap(8, 8, 1, 1, Pattern);
+                const DWORD Pattern[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA};
+                SizingPattern = CreateBitmap(8, 8, 1, 1, Pattern);
             }
             if(!SizingBrush)
             {
-              SizingBrush = CreatePatternBrush(SizingPattern);
+                SizingBrush = CreatePatternBrush(SizingPattern);
             }
 
             GetClientRect(hWnd, &rt);
             x = (SHORT) min(max(x, SPLIT_MIN), rt.right - SPLIT_MIN);
             if(last_split != x)
             {
-              rt.left = last_split-SPLIT_WIDTH/2;
-              rt.right = last_split+SPLIT_WIDTH/2+1;
-              hdc = GetDC(hWnd);
-              OldObj = SelectObject(hdc, SizingBrush);
-              PatBlt(hdc, rt.left, rt.top, rt.right - rt.left, rt.bottom - rt.top, PATINVERT);
-              last_split = x;
-              rt.left = x-SPLIT_WIDTH/2;
-              rt.right = x+SPLIT_WIDTH/2+1;
-              PatBlt(hdc, rt.left, rt.top, rt.right - rt.left, rt.bottom - rt.top, PATINVERT);
-              SelectObject(hdc, OldObj);
-              ReleaseDC(hWnd, hdc);
+                rt.left = last_split-SPLIT_WIDTH/2;
+                rt.right = last_split+SPLIT_WIDTH/2+1;
+                hdc = GetDC(hWnd);
+                OldObj = SelectObject(hdc, SizingBrush);
+                PatBlt(hdc, rt.left, rt.top, rt.right - rt.left, rt.bottom - rt.top, PATINVERT);
+                last_split = x;
+                rt.left = x-SPLIT_WIDTH/2;
+                rt.right = x+SPLIT_WIDTH/2+1;
+                PatBlt(hdc, rt.left, rt.top, rt.right - rt.left, rt.bottom - rt.top, PATINVERT);
+                SelectObject(hdc, OldObj);
+                ReleaseDC(hWnd, hdc);
             }
         }
         break;
 
     case WM_SETFOCUS:
-        if (pChildWnd != NULL) {
-            SetFocus(pChildWnd->nFocusPanel? pChildWnd->hListWnd: pChildWnd->hTreeWnd);
+        if (g_pChildWnd != NULL)
+        {
+            SetFocus(g_pChildWnd->nFocusPanel? g_pChildWnd->hListWnd: g_pChildWnd->hTreeWnd);
         }
         break;
 
@@ -462,265 +485,292 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
         break;
 
     case WM_NOTIFY:
-        if ((int)wParam == TREE_WINDOW) {
-            switch (((LPNMHDR)lParam)->code) {
+        if ((int)wParam == TREE_WINDOW && g_pChildWnd != NULL)
+        {
+            switch (((LPNMHDR)lParam)->code)
+            {
             case TVN_ITEMEXPANDING:
-                return !OnTreeExpanding(pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam);
-            case TVN_SELCHANGED: {
-                    LPCTSTR keyPath, rootName;
-                   LPTSTR fullPath;
-                    HKEY hRootKey;
-
-                   keyPath = GetItemPath(pChildWnd->hTreeWnd, ((NMTREEVIEW*)lParam)->itemNew.hItem, &hRootKey);
-                   if (keyPath) {
-                       RefreshListView(pChildWnd->hListWnd, hRootKey, keyPath);
-                       rootName = get_root_key_name(hRootKey);
-                       fullPath = HeapAlloc(GetProcessHeap(), 0, (_tcslen(rootName) + 1 + _tcslen(keyPath) + 1) * sizeof(TCHAR));
-                       if (fullPath) {
-                           _stprintf(fullPath, _T("%s\\%s"), rootName, keyPath);
-                           SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)fullPath);
-                               SendMessage(pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath);
-                           HeapFree(GetProcessHeap(), 0, fullPath);
-
-                           {
-                               HKEY hKey;
-                               TCHAR szBuffer[MAX_PATH];
-                               _sntprintf(szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), _T("My Computer\\%s\\%s"), rootName, keyPath);
-
-                               if (RegCreateKey(HKEY_CURRENT_USER,
-                                       g_szGeneralRegKey,
-                                   &hKey) == ERROR_SUCCESS)
-                               {
-                                   RegSetValueEx(hKey, _T("LastKey"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) _tcslen(szBuffer) * sizeof(szBuffer[0]));
-                                   RegCloseKey(hKey);
-                               }
-                           }
-                       }
-                   }
+                return !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam);
+            case TVN_SELCHANGED:
+            {
+                LPCTSTR keyPath, rootName;
+                LPTSTR fullPath;
+                HKEY hRootKey;
+
+                keyPath = GetItemPath(g_pChildWnd->hTreeWnd, ((NMTREEVIEW*)lParam)->itemNew.hItem, &hRootKey);
+                if (keyPath)
+                {
+                    RefreshListView(g_pChildWnd->hListWnd, hRootKey, keyPath);
+                    rootName = get_root_key_name(hRootKey);
+                    fullPath = HeapAlloc(GetProcessHeap(), 0, (_tcslen(rootName) + 1 + _tcslen(keyPath) + 1) * sizeof(TCHAR));
+                    if (fullPath)
+                    {
+                        /* set (correct) the address bar text */
+                        if(keyPath[0] != '\0')
+                            _stprintf(fullPath, _T("%s\\%s"), rootName, keyPath);
+                        else
+                            fullPath = _tcscpy(fullPath, rootName);
+                        SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)fullPath);
+                        SendMessage(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath);
+                        HeapFree(GetProcessHeap(), 0, fullPath);
+                        /* disable hive manipulation items temporarily (enable only if necessary) */
+                        EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_GRAYED);
+                        EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_GRAYED);
+                        /* compare the strings to see if we should enable/disable the "Load Hive" menus accordingly */
+                        if (!(_tcsicmp(rootName, TEXT("HKEY_LOCAL_MACHINE")) &&
+                                _tcsicmp(rootName, TEXT("HKEY_USERS"))))
+                        {
+                            // enable the unload menu item if at the root
+                            // otherwise enable the load menu item if there is no slash in keyPath (ie. immediate child selected)
+                            if(keyPath[0] == '\0')
+                                EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_ENABLED);
+                            else if(!_tcschr(keyPath, _T('\\')))
+                                EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_ENABLED);
+                        }
+
+                        {
+                            HKEY hKey;
+                            TCHAR szBuffer[MAX_PATH];
+                            _sntprintf(szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), _T("My Computer\\%s\\%s"), rootName, keyPath);
+
+                            if (RegCreateKey(HKEY_CURRENT_USER,
+                                             g_szGeneralRegKey,
+                                             &hKey) == ERROR_SUCCESS)
+                            {
+                                RegSetValueEx(hKey, _T("LastKey"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) _tcslen(szBuffer) * sizeof(szBuffer[0]));
+                                RegCloseKey(hKey);
+                            }
+                        }
+                    }
                 }
+            }
+            break;
+            case NM_SETFOCUS:
+                g_pChildWnd->nFocusPanel = 0;
                 break;
-           case NM_SETFOCUS:
-               pChildWnd->nFocusPanel = 0;
-               break;
             case TVN_BEGINLABELEDIT:
             {
-                               LPNMTVDISPINFO ptvdi;
-                               /* cancel label edit for rootkeys  */
-                               ptvdi = (LPNMTVDISPINFO) lParam;
-                if (!TreeView_GetParent(pChildWnd->hTreeWnd, ptvdi->item.hItem) ||
-                                       !TreeView_GetParent(pChildWnd->hTreeWnd, TreeView_GetParent(pChildWnd->hTreeWnd, ptvdi->item.hItem)))
-                  return TRUE;
-                               break;
-                       }
+                LPNMTVDISPINFO ptvdi;
+                /* cancel label edit for rootkeys  */
+                ptvdi = (LPNMTVDISPINFO) lParam;
+                if (!TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem) ||
+                        !TreeView_GetParent(g_pChildWnd->hTreeWnd, TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem)))
+                    return TRUE;
+                break;
+            }
             case TVN_ENDLABELEDIT:
+            {
+                LPCTSTR keyPath;
+                HKEY hRootKey;
+                HKEY hKey = NULL;
+                LPNMTVDISPINFO ptvdi;
+                LONG lResult = TRUE;
+                TCHAR szBuffer[MAX_PATH];
+
+                ptvdi = (LPNMTVDISPINFO) lParam;
+                if (ptvdi->item.pszText)
                 {
-                  LPCTSTR keyPath;
-                  HKEY hRootKey;
-                  HKEY hKey = NULL;
-                  LPNMTVDISPINFO ptvdi;
-                  LONG lResult = TRUE;
-                  TCHAR szBuffer[MAX_PATH];
-
-                  ptvdi = (LPNMTVDISPINFO) lParam;
-                  if (ptvdi->item.pszText)
-                  {
-                    keyPath = GetItemPath(pChildWnd->hTreeWnd, TreeView_GetParent(pChildWnd->hTreeWnd, ptvdi->item.hItem), &hRootKey);
+                    keyPath = GetItemPath(g_pChildWnd->hTreeWnd, TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem), &hRootKey);
                     _sntprintf(szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), _T("%s\\%s"), keyPath, ptvdi->item.pszText);
-                    keyPath = GetItemPath(pChildWnd->hTreeWnd, ptvdi->item.hItem, &hRootKey);
+                    keyPath = GetItemPath(g_pChildWnd->hTreeWnd, ptvdi->item.hItem, &hRootKey);
                     if (RegOpenKeyEx(hRootKey, szBuffer, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
                     {
-                      lResult = FALSE;
-                      RegCloseKey(hKey);
-                      (void)TreeView_EditLabel(pChildWnd->hTreeWnd, ptvdi->item.hItem);
+                        lResult = FALSE;
+                        RegCloseKey(hKey);
+                        (void)TreeView_EditLabel(g_pChildWnd->hTreeWnd, ptvdi->item.hItem);
                     }
                     else
                     {
-                      if (RenameKey(hRootKey, keyPath, ptvdi->item.pszText) != ERROR_SUCCESS)
-                        lResult = FALSE;
+                        if (RenameKey(hRootKey, keyPath, ptvdi->item.pszText) != ERROR_SUCCESS)
+                            lResult = FALSE;
                     }
                     return lResult;
-                  }
                 }
+            }
             default:
                 return 0;
             }
-        } else
+        }
+        else
         {
-            if ((int)wParam == LIST_WINDOW)
+            if ((int)wParam == LIST_WINDOW && g_pChildWnd != NULL)
             {
-               switch (((LPNMHDR)lParam)->code) {
-                 case NM_SETFOCUS:
-                       pChildWnd->nFocusPanel = 1;
-                       break;
-                 default:
-                       if(!ListWndNotifyProc(pChildWnd->hListWnd, wParam, lParam, &Result))
-                       {
-                               goto def;
-                       }
-                       return Result;
-                       break;
-               }
+                switch (((LPNMHDR)lParam)->code)
+                {
+                case NM_SETFOCUS:
+                    g_pChildWnd->nFocusPanel = 1;
+                    break;
+                default:
+                    if(!ListWndNotifyProc(g_pChildWnd->hListWnd, wParam, lParam, &Result))
+                    {
+                        goto def;
+                    }
+                    return Result;
+                    break;
+                }
             }
         }
         break;
 
     case WM_CONTEXTMENU:
     {
-      POINT pt;
-      if((HWND)wParam == pChildWnd->hListWnd)
-      {
-        int i, cnt;
-        BOOL IsDefault;
-        pt.x = (short) LOWORD(lParam);
-        pt.y = (short) HIWORD(lParam);
-        cnt = ListView_GetSelectedCount(pChildWnd->hListWnd);
-        i = ListView_GetNextItem(pChildWnd->hListWnd, -1, LVNI_FOCUSED | LVNI_SELECTED);
-        if (pt.x == -1 && pt.y == -1)
+        POINT pt;
+        if((HWND)wParam == g_pChildWnd->hListWnd)
         {
-            RECT rc;
-            if (i != -1)
+            int i, cnt;
+            BOOL IsDefault;
+            pt.x = (short) LOWORD(lParam);
+            pt.y = (short) HIWORD(lParam);
+            cnt = ListView_GetSelectedCount(g_pChildWnd->hListWnd);
+            i = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_FOCUSED | LVNI_SELECTED);
+            if (pt.x == -1 && pt.y == -1)
+            {
+                RECT rc;
+                if (i != -1)
+                {
+                    rc.left = LVIR_BOUNDS;
+                    SendMessage(g_pChildWnd->hListWnd, LVM_GETITEMRECT, i, (LPARAM) &rc);
+                    pt.x = rc.left + 8;
+                    pt.y = rc.top + 8;
+                }
+                else
+                    pt.x = pt.y = 0;
+                ClientToScreen(g_pChildWnd->hListWnd, &pt);
+            }
+            if(i == -1)
             {
-                rc.left = LVIR_BOUNDS;
-                SendMessage(pChildWnd->hListWnd, LVM_GETITEMRECT, i, (LPARAM) &rc);
-                pt.x = rc.left + 8;
-                pt.y = rc.top + 8;
+                TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL);
             }
             else
-                pt.x = pt.y = 0;
-            ClientToScreen(pChildWnd->hListWnd, &pt);
-        }
-        if(i == -1)
-        {
-          TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL);
-        }
-        else
-        {
-          HMENU mnu = GetSubMenu(hPopupMenus, PM_MODIFYVALUE);
-          SetMenuDefaultItem(mnu, ID_EDIT_MODIFY, MF_BYCOMMAND);
-          IsDefault = IsDefaultValue(pChildWnd->hListWnd, i);
-          if(cnt == 1)
-            EnableMenuItem(mnu, ID_EDIT_RENAME, MF_BYCOMMAND | (IsDefault ? MF_DISABLED | MF_GRAYED : MF_ENABLED));
-          else
-            EnableMenuItem(mnu, ID_EDIT_RENAME, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
-          EnableMenuItem(mnu, ID_EDIT_MODIFY, MF_BYCOMMAND | (cnt == 1 ? MF_ENABLED : MF_DISABLED | MF_GRAYED));
-          EnableMenuItem(mnu, ID_EDIT_MODIFY_BIN, MF_BYCOMMAND | (cnt == 1 ? MF_ENABLED : MF_DISABLED | MF_GRAYED));
-
-          TrackPopupMenu(mnu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL);
+            {
+                HMENU mnu = GetSubMenu(hPopupMenus, PM_MODIFYVALUE);
+                SetMenuDefaultItem(mnu, ID_EDIT_MODIFY, MF_BYCOMMAND);
+                IsDefault = IsDefaultValue(g_pChildWnd->hListWnd, i);
+                if(cnt == 1)
+                    EnableMenuItem(mnu, ID_EDIT_RENAME, MF_BYCOMMAND | (IsDefault ? MF_DISABLED | MF_GRAYED : MF_ENABLED));
+                else
+                    EnableMenuItem(mnu, ID_EDIT_RENAME, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
+                EnableMenuItem(mnu, ID_EDIT_MODIFY, MF_BYCOMMAND | (cnt == 1 ? MF_ENABLED : MF_DISABLED | MF_GRAYED));
+                EnableMenuItem(mnu, ID_EDIT_MODIFY_BIN, MF_BYCOMMAND | (cnt == 1 ? MF_ENABLED : MF_DISABLED | MF_GRAYED));
+
+                TrackPopupMenu(mnu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL);
+            }
         }
-      }
-      else if ((HWND)wParam == pChildWnd->hTreeWnd)
-      {
-        TVHITTESTINFO hti;
-        HMENU hContextMenu;
-        TVITEM item;
-        MENUITEMINFO mii;
-        TCHAR resource[256];
-        TCHAR buffer[256];
-        LPTSTR s;
-        LPCTSTR keyPath;
-        HKEY hRootKey;
-        int iLastPos;
-        WORD wID;
-
-        pt.x = (short) LOWORD(lParam);
-        pt.y = (short) HIWORD(lParam);
-
-        if (pt.x == -1 && pt.y == -1)
+        else if ((HWND)wParam == g_pChildWnd->hTreeWnd)
         {
-            RECT rc;
-            hti.hItem = TreeView_GetSelection(pChildWnd->hTreeWnd);
-            if (hti.hItem != NULL)
+            TVHITTESTINFO hti;
+            HMENU hContextMenu;
+            TVITEM item;
+            MENUITEMINFO mii;
+            TCHAR resource[256];
+            TCHAR buffer[256];
+            LPTSTR s;
+            LPCTSTR keyPath;
+            HKEY hRootKey;
+            int iLastPos;
+            WORD wID;
+
+            pt.x = (short) LOWORD(lParam);
+            pt.y = (short) HIWORD(lParam);
+
+            if (pt.x == -1 && pt.y == -1)
             {
-                TreeView_GetItemRect(pChildWnd->hTreeWnd, hti.hItem, &rc, TRUE);
-                pt.x = rc.left + 8;
-                pt.y = rc.top + 8;
-                ClientToScreen(pChildWnd->hTreeWnd, &pt);
-                hti.flags = TVHT_ONITEM;
+                RECT rc;
+                hti.hItem = TreeView_GetSelection(g_pChildWnd->hTreeWnd);
+                if (hti.hItem != NULL)
+                {
+                    TreeView_GetItemRect(g_pChildWnd->hTreeWnd, hti.hItem, &rc, TRUE);
+                    pt.x = rc.left + 8;
+                    pt.y = rc.top + 8;
+                    ClientToScreen(g_pChildWnd->hTreeWnd, &pt);
+                    hti.flags = TVHT_ONITEM;
+                }
+                else
+                    hti.flags = 0;
             }
             else
-                hti.flags = 0;
-        }
-        else
-        {
-            hti.pt.x = pt.x;
-            hti.pt.y = pt.y;
-            ScreenToClient(pChildWnd->hTreeWnd, &hti.pt);
-            (void)TreeView_HitTest(pChildWnd->hTreeWnd, &hti);
-        }
+            {
+                hti.pt.x = pt.x;
+                hti.pt.y = pt.y;
+                ScreenToClient(g_pChildWnd->hTreeWnd, &hti.pt);
+                (void)TreeView_HitTest(g_pChildWnd->hTreeWnd, &hti);
+            }
 
-        if (hti.flags & TVHT_ONITEM)
-        {
-          hContextMenu = GetSubMenu(hPopupMenus, PM_TREECONTEXT);
-          (void)TreeView_SelectItem(pChildWnd->hTreeWnd, hti.hItem);
-
-          memset(&item, 0, sizeof(item));
-          item.mask = TVIF_STATE | TVIF_CHILDREN;
-          item.hItem = hti.hItem;
-          (void)TreeView_GetItem(pChildWnd->hTreeWnd, &item);
-
-          /* Set the Expand/Collapse menu item appropriately */
-          LoadString(hInst, (item.state & TVIS_EXPANDED) ? IDS_COLLAPSE : IDS_EXPAND, buffer, sizeof(buffer) / sizeof(buffer[0]));
-          memset(&mii, 0, sizeof(mii));
-          mii.cbSize = sizeof(mii);
-          mii.fMask = MIIM_STRING | MIIM_STATE | MIIM_ID;
-          mii.fState = (item.cChildren > 0) ? MFS_DEFAULT : MFS_GRAYED;
-          mii.wID = (item.state & TVIS_EXPANDED) ? ID_TREE_COLLAPSEBRANCH : ID_TREE_EXPANDBRANCH;
-          mii.dwTypeData = (LPTSTR) buffer;
-          SetMenuItemInfo(hContextMenu, 0, TRUE, &mii);
-
-          /* Remove any existing suggestions */
-          memset(&mii, 0, sizeof(mii));
-          mii.cbSize = sizeof(mii);
-          mii.fMask = MIIM_ID;
-          GetMenuItemInfo(hContextMenu, GetMenuItemCount(hContextMenu) - 1, TRUE, &mii);
-          if ((mii.wID >= ID_TREE_SUGGESTION_MIN) && (mii.wID <= ID_TREE_SUGGESTION_MAX))
-                 {
-            do
-                       {
-              iLastPos = GetMenuItemCount(hContextMenu) - 1;
-              GetMenuItemInfo(hContextMenu, iLastPos, TRUE, &mii);
-              RemoveMenu(hContextMenu, iLastPos, MF_BYPOSITION);
-                       }
-                       while((mii.wID >= ID_TREE_SUGGESTION_MIN) && (mii.wID <= ID_TREE_SUGGESTION_MAX));
-                 }
-
-          /* Come up with suggestions */
-          keyPath = GetItemPath(pChildWnd->hTreeWnd, NULL, &hRootKey);
-          SuggestKeys(hRootKey, keyPath, Suggestions, sizeof(Suggestions) / sizeof(Suggestions[0]));
-          if (Suggestions[0])
-                 {
-            AppendMenu(hContextMenu, MF_SEPARATOR, 0, NULL);
-
-            LoadString(hInst, IDS_GOTO_SUGGESTED_KEY, resource, sizeof(resource) / sizeof(resource[0]));
+            if (hti.flags & TVHT_ONITEM)
+            {
+                hContextMenu = GetSubMenu(hPopupMenus, PM_TREECONTEXT);
+                (void)TreeView_SelectItem(g_pChildWnd->hTreeWnd, hti.hItem);
+
+                memset(&item, 0, sizeof(item));
+                item.mask = TVIF_STATE | TVIF_CHILDREN;
+                item.hItem = hti.hItem;
+                (void)TreeView_GetItem(g_pChildWnd->hTreeWnd, &item);
+
+                /* Set the Expand/Collapse menu item appropriately */
+                LoadString(hInst, (item.state & TVIS_EXPANDED) ? IDS_COLLAPSE : IDS_EXPAND, buffer, sizeof(buffer) / sizeof(buffer[0]));
+                memset(&mii, 0, sizeof(mii));
+                mii.cbSize = sizeof(mii);
+                mii.fMask = MIIM_STRING | MIIM_STATE | MIIM_ID;
+                mii.fState = (item.cChildren > 0) ? MFS_DEFAULT : MFS_GRAYED;
+                mii.wID = (item.state & TVIS_EXPANDED) ? ID_TREE_COLLAPSEBRANCH : ID_TREE_EXPANDBRANCH;
+                mii.dwTypeData = (LPTSTR) buffer;
+                SetMenuItemInfo(hContextMenu, 0, TRUE, &mii);
+
+                /* Remove any existing suggestions */
+                memset(&mii, 0, sizeof(mii));
+                mii.cbSize = sizeof(mii);
+                mii.fMask = MIIM_ID;
+                GetMenuItemInfo(hContextMenu, GetMenuItemCount(hContextMenu) - 1, TRUE, &mii);
+                if ((mii.wID >= ID_TREE_SUGGESTION_MIN) && (mii.wID <= ID_TREE_SUGGESTION_MAX))
+                {
+                    do
+                    {
+                        iLastPos = GetMenuItemCount(hContextMenu) - 1;
+                        GetMenuItemInfo(hContextMenu, iLastPos, TRUE, &mii);
+                        RemoveMenu(hContextMenu, iLastPos, MF_BYPOSITION);
+                    }
+                    while((mii.wID >= ID_TREE_SUGGESTION_MIN) && (mii.wID <= ID_TREE_SUGGESTION_MAX));
+                }
 
-            s = Suggestions;
-            wID = ID_TREE_SUGGESTION_MIN;
-            while(*s && (wID <= ID_TREE_SUGGESTION_MAX))
-                       {
-              _sntprintf(buffer, sizeof(buffer) / sizeof(buffer[0]), resource, s);
-
-              memset(&mii, 0, sizeof(mii));
-              mii.cbSize = sizeof(mii);
-              mii.fMask = MIIM_STRING | MIIM_ID;
-              mii.wID = wID++;
-              mii.dwTypeData = buffer;
-              InsertMenuItem(hContextMenu, GetMenuItemCount(hContextMenu), TRUE, &mii);
-
-              s += _tcslen(s) + 1;
-                       }
-                 }
-          TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, pChildWnd->hWnd, NULL);
+                /* Come up with suggestions */
+                keyPath = GetItemPath(g_pChildWnd->hTreeWnd, NULL, &hRootKey);
+                SuggestKeys(hRootKey, keyPath, Suggestions, sizeof(Suggestions) / sizeof(Suggestions[0]));
+                if (Suggestions[0])
+                {
+                    AppendMenu(hContextMenu, MF_SEPARATOR, 0, NULL);
+
+                    LoadString(hInst, IDS_GOTO_SUGGESTED_KEY, resource, sizeof(resource) / sizeof(resource[0]));
+
+                    s = Suggestions;
+                    wID = ID_TREE_SUGGESTION_MIN;
+                    while(*s && (wID <= ID_TREE_SUGGESTION_MAX))
+                    {
+                        _sntprintf(buffer, sizeof(buffer) / sizeof(buffer[0]), resource, s);
+
+                        memset(&mii, 0, sizeof(mii));
+                        mii.cbSize = sizeof(mii);
+                        mii.fMask = MIIM_STRING | MIIM_ID;
+                        mii.wID = wID++;
+                        mii.dwTypeData = buffer;
+                        InsertMenuItem(hContextMenu, GetMenuItemCount(hContextMenu), TRUE, &mii);
+
+                        s += _tcslen(s) + 1;
+                    }
+                }
+                TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, g_pChildWnd->hWnd, NULL);
+            }
         }
-      }
-      break;
+        break;
     }
 
     case WM_SIZE:
-        if (wParam != SIZE_MINIMIZED && pChildWnd != NULL) {
-            ResizeWnd(pChildWnd, LOWORD(lParam), HIWORD(lParam));
+        if (wParam != SIZE_MINIMIZED && g_pChildWnd != NULL)
+        {
+            ResizeWnd(LOWORD(lParam), HIWORD(lParam));
         }
         /* fall through */
-default: def:
+    default:
+def:
         return DefWindowProc(hWnd, message, wParam, lParam);
     }
     return 0;