[ros-diffs] [akhaldi] 63566: [UMPNPMGR] * 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 18:10:04 2014
New Revision: 63566

URL: http://svn.reactos.org/svn/reactos?rev=63566&view=rev
Log:
[UMPNPMGR]
* 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/base/services/umpnpmgr/CMakeLists.txt
    trunk/reactos/base/services/umpnpmgr/umpnpmgr.c

Modified: trunk/reactos/base/services/umpnpmgr/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/CMak...
==============================================================================
--- trunk/reactos/base/services/umpnpmgr/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/services/umpnpmgr/CMakeLists.txt	[iso-8859-1] Sun Jun  8 18:10:04 2014
@@ -1,8 +1,5 @@

include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
-
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)

add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl)

@@ -17,5 +14,5 @@
     ${PSEH_LIB})

set_module_type(umpnpmgr win32cui UNICODE)
-add_importlibs(umpnpmgr advapi32 rpcrt4 userenv msvcrt kernel32 ntdll)
+add_importlibs(umpnpmgr advapi32 rpcrt4 userenv shlwapi msvcrt kernel32 ntdll)
 add_cd_file(TARGET umpnpmgr DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/umpn...
==============================================================================
--- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c	[iso-8859-1] Sun Jun  8 18:10:04 2014
@@ -44,6 +44,7 @@
 #include <cfgmgr32.h>
 #include <regstr.h>
 #include <userenv.h>
+#include <shlwapi.h>
 #include <pnp_s.h>

#define NDEBUG
@@ -1142,7 +1143,7 @@

if (ulFlags & CM_DELETE_CLASS_SUBKEYS)
     {
-        if (RegDeleteTreeW(hClassKey, pszClassGuid) != ERROR_SUCCESS)
+        if (SHDeleteKeyW(hClassKey, pszClassGuid) != ERROR_SUCCESS)
             ret = CR_REGISTRY_ERROR;
     }
     else