Module: wine Branch: master Commit: c1d5dfe84bdaca664c44ef40c00272b34a172429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d5dfe84bdaca664c44ef40c0...
Author: Andrew Talbot andrew.talbot@talbotville.com Date: Mon Sep 29 21:28:22 2008 +0100
dinput: Sign-compare warnings fix.
---
dlls/dinput/dinput_main.c | 22 ++++++++++++---------- dlls/dinput/effect_linuxinput.c | 2 +- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 6 +++--- 4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 6b52de4..6c2a9ed 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -213,7 +213,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { }
void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { - int i; + unsigned int i;
FIXME("diaf.dwSize = %d\n", lpdiActionFormat->dwSize); FIXME("diaf.dwActionSize = %d\n", lpdiActionFormat->dwActionSize); @@ -221,7 +221,7 @@ void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { FIXME("diaf.dwNumActions = %d\n", lpdiActionFormat->dwNumActions); FIXME("diaf.rgoAction = %p\n", lpdiActionFormat->rgoAction); for (i=0;i<lpdiActionFormat->dwNumActions;i++) { - FIXME("diaf.rgoAction[%d]:\n", i); + FIXME("diaf.rgoAction[%u]:\n", i); FIXME("\tuAppData=%lx\n", lpdiActionFormat->rgoAction[i].uAppData); FIXME("\tdwSemantics=%x\n", lpdiActionFormat->rgoAction[i].dwSemantics); FIXME("\tdwFlags=%x\n", lpdiActionFormat->rgoAction[i].dwFlags); @@ -250,8 +250,9 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( { IDirectInputImpl *This = (IDirectInputImpl *)iface; DIDEVICEINSTANCEA devInstance; - int i, j, r; - + unsigned int i; + int j, r; + TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), lpCallback, pvRef, dwFlags); @@ -261,7 +262,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( if (!dinput_devices[i]->enum_deviceA) continue; for (j = 0, r = -1; r != 0; j++) { devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); + TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); if ((r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) return 0; @@ -280,8 +281,9 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( { IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); DIDEVICEINSTANCEW devInstance; - int i, j, r; - + unsigned int i; + int j, r; + TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), lpCallback, pvRef, dwFlags); @@ -291,7 +293,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( if (!dinput_devices[i]->enum_deviceW) continue; for (j = 0, r = -1; r != 0; j++) { devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); + TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); if ((r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) return 0; @@ -479,7 +481,7 @@ static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, R { IDirectInputImpl *This = (IDirectInputImpl *)iface; HRESULT ret_value = DIERR_DEVICENOTREG; - int i; + unsigned int i;
TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter);
@@ -515,7 +517,7 @@ static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx(LPDIRECTINPUT7W iface, R { IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); HRESULT ret_value = DIERR_DEVICENOTREG; - int i; + unsigned int i;
TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter);
diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 9b1cb1b..3395a37 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -406,7 +406,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( }
if (dwFlags & DIEP_TYPESPECIFICPARAMS) { - int expectedsize = 0; + DWORD expectedsize = 0; if (This->effect.type == FF_PERIODIC) { expectedsize = sizeof(DIPERIODIC); } else if (This->effect.type == FF_CONSTANT) { diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index bcac66a..4146f1d 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -781,7 +781,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty( LPCDIPROPHEADER ph) { JoystickImpl *This = (JoystickImpl *)iface; - int i; + DWORD i;
TRACE("(%p,%s,%p)\n",This,debugstr_guid(rguid),ph);
diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 6b3a186..4dcd61e 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -835,7 +835,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph;
if (ph->dwHow == DIPH_DEVICE) { - int i; + DWORD i; TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax); for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { /* Scale dead-zone */ @@ -862,7 +862,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, case (DWORD)DIPROP_DEADZONE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { - int i; + DWORD i; TRACE("deadzone(%d) all\n", pd->dwData); for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { This->props[i].lDeadZone = pd->dwData; @@ -893,7 +893,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
if (ph->dwHow == DIPH_DEVICE) { - int i; + DWORD i;
TRACE("saturation(%d) all\n", pd->dwData); for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++)