March 2022 - Wine-commits - list.winehq.org

Jinoh Kang : riched20: Add back-reference to outer ME_Run from struct re_object.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 05796c4e2a4acb91e6035c536b4d0e1f7e16896d URL: https://source.winehq.org/git/wine.git/?a=commit;h=05796c4e2a4acb91e6035c53… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 21 04:37:55 2022 +0900 riched20: Add back-reference to outer ME_Run from struct re_object. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 5 +++-- dlls/riched20/editstr.h | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 6d32776e3d2..c8658098e18 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -442,7 +442,7 @@ BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) nChars, FALSE); } -static struct re_object* create_re_object(const REOBJECT *reo) +static struct re_object* create_re_object(const REOBJECT *reo, ME_Run *run) { struct re_object *reobj = heap_alloc(sizeof(*reobj)); @@ -452,6 +452,7 @@ static struct re_object* create_re_object(const REOBJECT *reo) return NULL; } ME_CopyReObject(&reobj->obj, reo, REO_GETOBJ_ALL_INTERFACES); + reobj->run = run; return reobj; } @@ -477,7 +478,7 @@ void editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) run = run_insert( editor, cursor, style, &space, 1, MERF_GRAPHICS ); - run->reobj = create_re_object( reo ); + run->reobj = create_re_object( reo, run ); prev = run; while ((prev = run_prev_all_paras( prev ))) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 889795de189..3b166234f23 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -147,11 +147,13 @@ typedef enum { /******************************** structures *************************/ struct tagME_DisplayItem; +struct tagME_Run; struct re_object { struct list entry; REOBJECT obj; + struct tagME_Run *run; /* ptr to the reobj's run */ }; typedef struct tagME_Run

1 0

Jinoh Kang : riched20: Set REOBJECT's cp correctly in IRichEditOle::GetObject.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 194ba06c403fd72fbfb95048385c9ca4838af169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=194ba06c403fd72fbfb95048… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 21 04:38:42 2022 +0900 riched20: Set REOBJECT's cp correctly in IRichEditOle::GetObject. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52705 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 1 + dlls/riched20/tests/richole.c | 41 +++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 74a25a96830..a23f4c82730 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1320,6 +1320,7 @@ IRichEditOle_fnGetObject(IRichEditOle *iface, LONG iob, } } ME_CopyReObject(lpreobject, &reobj->obj, dwFlags); + lpreobject->cp = run_char_ofs( reobj->run, 0 ); return S_OK; } diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 08c1ce8ced4..24284a24484 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3214,9 +3214,9 @@ static void fill_reobject_struct(REOBJECT *reobj, LONG cp, LPOLEOBJECT poleobj, reobj->dwUser = user; } -#define CHECK_REOBJECT_STRUCT(reole,index,flags,cp,poleobj,pstg,polesite,user) \ - _check_reobject_struct(reole, index, flags, cp, poleobj, pstg, polesite, user, __LINE__) -static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, LONG cp, +#define CHECK_REOBJECT_STRUCT(reole,index,flags,cp,cp_check,poleobj,pstg,polesite,user) \ + _check_reobject_struct(reole, index, flags, cp, cp_check, poleobj, pstg, polesite, user, __LINE__) +static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, LONG cp, LONG cp_check, LPOLEOBJECT poleobj, LPSTORAGE pstg, LPOLECLIENTSITE polesite, DWORD user, int line) { REOBJECT reobj; @@ -3226,6 +3226,7 @@ static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, reobj.cp = cp; hr = IRichEditOle_GetObject(reole, index, &reobj, flags); ok(hr == S_OK, "IRichEditOle_GetObject failed: %#lx.\n", hr); + ok_(__FILE__,line)(reobj.cp == cp_check, "expected cp = %ld, got %ld.\n", cp_check, reobj.cp); ok_(__FILE__,line)(reobj.poleobj == poleobj, "got wrong object interface.\n"); ok_(__FILE__,line)(reobj.pstg == pstg, "got wrong storage interface.\n"); ok_(__FILE__,line)(reobj.polesite == polesite, "got wrong site interface.\n"); @@ -3294,9 +3295,9 @@ static void test_InsertObject(void) ok(count == 3, "got wrong object count: %ld\n", count); /* tests below show that order of rebject (from 0 to 2) is: reo1,reo3,reo2 */ - CHECK_REOBJECT_STRUCT(reole, 0, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); - CHECK_REOBJECT_STRUCT(reole, 1, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo3.polesite, 3); - CHECK_REOBJECT_STRUCT(reole, 2, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo2.polesite, 2); + CHECK_REOBJECT_STRUCT(reole, 0, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, 1, REO_GETOBJ_ALL_INTERFACES, 0, 1, NULL, NULL, reo3.polesite, 3); + CHECK_REOBJECT_STRUCT(reole, 2, REO_GETOBJ_ALL_INTERFACES, 0, 2, NULL, NULL, reo2.polesite, 2); hr = IRichEditOle_GetObject(reole, 2, NULL, REO_GETOBJ_ALL_INTERFACES); ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08lx\n", hr); @@ -3305,8 +3306,8 @@ static void test_InsertObject(void) hr = IRichEditOle_GetObject(reole, 2, &received_reo, REO_GETOBJ_ALL_INTERFACES); ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08lx\n", hr); - CHECK_REOBJECT_STRUCT(reole, 2, REO_GETOBJ_PSTG, 0, NULL, NULL, NULL, 2); - CHECK_REOBJECT_STRUCT(reole, 2, REO_GETOBJ_POLESITE, 0, NULL, NULL, reo2.polesite, 2); + CHECK_REOBJECT_STRUCT(reole, 2, REO_GETOBJ_PSTG, 0, 2, NULL, NULL, NULL, 2); + CHECK_REOBJECT_STRUCT(reole, 2, REO_GETOBJ_POLESITE, 0, 2, NULL, NULL, reo2.polesite, 2); hr = IRichEditOle_GetObject(reole, 3, &received_reo, REO_GETOBJ_POLESITE); ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08lx\n", hr); @@ -3327,9 +3328,9 @@ static void test_InsertObject(void) ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08lx\n", hr); ok(received_reo.polesite == NULL, "Got wrong site interface.\n"); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo3.polesite, 3); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 2, NULL, NULL, reo2.polesite, 2); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 1, 1, NULL, NULL, reo3.polesite, 3); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 2, 2, NULL, NULL, reo2.polesite, 2); received_reo.cbStruct = sizeof(received_reo); received_reo.polesite = (IOleClientSite *)0xdeadbeef; @@ -3341,25 +3342,25 @@ static void test_InsertObject(void) ok(received_reo.dwUser == 4, "Got wrong user-defined value: %ld.\n", received_reo.dwUser); SendMessageA(hwnd, EM_SETSEL, 0, 1); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); SendMessageA(hwnd, EM_SETSEL, 1, 2); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo3.polesite, 3); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 1, NULL, NULL, reo3.polesite, 3); SendMessageA(hwnd, EM_SETSEL, 2, 3); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo2.polesite, 2); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 2, NULL, NULL, reo2.polesite, 2); SendMessageA(hwnd, EM_SETSEL, 0, 2); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); SendMessageA(hwnd, EM_SETSEL, 1, 3); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo3.polesite, 3); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 1, NULL, NULL, reo3.polesite, 3); SendMessageA(hwnd, EM_SETSEL, 2, 0); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); SendMessageA(hwnd, EM_SETSEL, 0, 6); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); SendMessageA(hwnd, EM_SETSEL, 4, 5); received_reo.cbStruct = sizeof(received_reo); @@ -3380,14 +3381,14 @@ static void test_InsertObject(void) SendMessageW(hwnd, EM_SETSEL, 3, 4); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); ok(result == SEL_OBJECT, "Got selection type: %lx.\n", result); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo1.polesite, 1); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, 3, NULL, NULL, reo1.polesite, 1); SendMessageW(hwnd, EM_SETSEL, 2, 4); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); ok(result == (SEL_TEXT | SEL_OBJECT), "Got selection type: %lx.\n", result); SendMessageW(hwnd, EM_SETSEL, 5, 6); - CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo2.polesite, 2); + CHECK_REOBJECT_STRUCT(reole, REO_IOB_SELECTION, REO_GETOBJ_ALL_INTERFACES, 1, 5, NULL, NULL, reo2.polesite, 2); expected_string = L"abc\xfffc""d\xfffc""efg"; gettextex.cb = sizeof(buffer);

1 0

Rémi Bernon : dinput/tests: Add more debug traces to the HID driver.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: 4c336655c9f6c8690807192b1a5ea83a6e36bdef URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c336655c9f6c8690807192b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 21 09:54:11 2022 +0100 dinput/tests: Add more debug traces to the HID driver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/driver_hid.c | 27 +++++++++++---- dlls/dinput/tests/driver_hid.h | 75 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/tests/driver_hid.c b/dlls/dinput/tests/driver_hid.c index 99aa9bd688c..e4101853833 100644 --- a/dlls/dinput/tests/driver_hid.c +++ b/dlls/dinput/tests/driver_hid.c @@ -411,11 +411,12 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); HID_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_device *impl = ext->MiniDeviceExtension; + ULONG code = stack->MinorFunction; KIRQL irql; - if (winetest_debug > 1) trace( "pnp %#x\n", stack->MinorFunction ); + if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_pnp(code) ); - switch (stack->MinorFunction) + switch (code) { case IRP_MN_START_DEVICE: ++got_start_device; @@ -502,7 +503,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) KIRQL irql; LONG index; - if (winetest_debug > 1) trace( "ioctl %#lx\n", code ); + if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_ioctl(code) ); ok( got_start_device, "expected IRP_MN_START_DEVICE before any ioctls\n" ); @@ -725,6 +726,8 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; KIRQL irql; + if (winetest_debug > 1) trace( "%s: device %p, code %#lx %s\n", __func__, device, code, debugstr_ioctl(code) ); + switch (code) { case IOCTL_WINETEST_HID_SET_EXPECT: @@ -752,27 +755,32 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) return hidclass_driver_ioctl( device, irp ); } -static NTSTATUS WINAPI driver_add_device( DRIVER_OBJECT *driver, DEVICE_OBJECT *fdo ) +static NTSTATUS WINAPI driver_add_device( DRIVER_OBJECT *driver, DEVICE_OBJECT *device ) { - HID_DEVICE_EXTENSION *ext = fdo->DeviceExtension; + HID_DEVICE_EXTENSION *ext = device->DeviceExtension; NTSTATUS ret; + if (winetest_debug > 1) trace( "%s: driver %p, device %p\n", __func__, driver, device ); + /* We should be given the FDO, not the PDO. */ ok( !!ext->PhysicalDeviceObject, "expected non-NULL pdo\n" ); ok( ext->NextDeviceObject == ext->PhysicalDeviceObject, "got pdo %p, next %p\n", ext->PhysicalDeviceObject, ext->NextDeviceObject ); todo_wine - ok( ext->NextDeviceObject->AttachedDevice == fdo, "wrong attached device\n" ); + ok( ext->NextDeviceObject->AttachedDevice == device, "wrong attached device\n" ); ret = IoRegisterDeviceInterface( ext->PhysicalDeviceObject, &control_class, NULL, &control_symlink ); ok( !ret, "got %#lx\n", ret ); - fdo->Flags &= ~DO_DEVICE_INITIALIZING; + if (winetest_debug > 1) trace( "Created HID FDO %p for Bus PDO %p\n", device, ext->PhysicalDeviceObject ); + + device->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; } static NTSTATUS WINAPI driver_create( DEVICE_OBJECT *device, IRP *irp ) { + if (winetest_debug > 1) trace( "%s: device %p\n", __func__, device ); ok( 0, "unexpected call\n" ); irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( irp, IO_NO_INCREMENT ); @@ -781,6 +789,7 @@ static NTSTATUS WINAPI driver_create( DEVICE_OBJECT *device, IRP *irp ) static NTSTATUS WINAPI driver_close( DEVICE_OBJECT *device, IRP *irp ) { + if (winetest_debug > 1) trace( "%s: device %p\n", __func__, device ); ok( 0, "unexpected call\n" ); irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( irp, IO_NO_INCREMENT ); @@ -789,6 +798,7 @@ static NTSTATUS WINAPI driver_close( DEVICE_OBJECT *device, IRP *irp ) static void WINAPI driver_unload( DRIVER_OBJECT *driver ) { + if (winetest_debug > 1) trace( "%s: driver %p\n", __func__, driver ); input_queue_cleanup( &input_queue ); expect_queue_cleanup( &expect_queue ); winetest_cleanup(); @@ -812,6 +822,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) DWORD size; if ((ret = winetest_init())) return ret; + if (winetest_debug > 1) trace( "%s: driver %p\n", __func__, driver ); InitializeObjectAttributes( &attr, registry, 0, NULL, NULL ); ret = ZwOpenKey( &hkey, KEY_ALL_ACCESS, &attr ); @@ -833,6 +844,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) ok( !ret, "ZwQueryValueKey returned %#lx\n", ret ); memcpy( &polled, buffer + info_size, size - info_size ); params.DevicesArePolled = polled; + /* polled mode calls this in a state where printing anything locks the system up */ + if (polled) winetest_debug = 0; RtlInitUnicodeString( &name_str, L"Descriptor" ); size = info_size + sizeof(report_descriptor_buf); diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 089d12b70fc..80073a6ae3f 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -31,9 +31,11 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winioctl.h" #include "winternl.h" #include "ddk/wdm.h" +#include "ddk/hidclass.h" DEFINE_GUID(control_class,0xdeadbeef,0x29ef,0x4538,0xa5,0xfd,0xb6,0x95,0x73,0xa3,0x62,0xc0); @@ -65,6 +67,79 @@ struct winetest_shared_data LONG todo_failures; }; +static inline const char *debugstr_pnp( ULONG code ) +{ + switch (code) + { + case IRP_MN_START_DEVICE: return "IRP_MN_START_DEVICE"; + case IRP_MN_QUERY_REMOVE_DEVICE: return "IRP_MN_QUERY_REMOVE_DEVICE"; + case IRP_MN_REMOVE_DEVICE: return "IRP_MN_REMOVE_DEVICE"; + case IRP_MN_CANCEL_REMOVE_DEVICE: return "IRP_MN_CANCEL_REMOVE_DEVICE"; + case IRP_MN_STOP_DEVICE: return "IRP_MN_STOP_DEVICE"; + case IRP_MN_QUERY_STOP_DEVICE: return "IRP_MN_QUERY_STOP_DEVICE"; + case IRP_MN_CANCEL_STOP_DEVICE: return "IRP_MN_CANCEL_STOP_DEVICE"; + case IRP_MN_QUERY_DEVICE_RELATIONS: return "IRP_MN_QUERY_DEVICE_RELATIONS"; + case IRP_MN_QUERY_INTERFACE: return "IRP_MN_QUERY_INTERFACE"; + case IRP_MN_QUERY_CAPABILITIES: return "IRP_MN_QUERY_CAPABILITIES"; + case IRP_MN_QUERY_RESOURCES: return "IRP_MN_QUERY_RESOURCES"; + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: return "IRP_MN_QUERY_RESOURCE_REQUIREMENTS"; + case IRP_MN_QUERY_DEVICE_TEXT: return "IRP_MN_QUERY_DEVICE_TEXT"; + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: return "IRP_MN_FILTER_RESOURCE_REQUIREMENTS"; + case IRP_MN_READ_CONFIG: return "IRP_MN_READ_CONFIG"; + case IRP_MN_WRITE_CONFIG: return "IRP_MN_WRITE_CONFIG"; + case IRP_MN_EJECT: return "IRP_MN_EJECT"; + case IRP_MN_SET_LOCK: return "IRP_MN_SET_LOCK"; + case IRP_MN_QUERY_ID: return "IRP_MN_QUERY_ID"; + case IRP_MN_QUERY_PNP_DEVICE_STATE: return "IRP_MN_QUERY_PNP_DEVICE_STATE"; + case IRP_MN_QUERY_BUS_INFORMATION: return "IRP_MN_QUERY_BUS_INFORMATION"; + case IRP_MN_DEVICE_USAGE_NOTIFICATION: return "IRP_MN_DEVICE_USAGE_NOTIFICATION"; + case IRP_MN_SURPRISE_REMOVAL: return "IRP_MN_SURPRISE_REMOVAL"; + case IRP_MN_QUERY_LEGACY_BUS_INFORMATION: return "IRP_MN_QUERY_LEGACY_BUS_INFORMATION"; + default: return "unknown"; + } +} + +static inline const char *debugstr_ioctl( ULONG code ) +{ + switch (code) + { + case HID_CTL_CODE(0): return "IOCTL_HID_GET_DEVICE_DESCRIPTOR"; + case HID_CTL_CODE(1): return "IOCTL_HID_GET_REPORT_DESCRIPTOR"; + case HID_CTL_CODE(2): return "IOCTL_HID_READ_REPORT"; + case HID_CTL_CODE(3): return "IOCTL_HID_WRITE_REPORT"; + case HID_CTL_CODE(4): return "IOCTL_HID_GET_STRING"; + case HID_CTL_CODE(7): return "IOCTL_HID_ACTIVATE_DEVICE"; + case HID_CTL_CODE(8): return "IOCTL_HID_DEACTIVATE_DEVICE"; + case HID_CTL_CODE(9): return "IOCTL_HID_GET_DEVICE_ATTRIBUTES"; + case HID_CTL_CODE(10): return "IOCTL_HID_SEND_IDLE_NOTIFICATION_REQUEST"; + case HID_OUT_CTL_CODE(102): return "IOCTL_GET_PHYSICAL_DESCRIPTOR"; + case HID_CTL_CODE(101): return "IOCTL_HID_FLUSH_QUEUE"; + case HID_CTL_CODE(100): return "IOCTL_HID_GET_COLLECTION_DESCRIPTOR"; + case HID_BUFFER_CTL_CODE(106): return "IOCTL_HID_GET_COLLECTION_INFORMATION"; + case HID_OUT_CTL_CODE(100): return "IOCTL_HID_GET_FEATURE"; + case HID_OUT_CTL_CODE(103): return "IOCTL_HID_GET_HARDWARE_ID"; + case HID_OUT_CTL_CODE(120): return "IOCTL_HID_GET_INDEXED_STRING"; + case HID_OUT_CTL_CODE(104): return "IOCTL_HID_GET_INPUT_REPORT"; + case HID_OUT_CTL_CODE(110): return "IOCTL_HID_GET_MANUFACTURER_STRING"; + case HID_BUFFER_CTL_CODE(104): return "IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS"; + case HID_BUFFER_CTL_CODE(102): return "IOCTL_HID_GET_POLL_FREQUENCY_MSEC"; + case HID_OUT_CTL_CODE(111): return "IOCTL_HID_GET_PRODUCT_STRING"; + case HID_OUT_CTL_CODE(112): return "IOCTL_HID_GET_SERIALNUMBER_STRING"; + case HID_IN_CTL_CODE(100): return "IOCTL_HID_SET_FEATURE"; + case HID_BUFFER_CTL_CODE(105): return "IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS"; + case HID_IN_CTL_CODE(101): return "IOCTL_HID_SET_OUTPUT_REPORT"; + case HID_BUFFER_CTL_CODE(103): return "IOCTL_HID_SET_POLL_FREQUENCY_MSEC"; + case HID_BUFFER_CTL_CODE(100): return "IOCTL_HID_GET_DRIVER_CONFIG"; + case HID_BUFFER_CTL_CODE(101): return "IOCTL_HID_SET_DRIVER_CONFIG"; + case HID_OUT_CTL_CODE(121): return "IOCTL_HID_GET_MS_GENRE_DESCRIPTOR"; + case IOCTL_WINETEST_HID_SET_EXPECT: return "IOCTL_WINETEST_HID_SET_EXPECT"; + case IOCTL_WINETEST_HID_WAIT_EXPECT: return "IOCTL_WINETEST_HID_WAIT_EXPECT"; + case IOCTL_WINETEST_HID_SEND_INPUT: return "IOCTL_WINETEST_HID_SEND_INPUT"; + case IOCTL_WINETEST_HID_SET_CONTEXT: return "IOCTL_WINETEST_HID_SET_CONTEXT"; + default: return "unknown"; + } +} + #ifndef __WINE_WINE_TEST_H #if !defined( __WINE_USE_MSVCRT ) || defined( __MINGW32__ )

1 0

Rémi Bernon : dinput/tests: Rename HID driver identifiers and files.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: wine Branch: master Commit: f6d2495c508108177770a1d34813bd4d504505de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6d2495c508108177770a1d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 21 09:54:12 2022 +0100 dinput/tests: Rename HID driver identifiers and files. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 8 ++--- dlls/dinput/tests/dinput_test.h | 4 +-- dlls/dinput/tests/{driver_hid.c => driver.c} | 0 dlls/dinput/tests/{driver_hid.spec => driver.spec} | 0 dlls/dinput/tests/force_feedback.c | 4 +-- dlls/dinput/tests/hid.c | 38 ++++++++++++++-------- dlls/dinput/tests/hotplug.c | 4 +-- dlls/dinput/tests/joystick8.c | 10 +++--- 8 files changed, 40 insertions(+), 28 deletions(-) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 5ba0e5be4d7..c1b887f8dcb 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -1,15 +1,15 @@ TESTDLL = dinput.dll IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm -driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass -driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver_IMPORTS = winecrt0 ntoskrnl hal hidclass +driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ device.c \ device8.c \ dinput.c \ - driver_hid.c \ - driver_hid.spec \ + driver.c \ + driver.spec \ force_feedback.c \ hid.c \ hotplug.c \ diff --git a/dlls/dinput/tests/dinput_test.h b/dlls/dinput/tests/dinput_test.h index 97eed949a36..c0027c07094 100644 --- a/dlls/dinput/tests/dinput_test.h +++ b/dlls/dinput/tests/dinput_test.h @@ -52,8 +52,8 @@ extern const WCHAR expect_path_end[]; extern HINSTANCE instance; extern BOOL localized; /* object names get translated */ -BOOL pnp_driver_start( const WCHAR *resource ); -void pnp_driver_stop(void); +BOOL hid_device_start(void); +void hid_device_stop(void); void cleanup_registry_keys(void); diff --git a/dlls/dinput/tests/driver_hid.c b/dlls/dinput/tests/driver.c similarity index 100% rename from dlls/dinput/tests/driver_hid.c rename to dlls/dinput/tests/driver.c diff --git a/dlls/dinput/tests/driver_hid.spec b/dlls/dinput/tests/driver.spec similarity index 100% rename from dlls/dinput/tests/driver_hid.spec rename to dlls/dinput/tests/driver.spec diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index ce460147f9d..ca3f6293304 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -2999,7 +2999,7 @@ static BOOL test_force_feedback_joystick( DWORD version ) CloseHandle( file ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); winetest_pop_context(); @@ -4317,7 +4317,7 @@ static void test_device_managed_effect(void) CloseHandle( file ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); winetest_pop_context(); diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 83635146324..b5683b18850 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -415,8 +415,9 @@ static void unload_driver( SC_HANDLE service ) CloseServiceHandle( service ); } -void pnp_driver_stop(void) +static void pnp_driver_stop(void) { + const WCHAR *service_name = L"winetest"; SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; WCHAR path[MAX_PATH], dest[MAX_PATH], *filepart; SC_HANDLE manager, service; @@ -453,7 +454,7 @@ void pnp_driver_stop(void) manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ); ok( !!manager, "failed to open service manager, error %lu\n", GetLastError() ); - service = OpenServiceW( manager, L"winetest", SERVICE_STOP | DELETE ); + service = OpenServiceW( manager, service_name, SERVICE_STOP | DELETE ); if (service) unload_driver( service ); else ok( GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "got error %lu\n", GetLastError() ); @@ -488,11 +489,12 @@ void pnp_driver_stop(void) ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %lu\n", GetLastError() ); } -BOOL pnp_driver_start( const WCHAR *resource ) +static BOOL pnp_driver_start(void) { static const WCHAR hardware_id[] = L"test_hardware_id\0"; SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; WCHAR path[MAX_PATH], filename[MAX_PATH]; + const WCHAR *service_name = L"winetest"; SC_HANDLE manager, service; const CERT_CONTEXT *cert; int old_mute_threshold; @@ -504,7 +506,7 @@ BOOL pnp_driver_start( const WCHAR *resource ) old_mute_threshold = winetest_mute_threshold; winetest_mute_threshold = 1; - load_resource( resource, filename ); + load_resource( L"driver.dll", filename ); ret = MoveFileExW( filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING ); ok( ret, "failed to move file, error %lu\n", GetLastError() ); @@ -570,7 +572,7 @@ BOOL pnp_driver_start( const WCHAR *resource ) manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ); ok( !!manager, "failed to open service manager, error %lu\n", GetLastError() ); - service = OpenServiceW( manager, L"winetest", SERVICE_START ); + service = OpenServiceW( manager, service_name, SERVICE_START ); ok( !!service, "failed to open service, error %lu\n", GetLastError() ); ret = StartServiceW( service, 0, NULL ); @@ -590,6 +592,16 @@ BOOL pnp_driver_start( const WCHAR *resource ) return ret || GetLastError() == ERROR_SERVICE_ALREADY_RUNNING; } +void hid_device_stop(void) +{ + pnp_driver_stop(); +} + +BOOL hid_device_start(void) +{ + return pnp_driver_start(); +} + #define check_hidp_caps( a, b ) check_hidp_caps_( __LINE__, a, b ) static inline void check_hidp_caps_( int line, HIDP_CAPS *caps, const HIDP_CAPS *exp ) { @@ -2809,9 +2821,9 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); ok( !status, "RegSetValueExW returned %#lx\n", status ); - if (pnp_driver_start( L"driver_hid.dll" )) test_hid_device( report_id, polled, &caps ); + if (hid_device_start()) test_hid_device( report_id, polled, &caps ); + hid_device_stop(); - pnp_driver_stop(); SetCurrentDirectoryW( cwd ); } @@ -3169,7 +3181,7 @@ static void test_hidp_kdr(void) status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); ok( !status, "RegSetValueExW returned %#lx\n", status ); - if (!pnp_driver_start( L"driver_hid.dll" )) goto done; + if (!hid_device_start()) goto done; set = SetupDiGetClassDevsW( &GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); ok( set != INVALID_HANDLE_VALUE, "failed to get device list, error %#lx\n", GetLastError() ); @@ -3286,7 +3298,7 @@ static void test_hidp_kdr(void) CloseHandle( file ); done: - pnp_driver_stop(); + hid_device_stop(); SetCurrentDirectoryW( cwd ); } @@ -3360,7 +3372,7 @@ BOOL dinput_driver_start_( const char *file, int line, const BYTE *desc_buf, ULO status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); ok_(file, line)( !status, "RegSetValueExW returned %#lx\n", status ); - return pnp_driver_start( L"driver_hid.dll" ); + return hid_device_start(); } BOOL dinput_test_init_( const char *file, int line ) @@ -3395,7 +3407,7 @@ BOOL dinput_test_init_( const char *file, int line ) FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL ); ok( okfile != INVALID_HANDLE_VALUE, "failed to create file, error %lu\n", GetLastError() ); - subtest( "driver_hid" ); + subtest( "driver" ); return TRUE; } @@ -3555,9 +3567,9 @@ DWORD WINAPI dinput_test_device_thread( void *stop_event ) status = RegSetValueExW( hkey, L"Context", 0, REG_BINARY, (void *)context, sizeof(context) ); ok( !status, "RegSetValueExW returned %#lx\n", status ); - pnp_driver_start( L"driver_hid.dll" ); + hid_device_start(); WaitForSingleObject( stop_event, INFINITE ); - pnp_driver_stop(); + hid_device_stop(); SetCurrentDirectoryW( cwd ); diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 3580964e187..e212f874be3 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -185,7 +185,7 @@ static BOOL test_input_lost( DWORD version ) ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr ); ok( count == 0, "got %lu expected 0\n", count ); - pnp_driver_stop(); + hid_device_stop(); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#lx\n", hr ); @@ -218,7 +218,7 @@ static BOOL test_input_lost( DWORD version ) ok( ref == 0, "Release returned %ld\n", ref ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index c4cfceeee3e..ca7cc9a1a32 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -2084,7 +2084,7 @@ static void test_simple_joystick( DWORD version ) CloseHandle( file ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); winetest_pop_context(); @@ -2616,7 +2616,7 @@ static BOOL test_device_types( DWORD version ) ok( ref == 0, "Release returned %ld\n", ref ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); winetest_pop_context(); @@ -2842,7 +2842,7 @@ static void test_driving_wheel_axes(void) ok( ref == 0, "Release returned %ld\n", ref ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); winetest_pop_context(); @@ -3200,7 +3200,7 @@ static BOOL test_winmm_joystick(void) CloseHandle( file ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); @@ -3395,7 +3395,7 @@ static void test_windows_gaming_input(void) IRawGameControllerStatics_Release( controller_statics ); done: - pnp_driver_stop(); + hid_device_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); }

1 0

Zebediah Figura : tests: Rename struct shader_context to struct shader_runner.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: vkd3d Branch: master Commit: 5841e79102f400839c46462b17e575a7ff399d58 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5841e79102f400839c46462… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 19 12:35:31 2022 -0500 tests: Rename struct shader_context to struct shader_runner. This is a bit clearer, and avoids colliding with other things named "context", e.g. struct test_context, or d3d11 device contexts. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 90 ++++++++++++++++++++++----------------------- tests/shader_runner.h | 12 +++--- tests/shader_runner_d3d11.c | 20 +++++----- tests/shader_runner_d3d12.c | 20 +++++----- 4 files changed, 71 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=5841e79102f400839c4…

1 0

Zebediah Figura : tests: Rename struct d3d12_shader_context to struct d3d12_shader_runner.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: vkd3d Branch: master Commit: 39459d6c3e90c3cbc070937cb22142fdf96ee104 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=39459d6c3e90c3cbc070937… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 19 12:35:32 2022 -0500 tests: Rename struct d3d12_shader_context to struct d3d12_shader_runner. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner_d3d12.c | 62 ++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index eec9582c..a6db29ff 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -38,18 +38,18 @@ static struct d3d12_texture *d3d12_texture(struct texture *t) return CONTAINING_RECORD(t, struct d3d12_texture, t); } -struct d3d12_shader_context +struct d3d12_shader_runner { - struct shader_runner c; + struct shader_runner r; struct test_context test_context; ID3D12DescriptorHeap *heap; }; -static struct d3d12_shader_context *d3d12_shader_context(struct shader_runner *r) +static struct d3d12_shader_runner *d3d12_shader_runner(struct shader_runner *r) { - return CONTAINING_RECORD(r, struct d3d12_shader_context, c); + return CONTAINING_RECORD(r, struct d3d12_shader_runner, r); } static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_model) @@ -82,14 +82,14 @@ static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_m static struct texture *d3d12_runner_create_texture(struct shader_runner *r, const struct texture_params *params) { - struct d3d12_shader_context *context = d3d12_shader_context(r); - struct test_context *test_context = &context->test_context; + struct d3d12_shader_runner *runner = d3d12_shader_runner(r); + struct test_context *test_context = &runner->test_context; ID3D12Device *device = test_context->device; D3D12_SUBRESOURCE_DATA resource_data; struct d3d12_texture *texture; - if (!context->heap) - context->heap = create_gpu_descriptor_heap(device, + if (!runner->heap) + runner->heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS); if (params->slot >= MAX_RESOURCE_DESCRIPTORS) @@ -108,7 +108,7 @@ static struct texture *d3d12_runner_create_texture(struct shader_runner *r, cons transition_resource_state(test_context->list, texture->resource, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); ID3D12Device_CreateShaderResourceView(device, texture->resource, - NULL, get_cpu_descriptor_handle(test_context, context->heap, params->slot)); + NULL, get_cpu_descriptor_handle(test_context, runner->heap, params->slot)); return &texture->t; } @@ -123,8 +123,8 @@ static void d3d12_runner_destroy_texture(struct shader_runner *r, struct texture static void d3d12_runner_draw_quad(struct shader_runner *r) { - struct d3d12_shader_context *context = d3d12_shader_context(r); - struct test_context *test_context = &context->test_context; + struct d3d12_shader_runner *runner = d3d12_shader_runner(r); + struct test_context *test_context = &runner->test_context; ID3D12GraphicsCommandList *command_list = test_context->list; D3D12_ROOT_SIGNATURE_DESC root_signature_desc = {0}; @@ -140,7 +140,7 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) HRESULT hr; size_t i; - if (!(ps_code = compile_shader(context->c.ps_source, context->c.minimum_shader_model))) + if (!(ps_code = compile_shader(runner->r.ps_source, runner->r.minimum_shader_model))) return; root_signature_desc.NumParameters = 0; @@ -148,20 +148,20 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) root_signature_desc.NumStaticSamplers = 0; root_signature_desc.pStaticSamplers = static_samplers; - if (context->c.uniform_count) + if (runner->r.uniform_count) { uniform_index = root_signature_desc.NumParameters++; root_param = &root_params[uniform_index]; root_param->ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; root_param->Constants.ShaderRegister = 0; root_param->Constants.RegisterSpace = 0; - root_param->Constants.Num32BitValues = context->c.uniform_count; + root_param->Constants.Num32BitValues = runner->r.uniform_count; root_param->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; } - for (i = 0; i < context->c.texture_count; ++i) + for (i = 0; i < runner->r.texture_count; ++i) { - struct d3d12_texture *texture = d3d12_texture(context->c.textures[i]); + struct d3d12_texture *texture = d3d12_texture(runner->r.textures[i]); D3D12_DESCRIPTOR_RANGE *range; range = &texture->descriptor_range; @@ -182,10 +182,10 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) assert(root_signature_desc.NumParameters <= ARRAY_SIZE(root_params)); - for (i = 0; i < context->c.sampler_count; ++i) + for (i = 0; i < runner->r.sampler_count; ++i) { D3D12_STATIC_SAMPLER_DESC *sampler_desc = &static_samplers[root_signature_desc.NumStaticSamplers++]; - const struct sampler *sampler = &context->c.samplers[i]; + const struct sampler *sampler = &runner->r.samplers[i]; memset(sampler_desc, 0, sizeof(*sampler_desc)); sampler_desc->Filter = sampler->filter; @@ -214,15 +214,15 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) test_context->pso[test_context->pso_count++] = pso; ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, test_context->root_signature); - if (context->c.uniform_count) + if (runner->r.uniform_count) ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, uniform_index, - context->c.uniform_count, context->c.uniforms, 0); - for (i = 0; i < context->c.texture_count; ++i) + runner->r.uniform_count, runner->r.uniforms, 0); + for (i = 0; i < runner->r.texture_count; ++i) { - struct d3d12_texture *texture = d3d12_texture(context->c.textures[i]); + struct d3d12_texture *texture = d3d12_texture(runner->r.textures[i]); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, texture->root_index, - get_gpu_descriptor_handle(test_context, context->heap, texture->t.slot)); + get_gpu_descriptor_handle(test_context, runner->heap, texture->t.slot)); } ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &test_context->rtv, false, NULL); @@ -246,8 +246,8 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) static void d3d12_runner_probe_vec4(struct shader_runner *r, const RECT *rect, const struct vec4 *v, unsigned int ulps) { - struct d3d12_shader_context *context = d3d12_shader_context(r); - struct test_context *test_context = &context->test_context; + struct d3d12_shader_runner *runner = d3d12_shader_runner(r); + struct test_context *test_context = &runner->test_context; struct resource_readback rb; get_texture_readback_with_command_list(test_context->render_target, 0, &rb, @@ -274,16 +274,16 @@ void run_shader_tests_d3d12(int argc, char **argv) .no_root_signature = true, .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, }; - struct d3d12_shader_context context = {0}; + struct d3d12_shader_runner runner = {0}; parse_args(argc, argv); enable_d3d12_debug_layer(argc, argv); init_adapter_info(); - init_test_context(&context.test_context, &desc); + init_test_context(&runner.test_context, &desc); - run_shader_tests(&context.c, argc, argv, &d3d12_runner_ops); + run_shader_tests(&runner.r, argc, argv, &d3d12_runner_ops); - if (context.heap) - ID3D12DescriptorHeap_Release(context.heap); - destroy_test_context(&context.test_context); + if (runner.heap) + ID3D12DescriptorHeap_Release(runner.heap); + destroy_test_context(&runner.test_context); }

1 0

Zebediah Figura : tests: Rename struct d3d11_shader_context to struct d3d11_shader_runner.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: vkd3d Branch: master Commit: e5be178fe2a0a3964eb676d0491e3a73c4370902 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e5be178fe2a0a3964eb676d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 19 12:35:33 2022 -0500 tests: Rename struct d3d11_shader_context to struct d3d11_shader_runner. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner_d3d11.c | 114 ++++++++++++++++++++++---------------------- 1 file changed, 57 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=e5be178fe2a0a3964eb…

1 0

Zebediah Figura : tests: Use a macro to define the render target size.
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: vkd3d Branch: master Commit: 099df706f08200c63a10f0774aba8a52f88c5376 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=099df706f08200c63a10f07… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 19 12:35:34 2022 -0500 tests: Use a macro to define the render target size. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 2 +- tests/shader_runner.h | 3 +++ tests/shader_runner_d3d11.c | 12 ++++++------ tests/shader_runner_d3d12.c | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index d68d7f18..910e6ecd 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -293,7 +293,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) } else if (match_string(line, "probe all rgba", &line)) { - static const RECT rect = {0, 0, 640, 480}; + static const RECT rect = {0, 0, RENDER_TARGET_WIDTH, RENDER_TARGET_HEIGHT}; unsigned int ulps; struct vec4 v; int ret; diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 84c17016..26fa2367 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -24,6 +24,9 @@ #include "vkd3d_common.h" #include "utils.h" +#define RENDER_TARGET_WIDTH 640 +#define RENDER_TARGET_HEIGHT 480 + enum shader_model { SHADER_MODEL_2_0, diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 0a8e0efe..884d86af 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -241,8 +241,8 @@ static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window) ok(hr == S_OK, "Failed to get factory, hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); - dxgi_desc.BufferDesc.Width = 640; - dxgi_desc.BufferDesc.Height = 480; + dxgi_desc.BufferDesc.Width = RENDER_TARGET_WIDTH; + dxgi_desc.BufferDesc.Height = RENDER_TARGET_HEIGHT; dxgi_desc.BufferDesc.RefreshRate.Numerator = 60; dxgi_desc.BufferDesc.RefreshRate.Denominator = 1; dxgi_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -268,8 +268,8 @@ static BOOL init_test_context(struct d3d11_shader_runner *runner) { const D3D11_TEXTURE2D_DESC texture_desc = { - .Width = 640, - .Height = 480, + .Width = RENDER_TARGET_WIDTH, + .Height = RENDER_TARGET_HEIGHT, .MipLevels = 1, .ArraySize = 1, .Format = DXGI_FORMAT_R32G32B32A32_FLOAT, @@ -290,8 +290,8 @@ static BOOL init_test_context(struct d3d11_shader_runner *runner) return FALSE; } - rt_width = 640; - rt_height = 480; + rt_width = RENDER_TARGET_WIDTH; + rt_height = RENDER_TARGET_HEIGHT; SetRect(&rect, 0, 0, rt_width, rt_height); AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); runner->window = CreateWindowA("static", "d3dcompiler_test", WS_OVERLAPPEDWINDOW, diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index a6db29ff..4f077b38 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -269,8 +269,8 @@ void run_shader_tests_d3d12(int argc, char **argv) { static const struct test_context_desc desc = { - .rt_width = 640, - .rt_height = 480, + .rt_width = RENDER_TARGET_WIDTH, + .rt_height = RENDER_TARGET_HEIGHT, .no_root_signature = true, .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, };

1 0

Zebediah Figura : tests: Remove NULL rect handling from d3d11_runner_probe_vec4().
by Alexandre Julliard 21 Mar '22

21 Mar '22

Module: vkd3d Branch: master Commit: 71db328d38899237a788357e6c80870d438d644a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=71db328d38899237a788357… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 19 12:35:35 2022 -0500 tests: Remove NULL rect handling from d3d11_runner_probe_vec4(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner_d3d11.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 884d86af..c077718c 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -494,8 +494,6 @@ static void d3d11_runner_draw_quad(struct shader_runner *r) struct resource_readback { - uint64_t width; - unsigned int height; ID3D11Resource *resource; D3D11_MAPPED_SUBRESOURCE map_desc; }; @@ -516,9 +514,6 @@ static void init_readback(struct d3d11_shader_runner *runner, struct resource_re ID3D11DeviceContext_CopyResource(runner->immediate_context, rb->resource, (ID3D11Resource *)runner->rt); hr = ID3D11DeviceContext_Map(runner->immediate_context, rb->resource, 0, D3D11_MAP_READ, 0, &rb->map_desc); ok(hr == S_OK, "Failed to map texture, hr %#lx.\n", hr); - - rb->width = texture_desc.Width; - rb->height = texture_desc.Height; } static void release_readback(struct d3d11_shader_runner *runner, struct resource_readback *rb) @@ -535,17 +530,13 @@ static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsign static void check_readback_data_vec4(struct resource_readback *rb, const RECT *rect, const struct vec4 *expected, unsigned int max_diff) { - RECT r = {0, 0, rb->width, rb->height}; unsigned int x = 0, y = 0; struct vec4 got = {0}; bool all_match = true; - if (rect) - r = *rect; - - for (y = r.top; y < r.bottom; ++y) + for (y = rect->top; y < rect->bottom; ++y) { - for (x = r.left; x < r.right; ++x) + for (x = rect->left; x < rect->right; ++x) { got = *get_readback_vec4(rb, x, y); if (!compare_vec4(&got, expected, max_diff))

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in env.c.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: a0324df70c224de0e1869f2eac4ca020498c3791 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0324df70c224de0e1869f2e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 18 08:33:55 2022 +0100 ntdll/tests: Enable compilation with long types in env.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 161 +++++++++++++++++++++++++------------------------ 1 file changed, 81 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0324df70c224de0e186…

1 0