March 2011 - wine-commits

Nikolay Sivov : msxml3: Implement get_nodeTypedValue() for nodes that can' t have type.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 46fa4791053addd2f52f1ea2a19d38b162831d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fa4791053addd2f52f1ea2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 7 00:39:13 2011 +0300 msxml3: Implement get_nodeTypedValue() for nodes that can't have type. --- dlls/msxml3/cdata.c | 6 ++-- dlls/msxml3/comment.c | 6 ++-- dlls/msxml3/docfrag.c | 6 ++-- dlls/msxml3/doctype.c | 6 ++-- dlls/msxml3/domdoc.c | 6 ++-- dlls/msxml3/pi.c | 6 ++-- dlls/msxml3/tests/domdoc.c | 75 +++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 92 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index f81cf2f..e9de472 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -433,11 +433,11 @@ static HRESULT WINAPI domcdata_get_definition( static HRESULT WINAPI domcdata_get_nodeTypedValue( IXMLDOMCDATASection *iface, - VARIANT* var1) + VARIANT* v) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - FIXME("(%p)->(%p)\n", This, var1); - return return_null_var(var1); + TRACE("(%p)->(%p)\n", This, v); + return node_get_content(&This->node, v); } static HRESULT WINAPI domcdata_put_nodeTypedValue( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 4c5f107..a75d178 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -432,11 +432,11 @@ static HRESULT WINAPI domcomment_get_definition( static HRESULT WINAPI domcomment_get_nodeTypedValue( IXMLDOMComment *iface, - VARIANT* var1) + VARIANT* v) { domcomment *This = impl_from_IXMLDOMComment( iface ); - FIXME("(%p)->(%p)\n", This, var1); - return return_null_var(var1); + TRACE("(%p)->(%p)\n", This, v); + return node_get_content(&This->node, v); } static HRESULT WINAPI domcomment_put_nodeTypedValue( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 0c4193a..bc2b77f 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -436,11 +436,11 @@ static HRESULT WINAPI domfrag_get_definition( static HRESULT WINAPI domfrag_get_nodeTypedValue( IXMLDOMDocumentFragment *iface, - VARIANT* var1) + VARIANT *v) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - FIXME("(%p)->(%p)\n", This, var1); - return return_null_var(var1); + TRACE("(%p)->(%p)\n", This, v); + return return_null_var(v); } static HRESULT WINAPI domfrag_put_nodeTypedValue( diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index 360d2a0..6c757b3 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -407,11 +407,11 @@ static HRESULT WINAPI domdoctype_get_definition( static HRESULT WINAPI domdoctype_get_nodeTypedValue( IXMLDOMDocumentType *iface, - VARIANT* var1) + VARIANT* v) { domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); - FIXME("(%p)->(%p): stub\n", This, var1); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, v); + return return_null_var(v); } static HRESULT WINAPI domdoctype_put_nodeTypedValue( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a5f9e9e..c9d1c48 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1328,11 +1328,11 @@ static HRESULT WINAPI domdoc_get_definition( static HRESULT WINAPI domdoc_get_nodeTypedValue( IXMLDOMDocument3 *iface, - VARIANT* typedValue ) + VARIANT* v ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - FIXME("(%p)->(%p)\n", This, typedValue); - return return_null_var(typedValue); + TRACE("(%p)->(%p)\n", This, v); + return return_null_var(v); } static HRESULT WINAPI domdoc_put_nodeTypedValue( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 49a221d..b9a2c7e 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -447,11 +447,11 @@ static HRESULT WINAPI dom_pi_get_definition( static HRESULT WINAPI dom_pi_get_nodeTypedValue( IXMLDOMProcessingInstruction *iface, - VARIANT* var1) + VARIANT* v) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - FIXME("(%p)->(%p)\n", This, var1); - return return_null_var(var1); + TRACE("(%p)->(%p)\n", This, v); + return node_get_content(&This->node, v); } static HRESULT WINAPI dom_pi_put_nodeTypedValue( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9dca668..210c709 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6009,7 +6009,12 @@ static const nodetypedvalue_t get_nodetypedvalue[] = { static void test_nodeTypedValue(void) { const nodetypedvalue_t *entry = get_nodetypedvalue; - IXMLDOMDocument *doc; + IXMLDOMProcessingInstruction *pi; + IXMLDOMDocumentFragment *frag; + IXMLDOMDocumentType *doctype; + IXMLDOMDocument *doc, *doc2; + IXMLDOMCDATASection *cdata; + IXMLDOMComment *comment; IXMLDOMNode *node; VARIANT_BOOL b; VARIANT value; @@ -6035,8 +6040,10 @@ static void test_nodeTypedValue(void) hr = IXMLDOMDocument_get_nodeTypedValue(doc, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + V_VT(&value) = VT_EMPTY; hr = IXMLDOMDocument_get_nodeTypedValue(doc, &value); ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(V_VT(&value) == VT_NULL, "got %d\n", V_VT(&value)); hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("root/string"), &node); ok(hr == S_OK, "ret %08x\n", hr ); @@ -6082,6 +6089,72 @@ static void test_nodeTypedValue(void) IXMLDOMNode_Release(node); } + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("foo"), _bstr_("value"), &pi); + ok(hr == S_OK, "ret %08x\n", hr ); + { + V_VT(&value) = VT_NULL; + V_BSTR(&value) = (void*)0xdeadbeef; + hr = IXMLDOMProcessingInstruction_get_nodeTypedValue(pi, &value); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); + ok(!lstrcmpW(V_BSTR(&value), _bstr_("value")), "got wrong value\n"); + IXMLDOMProcessingInstruction_Release(pi); + } + + hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("[1]*2=3; &gee thats not right!"), &cdata); + ok(hr == S_OK, "ret %08x\n", hr ); + { + V_VT(&value) = VT_NULL; + V_BSTR(&value) = (void*)0xdeadbeef; + hr = IXMLDOMCDATASection_get_nodeTypedValue(cdata, &value); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); + ok(!lstrcmpW(V_BSTR(&value), _bstr_("[1]*2=3; &gee thats not right!")), "got wrong value\n"); + IXMLDOMCDATASection_Release(cdata); + } + + hr = IXMLDOMDocument_createComment(doc, _bstr_("comment"), &comment); + ok(hr == S_OK, "ret %08x\n", hr ); + { + V_VT(&value) = VT_NULL; + V_BSTR(&value) = (void*)0xdeadbeef; + hr = IXMLDOMComment_get_nodeTypedValue(comment, &value); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); + ok(!lstrcmpW(V_BSTR(&value), _bstr_("comment")), "got wrong value\n"); + IXMLDOMComment_Release(comment); + } + + hr = IXMLDOMDocument_createDocumentFragment(doc, &frag); + ok(hr == S_OK, "ret %08x\n", hr ); + { + V_VT(&value) = VT_EMPTY; + hr = IXMLDOMDocumentFragment_get_nodeTypedValue(frag, &value); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(V_VT(&value) == VT_NULL, "got %d\n", V_VT(&value)); + IXMLDOMDocumentFragment_Release(frag); + } + + doc2 = create_document(&IID_IXMLDOMDocument); + + b = VARIANT_FALSE; + hr = IXMLDOMDocument_loadXML(doc2, _bstr_(szEmailXML), &b); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(b == VARIANT_TRUE, "got %d\n", b); + + hr = IXMLDOMDocument_get_doctype(doc2, &doctype); + todo_wine ok(hr == S_OK, "ret %08x\n", hr ); + if (hr == S_OK) + { + V_VT(&value) = VT_EMPTY; + hr = IXMLDOMDocumentType_get_nodeTypedValue(doctype, &value); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(V_VT(&value) == VT_NULL, "got %d\n", V_VT(&value)); + IXMLDOMDocumentType_Release(doctype); + } + + IXMLDOMDocument_Release(doc2); + while (entry->name) { hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_(entry->name), &node);

1 0

Nikolay Sivov : msxml3: Properly update xmldoc refcounts on insertBefore().
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 0f3c247e46dbc7935bf6e2d563ce16f01cada9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3c247e46dbc7935bf6e2d56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 6 22:28:29 2011 +0300 msxml3: Properly update xmldoc refcounts on insertBefore(). insertBefore() is able to work on nodes from different documents, so on adding child or sibling it's possible that libxml2 switches doc pointer for a node, we need to update refcounts to cover that case. --- dlls/msxml3/node.c | 7 ++++ dlls/msxml3/tests/domdoc.c | 66 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index fc15a5d..18b3db2 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -295,6 +295,7 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT xmlNodePtr new_child_node; IXMLDOMNode *before = NULL; xmlnode *node_obj; + xmlDocPtr doc; HRESULT hr; if(!new_child) @@ -336,7 +337,10 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT /* unlink from current parent first */ if(node_obj->parent) IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + doc = new_child_node->doc; + xmldoc_add_ref(before_node_obj->node->doc); xmlAddPrevSibling(before_node_obj->node, new_child_node); + xmldoc_release(doc); node_obj->parent = This->parent; } else @@ -344,7 +348,10 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT /* unlink from current parent first */ if(node_obj->parent) IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + doc = new_child_node->doc; + xmldoc_add_ref(This->node->doc); xmlAddChild(This->node, new_child_node); + xmldoc_release(doc); node_obj->parent = This->iface; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 439207f..9dca668 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2064,6 +2064,7 @@ static void test_refs(void) doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; + EXPECT_REF(doc, 1); ref = IXMLDOMDocument_Release(doc); ok( ref == 0, "ref %d\n", ref); @@ -2076,6 +2077,7 @@ static void test_refs(void) ok( b == VARIANT_TRUE, "failed to load XML string\n"); SysFreeString( str ); + EXPECT_REF(doc, 1); IXMLDOMDocument_AddRef( doc ); EXPECT_REF(doc, 2); IXMLDOMDocument_AddRef( doc ); @@ -2089,19 +2091,27 @@ static void test_refs(void) ok( element != NULL, "should be an element\n"); EXPECT_REF(doc, 1); + todo_wine EXPECT_REF(element, 2); + + IXMLDOMElement_AddRef(element); + todo_wine EXPECT_REF(element, 3); + IXMLDOMElement_Release(element); r = IXMLDOMElement_get_childNodes( element, &node_list ); ok( r == S_OK, "rets %08x\n", r); + todo_wine EXPECT_REF(element, 2); EXPECT_REF(node_list, 1); IXMLDOMNodeList_get_item( node_list, 0, &node ); ok( r == S_OK, "rets %08x\n", r); + EXPECT_REF(node_list, 1); + EXPECT_REF(node, 1); IXMLDOMNodeList_get_item( node_list, 0, &node2 ); ok( r == S_OK, "rets %08x\n", r); - - EXPECT_REF(node, 1); + EXPECT_REF(node_list, 1); + EXPECT_REF(node2, 1); ref = IXMLDOMNode_Release( node ); ok( ref == 0, "ref %d\n", ref ); @@ -2121,18 +2131,22 @@ static void test_refs(void) /* IUnknown must be unique however we obtain it */ r = IXMLDOMElement_QueryInterface( element, &IID_IUnknown, (void**)&unk ); ok( r == S_OK, "rets %08x\n", r ); + EXPECT_REF(element, 2); r = IXMLDOMElement_QueryInterface( element, &IID_IXMLDOMNode, (void**)&node ); ok( r == S_OK, "rets %08x\n", r ); + todo_wine EXPECT_REF(element, 2); r = IXMLDOMNode_QueryInterface( node, &IID_IUnknown, (void**)&unk2 ); ok( r == S_OK, "rets %08x\n", r ); + todo_wine EXPECT_REF(element, 2); ok( unk == unk2, "unk %p unk2 %p\n", unk, unk2 ); + todo_wine ok( element != (void*)node, "node %p element %p\n", node, element ); IUnknown_Release( unk2 ); IUnknown_Release( unk ); IXMLDOMNode_Release( node ); + todo_wine EXPECT_REF(element, 2); IXMLDOMElement_Release( element ); - } static void test_create(void) @@ -2156,6 +2170,8 @@ static void test_create(void) doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; + EXPECT_REF(doc, 1); + /* types not supported for creation */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_DOCUMENT; @@ -2452,9 +2468,12 @@ static void test_create(void) V_I4(&var) = NODE_ELEMENT; r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); + + EXPECT_REF(doc, 1); r = IXMLDOMDocument_appendChild( doc, node, &root ); ok( r == S_OK, "returns %08x\n", r ); ok( node == root, "%p %p\n", node, root ); + EXPECT_REF(doc, 1); EXPECT_REF(node, 2); @@ -8250,7 +8269,45 @@ static void test_insertBefore(void) SysFreeString(p); IXMLDOMDocument_Release(doc); - free_bstrs(); +} + +static void test_appendChild(void) +{ + IXMLDOMDocument *doc, *doc2; + IXMLDOMElement *elem, *elem2; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + doc2 = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("elem"), &elem); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_createElement(doc2, _bstr_("elem2"), &elem2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(doc, 1); + todo_wine EXPECT_REF(elem, 2); + EXPECT_REF(doc2, 1); + todo_wine EXPECT_REF(elem2, 2); + EXPECT_NO_CHILDREN(doc); + EXPECT_NO_CHILDREN(doc2); + + /* append from another document */ + hr = IXMLDOMDocument_appendChild(doc2, (IXMLDOMNode*)elem, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(doc, 1); + todo_wine EXPECT_REF(elem, 2); + EXPECT_REF(doc2, 1); + todo_wine EXPECT_REF(elem2, 2); + EXPECT_NO_CHILDREN(doc); + EXPECT_CHILDREN(doc2); + + IXMLDOMElement_Release(elem); + IXMLDOMElement_Release(elem2); + IXMLDOMDocument_Release(doc); + IXMLDOMDocument_Release(doc2); } START_TEST(domdoc) @@ -8318,6 +8375,7 @@ START_TEST(domdoc) test_put_nodeTypedValue(); test_get_xml(); test_insertBefore(); + test_appendChild(); test_xsltemplate(); CoUninitialize();

1 0

Nikolay Sivov : msxml3: Trace ref counts for all dom objects.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: d05435167ac313733edfaccb89a7747f7dc6822c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05435167ac313733edfaccb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 21:32:31 2011 +0300 msxml3: Trace ref counts for all dom objects. --- dlls/msxml3/attribute.c | 8 +++++--- dlls/msxml3/cdata.c | 8 +++++--- dlls/msxml3/comment.c | 8 +++++--- dlls/msxml3/docfrag.c | 8 +++++--- dlls/msxml3/doctype.c | 6 ++---- dlls/msxml3/domimpl.c | 8 +++++--- dlls/msxml3/element.c | 4 ++-- dlls/msxml3/entityref.c | 8 +++++--- dlls/msxml3/nodelist.c | 8 +++++--- dlls/msxml3/nodemap.c | 8 +++++--- dlls/msxml3/pi.c | 8 +++++--- dlls/msxml3/text.c | 8 +++++--- 12 files changed, 54 insertions(+), 36 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index a6196a1..f61428a 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -89,16 +89,18 @@ static ULONG WINAPI domattr_AddRef( IXMLDOMAttribute *iface ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI domattr_Release( IXMLDOMAttribute *iface ) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index cdcebb0..f81cf2f 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -89,16 +89,18 @@ static ULONG WINAPI domcdata_AddRef( IXMLDOMCDATASection *iface ) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI domcdata_Release( IXMLDOMCDATASection *iface ) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 433cca9..4c5f107 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -89,16 +89,18 @@ static ULONG WINAPI domcomment_AddRef( IXMLDOMComment *iface ) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI domcomment_Release( IXMLDOMComment *iface ) { domcomment *This = impl_from_IXMLDOMComment( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 89b82a9..0c4193a 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -88,16 +88,18 @@ static ULONG WINAPI domfrag_AddRef( IXMLDOMDocumentFragment *iface ) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI domfrag_Release( IXMLDOMDocumentFragment *iface ) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index 9ebe1f0..360d2a0 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -91,9 +91,7 @@ static ULONG WINAPI domdoctype_AddRef( { domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - + TRACE("(%p)->(%d)\n", This, ref); return ref; } @@ -103,7 +101,7 @@ static ULONG WINAPI domdoctype_Release( domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p)->(%d)\n", This, ref); if(!ref) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 54936bb..9743cc6 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -83,16 +83,18 @@ static ULONG WINAPI dimimpl_AddRef( IXMLDOMImplementation *iface ) { domimpl *This = impl_from_IXMLDOMImplementation( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI dimimpl_Release( IXMLDOMImplementation *iface ) { domimpl *This = impl_from_IXMLDOMImplementation( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { heap_free( This ); diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 5559fd2..8d81f67 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -100,7 +100,7 @@ static ULONG WINAPI domelem_AddRef( domelem *This = impl_from_IXMLDOMElement( iface ); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p)->(%d)\n", This, ref); return ref; } @@ -111,7 +111,7 @@ static ULONG WINAPI domelem_Release( domelem *This = impl_from_IXMLDOMElement( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p)->(%d)\n", This, ref); if(!ref) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index add4d8a..7ce85ed 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -88,16 +88,18 @@ static ULONG WINAPI entityref_AddRef( IXMLDOMEntityReference *iface ) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI entityref_Release( IXMLDOMEntityReference *iface ) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 749b179..67bcd2a 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -93,16 +93,18 @@ static ULONG WINAPI xmlnodelist_AddRef( IXMLDOMNodeList *iface ) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xmlnodelist_Release( IXMLDOMNodeList *iface ) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { xmldoc_release( This->parent->doc ); diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 7055da5..660eab6 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -95,16 +95,18 @@ static ULONG WINAPI xmlnodemap_AddRef( IXMLDOMNamedNodeMap *iface ) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xmlnodemap_Release( IXMLDOMNamedNodeMap *iface ) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { IXMLDOMNode_Release( This->node ); diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 335b584..49a221d 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -88,16 +88,18 @@ static ULONG WINAPI dom_pi_AddRef( IXMLDOMProcessingInstruction *iface ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI dom_pi_Release( IXMLDOMProcessingInstruction *iface ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index b17d1d4..3e3d3b2 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -90,16 +90,18 @@ static ULONG WINAPI domtext_AddRef( IXMLDOMText *iface ) { domtext *This = impl_from_IXMLDOMText( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI domtext_Release( IXMLDOMText *iface ) { domtext *This = impl_from_IXMLDOMText( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { destroy_xmlnode(&This->node);

1 0

Nikolay Sivov : msvcrt: Added partially complete _wcsupr_s_l ( without locale support).
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 46ae113e7128956a4a77eac60e6019d640a92f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ae113e7128956a4a77eac60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 02:28:28 2011 +0300 msvcrt: Added partially complete _wcsupr_s_l (without locale support). --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/wcs.c | 16 +++++++++++++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 42d8310..d732d69 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1318,7 +1318,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s -@ stub _wcsupr_s_l +@ cdecl _wcsupr_s_l(wstr long ptr) msvcrt._wcsupr_s_l @ stub _wcsxfrm_l @ cdecl _wctime32(ptr) msvcrt._wctime32 @ stub _wctime32_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f9eaaf0..1631fdb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1171,7 +1171,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s -@ stub _wcsupr_s_l +@ cdecl _wcsupr_s_l(wstr long ptr) msvcrt._wcsupr_s_l @ stub _wcsxfrm_l @ cdecl _wctime32(ptr) msvcrt._wctime32 @ stub _wctime32_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b7288da..8148caf 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1158,7 +1158,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s -@ stub _wcsupr_s_l +@ cdecl _wcsupr_s_l(wstr long ptr) msvcrt._wcsupr_s_l @ stub _wcsxfrm_l @ cdecl _wctime32(ptr) msvcrt._wctime32 @ stub _wctime32_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d45094a..93aa0f0 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -103,10 +103,10 @@ MSVCRT_wchar_t* CDECL _wcsset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c ) } /****************************************************************** - * _wcsupr_s (MSVCRT.@) - * + * _wcsupr_s_l (MSVCRT.@) */ -INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) +int CDECL MSVCRT__wcsupr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, + MSVCRT__locale_t locale ) { MSVCRT_wchar_t* ptr = str; @@ -120,6 +120,7 @@ INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) while (n--) { if (!*ptr) return 0; + /* FIXME: add locale support */ *ptr = toupperW(*ptr); ptr++; } @@ -132,6 +133,15 @@ INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) } /****************************************************************** + * _wcsupr_s (MSVCRT.@) + * + */ +INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) +{ + return MSVCRT__wcsupr_s_l( str, n, NULL ); +} + +/****************************************************************** * _wcslwr_s (MSVCRT.@) */ int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n )

1 0

Nikolay Sivov : msvcrt: Added _wcslwr_s implementation.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 27e18b3bbc9aaf2ecf4146262af39448083cf360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e18b3bbc9aaf2ecf4146262… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 5 01:59:08 2011 +0300 msvcrt: Added _wcslwr_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 90 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/wcs.c | 28 +++++++++++++ 6 files changed, 122 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 608bfc6..42d8310 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1293,7 +1293,7 @@ @ stub _wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l -@ stub _wcslwr_s +@ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ stub _wcslwr_s_l @ stub _wcsncoll @ stub _wcsncoll_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 58b855c..f9eaaf0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1146,7 +1146,7 @@ @ stub _wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l -@ stub _wcslwr_s +@ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ stub _wcslwr_s_l @ stub _wcsncoll @ stub _wcsncoll_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d76acc8..b7288da 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1133,7 +1133,7 @@ @ stub _wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l -@ stub _wcslwr_s +@ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ stub _wcslwr_s_l @ stub _wcsncoll @ stub _wcsncoll_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c7f2120..f75c0d9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1067,7 +1067,7 @@ # stub _wcsicoll_l @ cdecl _wcslwr(wstr) ntdll._wcslwr # stub _wcslwr_l -# stub _wcslwr_s +@ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s # stub _wcslwr_s_l @ stub _wcsncoll #(wstr wstr long) # stub _wcsncoll_l diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c532fce..dfa38e6 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -75,6 +75,7 @@ static errno_t (__cdecl *p_ultoa_s)(__msvcrt_ulong,char*,size_t,int); static int *p__mb_cur_max; static unsigned char *p_mbctype; static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); +static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -731,6 +732,93 @@ static void test__wcsupr_s(void) ok(!wcscmp(testBuffer, expectedString), "Expected the string to be fully upper-case\n"); } +static void test__wcslwr_s(void) +{ + static const WCHAR mixedString[] = {'M', 'i', 'X', 'e', 'D', 'l', 'o', 'w', + 'e', 'r', 'U', 'P', 'P', 'E', 'R', 0}; + static const WCHAR expectedString[] = {'m', 'i', 'x', 'e', 'd', 'l', 'o', + 'w', 'e', 'r', 'u', 'p', 'p', 'e', + 'r', 0}; + WCHAR buffer[2*sizeof(mixedString)/sizeof(WCHAR)]; + int ret; + + if (!p_wcslwr_s) + { + win_skip("_wcslwr_s not found\n"); + return; + } + + /* Test NULL input string and invalid size. */ + errno = EBADF; + ret = p_wcslwr_s(NULL, 0); + ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno EINVAL, got %d\n", errno); + + /* Test NULL input string and valid size. */ + errno = EBADF; + ret = p_wcslwr_s(NULL, sizeof(buffer)/sizeof(wchar_t)); + ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno EINVAL, got %d\n", errno); + + /* Test empty string with zero size. */ + errno = EBADF; + buffer[0] = 'a'; + ret = p_wcslwr_s(buffer, 0); + ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno EINVAL, got %d\n", errno); + ok(buffer[0] == 0, "expected empty string\n"); + + /* Test empty string with size of one. */ + buffer[0] = 0; + ret = p_wcslwr_s(buffer, 1); + ok(ret == 0, "got %d\n", ret); + ok(buffer[0] == 0, "expected buffer to be unchanged\n"); + + /* Test one-byte buffer with zero size. */ + errno = EBADF; + buffer[0] = 'x'; + ret = p_wcslwr_s(buffer, 0); + ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "expected empty string\n"); + + /* Test one-byte buffer with size of one. */ + errno = EBADF; + buffer[0] = 'x'; + ret = p_wcslwr_s(buffer, 1); + ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "expected empty string\n"); + + /* Test invalid size. */ + wcscpy(buffer, mixedString); + errno = EBADF; + ret = p_wcslwr_s(buffer, 0); + ok(ret == EINVAL, "Expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "expected empty string\n"); + + /* Test normal string uppercasing. */ + wcscpy(buffer, mixedString); + ret = p_wcslwr_s(buffer, sizeof(mixedString)/sizeof(WCHAR)); + ok(ret == 0, "expected 0, got %d\n", ret); + ok(!wcscmp(buffer, expectedString), "expected lowercase\n"); + + /* Test uppercasing with a shorter buffer size count. */ + wcscpy(buffer, mixedString); + errno = EBADF; + ret = p_wcslwr_s(buffer, sizeof(mixedString)/sizeof(WCHAR) - 1); + ok(ret == EINVAL, "expected EINVAL, got %d\n", ret); + ok(errno == EINVAL, "expected errno to be EINVAL, got %d\n", errno); + ok(buffer[0] == '\0', "expected empty string\n"); + + /* Test uppercasing with a longer buffer size count. */ + wcscpy(buffer, mixedString); + ret = p_wcslwr_s(buffer, sizeof(buffer)/sizeof(WCHAR)); + ok(ret == 0, "expected 0, got %d\n", ret); + ok(!wcscmp(buffer, expectedString), "expected lowercase\n"); +} + static void test_mbcjisjms(void) { /* List of value-pairs to test. The test assumes the last pair to be {0, ..} */ @@ -1732,6 +1820,7 @@ START_TEST(string) p_strlwr_s = (void *)GetProcAddress(hMsvcrt, "_strlwr_s"); p_ultoa_s = (void *)GetProcAddress(hMsvcrt, "_ultoa_s"); p_set_invalid_parameter_handler = (void *) GetProcAddress(hMsvcrt, "_set_invalid_parameter_handler"); + p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1771,4 +1860,5 @@ START_TEST(string) test_wcsncat_s(); test__mbsnbcat_s(); test__ultoa_s(); + test__wcslwr_s(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b01e60b..d45094a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -131,6 +131,34 @@ INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) return MSVCRT_EINVAL; } +/****************************************************************** + * _wcslwr_s (MSVCRT.@) + */ +int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) +{ + MSVCRT_wchar_t* ptr = str; + + if (!str || !n) + { + if (str) *str = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + while (n--) + { + if (!*ptr) return 0; + *ptr = tolowerW(*ptr); + ptr++; + } + + /* MSDN claims that the function should return and set errno to + * ERANGE, which doesn't seem to be true based on the tests. */ + *str = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; +} + /********************************************************************* * _wcstod_l - not exported in native msvcrt */

1 0

Hans Leidekker : msi: Manage one assembly cache per major version of the . NET runtime.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: f1e59351ded497a7f9cd7c27c0fdfcf6db3765c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1e59351ded497a7f9cd7c27c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:40:39 2011 +0100 msi: Manage one assembly cache per major version of the .NET runtime. --- dlls/msi/assembly.c | 188 +++++++++++++++++++++++++++++++++------------------ dlls/msi/msipriv.h | 10 +++- dlls/msi/package.c | 6 +- 3 files changed, 135 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1e59351ded497a7f9cd7…

1 0

Hans Leidekker : msi: Avoid registering duplicate source list information.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 40ad619ac334732ea4dd5c073e2a13d5a899922d URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ad619ac334732ea4dd5c073… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:40:20 2011 +0100 msi: Avoid registering duplicate source list information. --- dlls/msi/package.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 5606d28..8d5fc18 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2567,6 +2567,11 @@ UINT msi_package_add_info(MSIPACKAGE *package, DWORD context, DWORD options, { MSISOURCELISTINFO *info; + LIST_FOR_EACH_ENTRY( info, &package->sourcelist_info, MSISOURCELISTINFO, entry ) + { + if (!strcmpW( info->value, value )) return ERROR_SUCCESS; + } + info = msi_alloc(sizeof(MSISOURCELISTINFO)); if (!info) return ERROR_OUTOFMEMORY; @@ -2585,6 +2590,11 @@ UINT msi_package_add_media_disk(MSIPACKAGE *package, DWORD context, DWORD option { MSIMEDIADISK *disk; + LIST_FOR_EACH_ENTRY( disk, &package->sourcelist_media, MSIMEDIADISK, entry ) + { + if (disk->disk_id == disk_id) return ERROR_SUCCESS; + } + disk = msi_alloc(sizeof(MSIMEDIADISK)); if (!disk) return ERROR_OUTOFMEMORY;

1 0

Hans Leidekker : msi: Compare keys only in compare_record.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 659db6e9024d60d997d065021b8ab46f765d0e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=659db6e9024d60d997d065021… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:40:06 2011 +0100 msi: Compare keys only in compare_record. --- dlls/msi/table.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index cdbdd58..bc05987 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1630,6 +1630,8 @@ static int compare_record( MSITABLEVIEW *tv, UINT row, MSIRECORD *rec ) for (i = 0; i < tv->num_cols; i++ ) { + if (!(tv->columns[i].type & MSITYPE_KEY)) continue; + r = get_table_value_from_record( tv, rec, i + 1, &ivalue ); if (r != ERROR_SUCCESS) return 1;

1 0

Hans Leidekker : msi: Reduce filename to the long name in ITERATE_RemoveFiles.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 3878c451caa53a276f96f605f352727100559b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3878c451caa53a276f96f605f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:39:53 2011 +0100 msi: Reduce filename to the long name in ITERATE_RemoveFiles. --- dlls/msi/files.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d024718..df765e5 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -915,14 +915,14 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) MSIPACKAGE *package = param; MSICOMPONENT *comp; MSIRECORD *uirow; - LPCWSTR component, filename, dirprop; + LPCWSTR component, dirprop; UINT install_mode; - LPWSTR dir = NULL, path = NULL; + LPWSTR dir = NULL, path = NULL, filename = NULL; DWORD size; UINT ret = ERROR_SUCCESS; component = MSI_RecordGetString(row, 2); - filename = MSI_RecordGetString(row, 3); + filename = strdupW( MSI_RecordGetString(row, 3) ); dirprop = MSI_RecordGetString(row, 4); install_mode = MSI_RecordGetInteger(row, 5); @@ -950,7 +950,12 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) if (!dir) return ERROR_OUTOFMEMORY; - size = (filename != NULL) ? lstrlenW(filename) : 0; + size = 0; + if (filename) + { + reduce_to_longfilename( filename ); + size = lstrlenW( filename ); + } size += lstrlenW(dir) + 2; path = msi_alloc(size * sizeof(WCHAR)); if (!path) @@ -981,6 +986,7 @@ done: ui_actiondata( package, szRemoveFiles, uirow ); msiobj_release( &uirow->hdr ); + msi_free(filename); msi_free(path); msi_free(dir); return ret;

1 0

Hans Leidekker : msi/tests: Check the result of get_system_dirs and get_user_dirs.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 8e5230740a67e9a6b45b424692e0ee070b2e38ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5230740a67e9a6b45b42469… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:39:35 2011 +0100 msi/tests: Check the result of get_system_dirs and get_user_dirs. --- dlls/msi/tests/action.c | 6 +++--- dlls/msi/tests/install.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index f7919a4..84750d5 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2138,7 +2138,7 @@ static BOOL get_system_dirs(void) RegCloseKey(hkey); - if(GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH) != ERROR_SUCCESS) + if (!GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH)) return FALSE; return TRUE; @@ -6016,8 +6016,8 @@ START_TEST(action) if(len && (CURR_DIR[len - 1] == '\\')) CURR_DIR[len - 1] = 0; - get_system_dirs(); - get_user_dirs(); + ok(get_system_dirs(), "failed to retrieve system dirs\n"); + ok(get_user_dirs(), "failed to retrieve user dirs\n"); /* Create a restore point ourselves so we circumvent the multitude of restore points * that would have been created by all the installation and removal tests. diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1ae39d4..ea5431a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2205,7 +2205,7 @@ static BOOL get_system_dirs(void) RegCloseKey(hkey); - if(GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH) != ERROR_SUCCESS) + if(!GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH)) return FALSE; return TRUE; @@ -6371,8 +6371,8 @@ START_TEST(install) if(len && (CURR_DIR[len - 1] == '\\')) CURR_DIR[len - 1] = 0; - get_system_dirs(); - get_user_dirs(); + ok(get_system_dirs(), "failed to retrieve system dirs\n"); + ok(get_user_dirs(), "failed to retrieve user dirs\n"); /* Create a restore point ourselves so we circumvent the multitude of restore points * that would have been created by all the installation and removal tests.

1 0

Hans Leidekker : userenv: Initialize a variable (valgrind).
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 8c7d6b1c94ca5a15a28c4e1e6a687ac699dc6c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7d6b1c94ca5a15a28c4e1e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:39:18 2011 +0100 userenv: Initialize a variable (valgrind). --- dlls/userenv/userenv_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 6221e7e..3a02149 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -161,7 +161,7 @@ BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, if (!(t = HeapAlloc( GetProcessHeap(), 0, len ))) return FALSE; if (!GetTokenInformation( hToken, TokenUser, t, len, &len )) goto done; - len = 0; + len = domain_len = 0; LookupAccountSidW( NULL, t->User.Sid, NULL, &len, NULL, &domain_len, NULL ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) goto done; if (!(userW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) goto done;

1 0

Henri Verbeet : wined3d: Try to evict the surface' s sysmem copy in surface_load_location().
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 60a710455ef8dd4ac38901a8741189defa427e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a710455ef8dd4ac38901a87… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 01:30:34 2011 +0100 wined3d: Try to evict the surface's sysmem copy in surface_load_location(). The memory may not be freed until surface destruction otherwise. The PBO creation code in surface_prepare_system_memory() also depends on the SYSMEM location being recreated regularly, although arguably that's just a symptom of the resource location management being somewhat broken. --- dlls/wined3d/surface.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 03d597c..2c9aa48 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1275,6 +1275,17 @@ static BOOL surface_convert_color_to_float(IWineD3DSurfaceImpl *surface, DWORD c return TRUE; } +static void surface_evict_sysmem(IWineD3DSurfaceImpl *surface) +{ + if (surface->flags & SFLAG_DONOTFREE) + return; + + HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); + surface->resource.allocatedMemory = NULL; + surface->resource.heapMemory = NULL; + surface_modify_location(surface, SFLAG_INSYSMEM, FALSE); +} + HRESULT surface_load(IWineD3DSurfaceImpl *surface, BOOL srgb) { DWORD flag = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; @@ -1316,14 +1327,7 @@ HRESULT surface_load(IWineD3DSurfaceImpl *surface, BOOL srgb) /* No partial locking for textures yet. */ surface_load_location(surface, flag, NULL); - - if (!(surface->flags & SFLAG_DONOTFREE)) - { - HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); - surface->resource.allocatedMemory = NULL; - surface->resource.heapMemory = NULL; - surface_modify_location(surface, SFLAG_INSYSMEM, FALSE); - } + surface_evict_sysmem(surface); return WINED3D_OK; } @@ -2071,7 +2075,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) * merged again in the drawable. The sysmem copy is not fully up to * date because only a subrectangle was read in Map(). */ if (!fullsurface) + { surface_modify_location(This, SFLAG_INDRAWABLE, TRUE); + surface_evict_sysmem(This); + } This->dirtyRect.left = This->currentDesc.Width; This->dirtyRect.top = This->currentDesc.Height; @@ -4652,7 +4659,13 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE } } - if (!rect) surface->flags |= flag; + if (!rect) + { + surface->flags |= flag; + + if (flag != SFLAG_INSYSMEM && (surface->flags & SFLAG_INSYSMEM)) + surface_evict_sysmem(surface); + } if (in_fbo && (surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))) {

1 0

Henri Verbeet : wined3d: Clear SFLAG_LOCKED as soon as possible in IWineD3DSurfaceImpl_Unmap().
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: b1e03b3250c62b3321cef57e381c4d273e42f2fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e03b3250c62b3321cef57e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 01:30:33 2011 +0100 wined3d: Clear SFLAG_LOCKED as soon as possible in IWineD3DSurfaceImpl_Unmap(). --- dlls/wined3d/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index daa484c..03d597c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2006,6 +2006,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) return WINEDDERR_NOTLOCKED; } + This->flags &= ~SFLAG_LOCKED; + memset(&This->lockedRect, 0, sizeof(This->lockedRect)); + if (This->flags & SFLAG_PBO) { const struct wined3d_gl_info *gl_info; @@ -2080,10 +2083,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) FIXME("Depth Stencil buffer locking is not implemented\n"); } - unlock_end: - This->flags &= ~SFLAG_LOCKED; - memset(&This->lockedRect, 0, sizeof(RECT)); - +unlock_end: /* Overlays have to be redrawn manually after changes with the GL implementation */ if (This->overlay_dest) This->surface_ops->surface_draw_overlay(This);

1 0

Henri Verbeet : wined3d: Get rid of the SFLAG_LOCKED hack in flush_to_framebuffer_drawpixels().
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: eb3796083a4c1b691519eb0a8acb4794e4758e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3796083a4c1b691519eb0a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 01:30:32 2011 +0100 wined3d: Get rid of the SFLAG_LOCKED hack in flush_to_framebuffer_drawpixels(). --- dlls/wined3d/surface.c | 41 +++++++++++++++++++---------------------- 1 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4304963..daa484c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1925,39 +1925,36 @@ lock_end: return IWineD3DBaseSurfaceImpl_Map(iface, pLockedRect, pRect, flags); } -static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, - GLenum fmt, GLenum type, UINT bpp, const BYTE *mem) +static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *surface, + const RECT *rect, GLenum fmt, GLenum type, UINT bpp, const BYTE *mem) { - UINT pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *) This); /* target is argb, 4 byte */ - IWineD3DDeviceImpl *device = This->resource.device; + UINT pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *)surface); /* target is argb, 4 byte */ + IWineD3DDeviceImpl *device = surface->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - RECT rect; + RECT local_rect; UINT w, h; - if (This->flags & SFLAG_LOCKED) - rect = This->lockedRect; - else - SetRect(&rect, 0, 0, This->currentDesc.Width, This->currentDesc.Height); + surface_get_rect(surface, rect, &local_rect); - mem += rect.top * pitch + rect.left * bpp; - w = rect.right - rect.left; - h = rect.bottom - rect.top; + mem += local_rect.top * pitch + local_rect.left * bpp; + w = local_rect.right - local_rect.left; + h = local_rect.bottom - local_rect.top; /* Activate the correct context for the render target */ - context = context_acquire(device, This); + context = context_acquire(device, surface); context_apply_blit_state(context, device); gl_info = context->gl_info; ENTER_GL(); - if (!surface_is_offscreen(This)) + if (!surface_is_offscreen(surface)) { - GLenum buffer = surface_get_gl_buffer(This); + GLenum buffer = surface_get_gl_buffer(surface); TRACE("Unlocking %#x buffer.\n", buffer); context_set_draw_buffer(context, buffer); - surface_translate_drawable_coords(This, context->win_handle, &rect); + surface_translate_drawable_coords(surface, context->win_handle, &local_rect); glPixelZoom(1.0f, -1.0f); } else @@ -1969,22 +1966,22 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, glPixelZoom(1.0f, 1.0f); } - glRasterPos3i(rect.left, rect.top, 1); + glRasterPos3i(local_rect.left, local_rect.top, 1); checkGLcall("glRasterPos3i"); /* If not fullscreen, we need to skip a number of bytes to find the next row of data */ - glPixelStorei(GL_UNPACK_ROW_LENGTH, This->currentDesc.Width); + glPixelStorei(GL_UNPACK_ROW_LENGTH, surface->currentDesc.Width); - if (This->flags & SFLAG_PBO) + if (surface->flags & SFLAG_PBO) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); checkGLcall("glBindBufferARB"); } glDrawPixels(w, h, fmt, type, mem); checkGLcall("glDrawPixels"); - if (This->flags & SFLAG_PBO) + if (surface->flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); @@ -4509,7 +4506,7 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE byte_count = format.byte_count; } - flush_to_framebuffer_drawpixels(surface, format.glFormat, format.glType, byte_count, mem); + flush_to_framebuffer_drawpixels(surface, rect, format.glFormat, format.glType, byte_count, mem); /* Don't delete PBO memory */ if ((mem != surface->resource.allocatedMemory) && !(surface->flags & SFLAG_PBO))

1 0

Henri Verbeet : wined3d: Check subresources for NULL during texture cleanup .
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 9059271442db4e75c7d5c9e39a061807b6e64a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9059271442db4e75c7d5c9e39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 01:30:31 2011 +0100 wined3d: Check subresources for NULL during texture cleanup. This fixes a regression introduced by 1de6adfbae7ac36c6649aab209d1a62a64e80465. --- dlls/wined3d/cubetexture.c | 6 ++++-- dlls/wined3d/texture.c | 7 +++++-- dlls/wined3d/volumetexture.c | 6 ++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 765c11a..165f6c0 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -179,10 +179,12 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) for (i = 0; i < sub_count; ++i) { - IWineD3DSurfaceImpl *surface = surface_from_resource(This->baseTexture.sub_resources[i]); + struct wined3d_resource *sub_resource = This->baseTexture.sub_resources[i]; - if (surface) + if (sub_resource) { + IWineD3DSurfaceImpl *surface = surface_from_resource(sub_resource); + /* Clean out the texture name we gave to the surface so that the * surface doesn't try and release it. */ surface_set_texture_name(surface, 0, TRUE); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8f98739..6ed3c7d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -201,9 +201,12 @@ static void texture_cleanup(IWineD3DTextureImpl *This) for (i = 0; i < This->baseTexture.level_count; ++i) { - IWineD3DSurfaceImpl *surface = surface_from_resource(This->baseTexture.sub_resources[i]); - if (surface) + struct wined3d_resource *sub_resource = This->baseTexture.sub_resources[i]; + + if (sub_resource) { + IWineD3DSurfaceImpl *surface = surface_from_resource(sub_resource); + /* Clean out the texture name we gave to the surface so that the * surface doesn't try and release it */ surface_set_texture_name(surface, 0, TRUE); diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index e24ff79..a0eb4d0 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -121,10 +121,12 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) for (i = 0; i < This->baseTexture.level_count; ++i) { - IWineD3DVolumeImpl *volume = volume_from_resource(This->baseTexture.sub_resources[i]); + struct wined3d_resource *sub_resource = This->baseTexture.sub_resources[i]; - if (volume) + if (sub_resource) { + IWineD3DVolumeImpl *volume = volume_from_resource(sub_resource); + /* Cleanup the container. */ volume_set_container(volume, NULL); IWineD3DVolume_Release((IWineD3DVolume *)volume);

1 0

Francois Gouget : riched20/tests: Add a '\n' to an ok() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: cc2cd5a525ba94656751e57b4a96988b813cc22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2cd5a525ba94656751e57b4… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:48 2011 +0100 riched20/tests: Add a '\n' to an ok() call. --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 955a394..7a4e032 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6028,7 +6028,7 @@ static void test_EM_CHARFROMPOS(void) hwnd = new_richedit(NULL); result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"one two three four five six seven\reight"); - ok(result == 1, "Expected 1, got %d", result); + ok(result == 1, "Expected 1, got %d\n", result); GetClientRect(hwnd, &rcClient); result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point);

1 0

Francois Gouget : comcat/tests: Add a '\n' to a pair of ok() calls.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 4c89a83a5a98e9b6b2d9767a8882bd9015451d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c89a83a5a98e9b6b2d9767a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:04 2011 +0100 comcat/tests: Add a '\n' to a pair of ok() calls. --- dlls/comcat/tests/comcat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index cf0b7c1..f78e234 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -104,7 +104,7 @@ static void do_enum(void) ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); - ok (hr == S_FALSE,"Expected S_FALSE, got 0x%08x", hr); + ok (hr == S_FALSE,"Expected S_FALSE, got 0x%08x\n", hr); ok (fetched == 0,"Fetched wrong number of guids %u\n",fetched); IEnumGUID_Release(pIEnum); @@ -114,7 +114,7 @@ static void do_enum(void) ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); - ok (hr == S_OK,"Expected S_OK, got 0x%08x", hr); + ok (hr == S_OK,"Expected S_OK, got 0x%08x\n", hr); ok (fetched == 1,"Fetched wrong number of guids %u\n",fetched); ok (IsEqualGUID(the_guid,&wanted_guid),"Guids do not match\n");

1 0

Francois Gouget : gdi32/tests: Add a '\n' to an ok() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 53bcd3edb578797a2546c2e1f2795b6cb6efdd5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bcd3edb578797a2546c2e1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:37 2011 +0100 gdi32/tests: Add a '\n' to an ok() call. --- dlls/gdi32/tests/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 4b061f9..f4b83e2 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -89,7 +89,7 @@ static void test_widenpath(void) Polyline(hdc, pnt, 6); EndPath(hdc); ret = WidenPath(hdc); - ok(ret == TRUE, "WidenPath failed: %d", GetLastError()); + ok(ret == TRUE, "WidenPath failed: %d\n", GetLastError()); nSize = GetPath(hdc, NULL, NULL, 0); ok(nSize > 6, "WidenPath should compute a widdened path with a 1px wide pen. Path length is %d, should be more than 6\n", nSize);

1 0

Francois Gouget : urlmon/tests: Add a '\n' to an ok() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 91aa80b7e3dbf39de2ea1f2aa109cdb21b73082b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91aa80b7e3dbf39de2ea1f2aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:52:01 2011 +0100 urlmon/tests: Add a '\n' to an ok() call. --- dlls/urlmon/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 4469949..17a797b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2765,7 +2765,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) ok(hres == S_OK, "IMoniker_BindToStorage failed: %08x\n", hres); ok(unk != NULL, "unk == NULL\n"); if(unk == NULL) { - ok(0, "Expected security problem to be ignored."); + ok(0, "Expected security problem to be ignored.\n"); invalid_cn_accepted = FALSE; binding_hres = INET_E_INVALID_CERTIFICATE; }

1 0

Francois Gouget : comctl32: Add a trailing '\n' to an ERR() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: af104705977c27698d1d72468e9c6ad18078c2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af104705977c27698d1d72468… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:49 2011 +0100 comctl32: Add a trailing '\n' to an ERR() call. --- dlls/comctl32/rebar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 4235592..cc3c8a7 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2116,7 +2116,7 @@ REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) REBAR_BAND *hitBand, *rowBeginBand; if(infoPtr->uNumBands <= 0) - ERR("There are no bands in this rebar"); + ERR("There are no bands in this rebar\n"); /* Up/down dragging can only occur when there is more than one * band in the rebar */

1 0

Francois Gouget : shell32/tests: Add a trailing '\n' to a skip().
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: b7b916b05f1e08b189cacbe5c205fd211e3c3b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b916b05f1e08b189cacbe5c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:37 2011 +0100 shell32/tests: Add a trailing '\n' to a skip(). --- dlls/shell32/tests/shlfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index bc3e426..c17694b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3696,7 +3696,7 @@ void test_ShellItemGetAttributes(void) } if(FAILED(hr)) { - skip("Skipping tests."); + skip("Skipping tests.\n"); return; }

1 0

Francois Gouget : msvcrt/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: bf75229a0402b8eca8e2f41ded1e69830b587eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf75229a0402b8eca8e2f41de… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:15 2011 +0100 msvcrt/tests: Add a trailing '\n' to an ok() call. --- dlls/msvcrt/tests/printf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index f05d124..ddf4801 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -859,7 +859,7 @@ static void test_xcvt(void) for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ decpt = sign = 100; err = p__fcvt_s(str, 1024, test_cvt_testcases[i].value, test_cvt_testcases[i].nrdigits, &decpt, &sign); - ok(err == 0, "_fcvt_s() failed with error code %d", err); + ok(err == 0, "_fcvt_s() failed with error code %d\n", err); ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_f, 15), "_fcvt_s() bad return, got '%s' expected '%s'. test %d\n", str, test_cvt_testcases[i].expstr_f, i);

1 0

Francois Gouget : d3dx9_36/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 41663974ad054e51117780a9bff70e928ea946f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41663974ad054e51117780a9b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:57 2011 +0100 d3dx9_36/tests: Add a trailing '\n' to ok() calls. --- dlls/d3dx9_36/tests/mesh.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index a6ac4b3..f460c2d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1377,7 +1377,7 @@ static void D3DXCreateBoxTest(void) wnd = CreateWindow("d3dx9_test_wc", "d3dx9_test", WS_SYSMENU | WS_POPUP , 0, 0, 640, 480, 0, 0, 0, 0); - ok(wnd != NULL, "Expected to have a window, received NULL"); + ok(wnd != NULL, "Expected to have a window, received NULL\n"); if (!wnd) { skip("Couldn't create application window\n"); @@ -1405,26 +1405,26 @@ static void D3DXCreateBoxTest(void) } hr = D3DXCreateBuffer(36 * sizeof(DWORD), &ppBuffer); - ok(hr==D3D_OK, "Expected D3D_OK, received %#x", hr); + ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); if (FAILED(hr)) goto end; hr = D3DXCreateBox(device,2.0f,20.0f,4.9f,NULL, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(NULL,22.0f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,-2.0f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,22.0f,-20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,22.0f,20.0f,-4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,10.9f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3D_OK,"Expected D3D_OK, received %#x", hr); + todo_wine ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); if (FAILED(hr)) {

1 0

Francois Gouget : mscoree: Add a '\n' to an ERR() trace.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: e0b2307f9c6208d7672a03338e6f84e8966fd2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b2307f9c6208d7672a03338… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:29 2011 +0100 mscoree: Add a '\n' to an ERR() trace. --- dlls/mscoree/metahost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 708f638..ca4795e 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -119,7 +119,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) if ((*result)->is_shutdown) { - ERR("Cannot load Mono after it has been shut down."); + ERR("Cannot load Mono after it has been shut down.\n"); *result = NULL; return E_FAIL; }

1 0

Francois Gouget : wscript/tests: Add a '\n' to an ok() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: bc6a7f40d5bb02483a166fe388e1cc81195cbcda URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc6a7f40d5bb02483a166fe38… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:42 2011 +0100 wscript/tests: Add a '\n' to an ok() call. --- programs/wscript/tests/run.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 7cb7bc8..405aae4 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -272,7 +272,7 @@ static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG script_size--; ext = strrchr(name, '.'); - ok(ext != NULL, "no script extension"); + ok(ext != NULL, "no script extension\n"); if(!ext) return TRUE;

1 0

Francois Gouget : comctl32/tests: Add a '\n' to a pair of ok() calls.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 755648421e8b6c1cff52317865aaa5653281d409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755648421e8b6c1cff5231786… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:23 2011 +0100 comctl32/tests: Add a '\n' to a pair of ok() calls. --- dlls/comctl32/tests/comboex.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index ca30482..59c261c 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -405,7 +405,7 @@ static void test_WM_WINDOWPOSCHANGING(void) wp.hwndInsertAfter = NULL; ret = SendMessageA(hCombo, WM_WINDOWPOSCHANGING, 0, (LPARAM)&wp); - ok(ret == 0, "expected 0, got %x", ret); + ok(ret == 0, "expected 0, got %x\n", ret); ok(wp.cy == combo_height, "Expected height %d, got %d\n", combo_height, wp.cy); @@ -419,7 +419,7 @@ static void test_WM_WINDOWPOSCHANGING(void) wp.hwndInsertAfter = NULL; ret = SendMessageA(hCombo, WM_WINDOWPOSCHANGING, 0, (LPARAM)&wp); - ok(ret == 0, "expected 0, got %x", ret); + ok(ret == 0, "expected 0, got %x\n", ret); ok(wp.cy == combo_height, "Expected height %d, got %d\n", combo_height, wp.cy);

1 0

Francois Gouget : d3dcompiler_43: Add a '\n' to a couple of FIXME() traces.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: fdf97125cb886c0cf90eea6f6d2e2b70096d5d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf97125cb886c0cf90eea6f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:13 2011 +0100 d3dcompiler_43: Add a '\n' to a couple of FIXME() traces. --- dlls/d3dcompiler_43/reflection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 006dc40..3ebb6ec 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1247,7 +1247,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type hr = d3dcompiler_parse_type_members(type->reflection, &members[i], data, &ptr2); if (hr != S_OK) { - FIXME("Failed to parse type members."); + FIXME("Failed to parse type members.\n"); goto err_out; } } @@ -1522,7 +1522,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c hr = d3dcompiler_parse_variables(cb, data, data_size, data + offset); if (hr != S_OK) { - FIXME("Failed to parse variables."); + FIXME("Failed to parse variables.\n"); goto err_out; }

1 0

Aric Stewart : ws2_32: async_send with no buffers does not need to do any work.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: f520dec3e1fee260f42f4eb28d033d7b177f94d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f520dec3e1fee260f42f4eb28… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 4 12:09:44 2011 -0600 ws2_32: async_send with no buffers does not need to do any work. --- dlls/ws2_32/socket.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f74fd36..1993419 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1797,6 +1797,12 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu switch (status) { case STATUS_ALERTED: + if ( wsa->n_iovecs <= wsa->first_iovec ) + { + /* Nothing to do */ + status = STATUS_SUCCESS; + break; + } if ((status = wine_server_handle_to_fd( wsa->hSocket, FILE_WRITE_DATA, &fd, NULL ) )) break;

1 0

Alexandre Julliard : server: Fix the contents of the mouse data for the low-level hook.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 34efca05c902864016fdbc81dd659360616f505d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34efca05c902864016fdbc81d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 11:07:35 2011 +0100 server: Fix the contents of the mouse data for the low-level hook. --- server/queue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/queue.c b/server/queue.c index d1aa715..97e0c4d 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1362,7 +1362,7 @@ static int send_hook_ll_message( struct desktop *desktop, struct message *hardwa if (input->kbd.flags & KEYEVENTF_UNICODE) vkey = VK_PACKET; msg->lparam = (input->kbd.scan << 16) | vkey; } - else msg->lparam = input->mouse.data; + else msg->lparam = input->mouse.data << 16; if (!(msg->data = memdup( hardware_msg->data, hardware_msg->data_size )) || !(msg->result = alloc_message_result( sender, queue, msg, timeout )))

1 0

Alexandre Julliard : user32: Set the last mouse event timestamp before calling the low-level hook.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 55e1fec7c3b041de21d08571cd3d3b22328bcc0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e1fec7c3b041de21d08571c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 11:07:15 2011 +0100 user32: Set the last mouse event timestamp before calling the low-level hook. --- dlls/user32/input.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 056dd68..06553a4 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -124,9 +124,11 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) */ BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input ) { - NTSTATUS status = send_hardware_message( hwnd, input, 0 ); + NTSTATUS status; + + if (input->type == INPUT_MOUSE) last_mouse_event = GetTickCount(); + status = send_hardware_message( hwnd, input, 0 ); if (status) SetLastError( RtlNtStatusToDosError(status) ); - else if (input->type == INPUT_MOUSE) last_mouse_event = GetTickCount(); return !status; } @@ -181,11 +183,10 @@ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) { /* we need to update the coordinates to what the server expects */ INPUT input = inputs[i]; + last_mouse_event = GetTickCount(); update_mouse_coords( &input ); if (!(status = send_hardware_message( 0, &input, SEND_HWMSG_INJECTED ))) { - last_mouse_event = GetTickCount(); - if ((input.u.mi.dwFlags & MOUSEEVENTF_MOVE) && ((input.u.mi.dwFlags & MOUSEEVENTF_ABSOLUTE) || input.u.mi.dx || input.u.mi.dy)) {

1 0

Alexandre Julliard : advapi32: Fix array size construct that gcc doesn' t like.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 5055ec63a70ff365a7719e9967e0813246bf1002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5055ec63a70ff365a7719e996… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 11:06:51 2011 +0100 advapi32: Fix array size construct that gcc doesn't like. --- dlls/advapi32/registry.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index abaf09d..d5c4164 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -43,10 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); #define HKEY_SPECIAL_ROOT_FIRST HKEY_CLASSES_ROOT #define HKEY_SPECIAL_ROOT_LAST HKEY_DYN_DATA -#define NB_SPECIAL_ROOT_KEYS ((UINT_PTR)HKEY_SPECIAL_ROOT_LAST - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST + 1) - -static HKEY special_root_keys[NB_SPECIAL_ROOT_KEYS]; -static BOOL hkcu_cache_disabled; static const WCHAR name_CLASSES_ROOT[] = {'M','a','c','h','i','n','e','\\', @@ -67,7 +63,7 @@ static const WCHAR name_CURRENT_CONFIG[] = static const WCHAR name_DYN_DATA[] = {'D','y','n','D','a','t','a',0}; -static const WCHAR * const root_key_names[NB_SPECIAL_ROOT_KEYS] = +static const WCHAR * const root_key_names[] = { name_CLASSES_ROOT, NULL, /* HKEY_CURRENT_USER is determined dynamically */ @@ -78,6 +74,11 @@ static const WCHAR * const root_key_names[NB_SPECIAL_ROOT_KEYS] = name_DYN_DATA }; +#define NB_SPECIAL_ROOT_KEYS (sizeof(root_key_names)/sizeof(root_key_names[0])) + +static HKEY special_root_keys[NB_SPECIAL_ROOT_KEYS]; +static BOOL hkcu_cache_disabled; + static const int is_win64 = (sizeof(void *) > sizeof(int)); /* check if value type needs string conversion (Ansi<->Unicode) */

1 0

Frédéric Delanoy : French translation for release 1.3.15
by Jeremy Newman 04 Mar '11

04 Mar '11

Module: website Branch: master Commit: 141253564fb438290fd66135f8d20ece60143140 URL: http://source.winehq.org/git/website.git/?a=commit;h=141253564fb438290fd661… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Mar 4 21:00:01 2011 +0100 French translation for release 1.3.15 --- news/fr/2011030401.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/fr/2011030401.xml b/news/fr/2011030401.xml new file mode 100644 index 0000000..2a2410a --- /dev/null +++ b/news/fr/2011030401.xml @@ -0,0 +1,19 @@ +<news> +<date>4 mars 2011</date> +<title>Sortie de Wine 1.3.15</title> +<body> + La version de développement 1.3.15 de Wine est disponible. + <a href="{$root}/announce/1.3.15">Nouveautés</a> de cette version : +<ul> + <li>Possibilité de modifier les mots de passe réseau.</li> + <li>Prise en charge de la réflexion dans le compilateur de shaders.</li> + <li>Les tests n'essaient plus s'accommoder du comportement Win9x.</li> + <li>Plusieurs améliorations MSHTML et MSXML.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.15.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.15
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: website Branch: master Commit: da7a3d4eeabb92d2459e93431f139d9f2f05ac39 URL: http://source.winehq.org/git/website.git/?a=commit;h=da7a3d4eeabb92d2459e93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 4 19:33:12 2011 +0100 Wine release 1.3.15 --- news/en/2011030401.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2011030401.xml b/news/en/2011030401.xml new file mode 100644 index 0000000..28af1b9 --- /dev/null +++ b/news/en/2011030401.xml @@ -0,0 +1,16 @@ +<news> +<date>March 4, 2011</date> +<title>Wine 1.3.15 Released</title> +<body> + The Wine development release 1.3.15 is now available. + <a href="{$root}/announce/1.3.15">What's new</a> in this release: +<ul> + <li>Support for changing network passwords.</li> + <li>Reflection support in shader compiler.</li> + <li>Tests no longer attempt to cope with Win9x behavior.</li> + <li>A number of MSHTML and MSXML improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.15.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.3.15 : Alexandre Julliard : Release 1.3.15
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: refs/tags/wine-1.3.15 Tag: feb6748c29a0c7cb5752af5461389f17d4c096cc URL: http://source.winehq.org/git/wine.git/?a=tag;h=feb6748c29a0c7cb5752af546138… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 4 19:25:23 2011 +0100 Release 1.3.15

1 0

Alexandre Julliard : Release 1.3.15.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: e44875b42d8f72c6a0d49f05655489a5b8fb673a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44875b42d8f72c6a0d49f056… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 4 19:25:23 2011 +0100 Release 1.3.15. --- ANNOUNCE | 875 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 446 insertions(+), 449 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e44875b42d8f72c6a0d49…

1 0

Marcus Meissner : msvcrt: Move side effect out of assert (Coverity).
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: ecb89ba89e63fcbb56e81d1cf7dbb371bdab1a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb89ba89e63fcbb56e81d1cf… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Mar 4 14:06:50 2011 +0100 msvcrt: Move side effect out of assert (Coverity). --- dlls/msvcrt/undname.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 670873d..920a763 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1184,7 +1184,8 @@ static BOOL handle_template(struct parsed_symbol* sym) const char* name; const char* args; - assert(*sym->current++ == '$'); + assert(*sym->current == '$'); + sym->current++; if (!(name = get_literal_string(sym))) return FALSE; if (!(args = get_args(sym, NULL, FALSE, '<', '>'))) return FALSE; sym->result = str_printf(sym, "%s%s", name, args);

1 0

Marcus Meissner : msi: Pointer to out of scope local variable (Coverity).
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 85045480375b8a3277dd20282d6b18ac0ea2070d URL: http://source.winehq.org/git/wine.git/?a=commit;h=85045480375b8a3277dd20282… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Mar 4 13:48:27 2011 +0100 msi: Pointer to out of scope local variable (Coverity). --- dlls/msi/table.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 739e189..cdbdd58 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1143,6 +1143,8 @@ static UINT msi_stream_name( const MSITABLEVIEW *tv, UINT row, LPWSTR *pstname ) type = tv->columns[i].type; if ( type & MSITYPE_KEY ) { + WCHAR number[0x20]; + r = TABLE_fetch_int( view, row, i+1, &ival ); if ( r != ERROR_SUCCESS ) goto err; @@ -1159,7 +1161,6 @@ static UINT msi_stream_name( const MSITABLEVIEW *tv, UINT row, LPWSTR *pstname ) else { static const WCHAR fmt[] = { '%','d',0 }; - WCHAR number[0x20]; UINT n = bytes_per_column( tv->db, &tv->columns[i], LONG_STR_BYTES ); switch( n )

1 0

Marcus Meissner : dbghelp: Local variable used out of scope (Coverity).
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: f955a7ca07924a93116ee0bb1c06ac18afdf7bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f955a7ca07924a93116ee0bb1… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Mar 4 13:44:16 2011 +0100 dbghelp: Local variable used out of scope (Coverity). --- dlls/dbghelp/dbghelp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index bd4a9cb..358902b 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -553,12 +553,13 @@ static BOOL CALLBACK reg_cb64to32(HANDLE hProcess, ULONG action, ULONG64 data, U */ BOOL pcs_callback(const struct process* pcs, ULONG action, void* data) { + IMAGEHLP_DEFERRED_SYMBOL_LOAD64 idsl; + TRACE("%p %u %p\n", pcs, action, data); if (!pcs->reg_cb) return FALSE; if (!pcs->reg_is_unicode) { - IMAGEHLP_DEFERRED_SYMBOL_LOAD64 idsl; IMAGEHLP_DEFERRED_SYMBOL_LOADW64* idslW; switch (action)

1 0

David Adam : d3dx9_36: Implement ID3DXMesh_GetNumBytesPerVertex.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 68da568f16bfcd8aba1b6d0073b8bc29938d8537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68da568f16bfcd8aba1b6d007… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Mar 4 08:49:14 2011 +0100 d3dx9_36: Implement ID3DXMesh_GetNumBytesPerVertex. --- dlls/d3dx9_36/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index f8f7c48..0ccced6 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -156,9 +156,9 @@ static DWORD WINAPI ID3DXMeshImpl_GetNumBytesPerVertex(ID3DXMesh *iface) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); - FIXME("(%p): stub\n", This); + TRACE("iface (%p)\n", This); - return 0; /* arbitrary since we cannot return E_NOTIMPL */ + return D3DXGetFVFVertexSize(This->fvf); } static DWORD WINAPI ID3DXMeshImpl_GetOptions(ID3DXMesh *iface)

1 0

David Adam : d3dx9_36: Add a test for D3DXCreateBox.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 23faba7eb1119dca25e643a40539f4940ee0d40c URL: http://source.winehq.org/git/wine.git/?a=commit;h=23faba7eb1119dca25e643a40… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Mar 4 08:29:20 2011 +0100 d3dx9_36: Add a test for D3DXCreateBox. --- dlls/d3dx9_36/tests/mesh.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 05d68eb..a6ac4b3 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1357,6 +1357,15 @@ static void D3DXCreateBoxTest(void) D3DPRESENT_PARAMETERS d3dpp; ID3DXMesh* box; ID3DXBuffer* ppBuffer; + DWORD *buffer; + static const DWORD adjacency[36]= + {6, 9, 1, 2, 10, 0, + 1, 9, 3, 4, 10, 2, + 3, 8, 5, 7, 11, 4, + 0, 11, 7, 5, 8, 6, + 7, 4, 9, 2, 0, 8, + 1, 3, 11, 5, 6, 10}; + unsigned int i; wc.lpfnWndProc = DefWindowProcA; wc.lpszClassName = "d3dx9_test_wc"; @@ -1414,6 +1423,21 @@ static void D3DXCreateBoxTest(void) hr = D3DXCreateBox(device,22.0f,20.0f,-4.9f,&box, &ppBuffer); todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + hr = D3DXCreateBox(device,10.9f,20.0f,4.9f,&box, &ppBuffer); + todo_wine ok(hr==D3D_OK,"Expected D3D_OK, received %#x", hr); + + if (FAILED(hr)) + { + skip("D3DXCreateBox failed\n"); + goto end; + } + + buffer = ID3DXBuffer_GetBufferPointer(ppBuffer); + for(i=0; i<36; i++) + todo_wine ok(adjacency[i]==buffer[i], "expected adjacency %d: %#x, received %#x\n",i,adjacency[i], buffer[i]); + + box->lpVtbl->Release(box); + end: IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d);

1 0

Huw Davies : gdi32: Remove a wayward CDECL.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: f435963be4c62866841187d2c1a6572644235f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f435963be4c62866841187d2c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 4 12:09:19 2011 +0000 gdi32: Remove a wayward CDECL. --- dlls/gdi32/gdi_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3ed9356..f6c971d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -124,7 +124,7 @@ typedef struct tagDC_FUNCS INT (CDECL *pGetPixelFormat)(PHYSDEV); UINT (CDECL *pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY); BOOL (CDECL *pGetTextExtentExPoint)(PHYSDEV,LPCWSTR,INT,INT,LPINT,LPINT,LPSIZE); - BOOL (CDECL *CDECL pGetTextMetrics)(PHYSDEV,TEXTMETRICW*); + BOOL (CDECL *pGetTextMetrics)(PHYSDEV,TEXTMETRICW*); INT (CDECL *pIntersectClipRect)(PHYSDEV,INT,INT,INT,INT); BOOL (CDECL *pInvertRgn)(PHYSDEV,HRGN); BOOL (CDECL *pLineTo)(PHYSDEV,INT,INT);

1 0

Rafał Mużyło : winealsa.drv: Drop redundant calls.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 110e66dc0cbd25682f1a3b39cad6c6e22f329305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=110e66dc0cbd25682f1a3b39c… Author: Rafał Mużyło <galtgendo(a)gmail.com> Date: Thu Mar 3 17:54:21 2011 +0100 winealsa.drv: Drop redundant calls. --- dlls/winealsa.drv/dscapture.c | 3 --- dlls/winealsa.drv/dsoutput.c | 3 --- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index f663b6c..0b67749 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -422,11 +422,8 @@ static snd_pcm_uframes_t CommitAll(IDsCaptureDriverBufferImpl *This, DWORD force static void CheckXRUN(IDsCaptureDriverBufferImpl* This) { snd_pcm_state_t state = snd_pcm_state(This->pcm); - snd_pcm_sframes_t delay; int err; - snd_pcm_hwsync(This->pcm); - snd_pcm_delay(This->pcm, &delay); if ( state == SND_PCM_STATE_XRUN ) { err = snd_pcm_prepare(This->pcm); diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 98fb5bb..5ea43f4 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -168,11 +168,8 @@ static snd_pcm_uframes_t CommitAll(IDsDriverBufferImpl *This) static void CheckXRUN(IDsDriverBufferImpl* This) { snd_pcm_state_t state = snd_pcm_state(This->pcm); - snd_pcm_sframes_t delay; int err; - snd_pcm_hwsync(This->pcm); - snd_pcm_delay(This->pcm, &delay); if ( state == SND_PCM_STATE_XRUN ) { err = snd_pcm_prepare(This->pcm);

1 0

Marcus Meissner : oleaut32: Local variable goes out of scope via pointer ( Coverity).
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: d9908d2abd12f0f28b2614e23d28d15e1f446b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9908d2abd12f0f28b2614e23… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Mar 4 10:43:42 2011 +0100 oleaut32: Local variable goes out of scope via pointer (Coverity). --- dlls/oleaut32/olefont.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index f86ef20..e65504c 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -338,6 +338,7 @@ HRESULT WINAPI OleCreateFontIndirect( { OLEFontImpl* newFont = 0; HRESULT hr = S_OK; + FONTDESC fd; TRACE("(%p, %s, %p)\n", lpFontDesc, debugstr_guid(riid), ppvObj); /* @@ -349,8 +350,6 @@ HRESULT WINAPI OleCreateFontIndirect( *ppvObj = 0; if (!lpFontDesc) { - FONTDESC fd; - static WCHAR fname[] = { 'S','y','s','t','e','m',0 }; fd.cbSizeofstruct = sizeof(fd);

1 0

Dmitry Timoshkov : user32: Add a test to make sure that SendInput sets a non-zero event time.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 7fb4e2ae45cff5ce72260c60587c6473e8bbfdf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb4e2ae45cff5ce72260c605… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Mar 4 14:43:31 2011 +0800 user32: Add a test to make sure that SendInput sets a non-zero event time. --- dlls/user32/tests/input.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 22120f0..d45edf1 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -369,6 +369,16 @@ static void test_Input_whitebox(void) DestroyWindow(hWndTest); } +static inline BOOL is_keyboard_message( UINT message ) +{ + return (message >= WM_KEYFIRST && message <= WM_KEYLAST); +} + +static inline BOOL is_mouse_message( UINT message ) +{ + return (message >= WM_MOUSEFIRST && message <= WM_MOUSELAST); +} + /* try to make sure pending X events have been processed before continuing */ static void empty_message_queue(void) { @@ -382,6 +392,9 @@ static void empty_message_queue(void) if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) break; while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { + if (is_keyboard_message(msg.message) || is_mouse_message(msg.message)) + ok(msg.time != 0, "message %#x has time set to 0\n", msg.message); + TranslateMessage(&msg); DispatchMessage(&msg); }

1 0

Nikolay Sivov : msxml3: Test to show namespace definition output for children.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 14ec98bd1405a5182341c1652c4dea246e662b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ec98bd1405a5182341c1652… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 02:04:22 2011 +0300 msxml3: Test to show namespace definition output for children. --- dlls/msxml3/tests/domdoc.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f84947c..439207f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7984,6 +7984,7 @@ static void test_insertBefore(void) IXMLDOMNode *node, *newnode; HRESULT hr; VARIANT v; + BSTR p; doc = create_document(&IID_IXMLDOMDocument); @@ -8161,6 +8162,93 @@ static void test_insertBefore(void) IXMLDOMElement_Release(elem3); IXMLDOMElement_Release(elem4); IXMLDOMElement_Release(elem5); + + /* elements with same default namespace */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + elem1 = NULL; + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("elem1"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(elem1 != NULL, "got %p\n", elem1); + + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + elem2 = NULL; + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("elem2"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(elem2 != NULL, "got %p\n", elem2); + + /* check contents so far */ + p = NULL; + hr = IXMLDOMElement_get_xml(elem1, &p); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(p, _bstr_("<elem1 xmlns=\"http://winehq.org/default\"/>")), "got %s\n", wine_dbgstr_w(p)); + SysFreeString(p); + + p = NULL; + hr = IXMLDOMElement_get_xml(elem2, &p); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(p, _bstr_("<elem2 xmlns=\"http://winehq.org/default\"/>")), "got %s\n", wine_dbgstr_w(p)); + SysFreeString(p); + + V_VT(&v) = VT_NULL; + hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)elem2, v, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* get_xml depends on context, for top node it omits child namespace attribute, + but at child level it's still returned */ + p = NULL; + hr = IXMLDOMElement_get_xml(elem1, &p); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!lstrcmpW(p, _bstr_("<elem1 xmlns=\"http://winehq.org/default\"><elem2/></elem1>")), + "got %s\n", wine_dbgstr_w(p)); + SysFreeString(p); + + p = NULL; + hr = IXMLDOMElement_get_xml(elem2, &p); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(p, _bstr_("<elem2 xmlns=\"http://winehq.org/default\"/>")), "got %s\n", wine_dbgstr_w(p)); + SysFreeString(p); + + IXMLDOMElement_Release(elem1); + IXMLDOMElement_Release(elem2); + + /* child without default namespace added to node with default namespace */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + elem1 = NULL; + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("elem1"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(elem1 != NULL, "got %p\n", elem1); + + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + elem2 = NULL; + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("elem2"), NULL, (IXMLDOMNode**)&elem2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(elem2 != NULL, "got %p\n", elem2); + + EXPECT_REF(elem2, 1); + V_VT(&v) = VT_NULL; + hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)elem2, v, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(elem2, 1); + + p = NULL; + hr = IXMLDOMElement_get_xml(elem2, &p); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(p, _bstr_("<elem2/>")), "got %s\n", wine_dbgstr_w(p)); + SysFreeString(p); + + hr = IXMLDOMElement_removeChild(elem1, (IXMLDOMNode*)elem2, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + p = NULL; + hr = IXMLDOMElement_get_xml(elem2, &p); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(p, _bstr_("<elem2/>")), "got %s\n", wine_dbgstr_w(p)); + SysFreeString(p); + IXMLDOMDocument_Release(doc); free_bstrs(); }

1 0

Nikolay Sivov : msxml3: Remove child with parent method first before insert with insertBefore().
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 179daa20b99db2173607566c250ec511a6bd280a URL: http://source.winehq.org/git/wine.git/?a=commit;h=179daa20b99db2173607566c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 01:03:15 2011 +0300 msxml3: Remove child with parent method first before insert with insertBefore(). --- dlls/msxml3/domdoc.c | 5 +--- dlls/msxml3/element.c | 6 +---- dlls/msxml3/node.c | 56 +++++++++++++++++++------------------------ dlls/msxml3/nodemap.c | 5 +--- dlls/msxml3/tests/domdoc.c | 53 +++++++++++++++++++++++++++++++++++++++-- 5 files changed, 78 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=179daa20b99db21736075…

1 0

Nikolay Sivov : msxml3: Test insertBefore() behaviour with node relinking, simplify common test cases.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 756ae9e3ee40b727432b116d00b9a3899dbdeaba URL: http://source.winehq.org/git/wine.git/?a=commit;h=756ae9e3ee40b727432b116d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 23:12:35 2011 +0300 msxml3: Test insertBefore() behaviour with node relinking, simplify common test cases. --- dlls/msxml3/tests/domdoc.c | 236 +++++++++++++++++++++++++------------------- 1 files changed, 133 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=756ae9e3ee40b727432b1…

1 0

Juan Lang : wininet: Remove outdated comment.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 9463a867a86a4b042dd080f3533f5ea5c140608c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9463a867a86a4b042dd080f35… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 13:37:53 2011 -0800 wininet: Remove outdated comment. --- dlls/wininet/urlcache.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index b80f65e..40e4840 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3449,8 +3449,6 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW CacheInfo, LPDW /*********************************************************************** * GetUrlCacheConfigInfoA (WININET.@) - * - * CacheInfo is some CACHE_CONFIG_INFO structure, with no MS info found by google */ BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA CacheInfo, LPDWORD size, DWORD bitmask) {

1 0

Juan Lang : wininet: Fix off-by-one error.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: d2a3832fc3d5c4c610ed5f9ec8f81cc37cff82d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a3832fc3d5c4c610ed5f9ec… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 12:17:09 2011 -0800 wininet: Fix off-by-one error. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index a52de20..b80f65e 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -877,7 +877,7 @@ static BOOL URLCache_LocalFileNameToPathW( } nRequired = (path_len + DIR_LENGTH + file_name_len + 1) * sizeof(WCHAR); - if (nRequired < *lpBufferSize) + if (nRequired <= *lpBufferSize) { int dir_len;

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DBuffer typedef.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: bea8d0a713e772499669028634e3f6317c1285f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea8d0a713e77249966902863… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 3 21:49:10 2011 +0100 wined3d: Get rid of the IWineD3DBuffer typedef. --- dlls/wined3d/buffer.c | 2 - dlls/wined3d/device.c | 148 ++++++++++++++++++++-------------------- dlls/wined3d/stateblock.c | 5 +- dlls/wined3d/wined3d_private.h | 3 - 4 files changed, 76 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bea8d0a713e7724996690…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011