Commit 2fd8388c authored by James Hatheway's avatar James Hatheway Committed by Alexandre Julliard

acmDriverEnumW shouldn't return MMSYSERR_ERROR if

acmDriverEnumCallback returns TRUE.
parent d2b850e8
...@@ -230,8 +230,9 @@ MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd, ...@@ -230,8 +230,9 @@ MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd,
if (acmDriverID(had, &hadid, 0) != MMSYSERR_NOERROR) if (acmDriverID(had, &hadid, 0) != MMSYSERR_NOERROR)
return MMSYSERR_INVALHANDLE; return MMSYSERR_INVALHANDLE;
return MSACM_FilterEnumHelper(MSACM_GetDriverID(hadid), had, pafd, MSACM_FilterEnumHelper(MSACM_GetDriverID(hadid), had, pafd,
fnCallback, dwInstance, fdwEnum); fnCallback, dwInstance, fdwEnum);
return MMSYSERR_NOERROR;
} }
for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) { for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) {
/* should check for codec only */ /* should check for codec only */
......
...@@ -498,8 +498,9 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, ...@@ -498,8 +498,9 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd,
if (acmDriverID(had, &hadid, 0) != MMSYSERR_NOERROR) if (acmDriverID(had, &hadid, 0) != MMSYSERR_NOERROR)
return MMSYSERR_INVALHANDLE; return MMSYSERR_INVALHANDLE;
return MSACM_FormatEnumHelper(MSACM_GetDriverID(hadid), had, pafd, &wfxRef, MSACM_FormatEnumHelper(MSACM_GetDriverID(hadid), had, pafd, &wfxRef,
fnCallback, dwInstance, fdwEnum); fnCallback, dwInstance, fdwEnum);
return MMSYSERR_NOERROR;
} }
for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) { for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) {
/* should check for codec only */ /* should check for codec only */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment