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

dinput: Simplify JoystickWImpl_Unacquire for Linux.

Browse Source 
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Bruno Jesus 2017-01-26 17:07:04 -02:00 committed by Alexandre Julliard
parent 27f456844b
commit 8339de07ca
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/dinput/joystick_linuxinput.c
View File

@ -88,6 +88,8 @@ HRESULT linuxinput_create_effect(int* fd, REFGUID rguid, struct list *parent_lis
HRESULT linuxinput_get_info_A(int fd, REFGUID rguid, LPDIEFFECTINFOA info); HRESULT linuxinput_get_info_A(int fd, REFGUID rguid, LPDIEFFECTINFOA info);
HRESULT linuxinput_get_info_W(int fd, REFGUID rguid, LPDIEFFECTINFOW info); HRESULT linuxinput_get_info_W(int fd, REFGUID rguid, LPDIEFFECTINFOW info);
static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags);
typedef struct JoystickImpl JoystickImpl; typedef struct JoystickImpl JoystickImpl;
static const IDirectInputDevice8AVtbl JoystickAvt; static const IDirectInputDevice8AVtbl JoystickAvt;
static const IDirectInputDevice8WVtbl JoystickWvt; static const IDirectInputDevice8WVtbl JoystickWvt;
@ -745,18 +747,10 @@ static HRESULT WINAPI JoystickWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface)
TRACE("(this=%p)\n",This); TRACE("(this=%p)\n",This);
res = IDirectInputDevice2WImpl_Unacquire(iface); res = IDirectInputDevice2WImpl_Unacquire(iface);
if (res==DI_OK && This->joyfd!=-1) { if (res==DI_OK && This->joyfd!=-1) {
effect_list_item *itr;
struct input_event event; struct input_event event;
/* For each known effect: /* Stop and unload all effects */
* - stop it JoystickWImpl_SendForceFeedbackCommand(iface, DISFFC_RESET);
* - unload it
* But, unlike DISFFC_RESET, do not release the effect.
*/
LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) {
IDirectInputEffect_Stop(itr->ref);
IDirectInputEffect_Unload(itr->ref);
}
/* Enable autocenter. */ /* Enable autocenter. */
event.type = EV_FF; event.type = EV_FF;