wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Isira Seneviratne : winmm: Correct phrasing of some resource strings.
by Alexandre Julliard 26 Mar '19

26 Mar '19

1 0

Józef Kucia : wined3d: Pass context to vp_free() and free_private().
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 6cc36f7296836a8c8da46441edb252a1a5672de4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cc36f7296836a8c8da46441… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 26 18:29:46 2019 +0100 wined3d: Pass context to vp_free() and free_private(). Avoid using "adapter->gl_info". 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/arb_program_shader.c | 20 ++++++++++-------- dlls/wined3d/ati_fragment_shader.c | 10 +++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 40 +++++++++++++++++++----------------- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader.c | 8 ++++---- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_private.h | 6 +++--- 8 files changed, 50 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cc36f7296836a8c8da4…

1 0

Józef Kucia : wined3d: Get rid of special case for shadow textures from wined3d_check_device_format ().
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 0500b3e38fbfde28cb35267e59775559e3b345df URL: https://source.winehq.org/git/wine.git/?a=commit;h=0500b3e38fbfde28cb35267e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 26 18:29:45 2019 +0100 wined3d: Get rid of special case for shadow textures from wined3d_check_device_format(). 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 | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6fb26d2..45e2871 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1626,13 +1626,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad allowed_bind_flags &= ~WINED3D_BIND_DEPTH_STENCIL; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_CUBE; } - else if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SHADOW) - && !adapter->gl_info.supported[ARB_SHADOW]) - { - TRACE("[FAILED] - No shadow sampler support.\n"); - return WINED3DERR_NOTAVAILABLE; - } break; case WINED3D_RTYPE_TEXTURE_3D:

1 0

Józef Kucia : wined3d: Unset WINED3DFMT_FLAG_TEXTURE for unsupported shadow textures.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 35d6f4c7f0d1cbc0608c7bca834dd79805799dce URL: https://source.winehq.org/git/wine.git/?a=commit;h=35d6f4c7f0d1cbc0608c7bca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 26 18:29:44 2019 +0100 wined3d: Unset WINED3DFMT_FLAG_TEXTURE for unsupported shadow textures. 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/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a800527..872b0f7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3197,6 +3197,9 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } + if (!gl_info->supported[ARB_SHADOW] && (format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SHADOW)) + format_clear_flag(&format->f, WINED3DFMT_FLAG_TEXTURE); + query_internal_format(adapter, format, &format_texture_info[i], gl_info, srgb_write, FALSE); /* Texture conversion stuff */

1 0

Józef Kucia : include/d3d12: Get rid of duplicated prototype.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: fdfbed3ff3f478b4223643f4be5c6f86a6071952 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdfbed3ff3f478b4223643f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 26 18:29:43 2019 +0100 include/d3d12: Get rid of duplicated prototype. Spotted by Stefan Dösinger. 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> --- include/d3d12.idl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/d3d12.idl b/include/d3d12.idl index 3a5a914..307a4fd 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2171,10 +2171,6 @@ interface ID3D12RootSignatureDeserializer : IUnknown const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *root_signature_desc, ID3DBlob **blob, ID3DBlob **error_blob); -[local] HRESULT __stdcall D3D12SerializeVersionedRootSignature( - const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, - ID3DBlob **blob, ID3DBlob **error_blob); - typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device);

1 0

Piotr Caban : msvcp90: Add support for more creation flags in _Mtx class.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 8a82912b28aa0c0c3ac4fc309fa8079e4415111d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a82912b28aa0c0c3ac4fc30… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 18:12:13 2019 +0100 msvcp90: Add support for more creation flags in _Mtx class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46908 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 13 +++++++++---- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index c1c7002..a35d1f6 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -323,6 +323,10 @@ typedef struct void *tail; } critical_section; +#define MTX_PLAIN 0x1 +#define MTX_TRY 0x2 +#define MTX_TIMED 0x4 +#define MTX_RECURSIVE 0x100 typedef struct { DWORD flags; @@ -335,6 +339,7 @@ static int (__cdecl *p__Mtx_init)(_Mtx_t*, int); static void (__cdecl *p__Mtx_destroy)(_Mtx_t*); static int (__cdecl *p__Mtx_lock)(_Mtx_t*); static int (__cdecl *p__Mtx_unlock)(_Mtx_t*); +static int (__cdecl *p__Mtx_trylock)(_Mtx_t*); /* cnd */ typedef void *_Cnd_t; @@ -801,6 +806,8 @@ static BOOL init(void) "_Mtx_lock"); SET(p__Mtx_unlock, "_Mtx_unlock"); + SET(p__Mtx_trylock, + "_Mtx_trylock"); SET(p__Cnd_init, "_Cnd_init"); @@ -2438,6 +2445,42 @@ static void test__Pad(void) CloseHandle(_Pad__Launch_returned); } +static void test__Mtx(void) +{ +# + static int flags[] = + { + 0, MTX_PLAIN, MTX_TRY, MTX_TIMED, MTX_RECURSIVE, + MTX_PLAIN|MTX_TRY, MTX_PLAIN|MTX_RECURSIVE, MTX_PLAIN|0xbeef + }; + _Mtx_t mtx; + int i, r, expect; + + for (i=0; i<ARRAY_SIZE(flags); i++) + { + if (flags[i] == MTX_PLAIN || flags[i] & MTX_RECURSIVE) + expect = 0; + else + expect = 3; + + r = p__Mtx_init(&mtx, flags[i]); + ok(!r, "failed to init mtx (flags %x)\n", flags[i]); + + r = p__Mtx_trylock(&mtx); + ok(!r, "_Mtx_trylock returned %x (flags %x)\n", r, flags[i]); + r = p__Mtx_trylock(&mtx); + ok(r == expect, "_Mtx_trylock returned %x (flags %x)\n", r, flags[i]); + if(!r) p__Mtx_unlock(&mtx); + + r = p__Mtx_lock(&mtx); + ok(r == expect, "_Mtx_lock returned %x (flags %x)\n", r, flags[i]); + if(!r) p__Mtx_unlock(&mtx); + + p__Mtx_unlock(&mtx); + p__Mtx_destroy(&mtx); + } +} + static void test_threads__Mtx(void) { void *mtx = NULL; @@ -3341,6 +3384,7 @@ START_TEST(msvcp120) test_thrd(); test_cnd(); test__Pad(); + test__Mtx(); test_threads__Mtx(); test_vector_base_v4__Segment_index_of(); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 0e81b8d..dac6a96 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -681,7 +681,10 @@ __ASM_GLOBAL_FUNC(call_thiscall_func, #endif /* __i386__ */ -#define MTX_MULTI_LOCK 0x100 +#define MTX_PLAIN 0x1 +#define MTX_TRY 0x2 +#define MTX_TIMED 0x4 +#define MTX_RECURSIVE 0x100 #define MTX_LOCKED 3 typedef struct { @@ -703,7 +706,7 @@ typedef _Mtx_t *_Mtx_arg_t; void __cdecl _Mtx_init_in_situ(_Mtx_t mtx, int flags) { - if(flags & ~MTX_MULTI_LOCK) + if(flags & ~(MTX_PLAIN | MTX_TRY | MTX_TIMED | MTX_RECURSIVE)) FIXME("unknown flags ignored: %x\n", flags); mtx->flags = flags; @@ -740,7 +743,8 @@ int __cdecl _Mtx_lock(_Mtx_arg_t mtx) if(MTX_T_FROM_ARG(mtx)->thread_id != GetCurrentThreadId()) { call_func1(critical_section_lock, &MTX_T_FROM_ARG(mtx)->cs); MTX_T_FROM_ARG(mtx)->thread_id = GetCurrentThreadId(); - }else if(!(MTX_T_FROM_ARG(mtx)->flags & MTX_MULTI_LOCK)) { + }else if(!(MTX_T_FROM_ARG(mtx)->flags & MTX_RECURSIVE) + && MTX_T_FROM_ARG(mtx)->flags != MTX_PLAIN) { return MTX_LOCKED; } @@ -764,7 +768,8 @@ int __cdecl _Mtx_trylock(_Mtx_arg_t mtx) if(!call_func1(critical_section_trylock, &MTX_T_FROM_ARG(mtx)->cs)) return MTX_LOCKED; MTX_T_FROM_ARG(mtx)->thread_id = GetCurrentThreadId(); - }else if(!(MTX_T_FROM_ARG(mtx)->flags & MTX_MULTI_LOCK)) { + }else if(!(MTX_T_FROM_ARG(mtx)->flags & MTX_RECURSIVE) + && MTX_T_FROM_ARG(mtx)->flags != MTX_PLAIN) { return MTX_LOCKED; }

1 0

Jacek Caban : mshtml: Propagate nsIDOMCSSStyleDeclaration errors.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 9944c4bd688b40c3c856d37517c2587996157cd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9944c4bd688b40c3c856d375… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:27:32 2019 +0100 mshtml: Propagate nsIDOMCSSStyleDeclaration errors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 31 +++++++++++-------------------- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/nsembed.c | 4 +++- dlls/mshtml/tests/dom.c | 36 +++++++++++++++++++++++++++++++++--- 4 files changed, 49 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 584ac59..7f99c89 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -921,16 +921,13 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ nsAString_InitDepend(&str_name, style_tbl[sid].name); nsAString_InitDepend(&str_value, value); nsAString_InitDepend(&str_empty, emptyW); - nsres = nsIDOMCSSStyleDeclaration_SetProperty(nsstyle, &str_name, &str_value, &str_empty); - if(NS_FAILED(nsres)) - ERR("SetProperty failed: %08x\n", nsres); - nsAString_Finish(&str_name); nsAString_Finish(&str_value); nsAString_Finish(&str_empty); - - return S_OK; + if(NS_FAILED(nsres)) + WARN("SetProperty failed: %08x\n", nsres); + return map_nsresult(nsres); } static HRESULT var_to_styleval(CSSStyle *style, const VARIANT *v, const style_tbl_entry_t *entry, WCHAR *buf, const WCHAR **ret) @@ -1023,12 +1020,9 @@ static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, stylei nsAString_InitDepend(&str_name, style_tbl[sid].name); nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(nsstyle, &str_name, value); nsAString_Finish(&str_name); - if(NS_FAILED(nsres)) { - ERR("SetProperty failed: %08x\n", nsres); - return E_FAIL; - } - - return S_OK; + if(NS_FAILED(nsres)) + WARN("GetPropertyValue failed: %08x\n", nsres); + return map_nsresult(nsres); } static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) @@ -3179,11 +3173,11 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri nsAString_GetData(&ret_str, &ret); *pfSuccess = variant_bool(*ret); }else { - ERR("RemoveProperty failed: %08x\n", nsres); + WARN("RemoveProperty failed: %08x\n", nsres); } nsAString_Finish(&name_str); nsAString_Finish(&ret_str); - return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; + return map_nsresult(nsres); } static HRESULT WINAPI HTMLStyle_toString(IHTMLStyle *iface, BSTR *String) @@ -5063,12 +5057,9 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclarati nsAString_Finish(&name_str); nsAString_Finish(&value_str); nsAString_Finish(&priority_str); - if(NS_FAILED(nsres)) { - FIXME("SetProperty failed: %08x\n", nsres); - return E_FAIL; - } - - return S_OK; + if(NS_FAILED(nsres)) + WARN("SetProperty failed: %08x\n", nsres); + return map_nsresult(nsres); } static HRESULT WINAPI HTMLCSSStyleDeclaration_item(IHTMLCSSStyleDeclaration *iface, LONG index, BSTR *pbstrPropertyName) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 14cc561..a2b05e7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -56,6 +56,7 @@ #define NS_ERROR_NOT_AVAILABLE ((nsresult)0x80040111L) #define NS_ERROR_INVALID_ARG ((nsresult)0x80070057L) #define NS_ERROR_UNEXPECTED ((nsresult)0x8000ffffL) +#define NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR ((nsresult)0x80530007) #define NS_ERROR_MODULE_NETWORK 6 @@ -958,6 +959,7 @@ void nsAString_InitDepend(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; +HRESULT map_nsresult(nsresult) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) DECLSPEC_HIDDEN; HRESULT return_nsform(nsresult,nsIDOMHTMLFormElement*,IHTMLFormElement**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index cebed37..6aa2812 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -848,7 +848,7 @@ void nsAString_Finish(nsAString *str) NS_StringContainerFinish(str); } -static HRESULT map_nsresult(nsresult nsres) +HRESULT map_nsresult(nsresult nsres) { switch(nsres) { case NS_OK: @@ -865,6 +865,8 @@ static HRESULT map_nsresult(nsresult nsres) return E_INVALIDARG; case NS_ERROR_UNEXPECTED: return E_UNEXPECTED; + case NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR: + return 0x80700007; /* according to tests */ } return E_FAIL; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8c7548a..bf23163 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6750,6 +6750,27 @@ static void test_xmlhttprequest(IHTMLWindow5 *window) VariantClear(&var); } +static void test_read_only_style(IHTMLCSSStyleDeclaration *style) +{ + BSTR none = a2bstr("none"), display = a2bstr("display"), str; + VARIANT v; + HRESULT hres; + + hres = IHTMLCSSStyleDeclaration_put_display(style, none); + ok(hres == 0x80700007, "put_display failed: %08x\n", hres); + + hres = IHTMLCSSStyleDeclaration_removeProperty(style, display, &str); + ok(hres == 0x80700007, "removeProperty failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = none; + hres = IHTMLCSSStyleDeclaration_setProperty(style, display, &v, NULL); + ok(hres == 0x80700007, "setProperty returned: %08x\n", hres); + + SysFreeString(none); + SysFreeString(display); +} + static void test_window(IHTMLDocument2 *doc) { IHTMLWindow2 *window, *window2, *self, *parent; @@ -7099,10 +7120,19 @@ static void test_defaults(IHTMLDocument2 *doc) test_ifaces((IUnknown*)cstyle, cstyle_iids); hres = IHTMLCurrentStyle_QueryInterface(cstyle, &IID_IHTMLCurrentStyle4, (void**)&unk); - if(SUCCEEDED(hres)) + if(SUCCEEDED(hres)) { + IHTMLCSSStyleDeclaration *css_style; + + hres = IHTMLCurrentStyle_QueryInterface(cstyle, &IID_IHTMLCSSStyleDeclaration, (void**)&css_style); + if(SUCCEEDED(hres)) { + test_read_only_style(css_style); + IHTMLCSSStyleDeclaration_Release(css_style); + }else { + win_skip("IHTMLCSSStyleDeclaration not supported\n"); + } + IUnknown_Release(unk); - else - { + }else { /*IE6 doesn't have interface */ win_skip("IID_IHTMLCurrentStyle4 not supported\n"); }

1 0

Jacek Caban : mshtml: Introduce map_nsresult and use it in return_nsstr.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 78a05ca6dd746325de4a17b4fbe892b9ff50a373 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78a05ca6dd746325de4a17b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:27:22 2019 +0100 mshtml: Introduce map_nsresult and use it in return_nsstr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 33d251d..cebed37 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -848,14 +848,35 @@ void nsAString_Finish(nsAString *str) NS_StringContainerFinish(str); } +static HRESULT map_nsresult(nsresult nsres) +{ + switch(nsres) { + case NS_OK: + return S_OK; + case NS_ERROR_OUT_OF_MEMORY: + return E_OUTOFMEMORY; + case NS_ERROR_NOT_IMPLEMENTED: + return E_NOTIMPL; + case NS_NOINTERFACE: + return E_NOINTERFACE; + case NS_ERROR_INVALID_POINTER: + return E_POINTER; + case NS_ERROR_INVALID_ARG: + return E_INVALIDARG; + case NS_ERROR_UNEXPECTED: + return E_UNEXPECTED; + } + return E_FAIL; +} + HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) { const PRUnichar *str; if(NS_FAILED(nsres)) { - ERR("failed: %08x\n", nsres); + WARN("failed: %08x\n", nsres); nsAString_Finish(nsstr); - return E_FAIL; + return map_nsresult(nsres); } nsAString_GetData(nsstr, &str);

1 0

Jacek Caban : mshtml: Expose IHTMLCSSStyleDeclaration to scripts from current style object.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 2cd8ff37510e3326d9665ac5f3510c6782afcfb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cd8ff37510e3326d9665ac5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:27:16 2019 +0100 mshtml: Expose IHTMLCSSStyleDeclaration to scripts from current style object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 5 +++-- dlls/mshtml/htmlstyle.c | 12 ++++++------ dlls/mshtml/htmlstyle.h | 3 +++ dlls/mshtml/tests/documentmode.js | 15 +++++++++++++++ dlls/mshtml/tests/elements.js | 6 ++++++ 5 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 63e8a25..85ac99a 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1301,9 +1301,10 @@ static const tid_t HTMLCurrentStyle_iface_tids[] = { 0 }; static dispex_static_data_t HTMLCurrentStyle_dispex = { - NULL, + &CSSStyle_dispex_vtbl, DispHTMLCurrentStyle_tid, - HTMLCurrentStyle_iface_tids + HTMLCurrentStyle_iface_tids, + CSSStyle_init_dispex_info }; HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f885cec..584ac59 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -10128,7 +10128,7 @@ static const IHTMLCSSStyleDeclaration2Vtbl HTMLCSSStyleDeclaration2Vtbl = { HTMLCSSStyleDeclaration2_get_animationFillMode }; -static HRESULT HTMLStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) +static HRESULT CSSStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) { const style_tbl_entry_t *style_entry; @@ -10146,15 +10146,15 @@ static HRESULT HTMLStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, return DISP_E_UNKNOWNNAME; } -static void HTMLStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { if(mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLCSSStyleDeclaration_tid, NULL); } -static const dispex_static_data_vtbl_t HTMLStyle_dispex_vtbl = { +const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl = { NULL, - HTMLStyle_get_dispid, + CSSStyle_get_dispid, NULL, NULL }; @@ -10169,10 +10169,10 @@ static const tid_t HTMLStyle_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyle_dispex = { - &HTMLStyle_dispex_vtbl, + &CSSStyle_dispex_vtbl, DispHTMLStyle_tid, HTMLStyle_iface_tids, - HTMLStyle_init_dispex_info + CSSStyle_init_dispex_info }; static HRESULT get_style_from_elem(HTMLElement *elem, nsIDOMCSSStyleDeclaration **ret) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index bb92a00..2c4b76b 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -140,6 +140,9 @@ HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; void init_css_style(CSSStyle*,nsIDOMCSSStyleDeclaration*,style_qi_t, dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; +void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) DECLSPEC_HIDDEN; +const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl DECLSPEC_HIDDEN; + HRESULT get_style_property(CSSStyle*,styleid_t,BSTR*) DECLSPEC_HIDDEN; HRESULT get_style_property_var(CSSStyle*,styleid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 1cbf13e..63dad76 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -98,6 +98,8 @@ function test_window_props() { var v = document.documentMode; test_exposed("postMessage", true); + test_exposed("sessionStorage", true); + test_exposed("localStorage", true); test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); @@ -152,6 +154,19 @@ function test_style_props() { test_exposed("removeProperty", v >= 9); test_exposed("background-clip", v >= 9); + style = document.body.currentStyle; + + test_exposed("zIndex", true); + test_exposed("z-index", true); + test_exposed("filter", 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 188a277..47a8dcc 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -234,6 +234,7 @@ function test_document_owner() { function test_style_properties() { var style = document.body.style; + var current_style = document.body.currentStyle; var val; style.cssFloat = "left"; @@ -295,6 +296,11 @@ function test_style_properties() { style.setProperty("border-width", "8px", undefined); ok(style.borderWidth === "7px", "style.borderWidth = " + style.borderWidth); + style.clip = "rect(1px 1px 10px 10px)"; + 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); + next_test(); }

1 0

Jacek Caban : mshtml: Use interface agnostic form of dispids for compat_dispid.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 9d35d09e894ed515a643c14af46a9714c00f4e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d35d09e894ed515a643c14a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:27:10 2019 +0100 mshtml: Use interface agnostic form of dispids for compat_dispid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 174 ++++++++++++++++++++++++------------------------ 1 file changed, 87 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d35d09e894ed515a643…

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
110
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019