August 2018 - Wine-Devel - list.winehq.org

[PATCH 2/3] mshtml: Implement known IHTMLCSSStyleDeclaration VARIANT properties.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 296 +++++++++++++++++++++++----------------------- dlls/mshtml/tests/style.c | 83 +++++++++++++ 2 files changed, 231 insertions(+), 148 deletions(-)

Aug. 31, 2018

[PATCH 1/3] mshtml: Added IHTMLCSSStyleDeclaration stub implementation.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 3065 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/style.c | 8 + 4 files changed, 3075 insertions(+)

Aug. 31, 2018

Re: [PATCH 3/3] msxml3: Return URL from get_namespaceURI from attributes for MSXML6.

by Nikolay Sivov

On 08/26/2018 07:27 PM, Daniel Lehman wrote: > static const xmlChar xmlns[] = "xmlns"; > +static const xmlChar xmlnsURI[] ="http://www.w3.org/2000/xmlns/"; > > typedef struct _domattr > { > @@ -559,7 +560,12 @@ static HRESULT WINAPI domattr_get_namespaceURI( > if (xmlStrEqual(This->node.node->name, xmlns)) > *p = bstr_from_xmlChar(xmlns); > else if (xmlStrEqual(ns->prefix, xmlns)) > - *p = SysAllocStringLen(NULL, 0); > + { > + if (xmldoc_version(This->node.node->doc) == MSXML6) > + *p = bstr_from_xmlChar(xmlnsURI); > + else > + *p = SysAllocStringLen(NULL, 0); > + } > else if (ns->href) > *p = bstr_from_xmlChar(ns->href); > } This could be WCHAR constant to avoid conversion, defined in the method body, if it's not used anywhere else.

Aug. 31, 2018

Re: [PATCH 2/3] msxml3: Copy namespaces as attributes.

by Nikolay Sivov

On 08/26/2018 07:27 PM, Daniel Lehman wrote: > static HRESULT WINAPI xmlnodemap_get_item( > IXMLDOMNamedNodeMap *iface, > LONG index, > IXMLDOMNode** item) > { > + HRESULT hr; > + xmlAttrPtr cur; > + struct list *ptr; > + nsattr_entry *nsattr; > xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); > > TRACE("(%p)->(%d %p)\n", This, index, item); > > - return This->funcs->get_item(This->node, index, item); > + hr = This->funcs->get_item(This->node, index, item); > + if (hr != S_FALSE) > + return hr; > + > + ptr = list_head(&This->nsattrs); > + if (!ptr) > + { > + if (!This->node->nsDef) > + return S_FALSE; > + > + if (This->node->nsDef) > + { > + hr = copy_ns_as_attrs(This); > + if (FAILED(hr)) > + return hr; > + } > + > + ptr = list_head(&This->nsattrs); > + if (!ptr) > + return FALSE; > + } > + > + if (This->node->properties) > + { > + --index; > + cur = This->node->properties; > + while (cur->next) > + { > + --index; > + cur = cur->next; > + } > + } > + > + if (index < 0) > + return S_FALSE; > + > + while (index--) > + ptr = list_next(ptr, ptr); > + > + nsattr = LIST_ENTRY(ptr, nsattr_entry, entry); > + cur = nsattr->attr; > + *item = create_node((xmlNodePtr) cur); > + > + return S_OK; > } This only applies to elements, so such fixup should happen there, not in generic nodemap method.

Aug. 31, 2018

[v2 PATCH] msxml3/tests: Add test for treating namespaces as attributes.

by Nikolay Sivov

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: minor cleanup. dlls/msxml3/tests/domdoc.c | 126 +++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 35fa42a6d1..b602e030a8 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12830,6 +12830,131 @@ todo_wine { IXMLDOMDocument2_Release(doc); } +typedef struct _namespace_as_attribute_t { + const GUID *guid; + const char *clsid; + const char *xmlns_uri; + BOOL todo; +} namespace_as_attribute_t; + +static const namespace_as_attribute_t namespace_as_attribute_test_data[] = { + { &CLSID_DOMDocument, "CLSID_DOMDocument", "", FALSE }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "", FALSE }, + { &CLSID_DOMDocument26, "CLSID_DOMDocument26", "", FALSE }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "", FALSE }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "", FALSE }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "http://www.w3.org/2000/xmlns/", TRUE }, + { 0 } +}; + +void test_namespaces_as_attributes(void) +{ + const namespace_as_attribute_t *entry = namespace_as_attribute_test_data; + static const char ns_as_attr_doc[] = { + "<?xml version=\"1.0\"?>" + "<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />" + }; + static const char *names[] = { "ns:b", "d", "xmlns:ns" }; + static const char *prefixes[] = { "ns", NULL, "xmlns" }; + static const char *basenames[] = { "b", "d", "ns" }; + static const char *uris[] = { "nshref", NULL, "" }; + static const char *texts[] = { "b attr", "d attr", "nshref" }; + IXMLDOMNamedNodeMap *map; + IXMLDOMNode *node, *item; + IXMLDOMDocument *doc; + VARIANT_BOOL b; + LONG len, i; + HRESULT hr; + BSTR str; + + while (entry->guid) + { + if (!is_clsid_supported(entry->guid, &IID_IXMLDOMDocument2)) + { + entry++; + continue; + } + + hr = CoCreateInstance(entry->guid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void **)&doc); + ok(SUCCEEDED(hr), "Failed to create document %s, hr %#x.\n", wine_dbgstr_guid(entry->guid), hr); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(ns_as_attr_doc), &b); + ok(hr == S_OK, "Failed to load xml, hr %#x.\n", hr); + + node = NULL; + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("a"), &node); + ok(SUCCEEDED(hr), "Failed to select a node, hr %#x.\n", hr); + + hr = IXMLDOMNode_get_attributes(node, &map); + ok(SUCCEEDED(hr), "Failed to get attributes, hr %#x.\n", hr); + + len = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &len); + ok(SUCCEEDED(hr), "Failed to get map length, hr %#x.\n", hr); + todo_wine ok(len == 3, "got %d\n", len); + + for (i = 0; i < len; i++) + { + item = NULL; + hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); + ok(SUCCEEDED(hr), "Failed to get item, hr %#x.\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_nodeName(item, &str); + ok(SUCCEEDED(hr), "Failed to get node name, hr %#x.\n", hr); + ok(!lstrcmpW(str, _bstr_(names[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_prefix(item, &str); + if (prefixes[i]) + { + ok(hr == S_OK, "Failed to get node name, hr %#x.\n", hr); + ok(!lstrcmpW(str, _bstr_(prefixes[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + else + ok(hr == S_FALSE, "Failed to get node name, hr %#x.\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_baseName(item, &str); + ok(SUCCEEDED(hr), "Failed to get base name, hr %#x.\n", hr); + ok(!lstrcmpW(str, _bstr_(basenames[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_namespaceURI(item, &str); + if (uris[i]) + { + ok(hr == S_OK, "Failed to get node name, hr %#x.\n", hr); + if (prefixes[i] && !strcmp(prefixes[i], "xmlns")) + todo_wine_if(entry->todo) + ok(!lstrcmpW(str, _bstr_(entry->xmlns_uri)), "got %s\n", wine_dbgstr_w(str)); + else + ok(!lstrcmpW(str, _bstr_(uris[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + else + ok(hr == S_FALSE, "Failed to get node name, hr %#x.\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_text(item, &str); + ok(SUCCEEDED(hr), "Failed to get node text, hr %#x.\n", hr); + ok(!lstrcmpW(str, _bstr_(texts[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNode_Release(item); + } + + IXMLDOMNamedNodeMap_Release(map); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + + entry++; + } + free_bstrs(); +} + START_TEST(domdoc) { HRESULT hr; @@ -12914,6 +13039,7 @@ START_TEST(domdoc) test_merging_text(); test_transformNodeToObject(); test_normalize_attribute_values(); + test_namespaces_as_attributes(); test_xsltemplate(); test_xsltext(); -- 2.18.0

Aug. 31, 2018

[PATCH] po: Update Finnish translation.

by Lauri Kenttä

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/po/fi.po b/po/fi.po index 54a636b461..f5a7b9ce99 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-20 17:38+0200\n" +"PO-Revision-Date: 2018-08-31 07:27+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -399,16 +399,12 @@ msgid "&Retry" msgstr "&Uudelleen" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "P&iilota välilehdet" +msgstr "Piilota lisätiedot" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Tiedot" +msgstr "Näytä lisätiedot" #: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 @@ -3440,18 +3436,16 @@ msgid "Connections" msgstr "Yhteydet" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Winen asetukset" +msgstr "Automaattiset asetukset" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Käytä Web Proxy Auto-Discovery (WPAD) -protokollaa" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Käytä Proxy Auto-Config (PAC) -skriptiä" #: inetcpl.rc:128 inetcpl.rc:132 msgid "Address:" @@ -14183,11 +14177,11 @@ msgstr "&Väri:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "MIME-tyypit" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "&Muokkaa tiedostosidoksia" #: winecfg.rc:308 msgid "Folders" -- 2.18.0

Aug. 31, 2018

[PATCH] schedsvc/tests: Check the entire entry list to find the new job

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This looks like it was a typo: The code loops through all the retrieved jobs, but it only retrieved the first one. This patch should fix the tests that usually fail on Debian, as well as any intermittent failures on Windows. --- dlls/schedsvc/tests/atsvcapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index 66f237ecab..d7d48a122c 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -118,7 +118,7 @@ START_TEST(atsvcapi) container.EntriesRead = 0; container.Buffer = NULL; total = start_index = 0; - ret = NetrJobEnum(server_name, &container, 1, &total, &start_index); + ret = NetrJobEnum(server_name, &container, -1, &total, &start_index); if (ret == ERROR_ACCESS_DENIED) { win_skip("NetrJobEnum: Access denied, skipping the tests\n"); -- 2.18.0

Aug. 31, 2018

[PATCH 12/12] shell32: Add remaining small icons

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/shell32.rc | 15 +++++++++++++++ dlls/shell32/shresdef.h | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0180e768cd..5c11590d7c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1032,13 +1032,28 @@ IDI_SHELL_SEARCH_SMALL ICON resources/search.ico /* @makedep: resources/help.ico */ IDI_SHELL_HELP_SMALL ICON resources/help.ico +/* @makedep: resources/log_off.ico */ +IDI_SHELL_LOG_OFF_SMALL ICON resources/log_off.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico +/* @makedep: resources/recent.ico */ +IDI_SHELL_RECENT_SMALL ICON resources/recent.ico + +/* @makedep: resources/window.ico */ +IDI_SHELL_RUN_SMALL ICON resources/window.ico + +/* @makedep: resources/shut_down.ico */ +IDI_SHELL_POWER_OFF_SMALL ICON resources/shut_down.ico + /* @makedep: resources/control.ico */ IDI_SHELL_CONTROL_PANEL_SMALL ICON resources/control.ico +/* @makedep: resources/eject.ico */ +IDI_SHELL_EJECT_SMALL ICON resources/eject.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/search.ico */ IDI_SHELL_SEARCH_DIRECTORY ICON resources/search.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 4858c8e2c6..16c92936ab 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -358,8 +358,13 @@ #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_SEARCH_SMALL 323 #define IDI_SHELL_HELP_SMALL 324 +#define IDI_SHELL_LOG_OFF_SMALL 325 #define IDI_SHELL_APP_FOLDER_SMALL 326 +#define IDI_SHELL_RECENT_SMALL 327 +#define IDI_SHELL_RUN_SMALL 328 +#define IDI_SHELL_POWER_OFF_SMALL 329 #define IDI_SHELL_CONTROL_PANEL_SMALL 330 +#define IDI_SHELL_EJECT_SMALL 331 /* 332 - 336 not used on Windows */ #define IDI_SHELL_SEARCH_DIRECTORY 337 #define IDI_SHELL_RESTRICTED2 338 -- 2.18.0

Aug. 31, 2018

[PATCH 11/12] shell32: Add remaining control panel icons

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/shell32.rc | 6 ++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5a48421b7d..0180e768cd 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1020,6 +1020,9 @@ IDI_SHELL_NEW_FOLDER ICON resources/folder.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_CONTROL_PANEL_XP2 ICON resources/control.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico @@ -1033,6 +1036,9 @@ IDI_SHELL_HELP_SMALL ICON resources/help.ico /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_CONTROL_PANEL_SMALL ICON resources/control.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/search.ico */ IDI_SHELL_SEARCH_DIRECTORY ICON resources/search.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 6e910dcd7d..4858c8e2c6 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -354,10 +354,12 @@ #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320 +#define IDI_SHELL_CONTROL_PANEL_XP2 321 #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_SEARCH_SMALL 323 #define IDI_SHELL_HELP_SMALL 324 #define IDI_SHELL_APP_FOLDER_SMALL 326 +#define IDI_SHELL_CONTROL_PANEL_SMALL 330 /* 332 - 336 not used on Windows */ #define IDI_SHELL_SEARCH_DIRECTORY 337 #define IDI_SHELL_RESTRICTED2 338 -- 2.18.0

Aug. 31, 2018

[PATCH 10/12] shell32: Rename icon 137 from "options" to "control panel XP"

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/shresdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 421261afa8..6e910dcd7d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -228,7 +228,7 @@ #define IDI_SHELL_FILE_SEARCH 134 #define IDI_SHELL_SYSTEM_SEARCH 135 /* 136 not used on Windows */ -#define IDI_SHELL_OPTIONS 137 +#define IDI_SHELL_CONTROL_PANEL_XP 137 #define IDI_SHELL_PRINTERS_FOLDER_XP 138 #define IDI_SHELL_ADD_PRINTER 139 #define IDI_SHELL_REMOTE_PRINTER 140 -- 2.18.0

Aug. 31, 2018