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

Francois Gouget : TestBot/TestAgent: Old Net::OpenSSH versions don' t have disconnect().
by Alexandre Julliard 29 Mar '19

29 Mar '19

Module: tools Branch: master Commit: 09c955efd51764aa713de23b64901bc489b74fec URL: https://source.winehq.org/git/tools.git/?a=commit;h=09c955efd51764aa713de23… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 29 09:51:26 2019 +0100 TestBot/TestAgent: Old Net::OpenSSH versions don't have disconnect(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 7c85e8a..ca8a81b 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -128,7 +128,6 @@ sub Disconnect($) { # This may close the SSH channel ($self->{fd}) as a side-effect, # which will avoid undue delays. - $self->{ssh}->disconnect(); $self->{ssh} = undef; waitpid($self->{sshpid}, 0); $self->{sshpid} = undef;

1 0

Józef Kucia : wined3d: Use adapter_check_format() in wined3d_check_render_target_format().
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: 8497ba8a7336c67235e9b76587a43e9d763d058d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8497ba8a7336c67235e9b765… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:56 2019 +0100 wined3d: Use adapter_check_format() in wined3d_check_render_target_format(). wined3d_check_pixel_format_{color,depth}() functions are moved to adapter_gl.c. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 73 ++++++++++++++++++++++++++++++++++- dlls/wined3d/directx.c | 86 +----------------------------------------- dlls/wined3d/wined3d_private.h | 5 --- 3 files changed, 73 insertions(+), 91 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 30c1515..3aaceaf 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4385,6 +4385,56 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s caps->MaxAnisotropy = gl_info->limits.anisotropy; } +static BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, + const struct wined3d_format *format) +{ + /* Float formats need FBOs. If FBOs are used this function isn't called */ + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) + return FALSE; + + /* Probably a RGBA_float or color index mode. */ + if (cfg->iPixelType != WGL_TYPE_RGBA_ARB) + return FALSE; + + if (cfg->redSize < format->red_size + || cfg->greenSize < format->green_size + || cfg->blueSize < format->blue_size + || cfg->alphaSize < format->alpha_size) + return FALSE; + + return TRUE; +} + +static BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, + const struct wined3d_format *format) +{ + BOOL lockable = FALSE; + + /* Float formats need FBOs. If FBOs are used this function isn't called */ + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) + return FALSE; + + if ((format->id == WINED3DFMT_D16_LOCKABLE) || (format->id == WINED3DFMT_D32_FLOAT)) + lockable = TRUE; + + /* On some modern cards like the Geforce8/9, GLX doesn't offer some + * depth/stencil formats which D3D9 reports. We can safely report + * "compatible" formats (e.g. D24 can be used for D16) as long as we + * aren't dealing with a lockable format. This also helps D3D <= 7 as they + * expect D16 which isn't offered without this on Geforce8 cards. */ + if (!(cfg->depthSize == format->depth_size || (!lockable && cfg->depthSize > format->depth_size))) + return FALSE; + + /* Some cards like Intel i915 ones only offer D24S8 but lots of games also + * need a format without stencil. We can allow a mismatch if the format + * doesn't have any stencil bits. If it does have stencil bits the size + * must match, or stencil wrapping would break. */ + if (format->stencil_size && cfg->stencilSize != format->stencil_size) + return FALSE; + + return TRUE; +} + static BOOL adapter_gl_check_format(const struct wined3d_adapter *adapter, const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, const struct wined3d_format *ds_format) @@ -4394,14 +4444,35 @@ static BOOL adapter_gl_check_format(const struct wined3d_adapter *adapter, if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER) return TRUE; + if (adapter_format && rt_format) + { + /* In backbuffer mode the front and backbuffer share the same WGL + * pixelformat. The format must match in RGB, alpha is allowed to be + * different. (Only the backbuffer can have alpha.) */ + if (adapter_format->red_size != rt_format->red_size + || adapter_format->green_size != rt_format->green_size + || adapter_format->blue_size != rt_format->blue_size) + { + TRACE("Render target format %s doesn't match with adapter format %s.\n", + debug_d3dformat(rt_format->id), debug_d3dformat(adapter_format->id)); + return FALSE; + } + } + for (i = 0; i < adapter->cfg_count; ++i) { const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; + /* Check if there is a WGL pixel format matching the requirements, the format should also be window + * drawable (not offscreen; e.g. Nvidia offers R5G6B5 for pbuffers even when X is running at 24bit) */ + if (adapter_format && rt_format && !cfg->windowDrawable) + continue; + if ((!adapter_format || wined3d_check_pixel_format_color(cfg, adapter_format)) && (!rt_format || wined3d_check_pixel_format_color(cfg, rt_format)) - && wined3d_check_pixel_format_depth(cfg, ds_format)) + && (!ds_format || wined3d_check_pixel_format_depth(cfg, ds_format))) { + TRACE("Pixel format %d is compatible.\n", cfg->iPixelFormat); return TRUE; } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 260fcc3..75f1fdd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1277,56 +1277,6 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U return WINED3D_OK; } -BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, - const struct wined3d_format *format) -{ - /* Float formats need FBOs. If FBOs are used this function isn't called */ - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) - return FALSE; - - /* Probably a RGBA_float or color index mode. */ - if (cfg->iPixelType != WGL_TYPE_RGBA_ARB) - return FALSE; - - if (cfg->redSize < format->red_size - || cfg->greenSize < format->green_size - || cfg->blueSize < format->blue_size - || cfg->alphaSize < format->alpha_size) - return FALSE; - - return TRUE; -} - -BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, - const struct wined3d_format *format) -{ - BOOL lockable = FALSE; - - /* Float formats need FBOs. If FBOs are used this function isn't called */ - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) - return FALSE; - - if ((format->id == WINED3DFMT_D16_LOCKABLE) || (format->id == WINED3DFMT_D32_FLOAT)) - lockable = TRUE; - - /* On some modern cards like the Geforce8/9, GLX doesn't offer some - * depth/stencil formats which D3D9 reports. We can safely report - * "compatible" formats (e.g. D24 can be used for D16) as long as we - * aren't dealing with a lockable format. This also helps D3D <= 7 as they - * expect D16 which isn't offered without this on Geforce8 cards. */ - if (!(cfg->depthSize == format->depth_size || (!lockable && cfg->depthSize > format->depth_size))) - return FALSE; - - /* Some cards like Intel i915 ones only offer D24S8 but lots of games also - * need a format without stencil. We can allow a mismatch if the format - * doesn't have any stencil bits. If it does have stencil bits the size - * must match, or stencil wrapping would break. */ - if (format->stencil_size && cfg->stencilSize != format->stencil_size) - return FALSE; - - return TRUE; -} - HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id) @@ -1446,41 +1396,7 @@ static BOOL wined3d_check_render_target_format(const struct wined3d_adapter *ada if (!(rt_format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) return FALSE; - if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) - { - const struct wined3d_pixel_format *cfgs = adapter->cfgs; - unsigned int i; - - /* In backbuffer mode the front and backbuffer share the same WGL - * pixelformat. The format must match in RGB, alpha is allowed to be - * different. (Only the backbuffer can have alpha.) */ - if (adapter_format->red_size != rt_format->red_size - || adapter_format->green_size != rt_format->green_size - || adapter_format->blue_size != rt_format->blue_size) - { - TRACE("Render target format %s doesn't match with adapter format %s.\n", - debug_d3dformat(rt_format->id), debug_d3dformat(adapter_format->id)); - return FALSE; - } - - /* Check if there is a WGL pixel format matching the requirements, the format should also be window - * drawable (not offscreen; e.g. Nvidia offers R5G6B5 for pbuffers even when X is running at 24bit) */ - for (i = 0; i < adapter->cfg_count; ++i) - { - if (cfgs[i].windowDrawable - && wined3d_check_pixel_format_color(&cfgs[i], adapter_format) - && wined3d_check_pixel_format_color(&cfgs[i], rt_format)) - { - TRACE("Pixel format %d is compatible with format %s.\n", - cfgs[i].iPixelFormat, debug_d3dformat(rt_format->id)); - return TRUE; - } - } - - return FALSE; - } - - return TRUE; + return adapter->adapter_ops->adapter_check_format(adapter, adapter_format, rt_format, NULL); } static BOOL wined3d_check_surface_format(const struct wined3d_format *format) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 83fc09d..b9f906a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4724,9 +4724,4 @@ static inline void wined3d_not_from_cs(struct wined3d_cs *cs) /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, - const struct wined3d_format *format) DECLSPEC_HIDDEN; -BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, - const struct wined3d_format *format) DECLSPEC_HIDDEN; - #endif

1 0

Józef Kucia : wined3d: Move pixel formats to wined3d_adapter_gl.
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: cad72d3cd7a40e2c1f70d19b988e19da62710bf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad72d3cd7a40e2c1f70d19b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:57 2019 +0100 wined3d: Move pixel formats to wined3d_adapter_gl. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 46 +++++++++++++++++++++++++++--------------- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/directx.c | 16 ++++++++++----- dlls/wined3d/wined3d_private.h | 17 ++++++++++++++-- 4 files changed, 58 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cad72d3cd7a40e2c1f70…

1 0

Louis Lenders : msi: Add MsiSourceListForceResolution{A,W} stub.
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: 2e95d2247d8fb83d040bdfce388ed4e96172427c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e95d2247d8fb83d040bdfce… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Mar 27 20:32:08 2019 +0100 msi: Add MsiSourceListForceResolution{A,W} stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46881 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.spec | 4 ++-- dlls/msi/source.c | 18 ++++++++++++++++++ include/msi.h | 4 ++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index eeb9ea7..406a910 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -205,8 +205,8 @@ 209 stdcall MsiSourceListClearAllW(wstr wstr long) 210 stdcall MsiSourceListAddSourceA(str str long str) 211 stdcall MsiSourceListAddSourceW(wstr wstr long wstr) -212 stub MsiSourceListForceResolutionA -213 stub MsiSourceListForceResolutionW +212 stdcall MsiSourceListForceResolutionA(str str long) +213 stdcall MsiSourceListForceResolutionW(wstr wstr long) 214 stdcall MsiIsProductElevatedA(str ptr) 215 stdcall MsiIsProductElevatedW(wstr ptr) 216 stdcall MsiGetShortcutTargetA(str ptr ptr ptr) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 3640b0d..ed1c6b6 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1330,3 +1330,21 @@ UINT WINAPI MsiSourceListClearSourceW(LPCWSTR szProductCodeOrPatchCode, LPCWSTR dwContext, dwOptions, debugstr_w(szSource)); return ERROR_SUCCESS; } + +/****************************************************************** + * MsiSourceListForceResolutionA (MSI.@) + */ +UINT WINAPI MsiSourceListForceResolutionA(const CHAR *product, const CHAR *user, DWORD reserved) +{ + FIXME("(%s %s %x)\n", debugstr_a(product), debugstr_a(user), reserved); + return ERROR_SUCCESS; +} + +/****************************************************************** + * MsiSourceListForceResolutionW (MSI.@) + */ +UINT WINAPI MsiSourceListForceResolutionW(const WCHAR *product, const WCHAR *user, DWORD reserved) +{ + FIXME("(%s %s %x)\n", debugstr_w(product), debugstr_w(user), reserved); + return ERROR_SUCCESS; +} diff --git a/include/msi.h b/include/msi.h index 417b606..604331a 100644 --- a/include/msi.h +++ b/include/msi.h @@ -672,6 +672,10 @@ UINT WINAPI MsiSourceListAddMediaDiskA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPCWSTR, LPCWSTR); #define MsiSourceListAddMediaDisk WINELIB_NAME_AW(MsiSourceListAddMediaDisk) +UINT WINAPI MsiSourceListForceResolutionA(const CHAR*, const CHAR*, DWORD); +UINT WINAPI MsiSourceListForceResolutionW(const WCHAR*, const WCHAR*, DWORD); +#define MsiSourceListForceResolution WINELIB_NAME_AW(MsiSourceListForceResolution) + UINT WINAPI MsiEnumPatchesA(LPCSTR, DWORD, LPSTR, LPSTR, LPDWORD); UINT WINAPI MsiEnumPatchesW(LPCWSTR, DWORD, LPWSTR, LPWSTR, LPDWORD); #define MsiEnumPatches WINELIB_NAME_AW(MsiEnumPatches)

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: bcbb650e418ba69bbfaef6e3505458989b59a3b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcbb650e418ba69bbfaef6e3… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Thu Mar 28 08:12:24 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 379 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 187 insertions(+), 192 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bcbb650e418ba69bbfae…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: 3dc6d9d9146522cebcd70af6c6de20d6a316da44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dc6d9d9146522cebcd70af6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 28 16:37:10 2019 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 314 +++++++++++++++------------------------------------------------ 1 file changed, 72 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3dc6d9d9146522cebcd7…

1 0

Jacek Caban : mshtml: Add IHTMLDocument7::createElementNS implementation.
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: 7858cc01b77da7c6b2e0db65dd751bb1e42faa7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7858cc01b77da7c6b2e0db65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 15:55:46 2019 +0100 mshtml: Add IHTMLDocument7::createElementNS implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 35 +++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/elements.js | 20 ++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 20d1c74..656acaf 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3288,8 +3288,39 @@ static HRESULT WINAPI HTMLDocument7_getElementsByTagNameNS(IHTMLDocument7 *iface static HRESULT WINAPI HTMLDocument7_createElementNS(IHTMLDocument7 *iface, VARIANT *pvarNS, BSTR bstrTag, IHTMLElement **newElem) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_variant(pvarNS), debugstr_w(bstrTag), newElem); - return E_NOTIMPL; + nsIDOMElement *dom_element; + HTMLElement *element; + nsAString ns, tag; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(pvarNS), debugstr_w(bstrTag), newElem); + + if(!This->doc_node->nsdoc) { + FIXME("NULL nsdoc\n"); + return E_FAIL; + } + + if(pvarNS && V_VT(pvarNS) != VT_NULL && V_VT(pvarNS) != VT_BSTR) + FIXME("Unsupported namespace %s\n", debugstr_variant(pvarNS)); + + nsAString_InitDepend(&ns, pvarNS && V_VT(pvarNS) == VT_BSTR ? V_BSTR(pvarNS) : NULL); + nsAString_InitDepend(&tag, bstrTag); + nsres = nsIDOMHTMLDocument_CreateElementNS(This->doc_node->nsdoc, &ns, &tag, &dom_element); + nsAString_Finish(&ns); + nsAString_Finish(&tag); + if(NS_FAILED(nsres)) { + WARN("CreateElementNS failed: %08x\n", nsres); + return map_nsresult(nsres); + } + + hres = HTMLElement_Create(This->doc_node, (nsIDOMNode*)dom_element, FALSE, &element); + nsIDOMElement_Release(dom_element); + if(FAILED(hres)) + return hres; + + *newElem = &element->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLDocument7_createAttributeNS(IHTMLDocument7 *iface, VARIANT *pvarNS, diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 5077885..287ff35 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -168,6 +168,25 @@ function test_getElementsByClassName() { next_test(); } +function test_createElementNS() { + var svg_ns = "http://www.w3.org/2000/svg"; + var elem; + + elem = document.createElementNS(null, "test"); + ok(elem.tagName === "test", "elem.tagName = " + elem.tagName); + + elem = document.createElementNS(svg_ns, "test"); + ok(elem.tagName === "test", "elem.tagName = " + elem.tagName); + + elem = document.createElementNS(svg_ns, "svg"); + ok(elem.tagName === "svg", "elem.tagName = " + elem.tagName); + + elem = document.createElementNS("test", "svg"); + ok(elem.tagName === "svg", "elem.tagName = " + elem.tagName); + + next_test(); +} + function test_query_selector() { document.body.innerHTML = '<div class="class1">' + '<div class="class1"></div>' @@ -351,6 +370,7 @@ var tests = [ test_textContent, test_ElementTraversal, test_getElementsByClassName, + test_createElementNS, test_head, test_iframe, test_anchor,

1 0

Jacek Caban : mshtml: Add IHTMLDOMNode3::get_namespaceURI implementation.
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: 4257a14f47d22dee250fecb71d05d9835755179d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4257a14f47d22dee250fecb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 15:55:56 2019 +0100 mshtml: Add IHTMLDOMNode3::get_namespaceURI implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 10 ++++++++-- dlls/mshtml/tests/elements.js | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ee504f9..36cfc80 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1227,8 +1227,14 @@ static HRESULT WINAPI HTMLDOMNode3_get_localName(IHTMLDOMNode3 *iface, VARIANT * static HRESULT WINAPI HTMLDOMNode3_get_namespaceURI(IHTMLDOMNode3 *iface, VARIANT *p) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_InitDepend(&nsstr, NULL); + nsres = nsIDOMNode_GetNamespaceURI(This->nsnode, &nsstr); + return return_nsstr_variant(nsres, &nsstr, p); } static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 287ff35..7bf5c24 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -174,15 +174,19 @@ function test_createElementNS() { elem = document.createElementNS(null, "test"); ok(elem.tagName === "test", "elem.tagName = " + elem.tagName); + ok(elem.namespaceURI === null, "elem.namespaceURI = " + elem.namespaceURI); elem = document.createElementNS(svg_ns, "test"); ok(elem.tagName === "test", "elem.tagName = " + elem.tagName); + ok(elem.namespaceURI === svg_ns, "elem.namespaceURI = " + elem.namespaceURI); elem = document.createElementNS(svg_ns, "svg"); ok(elem.tagName === "svg", "elem.tagName = " + elem.tagName); + ok(elem.namespaceURI === svg_ns, "elem.namespaceURI = " + elem.namespaceURI); elem = document.createElementNS("test", "svg"); ok(elem.tagName === "svg", "elem.tagName = " + elem.tagName); + ok(elem.namespaceURI === "test", "elem.namespaceURI = " + elem.namespaceURI); next_test(); }

1 0

Jacek Caban : mshtml: Add IElementSelector::querySelector implementation.
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: 394347945c44f18e37f70f1d7825e2adca332048 URL: https://source.winehq.org/git/wine.git/?a=commit;h=394347945c44f18e37f70f1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 15:56:06 2019 +0100 mshtml: Add IElementSelector::querySelector implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 35 +++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/elements.js | 6 ++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index da7b6cf..c628a18 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5182,8 +5182,39 @@ static HRESULT WINAPI ElementSelector_Invoke(IElementSelector *iface, DISPID dis static HRESULT WINAPI ElementSelector_querySelector(IElementSelector *iface, BSTR v, IHTMLElement **pel) { HTMLElement *This = impl_from_IElementSelector(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - return E_NOTIMPL; + nsIDOMElement *nselem; + HTMLElement *elem; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + + if(!This->dom_element) { + FIXME("comment element\n"); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMElement_QuerySelector(This->dom_element, &nsstr, &nselem); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("QuerySelector failed: %08x\n", nsres); + return E_FAIL; + } + + if(!nselem) { + *pel = NULL; + return S_OK; + } + + hres = get_element(nselem, &elem); + nsIDOMElement_Release(nselem); + if(FAILED(hres)) + return hres; + + *pel = &elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 7bf5c24..9645c0b 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -200,12 +200,18 @@ function test_query_selector() { var e = document.querySelector("nomatch"); ok(e === null, "e = " + e); + e = document.body.querySelector("nomatch"); + ok(e === null, "e = " + e); e = document.querySelector(".class1"); ok(e.tagName === "DIV", "e.tagName = " + e.tagName); + e = document.body.querySelector(".class1"); + ok(e.tagName === "DIV", "e.tagName = " + e.tagName); e = document.querySelector("a"); ok(e.tagName === "A", "e.tagName = " + e.tagName); + e = document.body.querySelector("a"); + ok(e.tagName === "A", "e.tagName = " + e.tagName); next_test(); }

1 0

Jacek Caban : mshtml: Support SVG element style.
by Alexandre Julliard 28 Mar '19

28 Mar '19

Module: wine Branch: master Commit: 43ae349c96564b8afe65a5bb30877e558673f851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43ae349c96564b8afe65a5bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 15:56:29 2019 +0100 mshtml: Support SVG element style. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 28 +++++++++++++++++++++------- dlls/mshtml/nsiface.idl | 13 +++++++++++++ dlls/mshtml/tests/elements.js | 16 ++++++++++++---- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 1a3f7b9..003ef8f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -10171,6 +10171,7 @@ static dispex_static_data_t HTMLStyle_dispex = { static HRESULT get_style_from_elem(HTMLElement *elem, nsIDOMCSSStyleDeclaration **ret) { nsIDOMElementCSSInlineStyle *nselemstyle; + nsIDOMSVGElement *svg_element; nsresult nsres; if(!elem->dom_element) { @@ -10180,16 +10181,29 @@ static HRESULT get_style_from_elem(HTMLElement *elem, nsIDOMCSSStyleDeclaration nsres = nsIDOMElement_QueryInterface(elem->dom_element, &IID_nsIDOMElementCSSInlineStyle, (void**)&nselemstyle); - assert(nsres == NS_OK); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMElementCSSInlineStyle_GetStyle(nselemstyle, ret); + nsIDOMElementCSSInlineStyle_Release(nselemstyle); + if(NS_FAILED(nsres)) { + ERR("GetStyle failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; + } - nsres = nsIDOMElementCSSInlineStyle_GetStyle(nselemstyle, ret); - nsIDOMElementCSSInlineStyle_Release(nselemstyle); - if(NS_FAILED(nsres)) { - ERR("GetStyle failed: %08x\n", nsres); - return E_FAIL; + nsres = nsIDOMElement_QueryInterface(elem->dom_element, &IID_nsIDOMSVGElement, (void**)&svg_element); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMSVGElement_GetStyle(svg_element, ret); + nsIDOMSVGElement_Release(svg_element); + if(NS_FAILED(nsres)) { + ERR("GetStyle failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } - return S_OK; + FIXME("Unsupported element type\n"); + return E_NOTIMPL; } void init_css_style(CSSStyle *style, nsIDOMCSSStyleDeclaration *nsstyle, style_qi_t qi, diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 560fcd1..09148aa 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1154,6 +1154,19 @@ interface nsIDOMHTMLElement : nsIDOMElement [ object, + uuid(c63517c5-8bab-4cd1-8694-bccafc32a195), + local +] +interface nsIDOMSVGElement : nsIDOMElement +{ + nsresult GetOwnerSVGElement(nsIDOMSVGElement **aOwnerSVGElement); + nsresult GetViewportElement(nsIDOMSVGElement **aViewportElement); + nsresult GetSVGClassName(nsISupports **aClassName); + nsresult GetStyle(nsIDOMCSSStyleDeclaration **aStyle); +} + +[ + object, uuid(59b80014-00f5-412d-846f-725494122d42), local ] diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 9645c0b..1df2b07 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -279,9 +279,11 @@ 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); + document.body.innerHTML = '<div>test</div><svg></svg>'; + var elem = document.body.firstChild; + var style = elem.style; + var current_style = elem.currentStyle; + var computed_style = window.getComputedStyle(elem); var val; style.cssFloat = "left"; @@ -350,7 +352,7 @@ function test_style_properties() { ok(computed_style.clip === "rect(1px, 1px, 10px, 10px)", "computed_style.clip = " + current_style.clip); - document.body.style.zIndex = 2; + 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); @@ -364,6 +366,12 @@ function test_style_properties() { ok(false, "expected exception"); }catch(e) {} + elem = elem.nextSibling; + computed_style = window.getComputedStyle(elem); + + elem.style.zIndex = 4; + ok(computed_style.zIndex === 4, "computed_style.zIndex = " + computed_style.zIndex); + next_test(); }

1 0