[COMBASE][COML2] Sync to wine-10.0

Co-Authored-By: buddyjojo <[email protected]>

Author: MishaProductions

dll/win32/CMakeLists.txt

@@ -21,9 +21,11 @@ add_subdirectory(cabinet)
 add_subdirectory(cards)
 add_subdirectory(cfgmgr32)
 add_subdirectory(clusapi)
+add_subdirectory(combase)
 add_subdirectory(comcat)
 add_subdirectory(comctl32)
 add_subdirectory(comdlg32)
+add_subdirectory(coml2)
 add_subdirectory(compstui)
 add_subdirectory(credui)
 if(ARCH STREQUAL "i386")

dll/win32/combase/CMakeLists.txt

@@ -0,0 +1,46 @@
+
+
+remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS -D_WIN32_WINNT=0x502)
+add_definitions(-D_WIN32_WINNT=0x600)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)
+if(DLL_EXPORT_VERSION GREATER_EQUAL 0xA00)
+    set(COMBASE_NAME "combase")
+else()
+    set(COMBASE_NAME "combase_win10")
+endif()
+spec2def(${COMBASE_NAME}.dll combase.spec ADD_IMPORTLIB)
+add_idl_headers(combase_idlheader dcom.idl)
+add_rpc_files(client irpcss.idl)
+
+list(APPEND SOURCE
+    apartment.c
+    combase.c
+    errorinfo.c
+    hglobalstream.c
+    malloc.c
+    marshal.c
+    roapi.c
+    rpc.c
+    string.c
+    stubmanager.c
+    usrmarshal.c
+    ${CMAKE_CURRENT_BINARY_DIR}/${COMBASE_NAME}_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/irpcss_c.c
+)
+
+add_definitions(-Dwcsdup=_wcsdup -Dwcsicmp=_wcsicmp -D_ROAPI_)
+
+add_library(${COMBASE_NAME} MODULE ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/${COMBASE_NAME}.def)
+set_module_type(${COMBASE_NAME} win32dll)
+target_link_libraries(${COMBASE_NAME} wine uuid pseh)
+add_importlibs(${COMBASE_NAME} advapi32 ole32 oleaut32 user32 gdi32 rpcrt4 msvcrt kernel32_vista kernel32 ntdll)
+add_dependencies(${COMBASE_NAME} combase_idlheader wineheaders rpcss)
+add_cd_file(TARGET ${COMBASE_NAME} DESTINATION reactos/system32 FOR all)
+set_wine_module_FIXME(${COMBASE_NAME}) # CORE-5743: ???
+
+if(MSVC)
+    # Disable warning C4090: 'function': different 'const' qualifiers
+    # Disable warning C4312: 'type cast': conversion from 'unsigned int' to 'void *' of greater size
+    target_compile_options(${COMBASE_NAME} PRIVATE /wd4090 /wd4312)
+endif()
+