March 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Add support for rep; ret instruction in function epilogs.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 34c875bf8bd3861f69dedbd7faada1a5c7748d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c875bf8bd3861f69dedbd7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 18:59:45 2012 +0100 ntdll: Add support for rep;ret instruction in function epilogs. --- dlls/ntdll/signal_x86_64.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 12acf94..19d91a0 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2648,6 +2648,8 @@ static BOOL is_inside_epilog( BYTE *pc ) case 0xc2: /* ret $nn */ case 0xc3: /* ret */ return TRUE; + case 0xf3: /* rep; ret (for amd64 prediction bug) */ + return pc[1] == 0xc3; /* FIXME: add various jump instructions */ } return FALSE; @@ -2702,6 +2704,7 @@ static void interpret_epilog( BYTE *pc, CONTEXT *context, KNONVOLATILE_CONTEXT_P context->Rsp += sizeof(ULONG64) + *(WORD *)(pc + 1); return; case 0xc3: /* ret */ + case 0xf3: /* rep; ret */ context->Rip = *(ULONG64 *)context->Rsp; context->Rsp += sizeof(ULONG64); return;

1 0

Alexandre Julliard : ntdll: Add support for jump instructions in function epilogs.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: b663a6dea47661fbd31c6a0d5a96517020d5628e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b663a6dea47661fbd31c6a0d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 19:18:37 2012 +0100 ntdll: Add support for jump instructions in function epilogs. --- dlls/ntdll/signal_x86_64.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 19d91a0..bea7ae0 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2586,7 +2586,7 @@ static int get_opcode_size( struct opcode op ) } } -static BOOL is_inside_epilog( BYTE *pc ) +static BOOL is_inside_epilog( BYTE *pc, ULONG64 base, const RUNTIME_FUNCTION *function ) { /* add or lea must be the first instruction, and it must have a rex.W prefix */ if ((pc[0] & 0xf8) == 0x48) @@ -2629,9 +2629,9 @@ static BOOL is_inside_epilog( BYTE *pc ) for (;;) { - BYTE rex = 0; + DWORD offset; - if ((*pc & 0xf0) == 0x40) rex = *pc++ & 0x0f; /* rex prefix */ + if ((*pc & 0xf0) == 0x40) pc++; /* rex prefix */ switch (*pc) { @@ -2648,9 +2648,14 @@ static BOOL is_inside_epilog( BYTE *pc ) case 0xc2: /* ret $nn */ case 0xc3: /* ret */ return TRUE; + case 0xe9: /* jmp nnnn */ + offset = pc + 5 + *(LONG *)(pc + 1) - (BYTE *)base; + return (offset >= function->BeginAddress && offset < function->EndAddress); + case 0xeb: /* jmp n */ + offset = pc + 2 + (signed char)pc[1] - (BYTE *)base; + return (offset >= function->BeginAddress && offset < function->EndAddress); case 0xf3: /* rep; ret (for amd64 prediction bug) */ return pc[1] == 0xc3; - /* FIXME: add various jump instructions */ } return FALSE; } @@ -2708,7 +2713,12 @@ static void interpret_epilog( BYTE *pc, CONTEXT *context, KNONVOLATILE_CONTEXT_P context->Rip = *(ULONG64 *)context->Rsp; context->Rsp += sizeof(ULONG64); return; - /* FIXME: add various jump instructions */ + case 0xe9: /* jmp nnnn */ + pc += 5 + *(LONG *)(pc + 1); + continue; + case 0xeb: /* jmp n */ + pc += 2 + (signed char)pc[1]; + continue; } return; } @@ -2753,7 +2763,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, else { prolog_offset = ~0; - if (is_inside_epilog( (BYTE *)pc )) + if (is_inside_epilog( (BYTE *)pc, base, function )) { interpret_epilog( (BYTE *)pc, context, ctx_ptr ); *frame_ret = frame;

1 0

Piotr Caban : urlmon: Added missing memcpy in CopyBindInfo.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: c9bd71f32fdf7f5036a2430f6fc021d0bbdf6c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9bd71f32fdf7f5036a2430f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 12 14:45:59 2012 +0100 urlmon: Added missing memcpy in CopyBindInfo. --- dlls/urlmon/urlmon_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 836ef12..e22f037 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -607,6 +607,7 @@ HRESULT WINAPI CopyBindInfo(const BINDINFO *pcbiSrc, BINDINFO *pcbiDest) ReleaseStgMedium(&pcbiDest->stgmedData); return E_OUTOFMEMORY; } + memcpy(pcbiDest->szCustomVerb, pcbiSrc->szCustomVerb, size); } size = FIELD_OFFSET(BINDINFO, securityAttributes)+sizeof(SECURITY_ATTRIBUTES);

1 0

Piotr Caban : msvcrt: Fixed printf behaviour on hexadecimal, zero-padded numbers.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 79c19aef299432f39e435c9c98be3ac613ea762a URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c19aef299432f39e435c9c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 12 19:49:11 2012 +0100 msvcrt: Fixed printf behaviour on hexadecimal, zero-padded numbers. --- dlls/msvcrt/printf.h | 8 +++++++- dlls/msvcrt/tests/printf.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 5c49739..b1cb53f 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -508,8 +508,14 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API i = 0; } else if(flags.Format && strchr("diouxX", flags.Format)) { APICHAR *tmp = buf; - int max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; + int max_len; + + /* 0 padding is added after '0x' in Alternate flag is in use */ + if((flags.Format=='x' || flags.Format=='X') && flags.PadZero && flags.Alternate + && !flags.LeftAlign && flags.Precision<flags.FieldLength-2) + flags.Precision = flags.FieldLength - 2; + max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; if(max_len > sizeof(buf)/sizeof(APICHAR)) tmp = HeapAlloc(GetProcessHeap(), 0, max_len); if(!tmp) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 978b512..ff86516 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -323,6 +323,22 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"1 "),"Character zero-padded and/or not left-adjusted \"%s\"\n",buffer); ok( r==4, "return count wrong\n"); + format = "%#012x"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"0x0000000001"),"Hexadecimal zero-padded \"%s\"\n",buffer); + + format = "%#04.8x"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"0x00000001"), "Hexadecimal zero-padded precision \"%s\"\n",buffer); + + format = "%#-08.2x"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"0x01 "), "Hexadecimal zero-padded not left-adjusted \"%s\"\n",buffer); + + format = "%#08o"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"00000001"), "Octal zero-padded \"%s\"\n",buffer); + if (sizeof(void *) == 8) { format = "%p";

1 0

Henri Verbeet : d3d9: Cleanup IDirect3D9Impl_QueryInterface().
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 2de689ac04a6bc1cd99a44ee364079b2968c1d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de689ac04a6bc1cd99a44ee3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 12 19:56:06 2012 +0100 d3d9: Cleanup IDirect3D9Impl_QueryInterface(). --- dlls/d3d9/directx.c | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 2654c1e..d8a5d78 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -29,33 +29,37 @@ static inline IDirect3D9Impl *impl_from_IDirect3D9Ex(IDirect3D9Ex *iface) return CONTAINING_RECORD(iface, IDirect3D9Impl, IDirect3D9Ex_iface); } -static HRESULT WINAPI IDirect3D9Impl_QueryInterface(IDirect3D9Ex *iface, REFIID riid, void **ppobj) +static HRESULT WINAPI IDirect3D9Impl_QueryInterface(IDirect3D9Ex *iface, REFIID riid, void **object) { - IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface); + IDirect3D9Impl *d3d9 = impl_from_IDirect3D9Ex(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3D9)) { - IDirect3D9Ex_AddRef(iface); - *ppobj = This; - TRACE("Returning IDirect3D9 interface at %p\n", *ppobj); + if (IsEqualGUID(riid, &IID_IDirect3D9) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IDirect3D9Ex_AddRef(&d3d9->IDirect3D9Ex_iface); + *object = &d3d9->IDirect3D9Ex_iface; return S_OK; - } else if(IsEqualGUID(riid, &IID_IDirect3D9Ex)) { - if(This->extended) { - *ppobj = This; - TRACE("Returning IDirect3D9Ex interface at %p\n", *ppobj); - IDirect3D9Ex_AddRef((IDirect3D9Ex *)*ppobj); - } else { - WARN("Application asks for IDirect3D9Ex, but this instance wasn't created with Direct3DCreate9Ex\n"); - WARN("Returning E_NOINTERFACE\n"); - *ppobj = NULL; + } + + if (IsEqualGUID(riid, &IID_IDirect3D9Ex)) + { + if (!d3d9->extended) + { + WARN("Application asks for IDirect3D9Ex, but this instance wasn't created with Direct3DCreate9Ex.\n"); + *object = NULL; return E_NOINTERFACE; } + + IDirect3D9Ex_AddRef(&d3d9->IDirect3D9Ex_iface); + *object = &d3d9->IDirect3D9Ex_iface; + return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); - *ppobj = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d9/tests: Fix a couple of return value checks.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 82b3dbdefbf13c381bc5cf4c9c610b37a540b543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b3dbdefbf13c381bc5cf4c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 12 19:56:07 2012 +0100 d3d9/tests: Fix a couple of return value checks. --- dlls/d3d9/tests/visual.c | 92 +++++++++++++++++++++++----------------------- 1 files changed, 46 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82b3dbdefbf13c381bc5c…

1 0

Henri Verbeet : d3d8/tests: Fix a couple of return value checks.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 93afc43ee9e21d4608614b71af7f59be06ebf191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93afc43ee9e21d4608614b71a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 12 19:56:08 2012 +0100 d3d8/tests: Fix a couple of return value checks. --- dlls/d3d8/tests/device.c | 6 +++--- dlls/d3d8/tests/visual.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2e1bc98..a34ba47 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1953,7 +1953,7 @@ static void test_render_zero_triangles(void) 0 /*PrimCount */, NULL, D3DFMT_INDEX16, quad, sizeof(quad[0])); ok(hr == D3D_OK, "IDirect3DDevice8_DrawIndexedPrimitiveUP failed with %#08x\n", hr); - IDirect3DDevice8_EndScene(device); + hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed with %#08x\n", hr); } @@ -2675,13 +2675,13 @@ static void test_ApplyStateBlock(void) ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr); ok(!received, "Expected = FALSE, received TRUE.\n"); - IDirect3DDevice8_ApplyStateBlock(device, 0); + hr = IDirect3DDevice8_ApplyStateBlock(device, 0); ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr); hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ZENABLE, &received); ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr); ok(!received, "Expected FALSE, received TRUE.\n"); - IDirect3DDevice8_ApplyStateBlock(device, token); + hr = IDirect3DDevice8_ApplyStateBlock(device, token); ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr); hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ZENABLE, &received); ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr); diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 789cdf8..191cf08 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -282,7 +282,7 @@ static void lighting_test(IDirect3DDevice8 *device) 2 /*PrimCount */, Indices, D3DFMT_INDEX16, litnquad, sizeof(litnquad[0])); ok(hr == D3D_OK, "IDirect3DDevice8_DrawIndexedPrimitiveUP failed with %#08x\n", hr); - IDirect3DDevice8_EndScene(device); + hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed with %#08x\n", hr); } @@ -1018,7 +1018,7 @@ static void test_rcp_rsq(IDirect3DDevice8 *device) hr = IDirect3DDevice8_CreateVertexShader(device, decl, rcp_test, &shader, 0); ok(hr == D3D_OK, "IDirect3DDevice8_CreateVertexShader returned with %#08x\n", hr); - IDirect3DDevice8_SetVertexShader(device, shader); + hr = IDirect3DDevice8_SetVertexShader(device, shader); ok(hr == D3D_OK, "IDirect3DDevice8_SetVertexShader returned %#08x\n", hr); IDirect3DDevice8_SetVertexShaderConstant(device, 0, constant, 1); @@ -1048,7 +1048,7 @@ static void test_rcp_rsq(IDirect3DDevice8 *device) hr = IDirect3DDevice8_CreateVertexShader(device, decl, rsq_test, &shader, 0); ok(hr == D3D_OK, "IDirect3DDevice8_CreateVertexShader returned with %#08x\n", hr); - IDirect3DDevice8_SetVertexShader(device, shader); + hr = IDirect3DDevice8_SetVertexShader(device, shader); ok(hr == D3D_OK, "IDirect3DDevice8_SetVertexShader returned %#08x\n", hr); IDirect3DDevice8_SetVertexShaderConstant(device, 0, constant, 1); @@ -2267,7 +2267,7 @@ static void intz_test(IDirect3DDevice8 *device) /* Render offscreen, using the INTZ texture as depth buffer */ hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); - IDirect3DDevice8_SetPixelShader(device, 0); + hr = IDirect3DDevice8_SetPixelShader(device, 0); ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); /* Setup the depth/stencil surface. */ @@ -2324,7 +2324,7 @@ static void intz_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "GetSurfaceLevel failed, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, ds); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); - IDirect3DDevice8_SetPixelShader(device, 0); + hr = IDirect3DDevice8_SetPixelShader(device, 0); ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); @@ -2380,7 +2380,7 @@ static void intz_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "GetSurfaceLevel failed, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); - IDirect3DDevice8_SetPixelShader(device, 0); + hr = IDirect3DDevice8_SetPixelShader(device, 0); ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); @@ -2594,7 +2594,7 @@ static void shadow_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); - IDirect3DDevice8_SetPixelShader(device, 0); + hr = IDirect3DDevice8_SetPixelShader(device, 0); ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); /* Setup the depth/stencil surface. */

1 0

Henri Verbeet : ddraw/tests: Fix a couple of return value checks.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 9e44c4bc589df13233498bfd213191990bf9f251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e44c4bc589df13233498bfd2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 12 19:56:09 2012 +0100 ddraw/tests: Fix a couple of return value checks. --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddrawmodes.c | 2 +- dlls/ddraw/tests/dsurface.c | 10 +++++----- dlls/ddraw/tests/visual.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9ba428f..fbdaf4b 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1249,7 +1249,7 @@ static void test_ck_rgba(void) ok(SUCCEEDED(hr), "Failed to create destination surface, hr %#x.\n", hr); hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DTexture, (void **)&texture); ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); - IDirect3DTexture_GetHandle(texture, device, &texture_handle); + hr = IDirect3DTexture_GetHandle(texture, device, &texture_handle); ok(SUCCEEDED(hr), "Failed to get texture handle, hr %#x.\n", hr); IDirect3DTexture_Release(texture); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 6931364..7a47f73 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1511,7 +1511,7 @@ static void test_ck_rgba(void) ok(SUCCEEDED(hr), "Failed to create destination surface, hr %#x.\n", hr); hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DTexture2, (void **)&texture); ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); - IDirect3DTexture2_GetHandle(texture, device, &texture_handle); + hr = IDirect3DTexture2_GetHandle(texture, device, &texture_handle); ok(SUCCEEDED(hr), "Failed to get texture handle, hr %#x.\n", hr); IDirect3DTexture2_Release(texture); diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index a4b71fb..725750d 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -624,7 +624,7 @@ static void testsurface(void) SetBkColor(hdc, RGB(0, 0, 255)); SetTextColor(hdc, RGB(255, 255, 0)); TextOut(hdc, 0, 0, testMsg, lstrlen(testMsg)); - IDirectDrawSurface_ReleaseDC(lpDDSBack, hdc); + rc = IDirectDrawSurface_ReleaseDC(lpDDSBack, hdc); ok(rc==DD_OK, "IDirectDrawSurface_ReleaseDC returned: %x\n",rc); while (1) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 85a5d7a..2937258 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2947,7 +2947,7 @@ static void PaletteTest(void) if (FAILED(hr)) goto err; /* Read back the palette and verify the entries. Without DDPCAPS_ALLOW256 set / entry 0 and 255 should have been overwritten with black and white */ - IDirectDrawPalette_GetEntries(palette , 0, 0, 256, &palEntries[0]); + hr = IDirectDrawPalette_GetEntries(palette , 0, 0, 256, &palEntries[0]); ok(hr == DD_OK, "GetEntries failed with %08x\n", hr); if(hr == DD_OK) { @@ -2967,9 +2967,9 @@ static void PaletteTest(void) /* CreatePalette without DDPCAPS_ALLOW256 ignores entry 0 and 255, / now check we are able to update the entries afterwards. */ - IDirectDrawPalette_SetEntries(palette , 0, 0, 256, &Table[0]); + hr = IDirectDrawPalette_SetEntries(palette , 0, 0, 256, &Table[0]); ok(hr == DD_OK, "SetEntries failed with %08x\n", hr); - IDirectDrawPalette_GetEntries(palette , 0, 0, 256, &palEntries[0]); + hr = IDirectDrawPalette_GetEntries(palette , 0, 0, 256, &palEntries[0]); ok(hr == DD_OK, "GetEntries failed with %08x\n", hr); if(hr == DD_OK) { @@ -2987,7 +2987,7 @@ static void PaletteTest(void) ok(hr == DD_OK, "CreatePalette failed with %08x\n", hr); if (FAILED(hr)) goto err; - IDirectDrawPalette_GetEntries(palette , 0, 0, 256, &palEntries[0]); + hr = IDirectDrawPalette_GetEntries(palette , 0, 0, 256, &palEntries[0]); ok(hr == DD_OK, "GetEntries failed with %08x\n", hr); if(hr == DD_OK) { @@ -3752,7 +3752,7 @@ static void GetDCFormatTest(void) if(SUCCEEDED(hr)) { - IDirectDrawSurface7_ReleaseDC(surface, dc); + hr = IDirectDrawSurface7_ReleaseDC(surface, dc); ok(hr == DD_OK, "IDirectDrawSurface7_ReleaseDC failed, hr = 0x%08x\n", hr); dc = 0; } diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 1bac70c..73d2b1a 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -234,7 +234,7 @@ static void set_viewport_size(IDirect3DDevice7 *device) memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - IDirectDrawSurface7_GetSurfaceDesc(target, &ddsd); + hr = IDirectDrawSurface7_GetSurfaceDesc(target, &ddsd); ok(hr == D3D_OK, "IDirectDrawSurface7_GetSurfaceDesc returned %08x\n", hr); IDirectDrawSurface7_Release(target); @@ -360,7 +360,7 @@ static void lighting_test(IDirect3DDevice7 *device) Indices, 6 /* Indexcount */, 0 /* flags */); ok(hr == D3D_OK, "IDirect3DDevice7_DrawIndexedPrimitiveUP failed with %08x\n", hr); - IDirect3DDevice7_EndScene(device); + hr = IDirect3DDevice7_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed with %08x\n", hr); }

1 0

Henri Verbeet : ddraw: Get rid of IDirectDrawPaletteImpl.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: d0a37cdeb5f12461d081b9ab82f971182c469d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a37cdeb5f12461d081b9ab8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 12 19:56:10 2012 +0100 ddraw: Get rid of IDirectDrawPaletteImpl. --- dlls/ddraw/ddraw.c | 12 +++--- dlls/ddraw/ddraw_private.h | 11 +++--- dlls/ddraw/palette.c | 86 +++++++++++++++++-------------------------- dlls/ddraw/surface.c | 6 ++-- 4 files changed, 48 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0a37cdeb5f12461d081b…

1 0

Vincent Povirk : gdiplus: Rewrite SOFTWARE_GdipFillRegion to call brush_fill_pixels less.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: dc3a08d840186c7692cc3cae45bdd517ab099e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3a08d840186c7692cc3cae4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 14 13:50:59 2012 -0600 gdiplus: Rewrite SOFTWARE_GdipFillRegion to call brush_fill_pixels less. --- dlls/gdiplus/graphics.c | 186 ++++++++++++++++++++--------------------------- 1 files changed, 79 insertions(+), 107 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6cf0a68..ddae06e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -413,6 +413,61 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, } } +static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst_y, + const BYTE *src, INT src_width, INT src_height, INT src_stride, HRGN hregion) +{ + GpStatus stat=Ok; + + if (graphics->image && graphics->image->type == ImageTypeBitmap) + { + int i, size; + RGNDATA *rgndata; + RECT *rects; + + size = GetRegionData(hregion, 0, NULL); + + rgndata = GdipAlloc(size); + if (!rgndata) + return OutOfMemory; + + GetRegionData(hregion, size, rgndata); + + rects = (RECT*)&rgndata->Buffer; + + for (i=0; stat == Ok && i<rgndata->rdh.nCount; i++) + { + stat = alpha_blend_pixels(graphics, rects[i].left, rects[i].top, + &src[(rects[i].left - dst_x) * 4 + (rects[i].top - dst_y) * src_stride], + rects[i].right - rects[i].left, rects[i].bottom - rects[i].top, + src_stride); + } + + GdipFree(rgndata); + + return stat; + } + else if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + ERR("This should not be used for metafiles; fix caller\n"); + return NotImplemented; + } + else + { + int save; + + save = SaveDC(graphics->hdc); + + ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); + + stat = alpha_blend_pixels(graphics, dst_x, dst_y, src, src_width, + src_height, src_stride); + + RestoreDC(graphics->hdc, save); + + return stat; + } +} + static ARGB blend_colors(ARGB start, ARGB end, REAL position) { ARGB result=0; @@ -3928,12 +3983,12 @@ static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, { GpStatus stat; GpRegion *temp_region; - GpMatrix *world_to_device, *identity; + GpMatrix *world_to_device; GpRectF graphics_bounds; - UINT scans_count, i; - INT dummy; - GpRect *scans = NULL; DWORD *pixel_data; + HRGN hregion; + RECT bound_rect; + GpRect gp_bound_rect; if (!brush_can_fill_pixels(brush)) return NotImplemented; @@ -3959,125 +4014,42 @@ static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, stat = GdipCombineRegionRect(temp_region, &graphics_bounds, CombineModeIntersect); if (stat == Ok) - stat = GdipCreateMatrix(&identity); - - if (stat == Ok) - { - stat = GdipGetRegionScansCount(temp_region, &scans_count, identity); - - if (stat == Ok && scans_count != 0) - { - scans = GdipAlloc(sizeof(*scans) * scans_count); - if (!scans) - stat = OutOfMemory; - - if (stat == Ok) - { - stat = GdipGetRegionScansI(temp_region, scans, &dummy, identity); - - if (stat != Ok) - GdipFree(scans); - } - } - - GdipDeleteMatrix(identity); - } + stat = GdipGetRegionHRgn(temp_region, NULL, &hregion); GdipDeleteRegion(temp_region); } - if (stat == Ok && scans_count == 0) + if (stat == Ok && GetRgnBox(hregion, &bound_rect) == NULLREGION) + { + DeleteObject(hregion); return Ok; + } if (stat == Ok) { - if (!graphics->image) - { - /* If we have to go through gdi32, use as few alpha blends as possible. */ - INT min_x, min_y, max_x, max_y; - UINT data_width, data_height; - - min_x = scans[0].X; - min_y = scans[0].Y; - max_x = scans[0].X+scans[0].Width; - max_y = scans[0].Y+scans[0].Height; - - for (i=1; i<scans_count; i++) - { - min_x = min(min_x, scans[i].X); - min_y = min(min_y, scans[i].Y); - max_x = max(max_x, scans[i].X+scans[i].Width); - max_y = max(max_y, scans[i].Y+scans[i].Height); - } - - data_width = max_x - min_x; - data_height = max_y - min_y; + gp_bound_rect.X = bound_rect.left; + gp_bound_rect.Y = bound_rect.top; + gp_bound_rect.Width = bound_rect.right - bound_rect.left; + gp_bound_rect.Height = bound_rect.bottom - bound_rect.top; - pixel_data = GdipAlloc(sizeof(*pixel_data) * data_width * data_height); - if (!pixel_data) - stat = OutOfMemory; - - if (stat == Ok) - { - for (i=0; i<scans_count; i++) - { - stat = brush_fill_pixels(graphics, brush, - pixel_data + (scans[i].X - min_x) + (scans[i].Y - min_y) * data_width, - &scans[i], data_width); + pixel_data = GdipAlloc(sizeof(*pixel_data) * gp_bound_rect.Width * gp_bound_rect.Height); + if (!pixel_data) + stat = OutOfMemory; - if (stat != Ok) - break; - } - - if (stat == Ok) - { - stat = alpha_blend_pixels(graphics, min_x, min_y, - (BYTE*)pixel_data, data_width, data_height, - data_width * 4); - } - - GdipFree(pixel_data); - } - } - else + if (stat == Ok) { - UINT max_size=0; - - for (i=0; i<scans_count; i++) - { - UINT size = scans[i].Width * scans[i].Height; - - if (size > max_size) - max_size = size; - } - - pixel_data = GdipAlloc(sizeof(*pixel_data) * max_size); - if (!pixel_data) - stat = OutOfMemory; + stat = brush_fill_pixels(graphics, brush, pixel_data, + &gp_bound_rect, gp_bound_rect.Width); if (stat == Ok) - { - for (i=0; i<scans_count; i++) - { - stat = brush_fill_pixels(graphics, brush, pixel_data, &scans[i], - scans[i].Width); - - if (stat == Ok) - { - stat = alpha_blend_pixels(graphics, scans[i].X, scans[i].Y, - (BYTE*)pixel_data, scans[i].Width, scans[i].Height, - scans[i].Width * 4); - } + stat = alpha_blend_pixels_hrgn(graphics, gp_bound_rect.X, + gp_bound_rect.Y, (BYTE*)pixel_data, gp_bound_rect.Width, + gp_bound_rect.Height, gp_bound_rect.Width * 4, hregion); - if (stat != Ok) - break; - } - - GdipFree(pixel_data); - } + GdipFree(pixel_data); } - GdipFree(scans); + DeleteObject(hregion); } return stat;

1 0