From cd5fa7dedb5ccd05bca19e87ea574e2053e33c0a Mon Sep 17 00:00:00 2001 From: Alexander Dorofeyev Date: Sun, 29 Jun 2008 15:07:53 +0300 Subject: [PATCH] quartz: Improve removal of registry data in Filtermapper unregister methods. --- dlls/quartz/filtermapper.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index bc8d4c8740f..06ec3343a6f 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1571,8 +1571,14 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID if (SUCCEEDED(hr)) { - lRet = RegDeleteKeyW(hKey, wszMeritName); - hr = HRESULT_FROM_WIN32(lRet); + 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); + CloseHandle(hKey); } @@ -1628,7 +1634,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi strcatW(wszPinNameKey, wszSlash); strcatW(wszPinNameKey, Name); - lRet = RegDeleteKeyW(hKey, wszPinNameKey); + lRet = RegDeleteTreeW(hKey, wszPinNameKey); hr = HRESULT_FROM_WIN32(lRet); CoTaskMemFree(wszPinNameKey); } -- 2.11.4.GIT