September 2021 - Wine-commits

Rémi Bernon : winexinput.sys: Translate lower reports into XInput HID reports.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 2eea1d615ae7e74282fe19e015ecadd10b4be9ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eea1d615ae7e74282fe19e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 10 09:08:21 2021 +0200 winexinput.sys: Translate lower reports into XInput HID reports. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 188 +++++++++++++++++++++++++++++++++-- dlls/winexinput.sys/pop_hid_macros.h | 83 ++++++++++++++++ dlls/winexinput.sys/psh_hid_macros.h | 85 ++++++++++++++++ dlls/xinput1_3/tests/xinput.c | 25 ----- 4 files changed, 349 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2eea1d615ae7e74282fe…

1 0

Alex Henrie : uiautomationcore: Add UiaDisconnectProvider stub.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: eac5cef24038f0194e58ed0004c4a162b4f3e9a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eac5cef24038f0194e58ed00… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Sep 10 01:18:17 2021 -0600 uiautomationcore: Add UiaDisconnectProvider stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51729 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 6 ++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 42014af6035..2dada95af80 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -89,3 +89,9 @@ HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **pr FIXME("(%p, %p): stub\n", hwnd, provider); return E_NOTIMPL; } + +HRESULT WINAPI UiaDisconnectProvider(IRawElementProviderSimple *provider) +{ + FIXME("(%p): stub\n", provider); + return E_NOTIMPL; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index c9b96ab39ef..656641c4bad 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -56,7 +56,7 @@ @ stub UiaAddEvent @ stdcall UiaClientsAreListening() #@ stub UiaDisconnectAllProviders -#@ stub UiaDisconnectProvider +@ stdcall UiaDisconnectProvider(ptr) @ stub UiaEventAddWindow @ stub UiaEventRemoveWindow @ stub UiaFind

1 0

Rémi Bernon : dinput8/tests: Read the HID report descriptor from the registry.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: b648e67fd3d5708edb7059396852a9b025e5ca36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b648e67fd3d5708edb705939… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 10 09:22:41 2021 +0200 dinput8/tests: Read the HID report descriptor from the registry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 268 +++------------------------------------- dlls/dinput8/tests/hid.c | 250 +++++++++++++++++++++++++++++++++++++ 2 files changed, 265 insertions(+), 253 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b648e67fd3d5708edb70…

1 0

Rémi Bernon : dinput8/tests: Read HID_DEVICE_ATTRIBUTES from the registry.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 97a6870c10e36f7f8c94f9fed4e3b24cd84e2cef URL: https://source.winehq.org/git/wine.git/?a=commit;h=97a6870c10e36f7f8c94f9fe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 10 09:22:42 2021 +0200 dinput8/tests: Read HID_DEVICE_ATTRIBUTES from the registry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 24 +++++++++++------------- dlls/dinput8/tests/hid.c | 11 +++++++++++ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 6bd5611c86c..06b223d1611 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -39,6 +39,7 @@ static UNICODE_STRING control_symlink; static unsigned int got_start_device; +static HID_DEVICE_ATTRIBUTES attributes; static char report_descriptor_buf[4096]; static DWORD report_descriptor_len; static DWORD report_id; @@ -228,25 +229,16 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) break; case IOCTL_HID_GET_DEVICE_ATTRIBUTES: - { - HID_DEVICE_ATTRIBUTES *attr = irp->UserBuffer; - ok( !in_size, "got input size %u\n", in_size ); - ok( out_size == sizeof(*attr), "got output size %u\n", out_size ); + ok( out_size == sizeof(attributes), "got output size %u\n", out_size ); - if (out_size == sizeof(*attr)) + if (out_size == sizeof(attributes)) { - ok( !attr->Size, "got size %u\n", attr->Size ); - - attr->Size = sizeof(*attr); - attr->VendorID = 0x1209; - attr->ProductID = 0x0001; - attr->VersionNumber = 0xface; - irp->IoStatus.Information = sizeof(*attr); + memcpy( irp->UserBuffer, &attributes, sizeof(attributes) ); + irp->IoStatus.Information = sizeof(attributes); } ret = STATUS_SUCCESS; break; - } case IOCTL_HID_READ_REPORT: { @@ -472,6 +464,12 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) memcpy( report_descriptor_buf, buffer + info_size, size - info_size ); report_descriptor_len = size - info_size; + RtlInitUnicodeString( &name_str, L"Attributes" ); + size = info_size + sizeof(attributes); + ret = ZwQueryValueKey( hkey, &name_str, KeyValuePartialInformation, buffer, size, &size ); + ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); + memcpy( &attributes, buffer + info_size, size - info_size ); + driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index ec2575aa9c1..51b204c736d 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2301,6 +2301,14 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) #undef REPORT_ID_OR_USAGE_PAGE #include "pop_hid_macros.h" + static const HID_DEVICE_ATTRIBUTES attributes = + { + .Size = sizeof(HID_DEVICE_ATTRIBUTES), + .VendorID = 0x1209, + .ProductID = 0x0001, + .VersionNumber = 0x0100, + }; + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; LSTATUS status; HKEY hkey; @@ -2322,6 +2330,9 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) status = RegSetValueExW( hkey, L"Descriptor", 0, REG_BINARY, (void *)report_desc, sizeof(report_desc) ); ok( !status, "RegSetValueExW returned %#x\n", status ); + status = RegSetValueExW( hkey, L"Attributes", 0, REG_BINARY, (void *)&attributes, sizeof(attributes) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + if (pnp_driver_start( L"driver_hid.dll" )) test_hid_device( report_id, polled ); pnp_driver_stop();

1 0

Rémi Bernon : dinput8/tests: Read the expected lengths from the registry.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 03e68ae3fc683ab9a41ac7072a49c319c33877af URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e68ae3fc683ab9a41ac707… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 10 09:22:43 2021 +0200 dinput8/tests: Read the expected lengths from the registry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 19 +++++++++---- dlls/dinput8/tests/hid.c | 61 ++++++++++++++++------------------------- 2 files changed, 36 insertions(+), 44 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 06b223d1611..eefdc05d1a3 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -42,6 +42,7 @@ static unsigned int got_start_device; static HID_DEVICE_ATTRIBUTES attributes; static char report_descriptor_buf[4096]; static DWORD report_descriptor_len; +static HIDP_CAPS caps; static DWORD report_id; static DWORD polled; @@ -242,7 +243,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_HID_READ_REPORT: { - ULONG expected_size = 25; + ULONG expected_size = caps.InputReportByteLength - (report_id ? 0 : 1); ok( !in_size, "got input size %u\n", in_size ); ok( out_size == expected_size, "got output size %u\n", out_size ); @@ -266,7 +267,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_HID_WRITE_REPORT: { HID_XFER_PACKET *packet = irp->UserBuffer; - ULONG expected_size = 2; + ULONG expected_size = caps.OutputReportByteLength - (report_id ? 0 : 1); ok( in_size == sizeof(*packet), "got input size %u\n", in_size ); ok( !out_size, "got output size %u\n", out_size ); @@ -284,7 +285,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_HID_GET_INPUT_REPORT: { HID_XFER_PACKET *packet = irp->UserBuffer; - ULONG expected_size = 23; + ULONG expected_size = caps.InputReportByteLength - (report_id ? 0 : 1); ok( !in_size, "got input size %u\n", in_size ); ok( out_size == sizeof(*packet), "got output size %u\n", out_size ); @@ -303,7 +304,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_HID_SET_OUTPUT_REPORT: { HID_XFER_PACKET *packet = irp->UserBuffer; - ULONG expected_size = 2; + ULONG expected_size = caps.OutputReportByteLength - (report_id ? 0 : 1); ok( in_size == sizeof(*packet), "got input size %u\n", in_size ); ok( !out_size, "got output size %u\n", out_size ); @@ -319,7 +320,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_HID_GET_FEATURE: { HID_XFER_PACKET *packet = irp->UserBuffer; - ULONG expected_size = 17; + ULONG expected_size = caps.FeatureReportByteLength - (report_id ? 0 : 1); ok( !in_size, "got input size %u\n", in_size ); ok( out_size == sizeof(*packet), "got output size %u\n", out_size ); @@ -337,7 +338,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_HID_SET_FEATURE: { HID_XFER_PACKET *packet = irp->UserBuffer; - ULONG expected_size = 17; + ULONG expected_size = caps.FeatureReportByteLength - (report_id ? 0 : 1); ok( in_size == sizeof(*packet), "got input size %u\n", in_size ); ok( !out_size, "got output size %u\n", out_size ); @@ -470,6 +471,12 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); memcpy( &attributes, buffer + info_size, size - info_size ); + RtlInitUnicodeString( &name_str, L"Caps" ); + size = info_size + sizeof(caps); + ret = ZwQueryValueKey( hkey, &name_str, KeyValuePartialInformation, buffer, size, &size ); + ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); + memcpy( &caps, buffer + info_size, size - info_size ); + driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 51b204c736d..4483a5ec479 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -724,41 +724,8 @@ static BOOL sync_ioctl( HANDLE file, DWORD code, void *in_buf, DWORD in_len, voi return ret; } -static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polled ) +static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polled, const HIDP_CAPS *expect_caps ) { - const HIDP_CAPS expect_hidp_caps[] = - { - /* without report id */ - { - .Usage = HID_USAGE_GENERIC_JOYSTICK, - .UsagePage = HID_USAGE_PAGE_GENERIC, - .InputReportByteLength = 26, - .OutputReportByteLength = 3, - .FeatureReportByteLength = 22, - .NumberLinkCollectionNodes = 10, - .NumberInputButtonCaps = 17, - .NumberInputValueCaps = 7, - .NumberInputDataIndices = 47, - .NumberFeatureButtonCaps = 1, - .NumberFeatureValueCaps = 6, - .NumberFeatureDataIndices = 8, - }, - /* with report id */ - { - .Usage = HID_USAGE_GENERIC_JOYSTICK, - .UsagePage = HID_USAGE_PAGE_GENERIC, - .InputReportByteLength = 25, - .OutputReportByteLength = 2, - .FeatureReportByteLength = 21, - .NumberLinkCollectionNodes = 10, - .NumberInputButtonCaps = 17, - .NumberInputValueCaps = 7, - .NumberInputDataIndices = 47, - .NumberFeatureButtonCaps = 1, - .NumberFeatureValueCaps = 6, - .NumberFeatureDataIndices = 8, - }, - }; const HIDP_BUTTON_CAPS expect_button_caps[] = { { @@ -942,7 +909,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetCaps returned %#x\n", status ); status = HidP_GetCaps( preparsed_data, &caps ); ok( status == HIDP_STATUS_SUCCESS, "HidP_GetCaps returned %#x\n", status ); - check_hidp_caps( &caps, &expect_hidp_caps[report_id] ); + check_hidp_caps( &caps, expect_caps ); collection_count = 0; status = HidP_GetLinkCollectionNodes( collections, &collection_count, preparsed_data ); @@ -1883,7 +1850,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle HidD_FreePreparsedData( preparsed_data ); } -static void test_hid_device( DWORD report_id, DWORD polled ) +static void test_hid_device( DWORD report_id, DWORD polled, const HIDP_CAPS *expect_caps ) { char buffer[FIELD_OFFSET( SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath[MAX_PATH] )]; SP_DEVICE_INTERFACE_DATA iface = {sizeof(SP_DEVICE_INTERFACE_DATA)}; @@ -2038,7 +2005,7 @@ static void test_hid_device( DWORD report_id, DWORD polled ) ok( poll_freq == 500, "got poll_freq %u, expected 500\n", poll_freq ); } - test_hidp( file, async_file, report_id, polled ); + test_hidp( file, async_file, report_id, polled, expect_caps ); CloseHandle( async_file ); CloseHandle( file ); @@ -2308,6 +2275,21 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) .ProductID = 0x0001, .VersionNumber = 0x0100, }; + const HIDP_CAPS caps = + { + .Usage = HID_USAGE_GENERIC_JOYSTICK, + .UsagePage = HID_USAGE_PAGE_GENERIC, + .InputReportByteLength = report_id ? 25 : 26, + .OutputReportByteLength = report_id ? 2 : 3, + .FeatureReportByteLength = report_id ? 21 : 22, + .NumberLinkCollectionNodes = 10, + .NumberInputButtonCaps = 17, + .NumberInputValueCaps = 7, + .NumberInputDataIndices = 47, + .NumberFeatureButtonCaps = 1, + .NumberFeatureValueCaps = 6, + .NumberFeatureDataIndices = 8, + }; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; LSTATUS status; @@ -2333,7 +2315,10 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) status = RegSetValueExW( hkey, L"Attributes", 0, REG_BINARY, (void *)&attributes, sizeof(attributes) ); ok( !status, "RegSetValueExW returned %#x\n", status ); - if (pnp_driver_start( L"driver_hid.dll" )) test_hid_device( report_id, polled ); + status = RegSetValueExW( hkey, L"Caps", 0, REG_BINARY, (void *)&caps, sizeof(caps) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + + if (pnp_driver_start( L"driver_hid.dll" )) test_hid_device( report_id, polled, &caps ); pnp_driver_stop(); SetCurrentDirectoryW( cwd );

1 0

Rémi Bernon : dinput8/tests: Stop increasing the sequence in HID_GET_INPUT_REPORT.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 202296c282b69fbf4d479a69f8e6fa954be0aee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=202296c282b69fbf4d479a69… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 10 09:22:44 2021 +0200 dinput8/tests: Stop increasing the sequence in HID_GET_INPUT_REPORT. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 1 - dlls/dinput8/tests/hid.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index eefdc05d1a3..b393ddb41cb 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -295,7 +295,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) memset( packet->reportBuffer, 0xa5, 3 ); if (report_id) ((char *)packet->reportBuffer)[0] = report_id; - ((char *)packet->reportBuffer)[1] = seq++; irp->IoStatus.Information = 3; ret = STATUS_SUCCESS; break; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 4483a5ec479..ebf3a6e7da9 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -1839,6 +1839,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value ); + todo_wine ok( memcmp( report, buffer + caps.InputReportByteLength, caps.InputReportByteLength ), "expected different report\n" ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" );

1 0

Rémi Bernon : hidclass.sys: Call HID_READ_REPORT to read reports in polled mode.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 78254f6ec34502f9b4f922fa3dc371bf835adb43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78254f6ec34502f9b4f922fa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 10 09:22:45 2021 +0200 hidclass.sys: Call HID_READ_REPORT to read reports in polled mode. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 1 - dlls/hidclass.sys/device.c | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index ebf3a6e7da9..4483a5ec479 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -1839,7 +1839,6 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value ); - todo_wine ok( memcmp( report, buffer + caps.InputReportByteLength, caps.InputReportByteLength ), "expected different report\n" ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index ed7cd76fcde..9b91834267e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -278,12 +278,8 @@ static DWORD CALLBACK hid_device_thread(void *args) packet->reportBufferLen--; } - if (!poll_interval) - call_minidriver( IOCTL_HID_READ_REPORT, ext->u.pdo.parent_fdo, NULL, 0, - packet->reportBuffer, packet->reportBufferLen, &io ); - else - call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, - packet, sizeof(*packet), &io ); + call_minidriver( IOCTL_HID_READ_REPORT, ext->u.pdo.parent_fdo, NULL, 0, + packet->reportBuffer, packet->reportBufferLen, &io ); if (io.Status == STATUS_SUCCESS) {

1 0

Nikolay Sivov : d3d10/tests: Test SystemValueType field.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: e5e6000654d42a513c4fff95f1d30e16dd07d450 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5e6000654d42a513c4fff95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 08:57:35 2021 +0300 d3d10/tests: Test SystemValueType field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 60db5ad55be..7923f70ed1e 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3698,18 +3698,25 @@ if (0) hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); +todo_wine + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 4, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 4, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); v = effect->lpVtbl->GetVariableByName(effect, "v"); vs = v->lpVtbl->AsShader(v); @@ -3717,18 +3724,24 @@ if (0) hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); /* NULL shader variable */ v = effect->lpVtbl->GetVariableByName(effect, "v0"); @@ -3746,6 +3759,8 @@ if (0) hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 3, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", + sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); @@ -3759,6 +3774,7 @@ if (0) hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 3, 0, &sign); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); effect->lpVtbl->Release(effect);

1 0

Nikolay Sivov : d3d10/effect: Set corresponding variable flag when explicit bind point is specified for a constant buffer.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 86194bff11941b6efa1cf8c6b04cc1d7d13a190c URL: https://source.winehq.org/git/wine.git/?a=commit;h=86194bff11941b6efa1cf8c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 08:57:36 2021 +0300 d3d10/effect: Set corresponding variable flag when explicit bind point is specified for a constant buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 3 +++ dlls/d3d10/tests/effect.c | 39 ++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6d12920c762..f8e7674ae1a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2502,6 +2502,9 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, return hr; } + if (l->explicit_bind_point != ~0u) + l->flag |= D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT; + return S_OK; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 7923f70ed1e..628c1856c78 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -56,30 +56,23 @@ static inline HRESULT create_effect(DWORD *data, UINT flags, ID3D10Device *devic * test_effect_constant_buffer_type */ #if 0 -cbuffer cb +cbuffer cb : register(b1) { float f1 : SV_POSITION; float f2 : COLOR0; }; #endif -static DWORD fx_test_ecbt[] = { -0x43425844, 0xc92a4732, 0xbd0d68c0, 0x877f71ee, -0x871fc277, 0x00000001, 0x0000010a, 0x00000001, -0x00000024, 0x30315846, 0x000000de, 0xfeff1001, -0x00000001, 0x00000002, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000042, -0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x66006263, -0x74616f6c, 0x00000700, 0x00000100, 0x00000000, -0x00000400, 0x00001000, 0x00000400, 0x00090900, -0x00316600, 0x505f5653, 0x5449534f, 0x004e4f49, -0x43003266, 0x524f4c4f, 0x00040030, 0x00100000, -0x00000000, 0x00020000, 0xffff0000, 0x0000ffff, -0x00290000, 0x000d0000, 0x002c0000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00380000, -0x000d0000, 0x003b0000, 0x00040000, 0x00000000, -0x00000000, 0x00000000, 0x52590000, +static DWORD fx_test_ecbt[] = +{ + 0x43425844, 0xa2e18995, 0x540597cc, 0x670b9d73, 0x777fe190, 0x00000001, 0x0000010a, 0x00000001, + 0x00000024, 0x30315846, 0x000000de, 0xfeff1001, 0x00000001, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000042, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x66006263, + 0x74616f6c, 0x00000700, 0x00000100, 0x00000000, 0x00000400, 0x00001000, 0x00000400, 0x00090900, + 0x00316600, 0x505f5653, 0x5449534f, 0x004e4f49, 0x43003266, 0x524f4c4f, 0x00040030, 0x00100000, + 0x00000000, 0x00020000, 0x00010000, 0x00000000, 0x00290000, 0x000d0000, 0x002c0000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00380000, 0x000d0000, 0x003b0000, 0x00040000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, }; static void test_effect_constant_buffer_type(void) @@ -87,6 +80,7 @@ static void test_effect_constant_buffer_type(void) ID3D10Effect *effect; ID3D10EffectConstantBuffer *constantbuffer; ID3D10EffectType *type, *type2, *null_type; + D3D10_EFFECT_VARIABLE_DESC var_desc; D3D10_EFFECT_TYPE_DESC type_desc; D3D10_EFFECT_DESC desc; ID3D10Device *device; @@ -119,6 +113,13 @@ static void test_effect_constant_buffer_type(void) ok(desc.Techniques == 0, "Unexpected techniques count %u.\n", desc.Techniques); constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); + + hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); +todo_wine + ok(var_desc.ExplicitBindPoint == 1, "Unexpected bind point %#x.\n", var_desc.ExplicitBindPoint); + type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &type_desc);

1 0

Nikolay Sivov : d3d10/effect: Use same field to return ExplicitBindPoint for all variable types.
by Alexandre Julliard 10 Sep '21

10 Sep '21

Module: wine Branch: master Commit: 78f4ce0b11a9917d9bc5d732bc6bc38659ac612b URL: https://source.winehq.org/git/wine.git/?a=commit;h=78f4ce0b11a9917d9bc5d732… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 08:57:37 2021 +0300 d3d10/effect: Use same field to return ExplicitBindPoint for all variable types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 23 ++++++++++++----------- dlls/d3d10/tests/effect.c | 36 ++++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index f8e7674ae1a..4807136f670 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2045,6 +2045,9 @@ static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, return hr; } + if (v->flag & D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT) + v->explicit_bind_point = v->buffer_offset; + return S_OK; } @@ -3967,7 +3970,7 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_variable_GetType static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetDesc(ID3D10EffectVariable *iface, D3D10_EFFECT_VARIABLE_DESC *desc) { - struct d3d10_effect_variable *This = impl_from_ID3D10EffectVariable(iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable(iface); TRACE("iface %p, desc %p\n", iface, desc); @@ -3985,16 +3988,14 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetDesc(ID3D10EffectVaria /* FIXME: This isn't correct. Anonymous shaders let desc->ExplicitBindPoint untouched, but normal shaders set it! */ memset(desc, 0, sizeof(*desc)); - desc->Name = This->name; - desc->Semantic = This->semantic; - desc->Flags = This->flag; - desc->Annotations = This->annotation_count; - desc->BufferOffset = This->buffer_offset; - - if (This->flag & D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT) - { - desc->ExplicitBindPoint = This->buffer_offset; - } + desc->Name = v->name; + desc->Semantic = v->semantic; + desc->Flags = v->flag; + desc->Annotations = v->annotation_count; + desc->BufferOffset = v->buffer_offset; + + if (v->flag & D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT) + desc->ExplicitBindPoint = v->explicit_bind_point; return S_OK; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 628c1856c78..ba46b18b678 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -61,18 +61,25 @@ cbuffer cb : register(b1) float f1 : SV_POSITION; float f2 : COLOR0; }; + +cbuffer cb2 : register(b0) +{ + float f3 : packoffset(c2); +}; #endif static DWORD fx_test_ecbt[] = { - 0x43425844, 0xa2e18995, 0x540597cc, 0x670b9d73, 0x777fe190, 0x00000001, 0x0000010a, 0x00000001, - 0x00000024, 0x30315846, 0x000000de, 0xfeff1001, 0x00000001, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000042, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x43425844, 0x7cfb8cde, 0x31ec2d95, 0x38500042, 0xa9330c67, 0x00000001, 0x00000145, 0x00000001, + 0x00000024, 0x30315846, 0x00000119, 0xfeff1001, 0x00000002, 0x00000003, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000049, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x66006263, 0x74616f6c, 0x00000700, 0x00000100, 0x00000000, 0x00000400, 0x00001000, 0x00000400, 0x00090900, - 0x00316600, 0x505f5653, 0x5449534f, 0x004e4f49, 0x43003266, 0x524f4c4f, 0x00040030, 0x00100000, - 0x00000000, 0x00020000, 0x00010000, 0x00000000, 0x00290000, 0x000d0000, 0x002c0000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00380000, 0x000d0000, 0x003b0000, 0x00040000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, + 0x00316600, 0x505f5653, 0x5449534f, 0x004e4f49, 0x43003266, 0x524f4c4f, 0x62630030, 0x33660032, + 0x00000400, 0x00001000, 0x00000000, 0x00000200, 0x00000100, 0x00000000, 0x00002900, 0x00000d00, + 0x00002c00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003800, 0x00000d00, 0x00003b00, + 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00004200, 0x00003000, 0x00000000, 0x00000100, + 0x00000000, 0x00000000, 0x00004600, 0x00000d00, 0x00000000, 0x00002000, 0x00000000, 0x00000400, + 0x00000000, 0x00000000, }; static void test_effect_constant_buffer_type(void) @@ -82,6 +89,7 @@ static void test_effect_constant_buffer_type(void) ID3D10EffectType *type, *type2, *null_type; D3D10_EFFECT_VARIABLE_DESC var_desc; D3D10_EFFECT_TYPE_DESC type_desc; + ID3D10EffectVariable *v; D3D10_EFFECT_DESC desc; ID3D10Device *device; ULONG refcount; @@ -104,10 +112,10 @@ static void test_effect_constant_buffer_type(void) hr = effect->lpVtbl->GetDesc(effect, &desc); ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); ok(!desc.IsChildEffect, "Unexpected IsChildEffect.\n"); - ok(desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", desc.ConstantBuffers); + ok(desc.ConstantBuffers == 2, "Unexpected constant buffers count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", desc.SharedConstantBuffers); - ok(desc.GlobalVariables == 2, "Unexpected global variables count %u.\n", desc.GlobalVariables); + ok(desc.GlobalVariables == 3, "Unexpected global variables count %u.\n", desc.GlobalVariables); ok(desc.SharedGlobalVariables == 0, "Unexpected shared global variables count %u.\n", desc.SharedGlobalVariables); ok(desc.Techniques == 0, "Unexpected techniques count %u.\n", desc.Techniques); @@ -117,7 +125,6 @@ static void test_effect_constant_buffer_type(void) hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &var_desc); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); -todo_wine ok(var_desc.ExplicitBindPoint == 1, "Unexpected bind point %#x.\n", var_desc.ExplicitBindPoint); type = constantbuffer->lpVtbl->GetType(constantbuffer); @@ -216,6 +223,15 @@ todo_wine string = type->lpVtbl->GetMemberSemantic(type, 3); ok(string == NULL, "GetMemberSemantic is \"%s\", expected \"NULL\"\n", string); + constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 1); + v = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); + hr = v->lpVtbl->GetDesc(v, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(var_desc.Name, "f3"), "Unexpected name %s.\n", var_desc.Name); + ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); + ok(var_desc.BufferOffset == 0x20, "Unexpected buffer offset %#x.\n", var_desc.BufferOffset); + ok(var_desc.ExplicitBindPoint == 0x20, "Unexpected bind point %#x.\n", var_desc.ExplicitBindPoint); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device);

1 0