October 2015 - Wine-commits

Matteo Bruni : d3d9/tests: Extend the INTZ test a bit.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: d6e4064596818b539fb3ac65165c462db6f71605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e4064596818b539fb3ac651… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 21 00:24:08 2015 +0200 d3d9/tests: Extend the INTZ test a bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e26293a..732c037 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13937,10 +13937,9 @@ static void intz_test(void) 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 0.0, 0.0, 0.0, 1.0 */ 0x02000001, 0x800f0001, 0xa0e40000, /* mov r1, c0 */ 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texld r0, t0, s0 */ - 0x02000001, 0x80010001, 0x80e40000, /* mov r1.x, r0 */ - 0x03010042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texldp r0, t0, s0 */ - 0x02000001, 0x80020001, 0x80000000, /* mov r1.y, r0.x */ - 0x02000001, 0x800f0800, 0x80e40001, /* mov oC0, r1 */ + 0x03010042, 0x800f0001, 0xb0e40000, 0xa0e40800, /* texldp r1, t0, s0 */ + 0x02000001, 0x80020000, 0x80000001, /* mov r0.y, r1.x */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff, /* end */ }; struct @@ -13976,17 +13975,18 @@ static void intz_test(void) } expected_colors[] = { - { 80, 100, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, - {240, 100, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, - {400, 100, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, - {560, 100, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, - { 80, 450, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)}, - {240, 450, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)}, - {400, 450, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, - {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, + { 80, 100, 0x20204020}, + {240, 100, 0x6060bf60}, + {400, 100, 0x9f9f409f}, + {560, 100, 0xdfdfbfdf}, + { 80, 450, 0x20204020}, + {240, 450, 0x6060bf60}, + {400, 450, 0x9f9f409f}, + {560, 450, 0xdfdfbfdf}, }; IDirect3DSurface9 *original_rt, *rt; + struct surface_readback rb; IDirect3DTexture9 *texture; IDirect3DPixelShader9 *ps; IDirect3DDevice9 *device; @@ -14102,13 +14102,15 @@ static void intz_test(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { - D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } + release_surface_readback(&rb); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); @@ -14154,13 +14156,15 @@ static void intz_test(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { - D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } + release_surface_readback(&rb); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); @@ -14219,13 +14223,15 @@ static void intz_test(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { - D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } + release_surface_readback(&rb); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr);

1 0

Matteo Bruni : d3d9/tests: Extend the shadow test a bit.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 8075101480df82c5f4280d534f2d76f035653667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8075101480df82c5f4280d534… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 21 00:24:09 2015 +0200 d3d9/tests: Extend the shadow test a bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 732c037..f110905 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14257,10 +14257,9 @@ static void shadow_test(void) 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 0.0, 0.0, 0.0, 1.0 */ 0x02000001, 0x800f0001, 0xa0e40000, /* mov r1, c0 */ 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texld r0, t0, s0 */ - 0x02000001, 0x80010001, 0x80e40000, /* mov r1.x, r0 */ - 0x03010042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texldp r0, t0, s0 */ - 0x02000001, 0x80020001, 0x80000000, /* mov r1.y, r0.x */ - 0x02000001, 0x800f0800, 0x80e40001, /* mov 0C0, r1 */ + 0x03010042, 0x800f0001, 0xb0e40000, 0xa0e40800, /* texldp r1, t0, s0 */ + 0x02000001, 0x80020000, 0x80000001, /* mov r0.y, r1.x */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff, /* end */ }; struct @@ -14299,17 +14298,18 @@ static void shadow_test(void) } expected_colors[] = { - {400, 60, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, - {560, 180, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00)}, - {560, 300, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00)}, - {400, 420, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00)}, - {240, 420, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00)}, - { 80, 300, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, - { 80, 180, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, - {240, 60, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, + {400, 60, 0x00000000}, + {560, 180, 0xffff00ff}, + {560, 300, 0xffff00ff}, + {400, 420, 0xffffffff}, + {240, 420, 0xffffffff}, + { 80, 300, 0x00000000}, + { 80, 180, 0x00000000}, + {240, 60, 0x00000000}, }; IDirect3DSurface9 *original_ds, *original_rt, *rt; + struct surface_readback rb; IDirect3DPixelShader9 *ps; IDirect3DDevice9 *device; IDirect3D9 *d3d; @@ -14434,14 +14434,16 @@ static void shadow_test(void) ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); IDirect3DTexture9_Release(texture); + get_rt_readback(original_rt, &rb); for (j = 0; j < sizeof(expected_colors) / sizeof(*expected_colors); ++j) { - D3DCOLOR color = getPixelColor(device, expected_colors[j].x, expected_colors[j].y); + D3DCOLOR color = get_readback_color(&rb, expected_colors[j].x, expected_colors[j].y); ok(color_match(color, expected_colors[j].color, 0), "Expected color 0x%08x at (%u, %u) for format %s, got 0x%08x.\n", expected_colors[j].color, expected_colors[j].x, expected_colors[j].y, formats[i].name, color); } + release_surface_readback(&rb); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr);

1 0

Vincent Povirk : gdiplus/tests: Add a test for CompositingModeSourceCopy.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: f6c104b322133727c37b1878ed9656b5a2a67a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c104b322133727c37b1878e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 20 10:43:12 2015 -0500 gdiplus/tests: Add a test for CompositingModeSourceCopy. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 6fc208e..c14f684 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3999,6 +3999,50 @@ static void test_DrawImage(void) expect(Ok, status); } +static void test_DrawImage_SourceCopy(void) +{ + DWORD dst_pixels[4] = { 0xffffffff, 0xffffffff, + 0xffffffff, 0xffffffff }; + DWORD src_pixels[4] = { 0, 0xffff0000, + 0, 0xff00ff }; + + GpStatus status; + union + { + GpBitmap *bitmap; + GpImage *image; + } u1, u2; + GpGraphics *graphics; + + status = GdipCreateBitmapFromScan0(2, 2, 8, PixelFormat32bppARGB, (BYTE*)dst_pixels, &u1.bitmap); + expect(Ok, status); + + status = GdipCreateBitmapFromScan0(2, 2, 8, PixelFormat32bppARGB, (BYTE*)src_pixels, &u2.bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext(u1.image, &graphics); + expect(Ok, status); + status = GdipSetInterpolationMode(graphics, InterpolationModeNearestNeighbor); + expect(Ok, status); + + status = GdipSetCompositingMode(graphics, CompositingModeSourceCopy); + expect(Ok, status); + + status = GdipDrawImageI(graphics, u2.image, 0, 0); + expect(Ok, status); + + todo_wine expect(0, dst_pixels[0]); + expect(0xffff0000, dst_pixels[1]); + todo_wine expect(0, dst_pixels[2]); + todo_wine expect(0, dst_pixels[3]); + + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + status = GdipDisposeImage(u1.image); + expect(Ok, status); + status = GdipDisposeImage(u2.image); + expect(Ok, status); +} + static void test_GdipDrawImagePointRect(void) { BYTE black_1x1[4] = { 0,0,0,0 }; @@ -4689,6 +4733,7 @@ START_TEST(image) test_DrawImage_scale(); test_image_format(); test_DrawImage(); + test_DrawImage_SourceCopy(); test_GdipDrawImagePointRect(); test_bitmapbits(); test_tiff_palette();

1 0

Andrew Eikum : ntdll: Claim success for FSCTL_SET_SPARSE.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: a3af13614fed1e2fd5352063b73effd4e79d39e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3af13614fed1e2fd5352063b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 20 13:08:54 2015 -0500 ntdll: Claim success for FSCTL_SET_SPARSE. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 8f89ba5..1027b54 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1795,6 +1795,11 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc } break; } + case FSCTL_SET_SPARSE: + TRACE("FSCTL_SET_SPARSE: Ignoring request\n"); + io->Information = 0; + status = STATUS_SUCCESS; + break; case FSCTL_PIPE_LISTEN: case FSCTL_PIPE_WAIT: default:

1 0

Andrew Eikum : explorerframe: Allow treeview expandos to open with a single click.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 5bbdcaaa16018c9e15cbaadb3a6e5954d0089cf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bbdcaaa16018c9e15cbaadb3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 20 11:43:13 2015 -0500 explorerframe: Allow treeview expandos to open with a single click. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 87a7200..e8a2c54 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -686,9 +686,9 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr) psi = shellitem_from_treeitem(This, tvhit.hItem); hr = events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON); - /* The expando should not be expanded unless + /* The label should not be expanded unless * double-clicked. */ - if(tvhit.flags == TVHT_ONITEMBUTTON) + if(tvhit.flags == TVHT_ONITEMLABEL) return TRUE; if(SUCCEEDED(hr))

1 0

Sebastian Lackner : kernel32/tests: Remove unnecessary busy loop ( PVS-Studio).
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 646888ec79574c5a80a2aaf9c5e5ad871fa580f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=646888ec79574c5a80a2aaf9c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 20 21:55:41 2015 +0200 kernel32/tests: Remove unnecessary busy loop (PVS-Studio). Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index b366661..e0de3f9 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -227,9 +227,8 @@ static DWORD WINAPI threadFunc1(LPVOID p) /* Double check that all threads really did run by validating that they have all written to the shared memory. There should be no race here, since all threads were synchronized after the write.*/ - for(i=0;i<NUM_THREADS;i++) { - while(tstruct->threadmem[i]==0) ; - } + for (i = 0; i < NUM_THREADS; i++) + ok(tstruct->threadmem[i] != 0, "expected threadmem[%d] != 0\n", i); /* lstrlenA contains an exception handler so this makes sure exceptions work in threads */ ok( lstrlenA( (char *)0xdeadbeef ) == 0, "lstrlenA: unexpected success\n" );

1 0

Dmitry Timoshkov : ole32: Initialize number of bytes read before the comparison.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: b9d8c2b1eacbfd88fd167a6a10bfb02f3885ec10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d8c2b1eacbfd88fd167a6a1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 21 10:51:52 2015 +0800 ole32: Initialize number of bytes read before the comparison. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 2e2478a..8bb4ed8 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -408,7 +408,7 @@ static HRESULT read_clipformat(IStream *stream, CLIPFORMAT *clipformat) if (length == -1) { DWORD cf; - hr = IStream_Read(stream, &cf, sizeof(cf), 0); + hr = IStream_Read(stream, &cf, sizeof(cf), &read); if (hr != S_OK || read != sizeof(cf)) return DV_E_CLIPFORMAT; *clipformat = cf;

1 0

Erich E. Hoover : ws2_32: Add asynchronous support for TransmitFile.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: effd2c41927f1dda9178f5cd1cdeed4f75b3089e URL: http://source.winehq.org/git/wine.git/?a=commit;h=effd2c41927f1dda9178f5cd1… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Oct 7 12:19:42 2015 -0600 ws2_32: Add asynchronous support for TransmitFile. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 90 +++++++++++++++++++++++++++++++++++++++-------- dlls/ws2_32/tests/sock.c | 91 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 161 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=effd2c41927f1dda9178f…

1 0

Sebastian Lackner : ntdll: Use wrapper function for consolidate callback on x86_64.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: cbb57052163d05a14d3d8cf25fee08eea6660142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb57052163d05a14d3d8cf25… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 20 05:53:46 2015 +0200 ntdll: Use wrapper function for consolidate callback on x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 63 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 575a770..524de68 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3288,6 +3288,64 @@ static void call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT * } +/********************************************************************** + * call_consolidate_callback + * + * Wrapper function to call a consolidate callback from a fake frame. + * If the callback executes RtlUnwindEx (like for example done in C++ handlers), + * we have to skip all frames which were already processed. To do that we + * trick the unwinding functions into thinking the call came from somewhere + * else. All CFI instructions are either DW_CFA_def_cfa_expression or + * DW_CFA_expression, and the expressions have the following format: + * + * DW_OP_breg6; sleb128 0x10 | Load %rbp + 0x10 + * DW_OP_deref | Get *(%rbp + 0x10) == context + * DW_OP_plus_uconst; uleb128 <OFFSET> | Add offset to get struct member + * [DW_OP_deref] | Dereference, only for CFA + */ +extern void * WINAPI call_consolidate_callback( CONTEXT *context, + void *(CALLBACK *callback)(EXCEPTION_RECORD *), + EXCEPTION_RECORD *rec ); +__ASM_GLOBAL_FUNC( call_consolidate_callback, + "pushq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + "movq %rsp,%rbp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") + "subq $0x20,%rsp\n\t" + "movq %rcx,0x10(%rbp)\n\t" + __ASM_CFI(".cfi_remember_state\n\t") + __ASM_CFI(".cfi_escape 0x0f,0x07,0x76,0x10,0x06,0x23,0x98,0x01,0x06\n\t") /* CFA */ + __ASM_CFI(".cfi_escape 0x10,0x03,0x06,0x76,0x10,0x06,0x23,0x90,0x01\n\t") /* %rbx */ + __ASM_CFI(".cfi_escape 0x10,0x04,0x06,0x76,0x10,0x06,0x23,0xa8,0x01\n\t") /* %rsi */ + __ASM_CFI(".cfi_escape 0x10,0x05,0x06,0x76,0x10,0x06,0x23,0xb0,0x01\n\t") /* %rdi */ + __ASM_CFI(".cfi_escape 0x10,0x06,0x06,0x76,0x10,0x06,0x23,0xa0,0x01\n\t") /* %rbp */ + __ASM_CFI(".cfi_escape 0x10,0x0c,0x06,0x76,0x10,0x06,0x23,0xd8,0x01\n\t") /* %r12 */ + __ASM_CFI(".cfi_escape 0x10,0x0d,0x06,0x76,0x10,0x06,0x23,0xe0,0x01\n\t") /* %r13 */ + __ASM_CFI(".cfi_escape 0x10,0x0e,0x06,0x76,0x10,0x06,0x23,0xe8,0x01\n\t") /* %r14 */ + __ASM_CFI(".cfi_escape 0x10,0x0f,0x06,0x76,0x10,0x06,0x23,0xf0,0x01\n\t") /* %r15 */ + __ASM_CFI(".cfi_escape 0x10,0x10,0x06,0x76,0x10,0x06,0x23,0xf8,0x01\n\t") /* %rip */ + __ASM_CFI(".cfi_escape 0x10,0x17,0x06,0x76,0x10,0x06,0x23,0x80,0x04\n\t") /* %xmm6 */ + __ASM_CFI(".cfi_escape 0x10,0x18,0x06,0x76,0x10,0x06,0x23,0x90,0x04\n\t") /* %xmm7 */ + __ASM_CFI(".cfi_escape 0x10,0x19,0x06,0x76,0x10,0x06,0x23,0xa0,0x04\n\t") /* %xmm8 */ + __ASM_CFI(".cfi_escape 0x10,0x1a,0x06,0x76,0x10,0x06,0x23,0xb0,0x04\n\t") /* %xmm9 */ + __ASM_CFI(".cfi_escape 0x10,0x1b,0x06,0x76,0x10,0x06,0x23,0xc0,0x04\n\t") /* %xmm10 */ + __ASM_CFI(".cfi_escape 0x10,0x1c,0x06,0x76,0x10,0x06,0x23,0xd0,0x04\n\t") /* %xmm11 */ + __ASM_CFI(".cfi_escape 0x10,0x1d,0x06,0x76,0x10,0x06,0x23,0xe0,0x04\n\t") /* %xmm12 */ + __ASM_CFI(".cfi_escape 0x10,0x1e,0x06,0x76,0x10,0x06,0x23,0xf0,0x04\n\t") /* %xmm13 */ + __ASM_CFI(".cfi_escape 0x10,0x1f,0x06,0x76,0x10,0x06,0x23,0x80,0x05\n\t") /* %xmm14 */ + __ASM_CFI(".cfi_escape 0x10,0x20,0x06,0x76,0x10,0x06,0x23,0x90,0x05\n\t") /* %xmm15 */ + "movq %r8,%rcx\n\t" + "callq *%rdx\n\t" + __ASM_CFI(".cfi_restore_state\n\t") + "movq %rbp,%rsp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") + "popq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbp\n\t") + "ret") + + /******************************************************************* * RtlUnwindEx (NTDLL.@) */ @@ -3474,8 +3532,9 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec else if (rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) { PVOID (CALLBACK *consolidate)(EXCEPTION_RECORD *) = (void *)rec->ExceptionInformation[0]; - TRACE( "calling consolidate callback %p\n", consolidate ); - target_ip = consolidate( rec ); + TRACE( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); + target_ip = call_consolidate_callback( context, consolidate, rec ); + TRACE( "-> target=%p\n", target_ip ); } context->Rax = (ULONG64)retval; context->Rip = (ULONG64)target_ip;

1 0

Sebastian Lackner : maintainers: Add a section for volunteer reviewers.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 6bcbd1b601790baf37bac9e27663d5e28f99996e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bcbd1b601790baf37bac9e27… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 21 04:27:52 2015 +0200 maintainers: Add a section for volunteer reviewers. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index d7e678f..ff102f0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -163,3 +163,9 @@ F: dlls/vbscript/ XML parsing M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/msxml*/ + +THE REST +M: Alexandre Julliard <julliard(a)winehq.org> +P: Sebastian Lackner <sebastian(a)fds-team.de> +F: * +F: */

1 0