Skip to content

W
wine-winehq
Commit 3415f778 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

include: Change some DWORD to DWORD_PTR in mmddk.h.

This matches the DDK and removes 14 Win64 compile warnings.
parent 5bc9da34
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 15 deletions
dlls/wineoss.drv/audio.c
View file @ 3415f778
...@@ -1965,7 +1965,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) ...@@ -1965,7 +1965,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
audio_buf_info info; audio_buf_info info;
DWORD ret; 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) { if (lpDesc == NULL) {
WARN("Invalid Parameter !\n"); WARN("Invalid Parameter !\n");
return MMSYSERR_INVALPARAM; return MMSYSERR_INVALPARAM;
......
dlls/winmm/mci.c
View file @ 3415f778
...@@ -2185,7 +2185,7 @@ BOOL WINAPI mciDriverNotify(HWND hWndCallBack, MCIDEVICEID wDevID, UINT wStatus) ...@@ -2185,7 +2185,7 @@ BOOL WINAPI mciDriverNotify(HWND hWndCallBack, MCIDEVICEID wDevID, UINT wStatus)
/************************************************************************** /**************************************************************************
* mciGetDriverData [WINMM.@] * mciGetDriverData [WINMM.@]
*/ */
DWORD WINAPI mciGetDriverData(MCIDEVICEID uDeviceID) DWORD_PTR WINAPI mciGetDriverData(MCIDEVICEID uDeviceID)
{ {
LPWINE_MCIDRIVER wmd; LPWINE_MCIDRIVER wmd;
...@@ -2204,11 +2204,11 @@ DWORD WINAPI mciGetDriverData(MCIDEVICEID uDeviceID) ...@@ -2204,11 +2204,11 @@ DWORD WINAPI mciGetDriverData(MCIDEVICEID uDeviceID)
/************************************************************************** /**************************************************************************
* mciSetDriverData [WINMM.@] * mciSetDriverData [WINMM.@]
*/ */
BOOL WINAPI mciSetDriverData(MCIDEVICEID uDeviceID, DWORD data) BOOL WINAPI mciSetDriverData(MCIDEVICEID uDeviceID, DWORD_PTR data)
{ {
LPWINE_MCIDRIVER wmd; LPWINE_MCIDRIVER wmd;
TRACE("(%04x, %08x)\n", uDeviceID, data); TRACE("(%04x, %08lx)\n", uDeviceID, data);
wmd = MCI_GetDriver(uDeviceID); wmd = MCI_GetDriver(uDeviceID);
......
dlls/winmm/winemm.h
View file @ 3415f778
...@@ -141,7 +141,7 @@ typedef struct tagWINE_MCIDRIVER { ...@@ -141,7 +141,7 @@ typedef struct tagWINE_MCIDRIVER {
LPWSTR lpstrDeviceType; LPWSTR lpstrDeviceType;
LPWSTR lpstrAlias; LPWSTR lpstrAlias;
HDRVR hDriver; HDRVR hDriver;
DWORD dwPrivate; DWORD_PTR dwPrivate;
YIELDPROC lpfnYieldProc; YIELDPROC lpfnYieldProc;
DWORD dwYieldData; DWORD dwYieldData;
BOOL bIs32; BOOL bIs32;
......
dlls/winmm/winmm.c
View file @ 3415f778
...@@ -2096,7 +2096,7 @@ UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, ...@@ -2096,7 +2096,7 @@ UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType,
wod.dwInstance = dwInstance; wod.dwInstance = dwInstance;
wod.dnDevNode = 0L; wod.dnDevNode = 0L;
TRACE("cb=%08x\n", wod.dwCallback); TRACE("cb=%08lx\n", wod.dwCallback);
for (;;) { for (;;) {
if (dwFlags & WAVE_MAPPED) { if (dwFlags & WAVE_MAPPED) {
......
include/mmddk.h
View file @ 3415f778
...@@ -389,10 +389,10 @@ typedef struct { ...@@ -389,10 +389,10 @@ typedef struct {
typedef struct { typedef struct {
HWAVE hWave; HWAVE hWave;
LPWAVEFORMATEX lpFormat; LPWAVEFORMATEX lpFormat;
DWORD dwCallback; DWORD_PTR dwCallback;
DWORD dwInstance; DWORD_PTR dwInstance;
UINT uMappedDeviceID; UINT uMappedDeviceID;
DWORD dnDevNode; DWORD_PTR dnDevNode;
} WAVEOPENDESC, *LPWAVEOPENDESC; } WAVEOPENDESC, *LPWAVEOPENDESC;
typedef struct { typedef struct {
...@@ -402,9 +402,9 @@ typedef struct { ...@@ -402,9 +402,9 @@ typedef struct {
typedef struct { typedef struct {
HMIDI hMidi; HMIDI hMidi;
DWORD dwCallback; DWORD_PTR dwCallback;
DWORD dwInstance; DWORD_PTR dwInstance;
DWORD dnDevNode; DWORD_PTR dnDevNode;
DWORD cIds; DWORD cIds;
MIDIOPENSTRMID rgIds; MIDIOPENSTRMID rgIds;
} MIDIOPENDESC, *LPMIDIOPENDESC; } MIDIOPENDESC, *LPMIDIOPENDESC;
...@@ -415,6 +415,7 @@ typedef struct tMIXEROPENDESC ...@@ -415,6 +415,7 @@ typedef struct tMIXEROPENDESC
LPVOID pReserved0; LPVOID pReserved0;
DWORD_PTR dwCallback; DWORD_PTR dwCallback;
DWORD_PTR dwInstance; DWORD_PTR dwInstance;
DWORD_PTR dnDevNode;
} MIXEROPENDESC, *LPMIXEROPENDESC; } MIXEROPENDESC, *LPMIXEROPENDESC;
typedef struct { typedef struct {
...@@ -433,8 +434,8 @@ typedef struct { ...@@ -433,8 +434,8 @@ typedef struct {
DECL_WINELIB_TYPE_AW(MCI_OPEN_DRIVER_PARMS) DECL_WINELIB_TYPE_AW(MCI_OPEN_DRIVER_PARMS)
DECL_WINELIB_TYPE_AW(LPMCI_OPEN_DRIVER_PARMS) DECL_WINELIB_TYPE_AW(LPMCI_OPEN_DRIVER_PARMS)
DWORD WINAPI mciGetDriverData(UINT uDeviceID); DWORD_PTR WINAPI mciGetDriverData(UINT uDeviceID);
BOOL WINAPI mciSetDriverData(UINT uDeviceID, DWORD dwData); BOOL WINAPI mciSetDriverData(UINT uDeviceID, DWORD_PTR dwData);
UINT WINAPI mciDriverYield(UINT uDeviceID); UINT WINAPI mciDriverYield(UINT uDeviceID);
BOOL WINAPI mciDriverNotify(HWND hwndCallback, UINT uDeviceID, BOOL WINAPI mciDriverNotify(HWND hwndCallback, UINT uDeviceID,
UINT uStatus); UINT uStatus);
...@@ -453,7 +454,7 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable); ...@@ -453,7 +454,7 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable);
BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev,
DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2); 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_NOTASKSUPPORT 1
#define TASKERR_OUTOFMEMORY 2 #define TASKERR_OUTOFMEMORY 2
......
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