Paul Vriens : atl:
Replace SHDeleteKeyW with RegDeleteTreeW and get rid of the import of
shlwapi .
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Aug 23 07:25:52 CDT 2007
Module: wine
Branch: master
Commit: 4f49655a6591f9ef1626e619ddcf1ea4be1316de
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f49655a6591f9ef1626e619ddcf1ea4be1316de
Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date: Wed Aug 22 11:05:35 2007 +0200
atl: Replace SHDeleteKeyW with RegDeleteTreeW and get rid of the import of shlwapi.
---
dlls/atl/Makefile.in | 2 +-
dlls/atl/registrar.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in
index d419a5d..413c50d 100644
--- a/dlls/atl/Makefile.in
+++ b/dlls/atl/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = atl.dll
IMPORTLIB = libatl.$(IMPLIBEXT)
-IMPORTS = ole32 oleaut32 shlwapi user32 gdi32 advapi32 kernel32
+IMPORTS = ole32 oleaut32 user32 gdi32 advapi32 kernel32
EXTRALIBS = -luuid
C_SRCS = \
diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c
index 2bc078d..9c0c73b 100644
--- a/dlls/atl/registrar.c
+++ b/dlls/atl/registrar.c
@@ -27,7 +27,6 @@
#include "winreg.h"
#include "objbase.h"
#include "oaidl.h"
-#include "shlwapi.h"
#define ATL_INITGUID
#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);
}else if(key_type == DO_DELETE) {
TRACE("Deleting %s\n", debugstr_w(buf->str));
- lres = SHDeleteKeyW(parent_key, buf->str);
+ lres = RegDeleteTreeW(parent_key, buf->str);
}else {
if(key_type == FORCE_REMOVE)
- SHDeleteKeyW(parent_key, buf->str);
+ RegDeleteTreeW(parent_key, buf->str);
lres = RegCreateKeyW(parent_key, buf->str, &hkey);
if(lres != ERROR_SUCCESS) {
WARN("Could not create(open) key: %08x\n", lres);
More information about the wine-cvs
mailing list