PATCH: Convert HMIXER, HMIXEROBJ to a void*

[Michael Stefaniuc <mstefani@redhat.de>]

Hello!

License: LGPL, X11
Changelog:
    Michael Stefaniuc <mstefani@redhat.com>
    - Convert HMIXER, HMIXEROBJ to a void*

bye
	michael
-- 
Michael Stefaniuc               Tel.: +49-711-96437-199
System Administration           Fax.: +49-711-96437-111
Red Hat GmbH                    Email: mstefani@redhat.com
Hauptstaetterstr. 58            http://www.redhat.de/
D-70178 Stuttgart
Index: dlls/winmm/mmsystem.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mmsystem.c,v
retrieving revision 1.65
diff -u -r1.65 mmsystem.c
--- dlls/winmm/mmsystem.c	2 Aug 2002 19:02:49 -0000	1.65
+++ dlls/winmm/mmsystem.c	2 Aug 2002 21:09:15 -0000
@@ -943,7 +943,7 @@
 		       &dwCallback, &dwInstance, bFrom32);
 
     wmld->uDeviceID = uDeviceID;
-    mod.hmx = hMix;
+    mod.hmx = (HMIXEROBJ)hMix;
     mod.dwCallback = dwCallback;
     mod.dwInstance = dwInstance;
 
@@ -980,7 +980,7 @@
 
     ret = MMSYSTEM_mixerOpen(&hmix, uDeviceID,
 			     dwCallback, dwInstance, fdwOpen, FALSE);
-    if (lphmix) *lphmix = hmix;
+    if (lphmix) *lphmix = HMIXER_16(hmix);
     return ret;
 }
 
@@ -1007,7 +1007,7 @@
  */
 UINT16 WINAPI mixerClose16(HMIXER16 hMix)
 {
-    return mixerClose(hMix);
+    return mixerClose(HMIXER_32(hMix));
 }
 
 /**************************************************************************
@@ -1035,7 +1035,7 @@
 UINT16 WINAPI mixerGetID16(HMIXEROBJ16 hmix, LPUINT16 lpid, DWORD fdwID)
 {
     UINT	xid;
-    UINT	ret = mixerGetID(hmix, &xid, fdwID);
+    UINT	ret = mixerGetID(HMIXEROBJ_32(hmix), &xid, fdwID);
 
     if (lpid)
 	*lpid = xid;
@@ -1137,7 +1137,8 @@
 
     sppaDetails = (SEGPTR)lpmcd->paDetails;
     lpmcd->paDetails = MapSL(sppaDetails);
-    ret = mixerGetControlDetailsA(hmix, (LPMIXERCONTROLDETAILS)lpmcd, fdwDetails);
+    ret = mixerGetControlDetailsA(HMIXEROBJ_32(hmix),
+			         (LPMIXERCONTROLDETAILS)lpmcd, fdwDetails);
     lpmcd->paDetails = (LPVOID)sppaDetails;
 
     return ret;
@@ -1251,7 +1252,7 @@
     mlcA.pamxctrl = HeapAlloc(GetProcessHeap(), 0,
 			      mlcA.cControls * mlcA.cbmxctrl);
 
-    ret = mixerGetLineControlsA(hmix, &mlcA, fdwControls);
+    ret = mixerGetLineControlsA(HMIXEROBJ_32(hmix), &mlcA, fdwControls);
 
     if (ret == MMSYSERR_NOERROR) {
 	lpmlc16->dwLineID = mlcA.dwLineID;
@@ -1405,7 +1406,7 @@
 	FIXME("Unsupported fdwControls=0x%08lx\n", fdwInfo);
     }
 
-    ret = mixerGetLineInfoA(hmix, &mliA, fdwInfo);
+    ret = mixerGetLineInfoA(HMIXEROBJ_32(hmix), &mliA, fdwInfo);
 
     lpmli16->dwDestination     	= mliA.dwDestination;
     lpmli16->dwSource          	= mliA.dwSource;
@@ -1478,7 +1479,7 @@
 DWORD WINAPI mixerMessage16(HMIXER16 hmix, UINT16 uMsg, DWORD dwParam1,
 			     DWORD dwParam2)
 {
-    return mixerMessage(hmix, uMsg, dwParam1, dwParam2);
+    return mixerMessage(HMIXER_32(hmix), uMsg, dwParam1, dwParam2);
 }
 
 /**************************************************************************
Index: dlls/winmm/winemm.h
===================================================================
RCS file: /home/wine/wine/dlls/winmm/winemm.h,v
retrieving revision 1.17
diff -u -r1.17 winemm.h
--- dlls/winmm/winemm.h	2 Aug 2002 19:02:49 -0000	1.17
+++ dlls/winmm/winemm.h	2 Aug 2002 21:09:16 -0000
@@ -232,6 +232,8 @@
 #define HMIDIIN_32(h16)		((HMIDIIN)(ULONG_PTR)(h16))
 #define HMIDIOUT_32(h16)	((HMIDIOUT)(ULONG_PTR)(h16))
 #define HMIDISTRM_32(h16)	((HMIDISTRM)(ULONG_PTR)(h16))
+#define HMIXER_32(h16)		((HMIXER)(ULONG_PTR)(h16))
+#define HMIXEROBJ_32(h16)	((HMIXEROBJ)(ULONG_PTR)(h16))
 #define HWAVE_32(h16)		((HWAVE)(ULONG_PTR)(h16))
 #define HWAVEIN_32(h16)		((HWAVEIN)(ULONG_PTR)(h16))
 #define HWAVEOUT_32(h16)	((HWAVEOUT)(ULONG_PTR)(h16))
@@ -241,6 +243,8 @@
 #define HMIDIIN_16(h32)		(LOWORD(h32))
 #define HMIDIOUT_16(h32)	(LOWORD(h32))
 #define HMIDISTRM_16(h32)	(LOWORD(h32))
+#define HMIXER_16(h32)		(LOWORD(h32))
+#define HMIXEROBJ_16(h32)	(LOWORD(h32))
 #define HWAVE_16(h32)		(LOWORD(h32))
 #define HWAVEIN_16(h32)		(LOWORD(h32))
 #define HWAVEOUT_16(h32)	(LOWORD(h32))
Index: include/mmsystem.h
===================================================================
RCS file: /home/wine/wine/include/mmsystem.h,v
retrieving revision 1.53
diff -u -r1.53 mmsystem.h
--- include/mmsystem.h	2 Aug 2002 19:02:49 -0000	1.53
+++ include/mmsystem.h	2 Aug 2002 21:09:17 -0000
@@ -38,8 +38,8 @@
 DECLARE_HANDLE(HMIDIIN);
 DECLARE_HANDLE(HMIDIOUT);
 DECLARE_HANDLE(HMIDISTRM);
-DECLARE_OLD_HANDLE(HMIXER);
-DECLARE_OLD_HANDLE(HMIXEROBJ);
+DECLARE_HANDLE(HMIXER);
+DECLARE_HANDLE(HMIXEROBJ);
 DECLARE_OLD_HANDLE(HMMIO);
 
 #include "pshpack1.h"

Attachment: pgp00027.pgp
Description: PGP signature