wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Jacek Caban : mshtml: Added support for IHTMLDOMAttribute2:: get_value on detached attributes.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 7ad4aeb7352e302d4a9f7399caccaf92bb23f27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad4aeb7352e302d4a9f7399c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 30 14:38:58 2016 +0200 mshtml: Added support for IHTMLDOMAttribute2::get_value on detached attributes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 11 +++++------ dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 8b21eea..bd7cb82 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -310,12 +310,11 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_value(IHTMLDOMAttribute2 *iface, BST TRACE("(%p)->(%p)\n", This, p); - if(!This->elem) { - FIXME("NULL This->elem\n"); - return E_UNEXPECTED; - } - - hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, &val); + V_VT(&val) = VT_EMPTY; + if(This->elem) + hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, &val); + else + hres = VariantCopy(&val, &This->value); if(SUCCEEDED(hres)) hres = attr_value_to_string(&val); if(FAILED(hres)) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f64bd82..41dddab 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8610,11 +8610,18 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) get_attr_node_value(attr, &v, VT_I4); ok(V_I4(&v) == 1, "nodeValue = %d\n", V_I4(&v)); + test_attr_value(attr, "1"); V_VT(&v) = VT_EMPTY; put_attr_node_value(attr, v); get_attr_node_value(attr, &v, VT_EMPTY); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("testing"); + put_attr_node_value(attr, v); + SysFreeString(V_BSTR(&v)); + test_attr_value(attr, "testing"); + IHTMLDOMAttribute_Release(attr); }

1 0

Jacek Caban : mshtml: Split conversion to string out of get_elem_attr_value_by_dispid.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: a3ab8d679225562dc3eed427173c2966698c3529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ab8d679225562dc3eed4271… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 30 14:38:44 2016 +0200 mshtml: Split conversion to string out of get_elem_attr_value_by_dispid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 6 +++-- dlls/mshtml/htmlelem.c | 61 ++++++++++++++++++++++++-------------------- dlls/mshtml/mshtml_private.h | 7 ++--- 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 97a4ce2..8b21eea 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -169,7 +169,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, V if(!This->elem) return VariantCopy(p, &This->value); - return get_elem_attr_value_by_dispid(This->elem, This->dispid, 0, p); + return get_elem_attr_value_by_dispid(This->elem, This->dispid, p); } static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, VARIANT_BOOL *p) @@ -315,7 +315,9 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_value(IHTMLDOMAttribute2 *iface, BST return E_UNEXPECTED; } - hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, ATTRFLAG_ASSTRING, &val); + hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, &val); + if(SUCCEEDED(hres)) + hres = attr_value_to_string(&val); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cb0b864..c7090e6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -63,6 +63,10 @@ static const WCHAR textareaW[] = {'T','E','X','T','A','R','E','A',0}; static const WCHAR title_tagW[]= {'T','I','T','L','E',0}; static const WCHAR trW[] = {'T','R',0}; +#define ATTRFLAG_CASESENSITIVE 0x0001 +#define ATTRFLAG_ASSTRING 0x0002 +#define ATTRFLAG_EXPANDURL 0x0004 + typedef struct { const WCHAR *name; HRESULT (*constructor)(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**); @@ -638,39 +642,39 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dispParams, NULL, &excep, NULL); } -HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, DWORD flags, VARIANT *ret) +HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, VARIANT *ret) { DISPPARAMS dispParams = {NULL, NULL, 0, 0}; EXCEPINFO excep; + + return IDispatchEx_InvokeEx(&elem->node.event_target.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYGET, &dispParams, ret, &excep, NULL); +} + +HRESULT attr_value_to_string(VARIANT *v) +{ HRESULT hres; static const WCHAR nullW[] = {'n','u','l','l',0}; - hres = IDispatchEx_InvokeEx(&elem->node.event_target.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, - DISPATCH_PROPERTYGET, &dispParams, ret, &excep, NULL); - if(FAILED(hres)) - return hres; - - if(flags & ATTRFLAG_ASSTRING) { - switch(V_VT(ret)) { - case VT_BSTR: - break; - case VT_NULL: - V_BSTR(ret) = SysAllocString(nullW); - if(!V_BSTR(ret)) - return E_OUTOFMEMORY; - V_VT(ret) = VT_BSTR; - break; - case VT_DISPATCH: - IDispatch_Release(V_DISPATCH(ret)); - V_VT(ret) = VT_BSTR; - V_BSTR(ret) = SysAllocString(NULL); - break; - default: - hres = VariantChangeType(ret, ret, 0, VT_BSTR); - if(FAILED(hres)) - return hres; - } + switch(V_VT(v)) { + case VT_BSTR: + break; + case VT_NULL: + V_BSTR(v) = SysAllocString(nullW); + if(!V_BSTR(v)) + return E_OUTOFMEMORY; + V_VT(v) = VT_BSTR; + break; + case VT_DISPATCH: + IDispatch_Release(V_DISPATCH(v)); + V_VT(v) = VT_BSTR; + V_BSTR(v) = SysAllocString(NULL); + break; + default: + hres = VariantChangeType(v, v, 0, VT_BSTR); + if(FAILED(hres)) + return hres; } return S_OK; @@ -700,7 +704,10 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr return hres; } - return get_elem_attr_value_by_dispid(This, dispid, lFlags, AttributeValue); + hres = get_elem_attr_value_by_dispid(This, dispid, AttributeValue); + if(SUCCEEDED(hres) && (lFlags & ATTRFLAG_ASSTRING)) + hres = attr_value_to_string(AttributeValue); + return hres; } static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strAttributeName, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 36c95ce..611cb8b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1016,11 +1016,8 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; -#define ATTRFLAG_CASESENSITIVE 0x0001 -#define ATTRFLAG_ASSTRING 0x0002 -#define ATTRFLAG_EXPANDURL 0x0004 - -HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,DWORD,VARIANT*) DECLSPEC_HIDDEN; +HRESULT attr_value_to_string(VARIANT*) DECLSPEC_HIDDEN; +HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_source_index(HTMLElement*,LONG*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Moved createAttribute tests to test_attr.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 51304cbe720ec74a228fda2a963fb56a37e96770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51304cbe720ec74a228fda2a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 30 14:38:26 2016 +0200 mshtml: Moved createAttribute tests to test_attr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 76 ++++++++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4206e9c..f64bd82 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1903,6 +1903,22 @@ static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) SysFreeString(text); } +#define create_attr(a,b) _create_attr(__LINE__,a,b) +static IHTMLDOMAttribute *_create_attr(unsigned line, IUnknown *unk, const char *name) +{ + IHTMLDocument5 *doc = _get_htmldoc5_iface(line, unk); + BSTR str = a2bstr("Test"); + IHTMLDOMAttribute *attr; + HRESULT hres; + + hres = IHTMLDocument5_createAttribute(doc, str, &attr); + ok_(__FILE__,line)(hres == S_OK, "createAttribute dailed: %08x\n", hres); + SysFreeString(str); + IHTMLDocument5_Release(doc); + + return attr; +} + #define test_attr_specified(a,b) _test_attr_specified(__LINE__,a,b) static void _test_attr_specified(unsigned line, IHTMLDOMAttribute *attr, VARIANT_BOOL expected) { @@ -8493,7 +8509,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLWindow2_Release(window); } -static void test_attr(IHTMLElement *elem) +static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) { IHTMLDOMAttribute *attr, *attr2; VARIANT v; @@ -8575,6 +8591,31 @@ static void test_attr(IHTMLElement *elem) test_attr_specified(attr, VARIANT_FALSE); test_attr_expando(attr, VARIANT_FALSE); IHTMLDOMAttribute_Release(attr); + + /* Test created, detached attribute. */ + attr = create_attr((IUnknown*)doc, "Test"); + + test_disp((IUnknown*)attr, &DIID_DispHTMLDOMAttribute, "[object]"); + test_ifaces((IUnknown*)attr, attr_iids); + test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); + + test_attr_node_name(attr, "Test"); + test_attr_expando(attr, VARIANT_FALSE); + + get_attr_node_value(attr, &v, VT_EMPTY); + + V_VT(&v) = VT_I4; + V_I4(&v) = 1; + put_attr_node_value(attr, v); + + get_attr_node_value(attr, &v, VT_I4); + ok(V_I4(&v) == 1, "nodeValue = %d\n", V_I4(&v)); + + V_VT(&v) = VT_EMPTY; + put_attr_node_value(attr, v); + get_attr_node_value(attr, &v, VT_EMPTY); + + IHTMLDOMAttribute_Release(attr); } static void test_blocked(IHTMLDocument2 *doc, IHTMLElement *outer_elem) @@ -8796,7 +8837,7 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); } - test_attr(div); + test_attr(doc, div); test_blocked(doc, div); test_elem_names(doc); @@ -8807,7 +8848,6 @@ static void test_create_elems(IHTMLDocument2 *doc) { IHTMLElement *elem, *body, *elem2; IHTMLDOMNode *node, *node2, *node3, *comment; - IHTMLDOMAttribute *attr; IHTMLDocument5 *doc5; IDispatch *disp; VARIANT var; @@ -8911,36 +8951,6 @@ static void test_create_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(comment); } - str = a2bstr("Test"); - hres = IHTMLDocument5_createAttribute(doc5, str, &attr); - ok(hres == S_OK, "createAttribute dailed: %08x\n", hres); - SysFreeString(str); - if(SUCCEEDED(hres)) { - VARIANT v; - - test_disp((IUnknown*)attr, &DIID_DispHTMLDOMAttribute, "[object]"); - test_ifaces((IUnknown*)attr, attr_iids); - test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); - - test_attr_node_name(attr, "Test"); - test_attr_expando(attr, VARIANT_FALSE); - - get_attr_node_value(attr, &v, VT_EMPTY); - - V_VT(&v) = VT_I4; - V_I4(&v) = 1; - put_attr_node_value(attr, v); - - get_attr_node_value(attr, &v, VT_I4); - ok(V_I4(&v) == 1, "nodeValue = %d\n", V_I4(&v)); - - V_VT(&v) = VT_EMPTY; - put_attr_node_value(attr, v); - get_attr_node_value(attr, &v, VT_EMPTY); - - IHTMLDOMAttribute_Release(attr); - } - IHTMLDocument5_Release(doc5); }

1 0

Piotr Caban : ieframe: Add ITargetFrame stub.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: dfc60ddbc83df77c89f4d3a1978639a94d714417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc60ddbc83df77c89f4d3a19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 11:31:08 2016 +0200 ieframe: Add ITargetFrame stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/client.c | 5 ++ dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 149 +++++++++++++++++++++++++++++++++++++++- dlls/ieframe/tests/webbrowser.c | 6 ++ 4 files changed, 160 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index d82195f..4846e28 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -668,6 +668,11 @@ static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, RE return IWebBrowser2_QueryInterface(This->wb, riid, ppv); } + if(IsEqualGUID(&IID_ITargetFrame, guidService)) { + TRACE("(%p)->(IID_ITargetFrame %s %p)\n", This, debugstr_guid(riid), ppv); + return IWebBrowser2_QueryInterface(This->wb, riid, ppv); + } + if(IsEqualGUID(&IID_IWebBrowserApp, guidService)) { TRACE("IWebBrowserApp service\n"); return IWebBrowser2_QueryInterface(This->wb, riid, ppv); diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 371cb03..3880354 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -55,6 +55,7 @@ typedef struct { typedef struct { IHlinkFrame IHlinkFrame_iface; + ITargetFrame ITargetFrame_iface; ITargetFrame2 ITargetFrame2_iface; ITargetFramePriv2 ITargetFramePriv2_iface; IWebBrowserPriv2IE9 IWebBrowserPriv2IE9_iface; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 88bc7e6..296ed19 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1241,6 +1241,149 @@ static const IHlinkFrameVtbl HlinkFrameVtbl = { HlinkFrame_UpdateHlink }; +static inline HlinkFrame *impl_from_ITargetFrame(ITargetFrame *iface) +{ + return CONTAINING_RECORD(iface, HlinkFrame, ITargetFrame_iface); +} + +static HRESULT WINAPI TargetFrame_QueryInterface(ITargetFrame *iface, REFIID riid, void **ppv) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI TargetFrame_AddRef(ITargetFrame *iface) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI TargetFrame_Release(ITargetFrame *iface) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI TargetFrame_SetFrameName(ITargetFrame *iface, LPCWSTR pszFrameName) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(pszFrameName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFrameName(ITargetFrame *iface, LPWSTR *ppszFrameName) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, ppszFrameName); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetParentFrame(ITargetFrame *iface, IUnknown **ppunkParent) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, ppunkParent); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_FindFrame(ITargetFrame *iface, LPCWSTR pszTargetName, + IUnknown *ppunkContextFrame, DWORD dwFlags, IUnknown **ppunkTargetFrame) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%s %p %x %p)\n", This, debugstr_w(pszTargetName), + ppunkContextFrame, dwFlags, ppunkTargetFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_SetFrameSrc(ITargetFrame *iface, LPCWSTR pszFrameSrc) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(pszFrameSrc)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFrameSrc(ITargetFrame *iface, LPWSTR *ppszFrameSrc) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, ppszFrameSrc); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFramesContainer(ITargetFrame *iface, IOleContainer **ppContainer) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, ppContainer); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_SetFrameOptions(ITargetFrame *iface, DWORD dwFlags) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%x)\n", This, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFrameOptions(ITargetFrame *iface, DWORD *pdwFlags) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, pdwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_SetFrameMargins(ITargetFrame *iface, DWORD dwWidth, DWORD dwHeight) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%d %d)\n", This, dwWidth, dwHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFrameMargins(ITargetFrame *iface, DWORD *pdwWidth, DWORD *pdwHeight) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p %p)\n", This, pdwWidth, pdwHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_RemoteNavigate(ITargetFrame *iface, ULONG cLength, ULONG *pulData) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%u %p)\n", This, cLength, pulData); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_OnChildFrameActivate(ITargetFrame *iface, IUnknown *pUnkChildFrame) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, pUnkChildFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_OnChildFrameDeactivate(ITargetFrame *iface, IUnknown *pUnkChildFrame) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, pUnkChildFrame); + return E_NOTIMPL; +} + +static const ITargetFrameVtbl TargetFrameVtbl = { + TargetFrame_QueryInterface, + TargetFrame_AddRef, + TargetFrame_Release, + TargetFrame_SetFrameName, + TargetFrame_GetFrameName, + TargetFrame_GetParentFrame, + TargetFrame_FindFrame, + TargetFrame_SetFrameSrc, + TargetFrame_GetFrameSrc, + TargetFrame_GetFramesContainer, + TargetFrame_SetFrameOptions, + TargetFrame_GetFrameOptions, + TargetFrame_SetFrameMargins, + TargetFrame_GetFrameMargins, + TargetFrame_RemoteNavigate, + TargetFrame_OnChildFrameActivate, + TargetFrame_OnChildFrameDeactivate +}; + static inline HlinkFrame *impl_from_ITargetFrame2(ITargetFrame2 *iface) { return CONTAINING_RECORD(iface, HlinkFrame, ITargetFrame2_iface); @@ -1517,6 +1660,9 @@ BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IHlinkFrame, riid)) { TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv); *ppv = &This->IHlinkFrame_iface; + }else if(IsEqualGUID(&IID_ITargetFrame, riid)) { + TRACE("(%p)->(IID_ITargetFrame %p)\n", This, ppv); + *ppv = &This->ITargetFrame_iface; }else if(IsEqualGUID(&IID_ITargetFrame2, riid)) { TRACE("(%p)->(IID_ITargetFrame2 %p)\n", This, ppv); *ppv = &This->ITargetFrame2_iface; @@ -1539,7 +1685,8 @@ BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) void HlinkFrame_Init(HlinkFrame *This, IUnknown *outer, DocHost *doc_host) { - This->IHlinkFrame_iface.lpVtbl = &HlinkFrameVtbl; + This->IHlinkFrame_iface.lpVtbl = &HlinkFrameVtbl; + This->ITargetFrame_iface.lpVtbl = &TargetFrameVtbl; This->ITargetFrame2_iface.lpVtbl = &TargetFrame2Vtbl; This->ITargetFramePriv2_iface.lpVtbl = &TargetFramePriv2Vtbl; This->IWebBrowserPriv2IE9_iface.lpVtbl = &WebBrowserPriv2IE9Vtbl; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index b2bbebd..4d28073 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "exdisp.h" #include "htiframe.h" +#include "htiface.h" #include "mshtmhst.h" #include "mshtmcid.h" #include "mshtml.h" @@ -3547,6 +3548,11 @@ static void test_dochost_qs(IWebBrowser2 *webbrowser) ok(iface_cmp(service, (IUnknown*)webbrowser), "service != unk\n"); IUnknown_Release(service); + hres = IServiceProvider_QueryService(serv_prov, &IID_ITargetFrame, &IID_ITargetFrame, (void**)&service); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + ok(iface_cmp(service, (IUnknown*)webbrowser), "service != unk\n"); + IUnknown_Release(service); + hres = IServiceProvider_QueryService(serv_prov, &IID_IShellBrowser, &IID_IShellBrowser, (void**)&service); ok(hres == S_OK, "QueryService failed: %08x\n", hres); IUnknown_Release(service);

1 0

Piotr Caban : include: Fix ITargetFrame definition.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 219716ee4e665a67a09c243b0206da1e11815d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=219716ee4e665a67a09c243b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 11:30:59 2016 +0200 include: Fix ITargetFrame definition. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/htiface.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/htiface.idl b/include/htiface.idl index e82a7b4..f267da0 100644 --- a/include/htiface.idl +++ b/include/htiface.idl @@ -65,6 +65,24 @@ interface ITargetFrame: IUnknown HRESULT SetFrameSrc([in] LPCWSTR pszFrameSrc); HRESULT GetFrameSrc([out] LPWSTR *ppszFrameSrc); + HRESULT GetFramesContainer([out] IOleContainer **ppContainer); + HRESULT SetFrameOptions([in] DWORD dwFlags); + HRESULT GetFrameOptions([out] DWORD *pdwFlags); + + HRESULT SetFrameMargins( + [in] DWORD dwWidth, + [in] DWORD dwHeight); + + HRESULT GetFrameMargins( + [out] DWORD *pdwWidth, + [out] DWORD *pdwHeight); + + HRESULT RemoteNavigate( + [in] ULONG cLength, + [in, size_is(cLength)] ULONG *pulData); + + HRESULT OnChildFrameActivate([in] IUnknown *pUnkChildFrame); + HRESULT OnChildFrameDeactivate([in] IUnknown *pUnkChildFrame); } /*****************************************************************************

1 0

Hans Leidekker : webservices: Add support for repeating element field mappings in WsReadType.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: b807964ec99728e3d0058fdf0872b97838abeb33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b807964ec99728e3d0058fdf0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 14:12:19 2016 +0200 webservices: Add support for repeating element field mappings in WsReadType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 115 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 80 ++++++++++++++++++++++++++++ 2 files changed, 195 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 59fe8a1..b61c50c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -176,6 +176,12 @@ void *ws_realloc( WS_HEAP *handle, void *ptr, SIZE_T size ) return HeapReAlloc( heap->handle, 0, ptr, size ); } +static void *ws_realloc_zero( WS_HEAP *handle, void *ptr, SIZE_T size ) +{ + struct heap *heap = (struct heap *)handle; + return HeapReAlloc( heap->handle, HEAP_ZERO_MEMORY, ptr, size ); +} + void ws_free( WS_HEAP *handle, void *ptr ) { struct heap *heap = (struct heap *)handle; @@ -2528,10 +2534,112 @@ static HRESULT read_type_wsz( struct reader *reader, WS_TYPE_MAPPING mapping, return S_OK; } +static ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) +{ + switch (type) + { + case WS_INT8_TYPE: + case WS_UINT8_TYPE: + return sizeof(INT8); + + case WS_INT16_TYPE: + case WS_UINT16_TYPE: + return sizeof(INT16); + + case WS_BOOL_TYPE: + case WS_INT32_TYPE: + case WS_UINT32_TYPE: + return sizeof(INT32); + + case WS_INT64_TYPE: + case WS_UINT64_TYPE: + return sizeof(INT64); + + case WS_WSZ_TYPE: + return sizeof(WCHAR *); + + case WS_STRUCT_TYPE: + return desc->size; + + default: + ERR( "unhandled type %u\n", type ); + return 0; + } +} + static HRESULT read_type( struct reader *, WS_TYPE_MAPPING, WS_TYPE, const WS_XML_STRING *, const WS_XML_STRING *, const void *, WS_READ_OPTION, WS_HEAP *, void *, ULONG ); +static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, + WS_READ_OPTION option, WS_HEAP *heap, void **ret, + ULONG size, ULONG *count ) +{ + HRESULT hr; + ULONG item_size, nb_items = 0, nb_allocated = 1, offset = 0; + char *buf; + + if (desc->itemRange) + FIXME( "ignoring range (%u-%u)\n", desc->itemRange->minItemCount, desc->itemRange->maxItemCount ); + + /* wrapper element */ + if (desc->localName && ((hr = read_node( reader )) != S_OK)) return hr; + + item_size = get_type_size( desc->type, desc->typeDescription ); + if (!(buf = ws_alloc_zero( heap, item_size ))) return WS_E_QUOTA_EXCEEDED; + for (;;) + { + if (nb_items >= nb_allocated) + { + if (!(buf = ws_realloc_zero( heap, buf, nb_allocated * 2 * item_size ))) + return WS_E_QUOTA_EXCEEDED; + nb_allocated *= 2; + } + hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->itemLocalName, desc->itemNs, + desc->typeDescription, WS_READ_REQUIRED_VALUE, heap, buf + offset, item_size ); + if (hr == WS_E_INVALID_FORMAT) break; + if (hr != S_OK) + { + ws_free( heap, buf ); + return hr; + } + if ((hr = read_node( reader )) != S_OK) + { + ws_free( heap, buf ); + return hr; + } + offset += item_size; + nb_items++; + } + + if (desc->localName && ((hr = read_node( reader )) != S_OK)) return hr; + + if (!nb_items) + { + ws_free( heap, buf ); + buf = NULL; + } + + switch (option) + { + case WS_READ_REQUIRED_POINTER: + if (!nb_items) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_OPTIONAL_POINTER: + if (size < sizeof(void *)) return E_INVALIDARG; + *ret = buf; + break; + + default: + FIXME( "read option %u not supported\n", option ); + return E_NOTIMPL; + } + + *count = nb_items; + return S_OK; +} + static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_READ_OPTION option, WS_HEAP *heap, void *ret, ULONG size ) { @@ -2598,6 +2706,13 @@ static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DES desc->typeDescription, option, heap, ptr, size ); break; + case WS_REPEATING_ELEMENT_FIELD_MAPPING: + { + ULONG count; + hr = read_type_repeating_element( reader, desc, option, heap, (void **)ptr, size, &count ); + if (hr == S_OK) *(ULONG *)(ptr + desc->countOffset) = count; + break; + } case WS_TEXT_FIELD_MAPPING: hr = read_type_text( reader, desc, option, heap, ptr, size ); break; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 027b6f4..755a070 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -71,6 +71,12 @@ static const char data11[] = "</o:services>" "</o:OfficeConfig>"; +static const char data12[] = + "<services>" + "<service><id>1</id></service>" + "<service><id>2</id></service>" + "</services>"; + static void test_WsCreateError(void) { HRESULT hr; @@ -2642,6 +2648,79 @@ static void test_complex_struct_type(void) WsFreeError( error ); } +static void test_repeating_element(void) +{ + WS_XML_STRING str_services = {8, (BYTE *)"services"}; + WS_XML_STRING str_service = {7, (BYTE *)"service"}; + WS_XML_STRING str_id = {2, (BYTE *)"id"}; + WS_XML_STRING str_ns = {0, NULL}; + HRESULT hr; + WS_XML_READER *reader; + WS_HEAP *heap; + WS_STRUCT_DESCRIPTION s, s2; + WS_FIELD_DESCRIPTION f, f2, *fields[1], *fields2[1]; + struct service + { + UINT32 id; + }; + struct services + { + struct service *service; + ULONG service_count; + } *test; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + prepare_struct_type_test( reader, data12 ); + + memset( &f2, 0, sizeof(f2) ); + f2.mapping = WS_ELEMENT_FIELD_MAPPING; + f2.localName = &str_id; + f2.ns = &str_ns; + f2.type = WS_UINT32_TYPE; + fields2[0] = &f2; + + memset( &s2, 0, sizeof(s2) ); + s2.size = sizeof(struct service); + s2.alignment = TYPE_ALIGNMENT(struct service); + s2.fields = fields2; + s2.fieldCount = 1; + s2.typeLocalName = &str_service; + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_REPEATING_ELEMENT_FIELD_MAPPING; + f.countOffset = FIELD_OFFSET(struct services, service_count); + f.type = WS_STRUCT_TYPE; + f.typeDescription = &s2; + f.itemLocalName = &str_service; + f.itemNs = &str_ns; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct services); + s.alignment = TYPE_ALIGNMENT(struct services); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_services; + + test = NULL; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + ok( test->service != NULL, "service not set\n" ); + ok( test->service_count == 2, "got %u\n", test->service_count ); + ok( test->service[0].id == 1, "got %u\n", test->service[0].id ); + ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); + + WsFreeReader( reader ); + WsFreeHeap( heap ); +} + START_TEST(reader) { test_WsCreateError(); @@ -2665,4 +2744,5 @@ START_TEST(reader) test_WsGetNamespaceFromPrefix(); test_text_field_mapping(); test_complex_struct_type(); + test_repeating_element(); }

1 0

Hans Leidekker : webservices/tests: Add more structure type tests.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 5650300786be22f9c6549465742b0a3a64bb4f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5650300786be22f9c65494657… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 14:12:18 2016 +0200 webservices/tests: Add more structure type tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 153 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 5e8dd93..027b6f4 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -64,6 +64,13 @@ static const char data9[] = static const char data10[] = "<a></b>"; +static const char data11[] = + "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" + "<o:services o:GenerationTime=\"2015-09-03T18:47:54\">" + "" + "</o:services>" + "</o:OfficeConfig>"; + static void test_WsCreateError(void) { HRESULT hr; @@ -2490,6 +2497,151 @@ static void test_text_field_mapping(void) WsFreeHeap( heap ); } +static void test_complex_struct_type(void) +{ + static const WCHAR timestampW[] = + {'2','0','1','5','-','0','9','-','0','3','T','1','8',':','4','7',':','5','4',0}; + HRESULT hr; + WS_ERROR *error; + WS_ERROR_PROPERTY prop; + WS_XML_READER *reader; + WS_HEAP *heap; + WS_STRUCT_DESCRIPTION s, s2; + WS_FIELD_DESCRIPTION f, f2, *fields[1], *fields2[1]; + WS_XML_STRING str_officeconfig = {12, (BYTE *)"OfficeConfig"}; + WS_XML_STRING str_services = {8, (BYTE *)"services"}; + WS_XML_STRING str_generationtime = {14, (BYTE *)"GenerationTime"}; + WS_XML_STRING ns = {39, (BYTE *)"urn:schemas-microsoft-com:office:office"}; + LANGID langid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + const WS_XML_NODE *node; + const WS_XML_ELEMENT_NODE *elem; + struct services + { + WCHAR *generationtime; + }; + struct officeconfig + { + struct services *services; + } *test; + + prop.id = WS_ERROR_PROPERTY_LANGID; + prop.value = &langid; + prop.valueSize = sizeof(langid); + hr = WsCreateError( &prop, 1, &error ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + /* element content type mapping */ + prepare_struct_type_test( reader, data11 ); + + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( elem->localName->length == 12, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "OfficeConfig", 12 ), "wrong data\n" ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( elem->localName->length == 8, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "services", 8 ), "wrong data\n" ); + + memset( &f2, 0, sizeof(f2) ); + f2.mapping = WS_ATTRIBUTE_FIELD_MAPPING; + f2.localName = &str_generationtime; + f2.ns = &ns; + f2.type = WS_WSZ_TYPE; + f2.options = WS_FIELD_OPTIONAL; + fields2[0] = &f2; + + memset( &s2, 0, sizeof(s2) ); + s2.size = sizeof(*test->services); + s2.alignment = TYPE_ALIGNMENT(struct services); + s2.fields = fields2; + s2.fieldCount = 1; + s2.typeLocalName = &str_services; + s2.typeNs = &ns; + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_ELEMENT_FIELD_MAPPING; + f.localName = &str_services; + f.ns = &ns; + f.type = WS_STRUCT_TYPE; + f.typeDescription = &s2; + f.options = WS_FIELD_POINTER; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(*test); + s.alignment = TYPE_ALIGNMENT(struct officeconfig); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_officeconfig; + s.typeNs = &ns; + + test = NULL; + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + ok( !lstrcmpW( test->services->generationtime, timestampW ), "wrong data\n" ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + /* element type mapping */ + prepare_struct_type_test( reader, data11 ); + + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( elem->localName->length == 12, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "OfficeConfig", 12 ), "wrong data\n" ); + + test = NULL; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + if (test) ok( !lstrcmpW( test->services->generationtime, timestampW ), "wrong data\n" ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + WsFreeReader( reader ); + WsFreeHeap( heap ); + WsFreeError( error ); +} + START_TEST(reader) { test_WsCreateError(); @@ -2512,4 +2664,5 @@ START_TEST(reader) test_WsFindAttribute(); test_WsGetNamespaceFromPrefix(); test_text_field_mapping(); + test_complex_struct_type(); }

1 0

Hans Leidekker : webservices: Add support for text field mappings in WsReadType.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 805143d40b2f0654345d6f9d74e4cec806a037a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805143d40b2f0654345d6f9d7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 14:12:17 2016 +0200 webservices: Add support for text field mappings in WsReadType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 18 +++++++++++++++++ dlls/webservices/tests/reader.c | 45 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index c97fd7e..59fe8a1 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2532,6 +2532,20 @@ static HRESULT read_type( struct reader *, WS_TYPE_MAPPING, WS_TYPE, const WS_XM const WS_XML_STRING *, const void *, WS_READ_OPTION, WS_HEAP *, void *, ULONG ); +static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, + WS_READ_OPTION option, WS_HEAP *heap, void *ret, ULONG size ) +{ + HRESULT hr; + BOOL found; + + if ((hr = read_to_startelement( reader, &found )) != S_OK) return S_OK; + if (!found) return WS_E_INVALID_FORMAT; + if ((hr = read_node( reader )) != S_OK) return hr; + + return read_type( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, desc->type, NULL, NULL, + desc->typeDescription, option, heap, ret, size ); +} + static WS_READ_OPTION map_field_options( WS_TYPE type, ULONG options ) { if (options & !(WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) @@ -2584,6 +2598,10 @@ static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DES desc->typeDescription, option, heap, ptr, size ); break; + case WS_TEXT_FIELD_MAPPING: + hr = read_type_text( reader, desc, option, heap, ptr, size ); + break; + default: FIXME( "unhandled field mapping %u\n", desc->mapping ); return E_NOTIMPL; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 38675db..5e8dd93 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -2446,6 +2446,50 @@ static void test_WsGetNamespaceFromPrefix(void) WsFreeReader( reader ); } +static void test_text_field_mapping(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + HRESULT hr; + WS_XML_READER *reader; + WS_HEAP *heap; + WS_STRUCT_DESCRIPTION s; + WS_FIELD_DESCRIPTION f, *fields[1]; + struct test + { + WCHAR *str; + } *test; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<a>test</a>" ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_WSZ_TYPE; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 1; + + test = NULL; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + ok( test->str != NULL, "str not set\n" ); + ok( !lstrcmpW( test->str, testW ), "got %s\n", wine_dbgstr_w(test->str) ); + + WsFreeReader( reader ); + WsFreeHeap( heap ); +} + START_TEST(reader) { test_WsCreateError(); @@ -2467,4 +2511,5 @@ START_TEST(reader) test_cdata(); test_WsFindAttribute(); test_WsGetNamespaceFromPrefix(); + test_text_field_mapping(); }

1 0

Hans Leidekker : webservices: Add a helper to determine node type.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 49bc8b4cc7109c7deab1e7fa15ad47a0cc50f41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49bc8b4cc7109c7deab1e7fa1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 14:12:16 2016 +0200 webservices: Add a helper to determine node type. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 38 +++++++++++++++++----------------- dlls/webservices/webservices_private.h | 5 +++++ dlls/webservices/writer.c | 10 ++++----- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9ae6254..c97fd7e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -303,7 +303,7 @@ void free_attribute( WS_XML_ATTRIBUTE *attr ) void free_node( struct node *node ) { if (!node) return; - switch (node->hdr.node.nodeType) + switch (node_type( node )) { case WS_XML_NODE_TYPE_ELEMENT: { @@ -337,7 +337,7 @@ void free_node( struct node *node ) break; default: - ERR( "unhandled type %u\n", node->hdr.node.nodeType ); + ERR( "unhandled type %u\n", node_type( node ) ); break; } heap_free( node ); @@ -1117,12 +1117,12 @@ static struct node *read_find_parent( struct reader *reader, const WS_XML_STRING for (parent = reader->current; parent; parent = parent->parent) { - if (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_BOF) + if (node_type( parent ) == WS_XML_NODE_TYPE_BOF) { if (!localname) return parent; return NULL; } - else if (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + else if (node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) { if (!localname) return parent; @@ -1540,7 +1540,7 @@ static BOOL move_to_root_element( struct reader *reader ) if (!(ptr = list_head( &reader->root->children ))) return FALSE; node = LIST_ENTRY( ptr, struct node, entry ); - if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + if (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT) { reader->current = node; return TRUE; @@ -1548,7 +1548,7 @@ static BOOL move_to_root_element( struct reader *reader ) while ((ptr = list_next( &reader->root->children, &node->entry ))) { struct node *next = LIST_ENTRY( ptr, struct node, entry ); - if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + if (node_type( next ) == WS_XML_NODE_TYPE_ELEMENT) { reader->current = next; return TRUE; @@ -1566,7 +1566,7 @@ static BOOL move_to_next_element( struct reader *reader ) while ((ptr = list_next( &node->parent->children, &node->entry ))) { struct node *next = LIST_ENTRY( ptr, struct node, entry ); - if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + if (node_type( next ) == WS_XML_NODE_TYPE_ELEMENT) { reader->current = next; return TRUE; @@ -1584,7 +1584,7 @@ static BOOL move_to_prev_element( struct reader *reader ) while ((ptr = list_prev( &node->parent->children, &node->entry ))) { struct node *prev = LIST_ENTRY( ptr, struct node, entry ); - if (prev->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + if (node_type( prev ) == WS_XML_NODE_TYPE_ELEMENT) { reader->current = prev; return TRUE; @@ -1601,7 +1601,7 @@ static BOOL move_to_child_element( struct reader *reader ) if (!(ptr = list_head( &reader->current->children ))) return FALSE; node = LIST_ENTRY( ptr, struct node, entry ); - if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + if (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT) { reader->current = node; return TRUE; @@ -1609,7 +1609,7 @@ static BOOL move_to_child_element( struct reader *reader ) while ((ptr = list_next( &reader->current->children, &node->entry ))) { struct node *next = LIST_ENTRY( ptr, struct node, entry ); - if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + if (node_type( next ) == WS_XML_NODE_TYPE_ELEMENT) { reader->current = next; return TRUE; @@ -1624,12 +1624,12 @@ static BOOL move_to_end_element( struct reader *reader ) struct list *ptr; struct node *node = reader->current; - if (node->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) return FALSE; + if (node_type( node ) != WS_XML_NODE_TYPE_ELEMENT) return FALSE; if ((ptr = list_tail( &node->children ))) { struct node *tail = LIST_ENTRY( ptr, struct node, entry ); - if (tail->hdr.node.nodeType == WS_XML_NODE_TYPE_END_ELEMENT) + if (node_type( tail ) == WS_XML_NODE_TYPE_END_ELEMENT) { reader->current = tail; return TRUE; @@ -1642,8 +1642,8 @@ static BOOL move_to_parent_element( struct reader *reader ) { struct node *parent = reader->current->parent; - if (parent && (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT || - parent->hdr.node.nodeType == WS_XML_NODE_TYPE_BOF)) + if (parent && (node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT || + node_type( parent ) == WS_XML_NODE_TYPE_BOF)) { reader->current = parent; return TRUE; @@ -1905,7 +1905,7 @@ static HRESULT read_get_node_text( struct reader *reader, WS_XML_UTF8_TEXT **ret { WS_XML_TEXT_NODE *text; - if (reader->current->hdr.node.nodeType != WS_XML_NODE_TYPE_TEXT) + if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; text = (WS_XML_TEXT_NODE *)&reader->current->hdr.node; @@ -1923,7 +1923,7 @@ static HRESULT read_get_attribute_text( struct reader *reader, ULONG index, WS_X WS_XML_ELEMENT_NODE *elem = &reader->current->hdr; WS_XML_ATTRIBUTE *attr; - if (reader->current->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) + if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT) return WS_E_INVALID_FORMAT; attr = elem->attributes[index]; @@ -1977,7 +1977,7 @@ HRESULT WINAPI WsFindAttribute( WS_XML_READER *handle, const WS_XML_STRING *loca if (!reader || !localname || !ns || !index) return E_INVALIDARG; - if (reader->current->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) + if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT) return WS_E_INVALID_OPERATION; if (!find_attribute( reader, localname, ns, index )) @@ -2689,7 +2689,7 @@ static BOOL is_empty_text_node( const struct node *node ) const WS_XML_UTF8_TEXT *utf8; ULONG i; - if (node->hdr.node.nodeType != WS_XML_NODE_TYPE_TEXT) return FALSE; + if (node_type( node ) != WS_XML_NODE_TYPE_TEXT) return FALSE; if (text->text->textType != WS_XML_TEXT_TYPE_UTF8) { ERR( "unhandled text type %u\n", text->text->textType ); @@ -2719,7 +2719,7 @@ static HRESULT read_type_next_node( struct reader *reader, const WS_XML_STRING * for (;;) { if ((hr = read_node( reader ) != S_OK)) return hr; - type = reader->current->hdr.node.nodeType; + type = node_type( reader->current ); if (type == WS_XML_NODE_TYPE_COMMENT || (type == WS_XML_NODE_TYPE_TEXT && is_empty_text_node( reader->current ))) continue; break; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index aa14416..548da06 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -46,6 +46,11 @@ struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN; void free_node( struct node * ) DECLSPEC_HIDDEN; void destroy_nodes( struct node * ) DECLSPEC_HIDDEN; +static inline WS_XML_NODE_TYPE node_type( const struct node *node ) +{ + return node->hdr.node.nodeType; +} + static inline void *heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 0c5f3cf5..8f6c6aa 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -601,8 +601,8 @@ static struct node *write_find_parent_element( struct writer *writer ) { struct node *node = writer->current; - if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) return node; - if (node->parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) return node->parent; + if (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT) return node; + if (node_type( node->parent ) == WS_XML_NODE_TYPE_ELEMENT) return node->parent; return NULL; } @@ -894,15 +894,15 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { struct node *node; - WS_XML_ELEMENT_NODE *elem, *current = &writer->current->hdr; + WS_XML_ELEMENT_NODE *elem; HRESULT hr; /* flush current start element if necessary */ if (writer->state == WRITER_STATE_STARTELEMENT && ((hr = write_endstartelement( writer )) != S_OK)) return hr; - if (!prefix && current->node.nodeType == WS_XML_NODE_TYPE_ELEMENT) - prefix = current->prefix; + if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT) + prefix = writer->current->hdr.prefix; if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) return E_OUTOFMEMORY; elem = &node->hdr;

1 0

Hans Leidekker : webservices: Fix memory leaks on error paths in WsCreateReader.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: e4a68fd57657d58d733f9813d2a675cab1a4bf10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a68fd57657d58d733f9813d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 14:12:15 2016 +0200 webservices: Fix memory leaks on error paths in WsCreateReader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7adc283..9ae6254 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -464,6 +464,15 @@ static void clear_prefixes( struct prefix *prefixes, ULONG count ) } } +static void free_reader( struct reader *reader ) +{ + if (!reader) return; + destroy_nodes( reader->root ); + clear_prefixes( reader->prefixes, reader->nb_prefixes ); + heap_free( reader->prefixes ); + heap_free( reader ); +} + static HRESULT set_prefix( struct prefix *prefix, const WS_XML_STRING *str, const WS_XML_STRING *ns ) { if (str) @@ -608,14 +617,14 @@ HRESULT WINAPI WsCreateReader( const WS_XML_READER_PROPERTY *properties, ULONG c hr = set_reader_prop( reader, properties[i].id, properties[i].value, properties[i].valueSize ); if (hr != S_OK) { - heap_free( reader ); + free_reader( reader ); return hr; } } if ((hr = read_init_state( reader )) != S_OK) { - heap_free( reader ); + free_reader( reader ); return hr; } @@ -631,12 +640,7 @@ void WINAPI WsFreeReader( WS_XML_READER *handle ) struct reader *reader = (struct reader *)handle; TRACE( "%p\n", handle ); - - if (!reader) return; - destroy_nodes( reader->root ); - clear_prefixes( reader->prefixes, reader->nb_prefixes ); - heap_free( reader->prefixes ); - heap_free( reader ); + free_reader( reader ); } /**************************************************************************

1 0

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