Skip to content

W
wine-cw
Commit 9741589b authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard
Browse files
Options

Fix many function prototypes and data types according to Platform SDK

definitions.
parent be6d014f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 56 deletions
dlls/winmm/joystick.c
View file @ 9741589b
......@@ -139,7 +139,7 @@ UINT WINAPI joyGetNumDevs(void)
/**************************************************************************
* joyGetDevCapsA [WINMM.@]
*/
MMRESULT WINAPI joyGetDevCapsA(UINT wID, LPJOYCAPSA lpCaps, UINT wSize)
MMRESULT WINAPI joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize)
{
if (wID >= MAXJOYSTICK) return JOYERR_PARMS;
if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER;
......@@ -153,7 +153,7 @@ MMRESULT WINAPI joyGetDevCapsA(UINT wID, LPJOYCAPSA lpCaps, UINT wSize)
/**************************************************************************
* joyGetDevCapsW [WINMM.@]
*/
MMRESULT WINAPI joyGetDevCapsW(UINT wID, LPJOYCAPSW lpCaps, UINT wSize)
MMRESULT WINAPI joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize)
{
JOYCAPSA jca;
MMRESULT ret = joyGetDevCapsA(wID, &jca, sizeof(jca));
......
dlls/winmm/lolvldrv.c
View file @ 9741589b
......@@ -171,8 +171,8 @@ UINT MMDRV_GetNum(UINT type)
/**************************************************************************
* MMDRV_Message [internal]
*/
DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1,
DWORD dwParam2, BOOL bFrom32)
DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1,
DWORD_PTR dwParam2, BOOL bFrom32)
{
LPWINE_MM_DRIVER lpDrv;
DWORD ret;
......
dlls/winmm/mmsystem.c
View file @ 9741589b
......@@ -489,7 +489,7 @@ UINT16 WINAPI auxGetVolume16(UINT16 uDeviceID, LPDWORD lpdwVolume)
if ((wmld = MMDRV_Get((HANDLE)(ULONG_PTR)uDeviceID, MMDRV_AUX, TRUE)) == NULL)
return MMSYSERR_INVALHANDLE;
return MMDRV_Message(wmld, AUXDM_GETVOLUME, (DWORD)lpdwVolume, 0L, TRUE);
return MMDRV_Message(wmld, AUXDM_GETVOLUME, (DWORD_PTR)lpdwVolume, 0L, TRUE);
}
/**************************************************************************
......@@ -796,7 +796,7 @@ UINT16 WINAPI midiOutUnprepareHeader16(HMIDIOUT16 hMidiOut, /* [in] */
if ((wmld = MMDRV_Get(HMIDIOUT_32(hMidiOut), MMDRV_MIDIOUT, FALSE)) == NULL)
return MMSYSERR_INVALHANDLE;
return MMDRV_Message(wmld, MODM_UNPREPARE, (DWORD)lpsegMidiOutHdr, uSize, FALSE);
return MMDRV_Message(wmld, MODM_UNPREPARE, lpsegMidiOutHdr, uSize, FALSE);
}
/**************************************************************************
......@@ -821,7 +821,7 @@ UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16 hMidiOut, /* [in] */
if ((wmld = MMDRV_Get(HMIDIOUT_32(hMidiOut), MMDRV_MIDIOUT, FALSE)) == NULL)
return MMSYSERR_INVALHANDLE;
return MMDRV_Message(wmld, MODM_LONGDATA, (DWORD)lpsegMidiOutHdr, uSize, FALSE);
return MMDRV_Message(wmld, MODM_LONGDATA, (DWORD_PTR)lpsegMidiOutHdr, uSize, FALSE);
}
/**************************************************************************
......@@ -993,7 +993,7 @@ UINT16 WINAPI midiInPrepareHeader16(HMIDIIN16 hMidiIn, /* [in] */
if ((wmld = MMDRV_Get(HMIDIIN_32(hMidiIn), MMDRV_MIDIIN, FALSE)) == NULL)
return MMSYSERR_INVALHANDLE;
return MMDRV_Message(wmld, MIDM_PREPARE, (DWORD)lpsegMidiInHdr, uSize, FALSE);
return MMDRV_Message(wmld, MIDM_PREPARE, lpsegMidiInHdr, uSize, FALSE);
}
/**************************************************************************
......@@ -1015,7 +1015,7 @@ UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16 hMidiIn, /* [in] */
if ((wmld = MMDRV_Get(HMIDIIN_32(hMidiIn), MMDRV_MIDIIN, FALSE)) == NULL)
return MMSYSERR_INVALHANDLE;
return MMDRV_Message(wmld, MIDM_UNPREPARE, (DWORD)lpsegMidiInHdr, uSize, FALSE);
return MMDRV_Message(wmld, MIDM_UNPREPARE, lpsegMidiInHdr, uSize, FALSE);
}
/**************************************************************************
......@@ -1032,7 +1032,7 @@ UINT16 WINAPI midiInAddBuffer16(HMIDIIN16 hMidiIn, /* [in] */
if ((wmld = MMDRV_Get(HMIDIIN_32(hMidiIn), MMDRV_MIDIIN, FALSE)) == NULL)
return MMSYSERR_INVALHANDLE;
return MMDRV_Message(wmld, MIDM_ADDBUFFER, (DWORD)lpsegMidiInHdr, uSize, FALSE);
return MMDRV_Message(wmld, MIDM_ADDBUFFER, (DWORD_PTR)lpsegMidiInHdr, uSize, FALSE);
}
/**************************************************************************
......@@ -1297,7 +1297,7 @@ UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */
if ((wmld = MMDRV_Get(HWAVEOUT_32(hWaveOut), MMDRV_WAVEOUT, FALSE)) == NULL)
return MMSYSERR_INVALHANDLE;
return MMDRV_Message(wmld, WODM_PREPARE, (DWORD)lpsegWaveOutHdr, uSize, FALSE);
return MMDRV_Message(wmld, WODM_PREPARE, lpsegWaveOutHdr, uSize, FALSE);
}
/**************************************************************************
......@@ -1319,7 +1319,7 @@ UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */
if ((wmld = MMDRV_Get(HWAVEOUT_32(hWaveOut), MMDRV_WAVEOUT, FALSE)) == NULL)
return MMSYSERR_INVALHANDLE;
return MMDRV_Message(wmld, WODM_UNPREPARE, (DWORD)lpsegWaveOutHdr, uSize, FALSE);
return MMDRV_Message(wmld, WODM_UNPREPARE, lpsegWaveOutHdr, uSize, FALSE);
}
/**************************************************************************
......@@ -1336,7 +1336,7 @@ UINT16 WINAPI waveOutWrite16(HWAVEOUT16 hWaveOut, /* [in] */
if ((wmld = MMDRV_Get(HWAVEOUT_32(hWaveOut), MMDRV_WAVEOUT, FALSE)) == NULL)
return MMSYSERR_INVALHANDLE;
return MMDRV_Message(wmld, WODM_WRITE, (DWORD)lpsegWaveOutHdr, uSize, FALSE);
return MMDRV_Message(wmld, WODM_WRITE, (DWORD_PTR)lpsegWaveOutHdr, uSize, FALSE);
}
/**************************************************************************
......@@ -1598,7 +1598,7 @@ UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16 hWaveIn, /* [in] */
lpWaveInHdr->dwBytesRecorded = 0;
ret = MMDRV_Message(wmld, WIDM_PREPARE, (DWORD)lpsegWaveInHdr, uSize, FALSE);
ret = MMDRV_Message(wmld, WIDM_PREPARE, lpsegWaveInHdr, uSize, FALSE);
return ret;
}
......@@ -1623,7 +1623,7 @@ UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16 hWaveIn, /* [in] */
if ((wmld = MMDRV_Get(HWAVEIN_32(hWaveIn), MMDRV_WAVEIN, FALSE)) == NULL)
return MMSYSERR_INVALHANDLE;
return MMDRV_Message(wmld, WIDM_UNPREPARE, (DWORD)lpsegWaveInHdr, uSize, FALSE);
return MMDRV_Message(wmld, WIDM_UNPREPARE, lpsegWaveInHdr, uSize, FALSE);
}
/**************************************************************************
......@@ -1641,7 +1641,7 @@ UINT16 WINAPI waveInAddBuffer16(HWAVEIN16 hWaveIn, /* [in] */
if ((wmld = MMDRV_Get(HWAVEIN_32(hWaveIn), MMDRV_WAVEIN, FALSE)) == NULL)
return MMSYSERR_INVALHANDLE;
return MMDRV_Message(wmld, WIDM_ADDBUFFER, (DWORD)lpsegWaveInHdr, uSize, FALSE);
return MMDRV_Message(wmld, WIDM_ADDBUFFER, (DWORD_PTR)lpsegWaveInHdr, uSize, FALSE);
}
/**************************************************************************
......
dlls/winmm/time.c
View file @ 9741589b
......@@ -271,7 +271,7 @@ WORD TIME_SetEventInternal(UINT wDelay, UINT wResol,
* timeSetEvent [WINMM.@]
*/
MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc,
DWORD dwUser, UINT wFlags)
DWORD_PTR dwUser, UINT wFlags)
{
if (wFlags & WINE_TIMER_IS32)
WARN("Unknown windows flag... wine internally used.. ooch\n");
......
dlls/winmm/winemm.h
View file @ 9741589b
......@@ -242,7 +242,7 @@ DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD dwParam1, DWORD dwParam2);
DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg);
LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID);
LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, BOOL bSrcCanBeID, UINT dstTyped);
DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1, DWORD dwParam2, BOOL bFrom32);
DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2, BOOL bFrom32);
UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD dwParam1, DWORD dwParam2);
BOOL MMDRV_Is32(unsigned int);
void MMDRV_InstallMap(unsigned int, MMDRV_MAPFUNC, MMDRV_UNMAPFUNC,
......
include/digitalv.h
View file @ 9741589b
......@@ -459,20 +459,20 @@ extern "C" {
/* parameter block for MCI_WHERE, MCI_PUT, MCI_FREEZE, MCI_UNFREEZE cmds */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
RECT rc;
} MCI_DGV_RECT_PARMS, *LPMCI_DGV_RECT_PARMS;
/* parameter block for MCI_CAPTURE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPSTR lpstrFileName;
RECT rc;
} MCI_DGV_CAPTURE_PARMSA, *LPMCI_DGV_CAPTURE_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPWSTR lpstrFileName;
RECT rc;
} MCI_DGV_CAPTURE_PARMSW, *LPMCI_DGV_CAPTURE_PARMSW;
......@@ -487,7 +487,7 @@ typedef MCI_GENERIC_PARMS MCI_CLOSE_PARMS, *LPMCI_CLOSE_PARMS;
/* parameter block for MCI_COPY command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT rc;
......@@ -498,14 +498,14 @@ typedef struct {
/* parameter block for MCI_CUE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwTo;
} MCI_DGV_CUE_PARMS, *LPMCI_DGV_CUE_PARMS;
/* parameter block for MCI_CUT command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT rc;
......@@ -516,7 +516,7 @@ typedef struct {
/* parameter block for MCI_DELETE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT rc;
......@@ -531,14 +531,14 @@ typedef MCI_DGV_RECT_PARMS MCI_DGV_FREEZE_PARMS, * LPMCI_DGV_FREEZE_PARMS;
/* parameter block for MCI_INFO command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPSTR lpstrReturn;
DWORD dwRetSize;
DWORD dwItem;
} MCI_DGV_INFO_PARMSA, * LPMCI_DGV_INFO_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPWSTR lpstrReturn;
DWORD dwRetSize;
DWORD dwItem;
......@@ -550,7 +550,7 @@ DECL_WINELIB_TYPE_AW(LPMCI_DGV_INFO_PARMS)
/* parameter block for MCI_LIST command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPSTR lpstrReturn;
DWORD dwLength;
DWORD dwNumber;
......@@ -559,7 +559,7 @@ typedef struct {
} MCI_DGV_LIST_PARMSA, *LPMCI_DGV_LIST_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPWSTR lpstrReturn;
DWORD dwLength;
DWORD dwNumber;
......@@ -581,7 +581,7 @@ DECL_WINELIB_TYPE_AW(LPMCI_DGV_LOAD_PARMS)
/* parameter block for MCI_MONITOR command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwSource;
DWORD dwMethod;
} MCI_DGV_MONITOR_PARMS, * LPMCI_DGV_MONITOR_PARMS;
......@@ -589,7 +589,7 @@ typedef struct {
/* parameter block for MCI_OPEN command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
UINT wDeviceID;
LPSTR lpstrDeviceType;
LPSTR lpstrElementName;
......@@ -599,7 +599,7 @@ typedef struct {
} MCI_DGV_OPEN_PARMSA, *LPMCI_DGV_OPEN_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
UINT wDeviceID;
LPWSTR lpstrDeviceType;
LPWSTR lpstrElementName;
......@@ -618,7 +618,7 @@ typedef MCI_GENERIC_PARMS MCI_DGV_PAUSE_PARMS, * LPMCI_DGV_PAUSE_PARMS;
/* parameter block for MCI_PASTE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwTo;
RECT rc;
DWORD dwAudioStream;
......@@ -636,7 +636,7 @@ typedef MCI_DGV_RECT_PARMS MCI_DGV_PUT_PARMS, * LPMCI_DGV_PUT_PARMS;
/* parameter block for MCI_QUALITY command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwItem;
LPSTR lpstrName;
DWORD lpstrAlgorithm;
......@@ -644,7 +644,7 @@ typedef struct {
} MCI_DGV_QUALITY_PARMSA, *LPMCI_DGV_QUALITY_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwItem;
LPWSTR lpstrName;
DWORD lpstrAlgorithm;
......@@ -661,7 +661,7 @@ typedef MCI_GENERIC_PARMS MCI_REALIZE_PARMS, * LPMCI_REALIZE_PARMS;
/* parameter block for MCI_RECORD command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT rc;
......@@ -672,13 +672,13 @@ typedef struct {
/* parameter block for MCI_RESERVE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPSTR lpstrPath;
DWORD dwSize;
} MCI_DGV_RESERVE_PARMSA, *LPMCI_DGV_RESERVE_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPWSTR lpstrPath;
DWORD dwSize;
} MCI_DGV_RESERVE_PARMSW, *LPMCI_DGV_RESERVE_PARMSW;
......@@ -689,13 +689,13 @@ DECL_WINELIB_TYPE_AW(LPMCI_DGV_RESERVE_PARMS)
/* parameter block for MCI_RESTORE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPSTR lpstrFileName;
RECT rc;
} MCI_DGV_RESTORE_PARMSA, *LPMCI_DGV_RESTORE_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPWSTR lpstrFileName;
RECT rc;
} MCI_DGV_RESTORE_PARMSW, *LPMCI_DGV_RESTORE_PARMSW;
......@@ -710,13 +710,13 @@ typedef MCI_GENERIC_PARMS MCI_DGV_RESUME_PARMS, * LPMCI_DGV_RESUME_PARMS;
/* parameter block for MCI_SAVE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPSTR lpstrFileName;
RECT rc;
} MCI_DGV_SAVE_PARMSA, *LPMCI_DGV_SAVE_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPWSTR lpstrFileName;
RECT rc;
} MCI_DGV_SAVE_PARMSW, *LPMCI_DGV_SAVE_PARMSW;
......@@ -727,7 +727,7 @@ DECL_WINELIB_TYPE_AW(LPMCI_DGV_SAVE_PARMS)
/* parameter block for MCI_SET command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwTimeFormat;
DWORD dwAudio;
DWORD dwFileFormat;
......@@ -737,7 +737,7 @@ typedef struct {
/* parameter block for MCI_SETAUDIO command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
......@@ -746,7 +746,7 @@ typedef struct {
} MCI_DGV_SETAUDIO_PARMSA, *LPMCI_DGV_SETAUDIO_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
......@@ -760,7 +760,7 @@ DECL_WINELIB_TYPE_AW(LPMCI_DGV_SETAUDIO_PARMS)
/* parameter block for MCI_SIGNAL command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwPosition;
DWORD dwPeriod;
DWORD dwUserParm;
......@@ -769,7 +769,7 @@ typedef struct {
/* parameter block for MCI_SETVIDEO command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
......@@ -779,7 +779,7 @@ typedef struct {
} MCI_DGV_SETVIDEO_PARMSA, *LPMCI_DGV_SETVIDEO_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
......@@ -794,8 +794,8 @@ DECL_WINELIB_TYPE_AW(LPMCI_DGV_SETVIDEO_PARMS)
/* parameter block for MCI_STATUS command message */
typedef struct {
DWORD dwCallback;
DWORD dwReturn;
DWORD_PTR dwCallback;
DWORD_PTR dwReturn;
DWORD dwItem;
DWORD dwTrack;
LPSTR lpstrDrive;
......@@ -803,8 +803,8 @@ typedef struct {
} MCI_DGV_STATUS_PARMSA, *LPMCI_DGV_STATUS_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD dwReturn;
DWORD_PTR dwCallback;
DWORD_PTR dwReturn;
DWORD dwItem;
DWORD dwTrack;
LPWSTR lpstrDrive;
......@@ -817,7 +817,7 @@ DECL_WINELIB_TYPE_AW(LPMCI_DGV_STATUS_PARMS)
/* parameter block for MCI_STEP command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwFrames;
} MCI_DGV_STEP_PARMS, *LPMCI_DGV_STEP_PARMS;
......@@ -832,7 +832,7 @@ typedef MCI_DGV_RECT_PARMS MCI_DGV_UNFREEZE_PARMS, * LPMCI_DGV_UNFREEZE_PARMS;
/* parameter block for MCI_UPDATE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
RECT rc;
HDC hDC;
} MCI_DGV_UPDATE_PARMS, * LPMCI_DGV_UPDATE_PARMS;
......@@ -844,14 +844,14 @@ typedef MCI_DGV_RECT_PARMS MCI_DGV_WHERE_PARMS, * LPMCI_DGV_WHERE_PARMS;
/* parameter block for MCI_WINDOW command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
HWND hWnd;
UINT nCmdShow;
LPSTR lpstrText;
} MCI_DGV_WINDOW_PARMSA, *LPMCI_DGV_WINDOW_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
HWND hWnd;
UINT nCmdShow;
LPWSTR lpstrText;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment