[PATCH v12 4/4] comctl32/edit: Fix incorrect size for format rect when it is smaller than text.

[Jacob Czekalla]

From: Jacob Czekalla

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56873
---
 dlls/comctl32/edit.c       | 34 ++++++++++++++++++++++++++++------
 dlls/comctl32/tests/edit.c |  4 ++--
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c
index 4b950412617..7c27b7dbb6b 100644
--- a/dlls/comctl32/edit.c
+++ b/dlls/comctl32/edit.c
@@ -2222,9 +2222,12 @@ static void EDIT_AdjustFormatRect(EDITSTATE *es)
    /* Windows doesn't care to fix text placement for SL controls */
    	es->format_rect.bottom = es->format_rect.top + es->line_height;

-	/* Always stay within the client area */
-	GetClientRect(es->hwndSelf, &ClientRect);
-	es->format_rect.bottom = min(es->format_rect.bottom, ClientRect.bottom);
+    if (!(es->style & ES_MULTILINE))
+    {
+        /* Always stay within the client area */
+        GetClientRect(es->hwndSelf, &ClientRect);
+        es->format_rect.bottom = min(es->format_rect.bottom, ClientRect.bottom);
+    }

if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL))
    	EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL);
@@ -2232,6 +2235,14 @@ static void EDIT_AdjustFormatRect(EDITSTATE *es)
    EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP);
 }

+static int EDIT_is_valid_format_rect(const EDITSTATE *es, const RECT *rc)
+{
+    if (IsRectEmpty(rc))
+        return 0;
+    if (es->text_width > (rc->right - rc->left) || (es->line_height * es->line_count) > (rc->bottom - rc->top))
+        return 0;
+    return 1;
+}

/*********************************************************************
  *
@@ -2244,12 +2255,23 @@ static void EDIT_AdjustFormatRect(EDITSTATE *es)
 static void EDIT_SetRectNP(EDITSTATE *es, const RECT *rc)
 {
    LONG_PTR ExStyle;
-	INT bw, bh;
+    INT bw, bh, too_large = 0;
+    RECT edit_rect;
    ExStyle = GetWindowLongPtrW(es->hwndSelf, GWL_EXSTYLE);

-	CopyRect(&es->format_rect, rc);
+    if (EDIT_is_valid_format_rect(es, rc))
+    {
+        CopyRect(&es->format_rect, rc);
+        GetClientRect(es->hwndSelf, &edit_rect);
+        if ((rc->bottom - rc->top) > (edit_rect.bottom - edit_rect.top))
+            too_large = 1;
+    }
+    else
+    {
+        GetClientRect(es->hwndSelf, &es->format_rect);
+    }

-	if (ExStyle & WS_EX_CLIENTEDGE) {
+    if (ExStyle & WS_EX_CLIENTEDGE && !too_large) {
    	es->format_rect.left++;
    	es->format_rect.right--;

diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c
index 66c6a9f6192..92091df8fa6 100644
--- a/dlls/comctl32/tests/edit.c
+++ b/dlls/comctl32/tests/edit.c
@@ -3832,9 +3832,9 @@ static void test_format_rect(void)
         SendMessageA(edit, EM_GETRECT, 0, (LPARAM)&rect);

if (tests[i].expected_equal)
-            todo_wine ok(EqualRect(&old_rect, &rect), "Expected format rectangle to be equal to client rectangle.\n");
+            ok(EqualRect(&old_rect, &rect), "Expected format rectangle to be equal to client rectangle.\n");
         else
-            todo_wine ok((rect.right - rect.left) > (old_rect.right - old_rect.left), "Expected format rect to be larger than client rectangle.\n");
+            ok((rect.right - rect.left) > (old_rect.right - old_rect.left), "Expected format rect to be larger than client rectangle.\n");
         DestroyWindow(edit);
     }
 }