diff options
Diffstat (limited to 'src/burn/engine/registration.cpp')
-rw-r--r-- | src/burn/engine/registration.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/burn/engine/registration.cpp b/src/burn/engine/registration.cpp index 4088004d..147865fa 100644 --- a/src/burn/engine/registration.cpp +++ b/src/burn/engine/registration.cpp | |||
@@ -910,7 +910,6 @@ extern "C" HRESULT RegistrationSessionEnd( | |||
910 | { | 910 | { |
911 | HRESULT hr = S_OK; | 911 | HRESULT hr = S_OK; |
912 | LPWSTR sczRebootRequiredKey = NULL; | 912 | LPWSTR sczRebootRequiredKey = NULL; |
913 | LPWSTR sczVariableKey = NULL; | ||
914 | HKEY hkRebootRequired = NULL; | 913 | HKEY hkRebootRequired = NULL; |
915 | HKEY hkRegistration = NULL; | 914 | HKEY hkRegistration = NULL; |
916 | 915 | ||
@@ -958,19 +957,8 @@ extern "C" HRESULT RegistrationSessionEnd( | |||
958 | 957 | ||
959 | RemoveSoftwareTags(pVariables, &pRegistration->softwareTags); | 958 | RemoveSoftwareTags(pVariables, &pRegistration->softwareTags); |
960 | 959 | ||
961 | // build variable registry key path | ||
962 | hr = StrAllocFormatted(&sczVariableKey, L"%s\\%s", pRegistration->sczRegistrationKey, REGISTRY_BUNDLE_VARIABLE_KEY); | ||
963 | ExitOnFailure(hr, "Failed to build variable registry key path."); | ||
964 | |||
965 | // Delete registration variable key. | ||
966 | hr = RegDelete(pRegistration->hkRoot, sczVariableKey, REG_KEY_DEFAULT, FALSE); | ||
967 | if (E_FILENOTFOUND != hr) | ||
968 | { | ||
969 | ExitOnFailure(hr, "Failed to delete registration variable key: %ls", sczVariableKey); | ||
970 | } | ||
971 | |||
972 | // Delete registration key. | 960 | // Delete registration key. |
973 | hr = RegDelete(pRegistration->hkRoot, pRegistration->sczRegistrationKey, REG_KEY_DEFAULT, FALSE); | 961 | hr = RegDelete(pRegistration->hkRoot, pRegistration->sczRegistrationKey, REG_KEY_DEFAULT, TRUE); |
974 | if (E_FILENOTFOUND != hr) | 962 | if (E_FILENOTFOUND != hr) |
975 | { | 963 | { |
976 | ExitOnFailure(hr, "Failed to delete registration key: %ls", pRegistration->sczRegistrationKey); | 964 | ExitOnFailure(hr, "Failed to delete registration key: %ls", pRegistration->sczRegistrationKey); |
@@ -998,7 +986,6 @@ extern "C" HRESULT RegistrationSessionEnd( | |||
998 | LExit: | 986 | LExit: |
999 | ReleaseRegKey(hkRegistration); | 987 | ReleaseRegKey(hkRegistration); |
1000 | ReleaseRegKey(hkRebootRequired); | 988 | ReleaseRegKey(hkRebootRequired); |
1001 | ReleaseStr(sczVariableKey); | ||
1002 | ReleaseStr(sczRebootRequiredKey); | 989 | ReleaseStr(sczRebootRequiredKey); |
1003 | 990 | ||
1004 | return hr; | 991 | return hr; |