Module: wine Branch: master Commit: fffcd23cce0f3553323206cf4cd151b1f83450d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffcd23cce0f3553323206cf4c...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jan 5 12:39:44 2009 +0100
dinput: Fix pointer cast warnings on 64-bit.
---
dlls/dinput/device.c | 6 +++--- dlls/dinput/joystick_linux.c | 12 ++++++------ dlls/dinput/joystick_linuxinput.c | 16 ++++++++-------- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 20a577b..91449f8 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -876,7 +876,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty(
switch (LOWORD(rguid)) { - case (DWORD) DIPROP_BUFFERSIZE: + case (DWORD_PTR) DIPROP_BUFFERSIZE: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph;
@@ -910,7 +910,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty(
switch (LOWORD(rguid)) { - case (DWORD) DIPROP_AXISMODE: + case (DWORD_PTR) DIPROP_AXISMODE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)pdiph;
@@ -930,7 +930,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty( LeaveCriticalSection(&This->crit); break; } - case (DWORD) DIPROP_BUFFERSIZE: + case (DWORD_PTR) DIPROP_BUFFERSIZE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)pdiph;
diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 00bc3bd..faef24f 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -795,7 +795,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(
if (!HIWORD(rguid)) { switch (LOWORD(rguid)) { - case (DWORD)DIPROP_RANGE: { + case (DWORD_PTR)DIPROP_RANGE: { LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; if (ph->dwHow == DIPH_DEVICE) { TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax); @@ -815,7 +815,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty( } break; } - case (DWORD)DIPROP_DEADZONE: { + case (DWORD_PTR)DIPROP_DEADZONE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { TRACE("deadzone(%d) all\n", pd->dwData); @@ -832,7 +832,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty( } break; } - case (DWORD)DIPROP_SATURATION: { + case (DWORD_PTR)DIPROP_SATURATION: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { TRACE("saturation(%d) all\n", pd->dwData); @@ -919,7 +919,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(
if (!HIWORD(rguid)) { switch (LOWORD(rguid)) { - case (DWORD) DIPROP_RANGE: { + case (DWORD_PTR) DIPROP_RANGE: { LPDIPROPRANGE pr = (LPDIPROPRANGE)pdiph; int obj = find_property(&This->base.data_format, pdiph);
@@ -933,7 +933,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty( } break; } - case (DWORD) DIPROP_DEADZONE: { + case (DWORD_PTR) DIPROP_DEADZONE: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; int obj = find_property(&This->base.data_format, pdiph);
@@ -944,7 +944,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty( } break; } - case (DWORD) DIPROP_SATURATION: { + case (DWORD_PTR) DIPROP_SATURATION: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; int obj = find_property(&This->base.data_format, pdiph);
diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2511750..6f5b362 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -852,7 +852,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface,
if (!HIWORD(rguid)) { switch (LOWORD(rguid)) { - case (DWORD)DIPROP_RANGE: { + case (DWORD_PTR)DIPROP_RANGE: { LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph;
if (ph->dwHow == DIPH_DEVICE) { @@ -880,7 +880,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, fake_current_js_state(This); break; } - case (DWORD)DIPROP_DEADZONE: { + case (DWORD_PTR)DIPROP_DEADZONE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { DWORD i; @@ -899,18 +899,18 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, fake_current_js_state(This); break; } - case (DWORD)DIPROP_CALIBRATIONMODE: { + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; FIXME("DIPROP_CALIBRATIONMODE(%d)\n", pd->dwData); break; } - case (DWORD)DIPROP_AUTOCENTER: { + case (DWORD_PTR)DIPROP_AUTOCENTER: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
FIXME("DIPROP_AUTOCENTER(%d)\n", pd->dwData); break; } - case (DWORD)DIPROP_SATURATION: { + case (DWORD_PTR)DIPROP_SATURATION: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
if (ph->dwHow == DIPH_DEVICE) { @@ -999,7 +999,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, if (HIWORD(rguid)) return DI_OK;
switch (LOWORD(rguid)) { - case (DWORD) DIPROP_RANGE: + case (DWORD_PTR) DIPROP_RANGE: { LPDIPROPRANGE pr = (LPDIPROPRANGE) pdiph; int obj = find_property(&This->base.data_format, pdiph); @@ -1011,7 +1011,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("range(%d, %d) obj=%d\n", pr->lMin, pr->lMax, obj); break; } - case (DWORD) DIPROP_DEADZONE: + case (DWORD_PTR) DIPROP_DEADZONE: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; int obj = find_property(&This->base.data_format, pdiph); @@ -1022,7 +1022,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("deadzone(%d) obj=%d\n", pd->dwData, obj); break; } - case (DWORD) DIPROP_SATURATION: + case (DWORD_PTR) DIPROP_SATURATION: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; int obj = find_property(&This->base.data_format, pdiph); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 46d82fc..47536f7 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -443,7 +443,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface,
switch (LOWORD(rguid)) { - case (DWORD)DIPROP_KEYNAME: + case (DWORD_PTR)DIPROP_KEYNAME: { HRESULT hr; LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1572784..178b8fb 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -585,7 +585,7 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface,
if (!HIWORD(rguid)) { switch (LOWORD(rguid)) { - case (DWORD) DIPROP_GRANULARITY: { + case (DWORD_PTR) DIPROP_GRANULARITY: { LPDIPROPDWORD pr = (LPDIPROPDWORD) pdiph; /* We'll just assume that the app asks about the Z axis */ @@ -594,7 +594,7 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, break; } - case (DWORD) DIPROP_RANGE: { + case (DWORD_PTR) DIPROP_RANGE: { LPDIPROPRANGE pr = (LPDIPROPRANGE) pdiph; if ((pdiph->dwHow == DIPH_BYID) &&