Marcus Meissner : quartz:
Added some error checking on failure to CreateClassEnumerator.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jun 4 08:14:25 CDT 2007
Module: wine
Branch: master
Commit: ccad96578d273e672a3492a2a7f2e11663ae4640
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccad96578d273e672a3492a2a7f2e11663ae4640
Author: Marcus Meissner <marcus at jet.franken.de>
Date: Sun Jun 3 12:51:52 2007 +0200
quartz: Added some error checking on failure to CreateClassEnumerator.
---
dlls/quartz/filtermapper.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c
index 6adce61..a45f477 100644
--- 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)
{
More information about the wine-cvs
mailing list