[PATCH 5/5] user32: Always use NtCallbackReturn in User32DrawText.

[Jacek Caban]

From: Jacek Caban

---
 dlls/user32/user_main.c | 12 +++---------
 dlls/win32u/font.c      |  1 -
 dlls/wow64win/user.c    |  6 ------
 include/ntuser.h        |  1 -
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c
index 56d5849f469..ef2b94ba698 100644
--- a/dlls/user32/user_main.c
+++ b/dlls/user32/user_main.c
@@ -121,19 +121,13 @@ static NTSTATUS WINAPI User32DrawScrollBar( const struct draw_scroll_bar_params
     return 0;
 }

-static NTSTATUS WINAPI User32DrawText( const struct draw_text_params *params, ULONG size )
+static NTSTATUS WINAPI User32DrawText( struct draw_text_params *params, ULONG size )
 {
-    RECT rect = params->rect;
     int ret;

size -= FIELD_OFFSET( struct draw_text_params, str );
-    ret = DrawTextW( params->hdc, params->str, size / sizeof(WCHAR), &rect, params->flags );
-    if (params->ret_rect)
-    {
-        *params->ret_rect = rect;
-        return ret;
-    }
-    return NtCallbackReturn( &rect, sizeof(rect), ret );
+    ret = DrawTextW( params->hdc, params->str, size / sizeof(WCHAR), &params->rect, params->flags );
+    return NtCallbackReturn( &params->rect, sizeof(params->rect), ret );
 }

static NTSTATUS WINAPI User32ImmProcessKey( const struct imm_process_key_params *params, ULONG size )
diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c
index c5f62e76f3a..4a341453012 100644
--- a/dlls/win32u/font.c
+++ b/dlls/win32u/font.c
@@ -7097,7 +7097,6 @@ INT WINAPI DECLSPEC_HIDDEN DrawTextW( HDC hdc, const WCHAR *str, INT count, RECT
     if (!(params = malloc( size ))) return 0;
     params->hdc = hdc;
     params->rect = *rect;
-    params->ret_rect = rect;
     params->flags = flags;
     if (count) memcpy( params->str, str, count * sizeof(WCHAR) );
     ret = KeUserModeCallback( NtUserDrawText, params, size, &ret_ptr, &ret_len );
diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c
index 409dcefcda2..8a5455d2347 100644
--- a/dlls/wow64win/user.c
+++ b/dlls/wow64win/user.c
@@ -832,7 +832,6 @@ static NTSTATUS WINAPI wow64_NtUserDrawText( void *arg, ULONG size )
 {
     struct draw_text_params *params = arg;
     struct draw_text_params32 *params32;
-    RECT *rect_ptr = params->ret_rect;
     ULONG ret_len;
     void *ret_ptr;
     NTSTATUS ret;
@@ -846,11 +845,6 @@ static NTSTATUS WINAPI wow64_NtUserDrawText( void *arg, ULONG size )

ret = Wow64KiUserCallbackDispatcher( NtUserDrawText, params32,
                                          size - sizeof(*params) + sizeof(*params32), &ret_ptr, &ret_len );
-    if (ret_len == sizeof(RECT) && rect_ptr)
-    {
-        *rect_ptr = *(const RECT *)ret_ptr;
-        return ret;
-    }
     return NtCallbackReturn( ret_ptr, ret_len, ret );
 }

diff --git a/include/ntuser.h b/include/ntuser.h
index 2f01f0eafb3..195d4e1322a 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -188,7 +188,6 @@ struct draw_text_params
     HDC hdc;
     int count;
     RECT rect;
-    RECT *ret_rect; /* FIXME: Use NtCallbackReturn instead */
     UINT flags;
     WCHAR str[1];
 };