November 2019 - Wine-Devel - list.winehq.org

[PATCH 1/2] msvcrt: Improve printf %I format support.
by Piotr Caban Nov. 2, 2019

Nov. 2, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/printf.h | 6 +++--- dlls/msvcrt/tests/printf.c | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[PATCH] shell32: Fix a memory leak (Valgrind).
by Sven Baars Nov. 2, 2019

Nov. 2, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/shell32/shlview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index c0c027fbd3..bcb9466315 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -655,6 +655,8 @@ static HRESULT ShellView_FillList(IShellViewImpl *This) { if (IncludeObject(This, pidl) == S_OK) shellview_add_item(This, pidl); + else + ILFree(pidl); } SendMessageW(This->hWndList, LVM_SORTITEMS, (WPARAM)This->pSFParent, (LPARAM)ShellView_CompareItems); -- 2.17.1

1 0

[PATCH v3] ucrtbase: Implement t and j printf length modifiers.
by Piotr Caban Nov. 2, 2019

Nov. 2, 2019

From: Ambrož Bizjak <abizjak.pro(a)gmail.com> Signed-off-by: Ambroz Bizjak <abizjak.pro(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v3: - remove unneeded casts - remove LONGLONG constants from touched code dlls/msvcrt/printf.h | 6 +++++- dlls/ucrtbase/tests/printf.c | 42 +++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 16 deletions(-)

2 1

Re: [PATCH] ucrtbase: Implement t and j printf length modifiers.
by Ambrož Bizjak Nov. 2, 2019

Nov. 2, 2019

Updated patch: - Using if (sizeof(type) == 8) instead of #ifdef _WIN64. - Using the MIN_/MAX_ constants for the exact type being tested to prevent a warning. - Added Signed-off-by line. On Fri, Nov 1, 2019 at 6:02 PM Piotr Caban <piotr.caban(a)gmail.com> wrote: > > Hi, > > Can't PTRDIFF_MIN or PTRDIFF_MAX be used to avoid the warning? > > Thanks, > Piotr > > On 11/1/19 5:28 PM, Ambrož Bizjak wrote: > > Hi, > > The reason for the define is that I was getting warnings about integer > > overflow from the branch that is not taken (too large value converted to > > 32 bits). > > > > Let me know if that's ok, then I will resend with signed-off. > > > > On Friday, November 1, 2019, Piotr Caban <piotr.caban(a)gmail.com > > <mailto:piotr.caban(a)gmail.com>> wrote: > > > > Hi Ambrož, > > > > The patch looks mostly good to me but it's required that you add > > signed-off-by line > > (https://wiki.winehq.org/Submitting_Patches#The_commit_message > > <https://wiki.winehq.org/Submitting_Patches#The_commit_message>). > > > > What's the reason for changing: > > if (sizeof(void*) == 8) > > to > > #ifdef _WIN64 > > ? > > I think it's better to keep it as is so the code is always compiled. > > > > Thanks, > > Piotr > > >

3 3

[PATCH 5/6] vbscript/tests: Add redim statement tests.
by Jacek Caban Nov. 2, 2019

Nov. 2, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/lang.vbs | 31 ++++++++++++++++++++++++++++++- dlls/vbscript/tests/run.c | 2 ++ 2 files changed, 32 insertions(+), 1 deletion(-)

2 1

[PATCH 2/6] vbscript: Allow 'with' as an identifier.
by Jacek Caban Nov. 2, 2019

Nov. 2, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 1 + dlls/vbscript/tests/run.c | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-)

2 1

Wine staging 4.19 release
by Alistair Leslie-Hughes Nov. 1, 2019

Nov. 1, 2019

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.19 (840 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * quartz: Implement MediaSeeking_GetStopPosition on top of MediaSeeking_GetPositions. * quartz: Remove unused cache of MediaSeeking stop position. * quartz: Include the stream position in addition to the reference clock offset in the time returned by MediaSeeking_GetPositions. * crypt32: Add MS root CA 2010. * include: Add restrictederrorinfo.idl. * uianimation: Add stub dll. * uianimation: Implement IUIAnimationManager CreateStoryboard. * uianimation: Implement IUIAnimationManager CreateAnimationVariable. Added: * [47974] X Rebirth: NtVirtualAlloc() does not find available memory with nonzero bitmask. Updated: * ntdll-User_Shared_Data Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 2/2] tapi32: Add lineGetTranslateCapsW function
by Vijay Kiran Kamuju Nov. 1, 2019

Nov. 1, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38585 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/tapi32/line.c | 6 ++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index a44ac1a1a726..e0f85cbc9449 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -1135,6 +1135,12 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, return 0; /* success */ } +DWORD WINAPI lineGetTranslateCapsW(HLINEAPP hLineApp, DWORD dwAPIVersion, + LPLINETRANSLATECAPS lpTranslateCaps) +{ + return lineGetTranslateCapsA(hLineApp, dwAPIVersion, lpTranslateCaps); +} + /*********************************************************************** * lineHandoff (TAPI32.@) */ diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 62631efe236f..39ab7c1bf2f6 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -67,6 +67,7 @@ @ stdcall lineGetStatusMessages(long ptr ptr) @ stdcall lineGetTranslateCaps(long long ptr) lineGetTranslateCapsA @ stdcall lineGetTranslateCapsA(long long ptr) +@ stdcall lineGetTranslateCapsW(long long ptr) @ stdcall lineHandoff(long str long) lineHandoffA @ stdcall lineHandoffA(long str long) @ stdcall lineHold(long) -- 2.21.0

2 1

[PATCH v2] vkd3d: Allocate huge descriptor pools when root signature demands it.
by Hans-Kristian Arntzen Nov. 1, 2019

Nov. 1, 2019

Currently, descriptor pools are allocated with the intention of being used as a suballocator, but for a bindless style, root signatures can contain many thousand descriptors. Fall back to single allocations for these cases and do not attempt to recycle these descriptor sets. This path is triggered by Control DX12 which creates a RS with > ~200k SRVs in register space 1. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- libs/vkd3d/command.c | 79 ++++++++++++++++++++++++++++---------- libs/vkd3d/state.c | 19 +-------- libs/vkd3d/vkd3d_private.h | 23 +++++++++++ 3 files changed, 84 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3f78d17..34d2505 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1264,13 +1264,24 @@ static bool d3d12_command_allocator_add_framebuffer(struct d3d12_command_allocat } static bool d3d12_command_allocator_add_descriptor_pool(struct d3d12_command_allocator *allocator, - VkDescriptorPool pool) + VkDescriptorPool pool, bool recycle) { - if (!vkd3d_array_reserve((void **)&allocator->descriptor_pools, &allocator->descriptor_pools_size, + if (recycle) + { + if (!vkd3d_array_reserve((void **)&allocator->descriptor_pools, &allocator->descriptor_pools_size, allocator->descriptor_pool_count + 1, sizeof(*allocator->descriptor_pools))) - return false; + return false; - allocator->descriptor_pools[allocator->descriptor_pool_count++] = pool; + allocator->descriptor_pools[allocator->descriptor_pool_count++] = pool; + } + else + { + if (!vkd3d_array_reserve((void **)&allocator->descriptor_pools_huge, &allocator->descriptor_pools_huge_size, + allocator->descriptor_pool_huge_count + 1, sizeof(*allocator->descriptor_pools_huge))) + return false; + + allocator->descriptor_pools_huge[allocator->descriptor_pool_huge_count++] = pool; + } return true; } @@ -1313,9 +1324,17 @@ static bool d3d12_command_allocator_add_transfer_buffer(struct d3d12_command_all } static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( - struct d3d12_command_allocator *allocator) + struct d3d12_command_allocator *allocator, const struct d3d12_root_signature_info *root_signature) { - static const VkDescriptorPoolSize pool_sizes[] = + bool huge_root_signature = false; + struct d3d12_device *device = allocator->device; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct VkDescriptorPoolCreateInfo pool_desc; + VkDevice vk_device = device->vk_device; + VkDescriptorPool vk_pool; + VkResult vr; + + VkDescriptorPoolSize pool_sizes[] = { {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1024}, {VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, 1024}, @@ -1324,14 +1343,23 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( {VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1024}, {VK_DESCRIPTOR_TYPE_SAMPLER, 1024}, }; - struct d3d12_device *device = allocator->device; - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - struct VkDescriptorPoolCreateInfo pool_desc; - VkDevice vk_device = device->vk_device; - VkDescriptorPool vk_pool; - VkResult vr; - if (allocator->free_descriptor_pool_count > 0) + if (root_signature && ( + root_signature->cbv_count > 1024 || + root_signature->srv_count > 1024 || + root_signature->uav_count + root_signature->buffer_uav_count > 1024 || + root_signature->sampler_count > 1024)) + { + huge_root_signature = true; + pool_sizes[0].descriptorCount = root_signature->cbv_count; + pool_sizes[1].descriptorCount = root_signature->srv_count; + pool_sizes[2].descriptorCount = root_signature->srv_count; + pool_sizes[3].descriptorCount = root_signature->uav_count + root_signature->buffer_uav_count; + pool_sizes[4].descriptorCount = root_signature->uav_count; + pool_sizes[5].descriptorCount = root_signature->sampler_count; + } + + if (!huge_root_signature && allocator->free_descriptor_pool_count > 0) { vk_pool = allocator->free_descriptor_pools[allocator->free_descriptor_pool_count - 1]; allocator->free_descriptor_pools[allocator->free_descriptor_pool_count - 1] = VK_NULL_HANDLE; @@ -1342,7 +1370,7 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; pool_desc.pNext = NULL; pool_desc.flags = device->vk_info.EXT_descriptor_indexing ? VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT : 0; - pool_desc.maxSets = 512; + pool_desc.maxSets = huge_root_signature ? 1 : 512; pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); pool_desc.pPoolSizes = pool_sizes; if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) @@ -1352,7 +1380,7 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( } } - if (!(d3d12_command_allocator_add_descriptor_pool(allocator, vk_pool))) + if (!(d3d12_command_allocator_add_descriptor_pool(allocator, vk_pool, !huge_root_signature))) { ERR("Failed to add descriptor pool.\n"); VK_CALL(vkDestroyDescriptorPool(vk_device, vk_pool, NULL)); @@ -1363,7 +1391,8 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( } static VkDescriptorSet d3d12_command_allocator_allocate_descriptor_set( - struct d3d12_command_allocator *allocator, VkDescriptorSetLayout vk_set_layout) + struct d3d12_command_allocator *allocator, VkDescriptorSetLayout vk_set_layout, + const struct d3d12_root_signature_info *root_signature) { struct d3d12_device *device = allocator->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1373,7 +1402,7 @@ static VkDescriptorSet d3d12_command_allocator_allocate_descriptor_set( VkResult vr; if (!allocator->vk_descriptor_pool) - allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator); + allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator, root_signature); if (!allocator->vk_descriptor_pool) return VK_NULL_HANDLE; @@ -1387,7 +1416,7 @@ static VkDescriptorSet d3d12_command_allocator_allocate_descriptor_set( allocator->vk_descriptor_pool = VK_NULL_HANDLE; if (vr == VK_ERROR_FRAGMENTED_POOL || vr == VK_ERROR_OUT_OF_POOL_MEMORY_KHR) - allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator); + allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator, root_signature); if (!allocator->vk_descriptor_pool) { ERR("Failed to allocate descriptor set, vr %d.\n", vr); @@ -1478,6 +1507,12 @@ static void d3d12_command_allocator_free_resources(struct d3d12_command_allocato } allocator->descriptor_pool_count = 0; + for (i = 0; i < allocator->descriptor_pool_huge_count; ++i) + { + VK_CALL(vkDestroyDescriptorPool(device->vk_device, allocator->descriptor_pools_huge[i], NULL)); + } + allocator->descriptor_pool_huge_count = 0; + for (i = 0; i < allocator->framebuffer_count; ++i) { VK_CALL(vkDestroyFramebuffer(device->vk_device, allocator->framebuffers[i], NULL)); @@ -1755,6 +1790,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->descriptor_pools_size = 0; allocator->descriptor_pool_count = 0; + allocator->descriptor_pools_huge = NULL; + allocator->descriptor_pools_huge_size = 0; + allocator->descriptor_pool_huge_count = 0; + allocator->views = NULL; allocator->views_size = 0; allocator->view_count = 0; @@ -2547,7 +2586,7 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li * we need at the very least a new descriptor set. */ bindings->descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, - root_signature->vk_set_layout); + root_signature->vk_set_layout, &root_signature->info); bindings->in_use = false; @@ -2582,7 +2621,7 @@ static void d3d12_command_list_prepare_uav_counter_descriptors(struct d3d12_comm if (list->state->uav_counter_mask) { bindings->uav_counter_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, - list->state->vk_set_layout); + list->state->vk_set_layout, NULL); } else bindings->uav_counter_descriptor_set = VK_NULL_HANDLE; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ed20de7..eb87350 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -314,23 +314,6 @@ static bool vk_binding_from_d3d12_descriptor_range(struct VkDescriptorSetLayoutB return true; } -struct d3d12_root_signature_info -{ - size_t cbv_count; - size_t buffer_uav_count; - size_t uav_count; - size_t buffer_srv_count; - size_t srv_count; - size_t sampler_count; - - size_t descriptor_count; - - size_t root_constant_count; - size_t root_descriptor_count; - - size_t cost; -}; - static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_signature_info *info, const D3D12_DESCRIPTOR_RANGE *range) { @@ -919,6 +902,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (FAILED(hr = vkd3d_private_store_init(&root_signature->private_store))) goto fail; + root_signature->info = info; + d3d12_device_add_ref(root_signature->device = device); return S_OK; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bd54c67..3a263ef 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -666,6 +666,23 @@ struct d3d12_root_parameter }; /* ID3D12RootSignature */ +struct d3d12_root_signature_info +{ + size_t cbv_count; + size_t buffer_uav_count; + size_t uav_count; + size_t buffer_srv_count; + size_t srv_count; + size_t sampler_count; + + size_t descriptor_count; + + size_t root_constant_count; + size_t root_descriptor_count; + + size_t cost; +}; + struct d3d12_root_signature { ID3D12RootSignature ID3D12RootSignature_iface; @@ -699,6 +716,8 @@ struct d3d12_root_signature unsigned int static_sampler_count; VkSampler *static_samplers; + struct d3d12_root_signature_info info; + struct d3d12_device *device; struct vkd3d_private_store private_store; @@ -846,6 +865,10 @@ struct d3d12_command_allocator size_t descriptor_pools_size; size_t descriptor_pool_count; + VkDescriptorPool *descriptor_pools_huge; + size_t descriptor_pools_huge_size; + size_t descriptor_pool_huge_count; + struct vkd3d_view **views; size_t views_size; size_t view_count; -- 2.23.0

1 0

[RESEND 1/4] comctl32/combo: Add tests for WM_CTLCOLOR*
by Fabian Maurer Nov. 1, 2019

Nov. 1, 2019

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 74 +++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 923d826b30..b4130139dd 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -46,6 +46,8 @@ static HWND hComboExParentWnd, hMainWnd; static HINSTANCE hMainHinst; static const char ComboExTestClass[] = "ComboExTestClass"; +static HBRUSH brush_red; + static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); #define MAX_CHARS 100 @@ -507,6 +509,8 @@ static BOOL init(void) wc.lpfnWndProc = ComboExTestWndProc; RegisterClassA(&wc); + brush_red = CreateSolidBrush(RGB(255, 0, 0)); + hMainWnd = CreateWindowA(WC_STATICA, "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); @@ -533,6 +537,7 @@ static void cleanup(void) UnregisterClassA(ComboExTestClass, GetModuleHandleA(NULL)); DestroyWindow(hMainWnd); + DeleteObject(brush_red); } static void test_comboex_subclass(void) @@ -717,6 +722,7 @@ static LRESULT (CALLBACK *old_parent_proc)(HWND hwnd, UINT msg, WPARAM wparam, L static LPCSTR expected_edit_text; static LPCSTR expected_list_text; static BOOL selchange_fired; +static HWND lparam_for_WM_CTLCOLOR = 0; static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -748,6 +754,19 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; } break; + case WM_CTLCOLOR: + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + if (lparam_for_WM_CTLCOLOR) + { + ok(lparam_for_WM_CTLCOLOR == (HWND)lparam, "Expected %p, got %p\n", lparam_for_WM_CTLCOLOR, (HWND)lparam); + } + return (LRESULT) brush_red; } return CallWindowProcA(old_parent_proc, hwnd, msg, wparam, lparam); @@ -1254,6 +1273,60 @@ static void test_combo_dropdown_size(DWORD style) } } +static void test_color_messages(void) +{ + HBRUSH brush; + int result; + COMBOBOXINFO info; + HWND handle_combo = create_combobox(CBS_DROPDOWN); + + old_parent_proc = (void *)SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)parent_wnd_proc); + + info.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + result = GetComboBoxInfo(handle_combo, &info); + ok(result, "Failed to get combobox info structure.\n"); + + lparam_for_WM_CTLCOLOR = info.hwndItem; + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLOR, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORMSGBOX, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLOREDIT, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORLISTBOX, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORBTN, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORDLG, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORSCROLLBAR, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORSTATIC, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + lparam_for_WM_CTLCOLOR = 0; + + DestroyWindow(handle_combo); + SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)old_parent_proc); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1281,6 +1354,7 @@ START_TEST(combo) } /* ComboBox control tests. */ + test_color_messages(); test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN); test_combo_setfont(CBS_DROPDOWNLIST); -- 2.23.0

2 4