October 2022 - Wine-Commits

Zhiyi Zhang : comctl32/listview: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: a8396d8b1e852276b6cea9f2c50834739d1170da URL: https://gitlab.winehq.org/wine/wine/-/commit/a8396d8b1e852276b6cea9f2c50834… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 16:06:09 2022 +0800 comctl32/listview: Don't repaint when handling WM_STYLECHANGED. Some applications subclass listview and change style multiple times when painting. Invalidating control when handling WM_STYLECHANGED causes infinite WM_PAINT messages in this case and end up stalling the message queue. --- dlls/comctl32/listview.c | 3 --- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 38d43a9f742..d060fd5c977 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11298,9 +11298,6 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, /* add scrollbars if needed */ LISTVIEW_UpdateScroll(infoPtr); - /* invalidate client area + erase background */ - LISTVIEW_InvalidateList(infoPtr); - return 0; } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 73526020843..d9f07570fd0 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1096,7 +1096,7 @@ static void test_WM_STYLECHANGED(void) {HOTKEY_CLASSA, wm_stylechanged_seq}, {WC_IPADDRESSA, wm_stylechanged_seq}, {WC_LISTBOXA, wm_stylechanged_repaint_seq, TRUE}, - {WC_LISTVIEWA, wm_stylechanged_seq, TRUE}, + {WC_LISTVIEWA, wm_stylechanged_seq}, {MONTHCAL_CLASSA, wm_stylechanged_repaint_seq, TRUE}, {WC_NATIVEFONTCTLA, wm_stylechanged_seq}, {WC_PAGESCROLLERA, wm_stylechanged_pager_seq, TRUE},

1 0

Zhiyi Zhang : comctl32/tests: Test if WM_STYLECHANGED repaints controls.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: c8ec431fd4cd370daba96aa18d892fa8d7397ef8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8ec431fd4cd370daba96aa18d892f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 15:20:58 2022 +0800 comctl32/tests: Test if WM_STYLECHANGED repaints controls. --- dlls/comctl32/tests/misc.c | 156 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index bc404c4b59a..5da44e7af8c 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -997,17 +997,171 @@ static void test_themed_background(void) pSetThreadDpiAwarenessContext(old_context); } +static WNDPROC old_proc; + +static const struct message wm_stylechanged_seq[] = +{ + {WM_STYLECHANGED, sent}, + {0} +}; + +static const struct message wm_stylechanged_repaint_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_PAINT, sent}, + {WM_ERASEBKGND, sent | defwinproc}, + {0} +}; + +static const struct message wm_stylechanged_combox_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_ERASEBKGND, sent | defwinproc}, + {WM_PAINT, sent}, + {0} +}; + +static const struct message wm_stylechanged_pager_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_PAINT, sent}, + {WM_NCPAINT, sent | defwinproc}, + {WM_ERASEBKGND, sent | defwinproc}, + {0} +}; + +static const struct message wm_stylechanged_progress_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_PAINT, sent | optional}, /* WM_PAINT and WM_ERASEBKGND are missing with comctl32 v5 */ + {WM_ERASEBKGND, sent | defwinproc | optional}, + {0} +}; + +static const struct message wm_stylechanged_trackbar_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_PAINT, sent | defwinproc}, + {WM_PAINT, sent}, + {0} +}; + +static LRESULT WINAPI test_wm_stylechanged_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +{ + static int defwndproc_counter = 0; + struct message msg = {0}; + LRESULT ret; + + if (message == WM_STYLECHANGED + || message == WM_PAINT + || message == WM_ERASEBKGND + || message == WM_NCPAINT) + { + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wp; + msg.lParam = lp; + add_message(sequences, CHILD_SEQ_INDEX, &msg); + } + + ++defwndproc_counter; + ret = CallWindowProcA(old_proc, hwnd, message, wp, lp); + --defwndproc_counter; + return ret; +} + +static void test_WM_STYLECHANGED(void) +{ + HWND parent, hwnd; + STYLESTRUCT style; + unsigned int i; + + static const struct test + { + const CHAR *class_name; + const struct message *seq; + BOOL todo; + } + tests[] = + { + {ANIMATE_CLASSA, wm_stylechanged_seq, TRUE}, + {WC_BUTTONA, wm_stylechanged_seq}, + {WC_COMBOBOXA, wm_stylechanged_combox_seq, TRUE}, + {WC_COMBOBOXEXA, wm_stylechanged_seq}, + {DATETIMEPICK_CLASSA, wm_stylechanged_seq, TRUE}, + {WC_EDITA, wm_stylechanged_seq}, + {WC_HEADERA, wm_stylechanged_repaint_seq, TRUE}, + {HOTKEY_CLASSA, wm_stylechanged_seq}, + {WC_IPADDRESSA, wm_stylechanged_seq}, + {WC_LISTBOXA, wm_stylechanged_repaint_seq, TRUE}, + {WC_LISTVIEWA, wm_stylechanged_seq, TRUE}, + {MONTHCAL_CLASSA, wm_stylechanged_repaint_seq, TRUE}, + {WC_NATIVEFONTCTLA, wm_stylechanged_seq}, + {WC_PAGESCROLLERA, wm_stylechanged_pager_seq, TRUE}, + {PROGRESS_CLASSA, wm_stylechanged_progress_seq}, + {REBARCLASSNAMEA, wm_stylechanged_seq}, + {WC_STATICA, wm_stylechanged_seq}, + {STATUSCLASSNAMEA, wm_stylechanged_seq}, + {"SysLink", wm_stylechanged_seq, TRUE}, + {WC_TABCONTROLA, wm_stylechanged_seq, TRUE}, + {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, + {TOOLTIPS_CLASSA, wm_stylechanged_seq}, + {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE}, + {WC_TREEVIEWA, wm_stylechanged_seq, TRUE}, + {UPDOWN_CLASSA, wm_stylechanged_seq, TRUE}, + {WC_SCROLLBARA, wm_stylechanged_seq}, + }; + + parent = CreateWindowA(WC_STATICA, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 100, 100, + 0, 0, 0, 0); + ok(parent != NULL, "CreateWindowA failed, error %lu.\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("%s", tests[i].class_name); + + hwnd = CreateWindowA(tests[i].class_name, "test", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, + parent, 0, 0, 0); + /* SysLink is unavailable in comctl32 v5 */ + if (!hwnd && !lstrcmpA(tests[i].class_name, "SysLink")) + { + winetest_pop_context(); + continue; + } + ok(hwnd != NULL, "CreateWindowA failed, error %lu.\n", GetLastError()); + old_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)test_wm_stylechanged_proc); + ok(old_proc != NULL, "SetWindowLongPtrA failed, error %lu.\n", GetLastError()); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + style.styleOld = GetWindowLongA(hwnd, GWL_STYLE); + style.styleNew = style.styleOld | WS_TABSTOP; + SendMessageA(hwnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM)&style); + flush_events(); + ok_sequence(sequences, CHILD_SEQ_INDEX, tests[i].seq, "WM_STYLECHANGED", tests[i].todo); + + DestroyWindow(hwnd); + winetest_pop_context(); + } + + DestroyWindow(parent); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; HANDLE hCtx; + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); if(!InitFunctionPtrs()) return; test_GetPtrAW(); test_Alloc(); test_comctl32_classes(FALSE); + test_WM_STYLECHANGED(); FreeLibrary(hComctl32); @@ -1015,7 +1169,6 @@ START_TEST(misc) return; if(!init_functions_v6()) return; - init_msg_sequences(sequences, NUM_MSG_SEQUENCES); test_comctl32_classes(TRUE); test_builtin_classes(); @@ -1023,6 +1176,7 @@ START_TEST(misc) test_themed_background(); test_WM_THEMECHANGED(); test_WM_SYSCOLORCHANGE(); + test_WM_STYLECHANGED(); unload_v6_module(ctx_cookie, hCtx); FreeLibrary(hComctl32);

1 0

Alex Henrie : include: Add WSANO_ADDRESS to winsock2.h.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: e9ff761d51d5072b271541ea05699ed2cae91ecf URL: https://gitlab.winehq.org/wine/wine/-/commit/e9ff761d51d5072b271541ea05699e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 17 20:32:27 2022 -0600 include: Add WSANO_ADDRESS to winsock2.h. Needed to compile Tera Term. --- include/winsock2.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winsock2.h b/include/winsock2.h index 86050025074..2e95733189e 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -782,6 +782,7 @@ typedef struct _OVERLAPPED* LPWSAOVERLAPPED; #define WSATRY_AGAIN (WSABASEERR + 1002) #define WSANO_RECOVERY (WSABASEERR + 1003) #define WSANO_DATA (WSABASEERR + 1004) +#define WSANO_ADDRESS WSANO_DATA #define WSA_IO_PENDING (ERROR_IO_PENDING) #define WSA_IO_INCOMPLETE (ERROR_IO_INCOMPLETE)

1 0

Jacek Caban : user.exe: Pass resource ID as a string in DIALOG_CreateControls16.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 8aa5b99627d3b27348ffaaceaa87dad7dba39a14 URL: https://gitlab.winehq.org/wine/wine/-/commit/8aa5b99627d3b27348ffaaceaa87da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 13 16:45:26 2022 +0200 user.exe: Pass resource ID as a string in DIALOG_CreateControls16. Based on commit 0739aa610cc07. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53646 --- dlls/user.exe16/dialog.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index ecd7acb9bfc..315f70dd6f3 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -181,13 +181,25 @@ static BOOL DIALOG_CreateControls16( HWND hwnd, LPCSTR template, TRACE(" BEGIN\n" ); while (items--) { + char *caption, caption_buf[4]; HINSTANCE16 instance = hInst; SEGPTR segptr; template = DIALOG_GetControl16( template, &info ); segptr = MapLS( info.data ); + + caption = (char *)info.windowName; + if (caption && IS_INTRESOURCE(caption)) + { + caption_buf[0] = 0xff; + caption_buf[1] = PtrToUlong( caption ); + caption_buf[2] = PtrToUlong( caption ) >> 8; + caption_buf[3] = 0; + caption = caption_buf; + } + hwndCtrl = WIN_Handle32( CreateWindowEx16( WS_EX_NOPARENTNOTIFY, - info.className, info.windowName, + info.className, caption, info.style | WS_CHILD, MulDiv(info.x, dlgInfo->xBaseUnit, 4), MulDiv(info.y, dlgInfo->yBaseUnit, 8),

1 0

Connor McAdams : uiautomationcore: Determine provider type for nested node providers.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 59a629810aa827927b30ffc167b3386b00ae92a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/59a629810aa827927b30ffc167b338… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 12 13:22:29 2022 -0400 uiautomationcore: Determine provider type for nested node providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 8 ++-- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_client.c | 63 +++++++++++++++++++++++++++++- 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 54d6fa710b5..604e488601f 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -4988,7 +4988,7 @@ static const struct prov_method_sequence node_from_hwnd3[] = { { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, { &Provider, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ { &Provider, PROV_GET_PROVIDER_OPTIONS }, - { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, + { &Provider, PROV_GET_PROVIDER_OPTIONS }, { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { 0 } }; @@ -5040,7 +5040,7 @@ static const struct prov_method_sequence node_from_hwnd6[] = { { &Provider_child, FRAG_GET_FRAGMENT_ROOT, METHOD_OPTIONAL }, { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_OPTIONAL }, { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, - { &Provider_child, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, + { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, /* Next two are only done on Win10v1809+. */ { &Provider_child, FRAG_GET_FRAGMENT_ROOT, METHOD_OPTIONAL }, { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_OPTIONAL }, @@ -5060,7 +5060,7 @@ static const struct prov_method_sequence node_from_hwnd7[] = { { &Provider_child, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, { &Provider_child, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, - { &Provider_child, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, + { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, @@ -5078,7 +5078,7 @@ static const struct prov_method_sequence node_from_hwnd8[] = { { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, { &Provider, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ { &Provider, PROV_GET_PROVIDER_OPTIONS }, - { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, + { &Provider, PROV_GET_PROVIDER_OPTIONS }, { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_ProviderDescriptionPropertyId */ { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ControlTypePropertyId */ { 0 } diff --git a/dlls/uiautomationcore/uia_classes.idl b/dlls/uiautomationcore/uia_classes.idl index 5877d14b8e5..4540613bba2 100644 --- a/dlls/uiautomationcore/uia_classes.idl +++ b/dlls/uiautomationcore/uia_classes.idl @@ -44,6 +44,7 @@ library UIA_wine_private interface IWineUiaProvider : IUnknown { HRESULT get_prop_val([in]const struct uia_prop_info *prop_info, [out, retval]VARIANT *ret_val); + HRESULT get_prov_opts([out, retval]int *out_opts); } [ diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 1385e1f94ee..4f2cdfd6391 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -333,6 +333,22 @@ int get_node_provider_type_at_idx(struct uia_node *node, int idx) return 0; } +static HRESULT get_prov_opts_from_node_provider(IWineUiaNode *node, int idx, int *out_opts) +{ + IWineUiaProvider *prov; + HRESULT hr; + + *out_opts = 0; + hr = IWineUiaNode_get_provider(node, idx, &prov); + if (FAILED(hr)) + return hr; + + hr = IWineUiaProvider_get_prov_opts(prov, out_opts); + IWineUiaProvider_Release(prov); + + return hr; +} + /* * IWineUiaNode interface. */ @@ -839,11 +855,28 @@ static HRESULT WINAPI uia_provider_get_prop_val(IWineUiaProvider *iface, return S_OK; } +static HRESULT WINAPI uia_provider_get_prov_opts(IWineUiaProvider *iface, int *out_opts) +{ + struct uia_provider *prov = impl_from_IWineUiaProvider(iface); + enum ProviderOptions prov_opts; + HRESULT hr; + + TRACE("%p, %p\n", iface, out_opts); + + *out_opts = 0; + hr = IRawElementProviderSimple_get_ProviderOptions(prov->elprov, &prov_opts); + if (SUCCEEDED(hr)) + *out_opts = prov_opts; + + return S_OK; +} + static const IWineUiaProviderVtbl uia_provider_vtbl = { uia_provider_QueryInterface, uia_provider_AddRef, uia_provider_Release, uia_provider_get_prop_val, + uia_provider_get_prov_opts, }; static HRESULT create_wine_uia_provider(struct uia_node *node, IRawElementProviderSimple *elprov, @@ -1186,11 +1219,21 @@ static HRESULT WINAPI uia_nested_node_provider_get_prop_val(IWineUiaProvider *if return S_OK; } +static HRESULT WINAPI uia_nested_node_provider_get_prov_opts(IWineUiaProvider *iface, int *out_opts) +{ + struct uia_nested_node_provider *prov = impl_from_nested_node_IWineUiaProvider(iface); + + TRACE("%p, %p\n", iface, out_opts); + + return get_prov_opts_from_node_provider(prov->nested_node, 0, out_opts); +} + static const IWineUiaProviderVtbl uia_nested_node_provider_vtbl = { uia_nested_node_provider_QueryInterface, uia_nested_node_provider_AddRef, uia_nested_node_provider_Release, uia_nested_node_provider_get_prop_val, + uia_nested_node_provider_get_prov_opts, }; static BOOL is_nested_node_provider(IWineUiaProvider *iface) @@ -1208,6 +1251,7 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU struct uia_nested_node_provider *prov; IGlobalInterfaceTable *git; IWineUiaNode *nested_node; + int prov_opts, prov_type; DWORD git_cookie; HRESULT hr; @@ -1218,6 +1262,21 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU return hr; } + hr = get_prov_opts_from_node_provider(nested_node, 0, &prov_opts); + if (FAILED(hr)) + { + WARN("Failed to get provider options for node %p with hr %#lx\n", nested_node, hr); + IWineUiaNode_Release(nested_node); + uia_stop_client_thread(); + return hr; + } + + /* Nested nodes can only serve as override or main providers. */ + if (prov_opts & ProviderOptions_OverrideProvider) + prov_type = PROV_TYPE_OVERRIDE; + else + prov_type = PROV_TYPE_MAIN; + /* * If we're retrieving a node from an HWND that belongs to the same thread * as the client making the request, return a normal provider instead of a @@ -1276,8 +1335,8 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU } } - node->prov[PROV_TYPE_MAIN] = provider_iface; - node->git_cookie[PROV_TYPE_MAIN] = git_cookie; + node->prov[prov_type] = provider_iface; + node->git_cookie[prov_type] = git_cookie; node->prov_count++; return S_OK;

1 0

Zhiyi Zhang : comctl32/treeview: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 44cfa3ec1af33f0f2560878c269405468f999a70 URL: https://gitlab.winehq.org/wine/wine/-/commit/44cfa3ec1af33f0f2560878c269405… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 15:36:43 2022 +0800 comctl32/treeview: Don't repaint when handling WM_STYLECHANGED. Some applications subclass treeview and change style multiple times when painting. Invalidating control when handling WM_STYLECHANGED causes infinite WM_PAINT messages in this case and end up stalling the message queue. --- dlls/comctl32/tests/misc.c | 2 +- dlls/comctl32/treeview.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5da44e7af8c..73526020843 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1109,7 +1109,7 @@ static void test_WM_STYLECHANGED(void) {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, {TOOLTIPS_CLASSA, wm_stylechanged_seq}, {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE}, - {WC_TREEVIEWA, wm_stylechanged_seq, TRUE}, + {WC_TREEVIEWA, wm_stylechanged_seq}, {UPDOWN_CLASSA, wm_stylechanged_seq, TRUE}, {WC_SCROLLBARA, wm_stylechanged_seq}, }; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 23e87bdce04..d3a69bb438e 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5627,7 +5627,6 @@ TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TREEVIEW_EndEditLabelNow(infoPtr, TRUE); TREEVIEW_UpdateSubTree(infoPtr, infoPtr->root); TREEVIEW_UpdateScrollBars(infoPtr); - TREEVIEW_Invalidate(infoPtr, NULL); return 0; }

1 0

Zhiyi Zhang : comctl32/tests: Ignore WM_NCPAINT when testing WM_THEMECHANGED for updown control.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: d7c27e19f91b6d9145cc5e05fdca8fef15ae55f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7c27e19f91b6d9145cc5e05fdca8f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 18 10:52:40 2022 +0800 comctl32/tests: Ignore WM_NCPAINT when testing WM_THEMECHANGED for updown control. Fix a possible test failure. --- dlls/comctl32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index ac4c3abaf30..bc404c4b59a 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -581,7 +581,7 @@ static void test_WM_THEMECHANGED(void) {TOOLTIPS_CLASSA, wm_themechanged_no_paint_seq}, {TRACKBAR_CLASSA, wm_themechanged_paint_seq}, {WC_TREEVIEWA, wm_themechanged_paint_erase_seq, 1, {0x1128}}, - {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq}, + {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq, 1, {WM_NCPAINT}}, {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}}, };

1 0

Connor McAdams : uiautomationcore: Add support for multiple providers on a single HUIANODE.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: edcd55bae27d5d6fcac8e4d8b8298cce0dcd0600 URL: https://gitlab.winehq.org/wine/wine/-/commit/edcd55bae27d5d6fcac8e4d8b8298c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 12 12:33:52 2022 -0400 uiautomationcore: Add support for multiple providers on a single HUIANODE. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 28 +-- dlls/uiautomationcore/uia_classes.idl | 2 +- dlls/uiautomationcore/uia_client.c | 273 ++++++++++++++++++++--------- dlls/uiautomationcore/uia_private.h | 28 ++- dlls/uiautomationcore/uia_provider.c | 4 +- 5 files changed, 231 insertions(+), 104 deletions(-)

1 0

Francois Gouget : reporttest: Update the TestWTBS expected error count.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: tools Branch: master Commit: 90f25cad3e43d2293cb5cb1dc74fc76d261fcb3c URL: https://gitlab.winehq.org/winehq/tools/-/commit/90f25cad3e43d2293cb5cb1dc74… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 17 16:09:40 2022 +0200 reporttest: Update the TestWTBS expected error count. This takes into acount the new test for timeouts during --list. --- testbot/src/reporttest/report.testwtbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 7b56e131..64a5ca13 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 70 +p tests.TestFailures 71 p build.HasTask 0 a wine.log.GrepV ^Applying patch

1 0

Francois Gouget : testbot/reporttest: Add the flaky count to the summary lines.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: tools Branch: master Commit: d6228b3d46503f7f4c0f68722c89d57bd92ec08d URL: https://gitlab.winehq.org/winehq/tools/-/commit/d6228b3d46503f7f4c0f68722c8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 20 10:20:38 2022 +0200 testbot/reporttest: Add the flaky count to the summary lines. --- testbot/src/reporttest/report.template | 112 ++++++++++++++++----------------- testbot/src/reporttest/reporttest.c | 2 +- 2 files changed, 57 insertions(+), 57 deletions(-)

1 0