wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

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

21 Apr '14

Module: wine Branch: master Commit: f8bd0523665c751291c0d583043f55c4680a9155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8bd0523665c751291c0d5830… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 21 08:10:32 2014 +0200 d3d8/tests: Use a separate device for offscreen_test(). --- dlls/d3d8/tests/visual.c | 94 +++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 3b8f92d..6ee64cf 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1882,49 +1882,63 @@ done: DestroyWindow(window); } -static void offscreen_test(IDirect3DDevice8 *device) +static void offscreen_test(void) { + IDirect3DSurface8 *backbuffer, *offscreen, *depthstencil; + IDirect3DTexture8 *offscreenTexture; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; - IDirect3DTexture8 *offscreenTexture = NULL; - IDirect3DSurface8 *backbuffer = NULL, *offscreen = NULL, *depthstencil = 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 = IDirect3DDevice8_GetDepthStencilSurface(device, &depthstencil); - ok(hr == D3D_OK, "IDirect3DDevice8_GetDepthStencilSurface failed, hr = %#08x\n", 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; + } - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 1.0f, 0); ok(hr == D3D_OK, "Clear failed, hr = %#08x\n", hr); - hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture); + hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture); ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %#08x\n", hr); - if(!offscreenTexture) { + if (!offscreenTexture) + { trace("Failed to create an X8R8G8B8 offscreen texture, trying R5G6B5\n"); - hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &offscreenTexture); + hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &offscreenTexture); 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"); + IDirect3DDevice8_Release(device); + goto done; } } + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &depthstencil); + ok(hr == D3D_OK, "IDirect3DDevice8_GetDepthStencilSurface failed, hr = %#08x\n", hr); + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(hr == D3D_OK, "Can't get back buffer, hr = %#08x\n", hr); - if(!backbuffer) { - goto out; - } hr = IDirect3DTexture8_GetSurfaceLevel(offscreenTexture, 0, &offscreen); ok(hr == D3D_OK, "Can't get offscreen surface, hr = %#08x\n", hr); - if(!offscreen) { - goto out; - } hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(hr == D3D_OK, "SetVertexShader failed, hr = %#08x\n", hr); @@ -1973,36 +1987,20 @@ static void offscreen_test(IDirect3DDevice8 *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); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); -out: - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice8_SetTexture returned %#x.\n", hr); - - /* restore things */ - if(backbuffer) { - hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depthstencil); - ok(SUCCEEDED(hr), "IDirect3DDevice8_SetRenderTarget returned %#x.\n", hr); - IDirect3DSurface8_Release(backbuffer); - } - if(offscreenTexture) { - IDirect3DTexture8_Release(offscreenTexture); - } - if(offscreen) { - IDirect3DSurface8_Release(offscreen); - } - if(depthstencil) { - IDirect3DSurface8_Release(depthstencil); - } + IDirect3DSurface8_Release(backbuffer); + IDirect3DTexture8_Release(offscreenTexture); + IDirect3DSurface8_Release(offscreen); + IDirect3DSurface8_Release(depthstencil); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void alpha_test(void) @@ -4949,7 +4947,6 @@ START_TEST(visual) clear_test(device_ptr); fog_test(device_ptr); z_range_test(device_ptr); - offscreen_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4957,6 +4954,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + offscreen_test(); alpha_test(); test_scalar_instructions(); fog_with_shader_test();

1 0

Dmitry Timoshkov : ole32: Add support for VT_DISPATCH/ VT_UNKNOWN to PropVariantClear and PropVariantCopy.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 5356c945cd3d2ef9a7cacc15fb02fcffe9e53046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5356c945cd3d2ef9a7cacc15f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 21 14:16:47 2014 +0900 ole32: Add support for VT_DISPATCH/VT_UNKNOWN to PropVariantClear and PropVariantCopy. --- dlls/ole32/ole2.c | 6 ++++++ dlls/ole32/tests/propvariant.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 98d00de..a017c1b 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2869,6 +2869,8 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_LPWSTR: case VT_FILETIME: case VT_BLOB: + case VT_DISPATCH: + case VT_UNKNOWN: case VT_STREAM: case VT_STORAGE: case VT_STREAMED_OBJECT: @@ -2945,6 +2947,8 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ case VT_UINT: case VT_FILETIME: break; + case VT_DISPATCH: + case VT_UNKNOWN: case VT_STREAM: case VT_STREAMED_OBJECT: case VT_STORAGE: @@ -3058,6 +3062,8 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ case VT_DATE: case VT_FILETIME: break; + case VT_DISPATCH: + case VT_UNKNOWN: case VT_STREAM: case VT_STREAMED_OBJECT: case VT_STORAGE: diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 891c425..1c9c447 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -51,11 +51,11 @@ static const struct valid_mapping { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_CY */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_DATE */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BSTR */ - { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DISPATCH */ + { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DISPATCH */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_ERROR */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BOOL */ { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_VARIANT */ - { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ + { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* 15 */ { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_I1 */

1 0

Dmitry Timoshkov : user32: When converting from MF_ flags to MENUITEMINFO ignore MF_POPUP if id is not a menu.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: c6dbb33e19b94d87b98fa20a2d3eb147d599f18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dbb33e19b94d87b98fa20a2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 21 14:16:42 2014 +0900 user32: When converting from MF_ flags to MENUITEMINFO ignore MF_POPUP if id is not a menu. --- dlls/user32/menu.c | 2 +- dlls/user32/tests/menu.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 6b0cf2f..ab3f73b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3859,7 +3859,7 @@ static void MENU_mnu2mnuii( UINT flags, UINT_PTR id, LPCWSTR str, pmii->fMask |= MIIM_DATA; pmii->dwItemData = (ULONG_PTR) str; } - if( flags & MF_POPUP) { + if( flags & MF_POPUP && MENU_GetMenu((HMENU)id)) { pmii->fMask |= MIIM_SUBMENU; pmii->hSubMenu = (HMENU)id; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 2f3c481..593292d 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3639,18 +3639,14 @@ static void test_AppendMenu(void) hmenu = CreateMenu(); ok(hmenu != 0, "CreateMenu failed\n"); ret = AppendMenuA(hmenu, MF_POPUP, 202, "item 1"); -todo_wine ok(ret, "AppendMenu failed\n"); -if (ret) /* FIXME: uncomment once Wine is fixed */ check_menu_items(hmenu, 202, MF_STRING, 0); DestroyMenu(hmenu); hmenu = CreateMenu(); ok(hmenu != 0, "CreateMenu failed\n"); ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, 203, "item 1"); -todo_wine ok(ret, "AppendMenu failed\n"); -if (ret) /* FIXME: uncomment once Wine is fixed */ check_menu_items(hmenu, 203, MF_OWNERDRAW, 0); DestroyMenu(hmenu); @@ -3720,9 +3716,7 @@ if (ret) /* FIXME: uncomment once Wine is fixed */ ok(ret, "AppendMenu failed\n"); check_menu_items(hmenu, 204, MF_STRING, 0); ret = ModifyMenuA(hmenu, 0, MF_POPUP | MF_BYPOSITION, 205, "item 2"); -todo_wine ok(ret, "ModifyMenu failed\n"); -if (ret) /* FIXME: uncomment once Wine is fixed */ check_menu_items(hmenu, 205, MF_STRING, 0); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii);

1 0

Dmitry Timoshkov : user32/tests: Add AppendMenu/ModifyMenu MF_POPUP tests.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 7744c7003b998fc5dc7cf375004840060ca1ddbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7744c7003b998fc5dc7cf3750… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 21 14:16:37 2014 +0900 user32/tests: Add AppendMenu/ModifyMenu MF_POPUP tests. --- dlls/user32/tests/menu.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index dc91c6a..2f3c481 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2510,6 +2510,11 @@ if (0) if (mii.hSubMenu) { ok(mii.wID == (UINT_PTR)mii.hSubMenu, "id %u: wID should be equal to hSubMenu\n", checked_cmd); + if (!GetMenuItemCount(mii.hSubMenu)) + { + ok(mii.fType == checked_type, "id %u: expected fType %04x, got %04x\n", checked_cmd, checked_type, mii.fType); + ok(mii.fState == checked_state, "id %u: expected fState %04x, got %04x\n", checked_cmd, checked_state, mii.fState); + } check_menu_items(mii.hSubMenu, checked_cmd, checked_type, checked_state); } else @@ -3618,6 +3623,129 @@ static void test_emptypopup(void) ok(ret, "DestroyMenu failed with error %d\n", GetLastError()); } +static void test_AppendMenu(void) +{ + MENUITEMINFOA mii; + HMENU hmenu, hsubmenu; + BOOL ret; + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW, 201, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, 201, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_POPUP, 202, "item 1"); +todo_wine + ok(ret, "AppendMenu failed\n"); +if (ret) /* FIXME: uncomment once Wine is fixed */ + check_menu_items(hmenu, 202, MF_STRING, 0); + DestroyMenu(hmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, 203, "item 1"); +todo_wine + ok(ret, "AppendMenu failed\n"); +if (ret) /* FIXME: uncomment once Wine is fixed */ + check_menu_items(hmenu, 203, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreateMenu(); + ok(hsubmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreateMenu(); + ok(hsubmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_STRING, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreateMenu(); + ok(hsubmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreatePopupMenu(); + ok(hsubmenu != 0, "CreatePopupMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreatePopupMenu(); + ok(hsubmenu != 0, "CreatePopupMenu failed\n"); + ret = AppendMenuA(hmenu, MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_STRING, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreatePopupMenu(); + ok(hsubmenu != 0, "CreatePopupMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_STRING, 204, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, 204, MF_STRING, 0); + ret = ModifyMenuA(hmenu, 0, MF_POPUP | MF_BYPOSITION, 205, "item 2"); +todo_wine + ok(ret, "ModifyMenu failed\n"); +if (ret) /* FIXME: uncomment once Wine is fixed */ + check_menu_items(hmenu, 205, MF_STRING, 0); + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_SUBMENU; + mii.hSubMenu = (HMENU)204; + ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); + ok(!ret, "InsertMenuItem should fail\n"); + ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); + ok(!ret, "SetMenuItemInfo should fail\n"); + mii.fMask = MIIM_ID; + mii.wID = 206; + ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); + ok(ret, "InsertMenuItem failed\n"); +if (0) /* FIXME: uncomment once Wine is fixed */ + check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED); + mii.wID = 207; + ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); + ok(ret, "SetMenuItemInfo failed\n"); +if (0) /* FIXME: uncomment once Wine is fixed */ + check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED); + DestroyMenu(hmenu); +} + START_TEST(menu) { init_function_pointers(); @@ -3655,4 +3783,5 @@ START_TEST(menu) test_menu_maxdepth(); test_menu_circref(); test_emptypopup(); + test_AppendMenu(); }

1 0

Nikolay Sivov : comctl32/treeview: Restore hdc before CDDS_ITEMPOSTPAINT.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: fe3f12335db8ea49d3569daa4ba50b57713a7cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3f12335db8ea49d3569daa4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 21 09:15:35 2014 +0400 comctl32/treeview: Restore hdc before CDDS_ITEMPOSTPAINT. --- dlls/comctl32/tests/msg.h | 31 ++++++++++++---- dlls/comctl32/tests/treeview.c | 76 +++++++++++++++++++++++++++++++++++++++- dlls/comctl32/treeview.c | 10 +++--- 3 files changed, 104 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index fbe8fe7..0e7ca99 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -38,7 +38,8 @@ typedef enum optional = 0x80, hook = 0x100, winevent_hook =0x200, - id = 0x400 + id = 0x400, + custdraw = 0x800 } msg_flags_t; struct message @@ -49,6 +50,7 @@ struct message LPARAM lParam; /* expected value of lParam */ UINT id; /* extra message data: id of the window, notify code etc. */ + DWORD stage; /* custom draw stage */ }; struct msg_sequence @@ -80,12 +82,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index, assert(msg_seq->sequence); - msg_seq->sequence[msg_seq->count].message = msg->message; - msg_seq->sequence[msg_seq->count].flags = msg->flags; - msg_seq->sequence[msg_seq->count].wParam = msg->wParam; - msg_seq->sequence[msg_seq->count].lParam = msg->lParam; - msg_seq->sequence[msg_seq->count].id = msg->id; - + msg_seq->sequence[msg_seq->count] = *msg; msg_seq->count++; } @@ -165,6 +162,26 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index, } } + if (expected->flags & custdraw) + { + if (expected->stage != actual->stage && todo) + { + todo_wine + { + failcount++; + ok_(file, line) (FALSE, + "%s: in msg 0x%04x expecting cd stage 0x%08x got 0x%08x\n", + context, expected->message, expected->stage, actual->stage); + } + } + else + { + ok_(file, line) (expected->stage == actual->stage, + "%s: in msg 0x%04x expecting cd stage 0x%08x got 0x%08x\n", + context, expected->message, expected->stage, actual->stage); + } + } + if (expected->flags & id) { if (expected->id != actual->id && expected->flags & optional) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index f4cdd50..cd619a9 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -40,10 +40,12 @@ static BOOL g_get_rect_in_expand; static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; static BOOL g_beginedit_alter_text; +static HFONT g_customdraw_font; -#define NUM_MSG_SEQUENCES 2 +#define NUM_MSG_SEQUENCES 3 #define TREEVIEW_SEQ_INDEX 0 #define PARENT_SEQ_INDEX 1 +#define PARENT_CD_SEQ_INDEX 2 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) @@ -242,6 +244,14 @@ static const struct message empty_seq[] = { { 0 } }; +static const struct message parent_cd_seq[] = { + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_POSTPAINT }, + { 0 } +}; + static HWND hMainWnd; static HTREEITEM hRoot, hChild; @@ -1149,6 +1159,38 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, break; } + case NM_CUSTOMDRAW: + { + NMTVCUSTOMDRAW *nmcd = (NMTVCUSTOMDRAW*)lParam; + COLORREF c0ffee = RGB(0xc0,0xff,0xee), cafe = RGB(0xca,0xfe,0x00); + + msg.flags |= custdraw; + msg.stage = nmcd->nmcd.dwDrawStage; + add_message(sequences, PARENT_CD_SEQ_INDEX, &msg); + + switch (msg.stage) + { + case CDDS_PREPAINT: + return CDRF_NOTIFYITEMDRAW|CDRF_NOTIFYITEMERASE|CDRF_NOTIFYPOSTPAINT; + case CDDS_ITEMPREPAINT: + nmcd->clrTextBk = c0ffee; + nmcd->clrText = cafe; + if (g_customdraw_font) + SelectObject(nmcd->nmcd.hdc, g_customdraw_font); + return CDRF_NOTIFYPOSTPAINT|CDRF_NEWFONT; + case CDDS_ITEMPOSTPAINT: + /* at the point of post paint notification colors are already restored */ + ok(GetTextColor(nmcd->nmcd.hdc) != cafe, "got 0%x\n", GetTextColor(nmcd->nmcd.hdc)); + ok(GetBkColor(nmcd->nmcd.hdc) != c0ffee, "got 0%x\n", GetBkColor(nmcd->nmcd.hdc)); + if (g_customdraw_font) + ok(GetCurrentObject(nmcd->nmcd.hdc, OBJ_FONT) != g_customdraw_font, "got %p\n", + GetCurrentObject(nmcd->nmcd.hdc, OBJ_FONT)); + break; + default: + ; + } + break; + } } } break; @@ -2053,6 +2095,37 @@ static void test_WM_GETDLGCODE(void) DestroyWindow(hTree); } +static void test_customdraw(void) +{ + static const char *rootA = "root"; + TVINSERTSTRUCTA ins; + HTREEITEM hRoot; + LOGFONTA lf; + HWND hwnd; + + hwnd = create_treeview_control(0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char*)rootA; + hRoot = TreeView_InsertItemA(hwnd, &ins); + ok(hRoot != NULL, "got %p\n", hRoot); + + /* create additional font, custom draw handler will select it */ + SystemParametersInfoA(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0); + lf.lfHeight *= 2; + g_customdraw_font = CreateFontIndirectA(&lf); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_cd_seq, "custom draw notifications", FALSE); + DeleteObject(g_customdraw_font); + g_customdraw_font = NULL; + + DestroyWindow(hwnd); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -2126,6 +2199,7 @@ START_TEST(treeview) test_TVM_GETNEXTITEM(); test_TVM_HITTEST(); test_WM_GETDLGCODE(); + test_customdraw(); if (!load_v6_module(&ctx_cookie, &hCtx)) { diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b2eed3c..dcc2be4 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2714,17 +2714,17 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) DeleteObject(hNewPen); } + /* Restore the hdc state */ + SetTextColor(hdc, oldTextColor); + SetBkColor(hdc, oldTextBkColor); + SelectObject(hdc, hOldFont); + if (cditem & CDRF_NOTIFYPOSTPAINT) { cditem = TREEVIEW_SendCustomDrawItemNotify (infoPtr, hdc, item, CDDS_ITEMPOSTPAINT, &nmcdhdr); TRACE("postpaint:cditem-app returns 0x%x\n", cditem); } - - /* Restore the hdc state */ - SetTextColor(hdc, oldTextColor); - SetBkColor(hdc, oldTextBkColor); - SelectObject(hdc, hOldFont); } /* Computes treeHeight and treeWidth and updates the scroll bars.

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 8b40ac454fc8fe73e0255e7859cc179386752e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b40ac454fc8fe73e0255e785… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Apr 19 09:12:23 2014 +0200 po: Update French translation. --- po/fr.po | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2699736..214f74c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-01-16 23:01+0100\n" +"PO-Revision-Date: 2014-04-19 09:10+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -6615,10 +6615,8 @@ msgid "The username could not be found.\n" msgstr "Nom d'utilisateur introuvable.\n" #: winerror.mc:3741 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "Le site n'existe pas.\n" +msgstr "Cette connexion réseau n'existe pas.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -11810,6 +11808,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Utilitaire d'enregistrement de DLL de Wine\n" +"\n" +"Fournit des services d'enregistrement de DLL.\n" +"\n" #: regsvr32.rc:40 msgid "" @@ -11824,54 +11826,66 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"Usage :\n" +" regsvr32 [/u] [/s] [/n] [/i[:commande]] NomDLL\n" +"\n" +"Options:\n" +" [/u] Annuler l'enregistrement d'un serveur.\n" +" [/s] Mode silencieux (aucun message ne sera affiché).\n" +" [/i] Appeler DllInstall, en passant une [commande] facultative.\n" +"\tQuand [/u] est utilisée, DllInstall est appelé en mode de " +"désinstallation.\n" +" [/n] Ne pas appeler DllRegisterServer. Cette option doit être utilisée " +"avec [/i].\n" +"\n" #: regsvr32.rc:41 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regsvr32: Option [%1] invalide ou non reconnue\n" +"\n" #: regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "Impossible d'ouvrir « %1 »\n" +msgstr "regsvr32 : Impossible de charger la DLL « %1 »\n" #: regsvr32.rc:43 msgid "regsvr32: %1 not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32 : %1 non implémentée dans la DLL « %2 »\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32 : Impossible d'enregistrer la DLL « %1 »\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32 : DLL « %1 » enregistrée avec succès\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32 : Impossible d'enregistrer la DLL « %1 »\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32 : DLL « %1 » désenregistrée avec succès\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32 : Impossible d'installer la DLL « %1 »\n" #: regsvr32.rc:49 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32 : DLL « %1 » installée avec succès\n" #: regsvr32.rc:50 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32 : Impossible de désinstaller la DLL « %1 »\n" #: regsvr32.rc:51 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32 : DLL « %1 » désinstallée avec succès\n" #: start.rc:55 msgid ""

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 828b48c644f1fa7d8aaa82dffa889457fee58bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828b48c644f1fa7d8aaa82dff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 21 09:15:12 2014 +0400 po: Update Russian translation. --- po/ru.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 8c745df..72f171d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6786,7 +6786,7 @@ msgstr "" "\t/q{|n|b|r|f|n+|b+|b-}\n" "Зарегистрировать службу MSI:\n" "\t/y\n" -"Разрегистрировать службу MSI:\n" +"Удалить регистрационные данные службы MSI:\n" "\t/z\n" "Вывести эту справку:\n" "\t/help\n" @@ -11702,7 +11702,7 @@ msgstr "" " regsvr32 [/u] [/s] [/n] [/i[:cmdline]] имя_dll\n" "\n" "Параметры:\n" -" [/u] Разрегистрировать сервер.\n" +" [/u] Удалить регистрационные данные сервера.\n" " [/s] Тихий режим (сообщения не выводятся).\n" " [/i] Вызвать DllInstall с дополнительными параметрами [cmdline].\n" "\tПри использовании с [/u] DllInstall будет вызвана в режиме удаления.\n" @@ -11735,11 +11735,11 @@ msgstr "regsvr32: DLL «%1» успешно зарегистрирована\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "regsvr32: не удалось разрегистрировать DLL «%1»\n" +msgstr "regsvr32: не удалось удалить регистрационные данные DLL «%1»\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "regsvr32: DLL «%1» успешно разрегистрирована\n" +msgstr "regsvr32: регистрационные данные DLL «%1» успешно удалены\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n"

1 0

Nikolay Sivov : atl: Move IUnknown methods to IOleClientSite.
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 82cf29d30753f9c48c356d0729b75b23fef42ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82cf29d30753f9c48c356d072… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 21 09:14:17 2014 +0400 atl: Move IUnknown methods to IOleClientSite. --- dlls/atl/atl_ax.c | 167 +++++++++++++++++++++++++---------------------------- 1 file changed, 80 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82cf29d30753f9c48c356…

1 0

Ken Thomases : winex11: Remove dead store into win_gravity in get_window_attributes().
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 3e09763835935cf44f3b78156a38753f30655d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e09763835935cf44f3b78156… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 20 17:11:13 2014 -0500 winex11: Remove dead store into win_gravity in get_window_attributes(). --- dlls/winex11.drv/window.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a9caa0d..d98b9f6 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -314,7 +314,6 @@ static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttrib attr->colormap = data->colormap ? data->colormap : default_colormap; attr->save_under = ((GetClassLongW( data->hwnd, GCL_STYLE ) & CS_SAVEBITS) != 0); attr->bit_gravity = NorthWestGravity; - attr->win_gravity = StaticGravity; attr->backing_store = NotUseful; attr->border_pixel = 0; attr->event_mask = (ExposureMask | PointerMotionMask |

1 0

Nikolay Sivov : services: Remove loop that's not really used anymore ( Coverity).
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: fdbd8ffffc9a807c0089ff625a6bb5ab6160540e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdbd8ffffc9a807c0089ff625… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 19 13:55:21 2014 +0400 services: Remove loop that's not really used anymore (Coverity). --- programs/services/services.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index f6de89d..2fe3806 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -695,32 +695,29 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDLE process_handle) { - WINE_TRACE("%p\n", service_entry); + HANDLE handles[2] = { service_entry->status_changed_event, process_handle }; + DWORD state, ret; - for (;;) - { - DWORD dwCurrentStatus; - HANDLE handles[2] = { service_entry->status_changed_event, process_handle }; - DWORD ret; - ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); - if (ret != WAIT_OBJECT_0) - return ERROR_SERVICE_REQUEST_TIMEOUT; - service_lock_shared(service_entry); - dwCurrentStatus = service_entry->status.dwCurrentState; - service_unlock(service_entry); - if (dwCurrentStatus == SERVICE_START_PENDING) - { - WINE_TRACE("Service changed its status to SERVICE_START_PENDING\n"); - return ERROR_SUCCESS; - } - else if (dwCurrentStatus == SERVICE_RUNNING) - { - WINE_TRACE("Service started successfully\n"); - return ERROR_SUCCESS; - } + WINE_TRACE("%p\n", service_entry); + ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); + if (ret != WAIT_OBJECT_0) return ERROR_SERVICE_REQUEST_TIMEOUT; + service_lock_shared(service_entry); + state = service_entry->status.dwCurrentState; + service_unlock(service_entry); + if (state == SERVICE_START_PENDING) + { + WINE_TRACE("Service state changed to SERVICE_START_PENDING\n"); + return ERROR_SUCCESS; } + else if (state == SERVICE_RUNNING) + { + WINE_TRACE("Service started successfully\n"); + return ERROR_SUCCESS; + } + + return ERROR_SERVICE_REQUEST_TIMEOUT; } /******************************************************************************

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
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