Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-07 13:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[UMPNPMGR]

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=63566
This commit is contained in:
Amine Khaldi 2014-06-08 18:10:04 +00:00
parent 70c282c0a9
commit d443d916e6
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/base/services/umpnpmgr/CMakeLists.txt
View file

@ -1,9 +1,6 @@
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 @@ target_link_libraries(umpnpmgr
${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)

3
reactos/base/services/umpnpmgr/umpnpmgr.c
View file

@ -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 @@ DWORD PNP_DeleteClassKey(
if (ulFlags & CM_DELETE_CLASS_SUBKEYS)
{
if (RegDeleteTreeW(hClassKey, pszClassGuid) != ERROR_SUCCESS)
if (SHDeleteKeyW(hClassKey, pszClassGuid) != ERROR_SUCCESS)
ret = CR_REGISTRY_ERROR;
}
else