user32: DrawText handling of 0 counts with string, empty strings and -1 counts…

user32: DrawText handling of 0 counts with string, empty strings and -1 counts with empty string and NULL strings.

user32: DrawText handling of 0 counts with string, empty strings and -1 counts…
48ad706c · Aric Stewart · Alexandre Julliard · 8b9ebc30 · 48ad706c · 48ad706c
Commit 48ad706c authored Oct 13, 2008 by Aric Stewart Committed by Alexandre Julliard Oct 14, 2008
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 42 additions and 15 deletions

text.c dlls/user32/tests/text.c +0 -0

text.c dlls/user32/text.c +42 -15

No files found.
--- a/dlls/user32/tests/text.c
+++ b/dlls/user32/tests/text.c
--- a/dlls/user32/text.c
+++ b/dlls/user32/text.c
@@ -862,7 +862,25 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
   if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n",
          dtp->iTabLength, dtp->iLeftMargin, dtp->iRightMargin);

-    if (!str || count == 0) return 0;
+    if (!str) return 0;
+
+    strPtr = str;
+
+    if (flags & DT_SINGLELINE)
+        flags &= ~DT_WORDBREAK;
+
+    GetTextMetricsW(hdc, &tm);
+    if (flags & DT_EXTERNALLEADING)
+	lh = tm.tmHeight + tm.tmExternalLeading;
+    else
+	lh = tm.tmHeight;
+
+    if (str[0] && count == 0)
+        return lh;
+
+    if (dtp && dtp->cbSize != sizeof(DRAWTEXTPARAMS))
+        return 0;
+
    if (count == -1)
    {
        count = strlenW(str);
@@ -871,21 +889,14 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count,
            if( flags & DT_CALCRECT)
            {
                rect->right = rect->left;
-                rect->bottom = rect->top;
+                if( flags & DT_SINGLELINE)
+                    rect->bottom = rect->top + lh;
+                else
+                    rect->bottom = rect->top;
            }
-            return 0;
+            return lh;
        }
    }
-    strPtr = str;
-
-    if (flags & DT_SINGLELINE)
-        flags &= ~DT_WORDBREAK;
-
-    GetTextMetricsW(hdc, &tm);
-    if (flags & DT_EXTERNALLEADING)
-	lh = tm.tmHeight + tm.tmExternalLeading;
-    else
-	lh = tm.tmHeight;

    if (dtp)
    {
@@ -1031,14 +1042,30 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count,
   UINT cp;

   if (!count) return 0;
+   if (!str && count > 0) return 0;
   if( !str || ((count == -1) && !(count = strlen(str))))
   {
+        int lh;
+        TEXTMETRICA tm;
+
+        if (dtp && dtp->cbSize != sizeof(DRAWTEXTPARAMS))
+            return 0;
+
+        GetTextMetricsA(hdc, &tm);
+        if (flags & DT_EXTERNALLEADING)
+            lh = tm.tmHeight + tm.tmExternalLeading;
+        else
+            lh = tm.tmHeight;
+
        if( flags & DT_CALCRECT)
        {
            rect->right = rect->left;
-            rect->bottom = rect->top;
+            if( flags & DT_SINGLELINE)
+                rect->bottom = rect->top + lh;
+            else
+                rect->bottom = rect->top;
        }
-        return 0;
+        return lh;
   }
   cp = GdiGetCodePage( hdc );
   wcount = MultiByteToWideChar( cp, 0, str, count, NULL, 0 );