From: Zhiyi Zhang zzhang@codeweavers.com
--- dlls/comctl32/Makefile.in | 1 - dlls/comctl32/comctl32.h | 2 ++ dlls/comctl32/commctrl.c | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-)
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..069a4a1dc6f 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -267,7 +267,9 @@ 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); +#endif extern void SYSLINK_Unregister(void); extern void TAB_Register(void); extern void TAB_Unregister(void); diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index d39bc2e22e3..74f70a5c82b 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,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) PROGRESS_Unregister (); REBAR_Unregister (); STATUS_Unregister (); +#if __WINE_COMCTL32_VERSION == 6 SYSLINK_Unregister (); +#endif TAB_Unregister (); TOOLBAR_Unregister (); TOOLTIPS_Unregister ();