- Converted HACMOBJ to void*

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);

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);

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;
 }
 
 /***********************************************************************

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