July 2022 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 7.14
by Alexandre Julliard July 29, 2022

July 29, 2022

Module: website Branch: master Commit: 6e5dccf5f70561b06515724ca9d004c0fe7f062b URL: https://gitlab.winehq.org/winehq/winehq/-/commit/6e5dccf5f70561b06515724ca9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 29 22:06:13 2022 +0200 Wine release 7.14 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022072901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022072901.xml b/news/en/2022072901.xml new file mode 100644 index 00000000..72a6c152 --- /dev/null +++ b/news/en/2022072901.xml @@ -0,0 +1,16 @@ +<news> +<date>July 29, 2022</date> +<title>Wine 7.14 Released</title> +<body> + The Wine development release 7.14 is now available. + <a href="{$root}/announce/7.14">What's new</a> in this release: +<ul> + <li>More progress on syscall interface for USER32.</li> + <li>Improved font fallbacks in DirectWrite.</li> + <li>Some fixes for socket shutdowns.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.14.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-7.14 : Alexandre Julliard : Release 7.14
by Alexandre Julliard July 29, 2022

July 29, 2022

Module: wine Branch: refs/tags/wine-7.14 Tag: 52c2dc7ee9c5fb124c909e4a716f40d9eee280cf URL: https://gitlab.winehq.org/wine/wine/-/tags/52c2dc7ee9c5fb124c909e4a716f40d9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 29 22:03:04 2022 +0200 Release 7.14

1 0

Alexandre Julliard : Release 7.14.
by Alexandre Julliard July 29, 2022

July 29, 2022

Module: wine Branch: master Commit: c86955d3806879fc97b127730e9fb90e232710a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c86955d3806879fc97b127730e9fb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 29 22:03:04 2022 +0200 Release 7.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 713 +++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 345 insertions(+), 388 deletions(-)

1 0

Gabriel Ivăncescu : include: Add DOMDocumentType dispinterface and coclass.
by Alexandre Julliard July 29, 2022

July 29, 2022

Module: wine Branch: master Commit: 434f9f1404c53db2ddae4f520c17321f43fd8cf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/434f9f1404c53db2ddae4f520c1732… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 29 17:30:05 2022 +0300 include: Add DOMDocumentType dispinterface and coclass. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/mshtml.idl | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index 1540633efef..6caa0c8ee5a 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -8497,6 +8497,51 @@ interface IDOMDocumentType : IDispatch HRESULT internalSubset([out, retval] VARIANT *p); } +/***************************************************************************** + * DispDOMDocumentType dispinterface + */ +[ + hidden, + uuid(30590098-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispDOMDocumentType +{ +properties: +methods: + WINE_HTMLDOMNODE_DISPINTERFACE_DECL; + + [propget, id(DISPID_IDOMDOCUMENTTYPE_NAME)] + BSTR name(); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_ENTITIES)] + IDispatch *entities(); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_NOTATIONS)] + IDispatch *notations(); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_PUBLICID)] + VARIANT publicId(); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_SYSTEMID)] + VARIANT systemId(); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_INTERNALSUBSET)] + VARIANT internalSubset(); +}; + +[ + noncreatable, + uuid(30510739-98b5-11cf-bb82-00aa00bdce0b) +] +coclass DOMDocumentType +{ + [default] dispinterface DispDOMDocumentType; + interface IHTMLDOMNode; + interface IHTMLDOMNode2; + interface IHTMLDOMNode3; + interface IDOMDocumentType; +}; + /***************************************************************************** * IHTMLDOMImplementation interface */

1 0

Gabriel Ivăncescu : mshtml: Handle lack of window in methods for detached documents.
by Alexandre Julliard July 29, 2022

July 29, 2022

Module: wine Branch: master Commit: f48709cfe4a271ca45b03c6e183d466776d35efe URL: https://gitlab.winehq.org/wine/wine/-/commit/f48709cfe4a271ca45b03c6e183d46… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 29 17:30:05 2022 +0300 mshtml: Handle lack of window in methods for detached documents. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 25 +++++++++++++++++++---- dlls/mshtml/tests/dom.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9092186bcf6..0cf19388481 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -877,7 +877,7 @@ static HRESULT WINAPI HTMLDocument_get_selection(IHTMLDocument2 *iface, IHTMLSel TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMWindow_GetSelection(This->window->nswindow, &nsselection); + nsres = nsIDOMHTMLDocument_GetSelection(This->doc_node->nsdoc, &nsselection); if(NS_FAILED(nsres)) { ERR("GetSelection failed: %08lx\n", nsres); return E_FAIL; @@ -896,7 +896,7 @@ static HRESULT WINAPI HTMLDocument_get_readyState(IHTMLDocument2 *iface, BSTR *p if(!p) return E_POINTER; - return get_readystate_string(This->window->readystate, p); + return get_readystate_string(This->window ? This->window->readystate : 0, p); } static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFramesCollection2 **p) @@ -905,6 +905,10 @@ static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFrames TRACE("(%p)->(%p)\n", This, p); + if(!This->window) { + /* Not implemented by IE */ + return E_NOTIMPL; + } return IHTMLWindow2_get_frames(&This->window->base.IHTMLWindow2_iface, p); } @@ -1087,7 +1091,7 @@ static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) TRACE("(%p)->(%p)\n", iface, p); - *p = SysAllocString(This->window->url ? This->window->url : L"about:blank"); + *p = SysAllocString(This->window && This->window->url ? This->window->url : L"about:blank"); return *p ? S_OK : E_OUTOFMEMORY; } @@ -1143,6 +1147,9 @@ static HRESULT WINAPI HTMLDocument_put_cookie(IHTMLDocument2 *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + if(!This->window) + return S_OK; + bret = InternetSetCookieExW(This->window->url, NULL, v, 0, 0); if(!bret) { FIXME("InternetSetCookieExW failed: %lu\n", GetLastError()); @@ -1160,6 +1167,11 @@ static HRESULT WINAPI HTMLDocument_get_cookie(IHTMLDocument2 *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); + if(!This->window) { + *p = NULL; + return S_OK; + } + size = 0; bret = InternetGetCookieExW(This->window->url, NULL, NULL, &size, 0, NULL); if(!bret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { @@ -1380,6 +1392,11 @@ static HRESULT WINAPI HTMLDocument_open(IHTMLDocument2 *iface, BSTR url, VARIANT TRACE("(%p)->(%s %s %s %s %p)\n", This, debugstr_w(url), debugstr_variant(&name), debugstr_variant(&features), debugstr_variant(&replace), pomWindowResult); + *pomWindowResult = NULL; + + if(!This->window) + return E_FAIL; + if(!This->doc_node->nsdoc) { ERR("!nsdoc\n"); return E_NOTIMPL; @@ -2263,7 +2280,7 @@ static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, I TRACE("(%p)->(%p)\n", This, p); - if(This->window->readystate == READYSTATE_UNINITIALIZED) { + if(This->window && This->window->readystate == READYSTATE_UNINITIALIZED) { *p = NULL; return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d25c7ac0df8..e3ac177205c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7322,10 +7322,14 @@ static void test_dom_implementation(IHTMLDocument2 *doc) hres = IHTMLDOMImplementation_QueryInterface(dom_implementation, &IID_IHTMLDOMImplementation2, (void**)&dom_implementation2); if(SUCCEEDED(hres)) { + IHTMLSelectionObject *selection; + IHTMLFramesCollection2 *frames; IHTMLDocument2 *new_document2; + IHTMLDocument3 *new_document3; IHTMLDocument7 *new_document; IHTMLLocation *location; IHTMLWindow2 *window; + IHTMLElement *elem; VARIANT v; IDispatch *disp; @@ -7334,6 +7338,7 @@ static void test_dom_implementation(IHTMLDocument2 *doc) str = SysAllocString(L"test"); hres = IHTMLDOMImplementation2_createHTMLDocument(dom_implementation2, str, &new_document); ok(hres == S_OK, "createHTMLDocument failed: %08lx\n", hres); + SysFreeString(str); test_disp((IUnknown*)new_document, &DIID_DispHTMLDocument, &CLSID_HTMLDocument, L"[object]"); test_ifaces((IUnknown*)new_document, doc_node_iids); @@ -7349,15 +7354,63 @@ static void test_dom_implementation(IHTMLDocument2 *doc) hres = IHTMLDocument7_QueryInterface(new_document, &IID_IHTMLDocument2, (void**)&new_document2); ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08lx\n", hres); + hres = IHTMLDocument7_QueryInterface(new_document, &IID_IHTMLDocument3, (void**)&new_document3); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08lx\n", hres); + hres = IHTMLDocument2_get_parentWindow(new_document2, &window); ok(hres == E_FAIL, "get_parentWindow returned: %08lx\n", hres); + hres = IHTMLDocument2_get_readyState(new_document2, &str); + ok(hres == S_OK, "get_readyState returned: %08lx\n", hres); + ok(!lstrcmpW(str, L"uninitialized"), "readyState = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLDocument2_get_Script(new_document2, &disp); ok(hres == E_PENDING, "get_Script returned: %08lx\n", hres); + str = SysAllocString(L"test=testval"); + hres = IHTMLDocument2_put_cookie(new_document2, str); + ok(hres == S_OK, "put_cookie returned: %08lx\n", hres); + SysFreeString(str); + + hres = IHTMLDocument2_get_cookie(doc, &str); + ok(hres == S_OK, "get_cookie returned: %08lx\n", hres); + ok(str == NULL, "cookie = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hres = IHTMLDocument3_get_documentElement(new_document3, &elem); + ok(hres == S_OK, "get_documentElement returned: %08lx\n", hres); + ok(elem != NULL, "documentElement = NULL\n"); + IHTMLElement_Release(elem); + + hres = IHTMLDocument2_get_frames(new_document2, &frames); + ok(hres == E_NOTIMPL, "get_frames returned: %08lx\n", hres); + hres = IHTMLDocument2_get_location(new_document2, &location); ok(hres == E_UNEXPECTED, "get_location returned: %08lx\n", hres); + hres = IHTMLDocument2_get_selection(new_document2, &selection); + ok(hres == S_OK, "get_selection returned: %08lx\n", hres); + ok(selection != NULL, "selection = NULL\n"); + hres = IHTMLSelectionObject_get_type(selection, &str); + ok(hres == S_OK, "selection get_type returned: %08lx\n", hres); + ok(!lstrcmpW(str, L"None"), "selection type = %s\n", wine_dbgstr_w(str)); + IHTMLSelectionObject_Release(selection); + SysFreeString(str); + + hres = IHTMLDocument2_get_URL(new_document2, &str); + ok(hres == S_OK, "get_URL returned: %08lx\n", hres); + ok(!lstrcmpW(str, L"about:blank"), "URL = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"text/html"); + V_VT(&v) = VT_ERROR; + disp = (IDispatch*)0xdeadbeef; + hres = IHTMLDocument2_open(new_document2, str, v, v, v, &disp); + ok(hres == E_FAIL, "open returned: %08lx\n", hres); + ok(disp == NULL, "disp = %p\n", disp); + SysFreeString(str); + memset(&v, 0xcc, sizeof(v)); hres = IHTMLDocument7_get_onmsthumbnailclick(new_document, &v); ok(hres == S_OK, "get_onmsthumbnailclick returned: %08lx\n", hres); @@ -7365,6 +7418,7 @@ static void test_dom_implementation(IHTMLDocument2 *doc) ok((DWORD)(DWORD_PTR)V_DISPATCH(&v) == 0xcccccccc, "got %p\n", V_DISPATCH(&v)); IHTMLDocument2_Release(new_document2); + IHTMLDocument3_Release(new_document3); IHTMLDocument7_Release(new_document); IHTMLDOMImplementation2_Release(dom_implementation2); }else {

1 0

Paul Gofman : opengl32/tests: Remove depth 32 / stencil 0 test in test_choosepixelformat().
by Alexandre Julliard July 29, 2022

July 29, 2022

Module: wine Branch: master Commit: b46917a481209f529b8ba535b341429f2b4cb91c URL: https://gitlab.winehq.org/wine/wine/-/commit/b46917a481209f529b8ba535b34142… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 29 12:11:05 2022 -0500 opengl32/tests: Remove depth 32 / stencil 0 test in test_choosepixelformat(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53429 --- dlls/opengl32/tests/opengl.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 7d407a1d0b0..57be207b548 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -380,12 +380,6 @@ static void test_choosepixelformat(void) pfd.cDepthBits = 0; pfd.cStencilBits = 0; - pfd.cDepthBits = 32; - ok( test_pfd(&pfd, &ret_fmt), "depth 32, stencil 8 failed.\n" ); - ok( ret_fmt.cDepthBits >= 24, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); - ok( !ret_fmt.cStencilBits, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); - pfd.cDepthBits = 0; - pfd.cStencilBits = 8; ok( test_pfd(&pfd, &ret_fmt), "depth 32, stencil 8 failed.\n" ); ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits );

1 0

Gabriel Ivăncescu : mshtml: Implement DocumentType node's name prop.
by Alexandre Julliard July 29, 2022

July 29, 2022

Module: wine Branch: master Commit: 144b30d941b7beabee0f45e19725ea32c44abb69 URL: https://gitlab.winehq.org/wine/wine/-/commit/144b30d941b7beabee0f45e19725ea… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 29 17:30:05 2022 +0300 mshtml: Implement DocumentType node's name prop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 8 ++++++-- dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index fb30b9d8405..9092186bcf6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -212,10 +212,14 @@ static HRESULT WINAPI DocumentType_Invoke(IDOMDocumentType *iface, DISPID dispId static HRESULT WINAPI DocumentType_get_name(IDOMDocumentType *iface, BSTR *p) { DocumentType *This = impl_from_IDOMDocumentType(iface); + nsAString nsstr; + nsresult nsres; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMDocumentType_GetName((nsIDOMDocumentType*)This->node.nsnode, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI DocumentType_get_entities(IDOMDocumentType *iface, IDispatch **p) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index c1e5e96125d..b9aea679258 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -670,6 +670,8 @@ sync_test("doctype", function() { ok(doctype === null, "doctype = " + document.doctype); return; } + + ok(doctype.name === "html", "doctype.name = " + doctype.name); }); async_test("iframe_doc_mode", function() {

1 0

Gabriel Ivăncescu : mshtml: Implement document.doctype.
by Alexandre Julliard July 29, 2022

July 29, 2022

Module: wine Branch: master Commit: d07c81158f605c369fabefd28058fd0c1b1f52a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d07c81158f605c369fabefd28058fd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 29 17:30:05 2022 +0300 mshtml: Implement document.doctype. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 290 +++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlnode.c | 9 +- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/documentmode.js | 10 ++ 4 files changed, 309 insertions(+), 3 deletions(-)

1 0

Gabriel Ivăncescu : include: Add IHTMLDOMNode3 to the HTMLDOMNode dispinterfaces.
by Alexandre Julliard July 29, 2022

July 29, 2022

Module: wine Branch: master Commit: fbefdd6753ce3bde5b562936f5280a27d76626c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbefdd6753ce3bde5b562936f5280a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 29 17:30:04 2022 +0300 include: Add IHTMLDOMNode3 to the HTMLDOMNode dispinterfaces. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/mshtml.idl | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index afeb44213d2..1540633efef 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -8142,10 +8142,6 @@ interface IHTMLDOMNode2 : IDispatch [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] \ IDispatch *ownerDocument() -#define WINE_HTMLDOMNODE_DISPINTERFACE_DECL \ - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; \ - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL - /***************************************************************************** * IHTMLDOMNode3 interface */ @@ -8234,6 +8230,69 @@ interface IHTMLDOMNode3 : IDispatch [out, retval] VARIANT_BOOL *pfisSupported); } +#define WINE_IHTMLDOMNODE3_DISPINTERFACE_DECL \ + [propput, id(DISPID_IHTMLDOMNODE3_PREFIX)] \ + void prefix(VARIANT v); \ + \ + [propget, id(DISPID_IHTMLDOMNODE3_PREFIX)] \ + VARIANT prefix(); \ + \ + [propget, id(DISPID_IHTMLDOMNODE3_LOCALNAME)] \ + VARIANT localName(); \ + \ + [propget, id(DISPID_IHTMLDOMNODE3_NAMESPACEURI)] \ + VARIANT namespaceURI(); \ + \ + [propput, id(DISPID_IHTMLDOMNODE3_TEXTCONTENT)] \ + void textContent(VARIANT v); \ + \ + [propget, id(DISPID_IHTMLDOMNODE3_TEXTCONTENT)] \ + VARIANT textContent(); \ + \ + [id(DISPID_IHTMLDOMNODE3_ISEQUALNODE)] \ + VARIANT_BOOL isEqualNode([in] IHTMLDOMNode3 *otherNode); \ + \ + [id(DISPID_IHTMLDOMNODE3_LOOKUPNAMESPACEURI)] \ + VARIANT lookupNamespaceURI([in] VARIANT *pvarPrefix); \ + \ + [id(DISPID_IHTMLDOMNODE3_LOOKUPPREFIX)] \ + VARIANT lookupPrefix([in] VARIANT *pvarNamespaceURI); \ + \ + [id(DISPID_IHTMLDOMNODE3_ISDEFAULTNAMESPACE)] \ + VARIANT_BOOL isDefaultNamespace([in] VARIANT *pvarNamespace); \ + \ + [id(DISPID_IHTMLDOMNODE3_IE9_APPENDCHILD)] \ + IHTMLDOMNode *ie9_appendChild([in] IHTMLDOMNode *newChild); \ + \ + [id(DISPID_IHTMLDOMNODE3_IE9_INSERTBEFORE)] \ + IHTMLDOMNode *ie9_insertBefore( \ + [in] IHTMLDOMNode *newChild, \ + [in, optional] VARIANT refChild); \ + \ + [id(DISPID_IHTMLDOMNODE3_IE9_REMOVECHILD)] \ + IHTMLDOMNode *ie9_removeChild([in] IHTMLDOMNode *oldChild); \ + \ + [id(DISPID_IHTMLDOMNODE3_IE9_REPLACECHILD)] \ + IHTMLDOMNode *ie9_replaceChild( \ + [in] IHTMLDOMNode *newChild, \ + [in] IHTMLDOMNode *oldChild); \ + \ + [id(DISPID_IHTMLDOMNODE3_ISSAMENODE)] \ + VARIANT_BOOL isSameNode([in] IHTMLDOMNode3 *otherNode); \ + \ + [id(DISPID_IHTMLDOMNODE3_COMPAREDOCUMENTPOSITION)] \ + USHORT compareDocumentPosition([in] IHTMLDOMNode *otherNode); \ + \ + [id(DISPID_IHTMLDOMNODE3_ISSUPPORTED)] \ + VARIANT_BOOL isSupported( \ + [in] BSTR feature, \ + [in] VARIANT version) \ + +#define WINE_HTMLDOMNODE_DISPINTERFACE_DECL \ + WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; \ + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; \ + WINE_IHTMLDOMNODE3_DISPINTERFACE_DECL + /***************************************************************************** * IHTMLDOMAttribute interface */

1 0

Nikolay Sivov : dwrite: Fix fallback config ranges text parsing.
by Alexandre Julliard July 29, 2022

July 29, 2022

Module: wine Branch: master Commit: f6f2a1a3e5854ad4475ab5855b194660d5250f8e URL: https://gitlab.winehq.org/wine/wine/-/commit/f6f2a1a3e5854ad4475ab5855b1946… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 29 12:15:52 2022 +0300 dwrite: Fix fallback config ranges text parsing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 1584329d350..e95c1689a98 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2816,7 +2816,8 @@ static void system_fallback_parse_ranges(const char *str, DWRITE_UNICODE_RANGE * str = end + 1; ranges[count].last = strtoul(str, &end, 16); } - if (*end == ',') str = end + 1; + str = end; + if (*str == ',') str++; count++; }

1 0