msdmo: Fix RegOpenKeyExW() failure condition.
Spotted by Mark Harmstone.
This commit is contained in:
parent
5c91d011bb
commit
6eab498160
|
@ -364,6 +364,7 @@ static HRESULT IEnumDMO_Constructor(
|
||||||
IEnumDMOImpl* lpedmo;
|
IEnumDMOImpl* lpedmo;
|
||||||
HRESULT hr = S_OK;
|
HRESULT hr = S_OK;
|
||||||
UINT size;
|
UINT size;
|
||||||
|
LONG ret;
|
||||||
|
|
||||||
*obj = NULL;
|
*obj = NULL;
|
||||||
|
|
||||||
|
@ -406,8 +407,8 @@ static HRESULT IEnumDMO_Constructor(
|
||||||
/* If not filtering by category enum from media objects root */
|
/* If not filtering by category enum from media objects root */
|
||||||
if (IsEqualGUID(guidCategory, &GUID_NULL))
|
if (IsEqualGUID(guidCategory, &GUID_NULL))
|
||||||
{
|
{
|
||||||
if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey))
|
if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey)))
|
||||||
hr = E_FAIL;
|
hr = HRESULT_FROM_WIN32(ret);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -416,8 +417,8 @@ static HRESULT IEnumDMO_Constructor(
|
||||||
|
|
||||||
wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories,
|
wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories,
|
||||||
GUIDToString(szguid, guidCategory));
|
GUIDToString(szguid, guidCategory));
|
||||||
if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey))
|
if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey)))
|
||||||
hr = E_FAIL;
|
hr = HRESULT_FROM_WIN32(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
lerr:
|
lerr:
|
||||||
|
|
Loading…
Reference in New Issue