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

Dmitry Timoshkov : taskschd: Implement IRegisteredTask::get_Path.
by Alexandre Julliard April 8, 2014

April 8, 2014

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

Akihiro Sagawa : user32: Emit EM_SETSEL message when choosing "Select All" from context menu.
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: 6b616a0fd8f3ef29fbda46789ea62d148edc27e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b616a0fd8f3ef29fbda46789… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 8 01:43:53 2014 +0900 user32: Emit EM_SETSEL message when choosing "Select All" from context menu. --- dlls/user32/edit.c | 3 +-- dlls/user32/tests/edit.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 1a9796f..4b29f03 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3266,8 +3266,7 @@ static void EDIT_ContextMenuCommand(EDITSTATE *es, UINT id) SendMessageW(es->hwndSelf, WM_CLEAR, 0, 0); break; case EM_SETSEL: - EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE); - EDIT_EM_ScrollCaret(es); + SendMessageW(es->hwndSelf, EM_SETSEL, 0, -1); break; default: ERR("unknown menu item, please report\n"); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 312e419..e5c05db 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2325,7 +2325,7 @@ static void test_contextmenu(void) while (PeekMessageA(&msg, hwndEdit, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok(menu_messages.wm_command == 0, "Expected no WM_COMMAND messages, got %d\n", menu_messages.wm_command); - todo_wine ok(menu_messages.em_setsel == 1, + ok(menu_messages.em_setsel == 1, "Expected 1 EM_SETSEL message, got %d\n", menu_messages.em_setsel); DestroyWindow (hwndEdit);

1 0

Akihiro Sagawa : user32: Don' t emit WM_COMMAND on choosing an item in a context menu (Edit control).
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: 0bfc8f05c62c34002d46553385605c538edff04d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bfc8f05c62c34002d4655338… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 8 01:43:51 2014 +0900 user32: Don't emit WM_COMMAND on choosing an item in a context menu (Edit control). --- dlls/user32/edit.c | 19 +++++++++---------- dlls/user32/tests/edit.c | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index e9cbc91..1a9796f 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3244,14 +3244,11 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) /********************************************************************* * - * WM_COMMAND + * EDIT_ContextMenuCommand * */ -static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND control) +static void EDIT_ContextMenuCommand(EDITSTATE *es, UINT id) { - if (code || control) - return; - switch (id) { case EM_UNDO: SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); @@ -3301,6 +3298,7 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y) HMENU popup = GetSubMenu(menu, 0); UINT start = es->selection_start; UINT end = es->selection_end; + UINT cmd; ORDER_UINT(start, end); @@ -3329,7 +3327,12 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y) if (!(es->flags & EF_FOCUSED)) SetFocus(es->hwndSelf); - TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, es->hwndSelf, NULL); + cmd = TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD | TPM_NONOTIFY, + x, y, 0, es->hwndSelf, NULL); + + if (cmd) + EDIT_ContextMenuCommand(es, cmd); + DestroyMenu(menu); } @@ -4984,10 +4987,6 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B EDIT_WM_Clear(es); break; - case WM_COMMAND: - EDIT_WM_Command(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam); - break; - case WM_CONTEXTMENU: EDIT_WM_ContextMenu(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 219fb1d..312e419 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2323,7 +2323,7 @@ static void test_contextmenu(void) SendMessageA(hwndEdit, WM_SETTEXT, 0, (LPARAM)"foo"); SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(-1, -1)); while (PeekMessageA(&msg, hwndEdit, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - todo_wine ok(menu_messages.wm_command == 0, + ok(menu_messages.wm_command == 0, "Expected no WM_COMMAND messages, got %d\n", menu_messages.wm_command); todo_wine ok(menu_messages.em_setsel == 1, "Expected 1 EM_SETSEL message, got %d\n", menu_messages.em_setsel);

1 0

Marcus Meissner : usp10: Fixed border condition in shifts (Coverity).
by Alexandre Julliard April 8, 2014

April 8, 2014

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

Dmitry Timoshkov : schedsvc/tests: Avoid test failures on file systems with enabled directory randomization.
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: 96760c3b51857cb30cd7d4a6faa9607740d5dde2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96760c3b51857cb30cd7d4a6f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 8 15:49:11 2014 +0900 schedsvc/tests: Avoid test failures on file systems with enabled directory randomization. --- dlls/schedsvc/tests/rpcapi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 6c555c8..2ef50c9 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -405,7 +405,9 @@ START_TEST(rpcapi) ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 1, "expected 1, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); - ok(!lstrcmpW(names[0], Task1), "expected Task1, got %s\n", wine_dbgstr_w(names[0])); + /* returned name depends whether directory randomization is on */ + ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2), + "expected Task3, got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); @@ -465,7 +467,9 @@ START_TEST(rpcapi) ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 3, "expected 3, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); - ok(!lstrcmpW(names[0], Task3), "expected Task3, got %s\n", wine_dbgstr_w(names[0])); + /* returned name depends whether directory randomization is on */ + ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2) || !lstrcmpW(names[0], Task3), + "expected Task3, got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names);

1 0

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

April 8, 2014

Module: wine Branch: master Commit: 230b910a34ec9f2fd1176099b55244cc4d077642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=230b910a34ec9f2fd1176099b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 8 09:21:53 2014 +0200 d3d9/tests: Use a separate device for texture_transform_flags_test(). --- dlls/d3d9/tests/visual.c | 89 +++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f50ee55..1421e31 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4028,25 +4028,25 @@ static void projected_textures_test(IDirect3DDevice9 *device, DWORD value = 0xdeadbeef; static const float proj_quads[] = { - -1.0, -1.0, 0.1, 0.0, 0.0, 4.0, 6.0, - 0.0, -1.0, 0.1, 4.0, 0.0, 4.0, 6.0, - -1.0, 0.0, 0.1, 0.0, 4.0, 4.0, 6.0, - 0.0, 0.0, 0.1, 4.0, 4.0, 4.0, 6.0, - - 0.0, -1.0, 0.1, 0.0, 0.0, 4.0, 6.0, - 1.0, -1.0, 0.1, 4.0, 0.0, 4.0, 6.0, - 0.0, 0.0, 0.1, 0.0, 4.0, 4.0, 6.0, - 1.0, 0.0, 0.1, 4.0, 4.0, 4.0, 6.0, - - -1.0, 0.0, 0.1, 0.0, 0.0, 4.0, 6.0, - 0.0, 0.0, 0.1, 4.0, 0.0, 4.0, 6.0, - -1.0, 1.0, 0.1, 0.0, 4.0, 4.0, 6.0, - 0.0, 1.0, 0.1, 4.0, 4.0, 4.0, 6.0, - - 0.0, 0.0, 0.1, 0.0, 0.0, 4.0, 6.0, - 1.0, 0.0, 0.1, 4.0, 0.0, 4.0, 6.0, - 0.0, 1.0, 0.1, 0.0, 4.0, 4.0, 6.0, - 1.0, 1.0, 0.1, 4.0, 4.0, 4.0, 6.0, + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, 4.0f, 6.0f, + -1.0f, 0.0f, 0.1f, 0.0f, 4.0f, 4.0f, 6.0f, + 0.0f, -1.0f, 0.1f, 4.0f, 0.0f, 4.0f, 6.0f, + 0.0f, 0.0f, 0.1f, 4.0f, 4.0f, 4.0f, 6.0f, + + 0.0f, -1.0f, 0.1f, 0.0f, 0.0f, 4.0f, 6.0f, + 0.0f, 0.0f, 0.1f, 0.0f, 4.0f, 4.0f, 6.0f, + 1.0f, -1.0f, 0.1f, 4.0f, 0.0f, 4.0f, 6.0f, + 1.0f, 0.0f, 0.1f, 4.0f, 4.0f, 4.0f, 6.0f, + + -1.0f, 0.0f, 0.1f, 0.0f, 0.0f, 4.0f, 6.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 4.0f, 4.0f, 6.0f, + 0.0f, 0.0f, 0.1f, 4.0f, 0.0f, 4.0f, 6.0f, + 0.0f, 1.0f, 0.1f, 4.0f, 4.0f, 4.0f, 6.0f, + + 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 4.0f, 6.0f, + 0.0f, 1.0f, 0.1f, 0.0f, 4.0f, 4.0f, 6.0f, + 1.0f, 0.0f, 0.1f, 4.0f, 0.0f, 4.0f, 6.0f, + 1.0f, 1.0f, 0.1f, 4.0f, 4.0f, 4.0f, 6.0f, }; if (tests[i].vs) @@ -4106,7 +4106,7 @@ static void projected_textures_test(IDirect3DDevice9 *device, ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); } -static void texture_transform_flags_test(IDirect3DDevice9 *device) +static void texture_transform_flags_test(void) { HRESULT hr; IDirect3D9 *d3d; @@ -4114,10 +4114,13 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) D3DCAPS9 caps; IDirect3DTexture9 *texture = NULL; IDirect3DVolumeTexture9 *volume = NULL; + IDirect3DDevice9 *device; unsigned int x, y, z; D3DLOCKED_RECT lr; D3DLOCKED_BOX lb; - DWORD color; + D3DCOLOR color; + ULONG refcount; + HWND window; UINT w, h; IDirect3DVertexDeclaration9 *decl, *decl2, *decl3, *decl4; float identity[16] = {1.0, 0.0, 0.0, 0.0, @@ -4149,14 +4152,21 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + 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; + } + memset(&lr, 0, sizeof(lr)); memset(&lb, 0, sizeof(lb)); - IDirect3DDevice9_GetDirect3D(device, &d3d); - if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, - D3DRTYPE_TEXTURE, D3DFMT_A16B16G16R16) == D3D_OK) { + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_A16B16G16R16) == D3D_OK) fmt = D3DFMT_A16B16G16R16; - } - IDirect3D9_Release(d3d); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); @@ -4186,7 +4196,7 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState(D3DTSS_COLORARG1) returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState(D3DRS_LIGHTING) returned %08x\n", hr); - 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 returned %08x\n", hr); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); @@ -4196,9 +4206,11 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_CreateTexture(device, w, h, 1, 0, fmt, D3DPOOL_MANAGED, &texture, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture returned %08x\n", hr); - if(!texture) { - skip("Failed to create the test texture\n"); - return; + if (!texture) + { + skip("Failed to create the test texture.\n"); + IDirect3DDevice9_Release(device); + goto done; } /* Unfortunately there is no easy way to set up a texture coordinate passthrough @@ -4752,19 +4764,16 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_Release(volume); - out: - hr = IDirect3DDevice9_SetVertexDeclaration(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed with %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTextureStageState failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0, (D3DMATRIX *) &identity); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform failed with %08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture returned %08x\n", hr); +out: IDirect3DVertexDeclaration9_Release(decl); IDirect3DVertexDeclaration9_Release(decl2); IDirect3DVertexDeclaration9_Release(decl3); IDirect3DVertexDeclaration9_Release(decl4); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void texdepth_test(void) @@ -16575,11 +16584,11 @@ START_TEST(visual) float_texture_test(device_ptr); g16r16_texture_test(device_ptr); pixelshader_blending_test(device_ptr); - texture_transform_flags_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + texture_transform_flags_test(); autogen_mipmap_test(); fixed_function_decl_test(); conditional_np2_repeat_test();

1 0

Nikolay Sivov : msxml3: IXSLProcessor_put_output() is not a stub.
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: ff0ed20c2ff81013a6560ddf5636d638f15cb632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0ed20c2ff81013a6560ddf5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 8 07:42:43 2014 +0400 msxml3: IXSLProcessor_put_output() is not a stub. --- dlls/msxml3/stylesheet.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index e5761de..b2816ee 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -463,7 +463,7 @@ static HRESULT WINAPI xslprocessor_put_output( IStream *stream; HRESULT hr; - FIXME("(%p)->(%s): semi-stub\n", This, debugstr_variant(&output)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&output)); switch (V_VT(&output)) { @@ -473,8 +473,11 @@ static HRESULT WINAPI xslprocessor_put_output( break; case VT_UNKNOWN: hr = IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IStream, (void**)&stream); + if (FAILED(hr)) + WARN("failed to get IStream from output, 0x%08x\n", hr); break; default: + FIXME("output type %d not handed\n", V_VT(&output)); hr = E_FAIL; }

1 0

Dmitry Timoshkov : avifil32: Use correct AddRef helpers.
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: 2886471db1e6f4d6b6555f150d14eebf87641136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2886471db1e6f4d6b6555f150… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 8 15:48:57 2014 +0900 avifil32: Use correct AddRef helpers. --- dlls/avifil32/wavfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 60dab03..32a6788 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -274,7 +274,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, D return AVIERR_NODATA; *avis = &This->IAVIStream_iface; - IAVIFile_AddRef(*avis); + IAVIStream_AddRef(*avis); return AVIERR_OK; } @@ -325,7 +325,7 @@ static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile *iface, IAVIStream **avis This->ckData.cksize = 0; *avis = &This->IAVIStream_iface; - IAVIFile_AddRef(*avis); + IAVIStream_AddRef(*avis); return AVIERR_OK; }

1 0

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

April 8, 2014

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

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

April 8, 2014

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