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

Author: akhaldi
Date: Sun Jun  8 14:51:07 2014
New Revision: 63554

URL: http://svn.reactos.org/svn/reactos?rev=63554&view=rev
Log:
[LOCALSPL]
* 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/localspl/CMakeLists.txt
    trunk/reactos/dll/win32/localspl/provider.c

Modified: trunk/reactos/dll/win32/localspl/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/CMakeLis...
==============================================================================
--- trunk/reactos/dll/win32/localspl/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/localspl/CMakeLists.txt	[iso-8859-1] Sun Jun  8 14:51:07 2014
@@ -1,6 +1,3 @@
-
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)

add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -20,6 +17,6 @@

set_module_type(localspl win32dll)
 target_link_libraries(localspl wine)
-add_importlibs(localspl spoolss user32 advapi32 msvcrt kernel32 ntdll)
+add_importlibs(localspl spoolss user32 advapi32 shlwapi msvcrt kernel32 ntdll)
 add_pch(localspl localspl_private.h SOURCE)
 add_cd_file(TARGET localspl DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/localspl/provider.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/provider...
==============================================================================
--- trunk/reactos/dll/win32/localspl/provider.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/localspl/provider.c	[iso-8859-1] Sun Jun  8 14:51:07 2014
@@ -20,6 +20,7 @@

#include "localspl_private.h"

+#include <shlwapi.h>
 #include <ddk/winddiui.h>

/* ############################### */
@@ -1846,7 +1847,7 @@
         return FALSE;
     }

-    if(RegDeleteTreeW(hroot, pMonitorName) == ERROR_SUCCESS) {
+    if(SHDeleteKeyW(hroot, pMonitorName) == ERROR_SUCCESS) {
         TRACE("%s deleted\n", debugstr_w(pMonitorName));
         RegCloseKey(hroot);
         return TRUE;