From: Thomas Heller <theller@ctypes.org>
Date: Wed, 14 Jul 2004 14:56:11 +0000 (+0000)
Subject: Don't complain that non-existant registry entries cannot be deleted.
X-Git-Tag: v2.3.5c1~176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7580c277677ae0516b4665bb67a27f3af2d4f11;p=thirdparty%2FPython%2Fcpython.git

Don't complain that non-existant registry entries cannot be deleted.

Backported from trunk.
---

diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c
index ec28f8aa8232..e9308c9cd199 100644
--- a/PC/bdist_wininst/install.c
+++ b/PC/bdist_wininst/install.c
@@ -1982,7 +1982,7 @@ void DeleteRegistryKey(char *string)
 		MessageBox(GetFocus(), string, "Could not open key", MB_OK);
 	else {
 		result = RegDeleteKey(hKey, subkeyname);
-		if (result != ERROR_SUCCESS)
+		if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND)
 			MessageBox(GetFocus(), string, "Could not delete key", MB_OK);
 		RegCloseKey(hKey);
 	}
@@ -2024,7 +2024,7 @@ void DeleteRegistryValue(char *string)
 		MessageBox(GetFocus(), string, "Could not open key", MB_OK);
 	else {
 		result = RegDeleteValue(hKey, valuename);
-		if (result != ERROR_SUCCESS)
+		if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND)
 			MessageBox(GetFocus(), string, "Could not delete value", MB_OK);
 		RegCloseKey(hKey);
 	}