ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Allow enumeration of objects when the device is not yet acquired. 

- Flag FF-capable axes during enumeration.
This commit is contained in:
Daniel Remenak 2005-09-06 10:22:23 +00:00 committed by Alexandre Julliard
parent b379e420ed
commit ff771e2e21
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/dinput/joystick_linuxinput.c
View File

@ -912,7 +912,6 @@ static HRESULT WINAPI JoystickAImpl_EnumObjects(
DIDEVICEOBJECTINSTANCEA ddoi; DIDEVICEOBJECTINSTANCEA ddoi;
int xfd = This->joyfd; int xfd = This->joyfd;
TRACE("(this=%p,%p,%p,%08lx)\n", This, lpCallback, lpvRef, dwFlags); TRACE("(this=%p,%p,%p,%08lx)\n", This, lpCallback, lpvRef, dwFlags);
if (TRACE_ON(dinput)) { if (TRACE_ON(dinput)) {
TRACE(" - flags = "); TRACE(" - flags = ");
@ -920,7 +919,9 @@ static HRESULT WINAPI JoystickAImpl_EnumObjects(
TRACE("\n"); TRACE("\n");
} }
if (xfd == -1) return DIERR_NOTACQUIRED; /* We need to work even if we're not yet acquired */
if (xfd == -1)
iface->lpVtbl->Acquire(iface);
/* Only the fields till dwFFMaxForce are relevant */ /* Only the fields till dwFFMaxForce are relevant */
ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce); ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce);
@ -971,10 +972,19 @@ static HRESULT WINAPI JoystickAImpl_EnumObjects(
FIXME("unhandled abs axis %d, ignoring!\n",i); FIXME("unhandled abs axis %d, ignoring!\n",i);
} }
ddoi.dwType = DIDFT_MAKEINSTANCE((1<<i) << WINE_JOYSTICK_AXIS_BASE) | DIDFT_ABSAXIS; ddoi.dwType = DIDFT_MAKEINSTANCE((1<<i) << WINE_JOYSTICK_AXIS_BASE) | DIDFT_ABSAXIS;
/* Linux event force feedback supports only (and always) x and y axes */
if (i == ABS_X || i == ABS_Y) {
if (This->has_ff)
ddoi.dwFlags |= DIDOI_FFACTUATOR;
}
sprintf(ddoi.tszName, "%d-Axis", i); sprintf(ddoi.tszName, "%d-Axis", i);
_dump_OBJECTINSTANCEA(&ddoi); _dump_OBJECTINSTANCEA(&ddoi);
if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) {
return DI_OK; /* return to unaquired state if that's where we were */
if (xfd == -1)
iface->lpVtbl->Unacquire(iface);
return DI_OK;
}
} }
} }
@ -1057,13 +1067,18 @@ static HRESULT WINAPI JoystickAImpl_EnumObjects(
} }
sprintf(ddoi.tszName, "%d-Button", i); sprintf(ddoi.tszName, "%d-Button", i);
_dump_OBJECTINSTANCEA(&ddoi); _dump_OBJECTINSTANCEA(&ddoi);
if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) {
return DI_OK; /* return to unaquired state if that's where we were */
if (xfd == -1)
iface->lpVtbl->Unacquire(iface);
return DI_OK;
}
} }
} }
if (xfd!=This->joyfd) /* return to unaquired state if that's where we were */
close(xfd); if (xfd == -1)
iface->lpVtbl->Unacquire(iface);
return DI_OK; return DI_OK;
} }