wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Alexandre Julliard : wow64: Map the parent process handle in NtCreateUserProcess().
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: be6ccdf51c98a45b661b12548bda60f8daf572b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be6ccdf51c98a45b661b1254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:01 2021 +0100 wow64: Map the parent process handle in NtCreateUserProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/process.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index fbe501ed034..50562390860 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -213,6 +213,10 @@ static PS_ATTRIBUTE_LIST *ps_attributes_32to64( PS_ATTRIBUTE_LIST **attr, const LongToHandle( ((LONG *)ULongToPtr(attr32->Attributes[i].Value))[j] ); } break; + case PS_ATTRIBUTE_PARENT_PROCESS: + ret->Attributes[i].Size = sizeof(HANDLE); + ret->Attributes[i].ValuePtr = LongToHandle( attr32->Attributes[i].Value ); + break; case PS_ATTRIBUTE_CLIENT_ID: ret->Attributes[i].Size = sizeof(CLIENT_ID); ret->Attributes[i].ValuePtr = Wow64AllocateTemp( ret->Attributes[i].Size );

1 0

Huw Davies : winemac: Include missing dlfcn.h.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 3016a34f3e50f2f65a603e495b5b34ec08b9368c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3016a34f3e50f2f65a603e49… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 2 07:55:55 2021 +0000 winemac: Include missing dlfcn.h. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 3665e0023b7..ca70db7a689 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdio.h> +#include <dlfcn.h> #include "macdrv.h" #include "wine/debug.h"

1 0

Huw Davies : netapi32: Return the length in characters not bytes.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 8a02f6dd0af647c4c804f0bbb0e768d994072ce6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a02f6dd0af647c4c804f0bb… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 2 07:46:17 2021 +0000 netapi32: Return the length in characters not bytes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 23881b470d9..c6b389950f7 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -72,7 +72,7 @@ static DWORD netapi_wcstoumbs( const WCHAR *src, char *dst, DWORD dstlen ) static DWORD netapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen ) { - if (!dst) return (strlen( src ) + 1) * sizeof(WCHAR); + if (!dst) return strlen( src ) + 1; return ntdll_umbstowcs( src, strlen( src ) + 1, dst, dstlen ); }

1 0

Henri Verbeet : wined3d: Map OpenGL adapter BOs persistently on 64-bit architectures.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: 537e20e041bd3b36553e45fe83671a92fdfd7735 URL: https://source.winehq.org/git/wine.git/?a=commit;h=537e20e041bd3b36553e45fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 1 17:52:16 2021 -0600 wined3d: Map OpenGL adapter BOs persistently on 64-bit architectures. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index dcb4ab7a0af..6391f6788e9 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2705,10 +2705,22 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_ wined3d_context_gl_wait_command_fence(context_gl, bo->command_fence_id); map: + if (bo->b.map_ptr) + return (uint8_t *)bo->b.map_ptr; + gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + if (gl_info->supported[ARB_BUFFER_STORAGE]) + { + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, + GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | wined3d_resource_gl_map_flags(bo, flags))))) + { + if (wined3d_map_persistent()) + bo->b.map_ptr = map_ptr; + } + } + else if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); } @@ -2791,6 +2803,9 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, flush_bo_ranges(context_gl, wined3d_const_bo_address(data), range_count, ranges); + if (bo->b.map_ptr) + return; + gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); GL_EXTCALL(glUnmapBuffer(bo->binding)); @@ -2908,9 +2923,15 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei } if (gl_info->supported[ARB_BUFFER_STORAGE]) + { + if (flags & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) + flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; GL_EXTCALL(glBufferStorage(binding, size, NULL, flags | GL_DYNAMIC_STORAGE_BIT)); + } else + { GL_EXTCALL(glBufferData(binding, size, NULL, usage)); + } wined3d_context_gl_bind_bo(context_gl, binding, 0); checkGLcall("buffer object creation");

1 0

Brendan Shanks : server: Remove workarounds for Mac OS X 10.4.
by Alexandre Julliard 02 Dec '21

02 Dec '21

Module: wine Branch: master Commit: f6cefaa9e0aadfab38a92aef4827d4c2e6bffbf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6cefaa9e0aadfab38a92aef… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Dec 1 13:28:19 2021 -0800 server: Remove workarounds for Mac OS X 10.4. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mach.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/server/mach.c b/server/mach.c index 77f1fdcdb86..d31e4025776 100644 --- a/server/mach.c +++ b/server/mach.c @@ -193,22 +193,12 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int else #endif { -/* work around silly renaming of struct members in OS X 10.5 */ -#if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) context->debug.i386_regs.dr0 = state.uds.ds32.__dr0; context->debug.i386_regs.dr1 = state.uds.ds32.__dr1; context->debug.i386_regs.dr2 = state.uds.ds32.__dr2; context->debug.i386_regs.dr3 = state.uds.ds32.__dr3; context->debug.i386_regs.dr6 = state.uds.ds32.__dr6; context->debug.i386_regs.dr7 = state.uds.ds32.__dr7; -#else - context->debug.i386_regs.dr0 = state.uds.ds32.dr0; - context->debug.i386_regs.dr1 = state.uds.ds32.dr1; - context->debug.i386_regs.dr2 = state.uds.ds32.dr2; - context->debug.i386_regs.dr3 = state.uds.ds32.dr3; - context->debug.i386_regs.dr6 = state.uds.ds32.dr6; - context->debug.i386_regs.dr7 = state.uds.ds32.dr7; -#endif } context->flags |= SERVER_CTX_DEBUG_REGISTERS; } @@ -262,7 +252,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.dsh.flavor = x86_DEBUG_STATE32; state.dsh.count = sizeof(state.uds.ds32) / sizeof(int); -#if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) state.uds.ds32.__dr0 = context->debug.i386_regs.dr0; state.uds.ds32.__dr1 = context->debug.i386_regs.dr1; state.uds.ds32.__dr2 = context->debug.i386_regs.dr2; @@ -271,16 +260,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.uds.ds32.__dr5 = 0; state.uds.ds32.__dr6 = context->debug.i386_regs.dr6; state.uds.ds32.__dr7 = dr7; -#else - state.uds.ds32.dr0 = context->debug.i386_regs.dr0; - state.uds.ds32.dr1 = context->debug.i386_regs.dr1; - state.uds.ds32.dr2 = context->debug.i386_regs.dr2; - state.uds.ds32.dr3 = context->debug.i386_regs.dr3; - state.uds.ds32.dr4 = 0; - state.uds.ds32.dr5 = 0; - state.uds.ds32.dr6 = context->debug.i386_regs.dr6; - state.uds.ds32.dr7 = dr7; -#endif } thread_set_state( port, x86_DEBUG_STATE, (thread_state_t)&state, count ); mach_port_deallocate( mach_task_self(), port );

1 0

André Zwing : gameux/tests: Skip gamestatistic tests on win10 >= 1803.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 6282718c73bdf1648f18764c51671a57cef3c526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6282718c73bdf1648f18764c… Author: André Zwing <nerv(a)dawncrow.de> Date: Wed Dec 1 18:17:03 2021 +0100 gameux/tests: Skip gamestatistic tests on win10 >= 1803. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51716 Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gamestatistics.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index c29c6b44470..aa10156f1ab 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -158,6 +158,12 @@ static void test_gamestatisticsmgr( void ) /* this should fail, because statistics don't exist yet */ gs = (void *)0xdeadbeef; hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); + if (hr != HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + /* With win10 1803 game explorer functionality was removed and gameux became a stub */ + win_skip("gameux is partially stubbed, skipping tests\n"); + return; + } ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); ok(gs == NULL, "Expected output pointer to be NULL, got %s\n", (gs == (void *)0xdeadbeef ? "deadbeef" : "neither NULL nor deadbeef"));

1 0

Gabriel Ivăncescu : mshtml: Fix style attribute removal in IE8 mode.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: f807f74194a3d0ca01953418f16e2e24ad95db50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f807f74194a3d0ca01953418… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 1 15:41:53 2021 +0200 mshtml: Fix style attribute removal in IE8 mode. put_cssText implicitly sets the attribute, which must be removed since IE8 specially checks it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 3 +++ dlls/mshtml/tests/documentmode.js | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6d99e657ff8..a205728e280 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1277,6 +1277,9 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA if(FAILED(hres)) return hres; + if(compat_mode >= COMPAT_MODE_IE8) + element_remove_attribute(This, strAttributeName); + *pfSuccess = VARIANT_TRUE; return S_OK; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index cf3fdfa617e..256418679bb 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1257,7 +1257,6 @@ sync_test("elem_attr", function() { r = elem.style; ok(r === style, "removed elem.style = " + r); r = elem.getAttribute("style"); - todo_wine_if(v === 8). ok(r === (v < 8 ? style : null), "style attr after removal = " + r); elem.setAttribute("style", "opacity: 1.0"); r = elem.getAttribute("style");

1 0

Gabriel Ivăncescu : mshtml: Associate props with attributes for IE8 mode, but keep them stringified.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 6f37e50a1dd6fbfacbace83d08d9ef8a3dd7e3e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f37e50a1dd6fbfacbace83d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 1 15:41:52 2021 +0200 mshtml: Associate props with attributes for IE8 mode, but keep them stringified. For non-builtin props, getAttribute retrieves the stringified value of the prop. setAttribute also stringifies the value if it's a builtin only. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> 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/documentmode.js | 77 +++++++++++++++++++++++++++++------- 2 files changed, 129 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f37e50a1dd6fbfacbac…

1 0

Gabriel Ivăncescu : mshtml: Restructure element removeAttribute.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: d224a2a88127fe5bf6737cafd7af0eff40d1a6c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d224a2a88127fe5bf6737caf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 1 15:41:51 2021 +0200 mshtml: Restructure element removeAttribute. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 55 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 24301294144..bc2a28fe334 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1197,46 +1197,47 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA LONG lFlags, VARIANT_BOOL *pfSuccess) { HTMLElement *This = impl_from_IHTMLElement(iface); + compat_mode_t compat_mode = dispex_compat_mode(&This->node.event_target.dispex); DISPID id; HRESULT hres; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); - if(dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) { - *pfSuccess = element_has_attribute(This, strAttributeName); - if(*pfSuccess) - return element_remove_attribute(This, strAttributeName); - return S_OK; - } + if(compat_mode < COMPAT_MODE_IE8 || !This->dom_element) { + hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, + lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); + if(hres == DISP_E_UNKNOWNNAME) { + *pfSuccess = VARIANT_FALSE; + return S_OK; + } + if(FAILED(hres)) + return hres; - hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, - lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); - if(hres == DISP_E_UNKNOWNNAME) { - *pfSuccess = VARIANT_FALSE; - return S_OK; - } - if(FAILED(hres)) - return hres; + if(id == DISPID_IHTMLELEMENT_STYLE) { + IHTMLStyle *style; - if(id == DISPID_IHTMLELEMENT_STYLE) { - IHTMLStyle *style; + TRACE("Special case: style\n"); - TRACE("Special case: style\n"); + hres = IHTMLElement_get_style(&This->IHTMLElement_iface, &style); + if(FAILED(hres)) + return hres; - hres = IHTMLElement_get_style(&This->IHTMLElement_iface, &style); - if(FAILED(hres)) - return hres; + hres = IHTMLStyle_put_cssText(style, NULL); + IHTMLStyle_Release(style); + if(FAILED(hres)) + return hres; - hres = IHTMLStyle_put_cssText(style, NULL); - IHTMLStyle_Release(style); - if(FAILED(hres)) - return hres; + *pfSuccess = VARIANT_TRUE; + return S_OK; + } - *pfSuccess = VARIANT_TRUE; - return S_OK; + return remove_attribute(&This->node.event_target.dispex, id, pfSuccess); } - return remove_attribute(&This->node.event_target.dispex, id, pfSuccess); + *pfSuccess = element_has_attribute(This, strAttributeName); + if(*pfSuccess) + return element_remove_attribute(This, strAttributeName); + return S_OK; } static HRESULT WINAPI HTMLElement_put_className(IHTMLElement *iface, BSTR v)

1 0

Gabriel Ivăncescu : mshtml: Restructure element getAttribute.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 368199c640f275453389205edd6c7f9ac2d08839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=368199c640f275453389205e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 1 15:41:50 2021 +0200 mshtml: Restructure element getAttribute. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index aa532098717..24301294144 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1158,6 +1158,9 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr LONG lFlags, VARIANT *AttributeValue) { HTMLElement *This = impl_from_IHTMLElement(iface); + compat_mode_t compat_mode = dispex_compat_mode(&This->node.event_target.dispex); + nsAString name_str, value_str; + nsresult nsres; DISPID dispid; HRESULT hres; @@ -1166,33 +1169,28 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr if(lFlags & ~(ATTRFLAG_CASESENSITIVE|ATTRFLAG_ASSTRING)) FIXME("Unsupported flags %x\n", lFlags); - if(This->dom_element && dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) { - nsAString name_str, value_str; - nsresult nsres; - - nsAString_InitDepend(&name_str, strAttributeName); - nsAString_InitDepend(&value_str, NULL); - nsres = nsIDOMElement_GetAttribute(This->dom_element, &name_str, &value_str); - nsAString_Finish(&name_str); - return return_nsstr_variant(nsres, &value_str, 0, AttributeValue); - } + if(compat_mode < COMPAT_MODE_IE8 || !This->dom_element) { + hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, + lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); + if(FAILED(hres)) { + V_VT(AttributeValue) = VT_NULL; + return (hres == DISP_E_UNKNOWNNAME) ? S_OK : hres; + } - hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, - lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); - if(hres == DISP_E_UNKNOWNNAME) { - V_VT(AttributeValue) = VT_NULL; - return S_OK; - } + hres = get_elem_attr_value_by_dispid(This, dispid, AttributeValue); + if(FAILED(hres)) + return hres; - if(FAILED(hres)) { - V_VT(AttributeValue) = VT_NULL; + if(lFlags & ATTRFLAG_ASSTRING) + hres = attr_value_to_string(AttributeValue); return hres; } - hres = get_elem_attr_value_by_dispid(This, dispid, AttributeValue); - if(SUCCEEDED(hres) && (lFlags & ATTRFLAG_ASSTRING)) - hres = attr_value_to_string(AttributeValue); - return hres; + nsAString_InitDepend(&name_str, strAttributeName); + nsAString_InitDepend(&value_str, NULL); + nsres = nsIDOMElement_GetAttribute(This->dom_element, &name_str, &value_str); + nsAString_Finish(&name_str); + return return_nsstr_variant(nsres, &value_str, 0, AttributeValue); } static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strAttributeName,

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
57
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 December 2021