[PATCH 0/3] MR6075: Add chevron visibility test to check the case of restoring band width to ideal value

[Ilia Docin (＠IDocin)]

I prepared fix https://gitlab.winehq.org/wine/wine/-/commit/b45ad56, that I didn't provide test for, but now I find a way to check it.

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

[PATCH 1/3] Revert "comctl32/rebar: Hide chevron if rebar's band is resized back to full size with gripper."

[Ilia Docin]

From: Ilia Docin <ilya.docin(a)contentai.ru>

This reverts commit b45ad560e45bd5a326252fca5f89209d20344a60.
---
 dlls/comctl32/rebar.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 7bb8f33ae06..61fd30c445f 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -799,8 +799,6 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend)
 	              lpBand->rcChild.top, lpBand->rcChild.right + CHEVRON_WIDTH,
 	              lpBand->rcChild.bottom);
 	  }
-	  else
-	      SetRectEmpty(&lpBand->rcChevron);
       }
       else {
           SetRect (&lpBand->rcChild,
-- 
GitLab


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

[PATCH 2/3] comctl32/rebar: Add chevron test.

[Ilia Docin]

From: Ilia Docin <ilya.docin(a)contentai.ru>

---
 dlls/comctl32/tests/rebar.c | 48 +++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c
index 7cafa4ba52b..aeb90ecf7bf 100644
--- a/dlls/comctl32/tests/rebar.c
+++ b/dlls/comctl32/tests/rebar.c
@@ -121,6 +121,7 @@ static HWND build_toolbar(int nr, HWND hParent)
 }
 
 static int g_parent_measureitem;
+static RECT g_chevron_rect;
 
 static LRESULT CALLBACK parent_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
@@ -129,8 +130,17 @@ static LRESULT CALLBACK parent_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARA
         case WM_NOTIFY:
             {
                 NMHDR *lpnm = (NMHDR *)lParam;
-                if (lpnm->code == RBN_HEIGHTCHANGE)
-                    GetClientRect(lpnm->hwndFrom, &height_change_notify_rect);
+                switch (lpnm->code)
+                {
+                    case RBN_HEIGHTCHANGE:
+                        GetClientRect(lpnm->hwndFrom, &height_change_notify_rect);
+                        break;
+                    case RBN_CHEVRONPUSHED:
+                        g_chevron_rect = ((NMREBARCHEVRON*)lParam)->rc;
+                        break;
+                    default:
+                        break;
+                }
             }
             break;
         case WM_MEASUREITEM:
@@ -1178,6 +1188,39 @@ static void init_functions(void)
 #undef X
 }
 
+static void test_chevron(void)
+{
+    HWND hRebar;
+    REBARBANDINFOA rbi;
+
+    hRebar = create_rebar_control(0);
+    rbi.cbSize = REBARBANDINFOA_V6_SIZE;
+    rbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_IDEALSIZE | RBBIM_SIZE | RBBIM_STYLE;
+    rbi.cxIdeal = 128;
+    rbi.cx = rbi.cxIdeal >> 1;
+    rbi.cxMinChild = rbi.cxIdeal >> 2;
+    rbi.cyMinChild = rbi.cxMinChild;
+    rbi.hwndChild = build_toolbar(1, hRebar);
+    rbi.fStyle = RBBS_USECHEVRON | RBBS_NOGRIPPER;
+    SendMessageA(hRebar, RB_INSERTBANDA, 0, (LPARAM)&rbi);
+    SendMessageA(hRebar, RB_INSERTBANDA, 1, (LPARAM)&rbi);
+
+    SetRectEmpty(&g_chevron_rect);
+    SendMessageA(hRebar, RB_PUSHCHEVRON, 0, 0);
+    ok(!IsRectEmpty(&g_chevron_rect), "Unexpected empty chevron rect\n");
+
+    // increase band width to make it more then ideal value to hide chevron
+    rbi.fMask = RBBIM_SIZE;
+    rbi.cx = rbi.cxIdeal << 1;
+    SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rbi);
+
+    SetRectEmpty(&g_chevron_rect);
+    SendMessageA(hRebar, RB_PUSHCHEVRON, 0, 0);
+    ok(IsRectEmpty(&g_chevron_rect), "Unexpected non-empty chevron rect\n");
+
+    DestroyWindow(hRebar);
+}
+
 START_TEST(rebar)
 {
     MSG msg;
@@ -1201,6 +1244,7 @@ START_TEST(rebar)
     test_layout();
     test_resize();
     test_style();
+    test_chevron();
 
 out:
     PostQuitMessage(0);
-- 
GitLab


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

[PATCH 3/3] comctl32/rebar: Hide chevron if rebar's band is resized back to full size with gripper.

[Ilia Docin]

From: Ilia Docin <ilya.docin(a)contentai.ru>

---
 dlls/comctl32/rebar.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 61fd30c445f..7bb8f33ae06 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -799,6 +799,8 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend)
 	              lpBand->rcChild.top, lpBand->rcChild.right + CHEVRON_WIDTH,
 	              lpBand->rcChild.bottom);
 	  }
+	  else
+	      SetRectEmpty(&lpBand->rcChevron);
       }
       else {
           SetRect (&lpBand->rcChild,
-- 
GitLab

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

[PATCH 3/3] comctl32/rebar: Hide chevron if rebar's band is resized back to full size with gripper.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=147073

Your paranoid android.


=== w10pro64_en_AE_u8 (32 bit report) ===

comctl32:
rebar.c:958: Test failed: expected 35 for 38 from line 999
rebar.c:958: Test failed: expected 40 for 43 from line 1005
rebar.c:958: Test failed: expected 40 for 43 from line 1024

[Zhiyi Zhang (＠zhiyi)]

The fix is already in. Don't revert it and then apply it again. You can just add the tests.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6075#note_76087