system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 18:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

dinput: Create generic joystick Acquire/Unacquire.

Browse source
This commit is contained in:
Aric Stewart 2009-03-09 10:07:35 -05:00 committed by Alexandre Julliard
parent 36f538eb91
commit 5dbe136027
3 changed files with 47 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
dlls/dinput/joystick.c
View file

@ -31,6 +31,40 @@
WINE_DEFAULT_DEBUG_CHANNEL(dinput);
/******************************************************************************
* Acquire : gets exclusive control of the joystick
*/
HRESULT WINAPI JoystickAGenericImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
{
JoystickGenericImpl *This = (JoystickGenericImpl *)iface;
TRACE("(%p)\n",This);
if (This->base.acquired) {
WARN("already acquired\n");
return S_FALSE;
}
This->base.acquired = 1;
return DI_OK;
}
/******************************************************************************
* Unacquire : frees the joystick
*/
HRESULT WINAPI JoystickAGenericImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
{
JoystickGenericImpl *This = (JoystickGenericImpl *)iface;
HRESULT res;
TRACE("(%p)\n",This);
if ((res = IDirectInputDevice2AImpl_Unacquire(iface)) != DI_OK) return res;
return DI_OK;
}
/******************************************************************************
* SetProperty : change input device properties
*/

16
dlls/dinput/joystick_linux.c
View file

@ -605,13 +605,13 @@ const struct dinput_device joystick_linux_device = {
static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
{
JoystickImpl *This = (JoystickImpl *)iface;
HRESULT res;
TRACE("(%p)\n",This);
if (This->generic.base.acquired) {
WARN("already acquired\n");
return S_FALSE;
}
res = JoystickAGenericImpl_Acquire(iface);
if (res != DI_OK)
return res;
/* open the joystick device */
if (This->joyfd==-1) {
@ -620,12 +620,11 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
This->joyfd=open(This->dev,O_RDONLY);
if (This->joyfd==-1) {
ERR("open(%s) failed: %s\n", This->dev, strerror(errno));
JoystickAGenericImpl_Unacquire(iface);
return DIERR_NOTFOUND;
}
}
This->generic.base.acquired = 1;
return DI_OK;
}
@ -639,7 +638,10 @@ static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
TRACE("(%p)\n",This);
if ((res = IDirectInputDevice2AImpl_Unacquire(iface)) != DI_OK) return res;
res = JoystickAGenericImpl_Unacquire(iface);
if (res != DI_OK)
return res;
if (This->joyfd!=-1) {
TRACE("closing joystick device\n");

4
dlls/dinput/joystick_private.h
View file

@ -78,4 +78,8 @@ HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface);
HRESULT WINAPI JoystickAGenericImpl_GetDeviceState( LPDIRECTINPUTDEVICE8A iface,
DWORD len, LPVOID ptr);
HRESULT WINAPI JoystickAGenericImpl_Acquire(LPDIRECTINPUTDEVICE8A iface);
HRESULT WINAPI JoystickAGenericImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface);
#endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */