Commit c1d5dfe8 authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

dinput: Sign-compare warnings fix.

parent 637c3125
...@@ -213,7 +213,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { ...@@ -213,7 +213,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) {
} }
void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) {
int i; unsigned int i;
FIXME("diaf.dwSize = %d\n", lpdiActionFormat->dwSize); FIXME("diaf.dwSize = %d\n", lpdiActionFormat->dwSize);
FIXME("diaf.dwActionSize = %d\n", lpdiActionFormat->dwActionSize); FIXME("diaf.dwActionSize = %d\n", lpdiActionFormat->dwActionSize);
...@@ -221,7 +221,7 @@ void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { ...@@ -221,7 +221,7 @@ void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) {
FIXME("diaf.dwNumActions = %d\n", lpdiActionFormat->dwNumActions); FIXME("diaf.dwNumActions = %d\n", lpdiActionFormat->dwNumActions);
FIXME("diaf.rgoAction = %p\n", lpdiActionFormat->rgoAction); FIXME("diaf.rgoAction = %p\n", lpdiActionFormat->rgoAction);
for (i=0;i<lpdiActionFormat->dwNumActions;i++) { 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("\tuAppData=%lx\n", lpdiActionFormat->rgoAction[i].uAppData);
FIXME("\tdwSemantics=%x\n", lpdiActionFormat->rgoAction[i].dwSemantics); FIXME("\tdwSemantics=%x\n", lpdiActionFormat->rgoAction[i].dwSemantics);
FIXME("\tdwFlags=%x\n", lpdiActionFormat->rgoAction[i].dwFlags); FIXME("\tdwFlags=%x\n", lpdiActionFormat->rgoAction[i].dwFlags);
...@@ -250,8 +250,9 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( ...@@ -250,8 +250,9 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices(
{ {
IDirectInputImpl *This = (IDirectInputImpl *)iface; IDirectInputImpl *This = (IDirectInputImpl *)iface;
DIDEVICEINSTANCEA devInstance; DIDEVICEINSTANCEA devInstance;
int i, j, r; unsigned int i;
int j, r;
TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n",
This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), This, dwDevType, _dump_DIDEVTYPE_value(dwDevType),
lpCallback, pvRef, dwFlags); lpCallback, pvRef, dwFlags);
...@@ -261,7 +262,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( ...@@ -261,7 +262,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices(
if (!dinput_devices[i]->enum_deviceA) continue; if (!dinput_devices[i]->enum_deviceA) continue;
for (j = 0, r = -1; r != 0; j++) { for (j = 0, r = -1; r != 0; j++) {
devInstance.dwSize = sizeof(devInstance); 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 ((r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) {
if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) if (lpCallback(&devInstance,pvRef) == DIENUM_STOP)
return 0; return 0;
...@@ -280,8 +281,9 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( ...@@ -280,8 +281,9 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices(
{ {
IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); IDirectInputImpl *This = impl_from_IDirectInput7W( iface );
DIDEVICEINSTANCEW devInstance; DIDEVICEINSTANCEW devInstance;
int i, j, r; unsigned int i;
int j, r;
TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n",
This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), This, dwDevType, _dump_DIDEVTYPE_value(dwDevType),
lpCallback, pvRef, dwFlags); lpCallback, pvRef, dwFlags);
...@@ -291,7 +293,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( ...@@ -291,7 +293,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices(
if (!dinput_devices[i]->enum_deviceW) continue; if (!dinput_devices[i]->enum_deviceW) continue;
for (j = 0, r = -1; r != 0; j++) { for (j = 0, r = -1; r != 0; j++) {
devInstance.dwSize = sizeof(devInstance); 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 ((r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) {
if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) if (lpCallback(&devInstance,pvRef) == DIENUM_STOP)
return 0; return 0;
...@@ -479,7 +481,7 @@ static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, R ...@@ -479,7 +481,7 @@ static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, R
{ {
IDirectInputImpl *This = (IDirectInputImpl *)iface; IDirectInputImpl *This = (IDirectInputImpl *)iface;
HRESULT ret_value = DIERR_DEVICENOTREG; 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); 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 ...@@ -515,7 +517,7 @@ static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx(LPDIRECTINPUT7W iface, R
{ {
IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); IDirectInputImpl *This = impl_from_IDirectInput7W( iface );
HRESULT ret_value = DIERR_DEVICENOTREG; 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); TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter);
......
...@@ -406,7 +406,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( ...@@ -406,7 +406,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters(
} }
if (dwFlags & DIEP_TYPESPECIFICPARAMS) { if (dwFlags & DIEP_TYPESPECIFICPARAMS) {
int expectedsize = 0; DWORD expectedsize = 0;
if (This->effect.type == FF_PERIODIC) { if (This->effect.type == FF_PERIODIC) {
expectedsize = sizeof(DIPERIODIC); expectedsize = sizeof(DIPERIODIC);
} else if (This->effect.type == FF_CONSTANT) { } else if (This->effect.type == FF_CONSTANT) {
......
...@@ -781,7 +781,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty( ...@@ -781,7 +781,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(
LPCDIPROPHEADER ph) LPCDIPROPHEADER ph)
{ {
JoystickImpl *This = (JoystickImpl *)iface; JoystickImpl *This = (JoystickImpl *)iface;
int i; DWORD i;
TRACE("(%p,%s,%p)\n",This,debugstr_guid(rguid),ph); TRACE("(%p,%s,%p)\n",This,debugstr_guid(rguid),ph);
......
...@@ -835,7 +835,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, ...@@ -835,7 +835,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface,
LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph;
if (ph->dwHow == DIPH_DEVICE) { if (ph->dwHow == DIPH_DEVICE) {
int i; DWORD i;
TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax); TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax);
for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) {
/* Scale dead-zone */ /* Scale dead-zone */
...@@ -862,7 +862,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, ...@@ -862,7 +862,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface,
case (DWORD)DIPROP_DEADZONE: { case (DWORD)DIPROP_DEADZONE: {
LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
if (ph->dwHow == DIPH_DEVICE) { if (ph->dwHow == DIPH_DEVICE) {
int i; DWORD i;
TRACE("deadzone(%d) all\n", pd->dwData); TRACE("deadzone(%d) all\n", pd->dwData);
for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) {
This->props[i].lDeadZone = pd->dwData; This->props[i].lDeadZone = pd->dwData;
...@@ -893,7 +893,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, ...@@ -893,7 +893,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface,
LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
if (ph->dwHow == DIPH_DEVICE) { if (ph->dwHow == DIPH_DEVICE) {
int i; DWORD i;
TRACE("saturation(%d) all\n", pd->dwData); TRACE("saturation(%d) all\n", pd->dwData);
for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++)
......
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