From: Zhiyi Zhang zzhang@codeweavers.com
--- dlls/comctl32/Makefile.in | 5 ----- dlls/comctl32/commctrl.c | 7 ++++++- dlls/comctl32/tests/misc.c | 1 - 3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 94259580946..bc17cd94199 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -6,8 +6,6 @@ DELAYIMPORTS = oleacc winmm uxtheme
SOURCES = \ animate.c \ - button.c \ - combo.c \ comboex.c \ comctl32.rc \ commctrl.c \ @@ -15,7 +13,6 @@ SOURCES = \ dpa.c \ draglist.c \ dsa.c \ - edit.c \ flatsb.c \ header.c \ hotkey.c \ @@ -31,7 +28,6 @@ SOURCES = \ idc_movebutton.svg \ imagelist.c \ ipaddress.c \ - listbox.c \ listview.c \ monthcal.c \ nativefont.c \ @@ -40,7 +36,6 @@ SOURCES = \ propsheet.c \ rebar.c \ smoothscroll.c \ - static.c \ status.c \ string.c \ syslink.c \ diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 6097b1a9735..08b24b2d5e6 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -68,7 +68,6 @@ #include "winerror.h" #include "winreg.h" #include "comctl32.h" -#include "uxtheme.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(commctrl); @@ -92,6 +91,7 @@ static const WORD wPattern55AA[] =
static const WCHAR strCC32SubclassInfo[] = L"CC32SubclassInfo";
+#if __WINE_COMCTL32_VERSION == 6 static void unregister_versioned_classes(void) { #define VERSION "6.0.2600.2982!" @@ -111,9 +111,11 @@ static void unregister_versioned_classes(void)
#undef VERSION } +#endif /* __WINE_COMCTL32_VERSION == 6 */
BOOL WINAPI RegisterClassNameW(const WCHAR *class) { +#if __WINE_COMCTL32_VERSION == 6 static const struct { const WCHAR nameW[16]; @@ -142,6 +144,7 @@ BOOL WINAPI RegisterClassNameW(const WCHAR *class) if (res < 0) max = pos - 1; else min = pos + 1; } +#endif /* __WINE_COMCTL32_VERSION == 6 */
return FALSE; } @@ -232,7 +235,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) TREEVIEW_Unregister (); UPDOWN_Unregister ();
+#if __WINE_COMCTL32_VERSION == 6 unregister_versioned_classes (); +#endif /* __WINE_COMCTL32_VERSION == 6 */
/* delete local pattern brush */ DeleteObject (COMCTL32_hPattern55AABrush); diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 4d74c401e1a..1f803b3cf59 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1327,7 +1327,6 @@ static void test_RegisterClassNameW(BOOL v6) if (v6) ok(ret, "RegisterClassNameW %s failed, error %lu.\n", wine_dbgstr_w(class_names[i]), GetLastError()); else - todo_wine ok(!ret, "RegisterClassNameW %s succeeded.\n", wine_dbgstr_w(class_names[i])); }