March 2019 - Wine-commits - list.winehq.org

Piotr Caban : kernel32: Don't use toupper.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 342ccda6ed28efc69071660f22ddde4e7ae94d87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=342ccda6ed28efc69071660f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 14:08:06 2019 +0100 kernel32: Don't use toupper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lzexpand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/lzexpand.c b/dlls/kernel32/lzexpand.c index 319c1c8..4b2ec2e 100644 --- a/dlls/kernel32/lzexpand.c +++ b/dlls/kernel32/lzexpand.c @@ -46,6 +46,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "lzexpand.h" #include "wine/unicode.h" @@ -285,7 +286,7 @@ INT WINAPI GetExpandedNameA( LPSTR in, LPSTR out ) if (fnislowercased) head.lastchar=tolower(head.lastchar); else - head.lastchar=toupper(head.lastchar); + head.lastchar=RtlUpperChar(head.lastchar); } /* now look where to replace the last character */

1 0

Piotr Caban : kernel32: Don't use strcasecmp.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 2eb1849100e741f3d936bf3f2d52ea09367f9867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb1849100e741f3d936bf3f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 14:08:12 2019 +0100 kernel32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/oldconfig.c | 4 ++-- dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ed7543e..00006d4 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -339,7 +339,7 @@ static const union cptable *get_codepage_table( unsigned int codepage ) static int charset_cmp( const void *name, const void *entry ) { const struct charset_entry *charset = entry; - return strcasecmp( name, charset->charset_name ); + return _strnicmp( name, charset->charset_name, -1 ); } /*********************************************************************** diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 219ecc5..dcce1aa 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -301,8 +301,8 @@ static void create_hardware_branch(void) fgets(cStr, sizeof(cStr), procfile); fclose(procfile); nType = DRIVE_UNKNOWN; - if (strncasecmp(cStr, "disk", 4) == 0) nType = DRIVE_FIXED; - if (strncasecmp(cStr, "cdrom", 5) == 0) nType = DRIVE_CDROM; + if (_strnicmp(cStr, "disk", 4) == 0) nType = DRIVE_FIXED; + if (_strnicmp(cStr, "cdrom", 5) == 0) nType = DRIVE_CDROM; if (nType == DRIVE_UNKNOWN) continue; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6062cfb..0ff695a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1391,7 +1391,7 @@ @ cdecl -private _strcmpi(str str) _stricmp @ cdecl -private _stricmp(str str) @ cdecl -private _strlwr(str) -@ cdecl -private _strnicmp(str str long) +@ cdecl _strnicmp(str str long) #add _strnicmp to importlib so it can be used instead of strncasecmp @ cdecl -private _strupr(str) @ cdecl -private _tolower(long) NTDLL__tolower @ cdecl -private _toupper(long) NTDLL__toupper diff --git a/include/winternl.h b/include/winternl.h index 147cb1d..2b3fb94 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2886,6 +2886,8 @@ NTSYSAPI NTSTATUS WINAPI RtlpUnWaitCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,__ms_va_list); NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,__ms_va_list); +NTSYSAPI int __cdecl _strnicmp(LPCSTR,LPCSTR,size_t); + /* 32-bit only functions */ #ifndef _WIN64

1 0

Piotr Caban : winmm: Don't use toupper.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: b602787a9332ea20d7d00f42054d060ae0c21760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b602787a9332ea20d7d00f42… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 14:08:28 2019 +0100 winmm: Don't use toupper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mmio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index b4155b6..6f14301 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -38,6 +38,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "winternl.h" #include "mmsystem.h" #include "winemm.h" @@ -1054,7 +1055,7 @@ FOURCC WINAPI mmioStringToFOURCCA(LPCSTR sz, UINT uFlags) for (i = 0; i < 4 && sz[i]; i++) { if (uFlags & MMIO_TOUPPER) { - cc[i] = toupper(sz[i]); + cc[i] = RtlUpperChar(sz[i]); } else { cc[i] = sz[i]; }

1 0

Piotr Caban : Revert "kernel32: Restore C locale for LC_CTYPE category.".
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: f09f6865384a4ef0c6c4f590de7c45562cb54381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f09f6865384a4ef0c6c4f590… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 14:08:36 2019 +0100 Revert "kernel32: Restore C locale for LC_CTYPE category.". This reverts commit c8e195e1797bd513c91927743b3ed38fdfa86c2f. There's still lots of code that works incorrectly in tr_TR.UTF-8 locale but I think it's good to revert this patch before next release. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 00006d4..fe2129b 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4226,7 +4226,6 @@ void LOCALE_Init(void) mac_cptable->info.codepage, unix_cp ); setlocale(LC_NUMERIC, "C"); /* FIXME: oleaut32 depends on this */ - setlocale(LC_CTYPE, "C"); /* Fixes issues when tr_TR.UTF-8 locale is used */ } static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName)

1 0

Andrew Eikum : ntdll: Fix memory region check in NtQueryVirtualMemory.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 12be24af8cab0e5f78795b164ec8847bafc30852 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12be24af8cab0e5f78795b16… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 27 11:33:25 2019 -0500 ntdll: Fix memory region check in NtQueryVirtualMemory. Patch by buggy(a)ifel.se. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45218 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 76dc6c2..fb6ede6 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2756,7 +2756,7 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) MEMORY_BASIC_INFORMATION *info = arg; void *end = (char *)start + size; - if ((char *)info->BaseAddress + info->RegionSize < (char *)start) return 0; + if ((char *)info->BaseAddress + info->RegionSize <= (char *)start) return 0; if (info->BaseAddress >= end) {

1 0

Jacek Caban : mshtml: Add IHTMLWindow7::getComputedStyle implementation.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 08939329709c3436ce7b3563b1b20c108241fac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08939329709c3436ce7b3563… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 18:52:14 2019 +0100 mshtml: Add IHTMLWindow7::getComputedStyle implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 22 ++++++++++++++++++++++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlwindow.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7f99c89..441346b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -10236,6 +10236,28 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) return S_OK; } +static const tid_t HTMLW3CComputedStyle_iface_tids[] = { + 0 +}; +static dispex_static_data_t HTMLW3CComputedStyle_dispex = { + &CSSStyle_dispex_vtbl, + DispHTMLW3CComputedStyle_tid, + HTMLW3CComputedStyle_iface_tids, + CSSStyle_init_dispex_info +}; + +HRESULT create_computed_style(nsIDOMCSSStyleDeclaration *nsstyle, IHTMLCSSStyleDeclaration **p) +{ + CSSStyle *style; + + if(!(style = heap_alloc_zero(sizeof(*style)))) + return E_OUTOFMEMORY; + + init_css_style(style, nsstyle, NULL, &HTMLW3CComputedStyle_dispex, COMPAT_MODE_IE11); + *p = &style->IHTMLCSSStyleDeclaration_iface; + return S_OK; +} + HRESULT get_elem_style(HTMLElement *elem, styleid_t styleid, BSTR *ret) { nsIDOMCSSStyleDeclaration *style; diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 2c4b76b..9dcf3d9 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -137,6 +137,7 @@ typedef enum { } styleid_t; HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; +HRESULT create_computed_style(nsIDOMCSSStyleDeclaration*,IHTMLCSSStyleDeclaration**) DECLSPEC_HIDDEN; void init_css_style(CSSStyle*,nsIDOMCSSStyleDeclaration*,style_qi_t, dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 926ebb9..55c03df 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -38,6 +38,7 @@ #include "mshtml_private.h" #include "htmlevent.h" #include "htmlscript.h" +#include "htmlstyle.h" #include "pluginhost.h" #include "binding.h" #include "resource.h" @@ -2322,8 +2323,42 @@ static HRESULT WINAPI HTMLWindow7_getComputedStyle(IHTMLWindow7 *iface, IHTMLDOM BSTR pseudo_elt, IHTMLCSSStyleDeclaration **p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); - FIXME("(%p)->(%p %s %p)\n", This, node, debugstr_w(pseudo_elt), p); - return E_NOTIMPL; + nsIDOMCSSStyleDeclaration *nsstyle; + nsAString pseudo_elt_str; + HTMLElement *element; + IHTMLElement *elem; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p %s %p)\n", This, node, debugstr_w(pseudo_elt), p); + + if(!This->outer_window) + return E_UNEXPECTED; + + hres = IHTMLDOMNode_QueryInterface(node, &IID_IHTMLElement, (void**)&elem); + if(FAILED(hres)) + return hres; + + element = unsafe_impl_from_IHTMLElement(elem); + if(!element) { + WARN("Not our element\n"); + IHTMLElement_Release(elem); + return E_INVALIDARG; + } + + nsAString_Init(&pseudo_elt_str, NULL); + nsres = nsIDOMWindow_GetComputedStyle(This->outer_window->nswindow, element->dom_element, + &pseudo_elt_str, &nsstyle); + IHTMLElement_Release(elem); + nsAString_Finish(&pseudo_elt_str); + if(NS_FAILED(nsres)) { + FIXME("GetComputedStyle failed: %08x\n", nsres); + return E_FAIL; + } + + hres = create_computed_style(nsstyle, p); + nsIDOMCSSStyleDeclaration_Release(nsstyle); + return hres; } static HRESULT WINAPI HTMLWindow7_get_styleMedia(IHTMLWindow7 *iface, IHTMLStyleMedia **p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a2b05e7..967fda2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -128,6 +128,7 @@ typedef struct EventTarget EventTarget; XDIID(DispHTMLTextAreaElement) \ XDIID(DispHTMLTitleElement) \ XDIID(DispHTMLUnknownElement) \ + XDIID(DispHTMLW3CComputedStyle) \ XDIID(DispHTMLWindow2) \ XDIID(DispHTMLXMLHttpRequest) \ XDIID(HTMLDocumentEvents) \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bf23163..7475c8f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -463,6 +463,14 @@ static const IID * const cstyle_iids[] = { NULL }; +static const IID * const computed_style_iids[] = { + &IID_IUnknown, + &IID_IDispatch, + &IID_IDispatchEx, + &IID_IHTMLCSSStyleDeclaration, + NULL +}; + static const IID * const img_factory_iids[] = { &IID_IUnknown, &IID_IDispatch, @@ -6879,7 +6887,10 @@ static void test_window(IHTMLDocument2 *doc) hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow7, (void**)&window7); if(SUCCEEDED(hres)) { + IHTMLCSSStyleDeclaration *computed_style; IHTMLPerformance *performance; + IHTMLDOMNode *node; + IHTMLElement *elem; ok(window7 != NULL, "window7 == NULL\n"); @@ -6907,6 +6918,25 @@ static void test_window(IHTMLDocument2 *doc) IHTMLWindow7_Release(window7); } + + hres = IHTMLDocument2_get_body(doc, &elem); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLDOMNode, (void**)&node); + ok(hres == S_OK, "Could not get IHTMLDOMNode iface: %08x\n", hres); + + hres = IHTMLWindow7_getComputedStyle(window7, node, NULL, &computed_style); + ok(hres == S_OK, "getComputedStyle failed: %08x\n", hres); + + test_disp((IUnknown*)computed_style, &DIID_DispHTMLW3CComputedStyle, NULL, "[object]"); + test_ifaces((IUnknown*)computed_style, computed_style_iids); + + test_read_only_style(computed_style); + + IHTMLCSSStyleDeclaration_Release(computed_style); + + IHTMLDOMNode_Release(node); + IHTMLElement_Release(elem); }else { win_skip("IHTMLWindow7 not supported\n"); }

1 0

Jacek Caban : mshtml: Expose getComputedStyle to scripts.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 3886fa60e0fceff3f1f439445fdd886997a26985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3886fa60e0fceff3f1f43944… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 18:52:27 2019 +0100 mshtml: Expose getComputedStyle to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 8 +------- dlls/mshtml/tests/documentmode.js | 16 ++++++++++++++++ dlls/mshtml/tests/elements.js | 17 +++++++++++++++++ 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 55c03df..a2aa90a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3499,14 +3499,8 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { - /* FIXME: Expose getComputedStyle once it's implemented. - * Stubs break existing web sites. */ - static const dispex_hook_t window7_hooks[] = { - {DISPID_IHTMLWINDOW7_GETCOMPUTEDSTYLE, NULL}, - {DISPID_UNKNOWN} - }; if(compat_mode >= COMPAT_MODE_IE9) - dispex_info_add_interface(info, IHTMLWindow7_tid, window7_hooks); + dispex_info_add_interface(info, IHTMLWindow7_tid, NULL); dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); EventTarget_init_dispex_info(info, compat_mode); } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 63dad76..aa60cd4 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -105,6 +105,7 @@ function test_window_props() { test_exposed("dispatchEvent", v >= 9); test_exposed("getSelection", v >= 9); test_exposed("onfocusout", v >= 9); + test_exposed("getComputedStyle", v >= 9); if(v >= 9) /* FIXME: native exposes it in all compat modes */ test_exposed("performance", true); @@ -167,6 +168,21 @@ function test_style_props() { test_exposed("removeProperty", v >= 9); test_exposed("background-clip", v >= 9); + if(window.getComputedStyle) { + style = window.getComputedStyle(document.body); + + test_exposed("removeAttribute", false); + test_exposed("zIndex", true); + test_exposed("z-index", true); + test_exposed("pixelTop", false); + test_exposed("float", true); + test_exposed("css-float", false); + test_exposed("style-float", false); + test_exposed("setProperty", v >= 9); + test_exposed("removeProperty", v >= 9); + test_exposed("background-clip", v >= 9); + } + next_test(); } diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 47a8dcc..1498e1f 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -235,6 +235,7 @@ function test_document_owner() { function test_style_properties() { var style = document.body.style; var current_style = document.body.currentStyle; + var computed_style = window.getComputedStyle(document.body); var val; style.cssFloat = "left"; @@ -300,6 +301,22 @@ function test_style_properties() { ok(style.clip === "rect(1px, 1px, 10px, 10px)", "style.clip = " + style.clip); ok(current_style.clip === "rect(1px, 1px, 10px, 10px)", "current_style.clip = " + current_style.clip); + ok(computed_style.clip === "rect(1px, 1px, 10px, 10px)", + "computed_style.clip = " + current_style.clip); + + document.body.style.zIndex = 2; + ok(current_style.zIndex === 2, "current_style.zIndex = " + current_style.zIndex); + ok(computed_style.zIndex === 2, "computed_style.zIndex = " + computed_style.zIndex); + + try { + current_style.zIndex = 1; + ok(false, "expected exception"); + }catch(e) {} + + try { + computed_style.zIndex = 1; + ok(false, "expected exception"); + }catch(e) {} next_test(); }

1 0

Jacek Caban : mshtml: Handle removeAttribute("filter") calls on detached style objects.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 3dd1fd9c8b28ade3cc35bfc2aeb7e9a1ecd730dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dd1fd9c8b28ade3cc35bfc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 18:52:34 2019 +0100 mshtml: Handle removeAttribute("filter") calls on detached style objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 441346b..1a3f7b9 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -3158,6 +3158,8 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri /* filter property is a special case */ if(style_entry->compat_dispid == DISPID_IHTMLSTYLE_FILTER) { + if(!This->elem) + return E_UNEXPECTED; *pfSuccess = variant_bool(This->elem->filter && *This->elem->filter); heap_free(This->elem->filter); This->elem->filter = NULL;

1 0

Jacek Caban : mshtml: Add IHTMLElement::getClientRects implementation.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 454a53235909e4a750955c154fff1b165a1b9761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=454a53235909e4a750955c15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 18:52:48 2019 +0100 mshtml: Add IHTMLElement::getClientRects implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 170 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsiface.idl | 12 ++- dlls/mshtml/tests/dom.c | 8 ++ 4 files changed, 188 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d490030..b14ecc1 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -553,6 +553,144 @@ static HRESULT create_html_rect(nsIDOMClientRect *nsrect, IHTMLRect **ret) return S_OK; } +typedef struct { + DispatchEx dispex; + IHTMLRectCollection IHTMLRectCollection_iface; + + LONG ref; + + nsIDOMClientRectList *rect_list; +} HTMLRectCollection; + +static inline HTMLRectCollection *impl_from_IHTMLRectCollection(IHTMLRectCollection *iface) +{ + return CONTAINING_RECORD(iface, HTMLRectCollection, IHTMLRectCollection_iface); +} + +static HRESULT WINAPI HTMLRectCollection_QueryInterface(IHTMLRectCollection *iface, REFIID riid, void **ppv) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &This->IHTMLRectCollection_iface; + }else if(IsEqualGUID(&IID_IHTMLRectCollection, riid)) { + *ppv = &This->IHTMLRectCollection_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLRectCollection_AddRef(IHTMLRectCollection *iface) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLRectCollection_Release(IHTMLRectCollection *iface) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if(This->rect_list) + nsIDOMClientRectList_Release(This->rect_list); + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLRectCollection_GetTypeInfoCount(IHTMLRectCollection *iface, UINT *pctinfo) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRectCollection_GetTypeInfo(IHTMLRectCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLRectCollection_GetIDsOfNames(IHTMLRectCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLRectCollection_Invoke(IHTMLRectCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLRectCollection_get_length(IHTMLRectCollection *iface, LONG *p) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRectCollection_get__newEnum(IHTMLRectCollection *iface, IUnknown **p) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRectCollection_item(IHTMLRectCollection *iface, VARIANT *index, VARIANT *result) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_variant(index), result); + return E_NOTIMPL; +} + +static const IHTMLRectCollectionVtbl HTMLRectCollectionVtbl = { + HTMLRectCollection_QueryInterface, + HTMLRectCollection_AddRef, + HTMLRectCollection_Release, + HTMLRectCollection_GetTypeInfoCount, + HTMLRectCollection_GetTypeInfo, + HTMLRectCollection_GetIDsOfNames, + HTMLRectCollection_Invoke, + HTMLRectCollection_get_length, + HTMLRectCollection_get__newEnum, + HTMLRectCollection_item +}; + +static const tid_t HTMLRectCollection_iface_tids[] = { + IHTMLRectCollection_tid, + 0 +}; +static dispex_static_data_t HTMLRectCollection_dispex = { + NULL, + IHTMLRectCollection_tid, + HTMLRectCollection_iface_tids +}; + static HRESULT WINAPI HTMLElement_QueryInterface(IHTMLElement *iface, REFIID riid, void **ppv) { @@ -2448,8 +2586,36 @@ static HRESULT WINAPI HTMLElement2_get_onpropertychange(IHTMLElement2 *iface, VA static HRESULT WINAPI HTMLElement2_getClientRects(IHTMLElement2 *iface, IHTMLRectCollection **pRectCol) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%p)\n", This, pRectCol); - return E_NOTIMPL; + nsIDOMClientRectList *rect_list; + HTMLRectCollection *rects; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, pRectCol); + + if(!This->dom_element) { + FIXME("comment element\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMElement_GetClientRects(This->dom_element, &rect_list); + if(NS_FAILED(nsres)) { + WARN("GetClientRects failed: %08x\n", nsres); + return map_nsresult(nsres); + } + + rects = heap_alloc_zero(sizeof(*rects)); + if(!rects) { + nsIDOMClientRectList_Release(rect_list); + return E_OUTOFMEMORY; + } + + rects->IHTMLRectCollection_iface.lpVtbl = &HTMLRectCollectionVtbl; + rects->ref = 1; + rects->rect_list = rect_list; + init_dispex(&rects->dispex, (IUnknown*)&rects->IHTMLRectCollection_iface, &HTMLRectCollection_dispex); + + *pRectCol = &rects->IHTMLRectCollection_iface; + return S_OK; } static HRESULT WINAPI HTMLElement2_getBoundingClientRect(IHTMLElement2 *iface, IHTMLRect **pRect) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 967fda2..26037f0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -210,6 +210,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLPerformanceTiming) \ XIID(IHTMLPluginsCollection) \ XIID(IHTMLRect) \ + XIID(IHTMLRectCollection) \ XIID(IHTMLScreen) \ XIID(IHTMLScriptElement) \ XIID(IHTMLSelectElement) \ diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index f9d8909..560fcd1 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -147,7 +147,6 @@ typedef nsISupports nsISupportsArray; typedef nsISupports nsIContentFilter; typedef nsISupports nsIDOMMediaList; typedef nsISupports nsIDOMHTMLTableSectionElement; -typedef nsISupports nsIDOMClientRectList; typedef nsISupports nsINode; typedef nsISupports nsIDOMUserDataHandler; typedef nsISupports nsISHEntry; @@ -1015,6 +1014,17 @@ interface nsIDOMClientRect : nsISupports [ object, + uuid(f474c567-cbcb-458f-abad-ae42363da287), + local +] +interface nsIDOMClientRectList : nsISupports +{ + nsresult GetLength(uint32_t *aLength); + nsresult Item(UINT32 index, nsIDOMClientRect **_retval); +} + +[ + object, uuid(6289999b-1008-4269-b42a-413ec5a9d3f4), local ] diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7475c8f..19d7b11 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5161,6 +5161,7 @@ static void _test_doc_set_title(unsigned line, IHTMLDocument2 *doc, const char * static void test_elem_bounding_client_rect(IUnknown *unk) { + IHTMLRectCollection *rects; IHTMLRect *rect, *rect2; IHTMLElement2 *elem2; LONG l; @@ -5199,6 +5200,13 @@ static void test_elem_bounding_client_rect(IUnknown *unk) ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); IHTMLRect_Release(rect); + + hres = IHTMLElement2_getClientRects(elem2, &rects); + ok(hres == S_OK, "getClientRects failed: %08x\n", hres); + + test_disp((IUnknown*)rects, &IID_IHTMLRectCollection, NULL, "[object]"); + + IHTMLRectCollection_Release(rects); } static void test_elem_col_item(IHTMLElementCollection *col, const char *n,

1 0

Jacek Caban : mshtml: Add IHTMLRectCollection implementation.
by Alexandre Julliard 27 Mar '19

27 Mar '19

Module: wine Branch: master Commit: 46de3fcf1d4a950c02692143be97462460503010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46de3fcf1d4a950c02692143… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 18:52:57 2019 +0100 mshtml: Add IHTMLRectCollection implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 83 +++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/elements.js | 18 ++++++++++ 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b14ecc1..da7b6cf 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -650,8 +650,15 @@ static HRESULT WINAPI HTMLRectCollection_Invoke(IHTMLRectCollection *iface, DISP static HRESULT WINAPI HTMLRectCollection_get_length(IHTMLRectCollection *iface, LONG *p) { HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 length; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRectList_GetLength(This->rect_list, &length); + assert(nsres == NS_OK); + *p = length; + return S_OK; } static HRESULT WINAPI HTMLRectCollection_get__newEnum(IHTMLRectCollection *iface, IUnknown **p) @@ -681,12 +688,82 @@ static const IHTMLRectCollectionVtbl HTMLRectCollectionVtbl = { HTMLRectCollection_item }; +static inline HTMLRectCollection *HTMLRectCollection_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLRectCollection, dispex); +} + +static HRESULT HTMLRectCollection_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) +{ + HTMLRectCollection *This = HTMLRectCollection_from_DispatchEx(dispex); + UINT32 len = 0; + DWORD idx = 0; + WCHAR *ptr; + + for(ptr = name; *ptr && isdigitW(*ptr); ptr++) + idx = idx*10 + (*ptr-'0'); + if(*ptr) + return DISP_E_UNKNOWNNAME; + + nsIDOMClientRectList_GetLength(This->rect_list, &len); + if(idx >= len) + return DISP_E_UNKNOWNNAME; + + *dispid = MSHTML_DISPID_CUSTOM_MIN + idx; + TRACE("ret %x\n", *dispid); + return S_OK; +} + +static HRESULT HTMLRectCollection_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLRectCollection *This = HTMLRectCollection_from_DispatchEx(dispex); + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + nsIDOMClientRect *rect; + IHTMLRect *html_rect; + nsresult nsres; + HRESULT hres; + + nsres = nsIDOMClientRectList_Item(This->rect_list, id - MSHTML_DISPID_CUSTOM_MIN, &rect); + if(NS_FAILED(nsres) || !rect) { + WARN("Unknown item\n"); + return DISP_E_UNKNOWNNAME; + } + + hres = create_html_rect(rect, &html_rect); + nsIDOMClientRect_Release(rect); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)html_rect; + break; + } + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static const dispex_static_data_vtbl_t HTMLRectCollection_dispex_vtbl = { + NULL, + HTMLRectCollection_get_dispid, + HTMLRectCollection_invoke, + NULL +}; static const tid_t HTMLRectCollection_iface_tids[] = { IHTMLRectCollection_tid, 0 }; static dispex_static_data_t HTMLRectCollection_dispex = { - NULL, + &HTMLRectCollection_dispex_vtbl, IHTMLRectCollection_tid, HTMLRectCollection_iface_tids }; diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 1498e1f..5077885 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -211,6 +211,23 @@ function test_compare_position() { next_test(); } +function test_rects() { + document.body.innerHTML = '<div>test</div>'; + var elem = document.body.firstChild; + var rects = elem.getClientRects(); + var rect = elem.getBoundingClientRect(); + + ok(rects.length === 1, "rect.length = " + rects.length); + ok(rects[0].top === rect.top, "rects[0].top = " + rects[0].top + " rect.top = " + rect.top); + ok(rects[0].bottom === rect.bottom, "rects[0].bottom = " + rects[0].bottom + " rect.bottom = " + rect.bottom); + + elem = document.createElement("style"); + rects = elem.getClientRects(); + ok(rects.length === 0, "rect.length = " + rects.length); + + next_test(); +} + function test_document_owner() { var node; @@ -339,6 +356,7 @@ var tests = [ test_anchor, test_query_selector, test_compare_position, + test_rects, test_document_owner, test_style_properties, test_storage

1 0