system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed opening of some drivers.

Browse source
This commit is contained in:
Eric Pouech 2001-04-13 22:28:19 +00:00 committed by Alexandre Julliard
parent 1b9e33df0c
commit 3c03f75c02
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
dlls/msacm/driver.c
View file

@ -235,6 +235,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe
{ {
PWINE_ACMDRIVERID padid; PWINE_ACMDRIVERID padid;
PWINE_ACMDRIVER pad; PWINE_ACMDRIVER pad;
MMRESULT ret = MMSYSERR_ERROR;
TRACE("(%p, %x, %08lu)\n", phad, hadid, fdwOpen); TRACE("(%p, %x, %08lu)\n", phad, hadid, fdwOpen);
@ -253,12 +254,24 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe
pad->obj.dwType = WINE_ACMOBJ_DRIVER; pad->obj.dwType = WINE_ACMOBJ_DRIVER;
pad->obj.pACMDriverID = padid; pad->obj.pACMDriverID = padid;
if (!(pad->hDrvr = padid->hInstModule) && padid->pszDriverAlias) if (!(pad->hDrvr = padid->hInstModule) && padid->pszDriverAlias) {
pad->hDrvr = OpenDriverA(padid->pszDriverAlias, NULL, 0); ACMDRVOPENDESCW adod;
if (!pad->hDrvr) {
HeapFree(MSACM_hHeap, 0, pad); adod.cbStruct = sizeof(adod);
return MMSYSERR_ERROR; adod.fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC;
adod.fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED;
adod.dwVersion = acmGetVersion();
adod.dwFlags = fdwOpen;
adod.dwError = 0;
adod.pszSectionName = (LPCWSTR)"\0"; /* FIXME */
adod.pszAliasName = (LPCWSTR)"\0"; /* FIXME */
adod.dnDevNode = 0;
if (!(pad->hDrvr = OpenDriverA(padid->pszDriverAlias, NULL, (DWORD)&adod))) {
ret = adod.dwError;
goto gotError;
}
} }
/* insert new pad at beg of list */ /* insert new pad at beg of list */
@ -269,6 +282,10 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe
*phad = (HACMDRIVER)pad; *phad = (HACMDRIVER)pad;
TRACE("'%s' => %08lx\n", padid->pszDriverAlias, (DWORD)pad); TRACE("'%s' => %08lx\n", padid->pszDriverAlias, (DWORD)pad);
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
gotError:
if (!pad->hDrvr)
HeapFree(MSACM_hHeap, 0, pad);
return ret;
} }
/*********************************************************************** /***********************************************************************