From 3415f7788cb01a83f798cf8a0e617306c33329fd Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Wed, 4 Feb 2009 00:56:28 +0100
Subject: [PATCH] include: Change some DWORD to DWORD_PTR in mmddk.h.

This matches the DDK and removes 14 Win64 compile warnings.
---
 dlls/wineoss.drv/audio.c |  2 +-
 dlls/winmm/mci.c         |  6 +++---
 dlls/winmm/winemm.h      |  2 +-
 dlls/winmm/winmm.c       |  2 +-
 include/mmddk.h          | 19 ++++++++++---------
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c
index d4c9095eafa..f5125103d2e 100644
--- a/dlls/wineoss.drv/audio.c
+++ b/dlls/wineoss.drv/audio.c
@@ -1965,7 +1965,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
     audio_buf_info      info;
     DWORD               ret;
 
-    TRACE("(%u, %p[cb=%08x], %08X);\n", wDevID, lpDesc, lpDesc->dwCallback, dwFlags);
+    TRACE("(%u, %p[cb=%08lx], %08X);\n", wDevID, lpDesc, lpDesc->dwCallback, dwFlags);
     if (lpDesc == NULL) {
 	WARN("Invalid Parameter !\n");
 	return MMSYSERR_INVALPARAM;
diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index dfb0ba72e42..b231159342b 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -2185,7 +2185,7 @@ BOOL WINAPI mciDriverNotify(HWND hWndCallBack, MCIDEVICEID wDevID, UINT wStatus)
 /**************************************************************************
  * 			mciGetDriverData			[WINMM.@]
  */
-DWORD WINAPI mciGetDriverData(MCIDEVICEID uDeviceID)
+DWORD_PTR WINAPI mciGetDriverData(MCIDEVICEID uDeviceID)
 {
     LPWINE_MCIDRIVER	wmd;
 
@@ -2204,11 +2204,11 @@ DWORD WINAPI mciGetDriverData(MCIDEVICEID uDeviceID)
 /**************************************************************************
  * 			mciSetDriverData			[WINMM.@]
  */
-BOOL WINAPI mciSetDriverData(MCIDEVICEID uDeviceID, DWORD data)
+BOOL WINAPI mciSetDriverData(MCIDEVICEID uDeviceID, DWORD_PTR data)
 {
     LPWINE_MCIDRIVER	wmd;
 
-    TRACE("(%04x, %08x)\n", uDeviceID, data);
+    TRACE("(%04x, %08lx)\n", uDeviceID, data);
 
     wmd = MCI_GetDriver(uDeviceID);
 
diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h
index 3ddff0804de..ce6a649f0bf 100644
--- a/dlls/winmm/winemm.h
+++ b/dlls/winmm/winemm.h
@@ -141,7 +141,7 @@ typedef struct tagWINE_MCIDRIVER {
         LPWSTR			lpstrDeviceType;
         LPWSTR			lpstrAlias;
         HDRVR			hDriver;
-	DWORD			dwPrivate;
+        DWORD_PTR               dwPrivate;
         YIELDPROC		lpfnYieldProc;
         DWORD	                dwYieldData;
         BOOL			bIs32;
diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c
index d9bd190ffa2..02dd5ed76fa 100644
--- a/dlls/winmm/winmm.c
+++ b/dlls/winmm/winmm.c
@@ -2096,7 +2096,7 @@ UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType,
     wod.dwInstance = dwInstance;
     wod.dnDevNode = 0L;
 
-    TRACE("cb=%08x\n", wod.dwCallback);
+    TRACE("cb=%08lx\n", wod.dwCallback);
 
     for (;;) {
         if (dwFlags & WAVE_MAPPED) {
diff --git a/include/mmddk.h b/include/mmddk.h
index c2ed4fcd415..33a93b25e15 100644
--- a/include/mmddk.h
+++ b/include/mmddk.h
@@ -389,10 +389,10 @@ typedef struct {
 typedef struct {
 	HWAVE			hWave;
 	LPWAVEFORMATEX		lpFormat;
-	DWORD			dwCallback;
-	DWORD			dwInstance;
+	DWORD_PTR		dwCallback;
+	DWORD_PTR		dwInstance;
 	UINT			uMappedDeviceID;
-        DWORD			dnDevNode;
+	DWORD_PTR		dnDevNode;
 } WAVEOPENDESC, *LPWAVEOPENDESC;
 
 typedef struct {
@@ -402,9 +402,9 @@ typedef struct {
 
 typedef struct {
 	HMIDI			hMidi;
-	DWORD			dwCallback;
-	DWORD			dwInstance;
-        DWORD          		dnDevNode;
+	DWORD_PTR		dwCallback;
+	DWORD_PTR		dwInstance;
+	DWORD_PTR		dnDevNode;
         DWORD          		cIds;
         MIDIOPENSTRMID 		rgIds;
 } MIDIOPENDESC, *LPMIDIOPENDESC;
@@ -415,6 +415,7 @@ typedef struct tMIXEROPENDESC
         LPVOID			pReserved0;
 	DWORD_PTR		dwCallback;
 	DWORD_PTR		dwInstance;
+	DWORD_PTR		dnDevNode;
 } MIXEROPENDESC, *LPMIXEROPENDESC;
 
 typedef struct {
@@ -433,8 +434,8 @@ typedef struct {
 DECL_WINELIB_TYPE_AW(MCI_OPEN_DRIVER_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_OPEN_DRIVER_PARMS)
 
-DWORD 			WINAPI	mciGetDriverData(UINT uDeviceID);
-BOOL			WINAPI	mciSetDriverData(UINT uDeviceID, DWORD dwData);
+DWORD_PTR		WINAPI	mciGetDriverData(UINT uDeviceID);
+BOOL			WINAPI	mciSetDriverData(UINT uDeviceID, DWORD_PTR dwData);
 UINT			WINAPI	mciDriverYield(UINT uDeviceID);
 BOOL			WINAPI	mciDriverNotify(HWND hwndCallback, UINT uDeviceID,
 						UINT uStatus);
@@ -453,7 +454,7 @@ BOOL			WINAPI	mciFreeCommandResource(UINT uTable);
 BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev,
                            DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2);
 
-typedef VOID (*LPTASKCALLBACK)(DWORD dwInst);
+typedef VOID (*LPTASKCALLBACK)(DWORD_PTR dwInst);
 
 #define TASKERR_NOTASKSUPPORT 1
 #define TASKERR_OUTOFMEMORY   2