August 2021 - Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d-shader: Handle 64-bit immediate constant registers.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: vkd3d Branch: master Commit: 506c98b4a2c7e2874f69b4c0f87156ecc41da855 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=506c98b4a2c7e2874f69b4c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 30 23:27:21 2021 +1000 vkd3d-shader: Handle 64-bit immediate constant registers. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 81 ++++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 7 +++ 2 files changed, 84 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0abc2d6..b5f20ce 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1147,6 +1147,21 @@ static uint32_t vkd3d_spirv_get_op_constant(struct vkd3d_spirv_builder *builder, vkd3d_spirv_build_op_constant); } +static uint32_t vkd3d_spirv_build_op_constant64(struct vkd3d_spirv_builder *builder, + uint32_t result_type, const uint32_t *values, unsigned int value_count) +{ + assert(value_count == 2); + return vkd3d_spirv_build_op_trv(builder, &builder->global_stream, + SpvOpConstant, result_type, values, value_count); +} + +static uint32_t vkd3d_spirv_get_op_constant64(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint64_t value) +{ + return vkd3d_spirv_build_once1v(builder, SpvOpConstant, result_type, + (const uint32_t *)&value, 2, vkd3d_spirv_build_op_constant64); +} + static uint32_t vkd3d_spirv_build_op_constant_composite(struct vkd3d_spirv_builder *builder, uint32_t result_type, const uint32_t *constituents, unsigned int constituent_count) { @@ -2709,6 +2724,35 @@ static uint32_t vkd3d_dxbc_compiler_get_constant(struct vkd3d_dxbc_compiler *com } } +static uint32_t vkd3d_dxbc_compiler_get_constant64(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_shader_component_type component_type, unsigned int component_count, const uint64_t *values) +{ + uint32_t type_id, scalar_type_id, component_ids[VKD3D_DVEC2_SIZE]; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int i; + + assert(0 < component_count && component_count <= VKD3D_DVEC2_SIZE); + type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); + + if (component_type != VKD3D_SHADER_COMPONENT_DOUBLE) + { + FIXME("Unhandled component_type %#x.\n", component_type); + return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); + } + + if (component_count == 1) + { + return vkd3d_spirv_get_op_constant64(builder, type_id, *values); + } + else + { + scalar_type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); + for (i = 0; i < component_count; ++i) + component_ids[i] = vkd3d_spirv_get_op_constant64(builder, scalar_type_id, values[i]); + return vkd3d_spirv_get_op_constant_composite(builder, type_id, component_ids, component_count); + } +} + static uint32_t vkd3d_dxbc_compiler_get_constant_uint(struct vkd3d_dxbc_compiler *compiler, uint32_t value) { @@ -3079,7 +3123,7 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil struct vkd3d_symbol reg_symbol, *symbol; struct rb_entry *entry; - assert(reg->type != VKD3DSPR_IMMCONST); + assert(reg->type != VKD3DSPR_IMMCONST && reg->type != VKD3DSPR_IMMCONST64); if (reg->type == VKD3DSPR_TEMP) { @@ -3390,6 +3434,33 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_constant(struct vkd3d_dxbc_compile vkd3d_component_type_from_data_type(reg->data_type), component_count, values); } +static uint32_t vkd3d_dxbc_compiler_emit_load_constant64(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) +{ + unsigned int component_count = vkd3d_write_mask_component_count(write_mask); + uint64_t values[VKD3D_DVEC2_SIZE] = {0}; + unsigned int i, j; + + assert(reg->type == VKD3DSPR_IMMCONST64); + + if (reg->immconst_type == VKD3D_IMMCONST_SCALAR) + { + for (i = 0; i < component_count; ++i) + values[i] = *reg->u.immconst_uint64; + } + else + { + for (i = 0, j = 0; i < VKD3D_DVEC2_SIZE; ++i) + { + if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) + values[j++] = reg->u.immconst_uint64[vkd3d_swizzle_get_component64(swizzle, i)]; + } + } + + return vkd3d_dxbc_compiler_get_constant64(compiler, + vkd3d_component_type_from_data_type(reg->data_type), component_count, values); +} + static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask, const struct vkd3d_shader_register_info *reg_info) @@ -3400,7 +3471,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler enum vkd3d_shader_component_type component_type; unsigned int skipped_component_mask; - assert(reg->type != VKD3DSPR_IMMCONST); + assert(reg->type != VKD3DSPR_IMMCONST && reg->type != VKD3DSPR_IMMCONST64); assert(vkd3d_write_mask_component_count(write_mask) == 1); component_idx = vkd3d_write_mask_get_component_idx(write_mask); @@ -3450,6 +3521,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co if (reg->type == VKD3DSPR_IMMCONST) return vkd3d_dxbc_compiler_emit_load_constant(compiler, reg, swizzle, write_mask); + else if (reg->type == VKD3DSPR_IMMCONST64) + return vkd3d_dxbc_compiler_emit_load_constant64(compiler, reg, swizzle, write_mask); component_count = vkd3d_write_mask_component_count(write_mask); component_type = vkd3d_component_type_from_data_type(reg->data_type); @@ -3665,7 +3738,7 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi unsigned int src_write_mask = write_mask; uint32_t type_id; - assert(reg->type != VKD3DSPR_IMMCONST); + assert(reg->type != VKD3DSPR_IMMCONST && reg->type != VKD3DSPR_IMMCONST64); if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) return; @@ -6840,7 +6913,7 @@ static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, uint32_t components[VKD3D_VEC4_SIZE]; unsigned int i, component_count; - if (src->reg.type == VKD3DSPR_IMMCONST || dst->modifiers || src->modifiers) + if (src->reg.type == VKD3DSPR_IMMCONST || src->reg.type == VKD3DSPR_IMMCONST64 || dst->modifiers || src->modifiers) goto general_implementation; vkd3d_dxbc_compiler_get_register_info(compiler, &dst->reg, &dst_reg_info); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b3cd8ce..c450049 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -621,6 +621,7 @@ struct vkd3d_shader_register { DWORD immconst_uint[VKD3D_VEC4_SIZE]; float immconst_float[VKD3D_VEC4_SIZE]; + uint64_t immconst_uint64[VKD3D_DVEC2_SIZE]; double immconst_double[VKD3D_DVEC2_SIZE]; unsigned fp_body_idx; } u; @@ -1087,6 +1088,12 @@ static inline unsigned int vkd3d_swizzle_get_component(DWORD swizzle, return (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(idx)) & VKD3D_SHADER_SWIZZLE_MASK; } +static inline unsigned int vkd3d_swizzle_get_component64(DWORD swizzle, + unsigned int idx) +{ + return ((swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(idx * 2)) & VKD3D_SHADER_SWIZZLE_MASK) / 2u; +} + static inline unsigned int vkd3d_compact_swizzle(unsigned int swizzle, unsigned int write_mask) { unsigned int i, compacted_swizzle = 0;

1 0

Conor McCarthy : vkd3d-shader: Emit abs modifier for double-precision float registers.
by Alexandre Julliard Aug. 3, 2021

Aug. 3, 2021

Module: vkd3d Branch: master Commit: c86570dff05c876b63fe2be4ff819bdc8fee9fb1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c86570dff05c876b63fe2be… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 30 23:27:22 2021 +1000 vkd3d-shader: Emit abs modifier for double-precision float registers. Based on a vkd3d-proton patch by Joshua Ashton. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b5f20ce..c18f694 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3582,15 +3582,12 @@ static void vkd3d_dxbc_compiler_emit_execution_mode1(struct vkd3d_dxbc_compiler static uint32_t vkd3d_dxbc_compiler_emit_abs(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) { - unsigned int component_count = vkd3d_write_mask_component_count(write_mask); struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id; - if (reg->data_type == VKD3D_DATA_FLOAT) - { - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_reg(compiler, reg, write_mask); + if (reg->data_type == VKD3D_DATA_FLOAT || reg->data_type == VKD3D_DATA_DOUBLE) return vkd3d_spirv_build_op_glsl_std450_fabs(builder, type_id, val_id); - } FIXME("Unhandled data type %#x.\n", reg->data_type); return val_id;

1 0

Rémi Bernon : hidclass.sys: Set IoStatus.Information in IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 3eb8c6cd4d69302c57ee17c2797cd3411f3e0f8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eb8c6cd4d69302c57ee17c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 2 12:25:22 2021 +0200 hidclass.sys: Set IoStatus.Information in IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 2 ++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index da1814587c7..73a8428ad22 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -560,11 +560,13 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) { if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) { + irp->IoStatus.Information = 0; irp->IoStatus.Status = rc = STATUS_BUFFER_TOO_SMALL; } else { *(ULONG *)irp->AssociatedIrp.SystemBuffer = RingBuffer_GetSize(ext->u.pdo.ring_buffer); + irp->IoStatus.Information = sizeof(ULONG); rc = irp->IoStatus.Status = STATUS_SUCCESS; } break; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index a37697f4a69..8eaf8ee4888 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2750,7 +2750,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) SetLastError(0xdeadbeef); ret = HidD_GetNumInputBuffers(file, &count); ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); - todo_wine ok(count == 32, "HidD_GetNumInputBuffers returned %u\n", count); + ok(count == 32, "HidD_GetNumInputBuffers returned %u\n", count); SetLastError(0xdeadbeef); ret = HidD_SetNumInputBuffers(file, 1); @@ -2769,7 +2769,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) SetLastError(0xdeadbeef); ret = HidD_GetNumInputBuffers(file, &count); ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); - todo_wine ok(count == 16, "HidD_GetNumInputBuffers returned %u\n", count); + ok(count == 16, "HidD_GetNumInputBuffers returned %u\n", count); async_file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, @@ -2790,7 +2790,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) SetLastError(0xdeadbeef); ret = HidD_GetNumInputBuffers(async_file, &count); ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); - todo_wine ok(count == 2, "HidD_GetNumInputBuffers returned %u\n", count); + ok(count == 2, "HidD_GetNumInputBuffers returned %u\n", count); count = 0xdeadbeef; SetLastError(0xdeadbeef); ret = HidD_GetNumInputBuffers(file, &count);

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some tests with concurrent reads in polled mode.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 76b4d09afdbd7d71ebdebb7d8bfbea5d81ecc4a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b4d09afdbd7d71ebdebb7d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 2 12:25:24 2021 +0200 ntoskrnl.exe/tests: Add some tests with concurrent reads in polled mode. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 3 +++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 45 ++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index cfbffd3843c..f1289b8a1bb 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -394,6 +394,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) const ULONG in_size = stack->Parameters.DeviceIoControl.InputBufferLength; const ULONG out_size = stack->Parameters.DeviceIoControl.OutputBufferLength; const ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; + static BYTE seq = 0; NTSTATUS ret; BOOL removed; KIRQL irql; @@ -485,6 +486,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { memset(irp->UserBuffer, 0xa5, expected_size); if (report_id) ((char *)irp->UserBuffer)[0] = report_id; + ((char *)irp->UserBuffer)[1] = seq++; irp->IoStatus.Information = 3; ret = STATUS_SUCCESS; } @@ -539,6 +541,7 @@ 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/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 92c6c4ed3eb..401401bbffe 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1676,7 +1676,7 @@ static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void return ret; } -static void test_hidp(HANDLE file, int report_id, BOOL polled) +static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled) { const HIDP_CAPS expect_hidp_caps[] = { @@ -1868,6 +1868,7 @@ static void test_hidp(HANDLE file, int report_id, BOOL polled) { .DataIndex = 39, .RawValue = 1, }, }; + OVERLAPPED overlapped = {0}, overlapped2 = {0}; HIDP_LINK_COLLECTION_NODE collections[16]; PHIDP_PREPARSED_DATA preparsed_data; USAGE_AND_PAGE usage_and_pages[16]; @@ -2692,6 +2693,46 @@ static void test_hidp(HANDLE file, int report_id, BOOL polled) todo_wine ok(ret, "ReadFile failed, last error %u\n", GetLastError()); todo_wine ok(value == (report_id ? 3 : 4), "ReadFile returned %x\n", value); todo_wine ok(report[0] == report_id, "unexpected report data\n"); + + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + overlapped2.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + + /* drain available input reports */ + SetLastError(0xdeadbeef); + while (ReadFile(async_file, report, caps.InputReportByteLength, NULL, &overlapped)) + ResetEvent(overlapped.hEvent); + todo_wine ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); + ret = GetOverlappedResult(async_file, &overlapped, &value, TRUE); + todo_wine ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); + todo_wine ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); + ResetEvent(overlapped.hEvent); + + memcpy(buffer, report, caps.InputReportByteLength); + memcpy(buffer + caps.InputReportByteLength, report, caps.InputReportByteLength); + + SetLastError(0xdeadbeef); + ret = ReadFile(async_file, report, caps.InputReportByteLength, NULL, &overlapped); + ok(!ret, "ReadFile succeded\n"); + ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadFile(async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2); + ok(!ret, "ReadFile succeded\n"); + ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); + + /* wait for first report to be ready */ + ret = GetOverlappedResult(async_file, &overlapped, &value, TRUE); + todo_wine ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); + todo_wine ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); + /* second report should be ready and the same */ + ret = GetOverlappedResult(async_file, &overlapped2, &value, FALSE); + todo_wine ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); + todo_wine 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"); + + CloseHandle(overlapped.hEvent); + CloseHandle(overlapped2.hEvent); } @@ -2828,7 +2869,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) ok(poll_freq == 50, "got poll_freq %u, expected 100\n", poll_freq); } - test_hidp(file, report_id, polled); + test_hidp(file, async_file, report_id, polled); CloseHandle(async_file); CloseHandle(file);

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some HidD_(Get|Set)NumInputBuffers tests.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 5e57887bcaa19060c542356ce4a1a4fd1f8cc523 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e57887bcaa19060c542356c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 2 12:25:21 2021 +0200 ntoskrnl.exe/tests: Add some HidD_(Get|Set)NumInputBuffers tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 55 +++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 2ec7c913465..a37697f4a69 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2704,6 +2704,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; SP_DEVINFO_DATA device = {sizeof(device)}; + HANDLE file, async_file; BOOL ret, found = FALSE; OBJECT_ATTRIBUTES attr; UNICODE_STRING string; @@ -2711,7 +2712,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) NTSTATUS status; unsigned int i; HDEVINFO set; - HANDLE file; + ULONG count; winetest_push_context("id %d%s", report_id, polled ? " poll" : ""); @@ -2745,8 +2746,60 @@ static void test_hid_device(DWORD report_id, DWORD polled) FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = HidD_GetNumInputBuffers(file, &count); + ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); + todo_wine ok(count == 32, "HidD_GetNumInputBuffers returned %u\n", count); + + SetLastError(0xdeadbeef); + ret = HidD_SetNumInputBuffers(file, 1); + ok(!ret, "HidD_SetNumInputBuffers succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_SetNumInputBuffers returned error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = HidD_SetNumInputBuffers(file, 513); + ok(!ret, "HidD_SetNumInputBuffers succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_SetNumInputBuffers returned error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = HidD_SetNumInputBuffers(file, 16); + ok(ret, "HidD_SetNumInputBuffers failed last error %u\n", GetLastError()); + + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = HidD_GetNumInputBuffers(file, &count); + ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); + todo_wine ok(count == 16, "HidD_GetNumInputBuffers returned %u\n", count); + + async_file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL); + ok(async_file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = HidD_GetNumInputBuffers(async_file, &count); + ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); + todo_wine ok(count == 32, "HidD_GetNumInputBuffers returned %u\n", count); + + SetLastError(0xdeadbeef); + ret = HidD_SetNumInputBuffers(async_file, 2); + ok(ret, "HidD_SetNumInputBuffers failed last error %u\n", GetLastError()); + + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = HidD_GetNumInputBuffers(async_file, &count); + ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); + todo_wine ok(count == 2, "HidD_GetNumInputBuffers returned %u\n", count); + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = HidD_GetNumInputBuffers(file, &count); + ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); + todo_wine ok(count == 16, "HidD_GetNumInputBuffers returned %u\n", count); + test_hidp(file, report_id, polled); + CloseHandle(async_file); CloseHandle(file); RtlInitUnicodeString(&string, L"\\??\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}");

1 0

Rémi Bernon : ntoskrnl.exe/tests: Don't close HID device file twice.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: e9c3dc02e86176ce1db53b3f27bb5726c92f26f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9c3dc02e86176ce1db53b3f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 2 12:25:20 2021 +0200 ntoskrnl.exe/tests: Don't close HID device file twice. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 148de3b1a6c..2ec7c913465 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2696,7 +2696,6 @@ static void test_hidp(HANDLE file, int report_id, BOOL polled) HidD_FreePreparsedData(preparsed_data); - CloseHandle(file); } static void test_hid_device(DWORD report_id, DWORD polled)

1 0

Rémi Bernon : ntoskrnl.exe/tests: Return success from IOCTL_HID_GET_STRING.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: be090396468da814aae3372761d1fe28388b1329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be090396468da814aae33727… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 2 12:25:19 2021 +0200 ntoskrnl.exe/tests: Return success from IOCTL_HID_GET_STRING. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 1a2971a8956..cfbffd3843c 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -604,7 +604,9 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(!in_size, "got input size %u\n", in_size); ok(out_size == 128, "got output size %u\n", out_size); - ret = STATUS_NOT_IMPLEMENTED; + memcpy(irp->UserBuffer, L"Wine Test", sizeof(L"Wine Test")); + irp->IoStatus.Information = sizeof(L"Wine Test"); + ret = STATUS_SUCCESS; break; default:

1 0

Jacek Caban : gdi32: Use ntgdi names for GetBoundsRect and SetBoundsRect.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 057b6404ba27164954215db54e91cc6a6202f814 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057b6404ba27164954215db5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 2 10:03:26 2021 +0200 gdi32: Use ntgdi names for GetBoundsRect and SetBoundsRect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 10 +++++----- dlls/gdi32/gdi32.spec | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index afa4247cf9e..ca06c845b1b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -494,7 +494,7 @@ static BOOL reset_dc_state( HDC hdc ) NtGdiSelectPen( hdc, GetStockObject( BLACK_PEN )); SetVirtualResolution( hdc, 0, 0, 0, 0 ); GDISelectPalette( hdc, GetStockObject( DEFAULT_PALETTE ), FALSE ); - SetBoundsRect( hdc, NULL, DCB_DISABLE ); + NtGdiSetBoundsRect( hdc, NULL, DCB_DISABLE ); AbortPath( hdc ); if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); @@ -1206,9 +1206,9 @@ BOOL WINAPI NtGdiSetDeviceGammaRamp( HDC hdc, void *ptr ) /*********************************************************************** - * GetBoundsRect (GDI32.@) + * NtGdiGetBoundsRect (win32u.@) */ -UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) +UINT WINAPI NtGdiGetBoundsRect( HDC hdc, RECT *rect, UINT flags ) { PHYSDEV physdev; RECT device_rect; @@ -1253,9 +1253,9 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) /*********************************************************************** - * SetBoundsRect (GDI32.@) + * NtGdiSetBoundsRect (win32u.@) */ -UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) +UINT WINAPI NtGdiSetBoundsRect( HDC hdc, const RECT *rect, UINT flags ) { PHYSDEV physdev; UINT ret; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5995396abe7..626463fe2f7 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -244,7 +244,7 @@ @ stdcall GetBitmapDimensionEx(long ptr) NtGdiGetBitmapDimension @ stdcall GetBkColor(long) @ stdcall GetBkMode(long) -@ stdcall GetBoundsRect(long ptr long) +@ stdcall GetBoundsRect(long ptr long) NtGdiGetBoundsRect # @ stub GetBrushAttributes @ stdcall GetBrushOrgEx(long ptr) @ stdcall GetCharABCWidthsA(long long long ptr) @@ -478,7 +478,7 @@ @ stdcall SetBitmapDimensionEx(long long long ptr) NtGdiSetBitmapDimension @ stdcall SetBkColor(long long) @ stdcall SetBkMode(long long) -@ stdcall SetBoundsRect(long ptr long) +@ stdcall SetBoundsRect(long ptr long) NtGdiSetBoundsRect # @ stub SetBrushAttributes @ stdcall SetBrushOrgEx(long long long ptr) @ stdcall SetColorAdjustment(long ptr)

1 0

Jacek Caban : gdi32: Store vis_rect in DC_ATTR.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 0d03c57d890c9edbd8b5812080b97b4d28aea3d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d03c57d890c9edbd8b58120… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 2 10:03:33 2021 +0200 gdi32: Store vis_rect in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 4 ++-- dlls/gdi32/bitmap.c | 10 +++++----- dlls/gdi32/clipping.c | 17 ++++++++-------- dlls/gdi32/dc.c | 49 ++++++++++++++++------------------------------ dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 8 files changed, 47 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d03c57d890c9edbd8b5…

1 0

Rémi Bernon : ntoskrnl.exe/tests: Reduce todo_wine test verbosity.
by Alexandre Julliard Aug. 2, 2021

Aug. 2, 2021

Module: wine Branch: master Commit: 2a7b7144718abe8e3cce9f72643a832a8a877094 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a7b7144718abe8e3cce9f72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 2 12:25:18 2021 +0200 ntoskrnl.exe/tests: Reduce todo_wine test verbosity. Reducing the failure message and mute driver todos after first failure. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 38 +++++++++++++----------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 1d5f7563e3f..1a2971a8956 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -388,7 +388,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) #undef REPORT_ID_OR_USAGE_PAGE #include "pop_hid_macros.h" - static BOOL test_failed; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); HID_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_device *impl = ext->MiniDeviceExtension; @@ -479,12 +478,8 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { ULONG expected_size = 23; ok(!in_size, "got input size %u\n", in_size); - if (!test_failed) - { - todo_wine_if(!report_id) - ok(out_size == expected_size, "got output size %u\n", out_size); - } - if (out_size != expected_size) test_failed = TRUE; + todo_wine_if(!report_id) + ok(out_size == expected_size, "got output size %u\n", out_size); if (polled) { @@ -537,12 +532,10 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(out_size == sizeof(*packet), "got output size %u\n", out_size); todo_wine_if(packet->reportId == 0x5a || (polled && report_id && packet->reportId == 0)) - ok(packet->reportId == report_id, "report %d, polled %d got packet report id %u\n", - report_id, polled, packet->reportId); + ok(packet->reportId == report_id, "got id %u\n", packet->reportId); todo_wine_if(packet->reportBufferLen == 21 || packet->reportBufferLen == 22) - ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", - packet->reportBufferLen, expected_size); - ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); + ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); memset(packet->reportBuffer, 0xa5, 3); if (report_id) ((char *)packet->reportBuffer)[0] = report_id; @@ -559,11 +552,10 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) todo_wine ok(!out_size, "got output size %u\n", out_size); todo_wine_if(packet->reportId != report_id) - ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + ok(packet->reportId == report_id, "got id %u\n", packet->reportId); todo_wine_if(packet->reportBufferLen == 0 || packet->reportBufferLen == 1) - ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", - packet->reportBufferLen, expected_size); - ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); + ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); irp->IoStatus.Information = 3; ret = STATUS_SUCCESS; @@ -578,11 +570,10 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(out_size == sizeof(*packet), "got output size %u\n", out_size); todo_wine_if(packet->reportId == 0x5a || packet->reportId == 0xa5) - ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + ok(packet->reportId == report_id, "got id %u\n", packet->reportId); todo_wine_if(packet->reportBufferLen == 16) - ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", - packet->reportBufferLen, expected_size); - ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); + ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); memset(packet->reportBuffer, 0xa5, 3); if (report_id) ((char *)packet->reportBuffer)[0] = report_id; @@ -599,11 +590,10 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) todo_wine ok(!out_size, "got output size %u\n", out_size); todo_wine_if(packet->reportId != report_id) - ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + ok(packet->reportId == report_id, "got id %u\n", packet->reportId); todo_wine_if(packet->reportBufferLen == 0 || packet->reportBufferLen == 16) - ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", - packet->reportBufferLen, expected_size); - ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); + ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); irp->IoStatus.Information = 3; ret = STATUS_SUCCESS; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 1eab88311ab..148de3b1a6c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2714,7 +2714,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) HDEVINFO set; HANDLE file; - winetest_push_context("report %d, polled %d", report_id, polled); + winetest_push_context("id %d%s", report_id, polled ? " poll" : ""); set = SetupDiGetClassDevsA(&GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index f73f6f938ca..aa84890f6af 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -51,7 +51,7 @@ static int winetest_debug; static int winetest_report_success; /* silence todos and skips above this threshold */ -static int winetest_mute_threshold = 42; +static int winetest_mute_threshold = 1; /* counts how many times a given line printed a message */ static LONG line_counters[16384];

1 0