[PATCH v5 5/6] comctl32: Remove syslink from comctl32 v5.

[Zhiyi Zhang]

From: Zhiyi Zhang

test_comctl32_classes() in comctl32 tests shows that syslink is not available in comctl32 v5. The
syslink test in the test_comctl32_classes() in user32 tests is removed in this commit because it's
not being tested properly. The broken() call at class.c#L1329 is hiding the failure on Windows.
---
 dlls/comctl32/Makefile.in  | 1 -
 dlls/comctl32/comctl32.h   | 2 ++
 dlls/comctl32/commctrl.c   | 5 ++++-
 dlls/comctl32/tests/misc.c | 2 --
 dlls/user32/tests/class.c  | 1 -
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index a61bdfc1e47..d041f09cf32 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -38,7 +38,6 @@ SOURCES = \
    smoothscroll.c \
    status.c \
    string.c \
-	syslink.c \
    tab.c \
    toolbar.c \
    tooltips.c \
diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
index a9a0b44fcd1..425a34f866b 100644
--- a/dlls/comctl32/comctl32.h
+++ b/dlls/comctl32/comctl32.h
@@ -267,8 +267,10 @@ extern void REBAR_Unregister(void);
 extern void STATIC_Register(void);
 extern void STATUS_Register(void);
 extern void STATUS_Unregister(void);
+#if __WINE_COMCTL32_VERSION == 6
 extern void SYSLINK_Register(void);
 extern void SYSLINK_Unregister(void);
+#endif
 extern void TAB_Register(void);
 extern void TAB_Unregister(void);
 extern void TOOLBAR_Register(void);
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 08b24b2d5e6..07e91356276 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -200,7 +200,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
             PROGRESS_Register ();
             REBAR_Register ();
             STATUS_Register ();
+#if __WINE_COMCTL32_VERSION == 6
             SYSLINK_Register ();
+#endif
             TAB_Register ();
             TOOLBAR_Register ();
             TOOLTIPS_Register ();
@@ -227,7 +229,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
             PROGRESS_Unregister ();
             REBAR_Unregister ();
             STATUS_Unregister ();
-            SYSLINK_Unregister ();
             TAB_Unregister ();
             TOOLBAR_Unregister ();
             TOOLTIPS_Unregister ();
@@ -236,6 +237,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
             UPDOWN_Unregister ();

#if __WINE_COMCTL32_VERSION == 6
+            SYSLINK_Unregister ();
+
             unregister_versioned_classes ();
 #endif /* __WINE_COMCTL32_VERSION == 6 */

diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c
index 8a2b2ca9f76..bb82277b575 100644
--- a/dlls/comctl32/tests/misc.c
+++ b/dlls/comctl32/tests/misc.c
@@ -404,9 +404,7 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno
         HWND hwnd;
         DWORD objid;

-        todo_wine_if(!strcmp(name, "SysLink") && !must_exist && !v6)
         ok( must_exist, "System class %s should %sexist\n", name, must_exist ? "" : "NOT " );
-        if (!must_exist) return;

todo_wine_if(!strcmp(name, "ScrollBar") || (!strcmp(name, "tooltips_class32") && v6))
         ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n",
diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c
index 92e07e44bdf..fd4ea848deb 100644
--- a/dlls/user32/tests/class.c
+++ b/dlls/user32/tests/class.c
@@ -1368,7 +1368,6 @@ static void test_comctl32_classes(void)
         PROGRESS_CLASSA,
         REBARCLASSNAMEA,
         STATUSCLASSNAMEA,
-        "SysLink",
         WC_TABCONTROLA,
         TOOLBARCLASSNAMEA,
         TOOLTIPS_CLASSA,