August 2011 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Add a copy_rect helper function.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 95f1abc8d87e462c90ba6d5e66a986eff71fe0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f1abc8d87e462c90ba6d5e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 23 11:16:31 2011 +0100 gdi32: Add a copy_rect helper function. --- dlls/gdi32/dibdrv/bitblt.c | 51 ++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 9e6c74f..3e4de88 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -27,6 +27,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); +static DWORD copy_rect( dib_info *dst, const RECT *dst_rect, const dib_info *src, const RECT *src_rect, + HRGN clip, INT rop2 ) +{ + POINT origin; + RECT clipped_rect; + const WINEREGION *clip_data; + int i; + + origin.x = src_rect->left; + origin.y = src_rect->top; + + if (clip == NULL) dst->funcs->copy_rect( dst, dst_rect, src, &origin, rop2 ); + else + { + clip_data = get_wine_region( clip ); + for (i = 0; i < clip_data->numRects; i++) + { + if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + { + origin.x = src_rect->left + clipped_rect.left - dst_rect->left; + origin.y = src_rect->top + clipped_rect.top - dst_rect->top; + dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + } + } + release_wine_region( clip ); + } + return ERROR_SUCCESS; +} + static void set_color_info( const dib_info *dib, BITMAPINFO *info ) { DWORD *masks = (DWORD *)info->bmiColors; @@ -182,8 +211,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info dib_info src_dib; HRGN saved_clip = NULL; dibdrv_physdev *pdev = NULL; - const WINEREGION *clip_data; - int i, rop2; + int rop2; TRACE( "%p %p %p\n", dev, hbitmap, info ); @@ -244,24 +272,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info rop2 = ((rop >> 16) & 0xf) + 1; - if (clip == NULL) dib->funcs->copy_rect( dib, &dst->visrect, &src_dib, &origin, rop2 ); - else - { - clip_data = get_wine_region( clip ); - for (i = 0; i < clip_data->numRects; i++) - { - RECT clipped_rect; - - if (intersect_rect( &clipped_rect, &dst->visrect, clip_data->rects + i )) - { - origin.x = src->visrect.left + clipped_rect.left - dst->visrect.left; - origin.y = src->visrect.top + clipped_rect.top - dst->visrect.top; - dib->funcs->copy_rect( dib, &clipped_rect, &src_dib, &origin, rop2 ); - } - } - release_wine_region( clip ); - } - ret = ERROR_SUCCESS; + ret = copy_rect( dib, &dst->visrect, &src_dib, &src->visrect, clip, rop2 ); if (saved_clip) restore_clipping_region( pdev, saved_clip );

1 0

Huw Davies : gdi32: Add support for all of the ternary rops.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 1def8d635a8f09321ec7df29c07643e1f130b7d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1def8d635a8f09321ec7df29c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 23 11:16:32 2011 +0100 gdi32: Add support for all of the ternary rops. --- dlls/gdi32/dibdrv/bitblt.c | 524 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 514 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1def8d635a8f09321ec7d…

1 0

Huw Davies : gdi32: Remove an unneeded level of indentation.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 597edc503f75946a71c2d38cd3711cb33986374f URL: http://source.winehq.org/git/wine.git/?a=commit;h=597edc503f75946a71c2d38cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 23 11:49:52 2011 +0100 gdi32: Remove an unneeded level of indentation. --- dlls/gdi32/dib.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index add3a70..65e9e1b 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -614,14 +614,12 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, if (ptr) { err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr ); - { - if (src_bits.free) src_bits.free( &src_bits ); - src_bits.ptr = ptr; - src_bits.is_copy = TRUE; - src_bits.free = free_heap_bits; - if (!err) - err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); - } + if (src_bits.free) src_bits.free( &src_bits ); + src_bits.ptr = ptr; + src_bits.is_copy = TRUE; + src_bits.free = free_heap_bits; + if (!err) + err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); } else err = ERROR_OUTOFMEMORY; }

1 0

Piotr Caban : include: Added IHTMLAttributeCollection definition.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 51aafd5683aba62dc4c919d57fc5725b52d1c5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51aafd5683aba62dc4c919d57… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 23 11:32:52 2011 +0200 include: Added IHTMLAttributeCollection definition. --- include/mshtmdid.h | 11 ++++++ include/mshtml.idl | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index cf03d64..622581f 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1029,6 +1029,17 @@ /* IHTMLElementCollection3 */ #define DISPID_IHTMLELEMENTCOLLECTION3_NAMEDITEM DISPID_COLLECTION+6 + +/* IHTMLAttributeCollection */ +#define DISPID_IHTMLATTRIBUTECOLLECTION_LENGTH DISPID_COLLECTION +#define DISPID_IHTMLATTRIBUTECOLLECTION__NEWENUM DISPID_NEWENUM +#define DISPID_IHTMLATTRIBUTECOLLECTION_ITEM DISPID_VALUE + +/* IHTMLAttributeCollection2 */ +#define DISPID_IHTMLATTRIBUTECOLLECTION2_GETNAMEDITEM DISPID_COLLECTION+1 +#define DISPID_IHTMLATTRIBUTECOLLECTION2_SETNAMEDITEM DISPID_COLLECTION+2 +#define DISPID_IHTMLATTRIBUTECOLLECTION2_REMOVENAMEDITEM DISPID_COLLECTION+3 + /* IHTMLAttributeCollection3 */ #define DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_GETNAMEDITEM DISPID_IE8_NAMEDNODEMAP #define DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_SETNAMEDITEM DISPID_IE8_NAMEDNODEMAP+1 diff --git a/include/mshtml.idl b/include/mshtml.idl index 13c0fa3..a840944 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -4149,6 +4149,58 @@ methods: } /***************************************************************************** + * IHTMLAttributeCollection interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4c3-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLAttributeCollection : IDispatch +{ + [propget, id(DISPID_IHTMLATTRIBUTECOLLECTION_LENGTH)] + HRESULT length( + [retval, out] long *p); + + [propget, id(DISPID_IHTMLATTRIBUTECOLLECTION__NEWENUM), hidden, restricted] + HRESULT _newEnum( + [retval, out] IUnknown **p); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION_ITEM)] + HRESULT item( + [optional, in] VARIANT *name, + [retval, out] IDispatch **pdisp); +} + +/***************************************************************************** + * IHTMLAttributeCollection2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f80a-98b5-11cf-bb82-00aa00bdce0b) + ] +interface IHTMLAttributeCollection2 : IDispatch +{ + [id(DISPID_IHTMLATTRIBUTECOLLECTION2_GETNAMEDITEM)] + HRESULT getNamedItem( + [in] BSTR bstrName, + [retval, out] IHTMLDOMAttribute **newretNode); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION2_SETNAMEDITEM)] + HRESULT setNamedItem( + [in] IHTMLDOMAttribute *ppNode, + [retval, out] IHTMLDOMAttribute **newretNode); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION2_REMOVENAMEDITEM)] + HRESULT removeNamedItem( + [in] BSTR bstrName, + [retval, out] IHTMLDOMAttribute **newretNode); +} + +/***************************************************************************** * IHTMLAttributeCollection3 interface */ [ @@ -4184,6 +4236,54 @@ interface IHTMLAttributeCollection3 : IDispatch } /***************************************************************************** + * DispHTMLAttributeCollection dispinterface + */ +[ + hidden, + uuid(3050f56c-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLAttributeCollection +{ +properties: +methods: + [propget, id(DISPID_IHTMLATTRIBUTECOLLECTION_LENGTH)] + long length(); + + [propget, id(DISPID_IHTMLATTRIBUTECOLLECTION__NEWENUM), hidden, restricted] + IUnknown *_newEnum(); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION_ITEM)] + IDispatch *item([optional, in] VARIANT *name); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION2_GETNAMEDITEM)] + IHTMLDOMAttribute *getNamedItem([in] BSTR bstrName); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION2_SETNAMEDITEM)] + IHTMLDOMAttribute *setNamedItem([in] IHTMLDOMAttribute *ppNode); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION2_REMOVENAMEDITEM)] + IHTMLDOMAttribute *removeNamedItem([in] BSTR bstrName); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_GETNAMEDITEM)] + IHTMLDOMAttribute *ie8_getNamedItem([in] BSTR bstrName); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_SETNAMEDITEM)] + IHTMLDOMAttribute *ie8_setNamedItem([in] IHTMLDOMAttribute *pNodeIn); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_REMOVENAMEDITEM)] + IHTMLDOMAttribute *ie8_removeNamedItem([in] BSTR bstrName); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_ITEM)] + IHTMLDOMAttribute *ie8_item([in] long index); + + [propget, id(DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_LENGTH)] + long ie8_length(); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); +} + +/***************************************************************************** * IHTMLDOMChildrenCollection interface */ [

1 0

Piotr Caban : mshtml: Added nsIDOMNamedNodeMap interface.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: f80c3a72502d1c0889056810d768da25fe0af62e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80c3a72502d1c0889056810d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 23 11:33:01 2011 +0200 mshtml: Added nsIDOMNamedNodeMap interface. --- dlls/mshtml/nsiface.idl | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 502fb30..90eceaa 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -110,7 +110,6 @@ typedef nsISupports nsIWidget; typedef nsISupports nsIDOMBarProp; typedef nsISupports nsIPrompt; typedef nsISupports nsIAuthPrompt; -typedef nsISupports nsIDOMNamedNodeMap; typedef nsISupports nsIDOMDocumentType; typedef nsISupports nsIDOMDOMImplementation; typedef nsISupports nsIDOMCDATASection; @@ -647,6 +646,23 @@ interface nsIDOM3Node : nsISupports [ object, + uuid(a6cf907b-15b3-11d2-932e-00805f8add32), + local +] +interface nsIDOMNamedNodeMap : nsISupports +{ + nsresult GetNamedItem(const nsAString *name, nsIDOMNode **_retval); + nsresult SetNamedItem(nsIDOMNode *arg, nsIDOMNode **_retval); + nsresult RemoveNamedItem(const nsAString *name, nsIDOMNode **_retval); + nsresult Item(PRUint32 index, nsIDOMNode **_retval); + nsresult GetLength(PRUint32 *aLength); + nsresult GetNamedItemNS(const nsAString *namespaceURI, const nsAString *localName, nsIDOMNode **_retval); + nsresult SetNamedItemNS(nsIDOMNode *arg, nsIDOMNode **_retval); + nsresult RemoveNamedItemNS(const nsAString *namespaceURI, const nsAString *localName, nsIDOMNode **_retval); +} + +[ + object, uuid(a6cf907c-15b3-11d2-932e-00805f8add32), local ]

1 0

Piotr Caban : mshtml: DeleteMemberByDispID should return E_NOTIMPL.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 423c6f94730767e8202eef7e807c3f0c6ea50b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=423c6f94730767e8202eef7e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 23 11:33:10 2011 +0200 mshtml: DeleteMemberByDispID should return E_NOTIMPL. --- dlls/mshtml/dispex.c | 5 ++++- dlls/mshtml/tests/script.c | 3 +++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 98f73b6..b1f9a12 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1009,7 +1009,10 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x)\n", This, id); + + TRACE("(%p)->(%x)\n", This, id); + + /* Not implemented by IE */ return E_NOTIMPL; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index f0fd1dd..5cac14a 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1951,6 +1951,9 @@ static void test_script_run(void) SysFreeString(tmp); ok(hres == S_OK, "GetDispID(document) failed: %08x\n", hres); + hres = IDispatchEx_DeleteMemberByDispID(document, id); + ok(hres == E_NOTIMPL, "DeleteMemberByDispID failed = %08x\n", hres); + VariantInit(&var); memset(&dp, 0, sizeof(dp)); memset(&ei, 0, sizeof(ei));

1 0

Piotr Caban : mshtml: Populate dynamic properties table in get_dynamic_data .
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 0a03ae75b04446f3cd84dcc7064d129e93ab58e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a03ae75b04446f3cd84dcc70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 23 11:33:18 2011 +0200 mshtml: Populate dynamic properties table in get_dynamic_data. --- dlls/mshtml/dispex.c | 30 ++++++++------ dlls/mshtml/htmldoc.c | 3 +- dlls/mshtml/htmlelem.c | 88 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlelemcol.c | 3 +- dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlnode.c | 3 +- dlls/mshtml/htmlstyle.c | 1 + dlls/mshtml/htmlwindow.c | 3 +- dlls/mshtml/mshtml_private.h | 1 + 9 files changed, 114 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index b1f9a12..6d175f4 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -366,11 +366,19 @@ static HRESULT variant_copy(VARIANT *dest, VARIANT *src) return VariantCopy(dest, src); } -static inline dispex_dynamic_data_t *get_dynamic_data(DispatchEx *This, BOOL alloc) +static inline dispex_dynamic_data_t *get_dynamic_data(DispatchEx *This) { - return !alloc || This->dynamic_data - ? This->dynamic_data - : (This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t))); + if(This->dynamic_data) + return This->dynamic_data; + + This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t)); + if(!This->dynamic_data) + return NULL; + + if(This->data->vtbl && This->data->vtbl->populate_props) + This->data->vtbl->populate_props(This); + + return This->dynamic_data; } static HRESULT get_dynamic_prop(DispatchEx *This, const WCHAR *name, DWORD flags, dynamic_prop_t **ret) @@ -379,14 +387,9 @@ static HRESULT get_dynamic_prop(DispatchEx *This, const WCHAR *name, DWORD flags dispex_dynamic_data_t *data; dynamic_prop_t *prop; - data = get_dynamic_data(This, alloc); - if(!data) { - if(alloc) - return E_OUTOFMEMORY; - - TRACE("not found %s\n", debugstr_w(name)); - return DISP_E_UNKNOWNNAME; - } + data = get_dynamic_data(This); + if(!data) + return E_OUTOFMEMORY; for(prop = data->props; prop < data->props+data->prop_cnt; prop++) { if(flags & fdexNameCaseInsensitive ? !strcmpiW(prop->name, name) : !strcmpW(prop->name, name)) { @@ -570,6 +573,7 @@ static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR static const dispex_static_data_vtbl_t function_dispex_vtbl = { function_value, NULL, + NULL, NULL }; @@ -625,7 +629,7 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, return S_OK; } - dynamic_data = get_dynamic_data(This, TRUE); + dynamic_data = get_dynamic_data(This); if(!dynamic_data) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f625602..0636a04 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2119,7 +2119,8 @@ static HRESULT HTMLDocumentNode_invoke(DispatchEx *dispex, DISPID id, LCID lcid, static const dispex_static_data_vtbl_t HTMLDocumentNode_dispex_vtbl = { NULL, NULL, - HTMLDocumentNode_invoke + HTMLDocumentNode_invoke, + NULL }; static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5d1d3af..d76f771 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1778,6 +1778,88 @@ static HRESULT HTMLElement_invoke(DispatchEx *dispex, DISPID id, LCID lcid, return E_NOTIMPL; } +static HRESULT HTMLElement_populate_props(DispatchEx *dispex) +{ + HTMLElement *This = impl_from_DispatchEx(dispex); + nsIDOMNamedNodeMap *attrs; + nsIDOMNode *node; + nsAString nsstr; + const PRUnichar *str; + BSTR name; + VARIANT value; + unsigned i; + PRUint32 len; + DISPID id; + nsresult nsres; + HRESULT hres; + + if(!This->nselem) + return S_FALSE; + + nsres = nsIDOMHTMLElement_GetAttributes(This->nselem, &attrs); + if(NS_FAILED(nsres)) + return E_FAIL; + + nsres = nsIDOMNamedNodeMap_GetLength(attrs, &len); + if(NS_FAILED(nsres)) { + nsIDOMNamedNodeMap_Release(attrs); + return E_FAIL; + } + + nsAString_Init(&nsstr, NULL); + for(i=0; i<len; i++) { + nsres = nsIDOMNamedNodeMap_Item(attrs, i, &node); + if(NS_FAILED(nsres)) + continue; + + nsres = nsIDOMNode_GetNodeName(node, &nsstr); + if(NS_FAILED(nsres)) { + nsIDOMNode_Release(node); + continue; + } + + nsAString_GetData(&nsstr, &str); + name = SysAllocString(str); + if(!name) { + nsIDOMNode_Release(node); + continue; + } + + hres = IDispatchEx_GetDispID(&dispex->IDispatchEx_iface, name, fdexNameCaseInsensitive, &id); + if(hres != DISP_E_UNKNOWNNAME) { + nsIDOMNode_Release(node); + SysFreeString(name); + continue; + } + + nsres = nsIDOMNode_GetNodeValue(node, &nsstr); + nsIDOMNode_Release(node); + if(NS_FAILED(nsres)) { + SysFreeString(name); + continue; + } + + nsAString_GetData(&nsstr, &str); + V_VT(&value) = VT_BSTR; + if(*str) { + V_BSTR(&value) = SysAllocString(str); + if(!V_BSTR(&value)) { + SysFreeString(name); + continue; + } + } else + V_BSTR(&value) = NULL; + + IHTMLElement_setAttribute(&This->IHTMLElement_iface, name, value, 0); + SysFreeString(name); + VariantClear(&value); + } + nsAString_Finish(&nsstr); + + nsIDOMNamedNodeMap_Release(attrs); + return S_OK; +} + static const tid_t HTMLElement_iface_tids[] = { HTMLELEMENT_TIDS, 0 @@ -1786,7 +1868,8 @@ static const tid_t HTMLElement_iface_tids[] = { static dispex_static_data_vtbl_t HTMLElement_dispex_vtbl = { NULL, HTMLElement_get_dispid, - HTMLElement_invoke + HTMLElement_invoke, + HTMLElement_populate_props }; static dispex_static_data_t HTMLElement_dispex = { @@ -2017,7 +2100,8 @@ static HRESULT HTMLFiltersCollection_invoke(DispatchEx *dispex, DISPID id, LCID static const dispex_static_data_vtbl_t HTMLFiltersCollection_dispex_vtbl = { NULL, HTMLFiltersCollection_get_dispid, - HTMLFiltersCollection_invoke + HTMLFiltersCollection_invoke, + NULL }; static const tid_t HTMLFiltersCollection_iface_tids[] = { diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index c87485e..b5dbc0f 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -470,7 +470,8 @@ static HRESULT HTMLElementCollection_invoke(DispatchEx *dispex, DISPID id, LCID static const dispex_static_data_vtbl_t HTMLElementColection_dispex_vtbl = { NULL, HTMLElementCollection_get_dispid, - HTMLElementCollection_invoke + HTMLElementCollection_invoke, + NULL }; static const tid_t HTMLElementCollection_iface_tids[] = { diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 2f72484..c984fbd 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -921,6 +921,7 @@ static const tid_t HTMLImageElementFactory_iface_tids[] = { static const dispex_static_data_vtbl_t HTMLImageElementFactory_dispex_vtbl = { HTMLImageElementFactory_value, NULL, + NULL, NULL }; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index d297d5b..7afccd6 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -260,7 +260,8 @@ static HRESULT HTMLDOMChildrenCollection_invoke(DispatchEx *dispex, DISPID id, L static const dispex_static_data_vtbl_t HTMLDOMChildrenCollection_dispex_vtbl = { NULL, HTMLDOMChildrenCollection_get_dispid, - HTMLDOMChildrenCollection_invoke + HTMLDOMChildrenCollection_invoke, + NULL }; static const tid_t HTMLDOMChildrenCollection_iface_tids[] = { diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index c835880..a9c6133 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -3063,6 +3063,7 @@ static HRESULT HTMLStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, static const dispex_static_data_vtbl_t HTMLStyle_dispex_vtbl = { NULL, HTMLStyle_get_dispid, + NULL, NULL }; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1ded796..d57760f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2330,7 +2330,8 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD static const dispex_static_data_vtbl_t HTMLWindow_dispex_vtbl = { NULL, NULL, - HTMLWindow_invoke + HTMLWindow_invoke, + NULL }; static const tid_t HTMLWindow_iface_tids[] = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cc92d2f..eac02d9 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -190,6 +190,7 @@ typedef struct { HRESULT (*value)(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*get_dispid)(DispatchEx*,BSTR,DWORD,DISPID*); HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); + HRESULT (*populate_props)(DispatchEx*); } dispex_static_data_vtbl_t; typedef struct {

1 0

Piotr Caban : mshtml: Make sure dynamic properties are initialized in Dispatch functions.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: ff449dd1d7538e492ef0f7d148e0a7de2ccd4bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff449dd1d7538e492ef0f7d14… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 23 11:33:28 2011 +0200 mshtml: Make sure dynamic properties are initialized in Dispatch functions. --- dlls/mshtml/dispex.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 6d175f4..44d0911 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -923,7 +923,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc DWORD idx = id - DISPID_DYNPROP_0; dynamic_prop_t *prop; - if(!This->dynamic_data || This->dynamic_data->prop_cnt <= idx) + if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx) return DISP_E_UNKNOWNNAME; prop = This->dynamic_data->props+idx; @@ -1039,7 +1039,7 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS if(is_dynamic_dispid(id)) { DWORD idx = id - DISPID_DYNPROP_0; - if(!This->dynamic_data || This->dynamic_data->prop_cnt <= idx) + if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx) return DISP_E_UNKNOWNNAME; *pbstrName = SysAllocString(This->dynamic_data->props[idx].name); @@ -1075,7 +1075,7 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, if(is_dynamic_dispid(id)) { DWORD idx = id - DISPID_DYNPROP_0; - if(!This->dynamic_data || This->dynamic_data->prop_cnt <= idx) + if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx) return DISP_E_UNKNOWNNAME; while(++idx < This->dynamic_data->prop_cnt && This->dynamic_data->props[idx].flags & DYNPROP_DELETED); @@ -1111,7 +1111,7 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, func++; } - if(This->dynamic_data && This->dynamic_data->prop_cnt) { + if(get_dynamic_data(This) && This->dynamic_data->prop_cnt) { *pid = DISPID_DYNPROP_0; return S_OK; }

1 0

Piotr Caban : mshtml/tests: Added dynamic properties accessing tests.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 1d4d1068cd9f5f5164df47d0a85ea85ab2ca3369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4d1068cd9f5f5164df47d0a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 23 11:33:37 2011 +0200 mshtml/tests: Added dynamic properties accessing tests. --- dlls/mshtml/tests/dom.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b0e3f84..7d0b048 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -55,6 +55,7 @@ static const char elem_test_str[] = "<img id=\"imgid\" name=\"WineImg\"/>" "<iframe src=\"about:blank\" id=\"ifr\"></iframe>" "<form id=\"frm\"></form>" + "<div id=\"attr\" attr1=\"attr1\" attr2 attr3=\"attr3\"></div>" "</body></html>"; static const char elem_test2_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" @@ -2338,6 +2339,49 @@ static void _test_img_name(unsigned line, IUnknown *unk, const char *pValue) SysFreeString(sName); } +static void test_dynamic_properties(IHTMLElement *elem) +{ + static const WCHAR attr1W[] = {'a','t','t','r','1',0}; + IDispatchEx *dispex; + BSTR name, attr1 = SysAllocString(attr1W); + VARIANT_BOOL succ; + VARIANT val; + int checked_no = 0; + DISPID id = DISPID_STARTENUM; + HRESULT hres; + + hres = IHTMLElement_QueryInterface(elem, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + + hres = IHTMLElement_removeAttribute(elem, attr1, 0, &succ); + ok(hres == S_OK, "removeAttribute failed: %08x\n", hres); + ok(succ, "removeAttribute set succ to FALSE\n"); + + while(1) { + hres = IDispatchEx_GetNextDispID(dispex, fdexEnumAll, id, &id); + ok(hres==S_OK || hres==S_FALSE, "GetNextDispID failed: %08x\n", hres); + if(hres != S_OK) + break; + + hres = IDispatchEx_GetMemberName(dispex, id, &name); + ok(hres == S_OK, "GetMemberName failed: %08x\n", hres); + + if(!strcmp_wa(name, "attr1")) + ok(0, "attr1 should be removed\n"); + else if(!strcmp_wa(name, "attr2") || !strcmp_wa(name, "attr3")) + checked_no++; + SysFreeString(name); + } + ok(checked_no == 2, "checked_no=%d, expected 2\n", checked_no); + IDispatchEx_Release(dispex); + + V_VT(&val) = VT_BSTR; + V_BSTR(&val) = attr1; + hres = IHTMLElement_setAttribute(elem, attr1, val, 0); + ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + SysFreeString(attr1); +} + #define test_input_type(i,t) _test_input_type(__LINE__,i,t) static void _test_input_type(unsigned line, IHTMLInputElement *input, const char *extype) { @@ -4664,7 +4708,8 @@ static void test_elems(IHTMLDocument2 *doc) ET_EMBED, ET_IMG, ET_IFRAME, - ET_FORM + ET_FORM, + ET_DIV }; static const elem_type_t item_types[] = { @@ -4911,6 +4956,12 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_elem_by_id(doc, "attr", TRUE); + if(elem) { + test_dynamic_properties(elem); + IHTMLElement_Release(elem); + } + elem = get_elem_by_id(doc, "styleid", TRUE); if(elem) { test_style_media((IUnknown*)elem, NULL);

1 0

Piotr Caban : mshtml: Remove no longer needed get_attr_from_nselem function .
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 6e1ad65dc356d8b3927ebce3c3034fdab37fea71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e1ad65dc356d8b3927ebce3c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 23 11:33:52 2011 +0200 mshtml: Remove no longer needed get_attr_from_nselem function. --- dlls/mshtml/htmlelem3.c | 58 +--------------------------------------------- 1 files changed, 2 insertions(+), 56 deletions(-) diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c index ece779d..73ca1ed 100644 --- a/dlls/mshtml/htmlelem3.c +++ b/dlls/mshtml/htmlelem3.c @@ -556,58 +556,6 @@ static HRESULT WINAPI HTMLElement4_normalize(IHTMLElement4 *iface) return E_NOTIMPL; } -/* FIXME: This should be done in IDispatchEx implementation layer */ -static BOOL get_attr_from_nselem(HTMLElement *This, BSTR name, DISPID *dispid) -{ - const PRUnichar *v; - nsIDOMAttr *nsattr; - nsAString nsstr; - BSTR val = NULL; - nsresult nsres; - HRESULT hres; - - nsAString_InitDepend(&nsstr, name); - nsres = nsIDOMHTMLElement_GetAttributeNode(This->nselem, &nsstr, &nsattr); - nsAString_Finish(&nsstr); - if(NS_FAILED(nsres) || !nsattr) - return FALSE; - - FIXME("HACK\n"); - - nsAString_Init(&nsstr, NULL); - nsres = nsIDOMAttr_GetNodeValue(nsattr, &nsstr); - if(NS_FAILED(nsres)) { - nsAString_Finish(&nsstr); - return FALSE; - } - - nsAString_GetData(&nsstr, &v); - if(*v) { - val = SysAllocString(v); - if(!val) { - nsAString_Finish(&nsstr); - return FALSE; - } - } - nsAString_Finish(&nsstr); - - hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, name, fdexNameEnsure, dispid); - if(SUCCEEDED(hres)) { - VARIANT arg; - DISPPARAMS dp = {&arg, NULL, 1, 0}; - EXCEPINFO ei; - - V_VT(&arg) = VT_BSTR; - V_BSTR(&arg) = val; - memset(&ei, 0, sizeof(ei)); - hres = IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, *dispid, - LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); - } - - SysFreeString(val); - return SUCCEEDED(hres); -} - static HRESULT WINAPI HTMLElement4_getAttributeNode(IHTMLElement4 *iface, BSTR bstrname, IHTMLDOMAttribute **ppAttribute) { HTMLElement *This = impl_from_IHTMLElement4(iface); @@ -619,10 +567,8 @@ static HRESULT WINAPI HTMLElement4_getAttributeNode(IHTMLElement4 *iface, BSTR b hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, bstrname, fdexNameCaseInsensitive, &dispid); if(hres == DISP_E_UNKNOWNNAME) { - if(!get_attr_from_nselem(This, bstrname, &dispid)) { - *ppAttribute = NULL; - return S_OK; - } + *ppAttribute = NULL; + return S_OK; }else if(FAILED(hres)) { return hres; }

1 0