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

Henri Verbeet : d3d9/tests: Use a separate device for fog_test().
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: b7f323e8c6e420b41e21155198c70937c2cac9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f323e8c6e420b41e2115519… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 10 10:05:45 2014 +0200 d3d9/tests: Use a separate device for fog_test(). --- dlls/d3d9/tests/visual.c | 268 +++++++++++++++++++++++++--------------------- 1 file changed, 146 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7f323e8c6e420b41e211…

1 0

Nikolay Sivov : shlwapi: Always close find handle (Coverity).
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: 14dab8ab4b998b7f104d7529e40a9d1bc906cb8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=14dab8ab4b998b7f104d7529e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 10 09:23:00 2014 +0400 shlwapi: Always close find handle (Coverity). --- dlls/shlwapi/path.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 5f70bcc..eba1f69 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3885,16 +3885,14 @@ BOOL WINAPI PathIsDirectoryEmptyW(LPCWSTR lpszPath) strcpyW(szSearch + dwLen, szAllFiles); hfind = FindFirstFileW(szSearch, &find_data); - - if (hfind != INVALID_HANDLE_VALUE && - find_data.cFileName[0] == '.' && - find_data.cFileName[1] == '.') + if (hfind != INVALID_HANDLE_VALUE) { - /* The only directory entry should be the parent */ - if (!FindNextFileW(hfind, &find_data)) - retVal = TRUE; + if (find_data.cFileName[0] == '.' && find_data.cFileName[1] == '.') + /* The only directory entry should be the parent */ + retVal = !FindNextFileW(hfind, &find_data); FindClose(hfind); } + return retVal; }

1 0

Dmitry Timoshkov : taskschd: Add invalid parameter check to IRegisteredTask:: get_State and IRegisteredTask::get_Enabled.
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: ea248186b35796e733e1246759a0b89967cf6a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea248186b35796e733e124675… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:41:22 2014 +0900 taskschd: Add invalid parameter check to IRegisteredTask::get_State and IRegisteredTask::get_Enabled. --- dlls/taskschd/regtask.c | 4 ++++ dlls/taskschd/tests/scheduler.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index e224b3e..5e9d5d3 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -157,6 +157,8 @@ static HRESULT WINAPI regtask_get_State(IRegisteredTask *iface, TASK_STATE *stat TRACE("%p,%p\n", iface, state); + if (!state) return E_POINTER; + return SchRpcGetTaskInfo(regtask->path, SCH_FLAG_STATE, &enabled, state); } @@ -168,6 +170,8 @@ static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL * TRACE("%p,%p\n", iface, v_enabled); + if (!v_enabled) return E_POINTER; + hr = SchRpcGetTaskInfo(regtask->path, 0, &enabled, &state); if (hr == S_OK) *v_enabled = enabled ? VARIANT_TRUE : VARIANT_FALSE; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index e54e6ee..17501ad 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -909,6 +909,11 @@ todo_wine todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + hr = IRegisteredTask_get_State(task2, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + hr = IRegisteredTask_get_Enabled(task2, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + IRegisteredTask_Release(task2); hr = ITaskFolder_DeleteTask(folder, NULL, 0);

1 0

Nikolay Sivov : qedit/tests: Fix a file handle leak on error path ( Coverity).
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: 4f681295d6844fa70eb58b84757779b8a7638c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f681295d6844fa70eb58b847… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 10 09:18:17 2014 +0400 qedit/tests: Fix a file handle leak on error path (Coverity). --- dlls/qedit/tests/mediadet.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index fce3e97..d5efe43 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -84,6 +84,7 @@ static BOOL unpack_avi_file(int id, WCHAR name[MAX_PATH]) char *mem; DWORD size, written; HANDLE fh; + BOOL ret; res = FindResourceW(NULL, MAKEINTRESOURCEW(id), MAKEINTRESOURCEW(AVI_RES_TYPE)); if (!res) @@ -116,12 +117,9 @@ static BOOL unpack_avi_file(int id, WCHAR name[MAX_PATH]) if (fh == INVALID_HANDLE_VALUE) return FALSE; - if (!WriteFile(fh, mem, size, &written, NULL) || written != size) - return FALSE; - + ret = WriteFile(fh, mem, size, &written, NULL); CloseHandle(fh); - - return TRUE; + return ret && written == size; } static BOOL init_tests(void)

1 0

Nikolay Sivov : msi: Fix a leak on error path (Coverity).
by Alexandre Julliard April 10, 2014

April 10, 2014

Module: wine Branch: master Commit: 0bcf4a5bb6f164ed98e28cb57a07c7fbab7f99f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bcf4a5bb6f164ed98e28cb57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 10 09:19:11 2014 +0400 msi: Fix a leak on error path (Coverity). --- dlls/msi/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 3c815d9..581dd55 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -735,10 +735,10 @@ static UINT replace_stack(FORMAT *format, STACK *stack, STACK *values) format->n = n; beg = format_replace( format, propfound, nonprop, oldsize, type, replaced, len ); + msi_free(replaced); if (!beg) return ERROR_SUCCESS; - msi_free(replaced); format->n = beg->n + beg->len; top = stack_peek(stack);

1 0

Ryan Turner : wined3d: Add NVIDIA Geforce GTX 760 to device list.
by Alexandre Julliard April 9, 2014

April 9, 2014

Module: wine Branch: master Commit: ed51082dd6f0dfa030ccf55a235379ef1c3681bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed51082dd6f0dfa030ccf55a2… Author: Ryan Turner <zdbiohazard2(a)gmail.com> Date: Tue Apr 8 14:16:22 2014 -0700 wined3d: Add NVIDIA Geforce GTX 760 to device list. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 86d0fcc..1f3ed4c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1261,6 +1261,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760, "NVIDIA Geforce GTX 760", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX765M, "NVIDIA GeForce GTX 765M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1673,6 +1674,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ {"GTX 765M", CARD_NVIDIA_GEFORCE_GTX765M}, /* Geforce 700 - midend high mobile */ + {"GTX 760", CARD_NVIDIA_GEFORCE_GTX760}, /* Geforce 700 - midend high */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9e209d9..40494bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1474,6 +1474,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GTX760 = 0x1187, CARD_NVIDIA_GEFORCE_GTX765M = 0x11e2, CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, CARD_NVIDIA_GEFORCE_GTX770 = 0x1184,

1 0

Alistair Leslie-Hughes : hnetcfg: Register NetFwOpenPort interface.
by Alexandre Julliard April 9, 2014

April 9, 2014

Module: wine Branch: master Commit: 9938eef4bc5a2b43c917e7d874da96d327a79b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9938eef4bc5a2b43c917e7d87… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 8 09:34:10 2014 +1000 hnetcfg: Register NetFwOpenPort interface. --- dlls/hnetcfg/hnetcfg.idl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/hnetcfg/hnetcfg.idl b/dlls/hnetcfg/hnetcfg.idl index 0ba4be2..9934f6a 100644 --- a/dlls/hnetcfg/hnetcfg.idl +++ b/dlls/hnetcfg/hnetcfg.idl @@ -35,3 +35,11 @@ coclass NetFwMgr { interface INetFwMgr; } uuid(ec9846b3-2762-4a6b-a214-6acb603462d2) ] coclass NetFwAuthorizedApplication { interface INetFwAuthorizedApplications; } + +[ + helpstring("HNetCfg.FwOpenPort"), + progid("HNetCfg.FwOpenPort"), + threading(both), + uuid(0ca545c6-37ad-4a6c-bf92-9f7610067ef5) +] +coclass NetFwOpenPort { interface INetFwOpenPort; }

1 0

Dmitry Timoshkov : taskschd: Forward IRegisteredTask:: get_State to SchRpcGetTaskInfo.
by Alexandre Julliard April 9, 2014

April 9, 2014

Module: wine Branch: master Commit: 7f3c32b626f9bfcdc299a7d8c494f24ee99e8dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3c32b626f9bfcdc299a7d8c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 9 18:50:58 2014 +0900 taskschd: Forward IRegisteredTask::get_State to SchRpcGetTaskInfo. --- dlls/taskschd/regtask.c | 8 ++++++-- dlls/taskschd/tests/scheduler.c | 13 +++---------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 2953c6e..038315f 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -152,8 +152,12 @@ static HRESULT WINAPI regtask_get_Path(IRegisteredTask *iface, BSTR *path) static HRESULT WINAPI regtask_get_State(IRegisteredTask *iface, TASK_STATE *state) { - FIXME("%p,%p: stub\n", iface, state); - return E_NOTIMPL; + RegisteredTask *regtask = impl_from_IRegisteredTask(iface); + DWORD enabled; + + TRACE("%p,%p\n", iface, state); + + return SchRpcGetTaskInfo(regtask->path, SCH_FLAG_STATE, &enabled, state); } static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL *enabled) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 3f8ba3e..7498b70 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -815,9 +815,7 @@ todo_wine ok(!lstrcmpW(bstr, Wine_Task1), "expected \\Wine\\Task1, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IRegisteredTask_get_State(task1, &state); -todo_wine ok(hr == S_OK, "get_State error %#x\n", hr); -if (hr == S_OK) ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); todo_wine @@ -844,9 +842,8 @@ if (hr == S_OK) ok(!lstrcmpW(bstr, Wine_Task2), "expected \\Wine\\Task2, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IRegisteredTask_get_State(task2, &state); -todo_wine ok(hr == S_OK, "get_State error %#x\n", hr); -if (hr == S_OK) +todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); todo_wine @@ -875,9 +872,7 @@ todo_wine ok(!lstrcmpW(bstr, Wine_Task1), "expected \\Wine\\Task1, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IRegisteredTask_get_State(task1, &state); -todo_wine ok(hr == S_OK, "get_State error %#x\n", hr); -if (hr == S_OK) ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); todo_wine @@ -889,9 +884,8 @@ if (hr == S_OK) todo_wine ok(hr == S_OK, "put_Enabled error %#x\n", hr); hr = IRegisteredTask_get_State(task1, &state); -todo_wine ok(hr == S_OK, "get_State error %#x\n", hr); -if (hr == S_OK) +todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); todo_wine @@ -913,9 +907,8 @@ if (hr == S_OK) ok(!lstrcmpW(bstr, Wine_Task2), "expected \\Wine\\Task2, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IRegisteredTask_get_State(task2, &state); -todo_wine ok(hr == S_OK, "get_State error %#x\n", hr); -if (hr == S_OK) +todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); todo_wine

1 0

Alexandre Julliard : makedep: Add a structure to store individual makefile parameters.
by Alexandre Julliard April 9, 2014

April 9, 2014

Module: wine Branch: master Commit: 228684d34f5814470c6af357320652b80a8bd42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=228684d34f5814470c6af3573… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 10:12:44 2014 +0200 makedep: Add a structure to store individual makefile parameters. --- tools/makedep.c | 187 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 97 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=228684d34f5814470c6af…

1 0

Henri Verbeet : d3d9/tests: Use a separate device for offscreen_test().
by Alexandre Julliard April 9, 2014

April 9, 2014

Module: wine Branch: master Commit: 80c3e07c968fbdfe7e76ffe1d69f5aa7a8afe5d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c3e07c968fbdfe7e76ffe1d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 9 08:54:46 2014 +0200 d3d9/tests: Use a separate device for offscreen_test(). --- dlls/d3d9/tests/visual.c | 90 +++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 46 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 62feac0..3d4cda7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1653,46 +1653,60 @@ static void test_cube_wrap(IDirect3DDevice9 *device) IDirect3DSurface9_Release(surface); } -static void offscreen_test(IDirect3DDevice9 *device) +static void offscreen_test(void) { + IDirect3DSurface9 *backbuffer, *offscreen; + IDirect3DTexture9 *offscreenTexture; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; - IDirect3DTexture9 *offscreenTexture = NULL; - IDirect3DSurface9 *backbuffer = NULL, *offscreen = NULL; - DWORD color; - static const float quad[][5] = { + static const float quad[][5] = + { {-0.5f, -0.5f, 0.1f, 0.0f, 0.0f}, {-0.5f, 0.5f, 0.1f, 0.0f, 1.0f}, { 0.5f, -0.5f, 0.1f, 1.0f, 0.0f}, { 0.5f, 0.5f, 0.1f, 1.0f, 1.0f}, }; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(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 = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 1.0f, 0); ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); - hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture, NULL); ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %08x\n", hr); - if(!offscreenTexture) { - trace("Failed to create an X8R8G8B8 offscreen texture, trying R5G6B5\n"); - hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &offscreenTexture, NULL); + if (!offscreenTexture) + { + trace("Failed to create an X8R8G8B8 offscreen texture, trying R5G6B5.\n"); + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &offscreenTexture, NULL); ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %08x\n", hr); - if(!offscreenTexture) { - skip("Cannot create an offscreen render target\n"); - goto out; + if (!offscreenTexture) + { + skip("Cannot create an offscreen render target.\n"); + IDirect3DDevice9_Release(device); + goto done; } } hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr); - if(!backbuffer) { - goto out; - } hr = IDirect3DTexture9_GetSurfaceLevel(offscreenTexture, 0, &offscreen); ok(hr == D3D_OK, "Can't get offscreen surface, hr = %08x\n", hr); - if(!offscreen) { - goto out; - } hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(hr == D3D_OK, "SetFVF failed, hr = %08x\n", hr); @@ -1739,34 +1753,19 @@ static void offscreen_test(IDirect3DDevice9 *device) /* Part of the originally cleared back buffer */ color = getPixelColor(device, 10, 10); ok(color == 0x00ff0000, "Offscreen failed: Got color 0x%08x, expected 0x00ff0000.\n", color); - if(0) { - /* Lower left corner of the screen, where back buffer offscreen rendering draws the offscreen texture. - * It should be red, but the offscreen texture may leave some junk there. Not tested yet. Depending on - * the offscreen rendering mode this test would succeed or fail - */ - color = getPixelColor(device, 10, 470); - ok(color == 0x00ff0000, "Offscreen failed: Got color 0x%08x, expected 0x00ff0000.\n", color); - } + color = getPixelColor(device, 10, 470); + ok(color == 0x00ff0000, "Offscreen failed: Got color 0x%08x, expected 0x00ff0000.\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); -out: - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture returned %#x.\n", hr); - - /* restore things */ - if (backbuffer) - { - hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderTarget returned %#x.\n", hr); - IDirect3DSurface9_Release(backbuffer); - } - if(offscreenTexture) { - IDirect3DTexture9_Release(offscreenTexture); - } - if(offscreen) { - IDirect3DSurface9_Release(offscreen); - } + IDirect3DSurface9_Release(backbuffer); + IDirect3DTexture9_Release(offscreenTexture); + IDirect3DSurface9_Release(offscreen); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } /* This test tests fog in combination with shaders. @@ -16670,11 +16669,10 @@ START_TEST(visual) skip("No mipmap support\n"); } - offscreen_test(device_ptr); - cleanup_device(device_ptr); device_ptr = NULL; + offscreen_test(); ds_size_test(); alpha_test(); shademode_test();

1 0