May 2019 - Wine-Commits - list.winehq.org

Paul Gofman : wined3d: Apply stencil mask to stencil reference value.
by Alexandre Julliard May 9, 2019

May 9, 2019

Module: wine Branch: master Commit: a9e199e5ad76c0540381f25011d6051ace3e7c0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9e199e5ad76c0540381f250… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 8 20:28:32 2019 +0300 wined3d: Apply stencil mask to stencil reference value. This is consistent with the docs and confirmed by the test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28196 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 59 +++++++++++++++++++++++++----------------------- dlls/wined3d/state.c | 2 +- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8be58bf..89571a1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11052,70 +11052,73 @@ static void stencil_cull_test(void) /* First pass: Fill the stencil buffer with some values... */ hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TWOSIDEDSTENCILMODE, TRUE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad2, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad2, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad3, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad3, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CCW); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad4, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad4, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILPASS, D3DSTENCILOP_KEEP); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFAIL, D3DSTENCILOP_KEEP); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TWOSIDEDSTENCILMODE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFUNC, D3DCMP_EQUAL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILMASK, 0x000000ff); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* 2nd pass: Make the stencil values visible */ hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < 16; ++i) { - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, i); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, 0x0000ff00 | i); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); painter[0].diffuse = (i * 16); /* Creates shades of blue */ @@ -11123,13 +11126,13 @@ static void stencil_cull_test(void) painter[2].diffuse = (i * 16); painter[3].diffuse = (i * 16); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, painter, sizeof(painter[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColor(device, 160, 420); ok(color == 0x00000030, "CCW triangle, twoside FALSE, cull cw, replace, has color 0x%08x, expected 0x00000030\n", color); @@ -11152,7 +11155,7 @@ static void stencil_cull_test(void) ok(color == 0x00000080, "CW triangle, twoside TRUE, cull cw, culled, has color 0x%08x, expected 0x00000080\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); cleanup: refcount = IDirect3DDevice9_Release(device); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0f35f2a..0c3e845 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -921,8 +921,8 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ func = GL_ALWAYS; if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC]))) func_back = GL_ALWAYS; - ref = state->render_states[WINED3D_RS_STENCILREF]; mask = state->render_states[WINED3D_RS_STENCILMASK]; + ref = state->render_states[WINED3D_RS_STENCILREF] & mask; stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]);

1 0

Francois Gouget : kernel32/tests: Use ok_() so the TestBot can correctly detect the line.
by Alexandre Julliard May 9, 2019

May 9, 2019

Module: wine Branch: master Commit: 6a20bb2daff0547438fe5f55e3182d142a4dce84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a20bb2daff0547438fe5f55… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 9 11:05:57 2019 +0200 kernel32/tests: Use ok_() so the TestBot can correctly detect the line. Otherwise the messages appear to change every time the line count changes, which making old errors new again. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index b8dc72b..bc6f4ab 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -627,13 +627,13 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG { if (!has_code && is_win64) { - ok( mod != NULL || want_32bit || broken(il_only), /* <= win7 */ - "%u: loading failed err %u\n", line, GetLastError() ); + ok_(__FILE__,line)( mod != NULL || want_32bit || broken(il_only), /* <= win7 */ + "loading failed err %u\n", GetLastError() ); } else { - ok( !mod, "%u: loading succeeded\n", line ); - ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "%u: wrong error %u\n", line, GetLastError() ); + ok_(__FILE__, line)( !mod, "loading succeeded\n" ); + ok_(__FILE__, line)( GetLastError() == ERROR_BAD_EXE_FORMAT, "wrong error %u\n", GetLastError() ); } } else

1 0

Alistair Leslie-Hughes : dinput: Trace This pointer in a consistent way.
by Alexandre Julliard May 9, 2019

May 9, 2019

Module: wine Branch: master Commit: 52deca4900b361e0ef4336a808bfae81af74b885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52deca4900b361e0ef4336a8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 8 05:27:06 2019 +0000 dinput: Trace This pointer in a consistent way. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 75 +++++++++++++++++++++++---------------- dlls/dinput/dinput_main.c | 4 +-- dlls/dinput/joystick.c | 10 +++--- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 4 +-- dlls/dinput/keyboard.c | 8 +++-- dlls/dinput/mouse.c | 3 +- 8 files changed, 63 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=52deca4900b361e0ef43…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_bind_and_dirtify ().
by Alexandre Julliard May 9, 2019

May 9, 2019

Module: wine Branch: master Commit: 77bc74c6379fc121802fdf790b130da5a490ba50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77bc74c6379fc121802fdf79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 19:29:13 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_bind_and_dirtify(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/surface.c | 8 +++---- dlls/wined3d/texture.c | 51 ++++++++++++++++++++++-------------------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 35 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77bc74c6379fc121802f…

1 0

Francois Gouget : user32: Make WIN_SetOwner() static.
by Alexandre Julliard May 9, 2019

May 9, 2019

Module: wine Branch: master Commit: 1631f6902261c0a0e9c4884ff3de6a7bdc0453a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1631f6902261c0a0e9c4884f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 9 11:02:31 2019 +0200 user32: Make WIN_SetOwner() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 2 +- dlls/user32/win.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0bb9fd9..a29e3a1 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -742,7 +742,7 @@ HWND WIN_GetFullHandle( HWND hwnd ) * * Change the owner of a window. */ -HWND WIN_SetOwner( HWND hwnd, HWND owner ) +static HWND WIN_SetOwner( HWND hwnd, HWND owner ) { WND *win = WIN_GetPtr( hwnd ); HWND ret = 0; diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 81b08fc..1f51fd6 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -91,7 +91,6 @@ extern HWND WIN_GetFullHandle( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentThread( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) DECLSPEC_HIDDEN; -extern HWND WIN_SetOwner( HWND hwnd, HWND owner ) DECLSPEC_HIDDEN; extern ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN; extern BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWindow, RECT *rectClient ) DECLSPEC_HIDDEN; extern void map_window_region( HWND from, HWND to, HRGN hrgn ) DECLSPEC_HIDDEN;

1 0

Francois Gouget : ntoskrnl.exe: Make run_work_item_worker() static.
by Alexandre Julliard May 9, 2019

May 9, 2019

Module: wine Branch: master Commit: 3f0ca3c7a4e01bdb5b92a07ec62dfda7f605165f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f0ca3c7a4e01bdb5b92a07e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 9 10:59:20 2019 +0200 ntoskrnl.exe: Make run_work_item_worker() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 86111b4..0005ed2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1226,7 +1226,7 @@ void WINAPI IoFreeWorkItem( PIO_WORKITEM work_item ) } -void WINAPI run_work_item_worker(TP_CALLBACK_INSTANCE *instance, void *context) +static void WINAPI run_work_item_worker(TP_CALLBACK_INSTANCE *instance, void *context) { PIO_WORKITEM work_item = context; DEVICE_OBJECT *device = work_item->device;

1 0

Conor McCarthy : mspatcha: Partially implement ApplyPatchToFileW and related functions.
by Alexandre Julliard May 9, 2019

May 9, 2019

Module: wine Branch: master Commit: 8695a6986ef2b7cae7c1f3247fec8e8e14de1971 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8695a6986ef2b7cae7c1f324… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Thu May 9 18:52:33 2019 +1000 mspatcha: Partially implement ApplyPatchToFileW and related functions. This can patch non-executables and 64-bit executable files, but patching of 32-bit executables is not supported. They are subject to special processing which alters PE relocations to match with those in the old file to improve compression. To reverse this, the meaning of the decoding data must be interpreted. Details, including where to find that data in the patch file, are included in pa19.c. Interleaved decompression of large files is also not supported. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12501 Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mspatcha/Makefile.in | 4 +- dlls/mspatcha/lzxd_dec.c | 775 ++++++++++++++++++++++++++++++ dlls/mspatcha/lzxd_dec.h | 27 ++ dlls/mspatcha/mspatcha.spec | 28 +- dlls/mspatcha/mspatcha_main.c | 183 +++++-- dlls/mspatcha/pa19.c | 1046 +++++++++++++++++++++++++++++++++++++++++ dlls/mspatcha/pa19.h | 37 ++ 7 files changed, 2045 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8695a6986ef2b7cae7c1…

1 0

Jacek Caban : hidclass.sys: Support canceling read IRPs.
by Alexandre Julliard May 9, 2019

May 9, 2019

Module: wine Branch: master Commit: f7bc64959886e585aced90688036a59a907b9743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7bc64959886e585aced9068… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 23:09:16 2019 +0200 hidclass.sys: Support canceling read IRPs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index fcdb1b8..1fb3bbc 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -134,14 +134,44 @@ static IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); - entry = RemoveHeadList(&ext->irp_queue); - if (entry != &ext->irp_queue) + while (!irp && (entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) + { irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); + if (!IoSetCancelRoutine(irp, NULL)) + { + /* cancel routine is already cleared, meaning that it was called. let it handle completion. */ + InitializeListHead(&irp->Tail.Overlay.s.ListEntry); + irp = NULL; + } + } KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); return irp; } +static void WINAPI read_cancel_routine(DEVICE_OBJECT *device, IRP *irp) +{ + BASE_DEVICE_EXTENSION *ext; + KIRQL old_irql; + + TRACE("cancel %p IRP on device %p\n", irp, device); + + ext = device->DeviceExtension; + + IoReleaseCancelSpinLock(irp->CancelIrql); + + KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); + + RemoveEntryList(&irp->Tail.Overlay.s.ListEntry); + + KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); + + irp->IoStatus.u.Status = STATUS_CANCELLED; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + + void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) { BASE_DEVICE_EXTENSION *ext; @@ -669,10 +699,20 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); + IoSetCancelRoutine(irp, read_cancel_routine); + if (irp->Cancel && !IoSetCancelRoutine(irp, NULL)) + { + /* IRP was canceled before we set cancel routine */ + InitializeListHead(&irp->Tail.Overlay.s.ListEntry); + KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); + return STATUS_CANCELLED; + } + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); - rc = STATUS_PENDING; + IoMarkIrpPending(irp); KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); + rc = STATUS_PENDING; } else {

1 0

Conor McCarthy : mspatcha: Add functions to API header file.
by Alexandre Julliard May 9, 2019

May 9, 2019

Module: wine Branch: master Commit: 2aa494686133bf4c4b6b054a45bf1d1d429acdc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aa494686133bf4c4b6b054a… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Thu May 9 18:52:32 2019 +1000 mspatcha: Add functions to API header file. Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/patchapi.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/include/patchapi.h b/include/patchapi.h index 5adaf0a..1ccdf9d 100644 --- a/include/patchapi.h +++ b/include/patchapi.h @@ -1,5 +1,6 @@ /* * Copyright 2011 Hans Leidekker for CodeWeavers + * Copyright 2019 Conor McCarthy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,11 +24,33 @@ extern "C" { #endif +#define PATCH_OPTION_USE_LZX_A 0x00000001 +#define PATCH_OPTION_USE_LZX_B 0x00000002 +#define PATCH_OPTION_USE_LZX_LARGE 0x00000004 /* raise maximum window from 8 -> 32 Mb */ + +#define PATCH_OPTION_NO_BINDFIX 0x00010000 +#define PATCH_OPTION_NO_LOCKFIX 0x00020000 +#define PATCH_OPTION_NO_REBASE 0x00040000 +#define PATCH_OPTION_FAIL_IF_SAME_FILE 0x00080000 +#define PATCH_OPTION_FAIL_IF_BIGGER 0x00100000 +#define PATCH_OPTION_NO_CHECKSUM 0x00200000 +#define PATCH_OPTION_NO_RESTIMEFIX 0x00400000 +#define PATCH_OPTION_NO_TIMESTAMP 0x00800000 +#define PATCH_OPTION_INTERLEAVE_FILES 0x40000000 +#define PATCH_OPTION_RESERVED1 0x80000000 + #define APPLY_OPTION_FAIL_IF_EXACT 0x00000001 #define APPLY_OPTION_FAIL_IF_CLOSE 0x00000002 #define APPLY_OPTION_TEST_ONLY 0x00000004 #define APPLY_OPTION_VALID_FLAGS 0x00000007 +#define ERROR_PATCH_DECODE_FAILURE 0xC00E4101 +#define ERROR_PATCH_CORRUPT 0xC00E4102 +#define ERROR_PATCH_NEWER_FORMAT 0xC00E4103 +#define ERROR_PATCH_WRONG_FILE 0xC00E4104 +#define ERROR_PATCH_NOT_NECESSARY 0xC00E4105 +#define ERROR_PATCH_NOT_AVAILABLE 0xC00E4106 + typedef struct _PATCH_IGNORE_RANGE { ULONG OffsetInOldFile; @@ -41,16 +64,66 @@ typedef struct _PATCH_RETAIN_RANGE ULONG OffsetInNewFile; } PATCH_RETAIN_RANGE, *PPATCH_RETAIN_RANGE; +typedef struct _PATCH_INTERLEAVE_MAP { + ULONG CountRanges; + struct { + ULONG OldOffset; + ULONG OldLength; + ULONG NewLength; + } Range[1]; +} PATCH_INTERLEAVE_MAP, *PPATCH_INTERLEAVE_MAP; + +typedef BOOL(CALLBACK PATCH_SYMLOAD_CALLBACK)(ULONG, LPCSTR, ULONG, ULONG, ULONG, ULONG, ULONG, PVOID); + +typedef PATCH_SYMLOAD_CALLBACK *PPATCH_SYMLOAD_CALLBACK; + +typedef struct _PATCH_OPTION_DATA { + ULONG SizeOfThisStruct; + ULONG SymbolOptionFlags; + LPCSTR NewFileSymbolPath; + LPCSTR *OldFileSymbolPathArray; + ULONG ExtendedOptionFlags; + PPATCH_SYMLOAD_CALLBACK SymLoadCallback; + PVOID SymLoadContext; + PPATCH_INTERLEAVE_MAP* InterleaveMapArray; + ULONG MaxLzxWindowSize; +} PATCH_OPTION_DATA, *PPATCH_OPTION_DATA; + +typedef BOOL (CALLBACK PATCH_PROGRESS_CALLBACK)(PVOID, ULONG, ULONG); + +typedef PATCH_PROGRESS_CALLBACK *PPATCH_PROGRESS_CALLBACK; + BOOL WINAPI ApplyPatchToFileA(LPCSTR,LPCSTR,LPCSTR,ULONG); BOOL WINAPI ApplyPatchToFileW(LPCWSTR,LPCWSTR,LPCWSTR,ULONG); #define ApplyPatchToFile WINELIB_NAME_AW(ApplyPatchToFile) +BOOL WINAPI ApplyPatchToFileByHandles(HANDLE, HANDLE, HANDLE, ULONG); +BOOL WINAPI ApplyPatchToFileExA(LPCSTR, LPCSTR, LPCSTR, ULONG, PPATCH_PROGRESS_CALLBACK, PVOID); +BOOL WINAPI ApplyPatchToFileExW(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, PPATCH_PROGRESS_CALLBACK, PVOID); +#define ApplyPatchToFileEx WINELIB_NAME_AW(ApplyPatchToFileEx) +BOOL WINAPI ApplyPatchToFileByHandlesEx(HANDLE, HANDLE, HANDLE, ULONG, PPATCH_PROGRESS_CALLBACK, PVOID); +BOOL WINAPI ApplyPatchToFileByBuffers(PBYTE, ULONG, PBYTE, ULONG, PBYTE*, ULONG, ULONG*, FILETIME*, ULONG, + PPATCH_PROGRESS_CALLBACK, PVOID); + +BOOL WINAPI TestApplyPatchToFileA(LPCSTR, LPCSTR, ULONG); +BOOL WINAPI TestApplyPatchToFileW(LPCWSTR, LPCWSTR, ULONG); +#define TestApplyPatchToFile WINELIB_NAME_AW(TestApplyPatchToFile) +BOOL WINAPI TestApplyPatchToFileByHandles(HANDLE, HANDLE, ULONG); +BOOL WINAPI TestApplyPatchToFileByBuffers(PBYTE, ULONG, PBYTE, ULONG, ULONG*, ULONG); + BOOL WINAPI GetFilePatchSignatureA(LPCSTR, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, PPATCH_RETAIN_RANGE, ULONG, LPSTR); BOOL WINAPI GetFilePatchSignatureW(LPCWSTR, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, PPATCH_RETAIN_RANGE, ULONG, LPWSTR); #define GetFilePatchSignature WINELIB_NAME_AW(GetFilePatchSignature) +BOOL WINAPI GetFilePatchSignatureByHandle(HANDLE, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, + ULONG, PPATCH_RETAIN_RANGE, ULONG, LPSTR); +BOOL WINAPI GetFilePatchSignatureByBuffer(PBYTE, ULONG, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, + PPATCH_RETAIN_RANGE, ULONG, LPSTR); +INT WINAPI NormalizeFileForPatchSignature(PVOID, ULONG, ULONG, PATCH_OPTION_DATA*, ULONG, + ULONG, ULONG, PPATCH_IGNORE_RANGE, ULONG, PPATCH_RETAIN_RANGE); + #ifdef __cplusplus } #endif

1 0

Jacek Caban : hidclass.sys: Make read IRP queue thread safe.
by Alexandre Julliard May 9, 2019

May 9, 2019

Module: wine Branch: master Commit: 85082e8bd3c9bcb0b45fc56b55cc7c88c653d028 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85082e8bd3c9bcb0b45fc56b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 23:09:03 2019 +0200 hidclass.sys: Make read IRP queue thread safe. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 2 +- dlls/hidclass.sys/device.c | 34 ++++++++++++++++++++++++---------- dlls/hidclass.sys/hid.h | 1 + dlls/hidclass.sys/pnp.c | 1 + 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index e942217..209c2df 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = hidclass.sys IMPORTLIB = hidclass -IMPORTS = ntoskrnl +IMPORTS = hal ntoskrnl DELAYIMPORTS = setupapi hid C_SRCS = \ diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 81d5c3c..fcdb1b8 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -126,10 +126,25 @@ error: return STATUS_UNSUCCESSFUL; } +static IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) +{ + LIST_ENTRY *entry; + KIRQL old_irql; + IRP *irp = NULL; + + KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); + + entry = RemoveHeadList(&ext->irp_queue); + if (entry != &ext->irp_queue) + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); + + KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); + return irp; +} + void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) { BASE_DEVICE_EXTENSION *ext; - LIST_ENTRY *entry; IRP *irp; ext = device->DeviceExtension; @@ -145,13 +160,10 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device if (ext->ring_buffer) RingBuffer_Destroy(ext->ring_buffer); - entry = RemoveHeadList(&ext->irp_queue); - while(entry != &ext->irp_queue) + while((irp = pop_irp_from_queue(ext))) { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irp->IoStatus.u.Status = STATUS_DEVICE_REMOVED; IoCompleteRequest(irp, IO_NO_INCREMENT); - entry = RemoveHeadList(&ext->irp_queue); } TRACE("Delete device(%p) %s\n", device, debugstr_w(ext->device_name)); @@ -189,7 +201,6 @@ static NTSTATUS copy_packet_into_buffer(HID_XFER_PACKET *packet, BYTE* buffer, U static void HID_Device_processQueue(DEVICE_OBJECT *device) { - LIST_ENTRY *entry; IRP *irp; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; UINT buffer_size = RingBuffer_GetBufferSize(ext->ring_buffer); @@ -197,11 +208,9 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); - entry = RemoveHeadList(&ext->irp_queue); - while(entry != &ext->irp_queue) + while((irp = pop_irp_from_queue(ext))) { int ptr; - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); @@ -222,7 +231,6 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) irp->IoStatus.u.Status = STATUS_UNSUCCESSFUL; } IoCompleteRequest( irp, IO_NO_INCREMENT ); - entry = RemoveHeadList(&ext->irp_queue); } HeapFree(GetProcessHeap(), 0, packet); } @@ -656,9 +664,15 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) BASE_DEVICE_EXTENSION *extension = device->DeviceExtension; if (extension->poll_interval) { + KIRQL old_irql; TRACE_(hid_report)("Queue irp\n"); + + KeAcquireSpinLock(&ext->irp_queue_lock, &old_irql); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); rc = STATUS_PENDING; + + KeReleaseSpinLock(&ext->irp_queue_lock, old_irql); } else { diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 769b715..ff2e7ef 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -54,6 +54,7 @@ typedef struct _BASE_DEVICE_EXTENSION { HANDLE halt_event; HANDLE thread; + KSPIN_LOCK irp_queue_lock; LIST_ENTRY irp_queue; /* Minidriver Specific stuff will end up here */ diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 08aae15..a283d63 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -114,6 +114,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ext = device->DeviceExtension; InitializeListHead(&ext->irp_queue); + KeInitializeSpinLock(&ext->irp_queue_lock); TRACE("Created device %p\n",device); status = minidriver->AddDevice(minidriver->minidriver.DriverObject, device);

1 0