>From 4650a77892f0714097ad5a1a8d517db30ae7dd2a Mon Sep 17 00:00:00 2001 From: Peter Dons Tychsen Date: Sun, 29 Jul 2007 21:21:17 +0200 Subject: [PATCH] Allow the use of the standard Joystick GUID when calling CreateDevice This fixes a startup crash bug for the small game "Air Agression". Patch is backwards compatible with previous behavior. --- dlls/dinput/joystick_linux.c | 37 +++++++++++++------ dlls/dinput/joystick_linuxinput.c | 69 ++++++++++++++++++++++--------------- 2 files changed, 66 insertions(+), 40 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 57f1d7a..29febfc 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -171,7 +171,6 @@ static INT find_joystick_devices(void) return joystick_devices_count; } -#undef MAX_JOYSTICKS static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { @@ -412,7 +411,8 @@ static HRESULT setup_dinput_options(JoystickImpl * device) return DI_OK; } -static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, LPDIRECTINPUTDEVICEA* pdev) +static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, + LPDIRECTINPUTDEVICEA* pdev, unsigned short index) { DWORD i; JoystickImpl* newDevice; @@ -428,7 +428,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di return DIERR_OUTOFMEMORY; } - if (!lstrcpynA(newDevice->dev, joystick_devices[rguid->Data3], sizeof(newDevice->dev)) || + if (!lstrcpynA(newDevice->dev, joystick_devices[index], sizeof(newDevice->dev)) || (newDevice->joyfd = open(newDevice->dev, O_RDONLY)) < 0) { WARN("open(%s, O_RDONLY) failed: %s\n", newDevice->dev, strerror(errno)); @@ -568,27 +568,37 @@ FAILED1: return hr; } -static BOOL IsJoystickGUID(REFGUID guid) +/****************************************************************************** + * get_joystick_index : Get the joystick index from a given GUID + */ +static unsigned short get_joystick_index(REFGUID guid) { GUID wine_joystick = DInput_Wine_Joystick_GUID; GUID dev_guid = *guid; - + wine_joystick.Data3 = 0; dev_guid.Data3 = 0; - return IsEqualGUID(&wine_joystick, &dev_guid); + /* for the standard joystick GUID use index 0 */ + if(IsEqualGUID(&GUID_Joystick,guid)) return 0; + + /* for the wine joystick GUIDs use the index stored in Data3 */ + if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3; + + return MAX_JOYSTICKS; } static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev) { - if ((IsEqualGUID(&GUID_Joystick,rguid)) || - (IsJoystickGUID(rguid))) { + unsigned short index; + + if ((index = get_joystick_index(rguid)) < MAX_JOYSTICKS) { if ((riid == NULL) || IsEqualGUID(&IID_IDirectInputDeviceA,riid) || IsEqualGUID(&IID_IDirectInputDevice2A,riid) || IsEqualGUID(&IID_IDirectInputDevice7A,riid) || IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { - return alloc_device(rguid, &JoystickAvt, dinput, pdev); + return alloc_device(rguid, &JoystickAvt, dinput, pdev, index); } else { WARN("no interface\n"); *pdev = 0; @@ -603,14 +613,15 @@ static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, RE static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEW* pdev) { - if ((IsEqualGUID(&GUID_Joystick,rguid)) || - (IsJoystickGUID(rguid))) { + unsigned short index; + + if ((index = get_joystick_index(rguid)) < MAX_JOYSTICKS) { if ((riid == NULL) || IsEqualGUID(&IID_IDirectInputDeviceW,riid) || IsEqualGUID(&IID_IDirectInputDevice2W,riid) || IsEqualGUID(&IID_IDirectInputDevice7W,riid) || IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { - return alloc_device(rguid, &JoystickWvt, dinput, (LPDIRECTINPUTDEVICEA *)pdev); + return alloc_device(rguid, &JoystickWvt, dinput, (LPDIRECTINPUTDEVICEA *)pdev, index); } else { WARN("no interface\n"); *pdev = 0; @@ -623,6 +634,8 @@ static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid, RE return DIERR_DEVICENOTREG; } +#undef MAX_JOYSTICKS + const struct dinput_device joystick_linux_device = { "Wine Linux joystick driver", joydev_enum_deviceA, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 6a8dd44..8fe247b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -197,6 +197,7 @@ static void find_joydevs(void) } if (fd!=-1) { + if ((-1==ioctl(fd,EVIOCGBIT(0,sizeof(joydev.evbits)),joydev.evbits))) { perror("EVIOCGBIT 0"); close(fd); @@ -349,7 +350,7 @@ static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN return FALSE; } -static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, struct JoyDev *joydev) +static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, unsigned short index) { JoystickImpl* newDevice; LPDIDATAFORMAT df = NULL; @@ -365,7 +366,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); newDevice->joyfd = -1; newDevice->base.dinput = dinput; - newDevice->joydev = joydev; + newDevice->joydev = &joydevs[index]; #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION newDevice->ff_state = FF_STATUS_STOPPED; #endif @@ -430,22 +431,39 @@ failed: return NULL; } +/****************************************************************************** + * get_joystick_index : Get the joystick index from a given GUID + */ +static unsigned short get_joystick_index(REFGUID guid) +{ + GUID wine_joystick = DInput_Wine_Joystick_Base_GUID; + GUID dev_guid = *guid; + + wine_joystick.Data3 = 0; + dev_guid.Data3 = 0; + + /* for the standard joystick GUID use index 0 */ + if(IsEqualGUID(&GUID_Joystick,guid)) return 0; + + /* for the wine joystick GUIDs use the index stored in Data3 */ + if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3 - DInput_Wine_Joystick_Base_GUID.Data3; + + return MAX_JOYDEV; +} + static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev) { - int i; + unsigned short index; - find_joydevs(); + find_joydevs(); - for (i=0; i