Module: wine Branch: master Commit: 29b00e1a8c2d06573027278de53b8f7698a1039d URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b00e1a8c2d06573027278de5...
Author: Dmitry Timoshkov dmitry@codeweavers.com Date: Thu May 31 23:01:53 2007 +0900
midimap: Fix compilation warnings in 64-bit mode.
---
dlls/midimap/midimap.c | 24 ++++++++++++------------ dlls/winmm/driver.c | 16 ++++++++-------- include/mmddk.h | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 299bb19..aa569e0 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -258,7 +258,7 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) return ret; }
-static DWORD modOpen(LPDWORD lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) +static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { MIDIMAPDATA* mom = HeapAlloc(GetProcessHeap(), 0, sizeof(MIDIMAPDATA));
@@ -268,7 +268,7 @@ static DWORD modOpen(LPDWORD lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
if (MIDIMAP_LoadSettings(mom)) { - *lpdwUser = (DWORD)mom; + *lpdwUser = (DWORD_PTR)mom; mom->self = mom;
return MMSYSERR_NOERROR; @@ -304,7 +304,7 @@ static DWORD modClose(MIDIMAPDATA* mom) return ret; }
-static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { WORD chn; DWORD ret = MMSYSERR_NOERROR; @@ -328,7 +328,7 @@ static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) return ret; }
-static DWORD modData(MIDIMAPDATA* mom, DWORD dwParam) +static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) { BYTE lb = LOBYTE(LOWORD(dwParam)); WORD chn = lb & 0x0F; @@ -385,13 +385,13 @@ static DWORD modData(MIDIMAPDATA* mom, DWORD dwParam) } break; default: - FIXME("ooch %u\n", dwParam); + FIXME("ooch %lx\n", dwParam); }
return ret; }
-static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; if (lpMidiHdr->dwFlags & (MHDR_ISSTRM|MHDR_PREPARED)) @@ -401,7 +401,7 @@ static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) return MMSYSERR_NOERROR; }
-static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; if ((lpMidiHdr->dwFlags & MHDR_ISSTRM) || !(lpMidiHdr->dwFlags & MHDR_PREPARED)) @@ -411,7 +411,7 @@ static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) return MMSYSERR_NOERROR; }
-static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD size) +static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD_PTR size) { static const WCHAR name[] = {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}; lpMidiCaps->wMid = 0x00FF; @@ -449,10 +449,10 @@ static DWORD modReset(MIDIMAPDATA* mom) /************************************************************************** * modMessage (MIDIMAP.@) */ -DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%u, %04X, %08X, %08X, %08X);\n", + TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);
switch (wMsg) @@ -464,7 +464,7 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, /* FIXME: Pretend this is supported */ return 0;
- case MODM_OPEN: return modOpen ((LPDWORD)dwUser, (LPMIDIOPENDESC)dwParam1,dwParam2); + case MODM_OPEN: return modOpen((DWORD_PTR *)dwUser, (LPMIDIOPENDESC)dwParam1, dwParam2); case MODM_CLOSE: return modClose ((MIDIMAPDATA*)dwUser);
case MODM_DATA: return modData ((MIDIMAPDATA*)dwUser, dwParam1); diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index cf1c0ab..87ba8fb 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -569,25 +569,25 @@ LRESULT WINAPI DefDriverProc(DWORD_PTR dwDriverIdentifier, HDRVR hDrv, /************************************************************************** * DriverCallback [WINMM.@] */ -BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev, - UINT wMsg, DWORD dwUser, DWORD dwParam1, - DWORD dwParam2) +BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, + DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, + DWORD_PTR dwParam2) { - TRACE("(%08X, %04X, %p, %04X, %08X, %08X, %08X); !\n", + TRACE("(%08lX, %04X, %p, %04X, %08lX, %08lX, %08lX)\n", dwCallBack, uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2);
switch (uFlags & DCB_TYPEMASK) { case DCB_NULL: TRACE("Null !\n"); if (dwCallBack) - WARN("uFlags=%04X has null DCB value, but dwCallBack=%08X is not null !\n", uFlags, dwCallBack); + WARN("uFlags=%04X has null DCB value, but dwCallBack=%08lX is not null !\n", uFlags, dwCallBack); break; case DCB_WINDOW: - TRACE("Window(%04X) handle=%p!\n", dwCallBack, hDev); + TRACE("Window(%04lX) handle=%p!\n", dwCallBack, hDev); PostMessageA((HWND)dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_TASK: /* aka DCB_THREAD */ - TRACE("Task(%04x) !\n", dwCallBack); + TRACE("Task(%04lx) !\n", dwCallBack); PostThreadMessageA(dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_FUNCTION: @@ -595,7 +595,7 @@ BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev, ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2); break; case DCB_EVENT: - TRACE("Event(%08x) !\n", dwCallBack); + TRACE("Event(%08lx) !\n", dwCallBack); SetEvent((HANDLE)dwCallBack); break; case 6: /* I would dub it DCB_MMTHREADSIGNAL */ diff --git a/include/mmddk.h b/include/mmddk.h index aa7106a..75840a0 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -446,8 +446,8 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable); #define DCB_TYPEMASK 0x0007 #define DCB_NOSWITCH 0x0008 /* don't switch stacks for callback */
-BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev, - UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2); +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);
-
Alexandre Julliard