- Wine-Devel - list.winehq.org

[PATCH 1/5] msxml3: When writing to stream \0 terminate output.
by Dmitry Timoshkov April 27, 2021

April 27, 2021

This fixes heap corruption when running the domdoc tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/domdoc.c | 12 +++++++++++- dlls/msxml3/tests/domdoc.c | 3 --- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index cf4f0433218..cb34632c203 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2524,8 +2524,18 @@ static int XMLCALL domdoc_stream_save_writecallback(void *ctx, const char *buffe static int XMLCALL domdoc_stream_save_closecallback(void *ctx) { + ULONG written; + HRESULT hr; + + hr = IStream_Write((IStream*)ctx, "\0", 1, &written); + if (hr != S_OK) + { + WARN("stream write error: 0x%08x\n", hr); + hr = -1; + } + IStream_Release((IStream*)ctx); - return 0; + return hr; } static HRESULT WINAPI domdoc_save( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6f8e2b44ed3..63fc57527b4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8586,7 +8586,6 @@ todo_wine hr = GetHGlobalFromStream(stream, &global); ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); - p[GlobalSize(global)] = 0; ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); @@ -8609,7 +8608,6 @@ todo_wine hr = GetHGlobalFromStream(stream, &global); ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); - p[GlobalSize(global)] = 0; ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); @@ -8631,7 +8629,6 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); - p[GlobalSize(global)] = 0; ok(!strcmp(p, xml3) || !strcmp(p, xml3_wine), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); -- 2.31.1

3 5

[PATCH 5/5] msxml3: When saving XML use encoding specified in the processing instruction.
by Dmitry Timoshkov April 27, 2021

April 27, 2021

Otherwise when a PI node with not default encoding is assigned to a document then saving an XML leads to document being encoded as UTF-8 while XML declaration has what PI specifies. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/domdoc.c | 70 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index cb34632c203..fd87aa52f30 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2538,6 +2538,63 @@ static int XMLCALL domdoc_stream_save_closecallback(void *ctx) return hr; } +static char *xmldoc_encoding(IXMLDOMDocument3 *doc) +{ + HRESULT hr; + IXMLDOMNode *node; + char *encoding = NULL; + + hr = IXMLDOMDocument3_get_firstChild(doc, &node); + if (hr == S_OK) + { + DOMNodeType type; + + hr = IXMLDOMNode_get_nodeType(node, &type); + if (hr == S_OK && type == NODE_PROCESSING_INSTRUCTION) + { + IXMLDOMProcessingInstruction *pi; + IXMLDOMNode *item; + IXMLDOMNamedNodeMap *node_map; + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMProcessingInstruction, (void **)&pi); + if (hr == S_OK) + { + hr = IXMLDOMNode_get_attributes(node, &node_map); + if (hr == S_OK) + { + static const WCHAR encodingW[] = {'e','n','c','o','d','i','n','g',0}; + BSTR bstr; + + bstr = SysAllocString(encodingW); + hr = IXMLDOMNamedNodeMap_getNamedItem(node_map, bstr, &item); + SysFreeString(bstr); + if (hr == S_OK) + { + VARIANT var; + + hr = IXMLDOMNode_get_nodeValue(item, &var); + if (hr == S_OK) + { + if (V_VT(&var) == VT_BSTR) + encoding = (char *)xmlchar_from_wchar(V_BSTR(&var)); + + VariantClear(&var); + } + } + + IXMLDOMNamedNodeMap_Release(node_map); + } + + IXMLDOMProcessingInstruction_Release(pi); + } + } + + IXMLDOMNode_Release(node); + } + + return encoding; +} + static HRESULT WINAPI domdoc_save( IXMLDOMDocument3 *iface, VARIANT destination ) @@ -2576,8 +2633,12 @@ static HRESULT WINAPI domdoc_save( ret = IUnknown_QueryInterface(pUnk, &IID_IStream, (void**)&stream); if(ret == S_OK) { + char *encoding = xmldoc_encoding(iface); + + TRACE("using encoding %s\n", encoding ? debugstr_a(encoding) : "default"); ctx = xmlSaveToIO(domdoc_stream_save_writecallback, - domdoc_stream_save_closecallback, stream, NULL, XML_SAVE_NO_DECL); + domdoc_stream_save_closecallback, stream, encoding, XML_SAVE_NO_DECL); + heap_free(encoding); if(!ctx) { @@ -2591,6 +2652,7 @@ static HRESULT WINAPI domdoc_save( case VT_BSTR: case VT_BSTR | VT_BYREF: { + char *encoding; /* save with file path */ HANDLE handle = CreateFileW( (V_VT(&destination) & VT_BYREF)? *V_BSTRREF(&destination) : V_BSTR(&destination), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); @@ -2600,8 +2662,12 @@ static HRESULT WINAPI domdoc_save( return E_FAIL; } + encoding = xmldoc_encoding(iface); + TRACE("using encoding %s\n", encoding ? debugstr_a(encoding) : "default"); ctx = xmlSaveToIO(domdoc_save_writecallback, domdoc_save_closecallback, - handle, NULL, XML_SAVE_NO_DECL); + handle, encoding, XML_SAVE_NO_DECL); + heap_free(encoding); + if (!ctx) { CloseHandle(handle); -- 2.31.1

2 1

[PATCH 4/5] msxml3: Implement IXMLDOMNamedNodeMap::getNamedItem() for a processing instruction node.
by Dmitry Timoshkov April 27, 2021

April 27, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/pi.c | 45 +++++++++++++++++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 5 ----- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index fe291e72af8..59ceee767a1 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -813,6 +813,27 @@ static const struct IXMLDOMProcessingInstructionVtbl dom_pi_vtbl = dom_pi_put_data }; +static xmlAttrPtr node_has_prop(const xmlNode *node, const xmlChar *name) +{ + xmlAttrPtr prop; + + /* xmlHasNsProp accepts only nodes of type XML_ELEMENT_NODE, + * so we have to look for an attribute in the node by hand. + */ + + prop = node->properties; + + while (prop) + { + if (xmlStrEqual(prop->name, name)) + return prop; + + prop = prop->next; + } + + return NULL; +} + static HRESULT dom_pi_get_qualified_item(const xmlNodePtr node, BSTR name, BSTR uri, IXMLDOMNode **item) { @@ -822,10 +843,28 @@ static HRESULT dom_pi_get_qualified_item(const xmlNodePtr node, BSTR name, BSTR static HRESULT dom_pi_get_named_item(const xmlNodePtr node, BSTR name, IXMLDOMNode **item) { - FIXME("(%p)->(%s %p): stub\n", node, debugstr_w(name), item ); - if (item) + xmlChar *nameA; + xmlAttrPtr attr; + + TRACE("(%p)->(%s %p)\n", node, debugstr_w(name), item); + + if (!item) return E_POINTER; + + nameA = xmlchar_from_wchar(name); + if (!nameA) return E_OUTOFMEMORY; + + attr = node_has_prop(node, nameA); + heap_free(nameA); + + if (!attr) + { *item = NULL; - return S_FALSE; + return S_FALSE; + } + + *item = create_node((xmlNodePtr)attr); + + return S_OK; } static HRESULT dom_pi_set_named_item(xmlNodePtr node, IXMLDOMNode *newItem, IXMLDOMNode **namedItem) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2880edc8e0d..2e1eae7a7ea 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8579,13 +8579,9 @@ todo_wine item = NULL; hr = IXMLDOMNamedNodeMap_getNamedItem(node_map, _bstr_("encoding"), &item); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(item != NULL, "got NULL\n"); -if (hr == S_OK) -{ hr = IXMLDOMNode_get_nodeName(item, &bstr); ok(hr == S_OK, "got 0x%08x\n", hr); ok(!lstrcmpW(bstr, L"encoding"), "got %s\n", wine_dbgstr_w(bstr)); @@ -8597,7 +8593,6 @@ if (hr == S_OK) ok(V_VT(&var) == VT_BSTR, "got %u\n", V_VT(&var)); ok(!lstrcmpW(V_BSTR(&var), L"windows-1252"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); -} IXMLDOMNamedNodeMap_Release(node_map); IXMLDOMNode_Release(node); -- 2.31.1

2 1

[PATCH 2/5] msxml3/tests: Add more tests for processing instruction attributes.
by Dmitry Timoshkov April 27, 2021

April 27, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/tests/domdoc.c | 43 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 63fc57527b4..2880edc8e0d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -46,6 +46,8 @@ #include "wine/heap.h" #include "wine/test.h" +#define XML_E_UNEXPECTED_ATTRIBUTE 0xC00CE56C + /* undef the #define in msxml2 so that we can access all versions */ #undef CLSID_DOMDocument @@ -8529,10 +8531,11 @@ static void test_createProcessingInstruction(void) static const char xml3_wine[] = "<?xml version=\"1.0\" standalone=\"yes\"?>\n<test/>\n"; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; - IXMLDOMNode *node; + IXMLDOMNode *node, *item; + IXMLDOMNamedNodeMap *node_map; IXMLDOMElement *element; WCHAR buff[10]; - BSTR xml; + BSTR xml, bstr; VARIANT var; HRESULT hr; IStream *stream; @@ -8543,6 +8546,10 @@ static void test_createProcessingInstruction(void) doc = create_document(&IID_IXMLDOMDocument); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\" dummy=\"value\""), &pi); +todo_wine + ok(hr == XML_E_UNEXPECTED_ATTRIBUTE, "got 0x%08x\n", hr); + /* test for BSTR handling, pass broken BSTR */ memcpy(&buff[2], L"test", 5 * sizeof(WCHAR)); /* just a big length */ @@ -8561,6 +8568,38 @@ static void test_createProcessingInstruction(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXMLDOMDocument_appendChild(doc, node, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMNode_get_attributes(node, &node_map); + ok(hr == S_OK, "got 0x%08x\n", hr); + + item = (void *)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getNamedItem(node_map, _bstr_("xml"), &item); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!item, "got %p\n", item); + + item = NULL; + hr = IXMLDOMNamedNodeMap_getNamedItem(node_map, _bstr_("encoding"), &item); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(item != NULL, "got NULL\n"); + +if (hr == S_OK) +{ + hr = IXMLDOMNode_get_nodeName(item, &bstr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(bstr, L"encoding"), "got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + VariantInit(&var); + hr = IXMLDOMNode_get_nodeValue(item, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&var) == VT_BSTR, "got %u\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"windows-1252"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); +} + + IXMLDOMNamedNodeMap_Release(node_map); IXMLDOMNode_Release(node); IXMLDOMProcessingInstruction_Release(pi); -- 2.31.1

2 1

[PATCH 3/5] msxml3: Implement ::get_attributes() for "xml" processing instruction node.
by Dmitry Timoshkov April 27, 2021

April 27, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/pi.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index cea95708087..fe291e72af8 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -34,6 +34,7 @@ #include "ole2.h" #include "msxml6.h" +#include "xmlparser.h" #include "msxml_private.h" #include "wine/debug.h" @@ -287,6 +288,138 @@ static HRESULT WINAPI dom_pi_get_nextSibling( return node_get_next_sibling(&This->node, domNode); } +static HRESULT xml_get_value(xmlChar **p, xmlChar **value) +{ + xmlChar *v; + int len; + + while (isspace(**p)) *p += 1; + if (**p != '=') return XML_E_MISSINGEQUALS; + *p += 1; + + while (isspace(**p)) *p += 1; + if (**p != '"') return XML_E_MISSINGQUOTE; + *p += 1; + + v = *p; + while (**p && **p != '"') *p += 1; + if (!**p) return XML_E_EXPECTINGCLOSEQUOTE; + len = *p - v; + if (!len) return XML_E_MISSINGNAME; + *p += 1; + + *value = heap_alloc(len + 1); + if (!*value) return E_OUTOFMEMORY; + memcpy(*value, v, len); + *(*value + len) = 0; + + return S_OK; +} + +static void set_prop(xmlNodePtr node, xmlAttrPtr attr) +{ + xmlAttrPtr prop; + + if (!node->properties) + { + node->properties = attr; + return; + } + + prop = node->properties; + while (prop->next) prop = prop->next; + + prop->next = attr; +} + +static HRESULT parse_xml_decl(xmlNodePtr node) +{ + xmlChar *version, *encoding, *standalone, *p; + xmlAttrPtr attr; + HRESULT hr = S_OK; + + if (!node->content) return S_OK; + + version = encoding = standalone = NULL; + + p = node->content; + + while (*p) + { + while (isspace(*p)) p++; + if (!*p) break; + + if (!strncmp((const char *)p, "version", 7)) + { + p += 7; + if ((hr = xml_get_value(&p, &version)) != S_OK) goto fail; + } + else if (!strncmp((const char *)p, "encoding", 8)) + { + p += 8; + if ((hr = xml_get_value(&p, &encoding)) != S_OK) goto fail; + } + else if (!strncmp((const char *)p, "standalone", 10)) + { + p += 10; + if ((hr = xml_get_value(&p, &standalone)) != S_OK) goto fail; + } + else + { + FIXME("unexpected XML attribute %s\n", debugstr_a((const char *)p)); + hr = XML_E_UNEXPECTED_ATTRIBUTE; + goto fail; + } + } + + /* xmlSetProp/xmlSetNsProp accept only nodes of type XML_ELEMENT_NODE, + * so we have to create and assign attributes to a node by hand. + */ + + if (version) + { + attr = xmlSetNsProp(NULL, NULL, (const xmlChar *)"version", version); + if (attr) + { + attr->doc = node->doc; + set_prop(node, attr); + } + else hr = E_OUTOFMEMORY; + } + if (encoding) + { + attr = xmlSetNsProp(NULL, NULL, (const xmlChar *)"encoding", encoding); + if (attr) + { + attr->doc = node->doc; + set_prop(node, attr); + } + else hr = E_OUTOFMEMORY; + } + if (standalone) + { + attr = xmlSetNsProp(NULL, NULL, (const xmlChar *)"standalone", standalone); + if (attr) + { + attr->doc = node->doc; + set_prop(node, attr); + } + else hr = E_OUTOFMEMORY; + } + +fail: + if (hr != S_OK) + { + xmlFreePropList(node->properties); + node->properties = NULL; + } + + heap_free(version); + heap_free(encoding); + heap_free(standalone); + return hr; +} + static HRESULT WINAPI dom_pi_get_attributes( IXMLDOMProcessingInstruction *iface, IXMLDOMNamedNodeMap** map) @@ -307,7 +440,12 @@ static HRESULT WINAPI dom_pi_get_attributes( if (!strcmpW(name, xmlW)) { - FIXME("created dummy map for <?xml ?>\n"); + if (!This->node.node->properties) + { + hr = parse_xml_decl(This->node.node); + if (hr != S_OK) return S_FALSE; + } + *map = create_nodemap(This->node.node, &dom_pi_attr_map); SysFreeString(name); return S_OK; -- 2.31.1

1 0

[PATCH 5/5] comctl32/theme_dialog: Pass the WM_SYSCOLORCHANGE message to the original dialog procedure.
by Zhiyi Zhang April 27, 2021

April 27, 2021

Even though themed dialog itself doesn't need to repaint after WM_SYSCOLORCHANGE is received, WM_SYSCOLORCHANGE should be passed to the original dialog procedure DefDlgProcW(), which can then forward WM_SYSCOLORCHANGE to its common controls and call COMCTL32_RefreshSysColors(). Fix wrong property sheet tab background color after winecfg disables theming. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44511 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/misc.c | 12 ++---------- dlls/comctl32/theme_dialog.c | 8 +------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index e2a1dc00bc4..9d3ca76e8d5 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -21,7 +21,6 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> -#include <uxtheme.h> #include "wine/test.h" #include "v6util.h" @@ -40,9 +39,8 @@ static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); -static BOOL (WINAPI *pIsThemeActive)(void); -static HMODULE hComctl32, hUxtheme; +static HMODULE hComctl32; /* For message tests */ enum seq_index @@ -108,9 +106,6 @@ static BOOL init_functions_v6(void) COMCTL32_GET_PROC(412, RemoveWindowSubclass) COMCTL32_GET_PROC(413, DefSubclassProc) - hUxtheme = LoadLibraryA("uxtheme.dll"); - pIsThemeActive = (void *)GetProcAddress(hUxtheme, "IsThemeActive"); - return TRUE; } @@ -630,7 +625,6 @@ static INT_PTR CALLBACK wm_syscolorchange_dlg_proc(HWND hwnd, UINT message, WPAR static void test_WM_SYSCOLORCHANGE(void) { HWND parent, dialog; - BOOL todo; struct { DLGTEMPLATE tmplate; @@ -652,8 +646,7 @@ static void test_WM_SYSCOLORCHANGE(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageW(dialog, WM_SYSCOLORCHANGE, 0, 0); - todo = pIsThemeActive && pIsThemeActive(); - ok_sequence(sequences, CHILD_SEQ_INDEX, wm_syscolorchange_seq, "test dialog WM_SYSCOLORCHANGE", todo); + ok_sequence(sequences, CHILD_SEQ_INDEX, wm_syscolorchange_seq, "test dialog WM_SYSCOLORCHANGE", FALSE); EndDialog(dialog, 0); DestroyWindow(parent); @@ -687,5 +680,4 @@ START_TEST(misc) unload_v6_module(ctx_cookie, hCtx); FreeLibrary(hComctl32); - FreeLibrary(hUxtheme); } diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c index 29007ba5c60..0f7835ae32f 100644 --- a/dlls/comctl32/theme_dialog.c +++ b/dlls/comctl32/theme_dialog.c @@ -63,13 +63,7 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, OpenThemeData( hWnd, themeClass ); InvalidateRect( hWnd, NULL, TRUE ); return 0; - - case WM_SYSCOLORCHANGE: - if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, - * which will do the repaint. */ - break; - + case WM_ERASEBKGND: if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); { -- 2.30.2

1 0

[PATCH 4/5] comctl32/test: Test that WM_SYSCOLORCHANGE should always be passed to the dialog procedure.
by Zhiyi Zhang April 27, 2021

April 27, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/misc.c | 59 +++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 15ff3b2d099..e2a1dc00bc4 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> +#include <uxtheme.h> #include "wine/test.h" #include "v6util.h" @@ -39,8 +40,9 @@ static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); +static BOOL (WINAPI *pIsThemeActive)(void); -static HMODULE hComctl32 = 0; +static HMODULE hComctl32, hUxtheme; /* For message tests */ enum seq_index @@ -106,6 +108,9 @@ static BOOL init_functions_v6(void) COMCTL32_GET_PROC(412, RemoveWindowSubclass) COMCTL32_GET_PROC(413, DefSubclassProc) + hUxtheme = LoadLibraryA("uxtheme.dll"); + pIsThemeActive = (void *)GetProcAddress(hUxtheme, "IsThemeActive"); + return TRUE; } @@ -604,6 +609,56 @@ static void test_WM_THEMECHANGED(void) DestroyWindow(parent); } +static const struct message wm_syscolorchange_seq[] = +{ + {WM_SYSCOLORCHANGE, sent | wparam | lparam}, + {0}, +}; + +static INT_PTR CALLBACK wm_syscolorchange_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct message msg = {0}; + + msg.message = message; + msg.flags = sent | wparam | lparam; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, CHILD_SEQ_INDEX, &msg); + return FALSE; +} + +static void test_WM_SYSCOLORCHANGE(void) +{ + HWND parent, dialog; + BOOL todo; + struct + { + DLGTEMPLATE tmplate; + WORD menu; + WORD class; + WORD title; + } temp = {0}; + + parent = CreateWindowExA(0, WC_STATICA, "parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, + 200, 200, 0, 0, 0, NULL); + ok(!!parent, "CreateWindowExA failed, error %d\n", GetLastError()); + + temp.tmplate.style = WS_CHILD | WS_VISIBLE; + temp.tmplate.cx = 50; + temp.tmplate.cy = 50; + dialog = CreateDialogIndirectParamA(NULL, &temp.tmplate, parent, wm_syscolorchange_dlg_proc, 0); + ok(!!dialog, "CreateDialogIndirectParamA failed, error %d\n", GetLastError()); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + SendMessageW(dialog, WM_SYSCOLORCHANGE, 0, 0); + todo = pIsThemeActive && pIsThemeActive(); + ok_sequence(sequences, CHILD_SEQ_INDEX, wm_syscolorchange_seq, "test dialog WM_SYSCOLORCHANGE", todo); + + EndDialog(dialog, 0); + DestroyWindow(parent); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -628,7 +683,9 @@ START_TEST(misc) test_builtin_classes(); test_LoadIconWithScaleDown(); test_WM_THEMECHANGED(); + test_WM_SYSCOLORCHANGE(); unload_v6_module(ctx_cookie, hCtx); FreeLibrary(hComctl32); + FreeLibrary(hUxtheme); } -- 2.30.2

1 0

[PATCH 3/5] comctl32/theming: Register themed dialog and scrollbar even when theming is not active.
by Zhiyi Zhang April 27, 2021

April 27, 2021

So that we can turn on theming in runtime. Otherwise, themed dialog and scrollbar are not enabled even if a theme is made active in winecfg if theming is disabled at start. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44511 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/misc.c | 2 +- dlls/comctl32/theming.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 4b0c1f9a4d0..15ff3b2d099 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -580,7 +580,7 @@ static void test_WM_THEMECHANGED(void) {TRACKBAR_CLASSA, wm_themechanged_paint_seq}, {WC_TREEVIEWA, wm_themechanged_paint_erase_seq, 1, {0x1128}}, {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq}, - {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}, TRUE}, + {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}}, }; parent = CreateWindowExA(0, WC_STATICA, "parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index ed7bb0a5b33..8078e661b76 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -26,7 +26,6 @@ #include "wingdi.h" #include "winuser.h" #include "comctl32.h" -#include "uxtheme.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(theming); @@ -96,8 +95,6 @@ void THEMING_Initialize (void) { unsigned int i; - if (!IsThemeActive()) return; - atSubclassProp = GlobalAddAtomW (L"CC32ThemingSubCl"); atRefDataProp = GlobalAddAtomW (L"CC32ThemingData"); -- 2.30.2

1 0

[PATCH 2/5] comctl32: Repaint after the WM_THEMECHANGED message is received.
by Zhiyi Zhang April 27, 2021

April 27, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 1 + dlls/comctl32/combo.c | 1 + dlls/comctl32/datetime.c | 1 + dlls/comctl32/edit.c | 1 + dlls/comctl32/header.c | 2 +- dlls/comctl32/ipaddress.c | 1 + dlls/comctl32/listbox.c | 1 + dlls/comctl32/listview.c | 1 + dlls/comctl32/monthcal.c | 1 + dlls/comctl32/pager.c | 9 +++++++++ dlls/comctl32/progress.c | 2 +- dlls/comctl32/static.c | 4 ++++ dlls/comctl32/status.c | 1 + dlls/comctl32/tab.c | 1 + dlls/comctl32/tests/misc.c | 36 ++++++++++++++++----------------- dlls/comctl32/theme_scrollbar.c | 1 + dlls/comctl32/toolbar.c | 1 + dlls/comctl32/trackbar.c | 1 + dlls/comctl32/treeview.c | 1 + dlls/comctl32/updown.c | 2 +- 20 files changed, 48 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b5a9ee7f7f6..d3dcc67b169 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -534,6 +534,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L theme = GetWindowTheme( hWnd ); CloseThemeData( theme ); OpenThemeData( hWnd, WC_BUTTONW ); + InvalidateRect( hWnd, NULL, TRUE ); break; case WM_ERASEBKGND: diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 887587a053b..074f54f0937 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1698,6 +1698,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam theme = GetWindowTheme( hwnd ); CloseThemeData( theme ); OpenThemeData( hwnd, WC_COMBOBOXW ); + InvalidateRect( hwnd, NULL, TRUE ); break; case WM_PRINTCLIENT: diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 93bca8c2f5c..ac5268f146c 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1544,6 +1544,7 @@ static LRESULT DATETIME_ThemeChanged (DATETIME_INFO *infoPtr) theme = GetWindowTheme(infoPtr->hwndSelf); CloseThemeData(theme); OpenThemeData(infoPtr->hwndSelf, themeClass); + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 639443bc338..d9354a107b1 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -5097,6 +5097,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_THEMECHANGED: CloseThemeData(GetWindowTheme(hwnd)); OpenThemeData(hwnd, WC_EDITW); + InvalidateRect(hwnd, NULL, TRUE); break; default: diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 085549fed65..8bb39261dd1 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -2110,7 +2110,7 @@ static LRESULT HEADER_ThemeChanged(const HEADER_INFO *infoPtr) HTHEME theme = GetWindowTheme(infoPtr->hwndSelf); CloseThemeData(theme); OpenThemeData(infoPtr->hwndSelf, themeClass); - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index b6302a89ba6..f24fb4a9335 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -462,6 +462,7 @@ static LRESULT IPADDRESS_ThemeChanged (const IPADDRESS_INFO *infoPtr) HTHEME theme = GetWindowTheme (infoPtr->Self); CloseThemeData (theme); theme = OpenThemeData (theme, WC_EDITW); + InvalidateRect (infoPtr->Self, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 239f54aafab..f9283f45282 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -3136,6 +3136,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, theme = GetWindowTheme( hwnd ); CloseThemeData( theme ); OpenThemeData( hwnd, WC_LISTBOXW ); + InvalidateRect( hwnd, NULL, TRUE ); break; default: diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 799ec509f33..05a772ab175 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9345,6 +9345,7 @@ static LRESULT LISTVIEW_ThemeChanged(const LISTVIEW_INFO *infoPtr) HTHEME theme = GetWindowTheme(infoPtr->hwndSelf); CloseThemeData(theme); OpenThemeData(infoPtr->hwndSelf, themeClass); + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 98c682df334..c0bec07f477 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2697,6 +2697,7 @@ static LRESULT theme_changed (const MONTHCAL_INFO* infoPtr) HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); CloseThemeData (theme); OpenThemeData (infoPtr->hwndSelf, themeClass); + InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 4763ed5640d..b8baa93e15f 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -966,6 +966,12 @@ PAGER_Timer (PAGER_INFO* infoPtr, INT nTimerId) return 0; } +static LRESULT PAGER_ThemeChanged (const PAGER_INFO* infoPtr) +{ + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + return 0; +} + static LRESULT PAGER_EraseBackground (const PAGER_INFO* infoPtr, HDC hdc) { @@ -1553,6 +1559,9 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_COMMAND: return SendMessageW (infoPtr->hwndNotify, uMsg, wParam, lParam); + case WM_THEMECHANGED: + return PAGER_ThemeChanged (infoPtr); + default: return DefWindowProcW (hwnd, uMsg, wParam, lParam); } diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 5cf2ccda20f..fb4c2dc66dd 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -615,7 +615,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, dwExStyle |= WS_EX_STATICEDGE; SetWindowLongW (hwnd, GWL_EXSTYLE, dwExStyle); - InvalidateRect (hwnd, NULL, FALSE); + InvalidateRect (hwnd, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index b3254e5761b..2bd2b22bc20 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -505,6 +505,10 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, STATIC_TryPaintFcn( hwnd, full_style ); break; + case WM_THEMECHANGED: + InvalidateRect( hwnd, 0, TRUE ); + break; + case WM_NCCREATE: { CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 0c3a90887c8..7bc9ec4386f 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1111,6 +1111,7 @@ static LRESULT theme_changed (const STATUS_INFO* infoPtr) HTHEME theme = GetWindowTheme (infoPtr->Self); CloseThemeData (theme); OpenThemeData (infoPtr->Self, themeClass); + InvalidateRect (infoPtr->Self, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 3bb5310d1f3..017719a183d 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -3106,6 +3106,7 @@ static LRESULT theme_changed(const TAB_INFO *infoPtr) HTHEME theme = GetWindowTheme (infoPtr->hwnd); CloseThemeData (theme); OpenThemeData (infoPtr->hwnd, themeClass); + InvalidateRect (infoPtr->hwnd, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index f4fcb300bb2..4b0c1f9a4d0 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -556,30 +556,30 @@ static void test_WM_THEMECHANGED(void) static const struct wm_themechanged_test tests[] = { {ANIMATE_CLASSA, wm_themechanged_no_paint_seq}, - {WC_BUTTONA, wm_themechanged_paint_erase_seq, 2, {WM_GETTEXT, WM_GETTEXTLENGTH}, TRUE}, - {WC_COMBOBOXA, wm_themechanged_paint_erase_seq, 1, {WM_CTLCOLOREDIT}, TRUE}, + {WC_BUTTONA, wm_themechanged_paint_erase_seq, 2, {WM_GETTEXT, WM_GETTEXTLENGTH}}, + {WC_COMBOBOXA, wm_themechanged_paint_erase_seq, 1, {WM_CTLCOLOREDIT}}, {WC_COMBOBOXEXA, wm_themechanged_no_paint_seq}, - {DATETIMEPICK_CLASSA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, - {WC_EDITA, wm_themechanged_paint_erase_seq, 7, {WM_GETTEXTLENGTH, WM_GETFONT, EM_GETSEL, EM_GETRECT, EM_CHARFROMPOS, EM_LINEFROMCHAR, EM_POSFROMCHAR}, TRUE}, - {WC_HEADERA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {DATETIMEPICK_CLASSA, wm_themechanged_paint_erase_seq}, + {WC_EDITA, wm_themechanged_paint_erase_seq, 7, {WM_GETTEXTLENGTH, WM_GETFONT, EM_GETSEL, EM_GETRECT, EM_CHARFROMPOS, EM_LINEFROMCHAR, EM_POSFROMCHAR}}, + {WC_HEADERA, wm_themechanged_paint_erase_seq}, {HOTKEY_CLASSA, wm_themechanged_no_paint_seq}, - {WC_IPADDRESSA, wm_themechanged_paint_erase_seq, 1, {WM_CTLCOLOREDIT}, TRUE}, - {WC_LISTBOXA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, - {WC_LISTVIEWA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, - {MONTHCAL_CLASSA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_IPADDRESSA, wm_themechanged_paint_erase_seq, 1, {WM_CTLCOLOREDIT}}, + {WC_LISTBOXA, wm_themechanged_paint_erase_seq}, + {WC_LISTVIEWA, wm_themechanged_paint_erase_seq}, + {MONTHCAL_CLASSA, wm_themechanged_paint_erase_seq}, {WC_NATIVEFONTCTLA, wm_themechanged_no_paint_seq}, - {WC_PAGESCROLLERA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, - {PROGRESS_CLASSA, wm_themechanged_paint_erase_seq, 3, {WM_STYLECHANGING, WM_STYLECHANGED, WM_NCPAINT}, TRUE}, + {WC_PAGESCROLLERA, wm_themechanged_paint_erase_seq}, + {PROGRESS_CLASSA, wm_themechanged_paint_erase_seq, 3, {WM_STYLECHANGING, WM_STYLECHANGED, WM_NCPAINT}}, {REBARCLASSNAMEA, wm_themechanged_no_paint_seq, 1, {WM_WINDOWPOSCHANGING}}, - {WC_STATICA, wm_themechanged_paint_erase_seq, 2, {WM_GETTEXT, WM_GETTEXTLENGTH}, TRUE}, - {STATUSCLASSNAMEA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_STATICA, wm_themechanged_paint_erase_seq, 2, {WM_GETTEXT, WM_GETTEXTLENGTH}}, + {STATUSCLASSNAMEA, wm_themechanged_paint_erase_seq}, {"SysLink", wm_themechanged_no_paint_seq}, - {WC_TABCONTROLA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, - {TOOLBARCLASSNAMEA, wm_themechanged_paint_erase_seq, 1, {WM_WINDOWPOSCHANGING}, TRUE}, + {WC_TABCONTROLA, wm_themechanged_paint_erase_seq}, + {TOOLBARCLASSNAMEA, wm_themechanged_paint_erase_seq, 1, {WM_WINDOWPOSCHANGING}}, {TOOLTIPS_CLASSA, wm_themechanged_no_paint_seq}, - {TRACKBAR_CLASSA, wm_themechanged_paint_seq, 0, {0}, TRUE}, - {WC_TREEVIEWA, wm_themechanged_paint_erase_seq, 1, {0x1128}, TRUE}, - {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {TRACKBAR_CLASSA, wm_themechanged_paint_seq}, + {WC_TREEVIEWA, wm_themechanged_paint_erase_seq, 1, {0x1128}}, + {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq}, {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}, TRUE}, }; diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index 27d31bd4ac5..304ff5bacbc 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -547,6 +547,7 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, theme = GetWindowTheme(hwnd); CloseThemeData(theme); OpenThemeData(hwnd, themeClass); + InvalidateRect(hwnd, NULL, TRUE); break; case WM_SYSCOLORCHANGE: diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 667a2f4c277..1aeb499c45f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6556,6 +6556,7 @@ static LRESULT theme_changed (HWND hwnd) HTHEME theme = GetWindowTheme (hwnd); CloseThemeData (theme); OpenThemeData (hwnd, themeClass); + InvalidateRect (hwnd, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 66522fd8582..1859cf0f516 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1720,6 +1720,7 @@ static LRESULT theme_changed (const TRACKBAR_INFO* infoPtr) HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); CloseThemeData (theme); OpenThemeData (infoPtr->hwndSelf, themeClass); + InvalidateRect (infoPtr->hwndSelf, NULL, FALSE); return 0; } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index a45096d8239..98cf5489f2b 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5633,6 +5633,7 @@ static LRESULT TREEVIEW_ThemeChanged(const TREEVIEW_INFO *infoPtr) HTHEME theme = GetWindowTheme (infoPtr->hwnd); CloseThemeData (theme); OpenThemeData (infoPtr->hwnd, themeClass); + InvalidateRect (infoPtr->hwnd, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index a804018d5f8..d5625839db3 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -966,7 +966,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L theme = GetWindowTheme (hwnd); CloseThemeData (theme); OpenThemeData (hwnd, L"Spin"); - InvalidateRect (hwnd, NULL, FALSE); + InvalidateRect (hwnd, NULL, TRUE); break; case WM_TIMER: -- 2.30.2

1 0

[PATCH 1/5] comctl32/tests: Test that WM_THEMECHANGED should invalidate client area.
by Zhiyi Zhang April 27, 2021

April 27, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/misc.c | 206 ++++++++++++++++++++++++++++++++++++- 1 file changed, 205 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index a3ba2028873..f4fcb300bb2 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -24,6 +24,7 @@ #include "wine/test.h" #include "v6util.h" +#include "msg.h" static PVOID (WINAPI * pAlloc)(LONG); static PVOID (WINAPI * pReAlloc)(PVOID, LONG); @@ -35,8 +36,21 @@ static BOOL (WINAPI * pStr_SetPtrA)(LPSTR, LPCSTR); static INT (WINAPI * pStr_GetPtrW)(LPCWSTR, LPWSTR, INT); static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); +static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); +static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); +static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); + static HMODULE hComctl32 = 0; +/* For message tests */ +enum seq_index +{ + CHILD_SEQ_INDEX, + NUM_MSG_SEQUENCES +}; + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + static char testicon_data[] = { 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, @@ -79,6 +93,40 @@ static BOOL InitFunctionPtrs(void) return TRUE; } +static BOOL init_functions_v6(void) +{ + hComctl32 = LoadLibraryA("comctl32.dll"); + if (!hComctl32) + { + trace("Could not load comctl32.dll version 6\n"); + return FALSE; + } + + COMCTL32_GET_PROC(410, SetWindowSubclass) + COMCTL32_GET_PROC(412, RemoveWindowSubclass) + COMCTL32_GET_PROC(413, DefSubclassProc) + + return TRUE; +} + +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + static void test_GetPtrAW(void) { if (pStr_GetPtrA) @@ -406,6 +454,156 @@ static void test_comctl32_classes(BOOL v6) check_class("SysLink", v6, CS_GLOBALCLASS, 0, FALSE); } +struct wm_themechanged_test +{ + const char *class; + const struct message *expected_msg; + int ignored_msg_count; + DWORD ignored_msgs[16]; + BOOL todo; +}; + +static BOOL ignore_message(UINT msg) +{ + /* these are always ignored */ + return (msg >= 0xc000 || + msg == WM_GETICON || + msg == WM_GETOBJECT || + msg == WM_TIMECHANGE || + msg == WM_DISPLAYCHANGE || + msg == WM_DEVICECHANGE || + msg == WM_DWMNCRENDERINGCHANGED || + msg == WM_WININICHANGE || + msg == WM_CHILDACTIVATE); +} + +static LRESULT CALLBACK test_wm_themechanged_proc(HWND hwnd, UINT message, WPARAM wParam, + LPARAM lParam, UINT_PTR id, DWORD_PTR ref_data) +{ + const struct wm_themechanged_test *test = (const struct wm_themechanged_test *)ref_data; + static int defwndproc_counter = 0; + struct message msg = {0}; + LRESULT ret; + int i; + + if (ignore_message(message)) + return pDefSubclassProc(hwnd, message, wParam, lParam); + + /* Extra messages to be ignored for a test case */ + for (i = 0; i < test->ignored_msg_count; ++i) + { + if (message == test->ignored_msgs[i]) + return pDefSubclassProc(hwnd, message, wParam, lParam); + } + + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, CHILD_SEQ_INDEX, &msg); + + if (message == WM_NCDESTROY) + pRemoveWindowSubclass(hwnd, test_wm_themechanged_proc, 0); + + ++defwndproc_counter; + ret = pDefSubclassProc(hwnd, message, wParam, lParam); + --defwndproc_counter; + + return ret; +} + +static HWND create_control(const char *class, DWORD style, HWND parent, DWORD_PTR data) +{ + HWND hwnd; + + if (parent) + style |= WS_CHILD; + hwnd = CreateWindowExA(0, class, "test", style, 0, 0, 50, 20, parent, 0, 0, NULL); + ok(!!hwnd, "Failed to create %s style %#x parent %p\n", class, style, parent); + pSetWindowSubclass(hwnd, test_wm_themechanged_proc, 0, data); + return hwnd; +} + +static const struct message wm_themechanged_paint_erase_seq[] = +{ + {WM_THEMECHANGED, sent | wparam | lparam}, + {WM_PAINT, sent | wparam | lparam}, + {WM_ERASEBKGND, sent | defwinproc}, + {0}, +}; + +static const struct message wm_themechanged_paint_seq[] = +{ + {WM_THEMECHANGED, sent | wparam | lparam}, + {WM_PAINT, sent | wparam | lparam}, + {0}, +}; + +static const struct message wm_themechanged_no_paint_seq[] = +{ + {WM_THEMECHANGED, sent | wparam | lparam}, + {0}, +}; + +static void test_WM_THEMECHANGED(void) +{ + HWND parent, child; + char buffer[64]; + int i; + + static const struct wm_themechanged_test tests[] = + { + {ANIMATE_CLASSA, wm_themechanged_no_paint_seq}, + {WC_BUTTONA, wm_themechanged_paint_erase_seq, 2, {WM_GETTEXT, WM_GETTEXTLENGTH}, TRUE}, + {WC_COMBOBOXA, wm_themechanged_paint_erase_seq, 1, {WM_CTLCOLOREDIT}, TRUE}, + {WC_COMBOBOXEXA, wm_themechanged_no_paint_seq}, + {DATETIMEPICK_CLASSA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_EDITA, wm_themechanged_paint_erase_seq, 7, {WM_GETTEXTLENGTH, WM_GETFONT, EM_GETSEL, EM_GETRECT, EM_CHARFROMPOS, EM_LINEFROMCHAR, EM_POSFROMCHAR}, TRUE}, + {WC_HEADERA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {HOTKEY_CLASSA, wm_themechanged_no_paint_seq}, + {WC_IPADDRESSA, wm_themechanged_paint_erase_seq, 1, {WM_CTLCOLOREDIT}, TRUE}, + {WC_LISTBOXA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_LISTVIEWA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {MONTHCAL_CLASSA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_NATIVEFONTCTLA, wm_themechanged_no_paint_seq}, + {WC_PAGESCROLLERA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {PROGRESS_CLASSA, wm_themechanged_paint_erase_seq, 3, {WM_STYLECHANGING, WM_STYLECHANGED, WM_NCPAINT}, TRUE}, + {REBARCLASSNAMEA, wm_themechanged_no_paint_seq, 1, {WM_WINDOWPOSCHANGING}}, + {WC_STATICA, wm_themechanged_paint_erase_seq, 2, {WM_GETTEXT, WM_GETTEXTLENGTH}, TRUE}, + {STATUSCLASSNAMEA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {"SysLink", wm_themechanged_no_paint_seq}, + {WC_TABCONTROLA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {TOOLBARCLASSNAMEA, wm_themechanged_paint_erase_seq, 1, {WM_WINDOWPOSCHANGING}, TRUE}, + {TOOLTIPS_CLASSA, wm_themechanged_no_paint_seq}, + {TRACKBAR_CLASSA, wm_themechanged_paint_seq, 0, {0}, TRUE}, + {WC_TREEVIEWA, wm_themechanged_paint_erase_seq, 1, {0x1128}, TRUE}, + {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq, 0, {0}, TRUE}, + {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}, TRUE}, + }; + + parent = CreateWindowExA(0, WC_STATICA, "parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, + 200, 200, 0, 0, 0, NULL); + ok(!!parent, "Failed to create parent window\n"); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + child = create_control(tests[i].class, WS_VISIBLE, parent, (DWORD_PTR)&tests[i]); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + SendMessageW(child, WM_THEMECHANGED, 0, 0); + flush_events(); + + sprintf(buffer, "Test %d class %s WM_THEMECHANGED", i, tests[i].class); + ok_sequence(sequences, CHILD_SEQ_INDEX, tests[i].expected_msg, buffer, tests[i].todo); + DestroyWindow(child); + } + + DestroyWindow(parent); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -416,15 +614,21 @@ START_TEST(misc) test_GetPtrAW(); test_Alloc(); - test_comctl32_classes(FALSE); + FreeLibrary(hComctl32); + if (!load_v6_module(&ctx_cookie, &hCtx)) return; + if(!init_functions_v6()) + return; + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); test_comctl32_classes(TRUE); test_builtin_classes(); test_LoadIconWithScaleDown(); + test_WM_THEMECHANGED(); unload_v6_module(ctx_cookie, hCtx); + FreeLibrary(hComctl32); } -- 2.30.2

1 0