[ros-diffs] [akhaldi] 63553: [CRYPT32] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174

[akhaldi]

Author: akhaldi
Date: Sun Jun  8 12:45:39 2014
New Revision: 63553

URL: http://svn.reactos.org/svn/reactos?rev=63553&view=rev
Log:
[CRYPT32]
* Do not rely on RegDeleteTreeW which shouldn't be exported.
* We no longer need to define _WIN32_WINNT as 0x600.
CORE-8174

Modified:
    trunk/reactos/dll/win32/crypt32/CMakeLists.txt
    trunk/reactos/dll/win32/crypt32/regstore.c

Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLists.txt?rev=63553&r1=63552&r2=63553&view=diff
==============================================================================
--- trunk/reactos/dll/win32/crypt32/CMakeLists.txt      [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/CMakeLists.txt      [iso-8859-1] Sun Jun  8 
12:45:39 2014
@@ -3,9 +3,6 @@
     -D__WINESRC__
     -D_WINE
     -D_CRYPT32_)
-
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(crypt32.dll crypt32.spec ADD_IMPORTLIB)
@@ -45,7 +42,7 @@
 
 set_module_type(crypt32 win32dll)
 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_pch(crypt32 crypt32_private.h SOURCE)
 add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/crypt32/regstore.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/regstore.c?rev=63553&r1=63552&r2=63553&view=diff
==============================================================================
--- trunk/reactos/dll/win32/crypt32/regstore.c  [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/regstore.c  [iso-8859-1] Sun Jun  8 
12:45:39 2014
@@ -17,6 +17,8 @@
  */
 
 #include "crypt32_private.h"
+
+#include <shlwapi.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(crypt);
 
@@ -507,12 +509,12 @@
 
     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)
-            rc = RegDeleteTreeW((HKEY)pvPara, CRLsW);
+            rc = SHDeleteKeyW((HKEY)pvPara, CRLsW);
         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)
             rc = ERROR_SUCCESS;
         SetLastError(rc);