wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

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

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

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 ID3D11ShaderRefleflection::GetVariableByName().
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: 3c75a985e36723b78901e90ac21add3d0c0b5412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c75a985e36723b78901e90ac… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Feb 22 21:01:11 2011 +0100 d3dcompiler: Implement ID3D11ShaderRefleflection::GetVariableByName(). --- dlls/d3dcompiler_43/reflection.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 22522bf..b751725 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -418,9 +418,36 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantP static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetVariableByName( ID3D11ShaderReflection *iface, LPCSTR name) { - FIXME("iface %p, name %s stub!\n", iface, name); + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + unsigned int i, k; - return NULL; + TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + + if (!name) + { + WARN("Invalid name specified\n"); + return &null_variable.ID3D11ShaderReflectionVariable_iface; + } + + for (i = 0; i < This->constant_buffer_count; ++i) + { + struct d3dcompiler_shader_reflection_constant_buffer *cb = &This->constant_buffers[i]; + + for (k = 0; k < cb->variable_count; ++k) + { + struct d3dcompiler_shader_reflection_variable *v = &cb->variables[k]; + + if (!strcmp(v->name, name)) + { + TRACE("Returning ID3D11ShaderReflectionVariable %p.\n", v); + return &v->ID3D11ShaderReflectionVariable_iface; + } + } + } + + WARN("Invalid name specified\n"); + + return &null_variable.ID3D11ShaderReflectionVariable_iface; } static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDescByName(

1 0

Marcus Meissner : dbghelp: Fixed pasted size error (Coverity).
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: 0d198362aaf5eeafea7efbb73c353bf258e82911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d198362aaf5eeafea7efbb73… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 23 05:41:27 2011 +0100 dbghelp: Fixed pasted size error (Coverity). --- dlls/dbghelp/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index ce5e63e..7f75cc2 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -193,7 +193,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->module.TimeDateStamp = stamp; module->module.CheckSum = checksum; - memset(module->module.LoadedPdbName, 0, sizeof(module->module.CVData)); + memset(module->module.LoadedPdbName, 0, sizeof(module->module.LoadedPdbName)); module->module.CVSig = 0; memset(module->module.CVData, 0, sizeof(module->module.CVData)); module->module.PdbSig = 0;

1 0

Marcus Meissner : cryptui: Fixed bad sizeof() (Coverity).
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: ab138e9c58417876f5bff63c86cbd7ffb1c7a6d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab138e9c58417876f5bff63c8… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 23 05:30:38 2011 +0100 cryptui: Fixed bad sizeof() (Coverity). --- dlls/cryptui/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index b823b6e..16f53da 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1637,7 +1637,7 @@ HCERTSTORE WINAPI CryptUIDlgSelectStoreA(PCRYPTUI_SELECTSTORE_INFO_A info) SetLastError(E_INVALIDARG); return NULL; } - memcpy(&infoW, &info, sizeof(info)); + memcpy(&infoW, info, sizeof(*info)); if (info->pszTitle) { len = MultiByteToWideChar(CP_ACP, 0, info->pszTitle, -1, NULL, 0);

1 0

Marcus Meissner : kernel32: Fixed mismatched bracket (Coverity).
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: b42c593f67e524034dbd07b38e1c5343260ed57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42c593f67e524034dbd07b38… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 23 05:21:42 2011 +0100 kernel32: Fixed mismatched bracket (Coverity). --- dlls/kernel32/tests/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index f20bd4e..322c2ca 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -927,7 +927,7 @@ static void test_LoopbackRead(HANDLE hcom) i=0; do { - res = ReadFile(hcom, rbuf+read, sizeof(rbuf-read), &read1, NULL); + res = ReadFile(hcom, rbuf+read, sizeof(rbuf)-read, &read1, NULL); ok(res, "Readfile failed\n"); read += read1; i++;

1 0

Marcus Meissner : rsaenh: Fixed bad sizeof() usage (Coverity).
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: c4337f1e33bca837db6a270d63e68940edddcea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4337f1e33bca837db6a270d6… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 23 05:14:38 2011 +0100 rsaenh: Fixed bad sizeof() usage (Coverity). --- dlls/rsaenh/sha2.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/sha2.c b/dlls/rsaenh/sha2.c index ea5bb28..76e7184 100644 --- a/dlls/rsaenh/sha2.c +++ b/dlls/rsaenh/sha2.c @@ -563,7 +563,7 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { } /* Clean up state data: */ - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); usedspace = 0; } @@ -584,7 +584,7 @@ char *SHA256_End(SHA256_CTX* context, char buffer[]) { } *buffer = 0; } else { - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH); return buffer; @@ -893,7 +893,7 @@ void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { } /* Zero out state data */ - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } char *SHA512_End(SHA512_CTX* context, char buffer[]) { @@ -913,7 +913,7 @@ char *SHA512_End(SHA512_CTX* context, char buffer[]) { } *buffer = 0; } else { - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH); return buffer; @@ -968,7 +968,7 @@ void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) { } /* Zero out state data */ - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } char *SHA384_End(SHA384_CTX* context, char buffer[]) { @@ -988,7 +988,7 @@ char *SHA384_End(SHA384_CTX* context, char buffer[]) { } *buffer = 0; } else { - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH); return buffer;

1 0

Marcus Meissner : wineoss.drv: Fixed incorrect sizeof() (Coverity).
by Alexandre Julliard 23 Feb '11

23 Feb '11

Module: wine Branch: master Commit: 242cbcaa27558de6bfe5f28805f1f89169cc497b URL: http://source.winehq.org/git/wine.git/?a=commit;h=242cbcaa27558de6bfe5f2880… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 23 03:22:52 2011 +0100 wineoss.drv: Fixed incorrect sizeof() (Coverity). --- dlls/wineoss.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 5598879..76f49ae 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -297,7 +297,7 @@ static BOOL supportedFormat(LPWAVEFORMATEX wf) void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) { - ZeroMemory(wf2, sizeof(wf2)); + ZeroMemory(wf2, sizeof(*wf2)); if (wf1->wFormatTag == WAVE_FORMAT_PCM) memcpy(wf2, wf1, sizeof(PCMWAVEFORMAT)); else if (wf1->wFormatTag == WAVE_FORMAT_EXTENSIBLE)

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2011