[COMCTL32][COMCTL32_V6] Sync to Wine-11.11

Author: MishaProductions

dll/win32/CMakeLists.txt

@@ -26,6 +26,7 @@ add_subdirectory(clusapi)
 add_subdirectory(combase)
 add_subdirectory(comcat)
 add_subdirectory(comctl32)
+add_subdirectory(comctl32_v6)
 add_subdirectory(comdlg32)
 add_subdirectory(coml2)
 add_subdirectory(compstui)

dll/win32/comctl32/CMakeLists.txt

@@ -1,8 +1,9 @@
 
 add_definitions(
     -D_WINE
-    -D__ROS_LONG64__
-    -D_COMCTL32_)
+    -D_COMCTL32_
+    -D__WINE_COMCTL32_VERSION=5
+    -D__WINE_COMCTL32_VERSION_MINOR=82)
 
 remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
 add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600)
@@ -15,22 +16,17 @@ endif()
 
 list(APPEND SOURCE
     animate.c
-    button.c
-    combo.c
     comboex.c
-    comctl32undoc.c
     commctrl.c
     datetime.c
     dpa.c
     draglist.c
     dsa.c
-    edit.c
     flatsb.c
     header.c
     hotkey.c
     imagelist.c
     ipaddress.c
-    listbox.c
     listview.c
     monthcal.c
     nativefont.c
@@ -39,14 +35,9 @@ list(APPEND SOURCE
     propsheet.c
     rebar.c
     smoothscroll.c
-    static.c
     status.c
     string.c
-    syslink.c
     tab.c
-    taskdialog.c
-    theme_scrollbar.c
-    theming.c
     toolbar.c
     tooltips.c
     trackbar.c
@@ -59,7 +50,7 @@ list(APPEND PCH_SKIP_SOURCE
 add_library(comctl32 MODULE
     ${SOURCE}
     ${PCH_SKIP_SOURCE}
-    rsrc.rc
+    comctl32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def)
 
 if(MSVC)
@@ -70,14 +61,12 @@ if(MSVC)
 endif()
 
 set_module_type(comctl32 win32dll UNICODE)
-target_link_libraries(comctl32 uuid wine ${PSEH_LIB} oldnames)
-add_delay_importlibs(comctl32 winmm uxtheme)
-add_importlibs(comctl32 user32 gdi32 advapi32 usp10 imm32 msvcrt kernel32 ntdll)
+target_link_libraries(comctl32 uuid wine wine_dll_version ${PSEH_LIB} oldnames)
+add_delay_importlibs(comctl32 winmm)
+add_importlibs(comctl32 user32 gdi32 advapi32 usp10 imm32 msvcrt kernelbase_ros kernel32_vista ntdll)
 add_pch(comctl32 precomp.h "${PCH_SKIP_SOURCE}")
 add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all)
 
 add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/${WINARCH}_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef FOR all)
-add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/${WINARCH}_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef FOR all)
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all)
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all)
 set_wine_module_FIXME(comctl32) # CORE-5743: No ARRAY_SIZE macro