September 2010 - Wine-commits

Alexandre Julliard : ws2_32/tests: Fix some buffer overflows in traces.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 9f2c51800dacf11cf93dc4aeb5d5ea6c3c9d6cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2c51800dacf11cf93dc4aeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 21:07:54 2010 +0200 ws2_32/tests: Fix some buffer overflows in traces. --- dlls/ws2_32/tests/sock.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e61d550..631fcda 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2629,23 +2629,22 @@ static void get_event_details(int event, int *bit, char *name) } } -static char *dbgstr_event_seq(const LPARAM *seq) +static const char *dbgstr_event_seq(const LPARAM *seq) { static char message[1024]; - char name[10]; + char name[12]; + int len = 1; message[0] = '['; message[1] = 0; while (*seq) { get_event_details(WSAGETSELECTEVENT(*seq), NULL, name); - - sprintf(message, "%s%s%s(%d)", message, message[1] == 0 ? "" : " ", - name, WSAGETSELECTERROR(*seq)); - + len += sprintf(message + len, "%s(%d) ", name, WSAGETSELECTERROR(*seq)); seq++; } - strcat(message, "]"); + if (len > 1) len--; + strcpy( message + len, "]" ); return message; } @@ -2654,7 +2653,8 @@ static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents) static char message[1024]; struct async_message *curr = messages_received; int index, error, bit = 0; - char name[10]; + char name[12]; + int len = 1; message[0] = '['; message[1] = 0; @@ -2685,10 +2685,10 @@ static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents) curr = curr->next; } - sprintf(message, "%s%s%s(%d)", message, message[1] == 0 ? "" : " ", - name, error); + len += sprintf(message + len, "%s(%d) ", name, error); } - strcat(message, "]"); + if (len > 1) len--; + strcpy( message + len, "]" ); return message; }

1 0

Jacek Caban : msxml3: Store outer iface as IXMLDOMNode instead of IUnknown in xmlnode.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: f5348b25aff4642956891ef267a06341aed0f1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5348b25aff4642956891ef26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 4 17:54:13 2010 +0200 msxml3: Store outer iface as IXMLDOMNode instead of IUnknown in xmlnode. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/msxml_private.h | 4 ++-- dlls/msxml3/node.c | 18 +++++++++--------- dlls/msxml3/pi.c | 2 +- dlls/msxml3/text.c | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 0bdc691..327f91c 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -556,7 +556,7 @@ IUnknown* create_attribute( xmlNodePtr attribute ) This->lpVtbl = &domattr_vtbl; This->ref = 1; - init_xmlnode(&This->node, attribute, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, attribute, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 373bbc8..b23d19d 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -835,7 +835,7 @@ IUnknown* create_cdata( xmlNodePtr text ) This->lpVtbl = &domcdata_vtbl; This->ref = 1; - init_xmlnode(&This->node, text, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 74d036d..6e7b77e 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -781,7 +781,7 @@ IUnknown* create_comment( xmlNodePtr comment ) This->lpVtbl = &domcomment_vtbl; This->ref = 1; - init_xmlnode(&This->node, comment, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, comment, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index d1b5b8c..9ca63d3 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -526,7 +526,7 @@ IUnknown* create_doc_fragment( xmlNodePtr fragment ) This->lpVtbl = &domfrag_vtbl; This->ref = 1; - init_xmlnode(&This->node, fragment, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, fragment, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 98045a0..3f01329 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2404,7 +2404,7 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **docu doc->safeopt = 0; doc->bsc = NULL; - init_xmlnode(&doc->node, (xmlNodePtr)xmldoc, (IUnknown*)&doc->lpVtbl, &domdoc_dispex); + init_xmlnode(&doc->node, (xmlNodePtr)xmldoc, (IXMLDOMNode*)&doc->lpVtbl, &domdoc_dispex); *document = (IXMLDOMDocument3*)&doc->lpVtbl; diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4c557ef..5b4a604 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -801,7 +801,7 @@ IUnknown* create_element( xmlNodePtr element ) This->lpVtbl = &domelem_vtbl; This->ref = 1; - init_xmlnode(&This->node, element, (IUnknown*)&This->lpVtbl, &domelem_dispex); + init_xmlnode(&This->node, element, (IXMLDOMNode*)&This->lpVtbl, &domelem_dispex); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index f583141..c55fd18 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -525,7 +525,7 @@ IUnknown* create_doc_entity_ref( xmlNodePtr entity ) This->lpVtbl = &entityref_vtbl; This->ref = 1; - init_xmlnode(&This->node, entity, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, entity, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 2210574..fe843b8 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -145,7 +145,7 @@ typedef struct _xmlnode { DispatchEx dispex; const struct IXMLDOMNodeVtbl *lpVtbl; - IUnknown *pUnkOuter; + IXMLDOMNode *iface; LONG ref; xmlNodePtr node; } xmlnode; @@ -160,7 +160,7 @@ static inline IXMLDOMNode *IXMLDOMNode_from_impl(xmlnode *This) return (IXMLDOMNode*)&This->lpVtbl; } -extern void init_xmlnode(xmlnode*,xmlNodePtr,IUnknown*,dispex_static_data_t*); +extern void init_xmlnode(xmlnode*,xmlNodePtr,IXMLDOMNode*,dispex_static_data_t*); extern void destroy_xmlnode(xmlnode*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 2c6df32..5b9eee4 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -89,8 +89,8 @@ static HRESULT WINAPI xmlnode_QueryInterface( TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); - if(This->pUnkOuter) - return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); + if(This->iface) + return IXMLDOMNode_QueryInterface(This->iface, riid, ppvObject); if (IsEqualGUID(riid, &IID_IUnknown)) { *ppvObject = iface; @@ -112,8 +112,8 @@ static ULONG WINAPI xmlnode_AddRef( { xmlnode *This = impl_from_IXMLDOMNode( iface ); - if(This->pUnkOuter) - return IUnknown_AddRef(This->pUnkOuter); + if(This->iface) + return IXMLDOMNode_AddRef(This->iface); return InterlockedIncrement(&This->ref); } @@ -124,8 +124,8 @@ static ULONG WINAPI xmlnode_Release( xmlnode *This = impl_from_IXMLDOMNode( iface ); LONG ref; - if(This->pUnkOuter) - return IUnknown_Release(This->pUnkOuter); + if(This->iface) + return IXMLDOMNode_Release(This->iface); ref = InterlockedDecrement( &This->ref ); if(!ref) { @@ -1713,7 +1713,7 @@ void destroy_xmlnode(xmlnode *This) xmldoc_release(This->node->doc); } -void init_xmlnode(xmlnode *This, xmlNodePtr node, IUnknown *outer, dispex_static_data_t *dispex_data ) +void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispex_static_data_t *dispex_data) { if(node) xmldoc_add_ref( node->doc ); @@ -1721,10 +1721,10 @@ void init_xmlnode(xmlnode *This, xmlNodePtr node, IUnknown *outer, dispex_static This->lpVtbl = &xmlnode_vtbl; This->ref = 1; This->node = node; - This->pUnkOuter = outer; + This->iface = node_iface; if(dispex_data) - init_dispex(&This->dispex, This->pUnkOuter, dispex_data); + init_dispex(&This->dispex, (IUnknown*)This->iface, dispex_data); } IXMLDOMNode *create_node( xmlNodePtr node ) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 4a5e621..2c70cc7 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -611,7 +611,7 @@ IUnknown* create_pi( xmlNodePtr pi ) This->lpVtbl = &dom_pi_vtbl; This->ref = 1; - init_xmlnode(&This->node, pi, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, pi, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index a087076..d3da258 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -811,7 +811,7 @@ IUnknown* create_text( xmlNodePtr text ) This->lpVtbl = &domtext_vtbl; This->ref = 1; - init_xmlnode(&This->node, text, (IUnknown*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->lpVtbl, NULL); return (IUnknown*) &This->lpVtbl; }

1 0

Jacek Caban : msxml3: Added node_query_inerface function for common xmlnode child objects implementation .
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 0670d092f137da408fe2f3ed0119a1a08ea1a932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0670d092f137da408fe2f3ed0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 4 17:54:46 2010 +0200 msxml3: Added node_query_inerface function for common xmlnode child objects implementation. --- dlls/msxml3/attribute.c | 4 ++++ dlls/msxml3/cdata.c | 4 ++++ dlls/msxml3/comment.c | 4 ++++ dlls/msxml3/docfrag.c | 4 ++++ dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 4 ++++ dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 11 +++++++++++ dlls/msxml3/pi.c | 4 ++++ dlls/msxml3/text.c | 4 ++++ 11 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 327f91c..3554859 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -67,6 +67,10 @@ static HRESULT WINAPI domattr_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index b23d19d..e378295 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -74,6 +74,10 @@ static HRESULT WINAPI domcdata_QueryInterface( TRACE("Unsupported interface\n"); return E_NOINTERFACE; } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 6e7b77e..f496625 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -68,6 +68,10 @@ static HRESULT WINAPI domcomment_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 9ca63d3..b013deb 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -67,6 +67,10 @@ static HRESULT WINAPI domfrag_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3f01329..8fdf5c1 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -545,7 +545,7 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID rii { *ppvObject = &This->lpvtblISupportErrorInfo; } - else if(dispex_query_interface(&This->node.dispex, riid, ppvObject)) + else if(node_query_interface(&This->node, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 5b4a604..6247269 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -74,7 +74,7 @@ static HRESULT WINAPI domelem_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } - else if(dispex_query_interface(&This->node.dispex, riid, ppvObject)) + else if(node_query_interface(&This->node, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index c55fd18..396db9b 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -67,6 +67,10 @@ static HRESULT WINAPI entityref_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index fe843b8..e8251bb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -162,6 +162,7 @@ static inline IXMLDOMNode *IXMLDOMNode_from_impl(xmlnode *This) extern void init_xmlnode(xmlnode*,xmlNodePtr,IXMLDOMNode*,dispex_static_data_t*); extern void destroy_xmlnode(xmlnode*); +extern BOOL node_query_interface(xmlnode*,REFIID,void**); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 5b9eee4..a2e175e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -80,6 +80,13 @@ xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ) return This->node; } +BOOL node_query_interface(xmlnode *This, REFIID riid, void **ppv) +{ + if(This->dispex.outer) + return dispex_query_interface(&This->dispex, riid, ppv); + return FALSE; +} + static HRESULT WINAPI xmlnode_QueryInterface( IXMLDOMNode *iface, REFIID riid, @@ -97,6 +104,8 @@ static HRESULT WINAPI xmlnode_QueryInterface( }else if (IsEqualGUID( riid, &IID_IDispatch) || IsEqualGUID( riid, &IID_IXMLDOMNode)) { *ppvObject = &This->lpVtbl; + }else if(node_query_interface(This, riid, ppvObject)) { + return *ppvObject ? S_OK : E_NOINTERFACE; }else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; @@ -1725,6 +1734,8 @@ void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispe if(dispex_data) init_dispex(&This->dispex, (IUnknown*)This->iface, dispex_data); + else + This->dispex.outer = NULL; } IXMLDOMNode *create_node( xmlNodePtr node ) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 2c70cc7..0b2a7e7 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -67,6 +67,10 @@ static HRESULT WINAPI dom_pi_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index d3da258..0ae5aa6 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -69,6 +69,10 @@ static HRESULT WINAPI domtext_QueryInterface( { *ppvObject = IXMLDOMNode_from_impl(&This->node); } + else if(node_query_interface(&This->node, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) ) {

1 0

Jacek Caban : msxml3: Use fake IID to safely cast IXMLDOMNode interface to xmlnode object.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: a92e95eab16e0c6e0a97b241c6c5b0b9a96ee1fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a92e95eab16e0c6e0a97b241c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 4 17:55:04 2010 +0200 msxml3: Use fake IID to safely cast IXMLDOMNode interface to xmlnode object. --- dlls/msxml3/domdoc.c | 6 ++- dlls/msxml3/msxml_private.h | 6 +-- dlls/msxml3/node.c | 146 +++++++++++++++++++++++++----------------- dlls/msxml3/nodemap.c | 38 +++++------- 4 files changed, 108 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a92e95eab16e0c6e0a97b…

1 0

Jacek Caban : msxml3: Use separate object for unknown node type implementation.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 4f61cd2840538483eaf2feb48fd734ec3a4bfa14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f61cd2840538483eaf2feb48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 4 17:55:27 2010 +0200 msxml3: Use separate object for unknown node type implementation. --- dlls/msxml3/msxml_private.h | 1 - dlls/msxml3/node.c | 518 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 496 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f61cd2840538483eaf2f…

1 0

Jacek Caban : msxml3: Use get_node_obj to get xmlnode from iface in replaceChild implementation.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 8a82ae668acdcef442b1c490107def73a58cc725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a82ae668acdcef442b1c4901… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 4 17:55:42 2010 +0200 msxml3: Use get_node_obj to get xmlnode from iface in replaceChild implementation. --- dlls/msxml3/node.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1236fae..a7d2ddf 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -644,11 +644,9 @@ static HRESULT WINAPI xmlnode_replaceChild( IXMLDOMNode** outOldChild) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - xmlNode *old_child_ptr, *new_child_ptr; + xmlnode *old_child, *new_child; xmlDocPtr leaving_doc; xmlNode *my_ancestor; - IXMLDOMNode *realOldChild; - HRESULT hr; TRACE("(%p)->(%p %p %p)\n", This, newChild, oldChild, outOldChild); @@ -660,23 +658,28 @@ static HRESULT WINAPI xmlnode_replaceChild( if(outOldChild) *outOldChild = NULL; - hr = IXMLDOMNode_QueryInterface(oldChild,&IID_IXMLDOMNode,(LPVOID*)&realOldChild); - if(FAILED(hr)) - return hr; + old_child = get_node_obj(oldChild); + if(!old_child) { + FIXME("oldChild is not our node implementation\n"); + return E_FAIL; + } - old_child_ptr = impl_from_IXMLDOMNode(realOldChild)->node; - IXMLDOMNode_Release(realOldChild); - if(old_child_ptr->parent != This->node) + if(old_child->node->parent != This->node) { WARN("childNode %p is not a child of %p\n", oldChild, iface); return E_INVALIDARG; } - new_child_ptr = impl_from_IXMLDOMNode(newChild)->node; + new_child = get_node_obj(newChild); + if(!new_child) { + FIXME("newChild is not our node implementation\n"); + return E_FAIL; + } + my_ancestor = This->node; while(my_ancestor) { - if(my_ancestor == new_child_ptr) + if(my_ancestor == new_child->node) { WARN("tried to create loop\n"); return E_FAIL; @@ -684,16 +687,16 @@ static HRESULT WINAPI xmlnode_replaceChild( my_ancestor = my_ancestor->parent; } - if(!new_child_ptr->parent) - if(xmldoc_remove_orphan(new_child_ptr->doc, new_child_ptr) != S_OK) - WARN("%p is not an orphan of %p\n", new_child_ptr, new_child_ptr->doc); + if(!new_child->node->parent) + if(xmldoc_remove_orphan(new_child->node->doc, new_child->node) != S_OK) + WARN("%p is not an orphan of %p\n", new_child->node, new_child->node->doc); - leaving_doc = new_child_ptr->doc; - xmldoc_add_ref(old_child_ptr->doc); - xmlReplaceNode(old_child_ptr, new_child_ptr); + leaving_doc = new_child->node->doc; + xmldoc_add_ref(old_child->node->doc); + xmlReplaceNode(old_child->node, new_child->node); xmldoc_release(leaving_doc); - xmldoc_add_orphan(old_child_ptr->doc, old_child_ptr); + xmldoc_add_orphan(old_child->node->doc, old_child->node); if(outOldChild) {

1 0

Jacek Caban : msxml3: Use xmlnode child object' s IXMLDOMNode implementation as base interface.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 27b4f11c0bb9f0b9d9023259ca6a2f9852a2d033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b4f11c0bb9f0b9d9023259c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 4 17:56:08 2010 +0200 msxml3: Use xmlnode child object's IXMLDOMNode implementation as base interface. The plan is to get rid of IXMLDOMNode interface in xmlnode object and use proper inheritance. --- dlls/msxml3/attribute.c | 5 +-- dlls/msxml3/cdata.c | 10 +--- dlls/msxml3/comment.c | 7 +-- dlls/msxml3/docfrag.c | 5 +-- dlls/msxml3/domdoc.c | 11 ++--- dlls/msxml3/element.c | 5 +-- dlls/msxml3/entityref.c | 5 +-- dlls/msxml3/node.c | 100 +++++++++-------------------------------------- dlls/msxml3/pi.c | 10 +--- dlls/msxml3/text.c | 8 +--- 10 files changed, 38 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27b4f11c0bb9f0b9d9023…

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in get_nodeName implementations.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 7a68fad27389fa33fa6f5b6d47208271ae19b9be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a68fad27389fa33fa6f5b6d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 4 17:56:25 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_nodeName implementations. --- dlls/msxml3/attribute.c | 11 ++++++-- dlls/msxml3/cdata.c | 8 +++++- dlls/msxml3/comment.c | 7 ++++- dlls/msxml3/docfrag.c | 8 +++++- dlls/msxml3/domdoc.c | 7 ++++- dlls/msxml3/element.c | 5 +++- dlls/msxml3/entityref.c | 5 +++- dlls/msxml3/msxml_private.h | 18 ++++++++++++++ dlls/msxml3/node.c | 55 +++++++++++-------------------------------- dlls/msxml3/pi.c | 12 +++++++-- dlls/msxml3/text.c | 7 ++++- 11 files changed, 89 insertions(+), 54 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index a004981..30a05cd 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -182,7 +182,10 @@ static HRESULT WINAPI domattr_get_nodeName( BSTR* p ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domattr_get_nodeValue( @@ -475,9 +478,11 @@ static HRESULT WINAPI domattr_get_name( IXMLDOMAttribute *iface, BSTR *p) { - /* name property returns the same value as nodeName */ domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domattr_get_value( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 6baacc8..903f36f 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -190,7 +190,13 @@ static HRESULT WINAPI domcdata_get_nodeName( BSTR* p ) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + static const WCHAR cdata_sectionW[] = + {'#','c','d','a','t','a','-','s','e','c','t','i','o','n',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(cdata_sectionW, p); } static HRESULT WINAPI domcdata_get_nodeValue( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 68fa9b8..513ce0c 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -184,7 +184,12 @@ static HRESULT WINAPI domcomment_get_nodeName( BSTR* p ) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + static const WCHAR commentW[] = {'#','c','o','m','m','e','n','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(commentW, p); } static HRESULT WINAPI domcomment_get_nodeValue( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index df6676e..5264d96 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -183,7 +183,13 @@ static HRESULT WINAPI domfrag_get_nodeName( BSTR* p ) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + static const WCHAR document_fragmentW[] = + {'#','d','o','c','u','m','e','n','t','-','f','r','a','g','m','e','n','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(document_fragmentW, p); } static HRESULT WINAPI domfrag_get_nodeValue( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index b122880..6046c1e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -686,7 +686,12 @@ static HRESULT WINAPI domdoc_get_nodeName( BSTR* name ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), name ); + + static const WCHAR documentW[] = {'#','d','o','c','u','m','e','n','t',0}; + + TRACE("(%p)->(%p)\n", This, name); + + return return_bstr(documentW, name); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 890ea14..4e5522c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -194,7 +194,10 @@ static HRESULT WINAPI domelem_get_nodeName( BSTR* p ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domelem_get_nodeValue( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 63c962b..db7d162 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -182,7 +182,10 @@ static HRESULT WINAPI entityref_get_nodeName( BSTR* p ) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + FIXME("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI entityref_get_nodeValue( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index cea3686..b249d90 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -159,6 +159,8 @@ extern void destroy_xmlnode(xmlnode*); extern BOOL node_query_interface(xmlnode*,REFIID,void**); extern xmlnode *get_node_obj(IXMLDOMNode*); +extern HRESULT node_get_nodeName(xmlnode*,BSTR*); + extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); static inline BSTR bstr_from_xmlChar(const xmlChar *str) @@ -177,6 +179,22 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str) return ret; } +static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) +{ + if(!p) + return E_INVALIDARG; + + if(value) { + *p = SysAllocString(value); + if(!*p) + return E_OUTOFMEMORY; + }else { + *p = NULL; + } + + return S_OK; +} + #endif void* libxslt_handle; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 6143f13..f057a95 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -178,56 +178,26 @@ static HRESULT WINAPI xmlnode_Invoke( return E_NOTIMPL; } -static HRESULT WINAPI xmlnode_get_nodeName( - IXMLDOMNode *iface, - BSTR* name) +HRESULT node_get_nodeName(xmlnode *This, BSTR *name) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - const xmlChar *str; - - TRACE("(%p)->(%p)\n", This, name ); - if (!name) return E_INVALIDARG; - if ( !This->node ) - return E_FAIL; - - switch( This->node->type ) - { - case XML_CDATA_SECTION_NODE: - str = (const xmlChar*) "#cdata-section"; - break; - case XML_COMMENT_NODE: - str = (const xmlChar*) "#comment"; - break; - case XML_DOCUMENT_FRAG_NODE: - str = (const xmlChar*) "#document-fragment"; - break; - case XML_TEXT_NODE: - str = (const xmlChar*) "#text"; - break; - case XML_DOCUMENT_NODE: - str = (const xmlChar*) "#document"; - break; - case XML_ATTRIBUTE_NODE: - case XML_ELEMENT_NODE: - case XML_PI_NODE: - str = This->node->name; - break; - default: - FIXME("nodeName not mapped correctly (%d)\n", This->node->type); - str = This->node->name; - break; - } - - *name = bstr_from_xmlChar( str ); + *name = bstr_from_xmlChar(This->node->name); if (!*name) return S_FALSE; return S_OK; } +static HRESULT WINAPI xmlnode_get_nodeName( + IXMLDOMNode *iface, + BSTR* name) +{ + ERR("Should not be called\n"); + return E_NOTIMPL; +} + static HRESULT WINAPI xmlnode_get_nodeValue( IXMLDOMNode *iface, VARIANT* value) @@ -1843,7 +1813,10 @@ static HRESULT WINAPI unknode_get_nodeName( BSTR* p ) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + FIXME("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI unknode_get_nodeValue( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index c86fd46..aeb296e 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -183,7 +183,10 @@ static HRESULT WINAPI dom_pi_get_nodeName( BSTR* p ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI dom_pi_get_nodeValue( @@ -492,9 +495,12 @@ static HRESULT WINAPI dom_pi_get_target( IXMLDOMProcessingInstruction *iface, BSTR *p) { - /* target returns the same value as nodeName property */ dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + /* target returns the same value as nodeName property */ + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI dom_pi_get_data( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index b131be1..ccfc36e 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -192,7 +192,12 @@ static HRESULT WINAPI domtext_get_nodeName( BSTR* p ) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(&This->node), p ); + + static const WCHAR textW[] = {'#','t','e','x','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(textW, p); } static HRESULT WINAPI domtext_get_nodeValue(

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in get_nodeValue implementations.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 6ce537baacd6a78ceb8165238941eef9c65e8f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce537baacd6a78ceb8165238… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 4 17:56:45 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_nodeValue implementations. --- dlls/msxml3/attribute.c | 14 ++++++-- dlls/msxml3/cdata.c | 7 +++- dlls/msxml3/comment.c | 7 +++- dlls/msxml3/docfrag.c | 11 ++++++- dlls/msxml3/domdoc.c | 10 ++++++- dlls/msxml3/element.c | 12 ++++++- dlls/msxml3/entityref.c | 11 ++++++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 65 ++++++++++++++++--------------------------- dlls/msxml3/pi.c | 7 +++- dlls/msxml3/text.c | 24 ++++++++------- 11 files changed, 100 insertions(+), 69 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 30a05cd..2e06512 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -190,10 +190,13 @@ static HRESULT WINAPI domattr_get_nodeName( static HRESULT WINAPI domattr_get_nodeValue( IXMLDOMAttribute *iface, - VARIANT* var1 ) + VARIANT* value) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + return node_get_content(&This->node, value); } static HRESULT WINAPI domattr_put_nodeValue( @@ -487,10 +490,13 @@ static HRESULT WINAPI domattr_get_name( static HRESULT WINAPI domattr_get_value( IXMLDOMAttribute *iface, - VARIANT *var1) + VARIANT *value) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + return node_get_content(&This->node, value); } static HRESULT WINAPI domattr_put_value( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 903f36f..b29a6cd 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -201,10 +201,13 @@ static HRESULT WINAPI domcdata_get_nodeName( static HRESULT WINAPI domcdata_get_nodeValue( IXMLDOMCDATASection *iface, - VARIANT* var1 ) + VARIANT* value) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + return node_get_content(&This->node, value); } static HRESULT WINAPI domcdata_put_nodeValue( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 513ce0c..3649daf 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -194,10 +194,13 @@ static HRESULT WINAPI domcomment_get_nodeName( static HRESULT WINAPI domcomment_get_nodeValue( IXMLDOMComment *iface, - VARIANT* var1 ) + VARIANT* value) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + return node_get_content(&This->node, value); } static HRESULT WINAPI domcomment_put_nodeValue( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 5264d96..fb6308e 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -194,10 +194,17 @@ static HRESULT WINAPI domfrag_get_nodeName( static HRESULT WINAPI domfrag_get_nodeValue( IXMLDOMDocumentFragment *iface, - VARIANT* var1 ) + VARIANT* value) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + FIXME("(%p)->(%p)\n", This, value); + + if(!value) + return E_INVALIDARG; + + V_VT(value) = VT_NULL; + return S_FALSE; } static HRESULT WINAPI domfrag_put_nodeValue( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 6046c1e..d591afa 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -700,7 +700,15 @@ static HRESULT WINAPI domdoc_get_nodeValue( VARIANT* value ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), value ); + + TRACE("(%p)->(%p)\n", This, value); + + if(!value) + return E_INVALIDARG; + + V_VT(value) = VT_NULL; + V_BSTR(value) = NULL; /* tests show that we should do this */ + return S_FALSE; } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4e5522c..0e8559a 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -202,10 +202,18 @@ static HRESULT WINAPI domelem_get_nodeName( static HRESULT WINAPI domelem_get_nodeValue( IXMLDOMElement *iface, - VARIANT* var1 ) + VARIANT* value) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + if(!value) + return E_INVALIDARG; + + V_VT(value) = VT_NULL; + V_BSTR(value) = NULL; /* tests show that we should do this */ + return S_FALSE; } static HRESULT WINAPI domelem_put_nodeValue( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index db7d162..a779d92 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -190,10 +190,17 @@ static HRESULT WINAPI entityref_get_nodeName( static HRESULT WINAPI entityref_get_nodeValue( IXMLDOMEntityReference *iface, - VARIANT* var1 ) + VARIANT* value) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + FIXME("(%p)->(%p)\n", This, value); + + if(!value) + return E_INVALIDARG; + + V_VT(value) = VT_NULL; + return S_FALSE; } static HRESULT WINAPI entityref_put_nodeValue( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index b249d90..3fc9666 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -160,6 +160,7 @@ extern BOOL node_query_interface(xmlnode*,REFIID,void**); extern xmlnode *get_node_obj(IXMLDOMNode*); extern HRESULT node_get_nodeName(xmlnode*,BSTR*); +extern HRESULT node_get_content(xmlnode*,VARIANT*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f057a95..905ae41 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -198,52 +198,28 @@ static HRESULT WINAPI xmlnode_get_nodeName( return E_NOTIMPL; } -static HRESULT WINAPI xmlnode_get_nodeValue( - IXMLDOMNode *iface, - VARIANT* value) +HRESULT node_get_content(xmlnode *This, VARIANT *value) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - HRESULT r = S_FALSE; - - TRACE("(%p)->(%p)\n", This, value); + xmlChar *content; if(!value) return E_INVALIDARG; - V_BSTR(value) = NULL; - V_VT(value) = VT_NULL; - - switch ( This->node->type ) - { - case XML_CDATA_SECTION_NODE: - case XML_COMMENT_NODE: - case XML_PI_NODE: - case XML_ATTRIBUTE_NODE: - { - xmlChar *content = xmlNodeGetContent(This->node); - V_VT(value) = VT_BSTR; - V_BSTR(value) = bstr_from_xmlChar( content ); - xmlFree(content); - r = S_OK; - break; - } - case XML_TEXT_NODE: - V_VT(value) = VT_BSTR; - V_BSTR(value) = bstr_from_xmlChar( This->node->content ); - r = S_OK; - break; - case XML_ELEMENT_NODE: - case XML_DOCUMENT_NODE: - /* these seem to return NULL */ - break; + content = xmlNodeGetContent(This->node); + V_VT(value) = VT_BSTR; + V_BSTR(value) = bstr_from_xmlChar( content ); + xmlFree(content); - default: - FIXME("node %p type %d\n", This, This->node->type); - } - - TRACE("%p returned %s\n", This, debugstr_w( V_BSTR(value) ) ); + TRACE("%p returned %s\n", This, debugstr_w(V_BSTR(value))); + return S_OK; +} - return r; +static HRESULT WINAPI xmlnode_get_nodeValue( + IXMLDOMNode *iface, + VARIANT* value) +{ + ERR("Should not be called\n"); + return E_NOTIMPL; } static HRESULT WINAPI xmlnode_put_nodeValue( @@ -1821,10 +1797,17 @@ static HRESULT WINAPI unknode_get_nodeName( static HRESULT WINAPI unknode_get_nodeValue( IXMLDOMNode *iface, - VARIANT* var1 ) + VARIANT* value) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + FIXME("(%p)->(%p)\n", This, value); + + if(!value) + return E_INVALIDARG; + + V_VT(value) = VT_NULL; + return S_FALSE; } static HRESULT WINAPI unknode_put_nodeValue( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index aeb296e..518fa66 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -191,10 +191,13 @@ static HRESULT WINAPI dom_pi_get_nodeName( static HRESULT WINAPI dom_pi_get_nodeValue( IXMLDOMProcessingInstruction *iface, - VARIANT* var1 ) + VARIANT* value) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + return node_get_content(&This->node, value); } static HRESULT WINAPI dom_pi_put_nodeValue( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index ccfc36e..07f9de5 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -202,10 +202,18 @@ static HRESULT WINAPI domtext_get_nodeName( static HRESULT WINAPI domtext_get_nodeValue( IXMLDOMText *iface, - VARIANT* var1 ) + VARIANT* value ) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(&This->node), var1 ); + + TRACE("(%p)->(%p)\n", This, value); + + if(!value) + return E_INVALIDARG; + + V_VT(value) = VT_BSTR; + V_BSTR(value) = bstr_from_xmlChar(This->node.node->content); + return S_OK; } static HRESULT WINAPI domtext_put_nodeValue( @@ -487,19 +495,13 @@ static HRESULT WINAPI domtext_get_data( IXMLDOMText *iface, BSTR *p) { - HRESULT hr; - VARIANT vRet; + domtext *This = impl_from_IXMLDOMText( iface ); if(!p) return E_INVALIDARG; - hr = IXMLDOMNode_get_nodeValue( iface, &vRet ); - if(hr == S_OK) - { - *p = V_BSTR(&vRet); - } - - return hr; + *p = bstr_from_xmlChar(This->node.node->content); + return S_OK; } static HRESULT WINAPI domtext_put_data(

1 0

Gerald Pfeifer : server: Remove pollev from set_socket_event.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 87624c2c217994f563dfd317d596fa76579a80c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87624c2c217994f563dfd317d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Sep 4 22:17:39 2010 +0200 server: Remove pollev from set_socket_event. --- server/sock.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 4f54c46..04ae748 100644 --- a/server/sock.c +++ b/server/sock.c @@ -967,7 +967,6 @@ DECL_HANDLER(set_socket_event) { struct sock *sock; struct event *old_event; - int pollev; if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, FILE_WRITE_ATTRIBUTES, &sock_ops))) return; @@ -982,7 +981,7 @@ DECL_HANDLER(set_socket_event) if (debug_level && sock->event) fprintf(stderr, "event ptr: %p\n", sock->event); - pollev = sock_reselect( sock ); + sock_reselect( sock ); if (sock->mask) sock->state |= FD_WINE_NONBLOCKING;

1 0