From 91f3fc7d59d7435c86cc2b67dc776fd7d9c65ec0 Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Fri, 8 Feb 2002 17:11:22 +0000 Subject: [PATCH] Fixed bug in cache init. --- dlls/msacm/internal.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/msacm/internal.c b/dlls/msacm/internal.c index 99cbbf737b5..d23930b5c1e 100644 --- a/dlls/msacm/internal.c +++ b/dlls/msacm/internal.c @@ -70,11 +70,10 @@ BOOL MSACM_FindFormatTagInCache(WINE_ACMDRIVERID* padid, DWORD fmtTag, LPDWORD i */ static BOOL MSACM_FillCache(PWINE_ACMDRIVERID padid) { - HACMDRIVER had = 0; - int ntag; - ACMDRIVERDETAILSW add; - ACMFORMATDETAILSW aftd; - WAVEFORMATEX wfx; + HACMDRIVER had = 0; + int ntag; + ACMDRIVERDETAILSW add; + ACMFORMATTAGDETAILSW aftd; if (acmDriverOpen(&had, (HACMDRIVERID)padid, 0) != 0) return FALSE; @@ -95,20 +94,17 @@ static BOOL MSACM_FillCache(PWINE_ACMDRIVERID padid) padid->fdwSupport = add.fdwSupport; aftd.cbStruct = sizeof(aftd); - /* don't care about retrieving full struct... so a bare WAVEFORMATEX should do */ - aftd.pwfx = &wfx; - aftd.cbwfx = sizeof(wfx); - + for (ntag = 0; ntag < add.cFormatTags; ntag++) { - aftd.dwFormatIndex = ntag; - if (MSACM_Message(had, ACMDM_FORMAT_DETAILS, (LPARAM)&aftd, ACM_FORMATDETAILSF_INDEX)) { + aftd.dwFormatTagIndex = ntag; + if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, (LPARAM)&aftd, ACM_FORMATTAGDETAILSF_INDEX)) { TRACE("IIOs (%s)\n", padid->pszDriverAlias); goto errCleanUp; } padid->aFormatTag[ntag].dwFormatTag = aftd.dwFormatTag; - padid->aFormatTag[ntag].cbwfx = aftd.cbwfx; + padid->aFormatTag[ntag].cbwfx = aftd.cbFormatSize; } - + acmDriverClose(had, 0); return TRUE;