Skip to content

Commit fd6d262

Browse files
[COMBASE][COML2] Sync to wine-10.0
Co-Authored-By: buddyjojo <[email protected]>
1 parent 8f343e5 commit fd6d262

38 files changed

+16669
-70
lines changed

dll/ntdll/nt_0600/ntdll_vista.spec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@
2020
@ stdcall RtlSendMsgToSm(ptr ptr) SmSendMsgToSm
2121
@ stdcall RtlLcidToLocaleName(long ptr long long)
2222
@ stdcall RtlLocaleNameToLcid(wstr ptr long)
23+
@ stdcall RtlCompareUnicodeStrings(wstr long wstr long long)

dll/win32/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ add_subdirectory(cabinet)
2121
add_subdirectory(cards)
2222
add_subdirectory(cfgmgr32)
2323
add_subdirectory(clusapi)
24+
add_subdirectory(combase)
2425
add_subdirectory(comcat)
2526
add_subdirectory(comctl32)
2627
add_subdirectory(comdlg32)
28+
add_subdirectory(coml2)
2729
add_subdirectory(compstui)
2830
add_subdirectory(credui)
2931
if(ARCH STREQUAL "i386")

dll/win32/combase/CMakeLists.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
2+
remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS -D_WIN32_WINNT=0x502)
3+
add_definitions(-D_WIN32_WINNT=0x600)
4+
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)
5+
6+
spec2def(combase.dll combase.spec ADD_IMPORTLIB)
7+
add_idl_headers(combase_idlheader dcom.idl)
8+
add_rpc_files(client irpcss.idl)
9+
10+
list(APPEND SOURCE
11+
apartment.c
12+
combase.c
13+
errorinfo.c
14+
hglobalstream.c
15+
malloc.c
16+
marshal.c
17+
roapi.c
18+
rpc.c
19+
string.c
20+
stubmanager.c
21+
usrmarshal.c
22+
${CMAKE_CURRENT_BINARY_DIR}/combase_stubs.c
23+
${CMAKE_CURRENT_BINARY_DIR}/irpcss_c.c
24+
)
25+
26+
add_definitions(-Dwcsdup=_wcsdup -Dwcsicmp=_wcsicmp -D_ROAPI_)
27+
28+
add_library(combase MODULE ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/combase.def)
29+
set_module_type(combase win32dll)
30+
if(MSVC)
31+
# Disable warning C4090: 'function': different 'const' qualifiers
32+
# Disable warning C4312: 'type cast': conversion from 'unsigned int' to 'void *' of greater size
33+
target_compile_options(combase PRIVATE /wd4090 /wd4312)
34+
endif()
35+
target_link_libraries(combase wine uuid pseh)
36+
add_importlibs(combase advapi32 ole32 oleaut32 user32 gdi32 rpcrt4 msvcrt kernel32_vista kernel32 ntdll)
37+
add_dependencies(combase combase_idlheader wineheaders rpcss)
38+
add_cd_file(TARGET combase DESTINATION reactos/system32 FOR all)
39+
set_wine_module_FIXME(combase) # CORE-5743: No ARRAY_SIZE macro

0 commit comments

Comments
 (0)