March 2016 - Wine-commits - list.winehq.org

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

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

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

Hans Leidekker : webservices: Add support for optional values in WsReadType.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: f162da498fee2d25fb03932b06074a465671d97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f162da498fee2d25fb03932b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 14:12:14 2016 +0200 webservices: Add support for optional values in WsReadType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 816 +++++++++++++++++++++++---------- dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 2 +- 3 files changed, 568 insertions(+), 251 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f162da498fee2d25fb039…

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

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: 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/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 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

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