[PATCH 2/2] comctl32: Clamp rebar height to cyMaxChild when cyIntegral == 0 too

[Feli Rippmann]

From: Feli Rippmann <[e-mail]>

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

diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 27270a9b63c..cb4763cff9b 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -465,7 +465,10 @@ static int round_child_height(const REBAR_BAND *lpBand, int cyHeight)
 {
     int cy = 0;
     if (lpBand->cyIntegral == 0)
-        return cyHeight;
+    {
+        cy = min(cyHeight, lpBand->cyMaxChild);
+        return cy;
+    }
     cy = max(cyHeight - (int)lpBand->cyMinChild, 0);
     cy = lpBand->cyMinChild + (cy/lpBand->cyIntegral) * lpBand->cyIntegral;
     cy = min(cy, lpBand->cyMaxChild);
-- 
GitLab

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