[PATCH v2 3/4] quartz: Don't fail FilterMapper_UnregisterFilter() if the CLSID doesn't exist.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/quartz/filtermapper.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c
index 4e4cb37..2c93047 100644
--- a/dlls/quartz/filtermapper.c
+++ b/dlls/quartz/filtermapper.c
@@ -1522,21 +1522,12 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID
         strcpyW(wszKeyName, wszClsidSlash);
         strcatW(wszKeyName, wszClsid);
 
-        lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey);
-        hr = HRESULT_FROM_WIN32(lRet);
-    }
-
-    if (SUCCEEDED(hr))
-    {
-        lRet = RegDeleteValueW(hKey, wszMeritName);
-        if (lRet != ERROR_SUCCESS)
-            hr = HRESULT_FROM_WIN32(lRet);
-
-        lRet = RegDeleteTreeW(hKey, wszPins);
-        if (lRet != ERROR_SUCCESS)
-            hr = HRESULT_FROM_WIN32(lRet);
-
-        RegCloseKey(hKey);
+        if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey))
+        {
+            RegDeleteValueW(hKey, wszMeritName);
+            RegDeleteTreeW(hKey, wszPins);
+            RegCloseKey(hKey);
+        }
     }
 
     CoTaskMemFree(wszClsid);
-- 
2.7.4