wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Marcus Meissner : usp10: Fixed border condition in shifts (Coverity).
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: b6a081ea44bd52f4726b3cf1bb164bddc87eb2d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a081ea44bd52f4726b3cf1b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 6 20:27:33 2014 +0200 usp10: Fixed border condition in shifts (Coverity). --- dlls/usp10/tests/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 22a4ab2..a7fbc73 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -837,7 +837,7 @@ static int CALLBACK enumFontProc( const LOGFONTA *lpelfe, const TEXTMETRICA *lpn return 1; i = rp->range; - while (i > sizeof(DWORD)*8) + while (i >= sizeof(DWORD)*8) { idx++; i -= (sizeof(DWORD)*8);

1 0

Marcus Meissner : comctl32: Process GetKeyState return correctly (Coverity ).
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 318169a86ff58e29f9b076dafb149abf794bb1c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=318169a86ff58e29f9b076daf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 6 20:23:56 2014 +0200 comctl32: Process GetKeyState return correctly (Coverity). --- dlls/comctl32/listview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bc9a04c..c5b5670 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3677,8 +3677,8 @@ static void LISTVIEW_SetSelection(LISTVIEW_INFO *infoPtr, INT nItem) static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *infoPtr, INT nItem, BOOL space) { /* FIXME: pass in the state */ - WORD wShift = HIWORD(GetKeyState(VK_SHIFT)); - WORD wCtrl = HIWORD(GetKeyState(VK_CONTROL)); + WORD wShift = GetKeyState(VK_SHIFT) & 0x8000; + WORD wCtrl = GetKeyState(VK_CONTROL) & 0x8000; BOOL bResult = FALSE; TRACE("nItem=%d, wShift=%d, wCtrl=%d\n", nItem, wShift, wCtrl);

1 0

Dmitry Timoshkov : taskschd: Implement IRegisteredTask::get_Path.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: a5602f1708fbdcd65d058e7417210ca1eee2acbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5602f1708fbdcd65d058e741… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 8 21:38:14 2014 +0900 taskschd: Implement IRegisteredTask::get_Path. --- dlls/taskschd/regtask.c | 12 ++++++++++-- dlls/taskschd/tests/scheduler.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 817ba36..2953c6e 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -138,8 +138,16 @@ static HRESULT WINAPI regtask_get_Name(IRegisteredTask *iface, BSTR *name) static HRESULT WINAPI regtask_get_Path(IRegisteredTask *iface, BSTR *path) { - FIXME("%p,%p: stub\n", iface, path); - return E_NOTIMPL; + RegisteredTask *regtask = impl_from_IRegisteredTask(iface); + + TRACE("%p,%p\n", iface, path); + + if (!path) return E_POINTER; + + *path = SysAllocString(regtask->path); + if (!*path) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI regtask_get_State(IRegisteredTask *iface, TASK_STATE *state) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d24e1ca..5e5d303 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -812,21 +812,18 @@ todo_wine ok(!lstrcmpW(bstr, Task1), "expected Task1, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IRegisteredTask_get_Path(task1, &bstr); -todo_wine ok(hr == S_OK, "get_Path error %#x\n", hr); - /* FIXME: Remove once implemented */ - if (hr != S_OK) - { - ITaskFolder_DeleteTask(root, Wine_Task1, 0); - goto failed; - } 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 ok(hr == S_OK, "get_Enabled error %#x\n", hr); +if (hr == S_OK) ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); IRegisteredTask_Release(task1); @@ -848,15 +845,20 @@ todo_wine 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) ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); +todo_wine ok(hr == S_OK, "get_Enabled error %#x\n", hr); +if (hr == S_OK) ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task2); hr = ITaskFolder_GetTask(root, NULL, &task1); +todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = ITaskFolder_GetTask(root, Wine_Task1, NULL); @@ -874,19 +876,28 @@ 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 ok(hr == S_OK, "get_Enabled error %#x\n", hr); +if (hr == S_OK) ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); hr = IRegisteredTask_put_Enabled(task1, VARIANT_TRUE); +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) ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); +todo_wine ok(hr == S_OK, "get_Enabled error %#x\n", hr); +if (hr == S_OK) ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task1); @@ -903,15 +914,20 @@ todo_wine 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) ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); +todo_wine ok(hr == S_OK, "get_Enabled error %#x\n", hr); +if (hr == S_OK) ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task2); hr = ITaskFolder_DeleteTask(folder, NULL, 0); +todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY), "expected ERROR_DIR_NOT_EMPTY, got %#x\n", hr); hr = ITaskFolder_DeleteTask(root, Wine_Task1, 0); @@ -923,8 +939,10 @@ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_RegisterTask(root, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); +todo_wine ok(hr == S_OK, "RegisterTask error %#x\n", hr); - + /* FIXME: Remove once implemented */ + if (hr != S_OK) goto failed; hr = IRegisteredTask_get_Name(task1, &bstr); ok(hr == S_OK, "get_Name error %#x\n", hr); hr = IIDFromString(bstr, &iid);

1 0

Dmitry Timoshkov : taskschd: Implement IRegisteredTask::get_Name.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: d79cce769a81c1c49f5df42f1ab34264cdb55ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79cce769a81c1c49f5df42f1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 8 15:49:28 2014 +0900 taskschd: Implement IRegisteredTask::get_Name. --- dlls/taskschd/regtask.c | 19 +++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 11 +++++------ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index bf50f4f..817ba36 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -117,8 +117,23 @@ static HRESULT WINAPI regtask_Invoke(IRegisteredTask *iface, DISPID dispid, REFI static HRESULT WINAPI regtask_get_Name(IRegisteredTask *iface, BSTR *name) { - FIXME("%p,%p: stub\n", iface, name); - return E_NOTIMPL; + RegisteredTask *regtask = impl_from_IRegisteredTask(iface); + const WCHAR *p_name; + + TRACE("%p,%p\n", iface, name); + + if (!name) return E_POINTER; + + p_name = strrchrW(regtask->path, '\\'); + if (!p_name) + p_name = regtask->path; + else + if (p_name[1] != 0) p_name++; + + *name = SysAllocString(p_name); + if (!*name) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI regtask_get_Path(IRegisteredTask *iface, BSTR *path) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index e0944fc..d24e1ca 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -805,22 +805,21 @@ todo_wine } hr = IRegisteredTask_get_Name(task1, NULL); -todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); hr = IRegisteredTask_get_Name(task1, &bstr); -todo_wine ok(hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Task1), "expected Task1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegisteredTask_get_Path(task1, &bstr); +todo_wine + ok(hr == S_OK, "get_Path error %#x\n", hr); /* FIXME: Remove once implemented */ if (hr != S_OK) { ITaskFolder_DeleteTask(root, Wine_Task1, 0); goto failed; } - ok(!lstrcmpW(bstr, Task1), "expected Task1, got %s\n", wine_dbgstr_w(bstr)); - SysFreeString(bstr); - hr = IRegisteredTask_get_Path(task1, &bstr); - ok(hr == S_OK, "get_Path error %#x\n", hr); ok(!lstrcmpW(bstr, Wine_Task1), "expected \\Wine\\Task1, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IRegisteredTask_get_State(task1, &state);

1 0

Dmitry Timoshkov : taskschd: Implement task management using RPC APIs.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 5c5d17e8f33a2561f5e8e85b4e3d2ca88e213a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5d17e8f33a2561f5e8e85b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 8 15:49:23 2014 +0900 taskschd: Implement task management using RPC APIs. --- dlls/taskschd/folder.c | 30 +++++++++++++++++++---- dlls/taskschd/regtask.c | 49 ++++++++++++++++++++++++++++++++++---- dlls/taskschd/taskschd_private.h | 5 ++-- dlls/taskschd/tests/scheduler.c | 33 +++++++++---------------- 4 files changed, 84 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c5d17e8f33a2561f5e8e…

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::DeleteTask.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 04c3680d1150e89b85f2e1c073c55ffd27b8c4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c3680d1150e89b85f2e1c07… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 8 15:49:17 2014 +0900 taskschd: Implement ITaskFolder::DeleteTask. --- dlls/taskschd/folder.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 14f1430..d9b201e 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -283,8 +283,23 @@ static HRESULT WINAPI TaskFolder_GetTasks(ITaskFolder *iface, LONG flags, IRegis static HRESULT WINAPI TaskFolder_DeleteTask(ITaskFolder *iface, BSTR name, LONG flags) { - FIXME("%p,%s,%x: stub\n", iface, debugstr_w(name), flags); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + WCHAR *folder_path; + HRESULT hr; + + TRACE("%p,%s,%x\n", iface, debugstr_w(name), flags); + + if (!name || !*name) return E_ACCESSDENIED; + + if (flags) + FIXME("unsupported flags %x\n", flags); + + folder_path = get_full_path(folder->path, name); + if (!folder_path) return E_OUTOFMEMORY; + + hr = SchRpcDelete(folder_path, 0); + heap_free(folder_path); + return hr; } static HRESULT WINAPI TaskFolder_RegisterTask(ITaskFolder *iface, BSTR name, BSTR xml, LONG flags,

1 0

Henri Verbeet : d3d9/tests: Use a separate device for release_buffer_test( ).
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 813ae272b062ffa98cceac6f40f035cd19379c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=813ae272b062ffa98cceac6f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 8 09:21:57 2014 +0200 d3d9/tests: Use a separate device for release_buffer_test(). --- dlls/d3d9/tests/visual.c | 77 +++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 41ef190..bd2edba 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3706,46 +3706,54 @@ static void maxmip_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); } -static void release_buffer_test(IDirect3DDevice9 *device) +static void release_buffer_test(void) { - IDirect3DVertexBuffer9 *vb = NULL; - IDirect3DIndexBuffer9 *ib = NULL; + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; BYTE *data; LONG ref; - static const struct vertex quad[] = { - {-1.0, -1.0, 0.1, 0xffff0000}, - {-1.0, 1.0, 0.1, 0xffff0000}, - { 1.0, 1.0, 0.1, 0xffff0000}, + static const short indices[] = {3, 4, 5}; + static const struct vertex quad[] = + { + {-1.0f, -1.0f, 0.1f, 0xffff0000}, + {-1.0f, 1.0f, 0.1f, 0xffff0000}, + { 1.0f, 1.0f, 0.1f, 0xffff0000}, - {-1.0, -1.0, 0.1, 0xff00ff00}, - {-1.0, 1.0, 0.1, 0xff00ff00}, - { 1.0, 1.0, 0.1, 0xff00ff00} + {-1.0f, -1.0f, 0.1f, 0xff00ff00}, + {-1.0f, 1.0f, 0.1f, 0xff00ff00}, + { 1.0f, 1.0f, 0.1f, 0xff00ff00}, }; - short indices[] = {3, 4, 5}; - /* Index and vertex buffers should always be creatable */ - hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), 0, D3DFVF_XYZ | D3DFVF_DIFFUSE, - D3DPOOL_MANAGED, &vb, NULL); - ok(hr == D3D_OK, "CreateVertexBuffer failed with %08x\n", hr); - if(!vb) { - skip("Failed to create a vertex buffer\n"); - return; - } - hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_DEFAULT, &ib, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateIndexBuffer failed with %08x\n", hr); - if(!ib) { - skip("Failed to create an index buffer\n"); - return; + 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; } + /* Index and vertex buffers should always be creatable */ + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), 0, + D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad), (void **) &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); memcpy(data, quad, sizeof(quad)); hr = IDirect3DVertexBuffer9_Unlock(vb); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Unlock failed with %08x\n", hr); + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_DEFAULT, &ib, NULL); + ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), (void **) &data, 0); ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Lock failed with %08x\n", hr); memcpy(data, indices, sizeof(indices)); @@ -3758,12 +3766,14 @@ static void release_buffer_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); /* Now destroy the bound index buffer and draw again */ ref = IDirect3DIndexBuffer9_Release(ib); ok(ref == 0, "Index Buffer reference count is %08d\n", ref); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); @@ -3779,16 +3789,21 @@ static void release_buffer_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %08x\n", hr); } + color = getPixelColor(device, 160, 120); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xff), 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - hr = IDirect3DDevice9_SetIndices(device, NULL); - ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Unlock failed with %08x\n", hr); - hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); - ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Unlock failed with %08x\n", hr); - /* Index buffer was already destroyed as part of the test */ IDirect3DVertexBuffer9_Release(vb); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void float_texture_test(void) @@ -16622,11 +16637,11 @@ START_TEST(visual) alpha_test(device_ptr); shademode_test(device_ptr); srgbtexture_test(device_ptr); - release_buffer_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + release_buffer_test(); float_texture_test(); g16r16_texture_test(); pixelshader_blending_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for float_texture_test() .
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 1abd58edea2e136d14da0503bcf144f5d63dbf47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1abd58edea2e136d14da0503b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 8 09:21:56 2014 +0200 d3d9/tests: Use a separate device for float_texture_test(). --- dlls/d3d9/tests/visual.c | 71 ++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4275b04..41ef190 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3791,37 +3791,48 @@ static void release_buffer_test(IDirect3DDevice9 *device) IDirect3DVertexBuffer9_Release(vb); } -static void float_texture_test(IDirect3DDevice9 *device) +static void float_texture_test(void) { - IDirect3D9 *d3d = NULL; - HRESULT hr; - IDirect3DTexture9 *texture = NULL; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; D3DLOCKED_RECT lr; + IDirect3D9 *d3d; + ULONG refcount; float *data; DWORD color; - float quad[] = { - -1.0, -1.0, 0.1, 0.0, 0.0, - -1.0, 1.0, 0.1, 0.0, 1.0, - 1.0, -1.0, 0.1, 1.0, 0.0, - 1.0, 1.0, 0.1, 1.0, 1.0, + HWND window; + HRESULT hr; + + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, }; - memset(&lr, 0, sizeof(lr)); - IDirect3DDevice9_GetDirect3D(device, &d3d); - if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, - D3DRTYPE_TEXTURE, D3DFMT_R32F) != D3D_OK) { - skip("D3DFMT_R32F textures not supported\n"); - goto out; + 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_CreateTexture(device, 1, 1, 1, 0, D3DFMT_R32F, - D3DPOOL_MANAGED, &texture, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed with %08x\n", hr); - if(!texture) { - skip("Failed to create R32F texture\n"); - goto out; + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_R32F) != D3D_OK) + { + skip("D3DFMT_R32F textures not supported\n"); + IDirect3DDevice9_Release(device); + goto done; } + hr = IDirect3DDevice9_CreateTexture(device, 1, 1, 1, 0, D3DFMT_R32F, D3DPOOL_MANAGED, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + memset(&lr, 0, sizeof(lr)); hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DTexture9_LockRect failed with %08x\n", hr); data = lr.pBits; @@ -3829,9 +3840,14 @@ static void float_texture_test(IDirect3DDevice9 *device) hr = IDirect3DTexture9_UnlockRect(texture, 0); ok(hr == D3D_OK, "IDirect3DTexture9_UnlockRect failed with %08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with %08x\n", hr); if(SUCCEEDED(hr)) @@ -3845,8 +3861,6 @@ static void float_texture_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %08x\n", hr); } - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); color = getPixelColor(device, 240, 320); ok(color == 0x0000ffff, "R32F with value 0.0 has color %08x, expected 0x0000ffff\n", color); @@ -3854,9 +3868,12 @@ static void float_texture_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); -out: - if(texture) IDirect3DTexture9_Release(texture); + IDirect3DTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: IDirect3D9_Release(d3d); + DestroyWindow(window); } static void g16r16_texture_test(void) @@ -16606,11 +16623,11 @@ START_TEST(visual) shademode_test(device_ptr); srgbtexture_test(device_ptr); release_buffer_test(device_ptr); - float_texture_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + float_texture_test(); g16r16_texture_test(); pixelshader_blending_test(); texture_transform_flags_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for g16r16_texture_test( ).
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 63c679e651db557e1a1c2505e582439fa29aac2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c679e651db557e1a1c2505e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 8 09:21:55 2014 +0200 d3d9/tests: Use a separate device for g16r16_texture_test(). --- dlls/d3d9/tests/visual.c | 71 ++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9b6f3d2..4275b04 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3859,37 +3859,48 @@ out: IDirect3D9_Release(d3d); } -static void g16r16_texture_test(IDirect3DDevice9 *device) +static void g16r16_texture_test(void) { - IDirect3D9 *d3d = NULL; - HRESULT hr; - IDirect3DTexture9 *texture = NULL; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; D3DLOCKED_RECT lr; + IDirect3D9 *d3d; + ULONG refcount; DWORD *data; DWORD color; - float quad[] = { - -1.0, -1.0, 0.1, 0.0, 0.0, - -1.0, 1.0, 0.1, 0.0, 1.0, - 1.0, -1.0, 0.1, 1.0, 0.0, - 1.0, 1.0, 0.1, 1.0, 1.0, + HWND window; + HRESULT hr; + + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, }; - memset(&lr, 0, sizeof(lr)); - IDirect3DDevice9_GetDirect3D(device, &d3d); - if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, - D3DRTYPE_TEXTURE, D3DFMT_G16R16) != D3D_OK) { - skip("D3DFMT_G16R16 textures not supported\n"); - goto out; + 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_CreateTexture(device, 1, 1, 1, 0, D3DFMT_G16R16, - D3DPOOL_MANAGED, &texture, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed with %08x\n", hr); - if(!texture) { - skip("Failed to create D3DFMT_G16R16 texture\n"); - goto out; + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_G16R16) != D3D_OK) + { + skip("D3DFMT_G16R16 textures not supported\n"); + IDirect3DDevice9_Release(device); + goto done; } + hr = IDirect3DDevice9_CreateTexture(device, 1, 1, 1, 0, D3DFMT_G16R16, D3DPOOL_MANAGED, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + memset(&lr, 0, sizeof(lr)); hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DTexture9_LockRect failed with %08x\n", hr); data = lr.pBits; @@ -3897,9 +3908,14 @@ static void g16r16_texture_test(IDirect3DDevice9 *device) hr = IDirect3DTexture9_UnlockRect(texture, 0); ok(hr == D3D_OK, "IDirect3DTexture9_UnlockRect failed with %08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with %08x\n", hr); if(SUCCEEDED(hr)) @@ -3913,8 +3929,6 @@ static void g16r16_texture_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %08x\n", hr); } - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); color = getPixelColor(device, 240, 320); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xf0, 0x0f, 0xff), 1), @@ -3923,9 +3937,12 @@ static void g16r16_texture_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); -out: - if(texture) IDirect3DTexture9_Release(texture); + IDirect3DTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: IDirect3D9_Release(d3d); + DestroyWindow(window); } static void check_rect(IDirect3DDevice9 *device, RECT r, const char *message) @@ -16590,11 +16607,11 @@ START_TEST(visual) srgbtexture_test(device_ptr); release_buffer_test(device_ptr); float_texture_test(device_ptr); - g16r16_texture_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + g16r16_texture_test(); pixelshader_blending_test(); texture_transform_flags_test(); autogen_mipmap_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for pixelshader_blending_test().
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 9d756e090557b20f08ce78f082af9a3608954028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d756e090557b20f08ce78f08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 8 09:21:54 2014 +0200 d3d9/tests: Use a separate device for pixelshader_blending_test(). --- dlls/d3d9/tests/visual.c | 90 +++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 41 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1421e31..9b6f3d2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10198,65 +10198,73 @@ done: DestroyWindow(window); } -struct formats { - const char *fmtName; - D3DFORMAT textureFormat; - DWORD resultColorBlending; - DWORD resultColorNoBlending; -}; - -static const struct formats test_formats[] = { - { "D3DFMT_G16R16", D3DFMT_G16R16, 0x001818ff, 0x002010ff}, - { "D3DFMT_R16F", D3DFMT_R16F, 0x0018ffff, 0x0020ffff }, - { "D3DFMT_G16R16F", D3DFMT_G16R16F, 0x001818ff, 0x002010ff }, - { "D3DFMT_A16B16G16R16F", D3DFMT_A16B16G16R16F, 0x00181800, 0x00201000 }, - { "D3DFMT_R32F", D3DFMT_R32F, 0x0018ffff, 0x0020ffff }, - { "D3DFMT_G32R32F", D3DFMT_G32R32F, 0x001818ff, 0x002010ff }, - { "D3DFMT_A32B32G32R32F", D3DFMT_A32B32G32R32F, 0x00181800, 0x00201000 }, - { NULL, 0 } -}; - -static void pixelshader_blending_test(IDirect3DDevice9 *device) +static void pixelshader_blending_test(void) { - HRESULT hr; - IDirect3DTexture9 *offscreenTexture = NULL; IDirect3DSurface9 *backbuffer = NULL, *offscreen = NULL; - IDirect3D9 *d3d = NULL; - DWORD color; + IDirect3DTexture9 *offscreenTexture = NULL; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; int fmt_index; + DWORD color; + HWND window; + HRESULT hr; - static const float quad[][5] = { + static const struct + { + const char *fmtName; + D3DFORMAT textureFormat; + D3DCOLOR resultColorBlending; + D3DCOLOR resultColorNoBlending; + } + test_formats[] = + { + {"D3DFMT_G16R16", D3DFMT_G16R16, 0x001818ff, 0x002010ff}, + {"D3DFMT_R16F", D3DFMT_R16F, 0x0018ffff, 0x0020ffff}, + {"D3DFMT_G16R16F", D3DFMT_G16R16F, 0x001818ff, 0x002010ff}, + {"D3DFMT_A16B16G16R16F", D3DFMT_A16B16G16R16F, 0x00181800, 0x00201000}, + {"D3DFMT_R32F", D3DFMT_R32F, 0x0018ffff, 0x0020ffff}, + {"D3DFMT_G32R32F", D3DFMT_G32R32F, 0x001818ff, 0x002010ff}, + {"D3DFMT_A32B32G32R32F", D3DFMT_A32B32G32R32F, 0x00181800, 0x00201000}, + }; + 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}, }; - /* Quad with R=0x10, G=0x20 */ - static const struct vertex quad1[] = { + static const struct vertex quad1[] = + { {-1.0f, -1.0f, 0.1f, 0x80102000}, {-1.0f, 1.0f, 0.1f, 0x80102000}, { 1.0f, -1.0f, 0.1f, 0x80102000}, { 1.0f, 1.0f, 0.1f, 0x80102000}, }; - /* Quad with R=0x20, G=0x10 */ - static const struct vertex quad2[] = { + static const struct vertex quad2[] = + { {-1.0f, -1.0f, 0.1f, 0x80201000}, {-1.0f, 1.0f, 0.1f, 0x80201000}, { 1.0f, -1.0f, 0.1f, 0x80201000}, { 1.0f, 1.0f, 0.1f, 0x80201000}, }; - IDirect3DDevice9_GetDirect3D(device, &d3d); + 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_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; - } - for(fmt_index=0; test_formats[fmt_index].textureFormat != 0; fmt_index++) + for (fmt_index = 0; fmt_index < sizeof(test_formats) / sizeof(*test_formats); ++fmt_index) { D3DFORMAT fmt = test_formats[fmt_index].textureFormat; @@ -10267,7 +10275,7 @@ static void pixelshader_blending_test(IDirect3DDevice9 *device) continue; } - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, fmt, D3DPOOL_DEFAULT, &offscreenTexture, NULL); @@ -10376,12 +10384,12 @@ static void pixelshader_blending_test(IDirect3DDevice9 *device) } } -out: - /* restore things */ - if(backbuffer) { - IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); - IDirect3DSurface9_Release(backbuffer); - } + IDirect3DSurface9_Release(backbuffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void tssargtemp_test(void) @@ -16583,11 +16591,11 @@ START_TEST(visual) release_buffer_test(device_ptr); float_texture_test(device_ptr); g16r16_texture_test(device_ptr); - pixelshader_blending_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + pixelshader_blending_test(); texture_transform_flags_test(); autogen_mipmap_test(); fixed_function_decl_test();

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2014