September 2021 - Wine-Commits

Rémi Bernon : dinput: Enumerate all HID joystick objects at once.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 1f8487e2f051e1cff7ff9c3cd8c2c7d8b7d6d11c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f8487e2f051e1cff7ff9c3c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 27 09:43:04 2021 +0200 dinput: Enumerate all HID joystick objects at once. Instead of using individual helpers. The force-feedback EnumObjects test shows that we should enumerate the output objects in their original order in the HID report descriptor, not depending on their button/value nature. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 128 ++++++++++++++++++--------------------------- dlls/dinput8/tests/hid.c | 1 - 2 files changed, 51 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f8487e2f051e1cff7ff…

1 0

Rémi Bernon : dinput: Use a custom HID joystick state instead of DIJOYSTATE2.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: d682b3a9d3253f935ee53cca3c2005c1b5b6c9ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=d682b3a9d3253f935ee53cca… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 27 09:43:03 2021 +0200 dinput: Use a custom HID joystick state instead of DIJOYSTATE2. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 85 +++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 53 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 30e63c16cb8..7fe2e5f246c 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -136,10 +136,11 @@ static inline const char *debugstr_hid_caps( struct hid_caps *caps ) return "(unknown type)"; } +#define DEVICE_STATE_MAX_SIZE 1024 + struct hid_joystick { IDirectInputDeviceImpl base; - DIJOYSTATE2 state; HANDLE device; OVERLAPPED read_ovl; @@ -160,6 +161,7 @@ struct hid_joystick ULONG usages_count; BYTE device_state_report_id; + BYTE device_state[DEVICE_STATE_MAX_SIZE]; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -660,7 +662,7 @@ static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, EnterCriticalSection( &impl->base.crit ); if (!impl->base.acquired) hr = DIERR_NOTACQUIRED; - else fill_DataFormat( ptr, len, &impl->state, &impl->base.data_format ); + else fill_DataFormat( ptr, len, impl->device_state, &impl->base.data_format ); LeaveCriticalSection( &impl->base.crit ); return hr; @@ -796,7 +798,8 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = struct parse_device_state_params { - DIJOYSTATE2 old_state; + BYTE old_state[DEVICE_STATE_MAX_SIZE]; + BYTE buttons[128]; DWORD time; DWORD seq; }; @@ -806,12 +809,18 @@ static BOOL check_device_state_button( struct hid_joystick *impl, struct hid_cap { IDirectInputDevice8W *iface = &impl->base.IDirectInputDevice8W_iface; struct parse_device_state_params *params = data; - DWORD i = DIDFT_GETINSTANCE( instance->dwType ); + BYTE old_value, value; if (!(instance->dwType & DIDFT_BUTTON)) FIXME( "unexpected object type %#x, expected DIDFT_BUTTON\n", instance->dwType ); - else if (params->old_state.rgbButtons[i] != impl->state.rgbButtons[i]) - queue_event( iface, instance->dwType, impl->state.rgbButtons[i], params->time, params->seq ); + else + { + value = params->buttons[instance->wUsage - 1]; + old_value = params->old_state[instance->dwOfs]; + impl->device_state[instance->dwOfs] = value; + if (old_value != value) + queue_event( iface, instance->dwType, value, params->time, params->seq ); + } return DIENUM_CONTINUE; } @@ -842,8 +851,8 @@ static BOOL read_device_state_value( struct hid_joystick *impl, struct hid_caps struct parse_device_state_params *params = data; char *report_buf = impl->input_report_buf; HIDP_VALUE_CAPS *value_caps = caps->value; + LONG old_value, value; NTSTATUS status; - LONG value; if (!(instance->dwType & (DIDFT_POV | DIDFT_AXIS))) FIXME( "unexpected object type %#x, expected DIDFT_POV | DIDFT_AXIS\n", instance->dwType ); @@ -855,47 +864,10 @@ static BOOL read_device_state_value( struct hid_joystick *impl, struct hid_caps instance->wUsagePage, instance->wUsage, status ); value = scale_value( logical_value, value_caps, value_caps->PhysicalMin, value_caps->PhysicalMax ); - switch (instance->dwOfs) - { - case DIJOFS_X: - if (impl->state.lX == value) break; - impl->state.lX = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_Y: - if (impl->state.lY == value) break; - impl->state.lY = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_Z: - if (impl->state.lZ == value) break; - impl->state.lZ = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_RX: - if (impl->state.lRx == value) break; - impl->state.lRx = value; + old_value = *(LONG *)(params->old_state + instance->dwOfs); + *(LONG *)(impl->device_state + instance->dwOfs) = value; + if (old_value != value) queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_RY: - if (impl->state.lRy == value) break; - impl->state.lRy = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_RZ: - if (impl->state.lRz == value) break; - impl->state.lRz = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_POV( 0 ): - if (impl->state.rgdwPOV[0] == value) break; - impl->state.rgdwPOV[0] = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - default: - FIXME( "unimplemented offset %#x.\n", instance->dwOfs ); - break; - } } return DIENUM_CONTINUE; @@ -911,7 +883,8 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) }; struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG i, count, report_len = impl->caps.InputReportByteLength; - struct parse_device_state_params params = {0}; + DIDATAFORMAT *format = impl->base.data_format.wine_df; + struct parse_device_state_params params = {{0}}; char *report_buf = impl->input_report_buf; USAGE_AND_PAGE *usages; NTSTATUS status; @@ -944,11 +917,11 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) if (report_buf[0] == impl->device_state_report_id) { - params.old_state = impl->state; params.time = GetCurrentTime(); params.seq = impl->base.dinput->evsequence++; + memcpy( params.old_state, impl->device_state, format->dwDataSize ); + memset( impl->device_state, 0, format->dwDataSize ); - memset( impl->state.rgbButtons, 0, sizeof(impl->state.rgbButtons) ); while (count--) { usages = impl->usages_buf + count; @@ -957,12 +930,12 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) else if (usages->Usage >= 128) FIXME( "ignoring extraneous button %d.\n", usages->Usage ); else - impl->state.rgbButtons[usages->Usage - 1] = 0x80; + params.buttons[usages->Usage - 1] = 0x80; } enum_value_objects( impl, &filter, DIDFT_ALL, read_device_state_value, &params ); enum_button_objects( impl, &filter, DIDFT_ALL, check_device_state_button, &params ); - if (memcmp( &params.old_state, &impl->state, sizeof(impl->state) ) && impl->base.hEvent) + if (impl->base.hEvent && memcmp( &params.old_state, impl->device_state, format->dwDataSize )) SetEvent( impl->base.hEvent ); } @@ -1231,6 +1204,7 @@ static BOOL init_objects( struct hid_joystick *impl, struct hid_caps *caps, DIDATAFORMAT *format = impl->base.data_format.wine_df; format->dwNumObjs++; + format->dwDataSize = max( format->dwDataSize, instance->dwOfs + sizeof(LONG) ); if (instance->dwType & DIDFT_BUTTON) impl->dev_caps.dwButtons++; if (instance->dwType & DIDFT_AXIS) impl->dev_caps.dwAxes++; if (instance->dwType & DIDFT_POV) impl->dev_caps.dwPOVs++; @@ -1360,12 +1334,17 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID enum_button_objects( impl, &filter, DIDFT_ALL, init_objects, NULL ); format = impl->base.data_format.wine_df; + if (format->dwDataSize > DEVICE_STATE_MAX_SIZE) + { + FIXME( "unable to create device, state is too large\n" ); + goto failed; + } + size = format->dwNumObjs * sizeof(*format->rgodf); if (!(format->rgodf = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ))) goto failed; format->dwSize = sizeof(*format); format->dwObjSize = sizeof(*format->rgodf); format->dwFlags = DIDF_ABSAXIS; - format->dwDataSize = sizeof(impl->state); index = 0; enum_value_objects( impl, &filter, DIDFT_ALL, init_data_format, &index );

1 0

Rémi Bernon : dinput: Compute HID joystick object offsets dynamically.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 42ba8f605d579c855929e597de5dd18770b790a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42ba8f605d579c855929e597… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 27 09:43:07 2021 +0200 dinput: Compute HID joystick object offsets dynamically. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 24 +++++++++++++----------- dlls/dinput8/tests/hid.c | 13 +------------ 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index e83b6747e0c..dfff379091e 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -235,7 +235,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, enum_object_callback callback, void *data ) { DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; - DWORD collection = 0, axis = 0, button = 0, pov = 0, i, j; + DWORD collection = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, i, j; DIDATAFORMAT *format = impl->base.data_format.wine_df; int *offsets = impl->base.data_format.offsets; DIPROPHEADER filter = *header; @@ -251,6 +251,10 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, filter.dwObj = format->rgodf[i].dwOfs; } + button_ofs += impl->caps.NumberInputValueCaps * sizeof(LONG); + button_ofs += impl->caps.NumberOutputValueCaps * sizeof(LONG); + button_ofs += impl->caps.NumberFeatureValueCaps * sizeof(LONG); + for (i = 0; i < impl->caps.NumberInputValueCaps; ++i) { caps.value = impl->input_value_caps + i; @@ -267,6 +271,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, TRACE( "Ignoring input value %s, usage page not implemented.\n", debugstr_hid_caps( &caps ) ); else { + instance.dwOfs = value_ofs; instance.wUsagePage = caps.value->UsagePage; instance.wUsage = caps.value->NotRange.Usage; instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); @@ -276,14 +281,12 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, switch (instance.wUsage) { case HID_USAGE_GENERIC_X: - instance.dwOfs = DIJOFS_X; set_axis_type( &instance, seen_axis, 0, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; case HID_USAGE_GENERIC_Y: - instance.dwOfs = DIJOFS_Y; set_axis_type( &instance, seen_axis, 1, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); @@ -291,28 +294,24 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, break; case HID_USAGE_GENERIC_Z: case HID_USAGE_GENERIC_WHEEL: - instance.dwOfs = DIJOFS_Z; set_axis_type( &instance, seen_axis, 2, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; case HID_USAGE_GENERIC_RX: - instance.dwOfs = DIJOFS_RX; set_axis_type( &instance, seen_axis, 3, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; case HID_USAGE_GENERIC_RY: - instance.dwOfs = DIJOFS_RY; set_axis_type( &instance, seen_axis, 4, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; case HID_USAGE_GENERIC_RZ: - instance.dwOfs = DIJOFS_RZ; set_axis_type( &instance, seen_axis, 5, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); @@ -320,14 +319,12 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, break; case HID_USAGE_GENERIC_DIAL: case HID_USAGE_GENERIC_SLIDER: - instance.dwOfs = DIJOFS_SLIDER( 0 ); instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + axis++ ); instance.dwFlags = DIDOI_ASPECTPOSITION; ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; case HID_USAGE_GENERIC_HATSWITCH: - instance.dwOfs = DIJOFS_POV( 0 ); instance.dwType = DIDFT_POV | DIDFT_MAKEINSTANCE( pov++ ); instance.dwFlags = 0; ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); @@ -338,6 +335,8 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, break; } } + + value_ofs += sizeof(LONG); } for (i = 0; i < impl->caps.NumberInputButtonCaps; ++i) @@ -356,7 +355,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, FIXME( "Ignoring input button %s, too many buttons.\n", debugstr_hid_caps( &caps ) ); else for (j = caps.button->Range.UsageMin; j <= caps.button->Range.UsageMax; ++j) { - instance.dwOfs = DIJOFS_BUTTON( j - 1 ); + instance.dwOfs = button_ofs + (j - caps.button->Range.UsageMin); instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( button++ ); instance.dwFlags = 0; instance.wUsagePage = caps.button->UsagePage; @@ -372,7 +371,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, FIXME( "Ignoring input button %s, too many buttons.\n", debugstr_hid_caps( &caps ) ); else { - instance.dwOfs = DIJOFS_BUTTON( caps.button->NotRange.Usage - 1 ); + instance.dwOfs = button_ofs; instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( button++ ); instance.dwFlags = 0; instance.wUsagePage = caps.button->UsagePage; @@ -383,6 +382,9 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } + + if (caps.button->IsRange) button_ofs += caps.button->Range.UsageMax - caps.button->Range.UsageMin; + button_ofs++; } for (i = 0; i < impl->caps.NumberLinkCollectionNodes; ++i) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 5031c4429af..25e7511353f 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3579,15 +3579,7 @@ static void test_simple_joystick(void) .wUsage = HID_USAGE_GENERIC_JOYSTICK, }, }; - const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] = - { - {.ofs = TRUE}, - {.ofs = TRUE}, - {.ofs = TRUE}, - {.ofs = TRUE}, - {.ofs = TRUE}, - {.ofs = TRUE}, - }; + const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] = {}; struct check_objects_params check_objects_params = { @@ -3970,7 +3962,6 @@ static void test_simple_joystick(void) check_member( objinst, expect_objects[1], "%u", dwSize ); check_member_guid( objinst, expect_objects[1], guidType ); - todo_wine check_member( objinst, expect_objects[1], "%#x", dwOfs ); check_member( objinst, expect_objects[1], "%#x", dwType ); check_member( objinst, expect_objects[1], "%#x", dwFlags ); @@ -3998,7 +3989,6 @@ static void test_simple_joystick(void) check_member( objinst, expect_objects[5], "%u", dwSize ); check_member_guid( objinst, expect_objects[5], guidType ); - todo_wine check_member( objinst, expect_objects[5], "%#x", dwOfs ); check_member( objinst, expect_objects[5], "%#x", dwType ); check_member( objinst, expect_objects[5], "%#x", dwFlags ); @@ -4031,7 +4021,6 @@ static void test_simple_joystick(void) check_member( objinst, expect_objects[0], "%u", dwSize ); check_member_guid( objinst, expect_objects[0], guidType ); - todo_wine check_member( objinst, expect_objects[0], "%#x", dwOfs ); check_member( objinst, expect_objects[0], "%#x", dwType ); check_member( objinst, expect_objects[0], "%#x", dwFlags );

1 0

Rémi Bernon : dinput: Convert DIPH_BYOFFSET filter to use current data format offsets.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: 85d7c56a834b7b3738556d727a666795312eb6fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d7c56a834b7b3738556d72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 27 09:43:06 2021 +0200 dinput: Convert DIPH_BYOFFSET filter to use current data format offsets. Instead of hardcoded DIJOYSTATE2 offsets. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 36 ++++++++++++++++++++++++------------ dlls/dinput8/tests/hid.c | 1 - 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index ade58166e27..e83b6747e0c 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -231,14 +231,26 @@ static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD seen[i] = TRUE; } -static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, DWORD flags, +static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, DWORD flags, enum_object_callback callback, void *data ) { DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; DWORD collection = 0, axis = 0, button = 0, pov = 0, i, j; + DIDATAFORMAT *format = impl->base.data_format.wine_df; + int *offsets = impl->base.data_format.offsets; + DIPROPHEADER filter = *header; BOOL ret, seen_axis[6] = {0}; struct hid_caps caps = {0}; + if (filter.dwHow == DIPH_BYOFFSET) + { + if (!offsets) return DIENUM_CONTINUE; + for (i = 0; i < format->dwNumObjs; ++i) + if (offsets[i] == filter.dwObj) break; + if (i == format->dwNumObjs) return DIENUM_CONTINUE; + filter.dwObj = format->rgodf[i].dwOfs; + } + for (i = 0; i < impl->caps.NumberInputValueCaps; ++i) { caps.value = impl->input_value_caps + i; @@ -267,14 +279,14 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, instance.dwOfs = DIJOFS_X; set_axis_type( &instance, seen_axis, 0, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; - ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); + ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; case HID_USAGE_GENERIC_Y: instance.dwOfs = DIJOFS_Y; set_axis_type( &instance, seen_axis, 1, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; - ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); + ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; case HID_USAGE_GENERIC_Z: @@ -282,28 +294,28 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, instance.dwOfs = DIJOFS_Z; set_axis_type( &instance, seen_axis, 2, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; - ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); + ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; case HID_USAGE_GENERIC_RX: instance.dwOfs = DIJOFS_RX; set_axis_type( &instance, seen_axis, 3, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; - ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); + ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; case HID_USAGE_GENERIC_RY: instance.dwOfs = DIJOFS_RY; set_axis_type( &instance, seen_axis, 4, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; - ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); + ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; case HID_USAGE_GENERIC_RZ: instance.dwOfs = DIJOFS_RZ; set_axis_type( &instance, seen_axis, 5, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; - ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); + ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; case HID_USAGE_GENERIC_DIAL: @@ -311,14 +323,14 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, instance.dwOfs = DIJOFS_SLIDER( 0 ); instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + axis++ ); instance.dwFlags = DIDOI_ASPECTPOSITION; - ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); + ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; case HID_USAGE_GENERIC_HATSWITCH: instance.dwOfs = DIJOFS_POV( 0 ); instance.dwType = DIDFT_POV | DIDFT_MAKEINSTANCE( pov++ ); instance.dwFlags = 0; - ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); + ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; break; default: @@ -352,7 +364,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = caps.button->ReportID; instance.wCollectionNumber = caps.button->LinkCollection; - ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); + ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } } @@ -368,7 +380,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = caps.button->ReportID; instance.wCollectionNumber = caps.button->LinkCollection; - ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); + ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } } @@ -391,7 +403,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = 0; instance.wCollectionNumber = caps.node->Parent; - ret = enum_object( impl, filter, flags, callback, &caps, &instance, data ); + ret = enum_object( impl, &filter, flags, callback, &caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; } } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index c7f5b82c187..5031c4429af 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3988,7 +3988,6 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0x14, DIPH_BYOFFSET ); ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0, DIPH_BYOFFSET ); - todo_wine ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); res = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 3 ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYID );

1 0

Rémi Bernon : kernelbase: Fix incorrect pseudo console allocation size (GCC 11).
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: wine Branch: master Commit: ea2b0033e0cfd3c133962f7d1d1f87cb968d6eae URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea2b0033e0cfd3c133962f7d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 27 10:58:29 2021 +0200 kernelbase: Fix incorrect pseudo console allocation size (GCC 11). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index c38e8e91955..a7eeb439232 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1728,7 +1728,7 @@ HRESULT WINAPI CreatePseudoConsole( COORD size, HANDLE input, HANDLE output, DWO if (!size.X || !size.Y || !ret) return E_INVALIDARG; - if (!(pseudo_console = HeapAlloc( GetProcessHeap(), 0, HEAP_ZERO_MEMORY ))) return E_OUTOFMEMORY; + if (!(pseudo_console = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pseudo_console) ))) return E_OUTOFMEMORY; swprintf( pipe_name, ARRAY_SIZE(pipe_name), L"\\\\.\\pipe\\wine_pty_signal_pipe%x", GetCurrentThreadId() );

1 0

Zebediah Figura : vkd3d-shader/hlsl: Factor out add_unary_expr().
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: vkd3d Branch: master Commit: 9a627494a3a1612f63e5f876a289904fabe38602 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a627494a3a1612f63e5f87… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 16:47:03 2021 -0500 vkd3d-shader/hlsl: Factor out add_unary_expr(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e9eac55..b8d147a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1083,6 +1083,17 @@ static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) return list; } +static struct list *add_unary_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *expr; + + if (!(expr = hlsl_new_unary_expr(ctx, op, node_from_list(instrs), loc))) + return NULL; + list_add_tail(instrs, &expr->entry); + return instrs; +} + static struct list *add_binary_expr(struct hlsl_ctx *ctx, struct list *list1, struct list *list2, enum hlsl_ir_expr_op op, struct vkd3d_shader_location loc) { @@ -3033,7 +3044,7 @@ unary_expr: if ($1 == UNARY_OP_PLUS) $$ = $2; else - $$ = append_unop($2, hlsl_new_unary_expr(ctx, ops[$1], node_from_list($2), @1)); + $$ = add_unary_expr(ctx, $2, ops[$1], @1); } /* var_modifiers is necessary to avoid shift/reduce conflicts. */

1 0

Zebediah Figura : vkd3d-shader/hlsl: Don't dereference a NULL offset_node in hlsl_offset_from_deref().
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: vkd3d Branch: master Commit: 14e9a1ba1c6b8403e3df5522ae763aed5a8f1f45 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=14e9a1ba1c6b8403e3df552… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 16:47:02 2021 -0500 vkd3d-shader/hlsl: Don't dereference a NULL offset_node in hlsl_offset_from_deref(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9efc3da..6f8bece 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1201,7 +1201,7 @@ unsigned int hlsl_offset_from_deref(const struct hlsl_deref *deref) if (offset_node->type != HLSL_IR_CONSTANT) { FIXME("Dereference with non-constant offset of type %s.\n", hlsl_node_type_to_string(offset_node->type)); - offset_node = NULL; + return 0; } return hlsl_ir_constant(offset_node)->value[0].u;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Factor out a variable_decl rule.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: vkd3d Branch: master Commit: 58c80574d8f1d1cf3eaba745eb0bf6f34c7c63a8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=58c80574d8f1d1cf3eaba74… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 16:47:06 2021 -0500 vkd3d-shader/hlsl: Factor out a variable_decl rule. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 941f49c..19745e7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1973,6 +1973,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type %type <type> typedef_type %type <variable_def> type_spec +%type <variable_def> variable_decl %type <variable_def> variable_def %% @@ -2546,7 +2547,7 @@ variables_def: list_add_tail($$, &$3->entry); } -variable_def: +variable_decl: any_identifier arrays colon_attribute { $$ = hlsl_alloc(ctx, sizeof(*$$)); @@ -2556,15 +2557,13 @@ variable_def: $$->semantic = $3.semantic; $$->reg_reservation = $3.reg_reservation; } - | any_identifier arrays colon_attribute '=' complex_initializer + +variable_def: + variable_decl + | variable_decl '=' complex_initializer { - $$ = hlsl_alloc(ctx, sizeof(*$$)); - $$->loc = @1; - $$->name = $1; - $$->arrays = $2; - $$->semantic = $3.semantic; - $$->reg_reservation = $3.reg_reservation; - $$->initializer = $5; + $$ = $1; + $$->initializer = $3; } arrays:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Get rid of the unary_op rule.
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: vkd3d Branch: master Commit: 8930bb734f5c2ef85b70fcfa7f779d3cbc2b0237 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8930bb734f5c2ef85b70fcf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 16:47:04 2021 -0500 vkd3d-shader/hlsl: Get rid of the unary_op rule. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 51 +++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b8d147a..42a6768 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -80,14 +80,6 @@ struct parse_if_body struct list *else_instrs; }; -enum parse_unary_op -{ - UNARY_OP_PLUS, - UNARY_OP_MINUS, - UNARY_OP_LOGICNOT, - UNARY_OP_BITNOT, -}; - enum parse_assign_op { ASSIGN_OP_ASSIGN, @@ -1798,7 +1790,6 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type struct parse_array_sizes arrays; struct parse_variable_def *variable_def; struct parse_if_body if_body; - enum parse_unary_op unary_op; enum parse_assign_op assign_op; struct hlsl_reg_reservation reg_reservation; struct parse_colon_attribute colon_attribute; @@ -1987,8 +1978,6 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type %type <type> type %type <type> typedef_type -%type <unary_op> unary_op - %type <variable_def> type_spec %type <variable_def> variable_def @@ -3037,16 +3026,22 @@ unary_expr: } $$ = $2; } - | unary_op unary_expr + | '+' unary_expr { - static const enum hlsl_ir_expr_op ops[] = {0, HLSL_OP1_NEG, HLSL_OP1_LOGIC_NOT, HLSL_OP1_BIT_NOT}; - - if ($1 == UNARY_OP_PLUS) - $$ = $2; - else - $$ = add_unary_expr(ctx, $2, ops[$1], @1); + $$ = $2; + } + | '-' unary_expr + { + $$ = add_unary_expr(ctx, $2, HLSL_OP1_NEG, @1); + } + | '~' unary_expr + { + $$ = add_unary_expr(ctx, $2, HLSL_OP1_BIT_NOT, @1); + } + | '!' unary_expr + { + $$ = add_unary_expr(ctx, $2, HLSL_OP1_LOGIC_NOT, @1); } - /* var_modifiers is necessary to avoid shift/reduce conflicts. */ | '(' var_modifiers type arrays ')' unary_expr { @@ -3082,24 +3077,6 @@ unary_expr: $$ = append_unop($6, &hlsl_new_cast(ctx, node_from_list($6), dst_type, &@3)->node); } -unary_op: - '+' - { - $$ = UNARY_OP_PLUS; - } - | '-' - { - $$ = UNARY_OP_MINUS; - } - | '!' - { - $$ = UNARY_OP_LOGICNOT; - } - | '~' - { - $$ = UNARY_OP_BITNOT; - } - mul_expr: unary_expr | mul_expr '*' unary_expr

1 0

Zebediah Figura : vkd3d-shader/hlsl: Get rid of append_unop().
by Alexandre Julliard Sept. 27, 2021

Sept. 27, 2021

Module: vkd3d Branch: master Commit: 19b21ed005efe4a1715a072b6b5a7da9a5ab9823 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=19b21ed005efe4a1715a072… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 16:47:05 2021 -0500 vkd3d-shader/hlsl: Get rid of append_unop(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 42a6768..941f49c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1069,12 +1069,6 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, return expr; } -static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) -{ - list_add_tail(list, &node->entry); - return list; -} - static struct list *add_unary_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, struct vkd3d_shader_location loc) { @@ -2934,7 +2928,8 @@ postfix_expr: hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Invalid swizzle \"%s\".", $3); YYABORT; } - $$ = append_unop($1, &swizzle->node); + list_add_tail($1, &swizzle->node.entry); + $$ = $1; } else { @@ -3047,6 +3042,7 @@ unary_expr: { struct hlsl_type *src_type = node_from_list($6)->data_type; struct hlsl_type *dst_type; + struct hlsl_ir_expr *cast; unsigned int i; if ($2) @@ -3074,7 +3070,13 @@ unary_expr: YYABORT; } - $$ = append_unop($6, &hlsl_new_cast(ctx, node_from_list($6), dst_type, &@3)->node); + if (!(cast = hlsl_new_cast(ctx, node_from_list($6), dst_type, &@3))) + { + hlsl_free_instr_list($6); + YYABORT; + } + list_add_tail($6, &cast->node.entry); + $$ = $6; } mul_expr:

1 0