October 2015 - Wine-Commits

Nikolay Sivov : quartz: Minor cleanup of returned interface pointers.
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

Module: wine Branch: master Commit: 5fb58eae3b9c2ca89d801b9d50ef9843665ca6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb58eae3b9c2ca89d801b9d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 14:31:49 2015 +0300 quartz: Minor cleanup of returned interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/filesource.c | 10 ++++------ dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 10 +++++----- dlls/quartz/systemclock.c | 2 +- dlls/quartz/vmr9.c | 2 +- dlls/quartz/waveparser.c | 2 +- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index d62ec2b..74529f2 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1451,7 +1451,7 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) return hr; - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 877c706..33ac442 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -810,20 +810,18 @@ static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin * iface, REFIID rii *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = This; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) + *ppv = &This->pin.pin.IPin_iface; else if (IsEqualIID(riid, &IID_IAsyncReader)) *ppv = &This->IAsyncReader_iface; if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking)) + if (!IsEqualIID(riid, &IID_IMediaSeeking)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 33a93ba..60dd82c 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -797,7 +797,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) This->seek = TRUE; /* Note: This memory is managed by the parser filter once created */ - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; } diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index cd8d93d..fd98787 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -147,11 +147,11 @@ HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * || IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IMediaFilter) || IsEqualIID(riid, &IID_IBaseFilter) ) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } @@ -521,21 +521,21 @@ static HRESULT WINAPI Parser_Seeking_QueryInterface(IMediaSeeking * iface, REFII { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); + return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); } static ULONG WINAPI Parser_Seeking_AddRef(IMediaSeeking * iface) { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_AddRef((IUnknown *)This); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); } static ULONG WINAPI Parser_Seeking_Release(IMediaSeeking * iface) { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_Release((IUnknown *)This); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } static const IMediaSeekingVtbl Parser_Seeking_Vtbl = diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index cdb06f7..a3e1504 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -215,7 +215,7 @@ static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REF if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IReferenceClock)) { SystemClockImpl_AddRef(iface); - *ppobj = This; + *ppobj = &This->IReferenceClock_iface; return S_OK; } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index c9a330d..10b9dff 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -3111,6 +3111,6 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren This->SurfaceAllocatorNotify = NULL; This->reset = FALSE; - *ppv = This; + *ppv = &This->IVMRImagePresenter9_iface; return S_OK; } diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 3f3846c..6e8c664 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -440,7 +440,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) return hr; - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; }

1 0

Bruno Jesus : msvfw32: Fix a copy & paste issue.
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

Module: wine Branch: master Commit: f12a970c0970945337fda8f985b2c4b84fd1c92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12a970c0970945337fda8f98… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Oct 21 13:29:38 2015 +0800 msvfw32: Fix a copy & paste issue. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index d0ff270..db71014 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1415,8 +1415,8 @@ static void clear_compvars(PCOMPVARS pc) pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL; if (pc->dwFlags & 0x80000000) { - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - pc->lpBitsOut = NULL; + HeapFree(GetProcessHeap(), 0, pc->lpbiOut); + pc->lpbiOut = NULL; pc->dwFlags &= ~0x80000000; } } @@ -1461,6 +1461,8 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFO)); if (!pc->lpbiOut) goto error; + /* Flag to show that we allocated lpbiOut for proper cleanup */ + pc->dwFlags |= 0x80000000; ret = ICSendMessage(pc->hic, ICM_COMPRESS_GET_FORMAT, (DWORD_PTR)pc->lpbiIn, (DWORD_PTR)pc->lpbiOut); @@ -1479,8 +1481,6 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) pc->lpbiOut->bmiHeader.biSizeImage = max(8192, pc->lpbiIn->bmiHeader.biSizeImage); ERR("Bad codec! Invalid output frame size, guessing from input\n"); } - /* Flag to show that we allocated lpbiOutput for proper cleanup */ - pc->dwFlags |= 0x80000000; } TRACE("Input: %ux%u, fcc %s, bpp %u, size %u\n",

1 0

Huw Davies : wineps: Pass the collate setting as a CUPS option.
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

Module: wine Branch: master Commit: 3f276c9be2a98cef198565f92b66163ef3ce2f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f276c9be2a98cef198565f92… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 21 09:17:50 2015 +0100 wineps: Pass the collate setting as a CUPS option. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/ps.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index a19dda3..a01346e 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -48,6 +48,8 @@ static const char *cups_duplexes[3] = cups_two_sided_long, /* DMDUP_VERTICAL */ cups_two_sided_short /* DMDUP_HORIZONTAL */ }; +static const char cups_collate_false[] = "%cupsJobTicket: collate=false\n"; +static const char cups_collate_true[] = "%cupsJobTicket: collate=true\n"; static const char psheader[] = /* title llx lly urx ury orientation */ "%%%%Creator: Wine PostScript Driver\n" @@ -364,6 +366,14 @@ static void write_cups_job_ticket( PHYSDEV dev, const struct ticket_info *info ) physDev->Devmode->dmPublic.u1.s1.dmCopies ); if (len > 0 && len < sizeof(buf)) write_spool( dev, buf, len ); + + if (physDev->Devmode->dmPublic.dmFields & DM_COLLATE) + { + if (physDev->Devmode->dmPublic.dmCollate == DMCOLLATE_FALSE) + write_spool( dev, cups_collate_false, sizeof(cups_collate_false) - 1 ); + else if (physDev->Devmode->dmPublic.dmCollate == DMCOLLATE_TRUE) + write_spool( dev, cups_collate_true, sizeof(cups_collate_true) - 1 ); + } } }

1 0

Nikolay Sivov : shell32/tests: Fix prototype to match implementation ( PVS-Studio).
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

Module: wine Branch: master Commit: 2fff77a0eee097de8510ae2f229d5aa7b9551316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fff77a0eee097de8510ae2f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 14:43:30 2015 +0300 shell32/tests: Fix prototype to match implementation (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index 81f4754..6cdb386 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -32,7 +32,7 @@ #include "wine/test.h" static HMODULE hShell32; -static HRESULT (WINAPI *pStrRetToStrNAW)(LPVOID,DWORD,LPSTRRET,const ITEMIDLIST *); +static BOOL (WINAPI *pStrRetToStrNAW)(LPVOID,DWORD,LPSTRRET,const ITEMIDLIST *); static WCHAR *CoDupStrW(const char* src) {

1 0

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

Oct. 21, 2015

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

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

Oct. 21, 2015

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

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

Oct. 21, 2015

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 : explorerframe: Allow treeview expandos to open with a single click.
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

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 : ntdll: Use wrapper function for consolidate callback on x86_64.
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

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

Francois Gouget : testbot: Don't sleep after a revert.
by Alexandre Julliard Oct. 21, 2015

Oct. 21, 2015

Module: tools Branch: master Commit: 3d769372cf523ff69249892d214bde772d8448dc URL: http://source.winehq.org/git/tools.git/?a=commit;h=3d769372cf523ff69249892d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 21 14:21:21 2015 +0200 testbot: Don't sleep after a revert. It may be needed for hypervisors that start the VM before fully reloading its state but that's the exception. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index db7f18d..cb5bfe4 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -66,7 +66,7 @@ $MaxRevertingVMs = 1; $MaxRevertsWhileRunningVMs = 1; $MaxActiveVMs = 2; $MaxVMsWhenIdle = undef; -$SleepAfterRevert = 30; +$SleepAfterRevert = 0; $WaitForToolsInVM = 30; $SuiteTimeout = 30 * 60;

1 0