appwiz.cpl: Remove list entries left over from an earlier uninstall (try 2)
Hugh McMaster
hugh.mcmaster at outlook.com
Fri Dec 16 06:20:40 CST 2016
Fixes bugs 41609 and 40845.
Currently, the root HKEY is closed before use, making it invalid.
Changes since version 1:
Duplicate the HKEY using RegOpenKeyEx() instead of SHRegDuplicateHKey().
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
dlls/appwiz.cpl/appwiz.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c
index 9d53e79..dd84827 100644
--- a/dlls/appwiz.cpl/appwiz.c
+++ b/dlls/appwiz.cpl/appwiz.c
@@ -298,7 +298,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root)
}
/* registry key */
- info->regroot = root;
+ RegOpenKeyExW(root, NULL, 0, KEY_READ, &info->regroot);
lstrcpyW(info->regkey, subKeyName);
info->path = command;
@@ -497,7 +497,6 @@ static void UninstallProgram(int id, DWORD button)
PROCESS_INFORMATION info;
WCHAR errormsg[MAX_STRING_LEN];
WCHAR sUninstallFailed[MAX_STRING_LEN];
- HKEY hkey;
BOOL res;
LoadStringW(hInst, IDS_UNINSTALL_FAILED, sUninstallFailed,
@@ -533,9 +532,8 @@ static void UninstallProgram(int id, DWORD button)
MB_ICONQUESTION) == IDYES)
{
/* delete the application's uninstall entry */
- RegOpenKeyExW(iter->regroot, PathUninstallW, 0, KEY_READ, &hkey);
- RegDeleteKeyW(hkey, iter->regkey);
- RegCloseKey(hkey);
+ RegDeleteKeyW(iter->regroot, iter->regkey);
+ RegCloseKey(iter->regroot);
}
}
--
2.7.4
More information about the wine-patches
mailing list