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

dpnet: Remove 'recursive registry key delete' function.

This commit is contained in:
Stefan Leichter 2007-08-29 21:07:03 +02:00 committed by Alexandre Julliard
parent afc85e91ab
commit af66d215b3
1 changed files with 8 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
dlls/dpnet/regsvr.c
View File

@ -117,9 +117,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
static LONG register_progid(WCHAR const *clsid, static LONG register_progid(WCHAR const *clsid,
char const *progid, char const *curver_progid, char const *progid, char const *curver_progid,
char const *name, char const *extra); char const *name, char const *extra);
static LONG recursive_delete_key(HKEY key);
static LONG recursive_delete_keyA(HKEY base, char const *name);
static LONG recursive_delete_keyW(HKEY base, WCHAR const *name);
/*********************************************************************** /***********************************************************************
* register_interfaces * register_interfaces
@ -208,7 +205,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list)
WCHAR buf[39]; WCHAR buf[39];
StringFromGUID2(list->iid, buf, 39); StringFromGUID2(list->iid, buf, 39);
res = recursive_delete_keyW(interface_key, buf); res = RegDeleteTreeW(interface_key, buf);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
} }
RegCloseKey(interface_key); RegCloseKey(interface_key);
@ -315,16 +313,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
WCHAR buf[39]; WCHAR buf[39];
StringFromGUID2(list->clsid, buf, 39); StringFromGUID2(list->clsid, buf, 39);
res = recursive_delete_keyW(coclass_key, buf); res = RegDeleteTreeW(coclass_key, buf);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (res != ERROR_SUCCESS) goto error_close_coclass_key;
if (list->progid) { if (list->progid) {
res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (res != ERROR_SUCCESS) goto error_close_coclass_key;
} }
if (list->viprogid) { if (list->viprogid) {
res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid);
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (res != ERROR_SUCCESS) goto error_close_coclass_key;
} }
} }
@ -436,70 +437,6 @@ error_close_progid_key:
return res; return res;
} }
/***********************************************************************
* 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;
}
/***********************************************************************
* recursive_delete_keyA
*/
static LONG recursive_delete_keyA(HKEY base, char const *name)
{
LONG res;
HKEY key;
res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key);
if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS;
if (res != ERROR_SUCCESS) return res;
res = recursive_delete_key(key);
RegCloseKey(key);
return res;
}
/***********************************************************************
* recursive_delete_keyW
*/
static LONG recursive_delete_keyW(HKEY base, WCHAR const *name)
{
LONG res;
HKEY key;
res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key);
if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS;
if (res != ERROR_SUCCESS) return res;
res = recursive_delete_key(key);
RegCloseKey(key);
return res;
}
/*********************************************************************** /***********************************************************************
* coclass list * coclass list
*/ */