wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Henri Verbeet : wined3d: Use the texture dimension helpers in wined3d_device_update_texture_3d().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 2f0a12149e1cb32fff655ba8b2dd85ebca40ffb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0a12149e1cb32fff655ba8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 21:30:18 2016 +0200 wined3d: Use the texture dimension helpers in wined3d_device_update_texture_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 395bbee..debb1d5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3547,9 +3547,9 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - if (src_texture->sub_resources[src_level].resource->width != dst_texture->resource.width - || src_texture->sub_resources[src_level].resource->height != dst_texture->resource.height - || src_texture->sub_resources[src_level].resource->depth != dst_texture->resource.depth) + if (wined3d_texture_get_level_width(src_texture, src_level) != dst_texture->resource.width + || wined3d_texture_get_level_height(src_texture, src_level) != dst_texture->resource.height + || wined3d_texture_get_level_depth(src_texture, src_level) != dst_texture->resource.depth) { WARN("Source and destination dimensions do not match.\n"); return WINED3DERR_INVALIDCALL;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in prepare_ds_clear().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 8ade2418ef467552436700afeda7511d1257107b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ade2418ef467552436700afe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 21:30:17 2016 +0200 wined3d: Use the texture dimension helpers in prepare_ds_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 033bb58..395bbee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -241,7 +241,9 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context { /* Depth buffer was discarded, make it entirely current in its new location since * there is no other place where we would get data anyway. */ - SetRect(out_rect, 0, 0, ds->resource.width, ds->resource.height); + SetRect(out_rect, 0, 0, + wined3d_texture_get_level_width(ds->container, ds->texture_level), + wined3d_texture_get_level_height(ds->container, ds->texture_level)); return; }

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in is_full_clear().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: ca26689b6e5fe3ccd720a84e0991ebd13c859946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca26689b6e5fe3ccd720a84e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 21:30:16 2016 +0200 wined3d: Use the texture dimension helpers in is_full_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a9b9f0d..033bb58 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -216,16 +216,16 @@ void device_switch_onscreen_ds(struct wined3d_device *device, static BOOL is_full_clear(const struct wined3d_surface *target, const RECT *draw_rect, const RECT *clear_rect) { + unsigned int height = wined3d_texture_get_level_height(target->container, target->texture_level); + unsigned int width = wined3d_texture_get_level_width(target->container, target->texture_level); + /* partial draw rect */ - if (draw_rect->left || draw_rect->top - || draw_rect->right < target->resource.width - || draw_rect->bottom < target->resource.height) + if (draw_rect->left || draw_rect->top || draw_rect->right < width || draw_rect->bottom < height) return FALSE; /* partial clear rect */ if (clear_rect && (clear_rect->left > 0 || clear_rect->top > 0 - || clear_rect->right < target->resource.width - || clear_rect->bottom < target->resource.height)) + || clear_rect->right < width || clear_rect->bottom < height)) return FALSE; return TRUE;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in context_find_fbo_entry().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 1c5d544380ab3687649ef703c0b91acc803352fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5d544380ab3687649ef703c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 21:30:15 2016 +0200 wined3d: Use the texture dimension helpers in context_find_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 124f9d9..169f460 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -480,8 +480,10 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, if (depth_stencil && render_targets[0]) { - if (depth_stencil->resource.width < render_targets[0]->resource.width || - depth_stencil->resource.height < render_targets[0]->resource.height) + if (wined3d_texture_get_level_width(depth_stencil->container, depth_stencil->texture_level) + < wined3d_texture_get_level_width(render_targets[0]->container, render_targets[0]->texture_level) + || wined3d_texture_get_level_height(depth_stencil->container, depth_stencil->texture_level) + < wined3d_texture_get_level_height(render_targets[0]->container, render_targets[0]->texture_level)) { WARN("Depth stencil is smaller than the primary color buffer, disabling\n"); depth_stencil = NULL;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in arbfp_blit_surface().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: a54c438e0d947c983f2d64bc2ad98e7d747a5bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54c438e0d947c983f2d64bc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 21:30:14 2016 +0200 wined3d: Use the texture dimension helpers in arbfp_blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d2c1d3d..d56123f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7903,8 +7903,8 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ * rectangle instead. */ surface_load_fb_texture(src_surface, FALSE, context); - src_rect.top = src_surface->resource.height - src_rect.top; - src_rect.bottom = src_surface->resource.height - src_rect.bottom; + src_rect.top = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - src_rect.top; + src_rect.bottom = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - src_rect.bottom; } else wined3d_texture_load(src_texture, context, FALSE);

1 0

Vincent Povirk : mscoree: Enable crash chaining in Mono.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: ccac8a455b6a3eb95cc637b3d30f320dab491249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccac8a455b6a3eb95cc637b3d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 30 12:17:34 2016 -0500 mscoree: Enable crash chaining in Mono. This allows winedbg to handle crashes and print native stack traces, after Mono has attempted to print a managed stack trace. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index ca6914e..252740d 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -100,6 +100,7 @@ MonoType* (CDECL *mono_reflection_type_from_name)(char *name, MonoImage *image); MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc); void (CDECL *mono_runtime_object_init)(MonoObject *this_obj); void (CDECL *mono_runtime_quit)(void); +static void (CDECL *mono_set_crash_chaining)(BOOL chain_signals); static void (CDECL *mono_set_dirs)(const char *assembly_dir, const char *config_dir); static void (CDECL *mono_set_verbose_level)(DWORD level); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); @@ -126,6 +127,10 @@ static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, return mono_image_open(fname, status); } +static void CDECL set_crash_chaining_dummy(BOOL crash_chaining) +{ +} + static void CDECL set_print_handler_dummy(MonoPrintCallback callback) { } @@ -217,6 +222,7 @@ static HRESULT load_mono(LPCWSTR mono_path) } while (0); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); + LOAD_OPT_MONO_FUNCTION(mono_set_crash_chaining, set_crash_chaining_dummy); LOAD_OPT_MONO_FUNCTION(mono_trace_set_print_handler, set_print_handler_dummy); LOAD_OPT_MONO_FUNCTION(mono_trace_set_printerr_handler, set_print_handler_dummy); @@ -224,6 +230,8 @@ static HRESULT load_mono(LPCWSTR mono_path) mono_profiler_install(NULL, mono_shutdown_callback_fn); + mono_set_crash_chaining(TRUE); + mono_trace_set_print_handler(mono_print_handler_fn); mono_trace_set_printerr_handler(mono_print_handler_fn);

1 0

Austin English : sfc: Document ordinal only exports.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: f34fd257c6c83804075914ee2b82cc42eadc683f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34fd257c6c83804075914ee2… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 28 02:54:12 2016 -0500 sfc: Document ordinal only exports. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc/sfc.spec | 21 ++++++++++++--------- dlls/sfc/sfc_main.c | 6 ------ dlls/sfc_os/sfc_os.c | 6 ++++++ dlls/sfc_os/sfc_os.spec | 15 +++++++++++++++ 4 files changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec index bdd66db..148f3db 100644 --- a/dlls/sfc/sfc.spec +++ b/dlls/sfc/sfc.spec @@ -1,12 +1,15 @@ -1 stub @ -2 stub @ -3 stdcall @(long) SFC_3 -4 stub @ -5 stub @ -6 stub @ -7 stub @ -8 stub @ -9 stub @ +1 stub @ # sfc_os.SfcInitProt +2 stub @ # sfc_os.SfcTerminateWatcherThread +3 stdcall @(long) sfc_os.SfcConnectToServer +4 stub @ # sfc_os.SfcClose +5 stub @ # sfc_os.SfcFileException +6 stub @ # sfc_os.SfcInitiateScan +7 stub @ # sfc_os.SfcInstallProtectedFiles +8 stub @ # sfc_os.SfpInstallCatalog +9 stub @ # SfpDeleteCatalog +@ stub SRSetRestorePoint +@ stub SRSetRestorePointA +@ stub SRSetRestorePointW @ stdcall SfcGetNextProtectedFile(long ptr) sfc_os.SfcGetNextProtectedFile @ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected @ stdcall SfcIsKeyProtected(long wstr long) sfc_os.SfcIsKeyProtected diff --git a/dlls/sfc/sfc_main.c b/dlls/sfc/sfc_main.c index c715867..58957c8 100644 --- a/dlls/sfc/sfc_main.c +++ b/dlls/sfc/sfc_main.c @@ -52,9 +52,3 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } - -DWORD WINAPI SFC_3(DWORD unknown) -{ - FIXME("%x\n", unknown); - return 0; -} diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index 9df38f8..9e45762 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -132,3 +132,9 @@ BOOL WINAPI SfcIsKeyProtected(HKEY hKey, LPCWSTR lpSubKey, REGSAM samDesired) SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } + +DWORD WINAPI SfcConnectToServer(DWORD unknown) +{ + FIXME("%x\n", unknown); + return 0; +} diff --git a/dlls/sfc_os/sfc_os.spec b/dlls/sfc_os/sfc_os.spec index 6b216e0..4c7405d 100644 --- a/dlls/sfc_os/sfc_os.spec +++ b/dlls/sfc_os/sfc_os.spec @@ -1,3 +1,18 @@ +@ stub BeginFileMapEnumeration +@ stub CloseFileMapEnumeration +@ stub GetNextFileMapContent +@ stub SRSetRestorePointA +@ stub SRSetRestorePointW +@ stub SfcClose +@ stdcall SfcConnectToServer(long) +@ stub SfcFileException @ stdcall SfcGetNextProtectedFile(long ptr) +@ stub SfcInitProt +@ stub SfcInitiateScan +@ stub SfcInstallProtectedFiles @ stdcall SfcIsFileProtected(ptr wstr) @ stdcall SfcIsKeyProtected(long wstr long) +@ stub SfcTerminateWatcherThread +@ stub SfpDeleteCatalog +@ stub SfpInstallCatalog +@ stub SfpVerifyFile

1 0

Austin English : oleaut32: Add OleLoadPictureFile stub.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 5989664e0f23327fe788c3b44991e70b29e07619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5989664e0f23327fe788c3b44… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 22 14:06:45 2016 -0500 oleaut32: Add OleLoadPictureFile stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut32.spec | 2 +- dlls/oleaut32/olepicture.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index f5ad0ef..97aec54 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -390,7 +390,7 @@ 419 stdcall OleCreatePictureIndirect(ptr ptr long ptr) 420 stdcall OleCreateFontIndirect(ptr ptr ptr) 421 stdcall OleTranslateColor(long long long) -422 stub OleLoadPictureFile +422 stdcall OleLoadPictureFile(int128 ptr) 423 stdcall OleSavePictureFile(ptr wstr) 424 stdcall OleLoadPicturePath(wstr ptr long long ptr ptr) 425 stdcall VarUI4FromI8(int64 ptr) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 44157de..b67563d 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2316,6 +2316,15 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, } /*********************************************************************** + * OleLoadPictureFile (OLEAUT32.422) + */ +HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture) +{ + FIXME("(%s %p): stub\n", wine_dbgstr_variant(&file), picture); + return E_NOTIMPL; +} + +/*********************************************************************** * OleSavePictureFile (OLEAUT32.423) */ HRESULT WINAPI OleSavePictureFile(IDispatch *picture, BSTR filename)

1 0

Jacek Caban : mshtml: Added IHTMLElement4:: setAttributeNode implementation.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 17fcc112ade167e602dc46981e8239b3ce576b51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17fcc112ade167e602dc46981… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 30 14:39:57 2016 +0200 mshtml: Added IHTMLElement4::setAttributeNode implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 5 +++ dlls/mshtml/htmlelem.c | 96 ++++++++++++++++++++++++++++++++++++-------- dlls/mshtml/mshtml_private.h | 7 +++- dlls/mshtml/tests/dom.c | 55 ++++++++++++++++++++++++- 4 files changed, 143 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 7a11245..e994eec 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -491,6 +491,11 @@ static dispex_static_data_t HTMLDOMAttribute_dispex = { HTMLDOMAttribute_iface_tids }; +HTMLDOMAttribute *unsafe_impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *iface) +{ + return iface->lpVtbl == &HTMLDOMAttributeVtbl ? impl_from_IHTMLDOMAttribute(iface) : NULL; +} + HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) { HTMLAttributeCollection *col; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index c7090e6..0329f1b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -612,14 +612,27 @@ static HRESULT WINAPI HTMLElement_Invoke(IHTMLElement *iface, DISPID dispIdMembe wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } +static HRESULT set_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, VARIANT *v) +{ + DISPID propput_dispid = DISPID_PROPERTYPUT; + DISPPARAMS dp = {v, &propput_dispid, 1, 1}; + EXCEPINFO ei; + + if(dispid == DISPID_IHTMLELEMENT_STYLE) { + TRACE("Ignoring call on style attribute\n"); + return S_OK; + } + + return IDispatchEx_InvokeEx(&elem->node.event_target.dispex.IDispatchEx_iface, dispid, + LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); +} + static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttributeName, VARIANT AttributeValue, LONG lFlags) { HTMLElement *This = impl_from_IHTMLElement(iface); + DISPID dispid; HRESULT hres; - DISPID dispid, dispidNamed = DISPID_PROPERTYPUT; - DISPPARAMS dispParams; - EXCEPINFO excep; TRACE("(%p)->(%s %s %08x)\n", This, debugstr_w(strAttributeName), debugstr_variant(&AttributeValue), lFlags); @@ -628,18 +641,7 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr if(FAILED(hres)) return hres; - if(dispid == DISPID_IHTMLELEMENT_STYLE) { - TRACE("Ignoring call on style attribute\n"); - return S_OK; - } - - dispParams.cArgs = 1; - dispParams.cNamedArgs = 1; - dispParams.rgdispidNamedArgs = &dispidNamed; - dispParams.rgvarg = &AttributeValue; - - return IDispatchEx_InvokeEx(&This->node.event_target.dispex.IDispatchEx_iface, dispid, - LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dispParams, NULL, &excep, NULL); + return set_elem_attr_value_by_dispid(This, dispid, &AttributeValue); } HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, VARIANT *ret) @@ -3718,8 +3720,68 @@ static HRESULT WINAPI HTMLElement4_setAttributeNode(IHTMLElement4 *iface, IHTMLD IHTMLDOMAttribute **ppretAttribute) { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%p %p)\n", This, pattr, ppretAttribute); - return E_NOTIMPL; + HTMLDOMAttribute *attr, *iter, *replace = NULL; + HTMLAttributeCollection *attrs; + DISPID dispid; + HRESULT hres; + + TRACE("(%p)->(%p %p)\n", This, pattr, ppretAttribute); + + attr = unsafe_impl_from_IHTMLDOMAttribute(pattr); + if(!attr) + return E_INVALIDARG; + + if(attr->elem) { + WARN("Tried to set already attached attribute.\n"); + return E_INVALIDARG; + } + + hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, + attr->name, fdexNameCaseInsensitive|fdexNameEnsure, &dispid); + if(FAILED(hres)) + return hres; + + hres = HTMLElement_get_attr_col(&This->node, &attrs); + if(FAILED(hres)) + return hres; + + LIST_FOR_EACH_ENTRY(iter, &attrs->attrs, HTMLDOMAttribute, entry) { + if(iter->dispid == dispid) { + replace = iter; + break; + } + } + + if(replace) { + hres = get_elem_attr_value_by_dispid(This, dispid, &replace->value); + if(FAILED(hres)) { + WARN("could not get attr value: %08x\n", hres); + V_VT(&replace->value) = VT_EMPTY; + } + if(!replace->name) { + replace->name = attr->name; + attr->name = NULL; + } + list_add_head(&replace->entry, &attr->entry); + list_remove(&replace->entry); + replace->elem = NULL; + }else { + list_add_tail(&attrs->attrs, &attr->entry); + } + + IHTMLDOMAttribute_AddRef(&attr->IHTMLDOMAttribute_iface); + attr->elem = This; + attr->dispid = dispid; + + IHTMLAttributeCollection_Release(&attrs->IHTMLAttributeCollection_iface); + + hres = set_elem_attr_value_by_dispid(This, dispid, &attr->value); + if(FAILED(hres)) + WARN("Could not set attribute value: %08x\n", hres); + VariantClear(&attr->value); + + *ppretAttribute = replace ? &replace->IHTMLDOMAttribute_iface : NULL; + return S_OK; } static HRESULT WINAPI HTMLElement4_removeAttributeNode(IHTMLElement4 *iface, IHTMLDOMAttribute *pattr, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 611cb8b..37c33d5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -943,15 +943,18 @@ typedef struct { LONG ref; - /* name and value are valid only for detached attributes (when elem == NULL). */ - WCHAR *name; + /* value is valid only for detached attributes (when elem == NULL). */ VARIANT value; + /* name must be valid for detached attributes */ + WCHAR *name; HTMLElement *elem; DISPID dispid; struct list entry; } HTMLDOMAttribute; +HTMLDOMAttribute *unsafe_impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute*) DECLSPEC_HIDDEN; + HRESULT HTMLDOMAttribute_Create(const WCHAR*,HTMLElement*,DISPID,HTMLDOMAttribute**) DECLSPEC_HIDDEN; HRESULT HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLElement**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6d6a1e8..dcff793 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8524,8 +8524,10 @@ static void test_elems(IHTMLDocument2 *doc) static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) { - IHTMLDOMAttribute *attr, *attr2; + IHTMLDOMAttribute *attr, *attr2, *attr3; + IHTMLElement4 *elem4; VARIANT v; + HRESULT hres; get_elem_attr_node((IUnknown*)elem, "noattr", FALSE); @@ -8636,6 +8638,57 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) SysFreeString(V_BSTR(&v)); test_attr_value(attr, "testing"); + elem4 = get_elem4_iface((IUnknown*)elem); + + hres = IHTMLElement4_setAttributeNode(elem4, attr, &attr2); + ok(hres == S_OK, "setAttributeNode failed: %08x\n", hres); + ok(!attr2, "attr2 != NULL\n"); + + test_elem_attr(elem, "Test", "testing"); + put_attr_value(attr, "new value"); + test_elem_attr(elem, "Test", "new value"); + + attr2 = get_elem_attr_node((IUnknown*)elem, "Test", TRUE); + ok(iface_cmp((IUnknown*)attr2, (IUnknown*)attr), "attr2 != attr\n"); + IHTMLDOMAttribute_Release(attr2); + + attr3 = create_attr((IUnknown*)doc, "Test"); + put_attr_value(attr3, "replace test"); + + hres = IHTMLElement4_setAttributeNode(elem4, attr3, &attr2); + ok(hres == S_OK, "setAttributeNode failed: %08x\n", hres); + ok(iface_cmp((IUnknown*)attr2, (IUnknown*)attr), "attr2 != attr\n"); + IHTMLDOMAttribute_Release(attr2); + + test_elem_attr(elem, "Test", "replace test"); + test_attr_value(attr, "new value"); + test_attr_value(attr3, "replace test"); + + attr2 = get_elem_attr_node((IUnknown*)elem, "Test", TRUE); + ok(iface_cmp((IUnknown*)attr2, (IUnknown*)attr3), "attr2 != attr3\n"); + IHTMLDOMAttribute_Release(attr2); + + put_attr_value(attr, "new value2"); + test_elem_attr(elem, "Test", "replace test"); + test_attr_value(attr, "new value2"); + test_attr_value(attr3, "replace test"); + + put_attr_value(attr3, "new replace value"); + test_elem_attr(elem, "Test", "new replace value"); + test_attr_value(attr, "new value2"); + test_attr_value(attr3, "new replace value"); + + /* Attached attributes cause errors. */ + hres = IHTMLElement4_setAttributeNode(elem4, attr3, &attr2); + ok(hres == E_INVALIDARG, "setAttributeNode failed: %08x, expected E_INVALIDARG\n", hres); + IHTMLDOMAttribute_Release(attr3); + + attr2 = get_elem_attr_node((IUnknown*)elem, "id", TRUE); + hres = IHTMLElement4_setAttributeNode(elem4, attr2, &attr3); + ok(hres == E_INVALIDARG, "setAttributeNode failed: %08x, expected E_INVALIDARG\n", hres); + IHTMLDOMAttribute_Release(attr2); + + IHTMLElement4_Release(elem4); IHTMLDOMAttribute_Release(attr); }

1 0

Jacek Caban : mshtml: Added IHTMLDOMAttribute2:: get_parentNode implementation.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 423b7ba1d174503038b66f9639fd9c1db3df1d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=423b7ba1d174503038b66f963… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 30 14:39:08 2016 +0200 mshtml: Added IHTMLDOMAttribute2::get_parentNode implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 7 +++++-- dlls/mshtml/tests/dom.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index bd7cb82..7a11245 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -347,8 +347,11 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_nodeType(IHTMLDOMAttribute2 *iface, static HRESULT WINAPI HTMLDOMAttribute2_get_parentNode(IHTMLDOMAttribute2 *iface, IHTMLDOMNode **p) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = NULL; + return S_OK; } static HRESULT WINAPI HTMLDOMAttribute2_get_childNodes(IHTMLDOMAttribute2 *iface, IDispatch **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 41dddab..6d6a1e8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3402,6 +3402,19 @@ static void _test_attr_node_name(unsigned line, IHTMLDOMAttribute *attr, const c SysFreeString(str); } +#define test_attr_parent(a) _test_attr_parent(__LINE__,a) +static void _test_attr_parent(unsigned line, IHTMLDOMAttribute *attr) +{ + IHTMLDOMAttribute2 *attr2 = _get_attr2_iface(line, (IUnknown*)attr); + IHTMLDOMNode *parent = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLDOMAttribute2_get_parentNode(attr2, &parent); + ok_(__FILE__,line)(hres == S_OK, "get_parentNode failed: %08x\n", hres); + ok_(__FILE__,line)(!parent, "parent != NULL\n"); + IHTMLDOMAttribute2_Release(attr2); +} + static void test_attr_collection_disp(IDispatch *disp) { IDispatchEx *dispex; @@ -8522,6 +8535,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) test_ifaces((IUnknown*)attr, attr_iids); test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); test_attr_specified(attr, VARIANT_TRUE); + test_attr_parent(attr); attr2 = get_elem_attr_node((IUnknown*)elem, "id", TRUE); ok(iface_cmp((IUnknown*)attr, (IUnknown*)attr2), "attr != attr2\n");

1 0

← Newer
1
2
3
4
5
6
7
...
73
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 2016