[OLE32] Sync to wine-10.0

Author: MishaProductions

dll/win32/ole32/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-remove_definitions(-D_WIN32_WINNT=0x502)
+remove_definitions(-D_WIN32_WINNT=0x502 -D_CRT_NON_CONFORMING_SWPRINTFS)
 add_definitions(-D_WIN32_WINNT=0x600)
 
 add_definitions(
@@ -8,9 +8,17 @@ add_definitions(
     -DCOM_NO_WINDOWS_H
     -DENTRY_PREFIX=OLE32_
     -DPROXY_CLSID=CLSID_PSFactoryBuffer
-    -DWINE_REGISTER_DLL)
+    -DWINE_REGISTER_DLL
+    -D_ROAPI_)
+
+if(DLL_EXPORT_VERSION GREATER_EQUAL 0xA00)
+    spec2def(ole32.dll ole32.spec ADD_IMPORTLIB NO_PRIVATE_WARNINGS)
+    set(COMBASE_NAME "combase")
+else()
+    spec2def(ole32.dll ole32_nt5.spec ADD_IMPORTLIB NO_PRIVATE_WARNINGS)
+    set(COMBASE_NAME "combase_win10")
+endif()
 
-spec2def(ole32.dll ole32.spec ADD_IMPORTLIB NO_PRIVATE_WARNINGS)
 generate_idl_iids(dcom.idl)
 add_idl_headers(ole32idl dcom.idl irot.idl)
 add_rpc_files(client irot.idl)
@@ -32,30 +40,22 @@ list(APPEND SOURCE
     datacache.c
     defaulthandler.c
     dictionary.c
-    enumx.c
-    errorinfo.c
     filelockbytes.c
     filemoniker.c
     ftmarshal.c
     git.c
-    hglobalstream.c
-    ifs.c
     itemmoniker.c
     marshal.c
-    memlockbytes.c
     moniker.c
     ole2.c
-    ole2impl.c
     ole2stubs.c
     ole32_main.c
     oleobj.c
     oleproxy.c
     pointermoniker.c
-    rpc.c
     stg_prop.c
     stg_stream.c
     storage32.c
-    stubmanager.c
     usrmarshal.c)
 
 if(MSVC AND (ARCH STREQUAL "i386"))
@@ -82,13 +82,15 @@ add_library(ole32 MODULE
 if(MSVC)
     # Disable warning C4090: '=': different 'const' qualifiers
     # Disable warning C4146: unary minus operator applied to unsigned type, result still unsigned
-    target_compile_options(ole32 PRIVATE /wd4090 /wd4146)
+    # Disable warning C4133: 'function': incompatible types - from 'UINT *' to 'MSIINSTALLCONTEXT *'
+    target_compile_options(ole32 PRIVATE /wd4090 /wd4146 /wd4133)
 endif()
 
 set_module_type(ole32 win32dll)
-target_link_libraries(ole32 wine uuid ${PSEH_LIB} oldnames)
+target_link_libraries(ole32 wine uuid pathcch_static ${PSEH_LIB} oldnames)
 add_delay_importlibs(ole32 oleaut32)
-add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 kernel32_vista ntdll)
+target_compile_definitions(ole32 PRIVATE STATIC_PATHCCH)
+add_importlibs(ole32 ${COMBASE_NAME} coml2 kernel32_vista advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll)
 add_dependencies(ole32 ole32idl)
 add_pch(ole32 precomp.h "${PCH_SKIP_SOURCE}")
 add_cd_file(TARGET ole32 DESTINATION reactos/system32 FOR all)