commit 1c9733c924c2bf4017fe1c217b30c28193db06e5
author Vincent Béron <vberon@mecano.gme.usherb.ca> Tue Mar 26 19:48:42 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 26 19:48:42 2002 +0000
tree ebe6b82a6b4a2584afd101ae2c4907744fd35c18
parent 2dbf9ea34cc3168ec99ddd292a6f6f5219c3db9f

- Converted HACMOBJ to void*
- acmMetrics16 calls acmMetrics only if hao is NULL

dlls/msacm/filter.c

diff --git a/dlls/msacm/filter.c b/dlls/msacm/filter.c
index 012bc99..1c3cfce 100644
--- a/dlls/msacm/filter.c
+++ b/dlls/msacm/filter.c
@@ -235,7 +235,7 @@
     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

diff --git a/dlls/msacm/format.c b/dlls/msacm/format.c
index 3635d57..2bc0ce2 100644
--- a/dlls/msacm/format.c
+++ b/dlls/msacm/format.c
@@ -509,7 +509,7 @@
     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

diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c
index 9303b20..be5947c 100644
--- a/dlls/msacm/msacm_main.c
+++ b/dlls/msacm/msacm_main.c
@@ -76,7 +76,9 @@
 {
   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;
 }
 
 /***********************************************************************