Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 03:05:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRYPT32]

Browse source 
* Do not rely on RegDeleteTreeW which shouldn't be exported.
* We no longer need to define _WIN32_WINNT as 0x600.
CORE-8174

svn path=/trunk/; revision=63553
This commit is contained in:
Amine Khaldi 2014-06-08 12:45:39 +00:00
parent bf89f9e6bb
commit 74e0de1a68
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/crypt32/CMakeLists.txt
View file

@ -4,9 +4,6 @@ add_definitions(
-D_WINE -D_WINE
-D_CRYPT32_) -D_CRYPT32_)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(crypt32.dll crypt32.spec ADD_IMPORTLIB) spec2def(crypt32.dll crypt32.spec ADD_IMPORTLIB)
@ -45,7 +42,7 @@ add_library(crypt32 SHARED
set_module_type(crypt32 win32dll) set_module_type(crypt32 win32dll)
target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames) target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames)
add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_importlibs(crypt32 user32 advapi32 shlwapi msvcrt kernel32 ntdll)
add_delay_importlibs(crypt32 cryptnet) add_delay_importlibs(crypt32 cryptnet)
add_pch(crypt32 crypt32_private.h SOURCE) add_pch(crypt32 crypt32_private.h SOURCE)
add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all) add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all)

8
reactos/dll/win32/crypt32/regstore.c
View file

@ -18,6 +18,8 @@
#include "crypt32_private.h" #include "crypt32_private.h"
#include <shlwapi.h>
WINE_DEFAULT_DEBUG_CHANNEL(crypt); WINE_DEFAULT_DEBUG_CHANNEL(crypt);
typedef struct _WINE_HASH_TO_DELETE typedef struct _WINE_HASH_TO_DELETE
@ -507,12 +509,12 @@ WINECRYPT_CERTSTORE *CRYPT_RegOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags,
if (dwFlags & CERT_STORE_DELETE_FLAG) if (dwFlags & CERT_STORE_DELETE_FLAG)
{ {
DWORD rc = RegDeleteTreeW((HKEY)pvPara, CertsW); DWORD rc = SHDeleteKeyW((HKEY)pvPara, CertsW);
if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS) if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS)
rc = RegDeleteTreeW((HKEY)pvPara, CRLsW); rc = SHDeleteKeyW((HKEY)pvPara, CRLsW);
if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS) if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS)
rc = RegDeleteTreeW((HKEY)pvPara, CTLsW); rc = SHDeleteKeyW((HKEY)pvPara, CTLsW);
if (rc == ERROR_NO_MORE_ITEMS) if (rc == ERROR_NO_MORE_ITEMS)
rc = ERROR_SUCCESS; rc = ERROR_SUCCESS;
SetLastError(rc); SetLastError(rc);