mirror of
https://github.com/reactos/reactos.git
synced 2024-08-20 18:35:32 +00:00
[UMPNPMGR]
* 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:
parent
70c282c0a9
commit
d443d916e6
|
@ -1,9 +1,6 @@
|
||||||
|
|
||||||
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
|
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)
|
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl)
|
||||||
|
|
||||||
|
|
||||||
|
@ -17,5 +14,5 @@ target_link_libraries(umpnpmgr
|
||||||
${PSEH_LIB})
|
${PSEH_LIB})
|
||||||
|
|
||||||
set_module_type(umpnpmgr win32cui UNICODE)
|
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)
|
add_cd_file(TARGET umpnpmgr DESTINATION reactos/system32 FOR all)
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
#include <cfgmgr32.h>
|
#include <cfgmgr32.h>
|
||||||
#include <regstr.h>
|
#include <regstr.h>
|
||||||
#include <userenv.h>
|
#include <userenv.h>
|
||||||
|
#include <shlwapi.h>
|
||||||
#include <pnp_s.h>
|
#include <pnp_s.h>
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
|
@ -1142,7 +1143,7 @@ DWORD PNP_DeleteClassKey(
|
||||||
|
|
||||||
if (ulFlags & CM_DELETE_CLASS_SUBKEYS)
|
if (ulFlags & CM_DELETE_CLASS_SUBKEYS)
|
||||||
{
|
{
|
||||||
if (RegDeleteTreeW(hClassKey, pszClassGuid) != ERROR_SUCCESS)
|
if (SHDeleteKeyW(hClassKey, pszClassGuid) != ERROR_SUCCESS)
|
||||||
ret = CR_REGISTRY_ERROR;
|
ret = CR_REGISTRY_ERROR;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue