February 2017 - Wine-devel - list.winehq.org

Re: [1/4] dinput: Keep username same between device objects.
by Andrew Eikum 27 Feb '17

27 Feb '17

On Thu, Feb 23, 2017 at 01:22:18AM +0200, Jetro Jormalainen wrote: > @@ -1308,11 +1308,24 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, > case (DWORD_PTR) DIPROP_USERNAME: > { > LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; > + struct DevicePlayer *device_player; > > if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; > > - lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR)); > - break; > + LIST_FOR_EACH_ENTRY(device_player, &This->dinput->device_players, > + struct DevicePlayer, entry) > + { > + if (IsEqualGUID(&device_player->guid, &This->guid)) > + { > + if (lstrlenW(device_player->username)) Please use *username instead of strlen in places where we don't actually care about the string length. Same in the other patch. > @@ -1390,10 +1403,32 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( > case (DWORD_PTR) DIPROP_USERNAME: > { > LPCDIPROPSTRING ps = (LPCDIPROPSTRING)pdiph; > + struct DevicePlayer *device_player; > + unsigned char found = 0; Please use BOOL, TRUE, and FALSE for booleans. Some people use those symbols for their static analyzers. Same in the other patch. > @@ -56,6 +57,12 @@ struct dinput_device { > HRESULT (*create_device)(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode); > }; > > +struct DevicePlayer { > + GUID guid; "guid" is a little vague. This refers to the specific device instance, right? Maybe device_guid or instance_guid? Andrew

1 0

Re: [PATCH 2/5] winebus.sys: Build device reports for linux event devices
by Sebastian Lackner 27 Feb '17

27 Feb '17

On 27.02.2017 16:09, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/winebus.sys/bus_udev.c | 437 +++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 435 insertions(+), 2 deletions(-) > > > > 0002-winebus.sys-Build-device-reports-for-linux-event-devic.txt > > > diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c > index 2dcc7fb442..e2a475ccd8 100644 > --- a/dlls/winebus.sys/bus_udev.c > +++ b/dlls/winebus.sys/bus_udev.c > @@ -63,6 +63,10 @@ > #include "wine/debug.h" > #include "wine/unicode.h" > > +#ifdef HAS_PROPER_INPUT_HEADER > +# include "hidusage.h" > +#endif > + > #include "bus.h" > > WINE_DEFAULT_DEBUG_CHANNEL(plugplay); > @@ -97,6 +101,418 @@ static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *de > return (struct platform_private *)get_platform_private(device); > } > > +#ifdef HAS_PROPER_INPUT_HEADER > +static const BYTE report_header[] = { > + 0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */ > + 0x09, 0x00, /* USAGE (??) */ > + 0xa1, 0x01, /* COLLECTION (Application) */ > + 0x09, 0x01, /* USAGE () */ > + 0xa1, 0x00, /* COLLECTION (Physical) */ > +}; > + > +#define IDX_HEADER_PAGE 1 > +#define IDX_HEADER_USAGE 3 > + > +static const BYTE report_buttons[] = { > + 0x05, 0x09, /* USAGE_PAGE (Button) */ > + 0x19, 0x01, /* USAGE_MINIMUM (Button 1) */ > + 0x29, 0x03, /* USAGE_MAXIMUM (Button 3) */ > + 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ > + 0x25, 0x01, /* LOGICAL_MAXIMUM (1) */ > + 0x35, 0x00, /* LOGICAL_MINIMUM (0) */ > + 0x45, 0x01, /* LOGICAL_MAXIMUM (1) */ > + 0x95, 0x03, /* REPORT_COUNT (3) */ > + 0x75, 0x01, /* REPORT_SIZE (1) */ > + 0x81, 0x02, /* INPUT (Data,Var,Abs) */ > +}; > +#define IDX_BUTTON_MIN_USAGE 3 > +#define IDX_BUTTON_MAX_USAGE 5 > +#define IDX_BUTTON_COUNT 11 > + > +static const BYTE report_padding[] = { > + 0x95, 0x03, /* REPORT_COUNT (3) */ > + 0x75, 0x01, /* REPORT_SIZE (1) */ > + 0x81, 0x03, /* INPUT (Cnst,Var,Abs) */ > +}; > +#define IDX_PADDING_BIT_COUNT 1 > + > +static const BYTE report_axis_header[] = { > + 0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */ > +}; > +#define IDX_AXIS_PAGE 1 > + > + > +static const BYTE report_axis_usage[] = { > + 0x09, 0x30, /* USAGE (X) */ > +}; > +#define IDX_AXIS_USAGE 1 > + > +static const BYTE report_abs_axis_tail[] = { > + 0x16, 0x00, 0x00, /* LOGICAL_MINIMUM (0) */ > + 0x26, 0xff, 0x00, /* LOGICAL_MAXIMUM (0xff) */ > + 0x35, 0x00, /* PHYSICAL_MINIMUM (0) */ > + 0x46, 0xff, 0x00, /* PHYSICAL_MAXIMUM (256) */ > + 0x75, 0x10, /* REPORT_SIZE (16) */ > + 0x95, 0x00, /* REPORT_COUNT (2) */ > + 0x81, 0x02, /* INPUT (Data,Var,Abs) */ > +}; > +#define IDX_ABS_AXIS_COUNT 14 > + > +static const BYTE report_rel_axis_tail[] = { > + 0x15, 0x81, /* LOGICAL_MINIMUM (0) */ > + 0x25, 0x7f, /* LOGICAL_MAXIMUM (0xffff) */ > + 0x75, 0x08, /* REPORT_SIZE (16) */ > + 0x95, 0x02, /* REPORT_COUNT (2) */ > + 0x81, 0x06, /* INPUT (Data,Var,Rel) */ > +}; > +#define IDX_REL_AXIS_COUNT 7 > + > +static const BYTE report_hatswitch[] = { > + 0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */ > + 0x09, 0x39, /* USAGE (Hatswitch) */ > + 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ > + 0x25, 0x08, /* LOGICAL_MAXIMUM (0x08) */ > + 0x35, 0x00, /* PHYSICAL_MINIMUM (0) */ > + 0x45, 0x08, /* PHYSICAL_MAXIMUM (8) */ > + 0x75, 0x08, /* REPORT_SIZE (8) */ > + 0x95, 0x01, /* REPORT_COUNT (1) */ > + 0x81, 0x02, /* INPUT (Data,Var,Abs) */ > +}; > +#define IDX_HATSWITCH_COUNT 15 > + > +static const BYTE report_tail[] = { > + 0xc0, /* END_COLLECTION */ > + 0xc0 /* END_COLLECTION */ > +}; > + > +static const BYTE ABS_to_HID_map[][2] = { > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /*ABS_X*/ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /*ABS_Y*/ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Z}, /*ABS_Z*/ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RX}, /*ABS_RX*/ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RY}, /*ABS_RY*/ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RZ}, /*ABS_RZ*/ > + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_THROTTLE}, /*ABS_THROTTLE*/ > + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_RUDDER}, /*ABS_RUDDER*/ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ > + {HID_USAGE_PAGE_SIMULATION, 0xC4}, /*ABS_GAS*/ > + {HID_USAGE_PAGE_SIMULATION, 0xC5}, /*ABS_BRAKE*/ > + {0,0}, /*ABS_HAT0X*/ > + {0,0}, /*ABS_HAT0Y*/ > + {0,0}, /*ABS_HAT1X*/ > + {0,0}, /*ABS_HAT1Y*/ > + {0,0}, /*ABS_HAT2X*/ > + {0,0}, /*ABS_HAT2Y*/ > + {0,0}, /*ABS_HAT3X*/ > + {0,0}, /*ABS_HAT3Y*/ > + {HID_USAGE_PAGE_DIGITIZER, 0x30}, /*ABS_PRESSURE*/ > + {0, 0}, /*ABS_DISTANCE*/ > + {HID_USAGE_PAGE_DIGITIZER, 0x3D}, /*ABS_TILT_X*/ > + {HID_USAGE_PAGE_DIGITIZER, 0x3F}, /*ABS_TILT_Y*/ > + {0, 0}, /*ABS_TOOL_WIDTH*/ > + {0, 0}, > + {0, 0}, > + {0, 0}, > + {HID_USAGE_PAGE_CONSUMER, 0xE0} /*ABS_VOLUME*/ > +}; > +#define HID_ABS_MAX (ABS_VOLUME+1) > +#define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) > + > +static const BYTE REL_to_HID_map[][2] = { > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /* REL_X */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /* REL_Y */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Z}, /* REL_Z */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RX}, /* REL_RX */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RY}, /* REL_RY */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RZ}, /* REL_RZ */ > + {0, 0}, /* REL_HWHEEL */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_DIAL}, /* REL_DIAL */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /* REL_WHEEL */ > + {0, 0} /* REL_MISC */ > +}; > + > +#define HID_REL_MAX (REL_MISC+1) > +#define TOP_REL_PAGE (HID_USAGE_PAGE_CONSUMER+1) > + > +struct wine_input_absinfo { > + struct input_absinfo info; > + BYTE report_index; > +}; > + > +struct wine_input_private { > + struct platform_private base; > + > + int report_descriptor_size; > + BYTE *report_descriptor; > + > + BYTE button_map[KEY_MAX]; > + BYTE rel_map[HID_REL_MAX]; > + BYTE hat_map[8]; > + int hat_values[8]; > + struct wine_input_absinfo abs_map[HID_ABS_MAX]; > +}; > + > +#define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) > + > +static BYTE *add_button_block(BYTE* report_ptr, BYTE usage_min, BYTE usage_max) > +{ > + memcpy(report_ptr, report_buttons, sizeof(report_buttons)); > + report_ptr[IDX_BUTTON_MIN_USAGE] = usage_min; > + report_ptr[IDX_BUTTON_MAX_USAGE] = usage_max; > + report_ptr[IDX_BUTTON_COUNT] = (usage_max - usage_min) + 1; > + return report_ptr + sizeof(report_buttons); > +} > + > +static BYTE *add_axis_block(BYTE *report_ptr, BYTE count, BYTE page, BYTE *usages, BOOL absolute) > +{ > + int i; > + memcpy(report_ptr, report_axis_header, sizeof(report_axis_header)); > + report_ptr[IDX_AXIS_PAGE] = page; > + report_ptr += sizeof(report_axis_header); > + for (i = 0; i < count; i++) > + { > + memcpy(report_ptr, report_axis_usage, sizeof(report_axis_usage)); > + report_ptr[IDX_AXIS_USAGE] = usages[i]; > + report_ptr += sizeof(report_axis_usage); > + } > + if (absolute) > + { > + memcpy(report_ptr, report_abs_axis_tail, sizeof(report_abs_axis_tail)); > + report_ptr[IDX_ABS_AXIS_COUNT] = count; > + report_ptr += sizeof(report_abs_axis_tail); > + } > + else > + { > + memcpy(report_ptr, report_rel_axis_tail, sizeof(report_rel_axis_tail)); > + report_ptr[IDX_REL_AXIS_COUNT] = count; > + report_ptr += sizeof(report_rel_axis_tail); > + } > + return report_ptr; > +} > + > +static BYTE *add_padding_block(BYTE *report_ptr, BYTE bitcount) > +{ > + memcpy(report_ptr, report_padding, sizeof(report_padding)); > + report_ptr[IDX_PADDING_BIT_COUNT] = bitcount; > + return report_ptr + sizeof(report_padding); > +} > + > +static BYTE *add_hatswitch(BYTE *report_ptr, INT count) > +{ > + memcpy(report_ptr, report_hatswitch, sizeof(report_hatswitch)); > + report_ptr[IDX_HATSWITCH_COUNT] = count; > + return report_ptr + sizeof(report_hatswitch); > +} > + > +static const BYTE* what_am_I(struct udev_device *dev) > +{ > + static const BYTE Unknown[2] = {HID_USAGE_PAGE_GENERIC, 0}; > + static const BYTE Mouse[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_MOUSE}; > + static const BYTE Keyboard[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD}; > + static const BYTE Gamepad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD}; > + static const BYTE Keypad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYPAD}; > + static const BYTE Tablet[2] = {HID_USAGE_PAGE_DIGITIZER, 0x2}; > + static const BYTE Touchscreen[2] = {HID_USAGE_PAGE_DIGITIZER, 0x4}; > + static const BYTE Touchpad[2] = {HID_USAGE_PAGE_DIGITIZER, 0x5}; > + > + struct udev_device *parent = dev; > + > + /* Look to the parents until we get a clue */ > + while (parent) > + { > + if (udev_device_get_property_value(parent, "ID_INPUT_MOUSE")) > + return Mouse; > + else if (udev_device_get_property_value(parent, "ID_INPUT_KEYBOARD")) > + return Keyboard; > + else if (udev_device_get_property_value(parent, "ID_INPUT_JOYSTICK")) > + return Gamepad; > + else if (udev_device_get_property_value(parent, "ID_INPUT_KEY")) > + return Keypad; > + else if (udev_device_get_property_value(parent, "ID_INPUT_TOUCHPAD")) > + return Touchpad; > + else if (udev_device_get_property_value(parent, "ID_INPUT_TOUCHSCREEN")) > + return Touchscreen; > + else if (udev_device_get_property_value(parent, "ID_INPUT_TABLET")) > + return Tablet; > + > + parent = udev_device_get_parent_with_subsystem_devtype(parent, "input", NULL); > + } > + return Unknown; > +} > + > +static VOID build_report_descriptor(struct wine_input_private *ext, struct udev_device *dev) > +{ > + int abs_pages[TOP_ABS_PAGE][HID_ABS_MAX+1]; > + int rel_pages[TOP_REL_PAGE][HID_REL_MAX+1]; > + BYTE absbits[(ABS_MAX+7)/8]; > + BYTE relbits[(REL_MAX+7)/8]; > + BYTE keybits[(KEY_MAX+7)/8]; > + BYTE *report_ptr; > + INT i, descript_size; > + INT report_size; > + INT button_count, abs_count, rel_count, hat_count; > + const BYTE *device_usage = what_am_I(dev); > + > + if (ioctl(ext->base.device_fd, EVIOCGBIT(EV_REL, sizeof(relbits)), relbits) == -1) > + { > + WARN("ioctl(EVIOCGBIT, EV_REL) failed: %d %s\n", errno, strerror(errno)); > + return; > + } > + if (ioctl(ext->base.device_fd, EVIOCGBIT(EV_ABS, sizeof(absbits)), absbits) == -1) > + { > + WARN("ioctl(EVIOCGBIT, EV_ABS) failed: %d %s\n", errno, strerror(errno)); > + return; > + } > + if (ioctl(ext->base.device_fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits) == -1) > + { > + WARN("ioctl(EVIOCGBIT, EV_KEY) failed: %d %s\n", errno, strerror(errno)); > + return; > + } > + > + descript_size = sizeof(report_header) + sizeof(report_tail); > + report_size = 0; > + > + /* For now lump all buttons just into incremental usages, Ignore Keys */ > + button_count = 0; > + for (i = BTN_MISC; i < KEY_MAX; i++) > + { > + if (test_bit(keybits, i)) > + { > + ext->button_map[i] = button_count; > + button_count++; > + } > + } > + if (button_count) > + { > + descript_size += sizeof(report_buttons); > + if (button_count % 8) > + descript_size += sizeof(report_padding); > + report_size = (button_count + 7) / 8; > + } > + > + abs_count = 0; > + memset(abs_pages, 0, sizeof(abs_pages)); > + for (i = 0; i < HID_ABS_MAX; i++) > + if (test_bit(absbits, i)) > + { > + abs_pages[ABS_to_HID_map[i][0]][0]++; > + abs_pages[ABS_to_HID_map[i][0]][abs_pages[ABS_to_HID_map[i][0]][0]] = i; > + > + ioctl(ext->base.device_fd, EVIOCGABS(i), &(ext->abs_map[i])); > + if (abs_pages[ABS_to_HID_map[i][0]][0] == 1) > + { > + descript_size += sizeof(report_axis_header); > + descript_size += sizeof(report_abs_axis_tail); > + } > + } > + /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ > + for (i = 1; i < TOP_ABS_PAGE; i++) > + if (abs_pages[i][0] > 0) > + { > + int j; > + descript_size += sizeof(report_axis_usage) * abs_pages[i][0]; > + for (j = 1; j <= abs_pages[i][0]; j++) > + { > + ext->abs_map[abs_pages[i][j]].report_index = report_size; > + report_size+=2; > + } > + abs_count++; > + } > + > + rel_count = 0; > + memset(rel_pages, 0, sizeof(rel_pages)); > + for (i = 0; i < HID_REL_MAX; i++) > + if (test_bit(relbits, i)) > + { > + rel_pages[REL_to_HID_map[i][0]][0]++; > + rel_pages[REL_to_HID_map[i][0]][rel_pages[REL_to_HID_map[i][0]][0]] = i; > + if (rel_pages[REL_to_HID_map[i][0]][0] == 1) > + { > + descript_size += sizeof(report_axis_header); > + descript_size += sizeof(report_rel_axis_tail); > + } > + } > + /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ > + for (i = 1; i < TOP_REL_PAGE; i++) > + if (rel_pages[i][0] > 0) > + { > + int j; > + descript_size += sizeof(report_axis_usage) * rel_pages[i][0]; > + for (j = 1; j <= rel_pages[i][0]; j++) > + { > + ext->rel_map[rel_pages[i][j]] = report_size; > + report_size++; > + } > + rel_count++; > + } > + > + hat_count = 0; > + for (i = ABS_HAT0X; i <=ABS_HAT3X; i+=2) > + if (test_bit(absbits, i)) > + { > + ext->hat_map[i - ABS_HAT0X] = report_size; > + ext->hat_values[i - ABS_HAT0X] = 0; > + ext->hat_values[i - ABS_HAT0X + 1] = 0; > + report_size++; > + hat_count++; > + } > + > + TRACE("Report Descriptor will be %i bytes\n", descript_size); > + TRACE("Report will be %i bytes\n", report_size); > + > + ext->report_descriptor = HeapAlloc(GetProcessHeap(), 0, descript_size); > + report_ptr = ext->report_descriptor; > + > + memcpy(report_ptr, report_header, sizeof(report_header)); > + report_ptr[IDX_HEADER_PAGE] = device_usage[0]; > + report_ptr[IDX_HEADER_USAGE] = device_usage[1]; > + report_ptr += sizeof(report_header); > + if (button_count) > + { > + report_ptr = add_button_block(report_ptr, 1, button_count); > + if (button_count % 8) > + { > + BYTE padding = 8 - (button_count % 8); > + report_ptr = add_padding_block(report_ptr, padding); > + } > + } > + if (abs_count) > + { > + for (i = 1; i < TOP_ABS_PAGE; i++) > + { > + if (abs_pages[i][0]) > + { > + BYTE usages[HID_ABS_MAX]; > + int j; > + for (j = 0; j < abs_pages[i][0]; j++) > + usages[j] = ABS_to_HID_map[abs_pages[i][j+1]][1]; > + report_ptr = add_axis_block(report_ptr, abs_pages[i][0], i, usages, TRUE); > + } > + } > + } > + if (rel_count) > + { > + for (i = 1; i < TOP_REL_PAGE; i++) > + { > + if (rel_pages[i][0]) > + { > + BYTE usages[HID_REL_MAX]; > + int j; > + for (j = 0; j < rel_pages[i][0]; j++) > + usages[j] = REL_to_HID_map[rel_pages[i][j+1]][1]; > + report_ptr = add_axis_block(report_ptr, rel_pages[i][0], i, usages, FALSE); > + } > + } > + } > + if (hat_count) > + report_ptr = add_hatswitch(report_ptr, hat_count); > + > + memcpy(report_ptr, report_tail, sizeof(report_tail)); > + > + ext->report_descriptor_size = descript_size; > +} > +#endif > + > static inline WCHAR *strdupAtoW(const char *src) > { > WCHAR *dst; > @@ -406,9 +822,23 @@ static const platform_vtbl hidraw_vtbl = > > #ifdef HAS_PROPER_INPUT_HEADER > > +static inline struct wine_input_private *input_impl_from_DEVICE_OBJECT(DEVICE_OBJECT *device) > +{ > + return (struct wine_input_private*)get_platform_private(device); > +} > + > static NTSTATUS lnxev_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) > { > - return STATUS_NOT_IMPLEMENTED; > + struct wine_input_private *ext = input_impl_from_DEVICE_OBJECT(device); > + > + *out_length = ext->report_descriptor_size; > + > + if (length < ext->report_descriptor_size) > + return STATUS_BUFFER_TOO_SMALL; > + > + memcpy(buffer, ext->report_descriptor, ext->report_descriptor_size); > + > + return STATUS_SUCCESS; > } > > static NTSTATUS lnxev_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) > @@ -511,7 +941,7 @@ static void try_add_device(struct udev_device *dev) > #ifdef HAS_PROPER_INPUT_HEADER > else if (strcmp(subsystem, "input") == 0) > { > - device = bus_create_hid_device(udev_driver_obj, lnxev_busidW, vid, pid, version, 0, serial, (gamepad != NULL), &GUID_DEVCLASS_LINUXEVENT, &lnxev_vtbl, sizeof(struct platform_private)); > + device = bus_create_hid_device(udev_driver_obj, lnxev_busidW, vid, pid, version, 0, serial, (gamepad != NULL), &GUID_DEVCLASS_LINUXEVENT, &lnxev_vtbl, sizeof(struct wine_input_private)); > } > #endif > > @@ -520,6 +950,9 @@ static void try_add_device(struct udev_device *dev) > struct platform_private *private = impl_from_DEVICE_OBJECT(device); > private->udev_device = udev_device_ref(dev); > private->device_fd = fd; > +#ifdef HAS_PROPER_INPUT_HEADER > + build_report_descriptor((struct wine_input_private*)private, dev); I don't think you want this code to be executed for hidraw devices. > +#endif > IoInvalidateDeviceRelations(device, BusRelations); > } > else > > >

1 0

Re: [PATCH v2 2/2] wined3d: Add quirk for Nvidia viewport subpixel bits bug.
by Sebastian Lackner 27 Feb '17

27 Feb '17

On 27.02.2017 13:42, Józef Kucia wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > > Version 2: Test if the pixel center offset works as expected. > > Tested with nouveau, radeonsi and Nvidia blob. > wined3d_caps_gl_ctx_test_viewport_subpixel_bits() fails only with Nvidia blob. As you might be aware, the problem on Nvidia binary can also be worked around by using slightly different offsets (basically reverting 1bed10abee7d2439a5c7358596c860c454f06b53). Do you think its better to disable it, or should we just use different pixel center offsets? > > --- > dlls/wined3d/directx.c | 27 ++++++++++++++++++++++++ > dlls/wined3d/utils.c | 47 ++++++++++++++++++++++++++++++++++++++++++ > dlls/wined3d/wined3d_private.h | 2 ++ > 3 files changed, 76 insertions(+) > > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index 7f1a850..3495710 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -913,6 +913,17 @@ static BOOL match_broken_arb_fog(const struct wined3d_gl_info *gl_info, struct w > return data[0] != 0x00ff0000 || data[3] != 0x0000ff00; > } > > +static BOOL match_broken_viewport_subpixel_bits(const struct wined3d_gl_info *gl_info, > + struct wined3d_caps_gl_ctx *ctx, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, > + enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) > +{ > + if (!gl_info->supported[ARB_VIEWPORT_ARRAY]) > + return FALSE; > + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) > + return FALSE; > + return !wined3d_caps_gl_ctx_test_viewport_subpixel_bits(ctx); > +} > + > static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) > { > /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms. > @@ -1041,6 +1052,17 @@ static void quirk_broken_arb_fog(struct wined3d_gl_info *gl_info) > gl_info->quirks |= WINED3D_QUIRK_BROKEN_ARB_FOG; > } > > +static void quirk_broken_viewport_subpixel_bits(struct wined3d_gl_info *gl_info) > +{ > + TRACE("Disabling ARB_viewport_array.\n"); > + gl_info->supported[ARB_VIEWPORT_ARRAY] = FALSE; > + if (gl_info->supported[ARB_CLIP_CONTROL]) > + { > + TRACE("Disabling ARB_clip_control.\n"); > + gl_info->supported[ARB_CLIP_CONTROL] = FALSE; > + } > +} > + > struct driver_quirk > { > BOOL (*match)(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, > @@ -1132,6 +1154,11 @@ static const struct driver_quirk quirk_table[] = > quirk_broken_arb_fog, > "ARBfp fogstart == fogend workaround" > }, > + { > + match_broken_viewport_subpixel_bits, > + quirk_broken_viewport_subpixel_bits, > + "Nvidia viewport subpixel bits bug" > + }, > }; > > /* Certain applications (Steam) complain if we report an outdated driver version. In general, > diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c > index b076783..c392388 100644 > --- a/dlls/wined3d/utils.c > +++ b/dlls/wined3d/utils.c > @@ -3509,6 +3509,53 @@ fail: > return FALSE; > } > > +BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) > +{ > + static const struct wined3d_color red = {1.0f, 0.0f, 0.0f, 1.0f}; > + const struct wined3d_gl_info *gl_info = ctx->gl_info; > + static const float offset = -63.0f / 128.0f; > + GLuint texture, fbo; > + DWORD readback[4]; > + unsigned int i; > + > + gl_info->gl_ops.gl.p_glGenTextures(1, &texture); > + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, texture); > + gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); > + gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, ARRAY_SIZE(readback), 1, 0, > + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); > + gl_info->fbo_ops.glGenFramebuffers(1, &fbo); > + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, fbo); > + gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, > + GL_TEXTURE_2D, texture, 0); > + checkGLcall("create resources"); > + > + gl_info->gl_ops.gl.p_glClearColor(1.0f, 1.0f, 1.0f, 1.0f); > + gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT); > + GL_EXTCALL(glViewportIndexedf(0, offset, offset, 4.0f, 1.0f)); > + draw_test_quad(ctx, NULL, &red); > + checkGLcall("draw"); > + > + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, texture); > + gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, > + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); > + checkGLcall("readback"); > + > + TRACE("Readback colors are 0x%08x, 0x%08x, 0x%08x, 0x%08x.\n", > + readback[0], readback[1], readback[2], readback[3]); > + > + gl_info->gl_ops.gl.p_glDeleteTextures(1, &texture); > + gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); > + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, 0); > + checkGLcall("delete resources"); > + > + for (i = 0; i < ARRAY_SIZE(readback); ++i) > + { > + if (readback[i] != 0xffff0000) > + return FALSE; > + } > + return TRUE; > +} > + > float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLenum format) > { > const struct wined3d_gl_info *gl_info = ctx->gl_info; > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 7950011..3cd7ae5 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -2354,6 +2354,8 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, > struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; > UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; > > +BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; > + > void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext) DECLSPEC_HIDDEN; > > enum projection_types >

2 3

Re: winmm: Fix some spec file entries
by Andrew Eikum 27 Feb '17

27 Feb '17

On Wed, Feb 22, 2017 at 11:23:08PM +0100, André Hentschel wrote: > -@ stdcall PlaySound(ptr long long) PlaySoundA > -@ stdcall PlaySoundA(ptr long long) > -@ stdcall PlaySoundW(ptr long long) > +@ stdcall PlaySound(str long long) PlaySoundA > +@ stdcall PlaySoundA(str long long) > +@ stdcall PlaySoundW(wstr long long) The first parameter is not always a string, sometimes it's a resource identifier or even a raw pointer: https://msdn.microsoft.com/en-us/library/windows/desktop/dd743679(v=vs.85).… Andrew

1 0

Re: [PATCH] oledb32: Correct length calculation in DataConvert for DBTYPE_STR
by Huw Davies 27 Feb '17

27 Feb '17

On Fri, Feb 24, 2017 at 06:45:16AM +0000, Alistair Leslie-Hughes wrote: > v2 - Correct failing test under wine > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/oledb32/convert.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c > index ac462f2..20ef917 100644 > --- a/dlls/oledb32/convert.c > +++ b/dlls/oledb32/convert.c > @@ -816,23 +816,23 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, > case DBTYPE_STR: > { > BSTR b; > - DBLENGTH bstr_len; > + DBLENGTH length; > INT bytes_to_copy; > - hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, > + hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &length, > src, &b, sizeof(BSTR), src_status, dst_status, > precision, scale, flags); > if(hr != S_OK) return hr; > - bstr_len = SysStringLen(b); > - *dst_len = bstr_len * sizeof(char); /* Doesn't include size for '\0' */ > + length = WideCharToMultiByte(CP_ACP, 0, b, -1, NULL, 0, NULL, NULL); > + *dst_len = SysStringLen(b); /* Doesn't include size for '\0' */ This obviously can't be right. As I said, you want to pass SysStringLen(b) as the wstr_len to WideCharToMultiByte(). Then whatever that returns will be the length of the ansi string excluding the '\0'. That should go into *dst_len. > *dst_status = DBSTATUS_S_OK; > - bytes_to_copy = min(*dst_len + sizeof(char), dst_max_len); > + bytes_to_copy = min(length, dst_max_len); bytes_to_copy should be min(length + 1, dst_max_len), so unchanged, but let's get rid of sizeof(char). > if(dst) > { > if(bytes_to_copy >= sizeof(char)) > { > - WideCharToMultiByte(CP_ACP, 0, b, bytes_to_copy - sizeof(char), dst, dst_max_len, NULL, NULL); > + WideCharToMultiByte(CP_ACP, 0, b, -1, dst, dst_max_len, NULL, NULL); Again SysStringLen(b) here for the wstr_len. > *((char *)dst + bytes_to_copy / sizeof(char) - 1) = 0; This is correct, but again let's get rid of the sizeof(char). > - if(bytes_to_copy < *dst_len + sizeof(char)) > + if(bytes_to_copy < length) should be length + 1. You probably want to add a test for a STR -> STR conversion of "test\0ed" and pass in interesting src lengths like 6, 7 and 8, then check the returned dst (using memcmp, not strcmp). Huw.

1 0

Re: iphlpapi/tests: Don't skip because of an obsolete function
by Nikolay Sivov 27 Feb '17

27 Feb '17

On 27.02.2017 16:05, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/iphlpapi/tests/iphlpapi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c > index 953bbc9..ddea4f8 100644 > --- a/dlls/iphlpapi/tests/iphlpapi.c > +++ b/dlls/iphlpapi/tests/iphlpapi.c > @@ -1583,7 +1583,7 @@ static void test_AllocateAndGetTcpExTableFromStack(void) > > if (!pAllocateAndGetTcpExTableFromStack) > { > - skip("AllocateAndGetTcpExTableFromStack not available\n"); > + trace("AllocateAndGetTcpExTableFromStack not available, skipping\n"); > return; > } > > What's a point of this change?

1 0

Re: ntdll: Fix RtlExpandEnvironmentStrings_U spec file entry (try 2)
by Alexandre Julliard 27 Feb '17

27 Feb '17

André Hentschel <nerv(a)dawncrow.de> writes: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/ntdll/ntdll.spec | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > > diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec > index 66618fc..7d7c34b 100644 > --- a/dlls/ntdll/ntdll.spec > +++ b/dlls/ntdll/ntdll.spec > @@ -589,7 +589,7 @@ > @ stdcall RtlEraseUnicodeString(ptr) > @ stdcall RtlExitUserProcess(long) > @ stdcall RtlExitUserThread(long) > -@ stdcall RtlExpandEnvironmentStrings_U(ptr ptr ptr ptr) > +@ stdcall RtlExpandEnvironmentStrings_U(wstr ptr ptr ptr) That's not a string either. -- Alexandre Julliard julliard(a)winehq.org

1 0

Coverity reports for test suite
by Alex Henrie 26 Feb '17

26 Feb '17

Hello, I recently noticed that we don't currently get Coverity reports for files in the test suite. I emailed Amine Khaldi, who does the Coverity reports, and asked if we could start getting reports on the tests. Amine made it sound like this had been discussed before and due to the large volume of reports, there was not interest in getting reports for anything other than the actual Wine code. Is there enough interest now to start looking at the test suite reports? Would it hurt anything to be able to see that information? -Alex

6 10

Re: [PATCH] wined3d: Add quirk for Nvidia viewport subpixel bits bug.
by Henri Verbeet 26 Feb '17

26 Feb '17

On 26 February 2017 at 19:55, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static BOOL match_nvidia_viewport_subpixel_bits(const struct wined3d_gl_info *gl_info, const char *gl_renderer, > + enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) > +{ > + return gl_vendor == GL_VENDOR_NVIDIA && gl_info->supported[ARB_VIEWPORT_ARRAY]; > +} If reasonably possible, we'd like to avoid matching on gl_vendor and the like. It's not the most reliable information we have, and would prevent the feature from working in the future if the driver is ever fixed. I'll grant the chances aren't great on the latter, but out of principle, it should be possible to test if the feature itself is working.

1 0

Re: iphlpapi/tests: Fix test failure for ScopeID with bad DAD
by Bruno Jesus 26 Feb '17

26 Feb '17

On Wed, Feb 22, 2017 at 5:01 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c > index e0701a3..2f818ff 100644 > --- a/dlls/iphlpapi/tests/iphlpapi.c > +++ b/dlls/iphlpapi/tests/iphlpapi.c > @@ -2067,6 +2067,9 @@ static void test_GetUnicastIpAddressEntry(void) > if (row.Address.si_family == AF_INET6) > ok(row.ScopeId.Value == row.Address.Ipv6.sin6_scope_id, "Expected %d, got %d\n", > row.Address.Ipv6.sin6_scope_id, row.ScopeId.Value); > + else if (row.DadState == IpDadStateTentative) > + ok(row.ScopeId.Value == aa->IfIndex, "Expected %d, got %d\n", > + aa->IfIndex, row.ScopeId.Value); > else > ok(row.ScopeId.Value == 0, "Expected 0, got %d\n", row.ScopeId.Value); > ok(row.CreationTimeStamp.QuadPart, "CreationTimeStamp is 0\n"); It may be bikeshedding but 2 things call my attention. The first is that ScopeID is a IPv6 only field, it is very weird that Windows is using it for something. The second is that it may be by chance that ScopeID matches the interface index, tentative means that the DAD mechanism is still working into checking the IP in the network, so ScopeID in such case would be meaningless until it turns into IpDadStatePreferred or maybe one of the other error states.

2 2