April 2021 - Wine-commits - list.winehq.org

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_copy_sub_resource_region().
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 8c4061a7786bc55478495baeaf21ea3278e7adb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c4061a7786bc55478495bae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 20:56:43 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_copy_sub_resource_region(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 13 +++++++------ dlls/d3d8/device.c | 4 ++-- dlls/d3d9/device.c | 6 +++--- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/executebuffer.c | 2 +- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 8 ++++---- 8 files changed, 24 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c4061a7786bc5547849…

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_texture_blt().
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 86dcbadffb464a1b8bef7ab28b8345b9051ffda4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86dcbadffb464a1b8bef7ab2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 20:56:44 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_texture_blt(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 9 ++++++--- dlls/d3d9/device.c | 9 ++++++--- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/surface.c | 16 +++++++++------- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 11 ++++++----- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 7 ++++--- 10 files changed, 38 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86dcbadffb464a1b8bef…

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_resolve_sub_resource().
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 5c7057d229ef40132843dc6aa89d3b1bb033160a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c7057d229ef40132843dc6a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 20:56:45 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_resolve_sub_resource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 7 +++---- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ef15dc71af7..ada668e3164 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1387,7 +1387,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D ID3D11Resource *src_resource, UINT src_subresource_idx, DXGI_FORMAT format) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; enum wined3d_format_id wined3d_format; @@ -1400,7 +1400,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); wined3d_format = wined3dformat_from_dxgi_format(format); wined3d_mutex_lock(); - wined3d_device_resolve_sub_resource(device->wined3d_device, + wined3d_device_context_resolve_sub_resource(context->wined3d_context, wined3d_dst_resource, dst_subresource_idx, wined3d_src_resource, src_subresource_idx, wined3d_format); wined3d_mutex_unlock(); @@ -4991,7 +4991,7 @@ static void STDMETHODCALLTYPE d3d10_device_ResolveSubresource(ID3D10Device1 *ifa wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); wined3d_format = wined3dformat_from_dxgi_format(format); wined3d_mutex_lock(); - wined3d_device_resolve_sub_resource(device->wined3d_device, + wined3d_device_context_resolve_sub_resource(device->immediate_context.wined3d_context, wined3d_dst_resource, dst_subresource_idx, wined3d_src_resource, src_subresource_idx, wined3d_format); wined3d_mutex_unlock(); diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f69b56acc37..b07c20f71a0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1932,7 +1932,7 @@ static void resolve_depth_buffer(struct d3d8_device *device) return; d3d8_dsv = wined3d_rendertarget_view_get_sub_resource_parent(wined3d_dsv); - wined3d_device_resolve_sub_resource(device->wined3d_device, dst_resource, 0, + wined3d_device_context_resolve_sub_resource(device->immediate_context, dst_resource, 0, wined3d_rendertarget_view_get_resource(wined3d_dsv), d3d8_dsv->sub_resource_idx, desc.format); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2b63f458a5d..6492eecc7b9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2429,7 +2429,7 @@ static void resolve_depth_buffer(struct d3d9_device *device) return; d3d9_dsv = wined3d_rendertarget_view_get_sub_resource_parent(wined3d_dsv); - wined3d_device_resolve_sub_resource(device->wined3d_device, dst_resource, 0, + wined3d_device_context_resolve_sub_resource(device->immediate_context, dst_resource, 0, wined3d_rendertarget_view_get_resource(wined3d_dsv), d3d9_dsv->sub_resource_idx, desc.format); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 78fbe668857..e21e22a46f7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1590,7 +1590,7 @@ static void resolve_depth_buffer(struct wined3d_device *device) if (!(src_view = state->fb.depth_stencil)) return; - wined3d_device_resolve_sub_resource(device, dst_resource, 0, + wined3d_device_context_resolve_sub_resource(&device->cs->c, dst_resource, 0, src_view->resource, src_view->sub_resource_idx, dst_resource->format->id); } @@ -5152,7 +5152,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str wined3d_cs_emit_update_sub_resource(device->cs, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); } -void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, +void CDECL wined3d_device_context_resolve_sub_resource(struct wined3d_device_context *context, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, enum wined3d_format_id format_id) @@ -5162,9 +5162,9 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, struct wined3d_blt_fx fx = {0}; RECT dst_rect, src_rect; - TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, " + TRACE("context %p, dst_resource %p, dst_sub_resource_idx %u, " "src_resource %p, src_sub_resource_idx %u, format %s.\n", - device, dst_resource, dst_sub_resource_idx, + context, dst_resource, dst_sub_resource_idx, src_resource, src_sub_resource_idx, debug_d3dformat(format_id)); if (wined3d_format_is_typeless(dst_resource->format) @@ -5197,7 +5197,7 @@ void CDECL wined3d_device_resolve_sub_resource(struct wined3d_device *device, src_level = src_sub_resource_idx % src_texture->level_count; SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(src_texture, src_level), wined3d_texture_get_level_height(src_texture, src_level)); - wined3d_device_context_blt(&device->cs->c, dst_texture, dst_sub_resource_idx, &dst_rect, + wined3d_device_context_blt(context, dst_texture, dst_sub_resource_idx, &dst_rect, src_texture, src_sub_resource_idx, &src_rect, 0, &fx, WINED3D_TEXF_POINT); } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d15b56b89d4..34eca80a94e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -111,7 +111,6 @@ @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) @ cdecl wined3d_device_reset(ptr ptr ptr ptr long) -@ cdecl wined3d_device_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_blend_state(ptr ptr ptr) @ cdecl wined3d_device_set_clip_status(ptr ptr) @@ -172,6 +171,7 @@ @ cdecl wined3d_device_context_draw_indirect(ptr ptr long long) @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) +@ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e3667cd3f60..0e356aa7ecb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2461,10 +2461,6 @@ void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state); -void __cdecl wined3d_device_resolve_sub_resource(struct wined3d_device *device, - struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, - struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, - enum wined3d_format_id format_id); void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); void __cdecl wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state, const struct wined3d_color *blend_factor, unsigned int sample_mask); @@ -2571,6 +2567,9 @@ void __cdecl wined3d_device_context_draw_indexed(struct wined3d_device_context * unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count); void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context *context, struct wined3d_buffer *buffer, unsigned int offset, bool indexed); +void __cdecl wined3d_device_context_resolve_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, + struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, enum wined3d_format_id format_id); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context,

1 0

Zebediah Figura : ntoskrnl/tests: Factor out winetest_init() and winetest_cleanup().
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 801d116733a2b36b814900321b592a804afc9e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=801d116733a2b36b81490032… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 22:42:20 2021 -0500 ntoskrnl/tests: Factor out winetest_init() and winetest_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 23 +++++------------------ dlls/ntoskrnl.exe/tests/driver_netio.c | 22 +++++----------------- dlls/ntoskrnl.exe/tests/utils.h | 25 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 179d2d5e02d..1d78f576ecf 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1782,15 +1782,7 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) test_stack_limits(); test_completion(); - /* print process report */ - if (winetest_debug) - { - kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, - (failures + todo_failures != 1) ? "failures" : "failure", skipped ); - } - ZwClose(okfile); + winetest_cleanup(); *((LONG *)buffer) = failures; irp->IoStatus.Status = STATUS_SUCCESS; @@ -2116,24 +2108,19 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; void *buffer = irp->AssociatedIrp.SystemBuffer; struct test_input *test_input = (struct test_input *)buffer; - OBJECT_ATTRIBUTES attr = {0}; - UNICODE_STRING pathU; - IO_STATUS_BLOCK io; + NTSTATUS status; if (!buffer) return STATUS_ACCESS_VIOLATION; if (length < sizeof(failures)) return STATUS_BUFFER_TOO_SMALL; - attr.Length = sizeof(attr); - RtlInitUnicodeString(&pathU, L"\\??\\C:\\windows\\winetest_ntoskrnl_okfile"); running_under_wine = test_input->running_under_wine; winetest_debug = test_input->winetest_debug; winetest_report_success = test_input->winetest_report_success; - attr.ObjectName = &pathU; - attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ - ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); + + if ((status = winetest_init())) + return status; pExEventObjectType = get_proc_address("ExEventObjectType"); ok(!!pExEventObjectType, "ExEventObjectType not found\n"); diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index 3d783dbef0d..98392c9c7fd 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -468,38 +468,26 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; void *buffer = irp->AssociatedIrp.SystemBuffer; struct test_input *test_input = buffer; - OBJECT_ATTRIBUTES attr = {0}; - UNICODE_STRING pathU; - IO_STATUS_BLOCK io; + NTSTATUS status; if (!buffer) return STATUS_ACCESS_VIOLATION; if (length < sizeof(failures)) return STATUS_BUFFER_TOO_SMALL; - attr.Length = sizeof(attr); - RtlInitUnicodeString(&pathU, L"\\??\\C:\\winetest_ntoskrnl_okfile"); running_under_wine = test_input->running_under_wine; winetest_debug = test_input->winetest_debug; winetest_report_success = test_input->winetest_report_success; - attr.ObjectName = &pathU; - attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ - ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); + + if ((status = winetest_init())) + return status; netio_init(); test_wsk_get_address_info(); test_wsk_listen_socket(); test_wsk_connect_socket(); - if (winetest_debug) - { - kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, - (failures + todo_failures != 1) ? "failures" : "failure", skipped ); - } - ZwClose(okfile); + winetest_cleanup(); *((LONG *)buffer) = failures; irp->IoStatus.Information = sizeof(failures); diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index be0f58f837c..508346ef9bf 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -49,6 +49,31 @@ static inline void WINAPIV kprintf(const char *format, ...) __ms_va_end(valist); } +static inline NTSTATUS winetest_init(void) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + IO_STATUS_BLOCK io; + + RtlInitUnicodeString(&string, L"\\??\\C:\\windows\\winetest_ntoskrnl_okfile"); + /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); + return ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); +} + +static inline void winetest_cleanup(void) +{ + if (winetest_debug) + { + kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, + todo_successes, failures + todo_failures, + (failures + todo_failures != 1) ? "failures" : "failure", skipped ); + } + ZwClose(okfile); +} + static inline void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) { const char *current_file;

1 0

Zebediah Figura : ntoskrnl/tests: Retrieve test global variables from a memory section.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 55a166d17e5a4392c281e3c0fe8ba720cf8944bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=55a166d17e5a4392c281e3c0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 22:42:21 2021 -0500 ntoskrnl/tests: Retrieve test global variables from a memory section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 +++--- dlls/ntoskrnl.exe/tests/driver.c | 10 +++------- dlls/ntoskrnl.exe/tests/driver.h | 6 +++++- dlls/ntoskrnl.exe/tests/driver_netio.c | 5 ----- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 27 +++++++++++++++++---------- dlls/ntoskrnl.exe/tests/utils.h | 26 +++++++++++++++++++++++++- 6 files changed, 53 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55a166d17e5a4392c281…

1 0

Zebediah Figura : ntoskrnl/tests: Write test counts to the shared memory section.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 553eb70ebf7c3e3af5e9b42ab32c278e34f829fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=553eb70ebf7c3e3af5e9b42a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 22:42:22 2021 -0500 ntoskrnl/tests: Write test counts to the shared memory section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 7 +------ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/driver_netio.c | 6 +----- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 33 ++++++++++++++++----------------- dlls/ntoskrnl.exe/tests/utils.h | 30 ++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 28 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index c5e0bdf754f..6d46314216b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1770,7 +1770,6 @@ static PIO_WORKITEM main_test_work_item; static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) { IRP *irp = context; - void *buffer = irp->AssociatedIrp.SystemBuffer; IoFreeWorkItem(main_test_work_item); main_test_work_item = NULL; @@ -1784,9 +1783,8 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) winetest_cleanup(); - *((LONG *)buffer) = failures; irp->IoStatus.Status = STATUS_SUCCESS; - irp->IoStatus.Information = sizeof(failures); + irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); } @@ -2105,15 +2103,12 @@ static void test_permanence(void) static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { - ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; void *buffer = irp->AssociatedIrp.SystemBuffer; struct main_test_input *test_input = (struct main_test_input *)buffer; NTSTATUS status; if (!buffer) return STATUS_ACCESS_VIOLATION; - if (length < sizeof(failures)) - return STATUS_BUFFER_TOO_SMALL; if ((status = winetest_init())) return status; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index cdf706b9830..397dd528e84 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -43,6 +43,7 @@ struct test_data int running_under_wine; int winetest_report_success; int winetest_debug; + int successes, failures, skipped, todo_successes, todo_failures; }; struct main_test_input diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index 55b5688ff53..ec8161d2424 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -465,14 +465,11 @@ static void test_wsk_connect_socket(void) static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { - ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; void *buffer = irp->AssociatedIrp.SystemBuffer; NTSTATUS status; if (!buffer) return STATUS_ACCESS_VIOLATION; - if (length < sizeof(failures)) - return STATUS_BUFFER_TOO_SMALL; if ((status = winetest_init())) return status; @@ -484,8 +481,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st winetest_cleanup(); - *((LONG *)buffer) = failures; - irp->IoStatus.Information = sizeof(failures); + irp->IoStatus.Information = 0; return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 92cbfa6a329..d0320fbb2b4 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -47,6 +47,8 @@ static const GUID GUID_NULL; static HANDLE device; +static struct test_data *test_data; + static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(const WCHAR *, UNICODE_STRING *, WCHAR **, CURDIR *); static BOOL (WINAPI *pRtlFreeUnicodeString)(UNICODE_STRING *); static BOOL (WINAPI *pCancelIoEx)(HANDLE, OVERLAPPED *); @@ -369,10 +371,9 @@ static ULONG64 modified_value; static void main_test(void) { struct main_test_input *test_input; - DWORD written, read; - LONG new_failures; char buffer[512]; HANDLE okfile; + DWORD size; BOOL res; /* Create a temporary file that the driver will write ok/trace output to. */ @@ -387,17 +388,16 @@ static void main_test(void) test_input->modified_value = &modified_value; modified_value = 0; - res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, test_input, sizeof(*test_input), - &new_failures, sizeof(new_failures), &written, NULL); + res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, test_input, sizeof(*test_input), NULL, 0, &size, NULL); ok(res, "DeviceIoControl failed: %u\n", GetLastError()); - ok(written == sizeof(new_failures), "got size %x\n", written); + ok(!size, "got size %u\n", size); - /* Print the ok/trace output and then add to our failure count. */ do { - ReadFile(okfile, buffer, sizeof(buffer), &read, NULL); - printf("%.*s", read, buffer); - } while (read == sizeof(buffer)); - winetest_add_failures(new_failures); + ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); + printf("%.*s", size, buffer); + } while (size == sizeof(buffer)); + + winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); heap_free(test_input); CloseHandle(okfile); @@ -1193,7 +1193,6 @@ START_TEST(ntoskrnl) WCHAR filename[MAX_PATH], filename2[MAX_PATH]; struct testsign_context ctx; SC_HANDLE service, service2; - struct test_data *data; BOOL ret, is_wow64; HANDLE mapping; DWORD written; @@ -1216,12 +1215,12 @@ START_TEST(ntoskrnl) return; mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, - 0, sizeof(*data), "Global\\winetest_ntoskrnl_section"); + 0, sizeof(*test_data), "Global\\winetest_ntoskrnl_section"); ok(!!mapping, "got error %u\n", GetLastError()); - data = MapViewOfFile(mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); - data->running_under_wine = !strcmp(winetest_platform, "wine"); - data->winetest_report_success = winetest_report_success; - data->winetest_debug = winetest_debug; + test_data = MapViewOfFile(mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); + test_data->running_under_wine = !strcmp(winetest_platform, "wine"); + test_data->winetest_report_success = winetest_report_success; + test_data->winetest_debug = winetest_debug; subtest("driver"); if (!(service = load_driver(&ctx, filename, L"driver.dll", L"WineTestDriver"))) @@ -1271,6 +1270,6 @@ START_TEST(ntoskrnl) out: testsign_cleanup(&ctx); - UnmapViewOfFile(data); + UnmapViewOfFile(test_data); CloseHandle(mapping); } diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index f743e88097a..60a5e4d1255 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -88,6 +88,13 @@ static inline NTSTATUS winetest_init(void) static inline void winetest_cleanup(void) { + struct test_data *data; + SIZE_T size = sizeof(*data); + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + void *addr = NULL; + HANDLE section; + if (winetest_debug) { kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", @@ -95,6 +102,29 @@ static inline void winetest_cleanup(void) todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", skipped ); } + + RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_ntoskrnl_section"); + /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); + + if (!ZwOpenSection(&section, SECTION_MAP_READ | SECTION_MAP_WRITE, &attr)) + { + if (!ZwMapViewOfSection(section, NtCurrentProcess(), &addr, + 0, 0, NULL, &size, ViewUnmap, 0, PAGE_READWRITE)) + { + data = addr; + + InterlockedExchangeAdd(&data->successes, successes); + InterlockedExchangeAdd(&data->failures, failures); + InterlockedExchangeAdd(&data->skipped, skipped); + InterlockedExchangeAdd(&data->todo_successes, todo_successes); + InterlockedExchangeAdd(&data->todo_failures, todo_failures); + + ZwUnmapViewOfSection(NtCurrentProcess(), addr); + } + ZwClose(section); + } + ZwClose(okfile); }

1 0

Zebediah Figura : ntoskrnl/tests: Separate a helper to print the contents of the driver output file.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 57d438b5d33ce605c1c0c17ce33eab6e4bea57cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d438b5d33ce605c1c0c17c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 22:42:23 2021 -0500 ntoskrnl/tests: Separate a helper to print the contents of the driver output file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index d0320fbb2b4..22fddfd3192 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -366,19 +366,37 @@ static BOOL start_driver(HANDLE service, BOOL vista_plus) return TRUE; } +static void cat_okfile(HANDLE okfile) +{ + char buffer[512]; + DWORD size; + + SetFilePointer(okfile, 0, NULL, FILE_BEGIN); + + do + { + ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); + printf("%.*s", size, buffer); + } while (size == sizeof(buffer)); + + SetFilePointer(okfile, 0, NULL, FILE_BEGIN); + SetEndOfFile(okfile); + + winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); +} + static ULONG64 modified_value; static void main_test(void) { struct main_test_input *test_input; - char buffer[512]; HANDLE okfile; DWORD size; BOOL res; /* Create a temporary file that the driver will write ok/trace output to. */ - okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ, + okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); @@ -392,12 +410,7 @@ static void main_test(void) ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(!size, "got size %u\n", size); - do { - ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); - printf("%.*s", size, buffer); - } while (size == sizeof(buffer)); - - winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); + cat_okfile(okfile); heap_free(test_input); CloseHandle(okfile);

1 0

Zebediah Figura : ntoskrnl/tests: Create the driver output file only once.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: cfa7006f799e1d746710ba6af3ef0520e77397a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfa7006f799e1d746710ba6a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 22:42:24 2021 -0500 ntoskrnl/tests: Create the driver output file only once. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 22fddfd3192..4f7afed171c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -366,7 +366,9 @@ static BOOL start_driver(HANDLE service, BOOL vista_plus) return TRUE; } -static void cat_okfile(HANDLE okfile) +static HANDLE okfile; + +static void cat_okfile(void) { char buffer[512]; DWORD size; @@ -390,16 +392,9 @@ static ULONG64 modified_value; static void main_test(void) { struct main_test_input *test_input; - HANDLE okfile; DWORD size; BOOL res; - /* Create a temporary file that the driver will write ok/trace output to. */ - - okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); - ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); - test_input = heap_alloc( sizeof(*test_input) ); test_input->process_id = GetCurrentProcessId(); test_input->teststr_offset = (SIZE_T)((BYTE *)&teststr - (BYTE *)NtCurrentTeb()->Peb->ImageBaseAddress); @@ -410,11 +405,9 @@ static void main_test(void) ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(!size, "got size %u\n", size); - cat_okfile(okfile); + cat_okfile(); heap_free(test_input); - CloseHandle(okfile); - DeleteFileA("C:\\windows\\winetest_ntoskrnl_okfile"); } static void test_basic_ioctl(void) @@ -1235,6 +1228,10 @@ START_TEST(ntoskrnl) test_data->winetest_report_success = winetest_report_success; test_data->winetest_debug = winetest_debug; + okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); + subtest("driver"); if (!(service = load_driver(&ctx, filename, L"driver.dll", L"WineTestDriver"))) goto out; @@ -1285,4 +1282,6 @@ out: testsign_cleanup(&ctx); UnmapViewOfFile(test_data); CloseHandle(mapping); + CloseHandle(okfile); + DeleteFileA("C:\\windows\\winetest_ntoskrnl_okfile"); }

1 0

Zebediah Figura : ntoskrnl/tests: Keep the test output file open for the entire duration each driver is loaded.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: e3ca290a4c0302da35c70e655ee7d38a33f7c871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3ca290a4c0302da35c70e65… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 6 22:42:25 2021 -0500 ntoskrnl/tests: Keep the test output file open for the entire duration each driver is loaded. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 53 +++++++++++++--------------------- dlls/ntoskrnl.exe/tests/driver_netio.c | 24 +++++++-------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 ++-- 3 files changed, 35 insertions(+), 48 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 6d46314216b..0d991cd98d6 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1781,8 +1781,6 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) test_stack_limits(); test_completion(); - winetest_cleanup(); - irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); @@ -2104,15 +2102,11 @@ static void test_permanence(void) static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { void *buffer = irp->AssociatedIrp.SystemBuffer; - struct main_test_input *test_input = (struct main_test_input *)buffer; - NTSTATUS status; + struct main_test_input *test_input = buffer; if (!buffer) return STATUS_ACCESS_VIOLATION; - if ((status = winetest_init())) - return status; - pExEventObjectType = get_proc_address("ExEventObjectType"); ok(!!pExEventObjectType, "ExEventObjectType not found\n"); @@ -2520,6 +2514,8 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) IoDeleteDevice(upper_device); IoDeleteDevice(lower_device); + + winetest_cleanup(); } NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) @@ -2528,6 +2524,9 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) NTSTATUS status; void *obj; + if ((status = winetest_init())) + return status; + DbgPrint("loading driver\n"); driver_obj = driver; @@ -2547,38 +2546,26 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) pIoDriverObjectType = MmGetSystemRoutineAddress(&nameW); RtlInitUnicodeString(&nameW, L"\\Driver\\WineTestDriver"); - if ((status = ObReferenceObjectByName(&nameW, 0, NULL, 0, *pIoDriverObjectType, KernelMode, NULL, &obj))) - return status; - if (obj != driver) - { - ObDereferenceObject(obj); - return STATUS_UNSUCCESSFUL; - } + status = ObReferenceObjectByName(&nameW, 0, NULL, 0, *pIoDriverObjectType, KernelMode, NULL, &obj); + ok(!status, "got %#x\n", status); + ok(obj == driver, "expected %p, got %p\n", driver, obj); ObDereferenceObject(obj); RtlInitUnicodeString(&nameW, L"\\Device\\WineTestDriver"); RtlInitUnicodeString(&linkW, L"\\DosDevices\\WineTestDriver"); - if (!(status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, - FILE_DEVICE_SECURE_OPEN, FALSE, &lower_device))) - { - status = IoCreateSymbolicLink(&linkW, &nameW); - lower_device->Flags &= ~DO_DEVICE_INITIALIZING; - } - - if (!status) - { - RtlInitUnicodeString(&nameW, L"\\Device\\WineTestUpper"); + status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &lower_device); + ok(!status, "failed to create device, status %#x\n", status); + status = IoCreateSymbolicLink(&linkW, &nameW); + ok(!status, "failed to create link, status %#x\n", status); + lower_device->Flags &= ~DO_DEVICE_INITIALIZING; - status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, - FILE_DEVICE_SECURE_OPEN, FALSE, &upper_device); - } + RtlInitUnicodeString(&nameW, L"\\Device\\WineTestUpper"); + status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &upper_device); + ok(!status, "failed to create device, status %#x\n", status); - if (!status) - { - IoAttachDeviceToDeviceStack(upper_device, lower_device); - upper_device->Flags &= ~DO_DEVICE_INITIALIZING; - } + IoAttachDeviceToDeviceStack(upper_device, lower_device); + upper_device->Flags &= ~DO_DEVICE_INITIALIZING; - return status; + return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index ec8161d2424..ea9cfd1a4c5 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -466,21 +466,15 @@ static void test_wsk_connect_socket(void) static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { void *buffer = irp->AssociatedIrp.SystemBuffer; - NTSTATUS status; if (!buffer) return STATUS_ACCESS_VIOLATION; - if ((status = winetest_init())) - return status; - netio_init(); test_wsk_get_address_info(); test_wsk_listen_socket(); test_wsk_connect_socket(); - winetest_cleanup(); - irp->IoStatus.Information = 0; return STATUS_SUCCESS; } @@ -533,6 +527,8 @@ static VOID WINAPI driver_unload(DRIVER_OBJECT *driver) IoDeleteSymbolicLink(&linkW); IoDeleteDevice(device_obj); + + winetest_cleanup(); } NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) @@ -540,6 +536,9 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) UNICODE_STRING nameW, linkW; NTSTATUS status; + if ((status = winetest_init())) + return status; + DbgPrint("Loading driver.\n"); driver_obj = driver; @@ -552,12 +551,11 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) RtlInitUnicodeString(&nameW, device_name); RtlInitUnicodeString(&linkW, driver_link); - if (!(status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, - FILE_DEVICE_SECURE_OPEN, FALSE, &device_obj))) - { - status = IoCreateSymbolicLink(&linkW, &nameW); - device_obj->Flags &= ~DO_DEVICE_INITIALIZING; - } + status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &device_obj); + ok(!status, "failed to create device, status %#x\n", status); + status = IoCreateSymbolicLink(&linkW, &nameW); + ok(!status, "failed to create link, status %#x\n", status); + device_obj->Flags &= ~DO_DEVICE_INITIALIZING; - return status; + return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 4f7afed171c..4981709034c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -405,8 +405,6 @@ static void main_test(void) ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(!size, "got size %u\n", size); - cat_okfile(); - heap_free(test_input); } @@ -931,6 +929,8 @@ static void test_driver_netio(struct testsign_context *ctx) unload_driver(service); ret = DeleteFileW(filename); ok(ret, "DeleteFile failed: %u\n", GetLastError()); + + cat_okfile(); } static void add_file_to_catalog(HANDLE catalog, const WCHAR *file) @@ -1272,6 +1272,8 @@ START_TEST(ntoskrnl) ret = DeleteFileW(filename2); ok(ret, "DeleteFile failed: %u\n", GetLastError()); + cat_okfile(); + test_driver3(&ctx); subtest("driver_netio"); test_driver_netio(&ctx);

1 0

Nikolay Sivov : mfplay: Implement GetVideoWindow().
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 0f18e5f81d44ca9daea91cd0f199dc8b7e751f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f18e5f81d44ca9daea91cd0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 7 11:06:59 2021 +0300 mfplay: Implement GetVideoWindow(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 18 ++++++++++++------ dlls/mfplay/tests/mfplay.c | 8 +++++++- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 246704c2799..479aca40890 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -69,6 +69,7 @@ struct media_player IMFSourceResolver *resolver; MFP_CREATION_OPTIONS options; HWND event_window; + HWND output_window; }; struct generic_event @@ -862,11 +863,15 @@ static HRESULT WINAPI media_player_GetAspectRatioMode(IMFPMediaPlayer *iface, return E_NOTIMPL; } -static HRESULT WINAPI media_player_GetVideoWindow(IMFPMediaPlayer *iface, HWND *hwnd) +static HRESULT WINAPI media_player_GetVideoWindow(IMFPMediaPlayer *iface, HWND *window) { - FIXME("%p, %p.\n", iface, hwnd); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, window); + + *window = player->output_window; + + return S_OK; } static HRESULT WINAPI media_player_UpdateVideo(IMFPMediaPlayer *iface) @@ -1166,12 +1171,12 @@ static const IMFAsyncCallbackVtbl media_player_events_callback_vtbl = }; HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, - IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player) + IMFPMediaPlayerCallback *callback, HWND window, IMFPMediaPlayer **player) { struct media_player *object; HRESULT hr; - TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, hwnd, player); + TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, window, player); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -1184,9 +1189,10 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C object->events_callback.lpVtbl = &media_player_events_callback_vtbl; object->refcount = 1; object->callback = callback; - object->options = options; if (object->callback) IMFPMediaPlayerCallback_AddRef(object->callback); + object->options = options; + object->output_window = window; if (FAILED(hr = CreatePropertyStore(&object->propstore))) goto failed; if (FAILED(hr = MFCreateSourceResolver(&object->resolver))) diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 64347265c40..6d82f630075 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -83,6 +83,7 @@ static void test_create_player(void) IPropertyStore *propstore; IMFPMediaPlayer *player; IUnknown *unk, *unk2; + HWND window; HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); @@ -108,8 +109,13 @@ static void test_create_player(void) IMFPMediaPlayer_Release(player); - hr = MFPCreateMediaPlayer(NULL, FALSE, 0, &callback, NULL, &player); + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, &callback, (HWND)0x1, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetVideoWindow(player, &window); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(window == (HWND)0x1, "Unexpected window.\n"); + IMFPMediaPlayer_Release(player); }

1 0