From 1c9733c924c2bf4017fe1c217b30c28193db06e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20B=C3=A9ron?= Date: Tue, 26 Mar 2002 19:48:42 +0000 Subject: [PATCH] - Converted HACMOBJ to void* - acmMetrics16 calls acmMetrics only if hao is NULL --- dlls/msacm/filter.c | 2 +- dlls/msacm/format.c | 2 +- dlls/msacm/msacm_main.c | 4 +++- include/msacm.h | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msacm/filter.c b/dlls/msacm/filter.c index 012bc991cf2..1c3cfcedad8 100644 --- a/dlls/msacm/filter.c +++ b/dlls/msacm/filter.c @@ -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); diff --git a/dlls/msacm/format.c b/dlls/msacm/format.c index 3635d574185..2bc0ce24f99 100644 --- a/dlls/msacm/format.c +++ b/dlls/msacm/format.c @@ -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); diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c index 9303b200d9f..be5947cbfea 100644 --- a/dlls/msacm/msacm_main.c +++ b/dlls/msacm/msacm_main.c @@ -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; } /*********************************************************************** diff --git a/include/msacm.h b/include/msacm.h index 967059c32c0..d0ea9e7f68f 100644 --- a/include/msacm.h +++ b/include/msacm.h @@ -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