[PATCH 0/1] MR10790: hhctrl.ocx: Make Contents/Search/Index children of the tab control.

[Stefan Dösinger (＠stefan)]

Right now they are siblings of the tab control and occupy the same area.
This causes issues when resizing the search tab: The tab control clears
its entire area and the listview only redraws newly created space,
causing part of the listview to disappear. The "Search" button is
affected too.

The contents tab is not affected because the treeview does a full
redraw.

---

I don't know htmlhelp well enough to be sure if this change is correct.
hwndNavigation is exposed through the API and callers may expect to find
a certain set of children in it. There are no tests for hhctrl.ocx.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10790

[PATCH 1/1] hhctrl.ocx: Make Contents/Search/Index children of the tab control.

[Stefan Dösinger]

From: Stefan Dösinger <[e-mail]>

Right now they are siblings of the tab control and occupy the same area.
This causes issues when resizing the search tab: The tab control clears
its entire area and the listview only redraws newly created space,
causing part of the listview to disappear. The "Search" button is
affected too.

The contents tab is not affected because the treeview does a full
redraw.

---

I don't know htmlhelp well enough to be sure if this change is correct.
hwndNavigation is exposed through the API and callers may expect to find
a certain set of children in it. There are no tests for hhctrl.ocx.
---
 dlls/hhctrl.ocx/help.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index f066d972a5b..0c3562c765e 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -587,7 +587,7 @@ static void ResizeTabChild(HHInfo *info, int tab)
     RECT rect, tabrc;
     DWORD cnt;
 
-    GetClientRect(info->WinType.hwndNavigation, &rect);
+    GetClientRect(info->hwndTabCtrl, &rect);
     SendMessageW(info->hwndTabCtrl, TCM_GETITEMRECT, 0, (LPARAM)&tabrc);
     cnt = SendMessageW(info->hwndTabCtrl, TCM_GETROWCOUNT, 0, 0);
 
@@ -1343,7 +1343,7 @@ static BOOL AddContentTab(HHInfo *info)
         return TRUE; /* No "Contents" tab */
     hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, szEmpty, WS_CHILD | WS_BORDER | TVS_LINESATROOT
                            | TVS_SHOWSELALWAYS | TVS_HASBUTTONS, 50, 50, 100, 100,
-                           info->WinType.hwndNavigation, NULL, hhctrl_hinstance, NULL);
+                           info->hwndTabCtrl, NULL, hhctrl_hinstance, NULL);
     if(!hWnd) {
         ERR("Could not create treeview control\n");
         return FALSE;
@@ -1371,7 +1371,7 @@ static BOOL AddIndexTab(HHInfo *info)
         return TRUE; /* No "Index" tab */
     info->tabs[TAB_INDEX].hwnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEWW,
            szEmpty, WS_CHILD | WS_BORDER | LVS_SINGLESEL | LVS_REPORT | LVS_NOCOLUMNHEADER, 50, 50, 100, 100,
-           info->WinType.hwndNavigation, NULL, hhctrl_hinstance, NULL);
+           info->hwndTabCtrl, NULL, hhctrl_hinstance, NULL);
     if(!info->tabs[TAB_INDEX].hwnd) {
         ERR("Could not create ListView control\n");
         return FALSE;
@@ -1401,7 +1401,7 @@ static BOOL AddSearchTab(HHInfo *info)
     if(info->tabs[TAB_SEARCH].id == -1)
         return TRUE; /* No "Search" tab */
     hwndContainer = CreateWindowExW(WS_EX_CONTROLPARENT, L"HH Child", szEmpty,
-                                    WS_CHILD, 0, 0, 0, 0, info->WinType.hwndNavigation,
+                                    WS_CHILD, 0, 0, 0, 0, info->hwndTabCtrl,
                                     NULL, hhctrl_hinstance, NULL);
     if(!hwndContainer) {
         ERR("Could not create search window container control.\n");
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10790