Stefan Leichter : comcat: Remove 'recursive registry key delete' function.
Alexandre Julliard
julliard at winehq.org
Wed Sep 26 07:46:13 CDT 2007
Module: wine
Branch: master
Commit: 6be7eba918cacd60192fe612d9082ad18f6e88a4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be7eba918cacd60192fe612d9082ad18f6e88a4
Author: Stefan Leichter <Stefan.Leichter at camline.com>
Date: Tue Sep 25 17:21:51 2007 +0200
comcat: Remove 'recursive registry key delete' function.
---
dlls/comcat/regsvr.c | 63 +++----------------------------------------------
1 files changed, 4 insertions(+), 59 deletions(-)
diff --git a/dlls/comcat/regsvr.c b/dlls/comcat/regsvr.c
index 1a2bb68..21a7597 100644
--- a/dlls/comcat/regsvr.c
+++ b/dlls/comcat/regsvr.c
@@ -101,8 +101,6 @@ static LONG register_key_defvalueW(HKEY base, WCHAR const *name,
WCHAR const *value);
static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
char const *value);
-static LONG recursive_delete_key(HKEY key);
-
/***********************************************************************
* register_interfaces
@@ -189,22 +187,12 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list)
for (; res == ERROR_SUCCESS && list->iid; ++list) {
WCHAR buf[39];
- HKEY iid_key;
StringFromGUID2(list->iid, buf, 39);
- res = RegOpenKeyExW(interface_key, buf, 0,
- KEY_READ | KEY_WRITE, &iid_key);
- if (res == ERROR_FILE_NOT_FOUND) {
- res = ERROR_SUCCESS;
- continue;
- }
- if (res != ERROR_SUCCESS) goto error_close_interface_key;
- res = recursive_delete_key(iid_key);
- RegCloseKey(iid_key);
- if (res != ERROR_SUCCESS) goto error_close_interface_key;
+ res = RegDeleteTreeW(interface_key, buf);
+ if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
}
-error_close_interface_key:
RegCloseKey(interface_key);
error_return:
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
@@ -287,23 +275,12 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
for (; res == ERROR_SUCCESS && list->clsid; ++list) {
WCHAR buf[39];
- HKEY clsid_key;
StringFromGUID2(list->clsid, buf, 39);
- res = RegOpenKeyExW(coclass_key, buf, 0,
- KEY_READ | KEY_WRITE, &clsid_key);
- if (res == ERROR_FILE_NOT_FOUND) {
- res = ERROR_SUCCESS;
- continue;
- }
- if (res != ERROR_SUCCESS) goto error_close_coclass_key;
- res = recursive_delete_key(clsid_key);
- RegCloseKey(clsid_key);
- if (res != ERROR_SUCCESS) goto error_close_coclass_key;
+ res = RegDeleteTreeW(coclass_key, buf);
+ if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
}
-error_close_coclass_key:
- RegCloseKey(coclass_key);
error_return:
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
}
@@ -360,38 +337,6 @@ static LONG register_key_defvalueA(
}
/***********************************************************************
- * recursive_delete_key
- */
-static LONG recursive_delete_key(HKEY key)
-{
- LONG res;
- WCHAR subkey_name[MAX_PATH];
- DWORD cName;
- HKEY subkey;
-
- for (;;) {
- cName = sizeof(subkey_name) / sizeof(WCHAR);
- res = RegEnumKeyExW(key, 0, subkey_name, &cName,
- NULL, NULL, NULL, NULL);
- if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) {
- res = ERROR_SUCCESS; /* presumably we're done enumerating */
- break;
- }
- res = RegOpenKeyExW(key, subkey_name, 0,
- KEY_READ | KEY_WRITE, &subkey);
- if (res == ERROR_FILE_NOT_FOUND) continue;
- if (res != ERROR_SUCCESS) break;
-
- res = recursive_delete_key(subkey);
- RegCloseKey(subkey);
- if (res != ERROR_SUCCESS) break;
- }
-
- if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0);
- return res;
-}
-
-/***********************************************************************
* coclass list
*/
static struct regsvr_coclass const coclass_list[] = {
More information about the wine-cvs
mailing list