February 2011 - Wine-commits

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionType::GetDesc().
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: c647243ed9dec44fce834d3d8d75c46d498707f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c647243ed9dec44fce834d3d8… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Feb 22 21:01:19 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionType::GetDesc(). --- dlls/d3dcompiler_43/reflection.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index b751725..3d97603 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -745,12 +745,33 @@ const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_va /* ID3D11ShaderReflectionType methods */ +static inline struct d3dcompiler_shader_reflection_type *impl_from_ID3D11ShaderReflectionType(ID3D11ShaderReflectionType *iface) +{ + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_type, ID3D11ShaderReflectionType_iface); +} + static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetDesc( ID3D11ShaderReflectionType *iface, D3D11_SHADER_TYPE_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p\n", iface, desc); + + if (This == &null_type) + { + WARN("Null type specified\n"); + return E_FAIL; + } + + if (!desc) + { + WARN("Invalid argument specified\n"); + return E_FAIL; + } + + *desc = This->desc; + + return S_OK; } static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByIndex(

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionVariable::GetType().
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: 12d4683f05c4f972344614c7b1b5f79a445096fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=12d4683f05c4f972344614c7b… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Feb 22 21:01:30 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionVariable::GetType(). --- dlls/d3dcompiler_43/reflection.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 3d97603..9119a83 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -33,10 +33,13 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl; +const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl; /* null objects - needed for invalid calls */ static struct d3dcompiler_shader_reflection_constant_buffer null_constant_buffer = {{&d3dcompiler_shader_reflection_constant_buffer_vtbl}}; -static struct d3dcompiler_shader_reflection_variable null_variable = {{&d3dcompiler_shader_reflection_variable_vtbl}, &null_constant_buffer}; +static struct d3dcompiler_shader_reflection_type null_type = {{&d3dcompiler_shader_reflection_type_vtbl}}; +static struct d3dcompiler_shader_reflection_variable null_variable = {{&d3dcompiler_shader_reflection_variable_vtbl}, + &null_constant_buffer, &null_type}; static BOOL copy_name(const char *ptr, char **name) { @@ -711,9 +714,11 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetDesc( static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetType( ID3D11ShaderReflectionVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface); - return NULL; + TRACE("iface %p\n", iface); + + return &This->type->ID3D11ShaderReflectionType_iface; } static ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetBuffer(

1 0

Nikolay Sivov : msxml3: Remove forward to removeChild() method for nodes.
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: 1178f7b46eb46dc928f6a6205cf927fa0d1e0a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1178f7b46eb46dc928f6a6205… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 14:28:44 2011 +0300 msxml3: Remove forward to removeChild() method for nodes. --- dlls/msxml3/attribute.c | 5 +++-- dlls/msxml3/cdata.c | 5 +++-- dlls/msxml3/comment.c | 5 +++-- dlls/msxml3/docfrag.c | 5 +++-- dlls/msxml3/domdoc.c | 7 ++++--- dlls/msxml3/element.c | 5 +++-- dlls/msxml3/entityref.c | 5 +++-- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 22 ++++++++-------------- dlls/msxml3/pi.c | 5 +++-- dlls/msxml3/text.c | 5 +++-- 11 files changed, 37 insertions(+), 33 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 9705cb8..7c49981 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -326,10 +326,11 @@ static HRESULT WINAPI domattr_replaceChild( static HRESULT WINAPI domattr_removeChild( IXMLDOMAttribute *iface, - IXMLDOMNode* domNode, IXMLDOMNode** oldNode) + IXMLDOMNode *child, IXMLDOMNode **oldChild) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_removeChild( &This->node.IXMLDOMNode_iface, domNode, oldNode ); + TRACE("(%p)->(%p %p)\n", This, child, oldChild); + return node_remove_child(&This->node, child, oldChild); } static HRESULT WINAPI domattr_appendChild( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index eb10d6f..22a75b8 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -337,10 +337,11 @@ static HRESULT WINAPI domcdata_replaceChild( static HRESULT WINAPI domcdata_removeChild( IXMLDOMCDATASection *iface, - IXMLDOMNode* domNode, IXMLDOMNode** oldNode) + IXMLDOMNode *child, IXMLDOMNode **oldChild) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_removeChild( &This->node.IXMLDOMNode_iface, domNode, oldNode ); + TRACE("(%p)->(%p %p)\n", This, child, oldChild); + return node_remove_child(&This->node, child, oldChild); } static HRESULT WINAPI domcdata_appendChild( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 3b24c14..f4dbbf8 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -330,10 +330,11 @@ static HRESULT WINAPI domcomment_replaceChild( static HRESULT WINAPI domcomment_removeChild( IXMLDOMComment *iface, - IXMLDOMNode* domNode, IXMLDOMNode** oldNode) + IXMLDOMNode *child, IXMLDOMNode **oldChild) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_removeChild( &This->node.IXMLDOMNode_iface, domNode, oldNode ); + TRACE("(%p)->(%p %p)\n", This, child, oldChild); + return node_remove_child(&This->node, child, oldChild); } static HRESULT WINAPI domcomment_appendChild( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 5abf8b3..8c72ec2 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -334,10 +334,11 @@ static HRESULT WINAPI domfrag_replaceChild( static HRESULT WINAPI domfrag_removeChild( IXMLDOMDocumentFragment *iface, - IXMLDOMNode* domNode, IXMLDOMNode** oldNode) + IXMLDOMNode *child, IXMLDOMNode **oldChild) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_removeChild( &This->node.IXMLDOMNode_iface, domNode, oldNode ); + TRACE("(%p)->(%p %p)\n", This, child, oldChild); + return node_remove_child(&This->node, child, oldChild); } static HRESULT WINAPI domfrag_appendChild( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 417b988..5b29854 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1217,11 +1217,12 @@ static HRESULT WINAPI domdoc_replaceChild( static HRESULT WINAPI domdoc_removeChild( IXMLDOMDocument3 *iface, - IXMLDOMNode* childNode, - IXMLDOMNode** oldChild) + IXMLDOMNode *child, + IXMLDOMNode **oldChild) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_removeChild( &This->node.IXMLDOMNode_iface, childNode, oldChild ); + TRACE("(%p)->(%p %p)\n", This, child, oldChild); + return node_remove_child(&This->node, child, oldChild); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index c4c130d..b80f0f6 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -345,10 +345,11 @@ static HRESULT WINAPI domelem_replaceChild( static HRESULT WINAPI domelem_removeChild( IXMLDOMElement *iface, - IXMLDOMNode* domNode, IXMLDOMNode** oldNode) + IXMLDOMNode *child, IXMLDOMNode **oldChild) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_removeChild( &This->node.IXMLDOMNode_iface, domNode, oldNode ); + TRACE("(%p)->(%p %p)\n", This, child, oldChild); + return node_remove_child(&This->node, child, oldChild); } static HRESULT WINAPI domelem_appendChild( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 9af5aa9..37cfad0 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -328,10 +328,11 @@ static HRESULT WINAPI entityref_replaceChild( static HRESULT WINAPI entityref_removeChild( IXMLDOMEntityReference *iface, - IXMLDOMNode* domNode, IXMLDOMNode** oldNode) + IXMLDOMNode *child, IXMLDOMNode **oldChild) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_removeChild( &This->node.IXMLDOMNode_iface, domNode, oldNode ); + TRACE("(%p)->(%p %p)\n", This, child, oldChild); + return node_remove_child(&This->node, child, oldChild); } static HRESULT WINAPI entityref_appendChild( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8d9d8dd..e4fda20 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -271,6 +271,7 @@ extern HRESULT node_clone(xmlnode*,VARIANT_BOOL,IXMLDOMNode**); extern HRESULT node_get_prefix(xmlnode*,BSTR*); extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT node_get_namespaceURI(xmlnode*,BSTR*); +extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index fd1cf97..b7c1cb0 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -401,22 +401,16 @@ HRESULT node_replace_child(xmlnode *This, IXMLDOMNode *newChild, IXMLDOMNode *ol return S_OK; } -static HRESULT WINAPI xmlnode_removeChild( - IXMLDOMNode *iface, - IXMLDOMNode* childNode, - IXMLDOMNode** oldChild) +HRESULT node_remove_child(xmlnode *This, IXMLDOMNode* child, IXMLDOMNode** oldChild) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlnode *child_node; - TRACE("(%p)->(%p %p)\n", This, childNode, oldChild); - - if(!childNode) return E_INVALIDARG; + if(!child) return E_INVALIDARG; if(oldChild) *oldChild = NULL; - child_node = get_node_obj(childNode); + child_node = get_node_obj(child); if(!child_node) { FIXME("childNode is not our node implementation\n"); return E_FAIL; @@ -424,7 +418,7 @@ static HRESULT WINAPI xmlnode_removeChild( if(child_node->node->parent != This->node) { - WARN("childNode %p is not a child of %p\n", childNode, iface); + WARN("childNode %p is not a child of %p\n", child, This); return E_INVALIDARG; } @@ -432,8 +426,8 @@ static HRESULT WINAPI xmlnode_removeChild( if(oldChild) { - IXMLDOMNode_AddRef(childNode); - *oldChild = childNode; + IXMLDOMNode_AddRef(child); + *oldChild = child; } return S_OK; @@ -1152,7 +1146,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, NULL, NULL, - xmlnode_removeChild, + NULL, xmlnode_appendChild, xmlnode_hasChildNodes, xmlnode_get_ownerDocument, @@ -1494,7 +1488,7 @@ static HRESULT WINAPI unknode_removeChild( IXMLDOMNode* domNode, IXMLDOMNode** oldNode) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_removeChild( &This->node.IXMLDOMNode_iface, domNode, oldNode ); + return node_remove_child(&This->node, domNode, oldNode); } static HRESULT WINAPI unknode_appendChild( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 5a1bdba..07ab0d0 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -344,10 +344,11 @@ static HRESULT WINAPI dom_pi_replaceChild( static HRESULT WINAPI dom_pi_removeChild( IXMLDOMProcessingInstruction *iface, - IXMLDOMNode* domNode, IXMLDOMNode** oldNode) + IXMLDOMNode *child, IXMLDOMNode **oldChild) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_removeChild( &This->node.IXMLDOMNode_iface, domNode, oldNode ); + TRACE("(%p)->(%p %p)\n", This, child, oldChild); + return node_remove_child(&This->node, child, oldChild); } static HRESULT WINAPI dom_pi_appendChild( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 55fd235..1b3b7ae 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -343,10 +343,11 @@ static HRESULT WINAPI domtext_replaceChild( static HRESULT WINAPI domtext_removeChild( IXMLDOMText *iface, - IXMLDOMNode* domNode, IXMLDOMNode** oldNode) + IXMLDOMNode *child, IXMLDOMNode **oldChild) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_removeChild( &This->node.IXMLDOMNode_iface, domNode, oldNode ); + TRACE("(%p)->(%p %p)\n", This, child, oldChild); + return node_remove_child(&This->node, child, oldChild); } static HRESULT WINAPI domtext_appendChild(

1 0

Nikolay Sivov : msxml3: Remove appendChild() forward.
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: 5775bcde4ad51a0b9eb168376ee42a25a28cffb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5775bcde4ad51a0b9eb168376… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 14:32:16 2011 +0300 msxml3: Remove appendChild() forward. --- dlls/msxml3/attribute.c | 5 +++-- dlls/msxml3/cdata.c | 5 +++-- dlls/msxml3/comment.c | 5 +++-- dlls/msxml3/docfrag.c | 5 +++-- dlls/msxml3/domdoc.c | 7 ++++--- dlls/msxml3/element.c | 5 +++-- dlls/msxml3/entityref.c | 5 +++-- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 18 ++++++------------ dlls/msxml3/pi.c | 5 +++-- dlls/msxml3/text.c | 5 +++-- 11 files changed, 35 insertions(+), 31 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 7c49981..0cfdefb 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -335,10 +335,11 @@ static HRESULT WINAPI domattr_removeChild( static HRESULT WINAPI domattr_appendChild( IXMLDOMAttribute *iface, - IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) + IXMLDOMNode *child, IXMLDOMNode **outChild) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode ); + TRACE("(%p)->(%p %p)\n", This, child, outChild); + return node_append_child(&This->node, child, outChild); } static HRESULT WINAPI domattr_hasChildNodes( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 22a75b8..06a8f4c 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -346,10 +346,11 @@ static HRESULT WINAPI domcdata_removeChild( static HRESULT WINAPI domcdata_appendChild( IXMLDOMCDATASection *iface, - IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) + IXMLDOMNode *child, IXMLDOMNode **outChild) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode ); + TRACE("(%p)->(%p %p)\n", This, child, outChild); + return node_append_child(&This->node, child, outChild); } static HRESULT WINAPI domcdata_hasChildNodes( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index f4dbbf8..858979c 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -339,10 +339,11 @@ static HRESULT WINAPI domcomment_removeChild( static HRESULT WINAPI domcomment_appendChild( IXMLDOMComment *iface, - IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) + IXMLDOMNode *child, IXMLDOMNode **outChild) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode ); + TRACE("(%p)->(%p %p)\n", This, child, outChild); + return node_append_child(&This->node, child, outChild); } static HRESULT WINAPI domcomment_hasChildNodes( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 8c72ec2..a2d2e15 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -343,10 +343,11 @@ static HRESULT WINAPI domfrag_removeChild( static HRESULT WINAPI domfrag_appendChild( IXMLDOMDocumentFragment *iface, - IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) + IXMLDOMNode *child, IXMLDOMNode **outChild) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode ); + TRACE("(%p)->(%p %p)\n", This, child, outChild); + return node_append_child(&This->node, child, outChild); } static HRESULT WINAPI domfrag_hasChildNodes( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 5b29854..0639dac 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1228,11 +1228,12 @@ static HRESULT WINAPI domdoc_removeChild( static HRESULT WINAPI domdoc_appendChild( IXMLDOMDocument3 *iface, - IXMLDOMNode* newChild, - IXMLDOMNode** outNewChild) + IXMLDOMNode *child, + IXMLDOMNode **outChild) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newChild, outNewChild ); + TRACE("(%p)->(%p %p)\n", This, child, outChild); + return node_append_child(&This->node, child, outChild); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index b80f0f6..a36128e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -354,10 +354,11 @@ static HRESULT WINAPI domelem_removeChild( static HRESULT WINAPI domelem_appendChild( IXMLDOMElement *iface, - IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) + IXMLDOMNode *child, IXMLDOMNode **outChild) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode ); + TRACE("(%p)->(%p %p)\n", This, child, outChild); + return node_append_child(&This->node, child, outChild); } static HRESULT WINAPI domelem_hasChildNodes( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 37cfad0..a983934 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -337,10 +337,11 @@ static HRESULT WINAPI entityref_removeChild( static HRESULT WINAPI entityref_appendChild( IXMLDOMEntityReference *iface, - IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) + IXMLDOMNode *child, IXMLDOMNode **outChild) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode ); + TRACE("(%p)->(%p %p)\n", This, child, outChild); + return node_append_child(&This->node, child, outChild); } static HRESULT WINAPI entityref_hasChildNodes( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index e4fda20..ccaa9c6 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -252,6 +252,7 @@ extern void destroy_xmlnode(xmlnode*); extern BOOL node_query_interface(xmlnode*,REFIID,void**); extern xmlnode *get_node_obj(IXMLDOMNode*); +extern HRESULT node_append_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**); extern HRESULT node_get_nodeName(xmlnode*,BSTR*); extern HRESULT node_get_content(xmlnode*,VARIANT*); extern HRESULT node_set_content(xmlnode*,LPCWSTR); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b7c1cb0..1e186ef 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -433,26 +433,20 @@ HRESULT node_remove_child(xmlnode *This, IXMLDOMNode* child, IXMLDOMNode** oldCh return S_OK; } -static HRESULT WINAPI xmlnode_appendChild( - IXMLDOMNode *iface, - IXMLDOMNode* newChild, - IXMLDOMNode** outNewChild) +HRESULT node_append_child(xmlnode *This, IXMLDOMNode *child, IXMLDOMNode **outChild) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); DOMNodeType type; VARIANT var; HRESULT hr; - TRACE("(%p)->(%p %p)\n", This, newChild, outNewChild); - - hr = IXMLDOMNode_get_nodeType(newChild, &type); + hr = IXMLDOMNode_get_nodeType(child, &type); if(FAILED(hr) || type == NODE_ATTRIBUTE) { - if(outNewChild) *outNewChild = NULL; + if (outChild) *outChild = NULL; return E_FAIL; } VariantInit(&var); - return IXMLDOMNode_insertBefore(This->iface, newChild, var, outNewChild); + return IXMLDOMNode_insertBefore(This->iface, child, var, outChild); } static HRESULT WINAPI xmlnode_hasChildNodes( @@ -1147,7 +1141,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, NULL, NULL, - xmlnode_appendChild, + NULL, xmlnode_hasChildNodes, xmlnode_get_ownerDocument, NULL, @@ -1496,7 +1490,7 @@ static HRESULT WINAPI unknode_appendChild( IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode ); + return node_append_child(&This->node, newNode, outNewNode); } static HRESULT WINAPI unknode_hasChildNodes( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 07ab0d0..fce1c0c 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -353,10 +353,11 @@ static HRESULT WINAPI dom_pi_removeChild( static HRESULT WINAPI dom_pi_appendChild( IXMLDOMProcessingInstruction *iface, - IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) + IXMLDOMNode *child, IXMLDOMNode **outChild) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode ); + TRACE("(%p)->(%p %p)\n", This, child, outChild); + return node_append_child(&This->node, child, outChild); } static HRESULT WINAPI dom_pi_hasChildNodes( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 1b3b7ae..a76ff9e 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -352,10 +352,11 @@ static HRESULT WINAPI domtext_removeChild( static HRESULT WINAPI domtext_appendChild( IXMLDOMText *iface, - IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) + IXMLDOMNode *child, IXMLDOMNode **outChild) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_appendChild( &This->node.IXMLDOMNode_iface, newNode, outNewNode ); + TRACE("(%p)->(%p %p)\n", This, child, outChild); + return node_append_child(&This->node, child, outChild); } static HRESULT WINAPI domtext_hasChildNodes(

1 0

Nikolay Sivov : msxml3: Remove hasChildNodes() forward.
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: 3d63982f86929b6230696c0ae87759a2d611bb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d63982f86929b6230696c0ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 14:35:35 2011 +0300 msxml3: Remove hasChildNodes() forward. --- dlls/msxml3/attribute.c | 5 +++-- dlls/msxml3/cdata.c | 5 +++-- dlls/msxml3/comment.c | 5 +++-- dlls/msxml3/docfrag.c | 5 +++-- dlls/msxml3/domdoc.c | 5 +++-- dlls/msxml3/element.c | 5 +++-- dlls/msxml3/entityref.c | 5 +++-- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 18 ++++++------------ dlls/msxml3/pi.c | 5 +++-- dlls/msxml3/text.c | 5 +++-- 11 files changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 0cfdefb..88eead1 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -344,10 +344,11 @@ static HRESULT WINAPI domattr_appendChild( static HRESULT WINAPI domattr_hasChildNodes( IXMLDOMAttribute *iface, - VARIANT_BOOL* pbool) + VARIANT_BOOL *ret) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_hasChildNodes( &This->node.IXMLDOMNode_iface, pbool ); + TRACE("(%p)->(%p)\n", This, ret); + return node_has_childnodes(&This->node, ret); } static HRESULT WINAPI domattr_get_ownerDocument( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 06a8f4c..977778d 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -355,10 +355,11 @@ static HRESULT WINAPI domcdata_appendChild( static HRESULT WINAPI domcdata_hasChildNodes( IXMLDOMCDATASection *iface, - VARIANT_BOOL* pbool) + VARIANT_BOOL *ret) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_hasChildNodes( &This->node.IXMLDOMNode_iface, pbool ); + TRACE("(%p)->(%p)\n", This, ret); + return node_has_childnodes(&This->node, ret); } static HRESULT WINAPI domcdata_get_ownerDocument( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 858979c..8fabca5 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -348,10 +348,11 @@ static HRESULT WINAPI domcomment_appendChild( static HRESULT WINAPI domcomment_hasChildNodes( IXMLDOMComment *iface, - VARIANT_BOOL* pbool) + VARIANT_BOOL *ret) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_hasChildNodes( &This->node.IXMLDOMNode_iface, pbool ); + TRACE("(%p)->(%p)\n", This, ret); + return node_has_childnodes(&This->node, ret); } static HRESULT WINAPI domcomment_get_ownerDocument( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index a2d2e15..3e3a6f2 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -352,10 +352,11 @@ static HRESULT WINAPI domfrag_appendChild( static HRESULT WINAPI domfrag_hasChildNodes( IXMLDOMDocumentFragment *iface, - VARIANT_BOOL* pbool) + VARIANT_BOOL *ret) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_hasChildNodes( &This->node.IXMLDOMNode_iface, pbool ); + TRACE("(%p)->(%p)\n", This, ret); + return node_has_childnodes(&This->node, ret); } static HRESULT WINAPI domfrag_get_ownerDocument( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 0639dac..cc8cc86 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1239,10 +1239,11 @@ static HRESULT WINAPI domdoc_appendChild( static HRESULT WINAPI domdoc_hasChildNodes( IXMLDOMDocument3 *iface, - VARIANT_BOOL* hasChild) + VARIANT_BOOL *ret) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_hasChildNodes( &This->node.IXMLDOMNode_iface, hasChild ); + TRACE("(%p)->(%p)\n", This, ret); + return node_has_childnodes(&This->node, ret); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index a36128e..4954a71 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -363,10 +363,11 @@ static HRESULT WINAPI domelem_appendChild( static HRESULT WINAPI domelem_hasChildNodes( IXMLDOMElement *iface, - VARIANT_BOOL* pbool) + VARIANT_BOOL *ret) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_hasChildNodes( &This->node.IXMLDOMNode_iface, pbool ); + TRACE("(%p)->(%p)\n", This, ret); + return node_has_childnodes(&This->node, ret); } static HRESULT WINAPI domelem_get_ownerDocument( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index a983934..4f4ab25 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -346,10 +346,11 @@ static HRESULT WINAPI entityref_appendChild( static HRESULT WINAPI entityref_hasChildNodes( IXMLDOMEntityReference *iface, - VARIANT_BOOL* pbool) + VARIANT_BOOL *ret) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_hasChildNodes( &This->node.IXMLDOMNode_iface, pbool ); + TRACE("(%p)->(%p)\n", This, ret); + return node_has_childnodes(&This->node, ret); } static HRESULT WINAPI entityref_get_ownerDocument( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index ccaa9c6..45a3902 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -273,6 +273,7 @@ extern HRESULT node_get_prefix(xmlnode*,BSTR*); extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT node_get_namespaceURI(xmlnode*,BSTR*); extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**); +extern HRESULT node_has_childnodes(const xmlnode*,VARIANT_BOOL*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1e186ef..214f1e6 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -449,23 +449,17 @@ HRESULT node_append_child(xmlnode *This, IXMLDOMNode *child, IXMLDOMNode **outCh return IXMLDOMNode_insertBefore(This->iface, child, var, outChild); } -static HRESULT WINAPI xmlnode_hasChildNodes( - IXMLDOMNode *iface, - VARIANT_BOOL* hasChild) +HRESULT node_has_childnodes(const xmlnode *This, VARIANT_BOOL *ret) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - - TRACE("(%p)->(%p)\n", This, hasChild); + if (!ret) return E_INVALIDARG; - if (!hasChild) - return E_INVALIDARG; if (!This->node->children) { - *hasChild = VARIANT_FALSE; + *ret = VARIANT_FALSE; return S_FALSE; } - *hasChild = VARIANT_TRUE; + *ret = VARIANT_TRUE; return S_OK; } @@ -1142,7 +1136,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, NULL, NULL, - xmlnode_hasChildNodes, + NULL, xmlnode_get_ownerDocument, NULL, NULL, @@ -1498,7 +1492,7 @@ static HRESULT WINAPI unknode_hasChildNodes( VARIANT_BOOL* pbool) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_hasChildNodes( &This->node.IXMLDOMNode_iface, pbool ); + return node_has_childnodes(&This->node, pbool); } static HRESULT WINAPI unknode_get_ownerDocument( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index fce1c0c..b0e0638 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -362,10 +362,11 @@ static HRESULT WINAPI dom_pi_appendChild( static HRESULT WINAPI dom_pi_hasChildNodes( IXMLDOMProcessingInstruction *iface, - VARIANT_BOOL* pbool) + VARIANT_BOOL *ret) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_hasChildNodes( &This->node.IXMLDOMNode_iface, pbool ); + TRACE("(%p)->(%p)\n", This, ret); + return node_has_childnodes(&This->node, ret); } static HRESULT WINAPI dom_pi_get_ownerDocument( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index a76ff9e..e8db21b 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -361,10 +361,11 @@ static HRESULT WINAPI domtext_appendChild( static HRESULT WINAPI domtext_hasChildNodes( IXMLDOMText *iface, - VARIANT_BOOL* pbool) + VARIANT_BOOL *ret) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_hasChildNodes( &This->node.IXMLDOMNode_iface, pbool ); + TRACE("(%p)->(%p)\n", This, ret); + return node_has_childnodes(&This->node, ret); } static HRESULT WINAPI domtext_get_ownerDocument(

1 0

Nikolay Sivov : msxml3: Remove get_ownerDocument() forward.
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: 2e5a0dd63f6fbfe544ef7a50a5615d2effb9ba9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5a0dd63f6fbfe544ef7a50a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 14:38:32 2011 +0300 msxml3: Remove get_ownerDocument() forward. --- dlls/msxml3/attribute.c | 5 +++-- dlls/msxml3/cdata.c | 5 +++-- dlls/msxml3/comment.c | 7 ++++--- dlls/msxml3/docfrag.c | 5 +++-- dlls/msxml3/domdoc.c | 11 ++++++----- dlls/msxml3/element.c | 7 ++++--- dlls/msxml3/entityref.c | 5 +++-- dlls/msxml3/msxml_private.h | 4 +++- dlls/msxml3/node.c | 14 ++++---------- dlls/msxml3/pi.c | 5 +++-- dlls/msxml3/schema.c | 2 +- dlls/msxml3/text.c | 5 +++-- 12 files changed, 40 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 88eead1..8fa24f1 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -353,10 +353,11 @@ static HRESULT WINAPI domattr_hasChildNodes( static HRESULT WINAPI domattr_get_ownerDocument( IXMLDOMAttribute *iface, - IXMLDOMDocument** domDocument) + IXMLDOMDocument **doc) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI domattr_cloneNode( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 977778d..64185ca 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -364,10 +364,11 @@ static HRESULT WINAPI domcdata_hasChildNodes( static HRESULT WINAPI domcdata_get_ownerDocument( IXMLDOMCDATASection *iface, - IXMLDOMDocument** domDocument) + IXMLDOMDocument **doc) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI domcdata_cloneNode( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 8fabca5..bb0c488 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -356,11 +356,12 @@ static HRESULT WINAPI domcomment_hasChildNodes( } static HRESULT WINAPI domcomment_get_ownerDocument( - IXMLDOMComment *iface, - IXMLDOMDocument** domDocument) + IXMLDOMComment *iface, + IXMLDOMDocument **doc) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI domcomment_cloneNode( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 3e3a6f2..8c7c8bf 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -361,10 +361,11 @@ static HRESULT WINAPI domfrag_hasChildNodes( static HRESULT WINAPI domfrag_get_ownerDocument( IXMLDOMDocumentFragment *iface, - IXMLDOMDocument** domDocument) + IXMLDOMDocument **doc) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI domfrag_cloneNode( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index cc8cc86..f0938e4 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1249,10 +1249,11 @@ static HRESULT WINAPI domdoc_hasChildNodes( static HRESULT WINAPI domdoc_get_ownerDocument( IXMLDOMDocument3 *iface, - IXMLDOMDocument** DOMDocument) + IXMLDOMDocument **doc) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, DOMDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } @@ -3423,7 +3424,7 @@ static dispex_static_data_t domdoc_dispex = { domdoc_iface_tids }; -HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) +HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) { domdoc *doc; @@ -3477,7 +3478,7 @@ HRESULT DOMDocument_create(const GUID *clsid, IUnknown *pUnkOuter, void **ppObj) xmldoc->_private = create_priv(); priv_from_xmlDocPtr(xmldoc)->properties = create_properties(clsid); - hr = DOMDocument_create_from_xmldoc(xmldoc, (IXMLDOMDocument3**)ppObj); + hr = get_domdoc_from_xmldoc(xmldoc, (IXMLDOMDocument3**)ppObj); if(FAILED(hr)) { free_properties(properties_from_xmlDocPtr(xmldoc)); @@ -3496,7 +3497,7 @@ IUnknown* create_domdoc( xmlNodePtr document ) TRACE("(%p)\n", document); - hr = DOMDocument_create_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument3**)&pObj); + hr = get_domdoc_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument3**)&pObj); if (FAILED(hr)) return NULL; diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4954a71..7cf3afc 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -371,11 +371,12 @@ static HRESULT WINAPI domelem_hasChildNodes( } static HRESULT WINAPI domelem_get_ownerDocument( - IXMLDOMElement *iface, - IXMLDOMDocument** domDocument) + IXMLDOMElement *iface, + IXMLDOMDocument **doc) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI domelem_cloneNode( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 4f4ab25..d8d1f21 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -355,10 +355,11 @@ static HRESULT WINAPI entityref_hasChildNodes( static HRESULT WINAPI entityref_get_ownerDocument( IXMLDOMEntityReference *iface, - IXMLDOMDocument** domDocument) + IXMLDOMDocument **doc) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI entityref_cloneNode( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 45a3902..499aecb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -274,8 +274,10 @@ extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT node_get_namespaceURI(xmlnode*,BSTR*); extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**); extern HRESULT node_has_childnodes(const xmlnode*,VARIANT_BOOL*); +extern HRESULT node_get_owner_doc(const xmlnode*,IXMLDOMDocument**); + +extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); -extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); extern XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodePtr node); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 214f1e6..dc393f8 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -463,15 +463,9 @@ HRESULT node_has_childnodes(const xmlnode *This, VARIANT_BOOL *ret) return S_OK; } -static HRESULT WINAPI xmlnode_get_ownerDocument( - IXMLDOMNode *iface, - IXMLDOMDocument** DOMDocument) +HRESULT node_get_owner_doc(const xmlnode *This, IXMLDOMDocument **doc) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - - TRACE("(%p)->(%p)\n", This, DOMDocument); - - return DOMDocument_create_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)DOMDocument); + return get_domdoc_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)doc); } HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode) @@ -1137,7 +1131,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, NULL, NULL, - xmlnode_get_ownerDocument, + NULL, NULL, NULL, xmlnode_get_text, @@ -1500,7 +1494,7 @@ static HRESULT WINAPI unknode_get_ownerDocument( IXMLDOMDocument** domDocument) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + return node_get_owner_doc(&This->node, domDocument); } static HRESULT WINAPI unknode_cloneNode( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index b0e0638..6b812a5 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -371,10 +371,11 @@ static HRESULT WINAPI dom_pi_hasChildNodes( static HRESULT WINAPI dom_pi_get_ownerDocument( IXMLDOMProcessingInstruction *iface, - IXMLDOMDocument** domDocument) + IXMLDOMDocument **doc) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI dom_pi_cloneNode( diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 2c20061..f782254 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1163,7 +1163,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri /* TODO: this should be read-only */ if (entry) - return DOMDocument_create_from_xmldoc(entry->doc, (IXMLDOMDocument3**)node); + return get_domdoc_from_xmldoc(entry->doc, (IXMLDOMDocument3**)node); *node = NULL; return S_OK; diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index e8db21b..c57428f 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -370,10 +370,11 @@ static HRESULT WINAPI domtext_hasChildNodes( static HRESULT WINAPI domtext_get_ownerDocument( IXMLDOMText *iface, - IXMLDOMDocument** domDocument) + IXMLDOMDocument **doc) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI domtext_cloneNode(

1 0

Jacek Caban : wscript: Added tests.
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: f5eb15a2fe73eb25fc99c0dc6d1ef49d5ac45b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5eb15a2fe73eb25fc99c0dc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 19:48:37 2011 +0100 wscript: Added tests. --- configure | 1 + configure.ac | 1 + programs/wscript/tests/Makefile.in | 9 + programs/wscript/tests/rsrc.rc | 20 ++ programs/wscript/tests/run.c | 357 ++++++++++++++++++++++++++++++++++++ programs/wscript/tests/run.js | 29 +++ 6 files changed, 417 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5eb15a2fe73eb25fc99c…

1 0

Alexandre Goujon : ws2_32: Make gethostbyname fail if WSAStartup was not called before.
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: 778757ba7434162edf35391f8a7b63b756b3ef59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=778757ba7434162edf35391f8… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Tue Feb 22 21:02:22 2011 +0100 ws2_32: Make gethostbyname fail if WSAStartup was not called before. --- dlls/ws2_32/socket.c | 4 ++++ dlls/ws2_32/tests/sock.c | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f3a521c..f74fd36 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4606,6 +4606,10 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) int locerr = ENOBUFS; #endif char hostname[100]; + if(!num_startup) { + SetLastError(WSANOTINITIALISED); + return NULL; + } if( gethostname( hostname, 100) == -1) { SetLastError( WSAENOBUFS); /* appropriate ? */ return retval; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index de647f1..d2f011f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -834,8 +834,6 @@ out: } /* Tests for WSAStartup */ - -/* This should fail. WSAStartup should be called before any network function is used. */ static void test_WithoutWSAStartup(void) { LPVOID ptr; @@ -843,8 +841,8 @@ static void test_WithoutWSAStartup(void) WSASetLastError(0xdeadbeef); ptr = gethostbyname("localhost"); - todo_wine ok(ptr == NULL, "gethostbyname() succeeded unexpectedly: %d\n", WSAGetLastError()); - todo_wine ok(WSAGetLastError() == WSANOTINITIALISED, "gethostbyname() failed with unexpected error: %d\n", + ok(ptr == NULL, "gethostbyname() succeeded unexpectedly: %d\n", WSAGetLastError()); + ok(WSAGetLastError() == WSANOTINITIALISED, "gethostbyname() failed with unexpected error: %d\n", WSAGetLastError()); }

1 0

Juan Lang : cryptnet: Delete existing cache entries when out of date.
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: 2a53eb708796bdf07792c8c34ccb643c11fbfb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a53eb708796bdf07792c8c34… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 22 18:43:40 2011 -0800 cryptnet: Delete existing cache entries when out of date. --- dlls/cryptnet/cryptnet_main.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index e8e7adf..26e8fe7 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -740,11 +740,16 @@ static void CRYPT_CacheURL(LPCWSTR pszURL, const CRYPT_BLOB_ARRAY *pObject, if (ret) lstrcpyW(cacheFileName, info->lpszLocalFileName); /* Check if the existing cache entry is up to date. If it isn't, - * overwite it with the new value. + * remove the existing cache entry, and create a new one with the + * new value. */ GetSystemTimeAsFileTime(&ft); if (CompareFileTime(&info->ExpireTime, &ft) < 0) + { create = TRUE; + DeleteUrlCacheEntryW(pszURL); + DeleteFileW(cacheFileName); + } CryptMemFree(info); } else

1 0

Hans Leidekker : msi: A custom action dll failing to load is not a fatal error.
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: 288718d8c3e656311593ac0cb1811d500f4c0f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288718d8c3e656311593ac0cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 23 11:25:17 2011 +0100 msi: A custom action dll failing to load is not a fatal error. --- dlls/msi/custom.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index c3f2302..83a750d 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -424,10 +424,7 @@ static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL /* keep a reference to prevent the dll from being unloaded */ if (dll && !(binary->module = LoadLibraryW( tmpfile ))) { - ERR("failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); - DeleteFileW( tmpfile ); - msi_free( binary ); - return NULL; + WARN( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); } binary->source = strdupW( source ); binary->tmpfile = strdupW( tmpfile ); @@ -720,8 +717,8 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) hModule = LoadLibraryW( dll ); if (!hModule) { - ERR("failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); - return r; + WARN( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + return ERROR_SUCCESS; } proc = strdupWtoA( function );

1 0