Piotr Caban : user32/tests: Don't use the same condition in ok and todo_wine_if.

[Alexandre Julliard]

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

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Thu Oct  7 16:33:48 2021 +0200

user32/tests: Don't use the same condition in ok and todo_wine_if.

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/user32/tests/win.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index d725f129d36..93d1e8ec232 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -4548,8 +4548,7 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle
     else
         dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE;
     ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle);
-    /* FIXME: Remove the condition below once Wine is fixed */
-    todo_wine_if (dwActualExStyle != dwExStyleOut)
+    todo_wine_if (!dwStyleIn)
         ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle);
 
     DestroyWindow(hwnd);
@@ -4702,7 +4701,7 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou
         WORD class_atom;
         WCHAR caption[1];
     } dlg_data;
-    DWORD style, ex_style;
+    DWORD style, ex_style, ex_style_out2;
     HWND hwnd, grand_parent = 0, parent = 0;
     struct dialog_param param;
 
@@ -4764,14 +4763,13 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou
     ok(style == style_out, "expected style %#x, got %#x\n", style_out, style);
     /* WS_EX_WINDOWEDGE can't always be changed */
     if (ex_style_in & WS_EX_DLGMODALFRAME)
-        ex_style_out = ex_style_in | WS_EX_WINDOWEDGE;
+        ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE;
     else if ((style & (WS_DLGFRAME | WS_THICKFRAME)) && !(ex_style_in & WS_EX_STATICEDGE))
-        ex_style_out = ex_style_in | WS_EX_WINDOWEDGE;
+        ex_style_out2 = ex_style_in | WS_EX_WINDOWEDGE;
     else
-        ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE;
-    /* FIXME: Remove the condition below once Wine is fixed */
-    todo_wine_if (ex_style != ex_style_out)
-        ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style);
+        ex_style_out2 = ex_style_in & ~WS_EX_WINDOWEDGE;
+    todo_wine_if (ex_style_out != ex_style_out2)
+        ok(ex_style == ex_style_out2, "expected ex_style %#x, got %#x\n", ex_style_out2, ex_style);
 
     DestroyWindow(hwnd);