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

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard March 28, 2019

March 28, 2019

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

Józef Kucia : wined3d: Add adapter_check_format() to adapter_ops.
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: 2727dcb07f35ccce4096dbf0c1e119a5f99a7552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2727dcb07f35ccce4096dbf0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:53 2019 +0100 wined3d: Add adapter_check_format() to adapter_ops. 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 | 24 +++++++++++++++++++++ dlls/wined3d/directx.c | 47 +++++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 8 +++++++ 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 99073f4..a076a98 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4385,10 +4385,34 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s caps->MaxAnisotropy = gl_info->limits.anisotropy; } +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) +{ + unsigned int i; + + if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER) + return TRUE; + + for (i = 0; i < adapter->cfg_count; ++i) + { + const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; + + if (wined3d_check_pixel_format_color(cfg, rt_format) + && wined3d_check_pixel_format_depth(cfg, ds_format)) + { + return TRUE; + } + } + + return FALSE; +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { wined3d_adapter_gl_create_context, adapter_gl_get_wined3d_caps, + adapter_gl_check_format, }; static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c978122..8e77138 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1277,7 +1277,7 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U return WINED3D_OK; } -static BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, +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 */ @@ -1297,7 +1297,7 @@ static BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format * return TRUE; } -static BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, +BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { BOOL lockable = FALSE; @@ -1331,6 +1331,7 @@ 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) { + const struct wined3d_format *adapter_format; const struct wined3d_format *rt_format; const struct wined3d_format *ds_format; const struct wined3d_adapter *adapter; @@ -1344,6 +1345,8 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, return WINED3DERR_INVALIDCALL; adapter = wined3d->adapters[adapter_idx]; + + adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); rt_format = wined3d_get_format(adapter, render_target_format_id, WINED3D_BIND_RENDER_TARGET); ds_format = wined3d_get_format(adapter, depth_stencil_format_id, WINED3D_BIND_DEPTH_STENCIL); @@ -1358,33 +1361,17 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, return WINED3DERR_NOTAVAILABLE; } - if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) + if (adapter->adapter_ops->adapter_check_format(adapter, adapter_format, rt_format, ds_format)) { - const struct wined3d_pixel_format *cfgs; - unsigned int cfg_count; - unsigned int i; - - cfgs = adapter->cfgs; - cfg_count = adapter->cfg_count; - for (i = 0; i < cfg_count; ++i) - { - if (wined3d_check_pixel_format_color(&cfgs[i], rt_format) - && wined3d_check_pixel_format_depth(&cfgs[i], ds_format)) - { - TRACE("Formats match.\n"); - return WINED3D_OK; - } - } - - TRACE("Unsupported format pair: %s and %s.\n", - debug_d3dformat(render_target_format_id), - debug_d3dformat(depth_stencil_format_id)); - - return WINED3DERR_NOTAVAILABLE; + TRACE("Formats match.\n"); + return WINED3D_OK; } - TRACE("Formats match.\n"); - return WINED3D_OK; + TRACE("Unsupported format pair: %s and %s.\n", + debug_d3dformat(render_target_format_id), + debug_d3dformat(depth_stencil_format_id)); + + return WINED3DERR_NOTAVAILABLE; } HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3d, UINT adapter_idx, @@ -2336,10 +2323,18 @@ static void adapter_no3d_get_wined3d_caps(const struct wined3d_adapter *adapter, { } +static BOOL adapter_no3d_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) +{ + return TRUE; +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { wined3d_adapter_no3d_create_context, adapter_no3d_get_wined3d_caps, + adapter_no3d_check_format, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 22e7441..83fc09d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2680,6 +2680,9 @@ struct wined3d_adapter_ops BOOL (*adapter_create_context)(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format); void (*adapter_get_wined3d_caps)(const struct wined3d_adapter *adapter, struct wined3d_caps *caps); + BOOL (*adapter_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); }; /* The adapter structure */ @@ -4721,4 +4724,9 @@ 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: Cleanup wined3d_check_surface_capability().
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: 0b7407287d0262a537de47d0f155c359a717895a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7407287d0262a537de47d0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 28 09:53:51 2019 +0100 wined3d: Cleanup wined3d_check_surface_capability(). 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/directx.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c66ed9c..8c40526 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1506,23 +1506,15 @@ static BOOL wined3d_check_render_target_format(const struct wined3d_adapter *ada return TRUE; } -static BOOL wined3d_check_surface_capability(const struct wined3d_format *format) +static BOOL wined3d_check_surface_format(const struct wined3d_format *format) { if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] | format->flags[WINED3D_GL_RES_TYPE_RB]) & WINED3DFMT_FLAG_BLIT) - { - TRACE("[OK]\n"); return TRUE; - } if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE)) == (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE)) - { - TRACE("[OK]\n"); return TRUE; - } - /* Reject other formats */ - TRACE("[FAILED]\n"); return FALSE; } @@ -1591,9 +1583,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3D_BIND_DEPTH_STENCIL; if (!(bind_flags & WINED3D_BIND_SHADER_RESOURCE)) { - if (!wined3d_check_surface_capability(format)) + if (!wined3d_check_surface_format(format)) { - TRACE("[FAILED] - Not supported for plain surfaces.\n"); + TRACE("%s is not supported for plain surfaces.\n", debug_d3dformat(format->id)); return WINED3DERR_NOTAVAILABLE; }

1 0

Claudio Fontana : kernel32: Allow empty profile section and key name strings.
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: be678a52e163111085ab3694b6c1f3af8e4d4a4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=be678a52e163111085ab3694… Author: Claudio Fontana <claudio.fontana(a)linaro.org> Date: Fri Mar 22 23:49:28 2019 +0100 kernel32: Allow empty profile section and key name strings. Consider "" a normal section, and fix calculation for zero length section name string and key name string. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8036 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18099 Signed-off-by: Claudio Fontana <claudio.fontana(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 40 ++++++++++++++++------------------------ dlls/kernel32/tests/profile.c | 2 -- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 65a8f28..027693e 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -500,7 +500,7 @@ static BOOL PROFILE_DeleteSection( PROFILESECTION **section, LPCWSTR name ) { while (*section) { - if ((*section)->name[0] && !strcmpiW( (*section)->name, name )) + if (!strcmpiW( (*section)->name, name )) { PROFILESECTION *to_del = *section; *section = to_del->next; @@ -524,7 +524,7 @@ static BOOL PROFILE_DeleteKey( PROFILESECTION **section, { while (*section) { - if ((*section)->name[0] && !strcmpiW( (*section)->name, section_name )) + if (!strcmpiW( (*section)->name, section_name )) { PROFILEKEY **key = &(*section)->key; while (*key) @@ -556,7 +556,7 @@ static void PROFILE_DeleteAllKeys( LPCWSTR section_name) PROFILESECTION **section= &CurProfile->section; while (*section) { - if ((*section)->name[0] && !strcmpiW( (*section)->name, section_name )) + if (!strcmpiW( (*section)->name, section_name )) { PROFILEKEY **key = &(*section)->key; while (*key) @@ -582,31 +582,28 @@ static PROFILEKEY *PROFILE_Find( PROFILESECTION **section, LPCWSTR section_name, LPCWSTR key_name, BOOL create, BOOL create_always ) { LPCWSTR p; - int seclen, keylen; + int seclen = 0, keylen = 0; while (PROFILE_isspaceW(*section_name)) section_name++; if (*section_name) + { p = section_name + strlenW(section_name) - 1; - else - p = section_name; - - while ((p > section_name) && PROFILE_isspaceW(*p)) p--; - seclen = p - section_name + 1; + while ((p > section_name) && PROFILE_isspaceW(*p)) p--; + seclen = p - section_name + 1; + } while (PROFILE_isspaceW(*key_name)) key_name++; if (*key_name) + { p = key_name + strlenW(key_name) - 1; - else - p = key_name; - - while ((p > key_name) && PROFILE_isspaceW(*p)) p--; - keylen = p - key_name + 1; + while ((p > key_name) && PROFILE_isspaceW(*p)) p--; + keylen = p - key_name + 1; + } while (*section) { - if ( ((*section)->name[0]) - && (!(strncmpiW( (*section)->name, section_name, seclen ))) - && (((*section)->name)[seclen] == '\0') ) + if (!strncmpiW((*section)->name, section_name, seclen) && + ((*section)->name)[seclen] == '\0') { PROFILEKEY **key = &(*section)->key; @@ -873,7 +870,7 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, while (section) { - if (section->name[0] && !strcmpiW( section->name, section_name )) + if (!strcmpiW( section->name, section_name )) { UINT oldlen = len; for (key = section->key; key; key = key->next) @@ -988,11 +985,6 @@ static INT PROFILE_GetString( LPCWSTR section, LPCWSTR key_name, if (!def_val) def_val = empty_strW; if (key_name) { - if (!key_name[0]) - { - PROFILE_CopyEntry(buffer, def_val, len, TRUE); - return strlenW(buffer); - } key = PROFILE_Find( &CurProfile->section, section, key_name, FALSE, FALSE); PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len, TRUE ); @@ -1002,7 +994,7 @@ static INT PROFILE_GetString( LPCWSTR section, LPCWSTR key_name, return strlenW( buffer ); } /* no "else" here ! */ - if (section && section[0]) + if (section) { INT ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, FALSE); if (!buffer[0]) /* no luck -> def_val */ diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index c075e0a..8a0089b 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -153,9 +153,7 @@ static void test_profile_string(void) /* works only in unicode, ascii crashes */ ret=GetPrivateProfileStringW(sW, emptyW, emptyW, bufW, ARRAY_SIZE(bufW), TESTFILE2W); - todo_wine ok(ret == 10, "expected 10, got %u\n", ret); - todo_wine ok(!lstrcmpW(valnokeyW,bufW), "expected %s, got %s\n", wine_dbgstr_w(valnokeyW), wine_dbgstr_w(bufW) );

1 0

Isira Seneviratne : wineandroid.drv: Remove unnecessary 'extends Object' statement.
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: 31f2a182e6f08f2e01b6b35b497817b9bfdbe9e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f2a182e6f08f2e01b6b35b… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Thu Feb 21 15:05:04 2019 +0530 wineandroid.drv: Remove unnecessary 'extends Object' statement. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 14385c0..0562f88 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -326,7 +326,7 @@ public class WineActivity extends Activity private HashMap<Integer,WineWindow> win_map = new HashMap<Integer,WineWindow>(); - protected class WineWindow extends Object + protected class WineWindow { static protected final int HWND_MESSAGE = 0xfffffffd; static protected final int SWP_NOZORDER = 0x04;

1 0

Jacek Caban : mshtml: Support SVG element style.
by Alexandre Julliard March 28, 2019

March 28, 2019

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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard March 28, 2019

March 28, 2019

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: Move detach_document_node call to HTMLDocumentNode_unlink.
by Alexandre Julliard March 28, 2019

March 28, 2019

Module: wine Branch: master Commit: d9da6e642e1ba85e302eec659f08970ee88a881d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9da6e642e1ba85e302eec65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 15:56:36 2019 +0100 mshtml: Move detach_document_node call to HTMLDocumentNode_unlink. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 656acaf..5b14678 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4966,7 +4966,8 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) { HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); - detach_document_node(This); + TRACE("(%p)\n", This); + heap_free(This->event_vector); ConnectionPointContainer_Destroy(&This->basedoc.cp_container); } @@ -4994,6 +4995,7 @@ static void HTMLDocumentNode_unlink(HTMLDOMNode *iface) nsIDOMHTMLDocument *nsdoc = This->nsdoc; release_document_mutation(This); + detach_document_node(This); This->nsdoc = NULL; nsIDOMHTMLDocument_Release(nsdoc); This->window = NULL;

1 0

Jacek Caban : mshtml: Add IElementSelector::querySelector implementation.
by Alexandre Julliard March 28, 2019

March 28, 2019

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: Add IHTMLDocument7::createElementNS implementation.
by Alexandre Julliard March 28, 2019

March 28, 2019

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