ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

atl: Replace SHDeleteKeyW with RegDeleteTreeW and get rid of the import of shlwapi.

This commit is contained in:
Paul Vriens 2007-08-22 11:05:35 +02:00 committed by Alexandre Julliard
parent e9a4c2351d
commit 4f49655a65
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/atl/Makefile.in
View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = atl.dll MODULE = atl.dll
IMPORTLIB = libatl.$(IMPLIBEXT) IMPORTLIB = libatl.$(IMPLIBEXT)
IMPORTS = ole32 oleaut32 shlwapi user32 gdi32 advapi32 kernel32 IMPORTS = ole32 oleaut32 user32 gdi32 advapi32 kernel32
EXTRALIBS = -luuid EXTRALIBS = -luuid
C_SRCS = \ C_SRCS = \

5
dlls/atl/registrar.c
View File

@ -27,7 +27,6 @@
#include "winreg.h" #include "winreg.h"
#include "objbase.h" #include "objbase.h"
#include "oaidl.h" #include "oaidl.h"
#include "shlwapi.h"
#define ATL_INITGUID #define ATL_INITGUID
#include "atliface.h" #include "atliface.h"
@ -243,10 +242,10 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO
strbuf_write(buf->str, &name, -1); strbuf_write(buf->str, &name, -1);
}else if(key_type == DO_DELETE) { }else if(key_type == DO_DELETE) {
TRACE("Deleting %s\n", debugstr_w(buf->str)); TRACE("Deleting %s\n", debugstr_w(buf->str));
lres = SHDeleteKeyW(parent_key, buf->str); lres = RegDeleteTreeW(parent_key, buf->str);
}else { }else {
if(key_type == FORCE_REMOVE) if(key_type == FORCE_REMOVE)
SHDeleteKeyW(parent_key, buf->str); RegDeleteTreeW(parent_key, buf->str);
lres = RegCreateKeyW(parent_key, buf->str, &hkey); lres = RegCreateKeyW(parent_key, buf->str, &hkey);
if(lres != ERROR_SUCCESS) { if(lres != ERROR_SUCCESS) {
WARN("Could not create(open) key: %08x\n", lres); WARN("Could not create(open) key: %08x\n", lres);