Author: sserapion
Date: Fri Mar 20 10:31:50 2009
New Revision: 40120
URL:
http://svn.reactos.org/svn/reactos?rev=40120&view=rev
Log:
Fix 64bit build.
Modified:
branches/ros-amd64-bringup/reactos/dll/win32/winmm/midimap/midimap.c
Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/midimap/midimap.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/winmm/midimap/midimap.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/midimap/midimap.c [iso-8859-1] Fri
Mar 20 10:31:50 2009
@@ -270,7 +270,7 @@
if (MIDIMAP_LoadSettings(mom))
{
- *lpdwUser = (DWORD)mom;
+ *lpdwUser = (DWORD_PTR)mom;
mom->self = mom;
return MMSYSERR_NOERROR;
@@ -306,7 +306,7 @@
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;
@@ -330,7 +330,7 @@
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;
@@ -393,7 +393,7 @@
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))
@@ -403,7 +403,7 @@
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))
@@ -413,7 +413,7 @@
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;
@@ -451,8 +451,8 @@
/**************************************************************************
* 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, %08lX, %08lX, %08lX);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2);
@@ -492,7 +492,7 @@
/**************************************************************************
* MIDIMAP_drvOpen [internal]
*/
-static DWORD MIDIMAP_drvOpen(LPSTR str)
+static LRESULT MIDIMAP_drvOpen(LPSTR str)
{
MIDIOUTCAPSW moc;
unsigned dev, i;
@@ -527,7 +527,7 @@
/**************************************************************************
* MIDIMAP_drvClose [internal]
*/
-static DWORD MIDIMAP_drvClose(DWORD dwDevID)
+static LRESULT MIDIMAP_drvClose(DWORD_PTR dwDevID)
{
if (midiOutPorts)
{
@@ -541,8 +541,8 @@
/**************************************************************************
* DriverProc (MIDIMAP.@)
*/
-LONG CALLBACK MIDIMAP_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
- DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK MIDIMAP_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+ LPARAM dwParam1, LPARAM dwParam2)
{
/* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */
/* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */