Skip to content

Commit 0001821

Browse files
committed
[CRYPT32] Sync to wine 10.0
- Move CertEnumSystemStoreLocation to reactos/store.c - Add emulation layer for unixlib calls - Implement enumeration of root certificate store in the registry
1 parent 664842e commit 0001821

34 files changed

+5602
-2915
lines changed

dll/win32/crypt32/CMakeLists.txt

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
33
add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600)
44

5+
remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
6+
57
add_definitions(
6-
-D__ROS_LONG64__
78
-D_WINE
89
-D_CRYPT32_
9-
-Dstrncasecmp=_strnicmp
1010
)
1111

1212
spec2def(crypt32.dll crypt32.spec ADD_IMPORTLIB)
@@ -27,6 +27,7 @@ list(APPEND SOURCE
2727
msg.c
2828
object.c
2929
oid.c
30+
pfx.c
3031
proplist.c
3132
protectdata.c
3233
provstore.c
@@ -35,7 +36,10 @@ list(APPEND SOURCE
3536
serialize.c
3637
sip.c
3738
store.c
38-
str.c)
39+
str.c
40+
reactos/store.c
41+
reactos/unixlib.c
42+
)
3943

4044
list(APPEND PCH_SKIP_SOURCE
4145
${CMAKE_CURRENT_BINARY_DIR}/crypt32_stubs.c)
@@ -47,15 +51,18 @@ add_library(crypt32 MODULE
4751
${CMAKE_CURRENT_BINARY_DIR}/crypt32.def)
4852

4953
if(MSVC)
50-
# Disable warning C4090: 'function': different 'const' qualifiers
51-
# Disable warning C4312: 'type cast': conversion from 'unsigned int' to 'void *' of greater size
52-
target_compile_options(crypt32 PRIVATE /wd4090 /wd4312)
54+
if(ARCH STREQUAL "amd64")
55+
target_compile_options(crypt32 PRIVATE
56+
/wd4267 # warning C4267: 'function': conversion from 'size_t' to 'ULONG', possible loss of data
57+
/wd4312 # warning C4312: 'type cast': conversion from 'unsigned int' to 'void *' of greater size
58+
)
59+
endif()
5360
endif()
5461

5562
set_module_type(crypt32 win32dll)
5663
target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames)
5764
add_delay_importlibs(crypt32 cryptnet)
58-
add_importlibs(crypt32 bcrypt user32 advapi32 advapi32_vista msvcrt kernel32 ntdll)
65+
add_importlibs(crypt32 bcrypt user32 advapi32 advapi32_vista msvcrt kernel32_vista kernel32 ntdll)
5966
add_pch(crypt32 precomp.h "${PCH_SKIP_SOURCE}")
6067
add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all)
6168
set_wine_module_FIXME(crypt32) # CORE-5743: No ARRAY_SIZE macro

0 commit comments

Comments
 (0)