marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Converted HACMOBJ to void* 

- acmMetrics16 calls acmMetrics only if hao is NULL
oldstable
Vincent Béron 2002-03-26 19:48:42 +00:00 committed by Alexandre Julliard
parent 2dbf9ea34c
commit 1c9733c924
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msacm/filter.c
View File

@ -235,7 +235,7 @@ MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd,
if (had) {
HACMDRIVERID hadid;
if (acmDriverID(had, &hadid, 0) != MMSYSERR_NOERROR)
if (acmDriverID((HACMOBJ)had, &hadid, 0) != MMSYSERR_NOERROR)
return MMSYSERR_INVALHANDLE;
MSACM_FilterEnumHelper(MSACM_GetDriverID(hadid), had, pafd,
fnCallback, dwInstance, fdwEnum);

2
dlls/msacm/format.c
View File

@ -509,7 +509,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd,
if (had) {
HACMDRIVERID hadid;
if (acmDriverID(had, &hadid, 0) != MMSYSERR_NOERROR)
if (acmDriverID((HACMOBJ)had, &hadid, 0) != MMSYSERR_NOERROR)
return MMSYSERR_INVALHANDLE;
MSACM_FormatEnumHelper(MSACM_GetDriverID(hadid), had, pafd, &wfxRef,
fnCallback, dwInstance, fdwEnum);

4
dlls/msacm/msacm_main.c
View File

@ -76,7 +76,9 @@ MMRESULT16 WINAPI acmMetrics16(
{
FIXME("(0x%04x, %d, %p): semi-stub\n", hao, uMetric, pMetric);
return acmMetrics(hao, uMetric, pMetric);
if(!hao) return acmMetrics(0, uMetric, pMetric);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
/***********************************************************************

2
include/msacm.h
View File

@ -211,7 +211,7 @@ static const WCHAR ACMHELPMSGCONTEXTHELPW[] = { 'a','c','m',
DECLARE_HANDLE(HACMDRIVERID);
DECLARE_HANDLE(HACMDRIVER);
DECLARE_HANDLE(HACMSTREAM);
DECLARE_OLD_HANDLE(HACMOBJ);
DECLARE_HANDLE(HACMOBJ);
/***********************************************************************
* Callbacks