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

dinput: Implement getting DIPROP_VIDPID property for evdev joystick driver. Fixes bug 26418.

This commit is contained in:
Vitaliy Margolen 2011-04-14 08:08:01 -06:00 committed by Alexandre Julliard
parent eee070f1e0
commit 20aa341032
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/dinput/joystick_linuxinput.c
View File

@ -110,6 +110,8 @@ struct JoyDev {
/* data returned by the EVIOCGABS() ioctl */ /* data returned by the EVIOCGABS() ioctl */
struct wine_input_absinfo axes[ABS_MAX]; struct wine_input_absinfo axes[ABS_MAX];
WORD vendor_id, product_id;
}; };
struct JoystickImpl struct JoystickImpl
@ -187,6 +189,7 @@ static void find_joydevs(void)
int no_ff_check = 0; int no_ff_check = 0;
int j; int j;
struct JoyDev *new_joydevs; struct JoyDev *new_joydevs;
struct input_id device_id = {0};
snprintf(buf, sizeof(buf), EVDEVPREFIX"%d", i); snprintf(buf, sizeof(buf), EVDEVPREFIX"%d", i);
@ -282,6 +285,14 @@ static void find_joydevs(void)
} }
} }
if (ioctl(fd, EVIOCGID, &device_id) == -1)
WARN("ioct(EVIOCGBIT, EV_ABS) failed: %d %s\n", errno, strerror(errno));
else
{
joydev.vendor_id = device_id.vendor;
joydev.product_id = device_id.product;
}
if (!have_joydevs) if (!have_joydevs)
new_joydevs = HeapAlloc(GetProcessHeap(), 0, sizeof(struct JoyDev)); new_joydevs = HeapAlloc(GetProcessHeap(), 0, sizeof(struct JoyDev));
else else
@ -946,6 +957,17 @@ static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF
break; break;
} }
case (DWORD_PTR) DIPROP_VIDPID:
{
LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph;
if (!This->joydev->product_id || !This->joydev->vendor_id)
return DIERR_UNSUPPORTED;
pd->dwData = MAKELONG(This->joydev->vendor_id, This->joydev->product_id);
TRACE("DIPROP_VIDPID(%08x)\n", pd->dwData);
break;
}
default: default:
return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph);
} }