[PATCH v8 2/4] user32/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/user32/edit.c       | 51 ++++++++++++++++++++++++++++++++++------
 dlls/user32/tests/edit.c |  2 +-
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c
index 39f429813d6..c59783463cf 100644
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -2297,9 +2297,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);
@@ -2307,6 +2310,24 @@ static void EDIT_AdjustFormatRect(EDITSTATE *es)
    EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP);
 }

+static int EDIT_is_valid_format_rect(EDITSTATE *es, const RECT *rc)
+{
+	RECT edit_rect;
+	int text_height = es->line_height * es->line_count;
+
+	GetClientRect(es->hwndSelf, &edit_rect);
+	if (rc->top >= rc->bottom)
+		return 0;
+	if (rc->left >= rc->right)
+		return 0;
+	if (text_height > (rc->bottom - rc->top))
+		return 0;
+	if (es->text_width > (rc->right - rc->left))
+		return 0;
+	if ((rc->bottom - rc->top) > (edit_rect.bottom - edit_rect.top))
+		return -1;
+	return 1;
+}

/*********************************************************************
  *
@@ -2319,12 +2340,28 @@ static void EDIT_AdjustFormatRect(EDITSTATE *es)
 static void EDIT_SetRectNP(EDITSTATE *es, const RECT *rc)
 {
    LONG_PTR ExStyle;
-	INT bw, bh;
+	INT bw, bh, res;
    ExStyle = GetWindowLongPtrW(es->hwndSelf, GWL_EXSTYLE);
+
+	res = EDIT_is_valid_format_rect(es, rc);
+	if (res == 0)
+	{
+		GetClientRect(es->hwndSelf, &es->format_rect);
+	}
+	else if (res == -1)
+	{
+		CopyRect(&es->format_rect, rc);
+		es->format_rect.left += 1;
+		es->format_rect.top += 1;
+		es->format_rect.right -= 1;
+		es->format_rect.bottom += 1;
+	}
+	else
+	{
+		CopyRect(&es->format_rect, rc);
+	}
    
-	CopyRect(&es->format_rect, rc);
-	
-	if (ExStyle & WS_EX_CLIENTEDGE) {
+	if (ExStyle & WS_EX_CLIENTEDGE && res != -1) {
    	es->format_rect.left++;
    	es->format_rect.right--;
    	
diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c
index 99a0073358c..2870150cee1 100644
--- a/dlls/user32/tests/edit.c
+++ b/dlls/user32/tests/edit.c
@@ -3473,7 +3473,7 @@ static void test_format_rect(void)
             size_flag = -1;
         if ((rect.right - rect.left) > (expected_rect.right - expected_rect.left))
             size_flag = 1;
-        todo_wine ok(size_flag == tests[i].expected, "expected %d, but got %d\n", tests[i].expected, size_flag);
+        ok(size_flag == tests[i].expected, "expected %d, but got %d\n", tests[i].expected, size_flag);
         DestroyWindow(edit);
     }
 }