February 2021 - Wine-Commits

Rémi Bernon : ntdll: Don't force submit wait in TpSetWait if timeout is 0.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: 3ed3e031ffbbc3f80095e4d809ba1c55bd8e59f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ed3e031ffbbc3f80095e4d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 11 10:53:47 2021 +0100 ntdll: Don't force submit wait in TpSetWait if timeout is 0. It'll be submitted eventually, no need to force it and it makes support for WT_EXECUTEINWAITTHREAD flag harder. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47843 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index db645118059..bef9a11905e 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -2941,7 +2941,6 @@ VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout ) { struct threadpool_object *this = impl_from_TP_WAIT( wait ); ULONGLONG timestamp = TIMEOUT_INFINITE; - BOOL submit_wait = FALSE; TRACE( "%p %p %p\n", wait, handle, timeout ); @@ -2965,11 +2964,6 @@ VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout ) NtQuerySystemTime( &now ); timestamp = now.QuadPart - timestamp; } - else if (!timestamp) - { - submit_wait = TRUE; - handle = NULL; - } } /* Add wait object back into one of the queues. */ @@ -2990,9 +2984,6 @@ VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout ) } RtlLeaveCriticalSection( &waitqueue.cs ); - - if (submit_wait) - tp_object_submit( this, FALSE ); } /***********************************************************************

1 0

Zebediah Figura : hidclass.sys: Pass a KEVENT to IoBuildDeviceIoControlRequest() in call_minidriver().
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: 0d406f09ee03347b8635c011f430e999c8cee8e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d406f09ee03347b8635c011… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 10 21:42:39 2021 -0600 hidclass.sys: Pass a KEVENT to IoBuildDeviceIoControlRequest() in call_minidriver(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/main.c | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index 1c7a3ca82af..e169c429efb 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -92,34 +92,19 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) return STATUS_SUCCESS; } -static NTSTATUS WINAPI internalComplete(DEVICE_OBJECT *deviceObject, IRP *irp, - void *context) -{ - HANDLE event = context; - SetEvent(event); - return STATUS_MORE_PROCESSING_REQUIRED; -} - NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) { IRP *irp; - IO_STATUS_BLOCK irp_status; - NTSTATUS status; - HANDLE event = CreateEventA(NULL, FALSE, FALSE, NULL); + IO_STATUS_BLOCK io; + KEVENT event; - irp = IoBuildDeviceIoControlRequest(code, device, in_buff, in_size, - out_buff, out_size, TRUE, NULL, &irp_status); + KeInitializeEvent(&event, NotificationEvent, FALSE); - IoSetCompletionRoutine(irp, internalComplete, event, TRUE, TRUE, TRUE); - status = IoCallDriver(device, irp); - - if (status == STATUS_PENDING) - WaitForSingleObject(event, INFINITE); - - status = irp->IoStatus.u.Status; + irp = IoBuildDeviceIoControlRequest(code, device, in_buff, in_size, + out_buff, out_size, TRUE, &event, &io); - IoCompleteRequest(irp, IO_NO_INCREMENT ); - CloseHandle(event); + if (IoCallDriver(device, irp) == STATUS_PENDING) + KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); - return status; + return io.u.Status; }

1 0

Henri Verbeet : wined3d: Add some TRACEs to command stream callbacks.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: 7ba0cc908506b821abef10ea2748e55d9de10787 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ba0cc908506b821abef10ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 11 11:52:16 2021 +0100 wined3d: Add some TRACEs to command stream callbacks. I.e., those used with wined3d_cs_init_object() and wined3d_cs_destroy_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 6 ++++++ dlls/wined3d/adapter_vk.c | 6 ++++++ dlls/wined3d/buffer.c | 2 ++ dlls/wined3d/device.c | 4 ++++ dlls/wined3d/palette.c | 2 ++ dlls/wined3d/query.c | 2 ++ dlls/wined3d/resource.c | 2 ++ dlls/wined3d/sampler.c | 4 ++++ dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/state.c | 6 ++++++ dlls/wined3d/swapchain.c | 2 ++ dlls/wined3d/texture.c | 2 ++ dlls/wined3d/vertexdeclaration.c | 2 ++ dlls/wined3d/view.c | 12 ++++++++++++ 14 files changed, 56 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ba0cc908506b821abef…

1 0

Henri Verbeet : wined3d: Create the backbuffer rendertarget view only after calling adapter_init_3d().
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: b9a440d15d84e7967f70b38291d2f85767fb7a6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a440d15d84e7967f70b382… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 11 11:52:15 2021 +0100 wined3d: Create the backbuffer rendertarget view only after calling adapter_init_3d(). Otherwise we may not be able to acquire a context to create the view. In practice, this is only an issue for d3d9 and earlier in combination with the Vulkan backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a400221ee30..f61708219ac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1088,6 +1088,24 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str if (device->d3d_initialized) return WINED3DERR_INVALIDCALL; + device->swapchain_count = 1; + if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) + { + ERR("Failed to allocate swapchain array.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + device->swapchains[0] = swapchain; + + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) + if (device->state.fb.render_targets[i]) + wined3d_rtv_bind_count_dec(device->state.fb.render_targets[i]); + + memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); + if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) + goto err_out; + device->d3d_initialized = TRUE; + swapchain_desc = &swapchain->state.desc; if (swapchain_desc->backbuffer_count && swapchain_desc->backbuffer_bind_flags & WINED3D_BIND_RENDER_TARGET) { @@ -1104,28 +1122,12 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str NULL, &wined3d_null_parent_ops, &device->back_buffer_view))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); - return hr; + device->adapter->adapter_ops->adapter_uninit_3d(device); + device->d3d_initialized = FALSE; + goto err_out; } } - device->swapchain_count = 1; - if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) - { - ERR("Failed to allocate swapchain array.\n"); - hr = E_OUTOFMEMORY; - goto err_out; - } - device->swapchains[0] = swapchain; - - for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) - if (device->state.fb.render_targets[i]) - wined3d_rtv_bind_count_dec(device->state.fb.render_targets[i]); - - memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); - if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) - goto err_out; - device->d3d_initialized = TRUE; - device_init_swapchain_state(device, swapchain); TRACE("All defaults now set up.\n"); @@ -1147,11 +1149,6 @@ err_out: heap_free(device->swapchains); device->swapchains = NULL; device->swapchain_count = 0; - if (device->back_buffer_view) - { - wined3d_rendertarget_view_decref(device->back_buffer_view); - device->back_buffer_view = NULL; - } return hr; }

1 0

Alexandre Julliard : server: Use TEB->ArbitraryUserPointer to store the loaded dll names.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: 4f2ed66a5ff55a98b3f9ed05c4f15b64dd96d558 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f2ed66a5ff55a98b3f9ed05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 11:37:00 2021 +0100 server: Use TEB->ArbitraryUserPointer to store the loaded dll names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 5 +++++ server/debugger.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 40efd46d3c7..378b812868c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2641,6 +2641,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC HANDLE mapping = 0; SECTION_IMAGE_INFORMATION image_info; NTSTATUS nts; + void *prev; TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); @@ -2662,6 +2663,9 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, &nt_name ); + prev = NtCurrentTeb()->Tib.ArbitraryUserPointer; + NtCurrentTeb()->Tib.ArbitraryUserPointer = nt_name.Buffer + 4; + switch (nts) { case STATUS_INVALID_IMAGE_NOT_MZ: /* not in PE format, maybe it's a .so file */ @@ -2748,6 +2752,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC } break; } + NtCurrentTeb()->Tib.ArbitraryUserPointer = prev; done: if (nts == STATUS_SUCCESS) diff --git a/server/debugger.c b/server/debugger.c index 2e3de0d41ab..9f389075b92 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -131,6 +131,13 @@ static const struct object_ops debug_obj_ops = debug_obj_destroy /* destroy */ }; +/* get a pointer to TEB->ArbitraryUserPointer in the client address space */ +static client_ptr_t get_teb_user_ptr( struct thread *thread ) +{ + unsigned int ptr_size = (CPU_FLAG( thread->process->cpu ) & CPU_64BIT_MASK) ? 8 : 4; + return thread->teb + 5 * ptr_size; +} + /* routines to build an event according to its type */ @@ -181,7 +188,7 @@ static void fill_load_dll_event( struct debug_event *event, const void *arg ) event->data.load_dll.dbg_offset = image_info->dbg_offset; event->data.load_dll.dbg_size = image_info->dbg_size; - event->data.load_dll.name = dll->name; + event->data.load_dll.name = get_teb_user_ptr( event->sender ); event->file = get_view_file( view, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE ); }

1 0

Nikolay Sivov : explorerframe: Handle NSTCS_SINGLECLICKEXPAND style.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: 6832c6e1f91b599d54dc1b29be3da4cb10c7724c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6832c6e1f91b599d54dc1b29… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 11:34:10 2021 +0300 explorerframe: Handle NSTCS_SINGLECLICKEXPAND style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index b1ecace5fae..0698e6fa065 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -68,7 +68,7 @@ typedef struct { } NSTC2Impl; static const DWORD unsupported_styles = - NSTCS_SINGLECLICKEXPAND | NSTCS_NOREPLACEOPEN | NSTCS_NOORDERSTREAM | NSTCS_FAVORITESMODE | + NSTCS_NOREPLACEOPEN | NSTCS_NOORDERSTREAM | NSTCS_FAVORITESMODE | NSTCS_EMPTYTEXT | NSTCS_ALLOWJUNCTIONS | NSTCS_SHOWTABSBUTTON | NSTCS_SHOWDELETEBUTTON | NSTCS_SHOWREFRESHBUTTON | NSTCS_SPRINGEXPAND | NSTCS_RICHTOOLTIP | NSTCS_NOINDENTCHECKS; static const DWORD unsupported_styles2 = @@ -213,6 +213,7 @@ static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs, if(nstcs_mask & NSTCS_DISABLEDRAGDROP) tv_mask |= TVS_DISABLEDRAGDROP; if(nstcs_mask & NSTCS_NOEDITLABELS) tv_mask |= TVS_EDITLABELS; if(nstcs_mask & NSTCS_CHECKBOXES) tv_mask |= TVS_CHECKBOXES; + if(nstcs_mask & NSTCS_SINGLECLICKEXPAND) tv_mask |= TVS_SINGLEEXPAND; *new_style = 0; @@ -227,6 +228,7 @@ static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs, if(nstcs & NSTCS_DISABLEDRAGDROP) *new_style |= TVS_DISABLEDRAGDROP; if(!(nstcs & NSTCS_NOEDITLABELS)) *new_style |= TVS_EDITLABELS; if(nstcs & NSTCS_CHECKBOXES) *new_style |= TVS_CHECKBOXES; + if(nstcs & NSTCS_SINGLECLICKEXPAND) *new_style |= TVS_SINGLEEXPAND; *new_style = (old_style & ~tv_mask) | (*new_style & tv_mask);

1 0

Nikolay Sivov : dwrite: Fix setting canBreakShapingAfter when applying ligatures.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: b91548d05955cf8e29e95b0397087bb6ed33c5b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b91548d05955cf8e29e95b03… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 11:10:18 2021 +0300 dwrite: Fix setting canBreakShapingAfter when applying ligatures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7dc4a1f7b55..8885306a84d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5126,10 +5126,28 @@ static BOOL opentype_layout_context_match_input(const struct match_context *mc, return TRUE; } -static void opentype_layout_unsafe_to_break(struct scriptshaping_context *context, unsigned int idx) +/* Marks text segment as unsafe to break between [start, end) glyphs. */ +static void opentype_layout_unsafe_to_break(struct scriptshaping_context *context, unsigned int start, + unsigned int end) { - if (context->u.buffer.glyph_props[idx].isClusterStart) - context->u.buffer.text_props[context->glyph_infos[idx].start_text_idx].canBreakShapingAfter = 0; + unsigned int i; + + while (start && !context->u.buffer.glyph_props[start].isClusterStart) + --start; + + while (--end && !context->u.buffer.glyph_props[end].isClusterStart) + ; + + if (start == end) + { + context->u.buffer.text_props[context->glyph_infos[start].start_text_idx].canBreakShapingAfter = 0; + return; + } + + for (i = context->glyph_infos[start].start_text_idx; i < context->glyph_infos[end].start_text_idx; ++i) + { + context->u.buffer.text_props[i].canBreakShapingAfter = 0; + } } static void opentype_layout_delete_glyph(struct scriptshaping_context *context, unsigned int idx) @@ -5194,10 +5212,8 @@ static BOOL opentype_layout_apply_ligature(struct scriptshaping_context *context { context->u.buffer.glyph_props[j++].lig_component = comp_count - i; } - opentype_layout_unsafe_to_break(context, i); - context->u.buffer.glyph_props[i].isClusterStart = 0; - context->glyph_infos[i].start_text_idx = 0; } + opentype_layout_unsafe_to_break(context, match_positions[0], match_positions[comp_count - 1] + 1); /* Delete ligated glyphs, backwards to preserve index. */ for (i = 1; i < comp_count; ++i)

1 0

Alexandre Julliard : kernelbase: Also export the non-K32 names for the psapi functions.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: a66c383709e3c956c579a848d441043d8c5b267c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a66c383709e3c956c579a848… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 10:16:04 2021 +0100 kernelbase: Also export the non-K32 names for the psapi functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 104 ++++++++++++++++++++++++-------------- dlls/kernelbase/kernelbase.spec | 108 ++++++++++++++++++++-------------------- 2 files changed, 120 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a66c383709e3c956c579…

1 0

Alexandre Julliard : server: Report load dll events upon mapping a SEC_IMAGE view.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: ea33192660e867e8389666c0f8255f88c979c1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea33192660e867e8389666c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 11:49:06 2021 +0100 server: Report load dll events upon mapping a SEC_IMAGE view. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 48 ++++++++++++++++++++++++++++++++- server/debugger.c | 41 +++-------------------------- server/mapping.c | 60 +++++++++++++++++++++++++++++++++++------- server/process.c | 4 --- 4 files changed, 100 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea33192660e867e83896…

1 0

Zebediah Figura : ntoskrnl/tests: Test the contents of the user IO_STATUS_BLOCK.
by Alexandre Julliard Feb. 11, 2021

Feb. 11, 2021

Module: wine Branch: master Commit: eb5d94953a0717629cbca8211b561fda1e30e0b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb5d94953a0717629cbca821… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 10 21:42:35 2021 -0600 ntoskrnl/tests: Test the contents of the user IO_STATUS_BLOCK. 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 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 5617342d803..eb4620ad25d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -846,6 +846,8 @@ static void test_call_driver(DEVICE_OBJECT *device) KEVENT event; NTSTATUS status; + iosb.Status = 0xdeadbeef; + iosb.Information = 0xdeadbeef; irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); @@ -854,6 +856,10 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); + ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); + ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); + ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); @@ -863,10 +869,16 @@ static void test_call_driver(DEVICE_OBJECT *device) status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); + ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); + ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); + ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); irp->IoStatus.Status = STATUS_SUCCESS; - irp->IoStatus.Information = 0; + irp->IoStatus.Information = 123; IoCompleteRequest(irp, IO_NO_INCREMENT); + todo_wine ok(iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status); + todo_wine ok(iosb.Information == 123, "got information %#x\n", iosb.Information); KeInitializeEvent(&event, NotificationEvent, FALSE);

1 0