Rafał Harabień : comctl32/tests: Remove now unused TODO_COUNT in static control tests.

[Alexandre Julliard]

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

Author: Rafał Harabień <rafalh92(a)outlook.com>
Date:   Sun Apr  3 01:37:37 2022 +0200

comctl32/tests: Remove now unused TODO_COUNT in static control tests.

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/comctl32/tests/static.c | 42 +++++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c
index bdae6744aa4..dbd71539a57 100644
--- a/dlls/comctl32/tests/static.c
+++ b/dlls/comctl32/tests/static.c
@@ -32,8 +32,6 @@
 
 #include "v6util.h"
 
-#define TODO_COUNT 1
-
 #define CTRL_ID 1995
 
 static HWND hMainWnd;
@@ -79,7 +77,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara
     return DefWindowProcA(hwnd, msg, wparam, lparam);
 }
 
-static void test_updates(int style, int flags)
+static void test_updates(int style)
 {
     HWND hStatic = create_static(style);
     RECT r1 = {5, 5, 30, 30}, rcClient;
@@ -130,13 +128,7 @@ static void test_updates(int style, int flags)
     else
         exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */
 
-    if (flags & TODO_COUNT)
-    todo_wine
-        ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic);
-    else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP)
-        ok(g_nReceivedColorStatic == exp, "Unexpected %u got %u\n", exp, g_nReceivedColorStatic);
-    else
-        ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic);
+    ok(g_nReceivedColorStatic == exp, "expected %u, got %u\n", exp, g_nReceivedColorStatic);
     DestroyWindow(hStatic);
 }
 
@@ -422,21 +414,21 @@ START_TEST(static)
         GetModuleHandleA(NULL), NULL);
     ShowWindow(hMainWnd, SW_SHOW);
 
-    test_updates(0, 0);
-    test_updates(SS_ICON, 0);
-    test_updates(SS_BLACKRECT, 0);
-    test_updates(SS_WHITERECT, 0);
-    test_updates(SS_BLACKFRAME, 0);
-    test_updates(SS_WHITEFRAME, 0);
-    test_updates(SS_USERITEM, 0);
-    test_updates(SS_SIMPLE, 0);
-    test_updates(SS_OWNERDRAW, 0);
-    test_updates(SS_BITMAP, 0);
-    test_updates(SS_BITMAP | SS_CENTERIMAGE, 0);
-    test_updates(SS_ETCHEDHORZ, 0);
-    test_updates(SS_ETCHEDVERT, 0);
-    test_updates(SS_ETCHEDFRAME, 0);
-    test_updates(SS_SUNKEN, 0);
+    test_updates(0);
+    test_updates(SS_ICON);
+    test_updates(SS_BLACKRECT);
+    test_updates(SS_WHITERECT);
+    test_updates(SS_BLACKFRAME);
+    test_updates(SS_WHITEFRAME);
+    test_updates(SS_USERITEM);
+    test_updates(SS_SIMPLE);
+    test_updates(SS_OWNERDRAW);
+    test_updates(SS_BITMAP);
+    test_updates(SS_BITMAP | SS_CENTERIMAGE);
+    test_updates(SS_ETCHEDHORZ);
+    test_updates(SS_ETCHEDVERT);
+    test_updates(SS_ETCHEDFRAME);
+    test_updates(SS_SUNKEN);
     test_set_text();
     test_set_image();
     test_STM_SETIMAGE();