April 2014 - Wine-commits - list.winehq.org

Piotr Caban : msvcr90: Share the source code with msvcrt.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: a6e53eaed215447af648cce63e0b68fe234ceaa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e53eaed215447af648cce63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 16 16:15:41 2014 +0200 msvcr90: Share the source code with msvcrt. --- dlls/msvcr90/Makefile.in | 32 +- dlls/msvcr90/msvcr90.c | 199 ---- dlls/msvcr90/msvcr90.spec | 2418 ++++++++++++++++++++++----------------------- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/main.c | 4 + dlls/msvcrt/msvcrt.h | 1 + tools/make_specfiles | 1 - 7 files changed, 1245 insertions(+), 1412 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6e53eaed215447af648c…

1 0

Nikolay Sivov : svchost: Simplify error handling, fix trace message.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 463f91dce16578829bc0593d87ae3ce794939174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=463f91dce16578829bc0593d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 23:20:49 2014 +0400 svchost: Simplify error handling, fix trace message. --- programs/svchost/svchost.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/programs/svchost/svchost.c b/programs/svchost/svchost.c index 573a6a3..8713b4a 100644 --- a/programs/svchost/svchost.c +++ b/programs/svchost/svchost.c @@ -254,6 +254,7 @@ static BOOL StartGroupServices(LPWSTR services) LPWSTR service_name = NULL; SERVICE_TABLE_ENTRYW *service_table = NULL; DWORD service_count; + BOOL ret; /* Count the services to load */ service_count = 0; @@ -264,8 +265,7 @@ static BOOL StartGroupServices(LPWSTR services) service_name = service_name + lstrlenW(service_name); ++service_name; } - WINE_TRACE("Service group %s contains %d services\n", - wine_dbgstr_w(services), service_count); + WINE_TRACE("Service group contains %d services\n", service_count); /* Populate the service table */ service_table = HeapAlloc(GetProcessHeap(), 0, @@ -287,15 +287,12 @@ static BOOL StartGroupServices(LPWSTR services) service_table[service_count].lpServiceProc = NULL; /* Start the services */ - if (!StartServiceCtrlDispatcherW(service_table)) - { + if (!(ret = StartServiceCtrlDispatcherW(service_table))) WINE_ERR("StartServiceCtrlDispatcherW failed to start %s: %u\n", wine_dbgstr_w(services), GetLastError()); - HeapFree(GetProcessHeap(), 0, service_table); - return FALSE; - } + HeapFree(GetProcessHeap(), 0, service_table); - return TRUE; + return ret; } /* Find the list of services associated with a group name and start those @@ -327,14 +324,11 @@ static BOOL LoadGroup(PWCHAR group_name) } /* Start services */ - if (StartGroupServices(services) == FALSE) - { + if (!(ret = StartGroupServices(services))) WINE_TRACE("Failed to start service group\n"); - HeapFree(GetProcessHeap(), 0, services); - return FALSE; - } + HeapFree(GetProcessHeap(), 0, services); - return TRUE; + return ret; } /* Load svchost group specified on the command line via the /k option */

1 0

Austin English : user.exe16: Downgrade a couple MESSAGEs to WARNs.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 39730102aa84ad4718b2eec41cbb595017d618dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=39730102aa84ad4718b2eec41… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 15 17:12:48 2014 -0700 user.exe16: Downgrade a couple MESSAGEs to WARNs. --- dlls/user.exe16/message.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 48799ab..935b025 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -882,14 +882,14 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 case 0: if (hi) { - MESSAGE("DDE_ACK: neither atom nor handle!!!\n"); + WARN("DDE_ACK: neither atom nor handle!!!\n"); hi = 0; } break; case 1: break; /* atom, nothing to do */ case 3: - MESSAGE("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); + WARN("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); /* fall through */ case 2: hi = convert_handle_16_to_32(hi, GMEM_DDESHARE); @@ -1262,14 +1262,14 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case 0: if (hi) { - MESSAGE("DDE_ACK: neither atom nor handle!!!\n"); + WARN("DDE_ACK: neither atom nor handle!!!\n"); hi = 0; } break; case 1: break; /* atom, nothing to do */ case 3: - MESSAGE("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); + WARN("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); /* fall through */ case 2: hi = convert_handle_32_to_16(hi, GMEM_DDESHARE);

1 0

Nikolay Sivov : msxml3/tests: Fix accessing released intreface pointer.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 026c861794a43bc8e538bc4fdff97f32bc71a79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=026c861794a43bc8e538bc4fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 16 08:35:50 2014 +0400 msxml3/tests: Fix accessing released intreface pointer. --- dlls/msxml3/tests/domdoc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 50f0941..1a2ec5e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -376,9 +376,10 @@ static void _expect_no_children(IXMLDOMNode *node, int line) #define EXPECT_REF(node,ref) _expect_ref((IUnknown*)node, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } #define EXPECT_LIST_LEN(list,len) _expect_list_len(list, len, __LINE__) @@ -2493,18 +2494,18 @@ todo_wine { EXPECT_REF(elem2, 2); todo_wine ok(unk == unk2, "got %p and %p\n", unk, unk2); - IUnknown_Release(unk); - IUnknown_Release(unk2); /* IUnknown refcount is not affected by node refcount */ - todo_wine EXPECT_REF(unk2, 3); + todo_wine EXPECT_REF(unk2, 4); IXMLDOMElement_AddRef(elem2); - todo_wine EXPECT_REF(unk2, 3); + todo_wine EXPECT_REF(unk2, 4); IXMLDOMElement_Release(elem2); IXMLDOMElement_Release(elem2); - todo_wine EXPECT_REF(unk2, 2); + todo_wine EXPECT_REF(unk2, 3); + + IUnknown_Release(unk2); hr = IXMLDOMElement_get_childNodes( element, &node_list ); EXPECT_HR(hr, S_OK);

1 0

Nikolay Sivov : urlmon/tests: Fix use after free of IPersistStream interface.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 96cf9a289895d2cfce0fcb06896bc94f68494d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96cf9a289895d2cfce0fcb068… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 16 08:47:45 2014 +0400 urlmon/tests: Fix use after free of IPersistStream interface. --- dlls/urlmon/tests/uri.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index cf10cb2..f142ffb 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -11299,7 +11299,6 @@ static void test_IPersistStream(void) ok(props == 0, "%d) Not all properties were processed %d. Next property type: %d\n", i, props, dw_data[0]); - IPersistStream_Release(persist_stream); IUri_Release(uri); hr = IStream_Seek(stream, no_off, STREAM_SEEK_SET, NULL); @@ -11307,6 +11306,8 @@ static void test_IPersistStream(void) hr = IPersistStream_GetClassID(persist_stream, &curi); ok(hr == S_OK, "%d) GetClassID failed 0x%08x, expected S_OK.\n", i, hr); ok(IsEqualCLSID(&curi, &CLSID_CUri), "%d) GetClassID returned incorrect CLSID.\n", i); + IPersistStream_Release(persist_stream); + hr = CoCreateInstance(&curi, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUri, (void**)&uri); ok(hr == S_OK, "%d) Error creating uninitialized Uri: 0x%08x.\n", i, hr); @@ -11322,6 +11323,7 @@ static void test_IPersistStream(void) "%d) Expected %s but got %s.\n", i, test->str_props[Uri_PROPERTY_RAW_URI].value, wine_dbgstr_w(raw_uri)); SysFreeString(raw_uri); + IPersistStream_Release(persist_stream); hr = IUri_QueryInterface(uri, &IID_IMarshal, (void**)&marshal); ok(hr == S_OK, "%d) QueryInterface(IID_IMarshal) failed 0x%08x, expected S_OK.\n", i, hr); @@ -11395,7 +11397,6 @@ static void test_IPersistStream(void) IMarshal_Release(marshal); IStream_Release(stream); - IPersistStream_Release(persist_stream); IUri_Release(uri); heap_free(uriW); }

1 0

Henri Verbeet : d3d8/tests: Use a separate device for volume_dxt5_test().
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: d93cbeca511856aad65675f24ad5ee9f079160f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93cbeca511856aad65675f24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 16 08:55:21 2014 +0200 d3d8/tests: Use a separate device for volume_dxt5_test(). --- dlls/d3d8/tests/visual.c | 52 ++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ce4de4a..e3e33e2 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4046,14 +4046,18 @@ static void fog_special_test(IDirect3DDevice8 *device) IDirect3DDevice8_DeletePixelShader(device, ps); } -static void volume_dxt5_test(IDirect3DDevice8 *device) +static void volume_dxt5_test(void) { - HRESULT hr; - IDirect3D8 *d3d8; IDirect3DVolumeTexture8 *texture; + IDirect3DDevice8 *device; D3DLOCKED_BOX box; + IDirect3D8 *d3d; unsigned int i; - DWORD color; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + static const char texture_data[] = { /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ @@ -4070,26 +4074,33 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) quads[] = { {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, - {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, - {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, }; static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; - hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); - ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); - hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5); - IDirect3D8_Release(d3d8); - if (FAILED(hr)) + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) { - skip("Volume dxt5 textures are not supported, skipping test.\n"); - return; + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + if (FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5))) + { + skip("Volume DXT5 textures are not supported, skipping test.\n"); + IDirect3DDevice8_Release(device); + goto done; } hr = IDirect3DDevice8_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, @@ -4115,7 +4126,7 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAGFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); hr = IDirect3DDevice8_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); @@ -4135,11 +4146,12 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); } - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); IDirect3DVolumeTexture8_Release(texture); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void volume_v16u16_test(void) @@ -4748,7 +4760,6 @@ START_TEST(visual) zenable_test(device_ptr); resz_test(device_ptr); fog_special_test(device_ptr); - volume_dxt5_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4756,6 +4767,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + volume_dxt5_test(); volume_v16u16_test(); add_dirty_rect_test(); }

1 0

Henri Verbeet : d3d8/tests: Use a separate device for fog_special_test().
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: b17ff75649634f67aff2bcf386072fa143ec50e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17ff75649634f67aff2bcf38… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 16 08:55:22 2014 +0200 d3d8/tests: Use a separate device for fog_special_test(). --- dlls/d3d8/tests/visual.c | 67 +++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e3e33e2..702c299 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3879,8 +3879,23 @@ static void zenable_test(IDirect3DDevice8 *device) } } -static void fog_special_test(IDirect3DDevice8 *device) +static void fog_special_test(void) { + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + D3DCAPS8 caps; + DWORD ps, vs; + HWND window; + HRESULT hr; + union + { + float f; + DWORD d; + } conv; + static const struct { struct vec3 position; @@ -3889,8 +3904,8 @@ static void fog_special_test(IDirect3DDevice8 *device) quad[] = { {{ -1.0f, -1.0f, 0.0f}, 0xff00ff00}, - {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, {{ -1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, {{ 1.0f, 1.0f, 1.0f}, 0xff00ff00} }; static const struct @@ -3931,16 +3946,23 @@ static void fog_special_test(IDirect3DDevice8 *device) 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ 0x0000ffff }; - union + static const D3DMATRIX identity = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) { - float f; - DWORD d; - } conv; - DWORD color; - HRESULT hr; - unsigned int i; - DWORD ps, vs; - D3DCAPS8 caps; + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); @@ -3965,6 +3987,14 @@ static void fog_special_test(IDirect3DDevice8 *device) ps = 0; } + /* The table fog tests seem to depend on the projection matrix explicitly + * being set to an identity matrix, even though that's the default. + * (AMD Radeon HD 6310, Windows 7) */ + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &identity); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); ok(SUCCEEDED(hr), "Failed to enable fog, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGCOLOR, 0xffff0000); @@ -3978,7 +4008,7 @@ static void fog_special_test(IDirect3DDevice8 *device) for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); if (!tests[i].vs) @@ -4034,16 +4064,15 @@ static void fog_special_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); } - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetPixelShader(device, 0); - ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, 0); - ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); if (vs) IDirect3DDevice8_DeleteVertexShader(device, vs); if (ps) IDirect3DDevice8_DeletePixelShader(device, ps); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void volume_dxt5_test(void) @@ -4759,7 +4788,6 @@ START_TEST(visual) multisample_copy_rects_test(device_ptr); zenable_test(device_ptr); resz_test(device_ptr); - fog_special_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4767,6 +4795,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + fog_special_test(); volume_dxt5_test(); volume_v16u16_test(); add_dirty_rect_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for resz_test().
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 46a7517fed4022fb4653dc067bec56b24f93ed65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a7517fed4022fb4653dc067… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 16 08:55:23 2014 +0200 d3d8/tests: Use a separate device for resz_test(). --- dlls/d3d8/tests/visual.c | 82 ++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 702c299..05f576e 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3429,13 +3429,19 @@ static void multisample_copy_rects_test(IDirect3DDevice8 *device) IDirect3DSurface8_Release(rt); } -static void resz_test(IDirect3DDevice8 *device) +static void resz_test(void) { IDirect3DSurface8 *rt, *original_rt, *ds, *original_ds, *intz_ds; - IDirect3D8 *d3d8; + IDirect3DTexture8 *texture; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + DWORD ps, value; + unsigned int i; + ULONG refcount; D3DCAPS8 caps; + HWND window; HRESULT hr; - unsigned int i; + static const DWORD ps_code[] = { 0xffff0101, /* ps_1_1 */ @@ -3450,7 +3456,7 @@ static void resz_test(IDirect3DDevice8 *device) 0x40000001, 0x80080000, 0xa0aa0002, /* +mov r0.w, c2.z */ 0x0000ffff, /* end */ }; - struct + static const struct { float x, y, z; float s0, t0, p0; @@ -3463,7 +3469,7 @@ static void resz_test(IDirect3DDevice8 *device) { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.5f}, }; - struct + static const struct { UINT x, y; D3DCOLOR color; @@ -3479,47 +3485,53 @@ static void resz_test(IDirect3DDevice8 *device) {400, 450, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)}, {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, }; - IDirect3DTexture8 *texture; - DWORD ps, value; - hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); - ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); - hr = IDirect3D8_CheckDeviceMultiSampleType(d3d8, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES); - if (FAILED(hr)) + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) { skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping RESZ test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } - hr = IDirect3D8_CheckDeviceMultiSampleType(d3d8, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_D24S8, TRUE, D3DMULTISAMPLE_2_SAMPLES); - if (FAILED(hr)) + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_D24S8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) { skip("Multisampling not supported for D3DFMT_D24S8, skipping RESZ test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } - hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('I','N','T','Z')); - if (FAILED(hr)) + if (FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('I','N','T','Z')))) { skip("No INTZ support, skipping RESZ test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } - hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, MAKEFOURCC('R','E','S','Z')); - if (FAILED(hr)) + if (FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, MAKEFOURCC('R','E','S','Z')))) { skip("No RESZ support, skipping RESZ test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } - IDirect3D8_Release(d3d8); hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) { skip("No unconditional NP2 texture support, skipping INTZ test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } hr = IDirect3DDevice8_GetRenderTarget(device, &original_rt); @@ -3729,20 +3741,18 @@ static void resz_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); - hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, original_ds); - ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); IDirect3DSurface8_Release(ds); - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 1, NULL); - ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); IDirect3DTexture8_Release(texture); - hr = IDirect3DDevice8_SetPixelShader(device, 0); - ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); hr = IDirect3DDevice8_DeletePixelShader(device, ps); ok(SUCCEEDED(hr), "DeletePixelShader failed, hr %#x.\n", hr); IDirect3DSurface8_Release(original_ds); IDirect3DSurface8_Release(original_rt); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void zenable_test(IDirect3DDevice8 *device) @@ -4787,7 +4797,6 @@ START_TEST(visual) shadow_test(device_ptr); multisample_copy_rects_test(device_ptr); zenable_test(device_ptr); - resz_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4795,6 +4804,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + resz_test(); fog_special_test(); volume_dxt5_test(); volume_v16u16_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for zenable_test().
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 36f5debb88072d1c2caaf2f2d9a1a3cd6a7ee43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f5debb88072d1c2caaf2f2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 16 08:55:24 2014 +0200 d3d8/tests: Use a separate device for zenable_test(). --- dlls/d3d8/tests/visual.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 05f576e..df3da7c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3755,8 +3755,18 @@ done: DestroyWindow(window); } -static void zenable_test(IDirect3DDevice8 *device) +static void zenable_test(void) { + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + UINT x, y; + UINT i, j; + static const struct { struct vec4 position; @@ -3769,11 +3779,16 @@ static void zenable_test(IDirect3DDevice8 *device) {{640.0f, 480.0f, 1.5f, 1.0f}, 0xff00ff00}, {{640.0f, 0.0f, 1.5f, 1.0f}, 0xff00ff00}, }; - D3DCOLOR color; - D3DCAPS8 caps; - HRESULT hr; - UINT x, y; - UINT i, j; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); @@ -3878,15 +3893,17 @@ static void zenable_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetPixelShader(device, 0); - ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, 0); - ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); hr = IDirect3DDevice8_DeletePixelShader(device, ps); ok(SUCCEEDED(hr), "Failed to delete pixel shader, hr %#x.\n", hr); hr = IDirect3DDevice8_DeleteVertexShader(device, vs); ok(SUCCEEDED(hr), "Failed to delete vertex shader, hr %#x.\n", hr); } + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void fog_special_test(void) @@ -4796,7 +4813,6 @@ START_TEST(visual) intz_test(device_ptr); shadow_test(device_ptr); multisample_copy_rects_test(device_ptr); - zenable_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4804,6 +4820,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + zenable_test(); resz_test(); fog_special_test(); volume_dxt5_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for multisample_copy_rects_test().
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: b2d85738489612ca29497a962b57ebe76ab52857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d85738489612ca29497a962… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 16 08:55:25 2014 +0200 d3d8/tests: Use a separate device for multisample_copy_rects_test(). --- dlls/d3d8/tests/visual.c | 47 +++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index df3da7c..7a2c932 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3350,25 +3350,35 @@ static void shadow_test(IDirect3DDevice8 *device) IDirect3D8_Release(d3d8); } -static void multisample_copy_rects_test(IDirect3DDevice8 *device) +static void multisample_copy_rects_test(void) { - IDirect3DSurface8 *original_ds, *original_rt, *ds, *ds_plain, *rt, *readback; + IDirect3DSurface8 *ds, *ds_plain, *rt, *readback; RECT src_rect = {64, 64, 128, 128}; POINT dst_point = {96, 96}; D3DLOCKED_RECT locked_rect; - IDirect3D8 *d3d8; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; - hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); - ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); - hr = IDirect3D8_CheckDeviceMultiSampleType(d3d8, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES); - IDirect3D8_Release(d3d8); - if (FAILED(hr)) + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) { skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisampled CopyRects test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } hr = IDirect3DDevice8_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, @@ -3383,11 +3393,6 @@ static void multisample_copy_rects_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_CreateImageSurface(device, 256, 256, D3DFMT_A8R8G8B8, &readback); ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr); - hr = IDirect3DDevice8_GetRenderTarget(device, &original_rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - hr = IDirect3DDevice8_GetDepthStencilSurface(device, &original_ds); - ok(SUCCEEDED(hr), "Failed to get depth/stencil, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); @@ -3418,15 +3423,15 @@ static void multisample_copy_rects_test(IDirect3DDevice8 *device) hr = IDirect3DSurface8_UnlockRect(readback); ok(SUCCEEDED(hr), "Failed to unlock readback surface, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, original_ds); - ok(SUCCEEDED(hr), "Failed to restore original render target, hr %#x.\n", hr); - - IDirect3DSurface8_Release(original_ds); - IDirect3DSurface8_Release(original_rt); IDirect3DSurface8_Release(readback); IDirect3DSurface8_Release(ds_plain); IDirect3DSurface8_Release(ds); IDirect3DSurface8_Release(rt); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void resz_test(void) @@ -4812,7 +4817,6 @@ START_TEST(visual) depth_buffer2_test(device_ptr); intz_test(device_ptr); shadow_test(device_ptr); - multisample_copy_rects_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4820,6 +4824,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + multisample_copy_rects_test(); zenable_test(); resz_test(); fog_special_test();

1 0