[PATCH 3/4] comctl32/tests: Add more RegisterClassNameW() tests.

[Zhiyi Zhang]

From: Zhiyi Zhang <[e-mail]>

---
 dlls/comctl32/tests/misc.c | 55 +++++++++++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 12 deletions(-)

diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c
index e69eeed3ac2..0d8feefd8d5 100644
--- a/dlls/comctl32/tests/misc.c
+++ b/dlls/comctl32/tests/misc.c
@@ -1337,29 +1337,60 @@ static void test_version(BOOL v6)
 
 static void test_RegisterClassNameW(BOOL v6)
 {
-    static const WCHAR *class_names[] =
+    static const struct
+    {
+        const WCHAR *class_name;
+        BOOL v6_only;
+    }
+    tests[] =
     {
-        L"Button",
-        L"ComboBox",
-        L"ComboLBox",
-        L"Edit",
-        L"ListBox",
-        L"Static",
+        {WC_BUTTONW, TRUE},
+        {WC_COMBOBOXW, TRUE},
+        {L"ComboLBox", TRUE},
+        {WC_EDITW, TRUE},
+        {WC_LINK, TRUE},
+        {WC_LISTBOXW, TRUE},
+        {WC_STATICW, TRUE},
+        {ANIMATE_CLASSW},
+        {WC_COMBOBOXEXW},
+        {DATETIMEPICK_CLASSW},
+        {WC_HEADERW},
+        {HOTKEY_CLASSW},
+        {WC_IPADDRESSW},
+        {WC_LISTVIEWW},
+        {MONTHCAL_CLASSW},
+        {WC_NATIVEFONTCTLW},
+        {WC_PAGESCROLLERW},
+        {PROGRESS_CLASSW},
+        {REBARCLASSNAMEW},
+        {STATUSCLASSNAMEW},
+        {WC_TABCONTROLW},
+        {TOOLBARCLASSNAMEW},
+        {TOOLTIPS_CLASSW},
+        {TRACKBAR_CLASSW},
+        {WC_TREEVIEWW},
+        {UPDOWN_CLASSW},
     };
     unsigned int i;
     BOOL ret;
 
     winetest_push_context("v%d", v6 ? 6 : 5);
 
-    for (i = 0; i < ARRAY_SIZE(class_names); i++)
+    for (i = 0; i < ARRAY_SIZE(tests); i++)
     {
-        ret = pRegisterClassNameW(class_names[i]);
-        if (v6)
-            ok(ret, "RegisterClassNameW %s failed, error %lu.\n", wine_dbgstr_w(class_names[i]), GetLastError());
+        ret = pRegisterClassNameW(tests[i].class_name);
+        if (!v6 && tests[i].v6_only)
+            ok(!ret, "RegisterClassNameW %s succeeded.\n", wine_dbgstr_w(tests[i].class_name));
         else
-            ok(!ret, "RegisterClassNameW %s succeeded.\n", wine_dbgstr_w(class_names[i]));
+            todo_wine_if(i > 5)
+            ok(ret, "RegisterClassNameW %s failed, error %lu.\n", wine_dbgstr_w(tests[i].class_name), GetLastError());
     }
 
+    /* Test registering an already registered class */
+    ret = pRegisterClassNameW(ANIMATE_CLASSW);
+    todo_wine
+    ok(ret, "RegisterClassNameW failed, error %lu.\n", GetLastError());
+
     winetest_pop_context();
 }
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/9822