mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-18 10:38:34 +00:00
Added *Filter* functions.
Misc bug fixes.
This commit is contained in:
parent
e89f6c4466
commit
42cdfcc694
|
@ -67,26 +67,140 @@ MMRESULT WINAPI acmFilterDetailsA(HACMDRIVER had, PACMFILTERDETAILSA pafd,
|
|||
MMRESULT WINAPI acmFilterDetailsW(HACMDRIVER had, PACMFILTERDETAILSW pafd,
|
||||
DWORD fdwDetails)
|
||||
{
|
||||
MMRESULT mmr;
|
||||
ACMFILTERTAGDETAILSA aftd;
|
||||
|
||||
TRACE("(0x%08x, %p, %ld)\n", had, pafd, fdwDetails);
|
||||
|
||||
if (fdwDetails & ~(ACM_FILTERDETAILSF_FILTER))
|
||||
return MMSYSERR_INVALFLAG;
|
||||
|
||||
return MSACM_Message(had, ACMDM_FILTER_DETAILS,
|
||||
(LPARAM) pafd, (LPARAM) fdwDetails);
|
||||
memset(&aftd, 0, sizeof(aftd));
|
||||
aftd.cbStruct = sizeof(aftd);
|
||||
|
||||
if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM;
|
||||
|
||||
switch (fdwDetails) {
|
||||
case ACM_FILTERDETAILSF_FILTER:
|
||||
if (pafd->dwFilterTag != pafd->pwfltr->dwFilterTag) {
|
||||
mmr = MMSYSERR_INVALPARAM;
|
||||
break;
|
||||
}
|
||||
if (had == (HACMDRIVER)NULL) {
|
||||
PWINE_ACMDRIVERID padid;
|
||||
|
||||
mmr = ACMERR_NOTPOSSIBLE;
|
||||
for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) {
|
||||
/* should check for codec only */
|
||||
if (padid->bEnabled &&
|
||||
acmDriverOpen(&had, (HACMDRIVERID)padid, 0) == 0) {
|
||||
mmr = MSACM_Message(had, ACMDM_FILTER_DETAILS,
|
||||
(LPARAM)pafd, (LPARAM)fdwDetails);
|
||||
acmDriverClose(had, 0);
|
||||
if (mmr == MMSYSERR_NOERROR) break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
mmr = MSACM_Message(had, ACMDM_FILTER_DETAILS,
|
||||
(LPARAM)pafd, (LPARAM)fdwDetails);
|
||||
}
|
||||
break;
|
||||
case ACM_FILTERDETAILSF_INDEX:
|
||||
/* should check pafd->dwFilterIndex < aftd->cStandardFilters */
|
||||
mmr = MSACM_Message(had, ACMDM_FILTER_DETAILS,
|
||||
(LPARAM)pafd, (LPARAM)fdwDetails);
|
||||
break;
|
||||
default:
|
||||
WARN("Unknown fdwDetails %08lx\n", fdwDetails);
|
||||
mmr = MMSYSERR_INVALFLAG;
|
||||
break;
|
||||
}
|
||||
|
||||
TRACE("=> %d\n", mmr);
|
||||
return mmr;
|
||||
}
|
||||
|
||||
struct MSACM_FilterEnumWtoA_Instance {
|
||||
PACMFILTERDETAILSA pafda;
|
||||
DWORD dwInstance;
|
||||
ACMFILTERENUMCBA fnCallback;
|
||||
};
|
||||
|
||||
static BOOL CALLBACK MSACM_FilterEnumCallbackWtoA(HACMDRIVERID hadid,
|
||||
PACMFILTERDETAILSW pafdw,
|
||||
DWORD dwInstance,
|
||||
DWORD fdwSupport)
|
||||
{
|
||||
struct MSACM_FilterEnumWtoA_Instance* pafei;
|
||||
|
||||
pafei = (struct MSACM_FilterEnumWtoA_Instance*)dwInstance;
|
||||
|
||||
pafei->pafda->dwFilterIndex = pafdw->dwFilterIndex;
|
||||
pafei->pafda->dwFilterTag = pafdw->dwFilterTag;
|
||||
pafei->pafda->fdwSupport = pafdw->fdwSupport;
|
||||
lstrcpyWtoA(pafei->pafda->szFilter, pafdw->szFilter);
|
||||
|
||||
return (pafei->fnCallback)(hadid, pafei->pafda,
|
||||
pafei->dwInstance, fdwSupport);
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* acmFilterEnumA (MSACM32.17)
|
||||
*/
|
||||
MMRESULT WINAPI acmFilterEnumA(HACMDRIVER had, PACMFILTERDETAILSA pafd,
|
||||
MMRESULT WINAPI acmFilterEnumA(HACMDRIVER had, PACMFILTERDETAILSA pafda,
|
||||
ACMFILTERENUMCBA fnCallback, DWORD dwInstance,
|
||||
DWORD fdwEnum)
|
||||
{
|
||||
FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
|
||||
had, pafd, fnCallback, dwInstance, fdwEnum);
|
||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
return MMSYSERR_ERROR;
|
||||
ACMFILTERDETAILSW afdw;
|
||||
struct MSACM_FilterEnumWtoA_Instance afei;
|
||||
|
||||
memset(&afdw, 0, sizeof(afdw));
|
||||
afdw.cbStruct = sizeof(afdw);
|
||||
afdw.dwFilterIndex = pafda->dwFilterIndex;
|
||||
afdw.dwFilterTag = pafda->dwFilterTag;
|
||||
afdw.pwfltr = pafda->pwfltr;
|
||||
afdw.cbwfltr = pafda->cbwfltr;
|
||||
|
||||
afei.pafda = pafda;
|
||||
afei.dwInstance = dwInstance;
|
||||
afei.fnCallback = fnCallback;
|
||||
|
||||
return acmFilterEnumW(had, &afdw, MSACM_FilterEnumCallbackWtoA,
|
||||
(DWORD)&afei, fdwEnum);
|
||||
}
|
||||
|
||||
static BOOL MSACM_FilterEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had,
|
||||
PACMFILTERDETAILSW pafd,
|
||||
ACMFILTERENUMCBW fnCallback, DWORD dwInstance,
|
||||
DWORD fdwEnum)
|
||||
{
|
||||
ACMDRIVERDETAILSW add;
|
||||
ACMFILTERTAGDETAILSW aftd;
|
||||
int i, j;
|
||||
|
||||
add.cbStruct = sizeof(add);
|
||||
|
||||
if (acmDriverDetailsW((HACMDRIVERID)padid, &add, 0) != MMSYSERR_NOERROR) return FALSE;
|
||||
|
||||
for (i = 0; i < add.cFilterTags; i++) {
|
||||
memset(&aftd, 0, sizeof(aftd));
|
||||
aftd.cbStruct = sizeof(aftd);
|
||||
aftd.dwFilterTagIndex = i;
|
||||
if (acmFilterTagDetailsW(had, &aftd, ACM_FILTERTAGDETAILSF_INDEX) != MMSYSERR_NOERROR)
|
||||
continue;
|
||||
|
||||
if ((fdwEnum & ACM_FILTERENUMF_DWFILTERTAG) &&
|
||||
aftd.dwFilterTag != pafd->pwfltr->dwFilterTag)
|
||||
continue;
|
||||
|
||||
for (j = 0; j < aftd.cStandardFilters; j++) {
|
||||
pafd->dwFilterIndex = j;
|
||||
pafd->dwFilterTag = aftd.dwFilterTag;
|
||||
if (acmFilterDetailsW(had, pafd, ACM_FILTERDETAILSF_INDEX) != MMSYSERR_NOERROR)
|
||||
continue;
|
||||
|
||||
if (!(fnCallback)((HACMDRIVERID)padid, pafd, dwInstance, add.fdwSupport))
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
@ -96,10 +210,35 @@ MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd,
|
|||
ACMFILTERENUMCBW fnCallback, DWORD dwInstance,
|
||||
DWORD fdwEnum)
|
||||
{
|
||||
FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
|
||||
PWINE_ACMDRIVERID padid;
|
||||
BOOL ret;
|
||||
|
||||
TRACE("(0x%08x, %p, %p, %ld, %ld)\n",
|
||||
had, pafd, fnCallback, dwInstance, fdwEnum);
|
||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
return MMSYSERR_ERROR;
|
||||
|
||||
if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM;
|
||||
|
||||
if (fdwEnum & ~(ACM_FILTERENUMF_DWFILTERTAG))
|
||||
FIXME("Unsupported fdwEnum values\n");
|
||||
|
||||
if (had) {
|
||||
HACMDRIVERID hadid;
|
||||
|
||||
if (acmDriverID(had, &hadid, 0) != MMSYSERR_NOERROR)
|
||||
return MMSYSERR_INVALHANDLE;
|
||||
return MSACM_FilterEnumHelper(MSACM_GetDriverID(hadid), had, pafd,
|
||||
fnCallback, dwInstance, fdwEnum);
|
||||
}
|
||||
for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) {
|
||||
/* should check for codec only */
|
||||
if (!padid->bEnabled || acmDriverOpen(&had, (HACMDRIVERID)padid, 0) != MMSYSERR_NOERROR)
|
||||
continue;
|
||||
ret = MSACM_FilterEnumHelper(padid, had, pafd,
|
||||
fnCallback, dwInstance, fdwEnum);
|
||||
acmDriverClose(had, 0);
|
||||
if (!ret) break;
|
||||
}
|
||||
return MMSYSERR_NOERROR;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
@ -134,28 +273,132 @@ MMRESULT WINAPI acmFilterTagDetailsA(HACMDRIVER had, PACMFILTERTAGDETAILSA paftd
|
|||
MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
|
||||
DWORD fdwDetails)
|
||||
{
|
||||
PWINE_ACMDRIVERID padid;
|
||||
MMRESULT mmr;
|
||||
|
||||
TRACE("(0x%08x, %p, %ld)\n", had, paftd, fdwDetails);
|
||||
|
||||
if (fdwDetails &
|
||||
~(ACM_FILTERTAGDETAILSF_FILTERTAG|
|
||||
ACM_FILTERTAGDETAILSF_LARGESTSIZE))
|
||||
if (fdwDetails & ~(ACM_FILTERTAGDETAILSF_FILTERTAG|ACM_FILTERTAGDETAILSF_INDEX|
|
||||
ACM_FILTERTAGDETAILSF_LARGESTSIZE))
|
||||
return MMSYSERR_INVALFLAG;
|
||||
|
||||
return MSACM_Message(had, ACMDM_FILTERTAG_DETAILS,
|
||||
(LPARAM)paftd, (LPARAM)fdwDetails);
|
||||
|
||||
switch (fdwDetails) {
|
||||
case ACM_FILTERTAGDETAILSF_FILTERTAG:
|
||||
if (had == (HACMDRIVER)NULL) {
|
||||
mmr = ACMERR_NOTPOSSIBLE;
|
||||
for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) {
|
||||
/* should check for codec only */
|
||||
if (padid->bEnabled && acmDriverOpen(&had, (HACMDRIVERID)padid, 0) == 0) {
|
||||
mmr = MSACM_Message(had, ACMDM_FILTERTAG_DETAILS,
|
||||
(LPARAM)paftd, (LPARAM)fdwDetails);
|
||||
acmDriverClose(had, 0);
|
||||
if (mmr == MMSYSERR_NOERROR) break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
mmr = MSACM_Message(had, ACMDM_FILTERTAG_DETAILS,
|
||||
(LPARAM)paftd, (LPARAM)fdwDetails);
|
||||
}
|
||||
break;
|
||||
|
||||
case ACM_FILTERTAGDETAILSF_INDEX:
|
||||
/* FIXME should check paftd->dwFilterTagIndex < add.cFilterTags */
|
||||
mmr = MSACM_Message(had, ACMDM_FILTERTAG_DETAILS,
|
||||
(LPARAM)paftd, (LPARAM)fdwDetails);
|
||||
break;
|
||||
|
||||
case ACM_FILTERTAGDETAILSF_LARGESTSIZE:
|
||||
if (had == (HACMDRIVER)NULL) {
|
||||
ACMFILTERTAGDETAILSW tmp;
|
||||
DWORD ft = paftd->dwFilterTag;
|
||||
|
||||
mmr = ACMERR_NOTPOSSIBLE;
|
||||
for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) {
|
||||
/* should check for codec only */
|
||||
if (padid->bEnabled &&
|
||||
acmDriverOpen(&had, (HACMDRIVERID)padid, 0) == 0) {
|
||||
|
||||
memset(&tmp, 0, sizeof(tmp));
|
||||
tmp.cbStruct = sizeof(tmp);
|
||||
tmp.dwFilterTag = ft;
|
||||
|
||||
if (MSACM_Message(had, ACMDM_FILTERTAG_DETAILS,
|
||||
(LPARAM)&tmp,
|
||||
(LPARAM)fdwDetails) == MMSYSERR_NOERROR) {
|
||||
if (mmr == ACMERR_NOTPOSSIBLE ||
|
||||
paftd->cbFilterSize < tmp.cbFilterSize) {
|
||||
*paftd = tmp;
|
||||
mmr = MMSYSERR_NOERROR;
|
||||
}
|
||||
}
|
||||
acmDriverClose(had, 0);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
mmr = MSACM_Message(had, ACMDM_FILTERTAG_DETAILS,
|
||||
(LPARAM)paftd, (LPARAM)fdwDetails);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
WARN("Unsupported fdwDetails=%08lx\n", fdwDetails);
|
||||
mmr = MMSYSERR_ERROR;
|
||||
}
|
||||
|
||||
if (mmr == MMSYSERR_NOERROR &&
|
||||
paftd->dwFilterTag == WAVE_FORMAT_PCM && paftd->szFilterTag[0] == 0)
|
||||
lstrcpyAtoW(paftd->szFilterTag, "PCM");
|
||||
|
||||
return mmr;
|
||||
}
|
||||
|
||||
struct MSACM_FilterTagEnumWtoA_Instance {
|
||||
PACMFILTERTAGDETAILSA paftda;
|
||||
DWORD dwInstance;
|
||||
ACMFILTERTAGENUMCBA fnCallback;
|
||||
};
|
||||
|
||||
static BOOL CALLBACK MSACM_FilterTagEnumCallbackWtoA(HACMDRIVERID hadid,
|
||||
PACMFILTERTAGDETAILSW paftdw,
|
||||
DWORD dwInstance,
|
||||
DWORD fdwSupport)
|
||||
{
|
||||
struct MSACM_FilterTagEnumWtoA_Instance* paftei;
|
||||
|
||||
paftei = (struct MSACM_FilterTagEnumWtoA_Instance*)dwInstance;
|
||||
|
||||
paftei->paftda->dwFilterTagIndex = paftdw->dwFilterTagIndex;
|
||||
paftei->paftda->dwFilterTag = paftdw->dwFilterTag;
|
||||
paftei->paftda->cbFilterSize = paftdw->cbFilterSize;
|
||||
paftei->paftda->fdwSupport = paftdw->fdwSupport;
|
||||
paftei->paftda->cStandardFilters = paftdw->cStandardFilters;
|
||||
lstrcpyWtoA(paftei->paftda->szFilterTag, paftdw->szFilterTag);
|
||||
|
||||
return (paftei->fnCallback)(hadid, paftei->paftda,
|
||||
paftei->dwInstance, fdwSupport);
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* acmFilterTagEnumA (MSACM32.21)
|
||||
*/
|
||||
MMRESULT WINAPI acmFilterTagEnumA(HACMDRIVER had, PACMFILTERTAGDETAILSA paftd,
|
||||
MMRESULT WINAPI acmFilterTagEnumA(HACMDRIVER had, PACMFILTERTAGDETAILSA paftda,
|
||||
ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance,
|
||||
DWORD fdwEnum)
|
||||
{
|
||||
FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
|
||||
had, paftd, fnCallback, dwInstance, fdwEnum);
|
||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
return MMSYSERR_ERROR;
|
||||
ACMFILTERTAGDETAILSW aftdw;
|
||||
struct MSACM_FilterTagEnumWtoA_Instance aftei;
|
||||
|
||||
memset(&aftdw, 0, sizeof(aftdw));
|
||||
aftdw.cbStruct = sizeof(aftdw);
|
||||
aftdw.dwFilterTagIndex = paftda->dwFilterTagIndex;
|
||||
aftdw.dwFilterTag = paftda->dwFilterTag;
|
||||
|
||||
aftei.paftda = paftda;
|
||||
aftei.dwInstance = dwInstance;
|
||||
aftei.fnCallback = fnCallback;
|
||||
|
||||
return acmFilterTagEnumW(had, &aftdw, MSACM_FilterTagEnumCallbackWtoA,
|
||||
(DWORD)&aftei, fdwEnum);
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
@ -165,8 +408,36 @@ MMRESULT WINAPI acmFilterTagEnumW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
|
|||
ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance,
|
||||
DWORD fdwEnum)
|
||||
{
|
||||
FIXME("(0x%08x, %p, %p, %ld, %ld): stub\n",
|
||||
had, paftd, fnCallback, dwInstance, fdwEnum);
|
||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
return MMSYSERR_ERROR;
|
||||
PWINE_ACMDRIVERID padid;
|
||||
ACMDRIVERDETAILSW add;
|
||||
int i;
|
||||
|
||||
TRACE("(0x%08x, %p, %p, %ld, %ld)\n",
|
||||
had, paftd, fnCallback, dwInstance, fdwEnum);
|
||||
|
||||
if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM;
|
||||
|
||||
if (had) FIXME("had != NULL, not supported\n");
|
||||
|
||||
for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) {
|
||||
/* should check for codec only */
|
||||
if (padid->bEnabled && acmDriverOpen(&had, (HACMDRIVERID)padid, 0) == MMSYSERR_NOERROR) {
|
||||
add.cbStruct = sizeof(add);
|
||||
|
||||
if (acmDriverDetailsW((HACMDRIVERID)padid, &add, 0) == MMSYSERR_NOERROR) {
|
||||
for (i = 0; i < add.cFilterTags; i++) {
|
||||
paftd->dwFilterTagIndex = i;
|
||||
if (acmFilterTagDetailsW(had, paftd, ACM_FILTERTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) {
|
||||
if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance,
|
||||
add.fdwSupport)) {
|
||||
padid = NULL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
acmDriverClose(had, 0);
|
||||
}
|
||||
return MMSYSERR_NOERROR;
|
||||
}
|
||||
|
|
|
@ -303,8 +303,10 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd,
|
|||
|
||||
switch (fdwDetails) {
|
||||
case ACM_FORMATDETAILSF_FORMAT:
|
||||
if (pafd->dwFormatTag != pafd->pwfx->wFormatTag)
|
||||
if (pafd->dwFormatTag != pafd->pwfx->wFormatTag) {
|
||||
mmr = MMSYSERR_INVALPARAM;
|
||||
break;
|
||||
}
|
||||
if (had == (HACMDRIVER)NULL) {
|
||||
PWINE_ACMDRIVERID padid;
|
||||
|
||||
|
|
|
@ -132,10 +132,12 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pw
|
|||
pwfxDst->wFormatTag, pwfxDst->nChannels, pwfxDst->nSamplesPerSec, pwfxDst->nAvgBytesPerSec,
|
||||
pwfxDst->nBlockAlign, pwfxDst->wBitsPerSample, pwfxDst->cbSize);
|
||||
|
||||
#define SIZEOF_WFX(wfx) (sizeof(WAVEFORMATEX) + ((wfx->wFormatTag == WAVE_FORMAT_PCM) ? 0 : wfx->cbSize))
|
||||
wfxSrcSize = SIZEOF_WFX(pwfxSrc);
|
||||
wfxDstSize = SIZEOF_WFX(pwfxDst);
|
||||
#undef SIZEOF_WFX
|
||||
if ((fdwOpen & ACM_STREAMOPENF_QUERY) && phas) return MMSYSERR_INVALPARAM;
|
||||
if (pwfltr && (pwfxSrc->wFormatTag != pwfxDst->wFormatTag)) return MMSYSERR_INVALPARAM;
|
||||
|
||||
wfxSrcSize = wfxDstSize = sizeof(WAVEFORMATEX);
|
||||
if (pwfxSrc->wFormatTag != WAVE_FORMAT_PCM) wfxSrcSize += pwfxSrc->cbSize;
|
||||
if (pwfxDst->wFormatTag != WAVE_FORMAT_PCM) wfxDstSize += pwfxDst->cbSize;
|
||||
|
||||
was = HeapAlloc(MSACM_hHeap, 0, sizeof(*was) + wfxSrcSize + wfxDstSize + ((pwfltr) ? sizeof(WAVEFILTER) : 0));
|
||||
if (was == NULL)
|
||||
|
|
Loading…
Reference in a new issue