May 2009 - Wine-commits - list.winehq.org

Lionel Debroux : kernel32: Fix doc header for SetThreadIdealProcessor.
by Alexandre Julliard 21 May '09

21 May '09

Module: wine Branch: master Commit: e85a0375168ae5d59e6e25bbb3b7400660245027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85a0375168ae5d59e6e25bbb… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Wed May 20 14:46:58 2009 +0200 kernel32: Fix doc header for SetThreadIdealProcessor. --- dlls/kernel32/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index b084943..8cd2fb1 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -402,7 +402,7 @@ DWORD_PTR WINAPI SetThreadAffinityMask( HANDLE hThread, DWORD_PTR dwThreadAffini /********************************************************************** - * SetThreadIdealProcessor [KERNEL32.@] Obtains timing information. + * SetThreadIdealProcessor [KERNEL32.@] Sets preferred processor for thread. * * RETURNS * Success: Value of last call to SetThreadIdealProcessor

1 0

Francois Gouget : msctf: Fix an error message.
by Alexandre Julliard 21 May '09

21 May '09

Module: wine Branch: master Commit: 30df52ca1e3e32b9a62a402158dd5bbb48c8d2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=30df52ca1e3e32b9a62a40215… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 20 16:03:58 2009 +0200 msctf: Fix an error message. --- dlls/msctf/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index d312574..6f35def 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -648,7 +648,7 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, if (!This->pContext || !This->pContext->currentEditSession) { - ERR("OnLockGranted called on a context without a current edit session\nZ"); + ERR("OnLockGranted called on a context without a current edit session\n"); return E_FAIL; }

1 0

Jacek Caban : urlmon: Fixed buffer size calculation.
by Alexandre Julliard 21 May '09

21 May '09

Module: wine Branch: master Commit: 061b6a839aac98c09cd560a0f5b0a2c19e9294cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=061b6a839aac98c09cd560a0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 20 16:47:32 2009 +0200 urlmon: Fixed buffer size calculation. --- dlls/urlmon/bindprot.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index eceb7e3..f63824b 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -1002,20 +1002,18 @@ static HRESULT report_data(BindProtocol *This, DWORD bscf, ULONG progress, ULONG do { read = 0; - hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, BUFFER_SIZE-This->buf_size, &read); - if(hres != S_OK) - break; + hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, + BUFFER_SIZE-This->buf_size, &read); + if(FAILED(hres) && hres != E_PENDING) + return hres; This->buf_size += read; - }while(This->buf_size < MIME_TEST_SIZE); - if(FAILED(hres) && hres != E_PENDING) - return hres; + }while(This->buf_size < MIME_TEST_SIZE && hres == S_OK); - This->buf_size += read; if(This->buf_size < MIME_TEST_SIZE && hres != S_FALSE) return S_OK; - - hres = FindMimeFromData(NULL, This->url, This->buf, min(This->buf_size, MIME_TEST_SIZE), This->mime, 0, &mime, 0); + hres = FindMimeFromData(NULL, This->url, This->buf, min(This->buf_size, MIME_TEST_SIZE), + This->mime, 0, &mime, 0); if(FAILED(hres)) return hres;

1 0

Luke Benstead : ddraw: Add tests for DirectDrawSurface reference counting.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 73abda63d782abf53eaae2428237e024a3881d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73abda63d782abf53eaae2428… Author: Luke Benstead <kazade(a)gmail.com> Date: Tue May 19 21:27:08 2009 +0100 ddraw: Add tests for DirectDrawSurface reference counting. --- dlls/ddraw/tests/dsurface.c | 114 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index a0f69b1..c3280fb 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -26,6 +26,7 @@ #include <assert.h> #include "wine/test.h" #include "ddraw.h" +#include "d3d.h" #include "unknwn.h" static LPDIRECTDRAW lpDD = NULL; @@ -966,6 +967,118 @@ static void GetDDInterface_7(void) IDirectDrawSurface7_Release(dsurface7); } +static ULONG getRefcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + +static void IFaceRefCount(void) +{ + LPDIRECTDRAWSURFACE surf; + DDSURFACEDESC surface; + HRESULT ret; + IDirectDrawSurface2 *surf2; + IDirectDrawSurface2 *surf2a; + IDirectDrawSurface4 *surf4; + IDirectDrawSurface7 *surf7a; + IDirectDrawSurface7 *surf7b; + IDirect3DTexture* tex; + IDirect3DTexture2* tex2; + IDirectDrawGammaControl* gamma; + ULONG ref; + + /* Create a surface */ + ZeroMemory(&surface, sizeof(surface)); + surface.dwSize = sizeof(surface); + surface.dwFlags = DDSD_CAPS; + surface.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + ret = IDirectDraw_CreateSurface(lpDD, &surface, &surf, NULL); + + if (ret != DD_OK) + { + ok(FALSE, "Could not create surface, skipping test\n"); + return; + } + + ref = getRefcount((IUnknown *) surf); + ok(ref == 1, "Refcount is %u, expected 1\n", ref); /* Check the ref count is one */ + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface2, (void **) &surf2); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); /* Check the ref count is one */ + ref = getRefcount((IUnknown *) surf2); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); /* This should also be one */ + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface2, (void **) &surf2a); + ref = getRefcount((IUnknown *) surf2); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); /* Surf2's refcount should be 2 now, but surf should be 1 */ + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface4, (void **) &surf4); + ref = getRefcount((IUnknown *) surf4); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface7, (void **) &surf7a); + ref = getRefcount((IUnknown *) surf7a); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface7, (void **) &surf7b); + ref = getRefcount((IUnknown *) surf7b); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + + /* IDirect3DTexture interface (unlike the others) alters the original IDirectDrawSurface ref count */ + IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture, (void **) &tex); + ref = getRefcount((IUnknown *) tex); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture2, (void **) &tex2); + ref = getRefcount((IUnknown *) tex); + todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + ref = getRefcount((IUnknown *) tex2); + todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawGammaControl, (void **) &gamma); + ref = getRefcount((IUnknown *) gamma); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirect3DTexture2_Release(tex2); /* Release the texture */ + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + + ref = IDirect3DTexture_Release(tex); /* Release the texture */ + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirectDrawGammaControl_Release(gamma); /* Release the gamma control */ + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + + ref = IDirectDrawSurface2_Release(surf2); /* Release one of the 2 surf2 interfaces */ + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirectDrawSurface2_Release(surf2a); /* Release the other */ + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + + ref = IDirectDrawSurface4_Release(surf4); + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + + ref = IDirectDrawSurface7_Release(surf7a); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirectDrawSurface7_Release(surf7b); + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + + ref = IDirectDrawSurface_Release(surf); + ok(ref == 0, "Refcount is %u, expected 0\n", ref); +} + #define MAXEXPECTED 8 /* Can match up to 8 expected surfaces */ struct enumstruct { @@ -2908,6 +3021,7 @@ START_TEST(dsurface) GetDDInterface_2(); GetDDInterface_4(); GetDDInterface_7(); + IFaceRefCount(); EnumTest(); AttachmentTest(); AttachmentTest7();

1 0

Alexandre Julliard : ntdll/tests: Add more tests for RtlVirtualUnwind.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: fb819d6491d046fed99ec879df9de08e8ccd49da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb819d6491d046fed99ec879d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 12:21:07 2009 +0200 ntdll/tests: Add more tests for RtlVirtualUnwind. --- dlls/ntdll/tests/exception.c | 241 ++++++++++++++++++++++++++++------------- 1 files changed, 164 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb819d6491d046fed99ec…

1 0

Alexandre Julliard : ntdll: Add support for some function epilogs in RtlVirtualUnwind.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 1d4747c35fe5627375c98ab0cb55ec1e4e0eab4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4747c35fe5627375c98ab0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 12:31:28 2009 +0200 ntdll: Add support for some function epilogs in RtlVirtualUnwind. --- dlls/ntdll/signal_x86_64.c | 132 +++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/tests/exception.c | 10 +++ 2 files changed, 141 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c1210e9..bf78685 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1060,6 +1060,131 @@ static int get_opcode_size( struct opcode op ) } } +static BOOL is_inside_epilog( BYTE *pc ) +{ + /* add or lea must be the first instruction, and it must have a rex.W prefix */ + if ((pc[0] & 0xf8) == 0x48) + { + switch (pc[1]) + { + case 0x81: /* add $nnnn,%rsp */ + if (pc[0] == 0x48 && pc[2] == 0xc4) + { + pc += 7; + break; + } + return FALSE; + case 0x83: /* add $n,%rsp */ + if (pc[0] == 0x48 && pc[2] == 0xc4) + { + pc += 4; + break; + } + return FALSE; + case 0x8d: /* lea n(reg),%rsp */ + if (pc[0] & 0x06) return FALSE; /* rex.RX must be cleared */ + if (((pc[2] >> 3) & 7) != 4) return FALSE; /* dest reg mus be %rsp */ + if ((pc[2] & 7) == 4) return FALSE; /* no SIB byte allowed */ + if ((pc[2] >> 6) == 1) /* 8-bit offset */ + { + pc += 4; + break; + } + if ((pc[2] >> 6) == 2) /* 32-bit offset */ + { + pc += 7; + break; + } + return FALSE; + } + } + + /* now check for various pop instructions */ + + for (;;) + { + BYTE rex = 0; + + if ((*pc & 0xf0) == 0x40) rex = *pc++ & 0x0f; /* rex prefix */ + + switch (*pc) + { + case 0x58: /* pop %rax/%r8 */ + case 0x59: /* pop %rcx/%r9 */ + case 0x5a: /* pop %rdx/%r10 */ + case 0x5b: /* pop %rbx/%r11 */ + case 0x5c: /* pop %rsp/%r12 */ + case 0x5d: /* pop %rbp/%r13 */ + case 0x5e: /* pop %rsi/%r14 */ + case 0x5f: /* pop %rdi/%r15 */ + pc++; + continue; + case 0xc2: /* ret $nn */ + case 0xc3: /* ret */ + return TRUE; + /* FIXME: add various jump instructions */ + } + return FALSE; + } +} + +/* execute a function epilog, which must have been validated with is_inside_epilog() */ +static void interpret_epilog( BYTE *pc, CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr ) +{ + for (;;) + { + BYTE rex = 0; + + if ((*pc & 0xf0) == 0x40) rex = *pc++ & 0x0f; /* rex prefix */ + + switch (*pc) + { + case 0x58: /* pop %rax/r8 */ + case 0x59: /* pop %rcx/r9 */ + case 0x5a: /* pop %rdx/r10 */ + case 0x5b: /* pop %rbx/r11 */ + case 0x5c: /* pop %rsp/r12 */ + case 0x5d: /* pop %rbp/r13 */ + case 0x5e: /* pop %rsi/r14 */ + case 0x5f: /* pop %rdi/r15 */ + set_int_reg( context, ctx_ptr, *pc - 0x58 + (rex & 1) * 8, *(ULONG64 *)context->Rsp ); + context->Rsp += sizeof(ULONG64); + pc++; + continue; + case 0x81: /* add $nnnn,%rsp */ + context->Rsp += *(LONG *)(pc + 2); + pc += 2 + sizeof(LONG); + continue; + case 0x83: /* add $n,%rsp */ + context->Rsp += (signed char)pc[2]; + pc += 3; + continue; + case 0x8d: + if ((pc[1] >> 6) == 1) /* lea n(reg),%rsp */ + { + context->Rsp = get_int_reg( context, (pc[1] & 7) + (rex & 1) * 8 ) + (signed char)pc[2]; + pc += 3; + } + else /* lea nnnn(reg),%rsp */ + { + context->Rsp = get_int_reg( context, (pc[1] & 7) + (rex & 1) * 8 ) + *(LONG *)(pc + 2); + pc += 2 + sizeof(LONG); + } + continue; + case 0xc2: /* ret $nn */ + context->Rip = *(ULONG64 *)context->Rsp; + context->Rsp += sizeof(ULONG64) + *(WORD *)(pc + 1); + return; + case 0xc3: /* ret */ + context->Rip = *(ULONG64 *)context->Rsp; + context->Rsp += sizeof(ULONG64); + return; + /* FIXME: add various jump instructions */ + } + return; + } +} + /********************************************************************** * RtlVirtualUnwind (NTDLL.@) */ @@ -1100,7 +1225,12 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, else { prolog_offset = ~0; - /* FIXME: check for function epilog */ + if (is_inside_epilog( (BYTE *)pc )) + { + interpret_epilog( (BYTE *)pc, context, ctx_ptr ); + *frame_ret = frame; + return NULL; + } } for (i = 0; i < info->count; i += get_opcode_size(info->opcodes[i])) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c3cc797..ff4125f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1116,6 +1116,9 @@ static void test_virtual_unwind(void) { 0x1c, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, { 0x1d, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, { 0x24, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, + { 0x2b, 0x40, FALSE, 0x128, { {rsp,0x130}, {rbp,0x120}, {-1,-1}}}, + { 0x32, 0x40, FALSE, 0x008, { {rsp,0x010}, {rbp,0x000}, {-1,-1}}}, + { 0x33, 0x40, FALSE, 0x000, { {rsp,0x008}, {-1,-1}}}, }; @@ -1165,6 +1168,13 @@ static void test_virtual_unwind(void) { 0x04, 0x50, FALSE, 0x020, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, { 0x06, 0x50, FALSE, 0x028, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, { 0x0a, 0x50, TRUE, 0x058, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, + { 0x0c, 0x50, FALSE, 0x058, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, + { 0x10, 0x50, FALSE, 0x028, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, + { 0x12, 0x50, FALSE, 0x020, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, + { 0x13, 0x50, FALSE, 0x018, { {rsp,0x020}, {rbx,0x010}, {rbp,0x008}, {rsi,0x000}, {-1,-1} }}, + { 0x14, 0x50, FALSE, 0x010, { {rsp,0x018}, {rbx,0x008}, {rbp,0x000}, {-1,-1} }}, + { 0x15, 0x50, FALSE, 0x008, { {rsp,0x010}, {rbx,0x000}, {-1,-1} }}, + { 0x16, 0x50, FALSE, 0x000, { {rsp,0x008}, {-1,-1} }}, }; static const struct unwind_test tests[] =

1 0

Alexandre Julliard : ntdll: Add test cases for the returned frame value in RtlVirtualUnwind.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 6c35e3f47c6c7e6f7e8da8e3c20b0784cc5ca8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c35e3f47c6c7e6f7e8da8e3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 13:33:32 2009 +0200 ntdll: Add test cases for the returned frame value in RtlVirtualUnwind. --- dlls/ntdll/signal_x86_64.c | 5 +-- dlls/ntdll/tests/exception.c | 57 ++++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index bf78685..1c315d1 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1202,7 +1202,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, dump_unwind_info( base, function ); - frame = context->Rsp; + frame = *frame_ret = context->Rsp; for (;;) { info = (struct UNWIND_INFO *)((char *)base + function->UnwindData); @@ -1251,7 +1251,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, context->Rsp += (info->opcodes[i].info + 1) * 8; break; case UWOP_SET_FPREG: /* leaq nn(%rsp),%framereg */ - context->Rsp = frame; + context->Rsp = *frame_ret = frame; break; case UWOP_SAVE_NONVOL: /* movq %reg,n(%rsp) */ off = frame + *(USHORT *)&info->opcodes[i+1] * 8; @@ -1285,7 +1285,6 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, /* now pop return address */ context->Rip = *(ULONG64 *)context->Rsp; context->Rsp += sizeof(ULONG64); - *frame_ret = frame; if (!(info->flags & type)) return NULL; /* no matching handler */ if (prolog_offset != ~0) return NULL; /* inside prolog */ diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index ff4125f..aefce8b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -941,6 +941,7 @@ struct results int rbp_offset; /* rbp offset from stack pointer */ int handler; /* expect handler to be set? */ int rip; /* expected final rip value */ + int frame; /* expected frame return value */ int regs[8][2]; /* expected values for registers */ }; @@ -1022,6 +1023,8 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) ok( context.Rip == test->results[i].rip, "%u/%u: wrong rip %p/%x\n", testnum, i, (void *)context.Rip, test->results[i].rip ); + ok( frame == (ULONG64)fake_stack + test->results[i].frame, "%u/%u: wrong frame %p/%p\n", + testnum, i, (void *)frame, (char *)fake_stack + test->results[i].frame ); for (j = 0; j < 16; j++) { @@ -1107,18 +1110,18 @@ static void test_virtual_unwind(void) static const struct results results_0[] = { - /* offset rbp handler rip registers */ - { 0x00, 0x40, FALSE, 0x000, { {rsp,0x008}, {-1,-1} }}, - { 0x02, 0x40, FALSE, 0x008, { {rsp,0x010}, {rbp,0x000}, {-1,-1} }}, - { 0x09, 0x40, FALSE, 0x118, { {rsp,0x120}, {rbp,0x110}, {-1,-1} }}, - { 0x0e, 0x40, FALSE, 0x128, { {rsp,0x130}, {rbp,0x120}, {-1,-1} }}, - { 0x15, 0x40, FALSE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {-1,-1} }}, - { 0x1c, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, - { 0x1d, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, - { 0x24, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, - { 0x2b, 0x40, FALSE, 0x128, { {rsp,0x130}, {rbp,0x120}, {-1,-1}}}, - { 0x32, 0x40, FALSE, 0x008, { {rsp,0x010}, {rbp,0x000}, {-1,-1}}}, - { 0x33, 0x40, FALSE, 0x000, { {rsp,0x008}, {-1,-1}}}, + /* offset rbp handler rip frame registers */ + { 0x00, 0x40, FALSE, 0x000, 0x000, { {rsp,0x008}, {-1,-1} }}, + { 0x02, 0x40, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbp,0x000}, {-1,-1} }}, + { 0x09, 0x40, FALSE, 0x118, 0x000, { {rsp,0x120}, {rbp,0x110}, {-1,-1} }}, + { 0x0e, 0x40, FALSE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {-1,-1} }}, + { 0x15, 0x40, FALSE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {-1,-1} }}, + { 0x1c, 0x40, TRUE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, + { 0x1d, 0x40, TRUE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, + { 0x24, 0x40, TRUE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, + { 0x2b, 0x40, FALSE, 0x128, 0x010, { {rsp,0x130}, {rbp,0x120}, {-1,-1}}}, + { 0x32, 0x40, FALSE, 0x008, 0x010, { {rsp,0x010}, {rbp,0x000}, {-1,-1}}}, + { 0x33, 0x40, FALSE, 0x000, 0x010, { {rsp,0x008}, {-1,-1}}}, }; @@ -1160,21 +1163,21 @@ static void test_virtual_unwind(void) static const struct results results_1[] = { - /* offset rbp handler rip registers */ - { 0x00, 0x50, FALSE, 0x000, { {rsp,0x008}, {-1,-1} }}, - { 0x01, 0x50, FALSE, 0x008, { {rsp,0x010}, {rbx,0x000}, {-1,-1} }}, - { 0x02, 0x50, FALSE, 0x010, { {rsp,0x018}, {rbx,0x008}, {rbp,0x000}, {-1,-1} }}, - { 0x03, 0x50, FALSE, 0x018, { {rsp,0x020}, {rbx,0x010}, {rbp,0x008}, {rsi,0x000}, {-1,-1} }}, - { 0x04, 0x50, FALSE, 0x020, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, - { 0x06, 0x50, FALSE, 0x028, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, - { 0x0a, 0x50, TRUE, 0x058, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, - { 0x0c, 0x50, FALSE, 0x058, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, - { 0x10, 0x50, FALSE, 0x028, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, - { 0x12, 0x50, FALSE, 0x020, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, - { 0x13, 0x50, FALSE, 0x018, { {rsp,0x020}, {rbx,0x010}, {rbp,0x008}, {rsi,0x000}, {-1,-1} }}, - { 0x14, 0x50, FALSE, 0x010, { {rsp,0x018}, {rbx,0x008}, {rbp,0x000}, {-1,-1} }}, - { 0x15, 0x50, FALSE, 0x008, { {rsp,0x010}, {rbx,0x000}, {-1,-1} }}, - { 0x16, 0x50, FALSE, 0x000, { {rsp,0x008}, {-1,-1} }}, + /* offset rbp handler rip frame registers */ + { 0x00, 0x50, FALSE, 0x000, 0x000, { {rsp,0x008}, {-1,-1} }}, + { 0x01, 0x50, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbx,0x000}, {-1,-1} }}, + { 0x02, 0x50, FALSE, 0x010, 0x000, { {rsp,0x018}, {rbx,0x008}, {rbp,0x000}, {-1,-1} }}, + { 0x03, 0x50, FALSE, 0x018, 0x000, { {rsp,0x020}, {rbx,0x010}, {rbp,0x008}, {rsi,0x000}, {-1,-1} }}, + { 0x04, 0x50, FALSE, 0x020, 0x000, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, + { 0x06, 0x50, FALSE, 0x028, 0x000, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, + { 0x0a, 0x50, TRUE, 0x058, 0x000, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, + { 0x0c, 0x50, FALSE, 0x058, 0x000, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, + { 0x10, 0x50, FALSE, 0x028, 0x000, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, + { 0x12, 0x50, FALSE, 0x020, 0x000, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, + { 0x13, 0x50, FALSE, 0x018, 0x000, { {rsp,0x020}, {rbx,0x010}, {rbp,0x008}, {rsi,0x000}, {-1,-1} }}, + { 0x14, 0x50, FALSE, 0x010, 0x000, { {rsp,0x018}, {rbx,0x008}, {rbp,0x000}, {-1,-1} }}, + { 0x15, 0x50, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbx,0x000}, {-1,-1} }}, + { 0x16, 0x50, FALSE, 0x000, 0x000, { {rsp,0x008}, {-1,-1} }}, }; static const struct unwind_test tests[] =

1 0

Marcus Meissner : wininet: lpwhr cannot be NULL (Coverity 927).
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 1d362c90a431680c3d311de728e26833377b7d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d362c90a431680c3d311de72… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed May 20 09:33:21 2009 +0200 wininet: lpwhr cannot be NULL (Coverity 927). --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 212ff9f..904939a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3832,7 +3832,7 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) TRACE("-->\n"); - if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ) + if (lpwhr->hdr.htype != WH_HHTTPREQ) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); goto lend;

1 0

Kai Blin : secur32: Don't try to use ntlm_auth --use-cred-cache.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: ec443be73800258f8c921ace0f15e250617e98f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec443be73800258f8c921ace0… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed May 20 11:06:05 2009 +0200 secur32: Don't try to use ntlm_auth --use-cred-cache. If ntlm_auth actually uses the cred cache, it will not give a session key. As the Wine NTLM code depends on the session key to do transport crypto, don't attempt to use the winbind cred cache. This completely reverts my attempted fix 7788c8ed and also parts of Rob's 888a8e27 and 8a2125f9. It does not affect the code using wine's own credential cache. --- dlls/secur32/ntlm.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5e2450a..2f0c5aa 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -471,7 +471,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if((phContext == NULL) && (pInput == NULL)) { static char helper_protocol[] = "--helper-protocol=ntlmssp-client-1"; - static CHAR credentials_argv[] = "--use-cached-creds"; SEC_CHAR *client_argv[5]; int pwlen = 0; @@ -550,10 +549,10 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( } username = ntlm_GetUsernameArg(ui->wkui1_username, -1); - TRACE("using cached credentials\n"); + FIXME("using ntlm_auth cached credentials not supported\n"); client_argv[2] = username; - client_argv[3] = credentials_argv; + client_argv[3] = NULL; client_argv[4] = NULL; } } @@ -645,8 +644,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if(fContextReq & ISC_REQ_DELEGATE) ctxt_attr |= ISC_RET_DELEGATE; - /* If no password is given, try to use cached credentials. Fall back to an empty - * password if this failed. */ + /* If no password is given, use an empty password instead. This is the + * SMB way to do "anonymous" authentication. */ if(!password && !ntlm_cred->password) { lstrcpynA(buffer, "OK", max_len-1); @@ -655,25 +654,15 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( cleanup_helper(helper); goto isc_end; } - /* If the helper replied with "PW", using cached credentials failed */ + /* If the helper replied with "PW", give an empty password. */ if(!strncmp(buffer, "PW", 2)) { TRACE("Using cached credentials failed.\n"); - ret = SEC_E_NO_CREDENTIALS; - goto isc_end; + lstrcpynA(buffer, "PW AA==", max_len-1); } else { - /* Some versions of Samba have a broken ntlm_auth that can - * return "BH" here. Catch this and abort. */ - if(!strncmp(buffer, "BH", 2)) - { - ERR("ntlm_auth replied 'BH'. This should not happen. " - "Please fix your ntlm_auth install and try again.\n"); - ret = SEC_E_INTERNAL_ERROR; - goto isc_end; - } - /* Otherwise, just do a noop on the next run */ + /* Just do a noop on the next run */ lstrcpynA(buffer, "OK", max_len-1); } }

1 0

Tim Wright : qmgr: Change BITS_IBackgroundCopyJob_SetPriority to a stub.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: cb26244adb4e15ab60e4d02b5bedf96c9da98685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb26244adb4e15ab60e4d02b5… Author: Tim Wright <timw(a)splhi.com> Date: Tue May 19 08:28:14 2009 -0700 qmgr: Change BITS_IBackgroundCopyJob_SetPriority to a stub. --- dlls/qmgr/job.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 3baa893..09693a3 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -334,8 +334,8 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_SetPriority( IBackgroundCopyJob2 *iface, BG_JOB_PRIORITY Val) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + FIXME("(%p,0x%08x) stub\n", iface, Val); + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_GetPriority(

1 0