quartz: Added some error checking on failure to CreateClassEnumerator.

ccad9657 · Marcus Meissner · Alexandre Julliard · 2e5a48be · ccad9657
Commit ccad9657 authored Jun 03, 2007 by Marcus Meissner Committed by Alexandre Julliard Jun 04, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

filtermapper.c dlls/quartz/filtermapper.c +7 -2

No files found.
--- a/dlls/quartz/filtermapper.c
+++ b/dlls/quartz/filtermapper.c
@@ -962,9 +962,14 @@ static HRESULT WINAPI FilterMapper2_EnumMatchingFilters(
    *ppEnum = NULL;

    hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&pCreateDevEnum);
+    if (FAILED(hr))
+        return hr;

-    if (SUCCEEDED(hr))
-        hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &CLSID_ActiveMovieCategories, &pEnumCat, 0);
+    hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &CLSID_ActiveMovieCategories, &pEnumCat, 0);
+    if (FAILED(hr)) {
+        ICreateDevEnum_Release(pCreateDevEnum);
+        return hr;
+    }

    while (IEnumMoniker_Next(pEnumCat, 1, &pMonikerCat, NULL) == S_OK)
    {