June 2009 - Wine-Commits - list.winehq.org

Hans Leidekker : include: Add definition of IObjContext.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: ceee7415f58d52060ab25527c8ed1d492c838cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceee7415f58d52060ab25527c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 23 09:36:49 2009 +0200 include: Add definition of IObjContext. --- dlls/uuid/uuid.c | 1 + include/objidl.idl | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 840a346..18b4d55 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -32,6 +32,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "wingdi.h" #include "winuser.h" +#define USE_COM_CONTEXT_DEF #include "objbase.h" #include "servprov.h" diff --git a/include/objidl.idl b/include/objidl.idl index 29b907d..2aa6065 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -2454,4 +2454,21 @@ interface IContext : IUnknown [out] IEnumContextProps **ppEnumContextProps); } +[ + local, + object, + uuid(000001c6-0000-0000-c000-000000000046), + pointer_default(unique) +] +interface IObjContext : IContext +{ + void Reserved1(); + void Reserved2(); + void Reserved3(); + void Reserved4(); + void Reserved5(); + void Reserved6(); + void Reserved7(); +} + cpp_quote("#endif /* defined USE_COM_CONTEXT_DEF */")

1 0

Hans Leidekker : ntdll: Don't return success from the NtQueryEvent stub.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: 3a4386679053afdc6d6c5de5b0c0154234c90fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a4386679053afdc6d6c5de5b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 23 09:35:48 2009 +0200 ntdll: Don't return success from the NtQueryEvent stub. --- dlls/ntdll/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 6051f62..f3f969a 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -402,7 +402,7 @@ NTSTATUS WINAPI NtQueryEvent ( OUT PULONG ReturnLength) { FIXME("(%p)\n", EventHandle); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } /*

1 0

Henri Verbeet : d3d9/tests: Make sure the device is released properly.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: c672071db70d0932631d92ddebc6ec65a9947c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c672071db70d0932631d92dde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 23 09:05:32 2009 +0200 d3d9/tests: Make sure the device is released properly. --- dlls/d3d9/tests/device.c | 105 ++++++++++++++++++++++++++++++++++----------- dlls/d3d9/tests/query.c | 16 +++++-- 2 files changed, 91 insertions(+), 30 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 41c6d47..279c065 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -130,9 +130,13 @@ static void test_mipmap_levels(void) check_mipmap_levels(pDevice, 1, 256, 9); check_mipmap_levels(pDevice, 1, 1, 1); - cleanup: - if (pD3d) IUnknown_Release( pD3d ); - if (pDevice) IUnknown_Release( pDevice ); +cleanup: + if (pDevice) + { + UINT refcount = IUnknown_Release( pDevice ); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IUnknown_Release( pD3d ); DestroyWindow( hwnd ); } @@ -186,8 +190,12 @@ static void test_checkdevicemultisampletype(void) ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); cleanup: - if (pD3d) IUnknown_Release( pD3d ); - if (pDevice) IUnknown_Release( pDevice ); + if (pDevice) + { + UINT refcount = IUnknown_Release( pDevice ); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IUnknown_Release( pD3d ); DestroyWindow( hwnd ); } @@ -326,12 +334,16 @@ static void test_swapchain(void) ok(swapchainX == NULL, "The swapchain pointer is %p\n", swapchainX); if(swapchainX && swapchainX != (void *) 0xdeadbeef ) IDirect3DSwapChain9_Release(swapchainX); - cleanup: +cleanup: if(swapchain1) IDirect3DSwapChain9_Release(swapchain1); if(swapchain2) IDirect3DSwapChain9_Release(swapchain2); if(swapchain3) IDirect3DSwapChain9_Release(swapchain3); - if(pDevice) IDirect3DDevice9_Release(pDevice); - if(pD3d) IDirect3DDevice9_Release(pD3d); + if (pDevice) + { + UINT refcount = IDirect3DDevice9_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IDirect3D9_Release(pD3d); DestroyWindow( hwnd ); } @@ -760,8 +772,12 @@ static void test_cursor(void) ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ cleanup: - if(pDevice) IDirect3D9_Release(pDevice); - if(pD3d) IDirect3D9_Release(pD3d); + if (pDevice) + { + UINT refcount = IDirect3DDevice9_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IDirect3D9_Release(pD3d); DestroyWindow( hwnd ); } @@ -1145,8 +1161,12 @@ static void test_reset(void) cleanup: HeapFree(GetProcessHeap(), 0, modes); - if(pD3d) IDirect3D9_Release(pD3d); - if(pDevice) IDirect3D9_Release(pDevice); + if (pDevice) + { + UINT refcount = IDirect3DDevice9_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IDirect3D9_Release(pD3d); } /* Test adapter display modes */ @@ -1389,8 +1409,12 @@ cleanup: if(pSurface1) IDirect3DSurface9_Release(pSurface1); if(pSurface2) IDirect3DSurface9_Release(pSurface2); if(pSurface3) IDirect3DSurface9_Release(pSurface3); - if(pD3d) IDirect3D9_Release(pD3d); - if(pDevice) IDirect3D9_Release(pDevice); + if (pDevice) + { + UINT refcount = IDirect3DDevice9_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IDirect3D9_Release(pD3d); if(hwnd) DestroyWindow(hwnd); } @@ -1456,8 +1480,12 @@ static void test_limits(void) */ cleanup: if(pTexture) IDirect3DTexture9_Release(pTexture); - if(pD3d) IDirect3D9_Release(pD3d); - if(pDevice) IDirect3D9_Release(pDevice); + if (pDevice) + { + UINT refcount = IDirect3D9_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IDirect3D9_Release(pD3d); if(hwnd) DestroyWindow(hwnd); } @@ -1615,8 +1643,12 @@ static void test_depthstenciltest(void) cleanup: if(pDepthStencil) IDirect3DSurface9_Release(pDepthStencil); - if(pD3d) IDirect3D9_Release(pD3d); - if(pDevice) IDirect3D9_Release(pDevice); + if (pDevice) + { + UINT refcount = IDirect3D9_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IDirect3D9_Release(pD3d); if(hwnd) DestroyWindow(hwnd); } @@ -1739,8 +1771,12 @@ static void test_draw_indexed(void) IDirect3DVertexDeclaration9_Release(vertex_declaration); cleanup: + if (device) + { + UINT refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } if (d3d9) IDirect3D9_Release(d3d9); - if (device) IDirect3DDevice9_Release(device); if (hwnd) DestroyWindow(hwnd); } @@ -1831,7 +1867,11 @@ cleanup: if (buffer) IDirect3DVertexBuffer9_Release(buffer); if(decl) IDirect3DVertexDeclaration9_Release(decl); if(shader) IDirect3DVertexShader9_Release(shader); - if(device) IDirect3DDevice9_Release(device); + if (device) + { + UINT refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } if(d3d9) IDirect3D9_Release(d3d9); } @@ -1901,8 +1941,13 @@ static void test_vertex_buffer_alignment(void) } } - cleanup: - if(d3d9) IDirect3D9_Release(d3d9); +cleanup: + if (device) + { + UINT refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (d3d9) IDirect3D9_Release(d3d9); } static void test_lights(void) @@ -1963,8 +2008,12 @@ static void test_lights(void) ok(hr == D3D_OK, "Disabling light %u failed with %08x\n", i, hr); } - cleanup: - if(device) IDirect3DDevice9_Release(device); +cleanup: + if (device) + { + UINT refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } if(d3d9) IDirect3D9_Release(d3d9); } @@ -2037,9 +2086,13 @@ static void test_set_stream_source(void) hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); ok(hr == D3D_OK, "Failed to set the stream source, offset 4, hr = %08x\n", hr); - if(pVertexBuffer) IDirect3DDevice9_Release(pVertexBuffer); cleanup: - if(device) IDirect3DDevice9_Release(device); + if (pVertexBuffer) IDirect3DVertexBuffer9_Release(pVertexBuffer); + if (device) + { + UINT refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } if(d3d9) IDirect3D9_Release(d3d9); } diff --git a/dlls/d3d9/tests/query.c b/dlls/d3d9/tests/query.c index 5a75907..d015353 100644 --- a/dlls/d3d9/tests/query.c +++ b/dlls/d3d9/tests/query.c @@ -130,8 +130,12 @@ static void test_query_support(IDirect3D9 *pD3d, HWND hwnd) } } - cleanup: - if(pDevice) IDirect3DDevice9_Release(pDevice); +cleanup: + if (pDevice) + { + UINT refcount = IDirect3DDevice9_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } } static void test_occlusion_query_states(IDirect3D9 *pD3d, HWND hwnd) @@ -226,10 +230,14 @@ static void test_occlusion_query_states(IDirect3D9 *pD3d, HWND hwnd) hr = IDirect3DQuery9_Issue(pQuery, D3DISSUE_END); ok(hr == D3D_OK, "IDirect3DQuery9_Issue(D3DISSUE_END) on a ended query returned %08x\n", hr); - cleanup: +cleanup: HeapFree(GetProcessHeap(), 0, data); if (pQuery) IDirect3DQuery9_Release(pQuery); - if(pDevice) IDirect3DDevice9_Release(pDevice); + if (pDevice) + { + UINT refcount = IDirect3DDevice9_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } } START_TEST(query)

1 0

Henri Verbeet : d3d9/tests: Release the query in test_occlusion_query_states().
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: ad05c39fd7f8a1d47364c26df4fdbd24b5b853af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad05c39fd7f8a1d47364c26df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 23 09:05:31 2009 +0200 d3d9/tests: Release the query in test_occlusion_query_states(). --- dlls/d3d9/tests/query.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/query.c b/dlls/d3d9/tests/query.c index 8fc66e9..5a75907 100644 --- a/dlls/d3d9/tests/query.c +++ b/dlls/d3d9/tests/query.c @@ -228,6 +228,7 @@ static void test_occlusion_query_states(IDirect3D9 *pD3d, HWND hwnd) cleanup: HeapFree(GetProcessHeap(), 0, data); + if (pQuery) IDirect3DQuery9_Release(pQuery); if(pDevice) IDirect3DDevice9_Release(pDevice); }

1 0

Paul Vriens : user32/tests: Prevent some 'deadcode' (Coverity).
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: 3b437b550d4057043f9d8fc5ced7cca8ed31f0ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b437b550d4057043f9d8fc5c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 23 08:14:29 2009 +0200 user32/tests: Prevent some 'deadcode' (Coverity). --- dlls/user32/tests/cursoricon.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 26c533b..b15acc2 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1218,11 +1218,6 @@ static void test_DrawIconEx(void) check_alpha_draw(hdcDst, TRUE, FALSE, 32, __LINE__); todo_wine check_alpha_draw(hdcDst, TRUE, TRUE, 32, __LINE__); - SelectObject(hdcDst, bmpOld); - DeleteObject(bmpDst); - bmpOld = NULL; - bmpDst = NULL; - cleanup: if(bmpOld) SelectObject(hdcDst, bmpOld);

1 0

Paul Vriens : crypt32/tests: Fix a test (logical || with non-zero constant) .
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: bc8716439e191d1cab694a21de034e026d8d944a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc8716439e191d1cab694a21d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 23 07:49:27 2009 +0200 crypt32/tests: Fix a test (logical || with non-zero constant). --- dlls/crypt32/tests/encode.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 3e99800..e23c559 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5520,7 +5520,8 @@ static void test_decodeCTL(DWORD dwEncoding) SetLastError(0xdeadbeef); ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithBogusEntry, sizeof(ctlWithBogusEntry), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || CRYPT_E_ASN1_CORRUPT), + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_EOD || GetLastError() == CRYPT_E_ASN1_CORRUPT), "expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); info.SubjectAlgorithm.Parameters.cbData = 0;

1 0

Henri Verbeet : d3d8/tests: Make sure the device is released properly.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: f0e830756683a54d6e4bf862d40202aa4be80e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e830756683a54d6e4bf862d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 23 09:05:33 2009 +0200 d3d8/tests: Make sure the device is released properly. --- dlls/d3d8/tests/device.c | 88 +++++++++++++++++++++++++++++++++------------ 1 files changed, 64 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f039a1b..97f64a1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -144,9 +144,13 @@ static void test_mipmap_levels(void) check_mipmap_levels(pDevice, 1, 256, 9); check_mipmap_levels(pDevice, 1, 1, 1); - cleanup: - if (pD3d) IUnknown_Release( pD3d ); - if (pDevice) IUnknown_Release( pDevice ); +cleanup: + if (pDevice) + { + UINT refcount = IUnknown_Release( pDevice ); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IUnknown_Release( pD3d ); DestroyWindow( hwnd ); } @@ -259,12 +263,16 @@ static void test_swapchain(void) ok(backbuffer == (void *) 0xdeadbeef, "The back buffer pointer was modified (%p)\n", backbuffer); if(backbuffer && backbuffer != (void *) 0xdeadbeef) IDirect3DSurface8_Release(backbuffer); - cleanup: +cleanup: if(swapchain1) IDirect3DSwapChain8_Release(swapchain1); if(swapchain2) IDirect3DSwapChain8_Release(swapchain2); if(swapchain3) IDirect3DSwapChain8_Release(swapchain3); - if(pDevice) IDirect3DDevice8_Release(pDevice); - if(pD3d) IDirect3DDevice8_Release(pD3d); + if (pDevice) + { + UINT refcount = IDirect3DDevice8_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IDirect3D8_Release(pD3d); DestroyWindow( hwnd ); } @@ -691,8 +699,12 @@ static void test_cursor(void) ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ cleanup: - if(pD3d) IDirect3D8_Release(pD3d); - if(pDevice) IDirect3D8_Release(pDevice); + if (pDevice) + { + UINT refcount = IDirect3DDevice8_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IDirect3D8_Release(pD3d); } static void test_states(void) @@ -732,8 +744,12 @@ static void test_states(void) ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState(D3DRS_ZVISIBLE, FALSE) returned %#08x\n", hr); cleanup: - if(pD3d) IDirect3D8_Release(pD3d); - if(pDevice) IDirect3D8_Release(pDevice); + if (pDevice) + { + UINT refcount = IDirect3DDevice8_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IDirect3D8_Release(pD3d); } static void test_shader_versions(void) @@ -851,8 +867,12 @@ static void test_scene(void) /* StretchRect does not exit in Direct3D8, so no equivalent to the d3d9 stretchrect tests */ cleanup: - if(pD3d) IDirect3D8_Release(pD3d); - if(pDevice) IDirect3D8_Release(pDevice); + if (pDevice) + { + UINT refcount = IDirect3DDevice8_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IDirect3D8_Release(pD3d); if(hwnd) DestroyWindow(hwnd); } @@ -1096,8 +1116,12 @@ static void test_shader(void) ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_DeleteVertexShader returned %#08x\n", hr); cleanup: - if(pD3d) IDirect3D8_Release(pD3d); - if(pDevice) IDirect3D8_Release(pDevice); + if (pDevice) + { + UINT refcount = IDirect3DDevice8_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IDirect3D8_Release(pD3d); if(hwnd) DestroyWindow(hwnd); } @@ -1158,8 +1182,12 @@ static void test_limits(void) cleanup: if(pTexture) IDirect3DTexture8_Release(pTexture); - if(pD3d) IDirect3D8_Release(pD3d); - if(pDevice) IDirect3D8_Release(pDevice); + if (pDevice) + { + UINT refcount = IDirect3DDevice8_Release(pDevice); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (pD3d) IDirect3D8_Release(pD3d); if(hwnd) DestroyWindow(hwnd); } @@ -1230,9 +1258,13 @@ static void test_lights(void) ok(hr == D3D_OK, "Disabling light %u failed with %08x\n", i, hr); } - cleanup: - if(device) IDirect3DDevice8_Release(device); - if(d3d8) IDirect3D8_Release(d3d8); +cleanup: + if (device) + { + UINT refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (d3d8) IDirect3D8_Release(d3d8); } static void test_render_zero_triangles(void) @@ -1300,9 +1332,13 @@ static void test_render_zero_triangles(void) IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - cleanup: - if(device) IDirect3DDevice8_Release(device); - if(d3d8) IDirect3D8_Release(d3d8); +cleanup: + if (device) + { + UINT refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (d3d8) IDirect3D8_Release(d3d8); } static void test_depth_stencil_reset(void) @@ -1410,8 +1446,12 @@ static void test_depth_stencil_reset(void) if (surface) IDirect3DSurface8_Release(surface); cleanup: - if(d3d8) IDirect3D8_Release(d3d8); - if(device) IDirect3D8_Release(device); + if (device) + { + UINT refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (d3d8) IDirect3D8_Release(d3d8); } START_TEST(device)

1 0

Henri Verbeet : d3d9/tests: Release the vertex buffer in test_null_stream() .
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: 6cc2f9573aa0f6a215505bd4d812d04260d7b0f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc2f9573aa0f6a215505bd4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 23 09:05:30 2009 +0200 d3d9/tests: Release the vertex buffer in test_null_stream(). --- dlls/d3d9/tests/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5610a71..41c6d47 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1828,6 +1828,7 @@ static void test_null_stream(void) IDirect3DDevice9_SetVertexDeclaration(device, NULL); cleanup: + if (buffer) IDirect3DVertexBuffer9_Release(buffer); if(decl) IDirect3DVertexDeclaration9_Release(decl); if(shader) IDirect3DVertexShader9_Release(shader); if(device) IDirect3DDevice9_Release(device);

1 0

Henri Verbeet : wined3d: Fix a comment.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: 114b5bdefbfbb678a48a757304699e587c42155d URL: http://source.winehq.org/git/wine.git/?a=commit;h=114b5bdefbfbb678a48a75730… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 23 09:05:34 2009 +0200 wined3d: Fix a comment. This was actually broken by 122af07a3034ddd2e0e74d9166df442a0e263e9a. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 44b4fce..710cf68 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2308,7 +2308,6 @@ static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) } } -/* GL locking is done by the caller */ static void shader_hw_sgn(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; @@ -2655,6 +2654,7 @@ static void shader_hw_texldl(const struct wined3d_shader_instruction *ins) shader_hw_sample(ins, sampler_idx, reg_dest, reg_coord, flags, NULL, NULL); } +/* GL locking is done by the caller */ static GLuint create_arb_blt_vertex_program(const WineD3D_GL_Info *gl_info) { GLuint program_id = 0;

1 0

Paul Vriens : d3d9/tests: Use color_match (( logical || with non-zero constant).
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: d8669f9e41a743be6fe2cdf5596f7818dee2d334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8669f9e41a743be6fe2cdf55… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 23 08:04:47 2009 +0200 d3d9/tests: Use color_match ((logical || with non-zero constant). --- dlls/d3d9/tests/visual.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 410246b..23258cc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3265,13 +3265,13 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); color = getPixelColor(device, 160, 360); - ok(color == 0x00FFFF00 || color == 0x00FEFE00, "quad 1 has color %08x, expected 0x00FFFF00\n", color); + ok(color_match(color, 0x00FFFF00, 1), "quad 1 has color %08x, expected 0x00FFFF00\n", color); color = getPixelColor(device, 160, 120); ok(color == 0x00000000, "quad 2 has color %08x, expected 0x0000000\n", color); color = getPixelColor(device, 480, 120); - ok(color == 0x0000FF00 || color == 0x0000FE00, "quad 3 has color %08x, expected 0x0000FF00\n", color); + ok(color_match(color, 0x0000FF00, 1), "quad 3 has color %08x, expected 0x0000FF00\n", color); color = getPixelColor(device, 480, 360); - ok(color == 0x00FF0000 || 0x00FE0000, "quad 4 has color %08x, expected 0x00FF0000\n", color); + ok(color_match(color, 0x00FF0000, 1), "quad 4 has color %08x, expected 0x00FF0000\n", color); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); @@ -3352,14 +3352,14 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); color = getPixelColor(device, 160, 360); - ok(color == 0x00FF0000 || color == 0x00FE0000, "quad 1 has color %08x, expected 0x00FF0000\n", color); + ok(color_match(color, 0x00FF0000, 1), "quad 1 has color %08x, expected 0x00FF0000\n", color); color = getPixelColor(device, 160, 120); ok(color == 0x00000000, "quad 2 has color %08x, expected 0x0000000\n", color); color = getPixelColor(device, 480, 120); - ok(color == 0x00ff8000 || color == 0x00fe7f00 || color == 0x00000000, + ok(color_match(color, 0x00ff8000, 1) || color == 0x00000000, "quad 3 has color %08x, expected 0x00ff8000\n", color); color = getPixelColor(device, 480, 360); - ok(color == 0x0033cc00 || color == 0x0032cb00 || color == 0x00FF0000 || color == 0x00FE0000, + ok(color_match(color, 0x0033cc00, 1) || color_match(color, 0x00FF0000, 1), "quad 4 has color %08x, expected 0x0033cc00\n", color); IDirect3DTexture9_Release(texture);

1 0