Zebediah Figura : user32: AdjustWindowRect() shouldn't ignore WS_MINIMIZE.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 23f26266efe0891b9cffa1d26cbf60c96d2cd314
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=23f26266efe0891b9cffa1d26cbf60c96d2cd314

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Tue Feb 19 12:17:39 2019 -0600

user32: AdjustWindowRect() shouldn't ignore WS_MINIMIZE.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/user32/nonclient.c | 4 ----
 dlls/user32/tests/win.c | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c
index 26bb0a0..0dea3a2 100644
--- a/dlls/user32/nonclient.c
+++ b/dlls/user32/nonclient.c
@@ -315,8 +315,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL
 {
     NONCLIENTMETRICSW ncm;
 
-    if (style & WS_MINIMIZE) return TRUE;
-
     TRACE("(%s) %08x %d %08x\n", wine_dbgstr_rect(rect), style, menu, exStyle );
 
     ncm.cbSize = sizeof(ncm);
@@ -335,8 +333,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectExForDpi( LPRECT rect, DWORD style
 {
     NONCLIENTMETRICSW ncm;
 
-    if (style & WS_MINIMIZE) return TRUE;
-
     TRACE("(%s) %08x %d %08x %u\n", wine_dbgstr_rect(rect), style, menu, exStyle, dpi );
 
     ncm.cbSize = sizeof(ncm);
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 8111ec0..9540496 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -5342,7 +5342,7 @@ static void test_AWR_window_size(BOOL menu)
 
 static void test_AWR_flags(void)
 {
-    static const DWORD styles[] = { WS_POPUP, WS_BORDER, WS_DLGFRAME, WS_THICKFRAME };
+    static const DWORD styles[] = { WS_POPUP, WS_BORDER, WS_DLGFRAME, WS_THICKFRAME, WS_MINIMIZE };
     static const DWORD exStyles[] = { WS_EX_CLIENTEDGE, WS_EX_TOOLWINDOW, WS_EX_WINDOWEDGE,
                                       WS_EX_APPWINDOW, WS_EX_DLGMODALFRAME, WS_EX_STATICEDGE };