March 2011 - Wine-Commits - list.winehq.org

Juan Lang : wininet: Store entries in url cache with valid last-modified date.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 28e92293369d3a33e5f269091864c6116e75814a URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e92293369d3a33e5f269091… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 4 11:43:54 2011 -0800 wininet: Store entries in url cache with valid last-modified date. --- dlls/wininet/http.c | 227 ++++++++++++++++++++++++++++++++++++----------- dlls/wininet/internet.h | 1 + 2 files changed, 176 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28e92293369d3a33e5f26…

1 0

Juan Lang : wininet: Fix a comment.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: b2ed9c59671b14b451bb60e61c6818a1cd3d08c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ed9c59671b14b451bb60e61… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 2 17:09:45 2011 -0800 wininet: Fix a comment. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1f9b611..841a83f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3999,8 +3999,8 @@ static void HTTP_CacheRequest(http_request_t *request) * Sends the specified request to the HTTP server * * RETURNS - * TRUE on success - * FALSE on failure + * ERROR_SUCCESS on success + * win32 error code on failure * */ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,

1 0

Nikolay Sivov : msxml3: Implement get_nodeTypedValue() for nodes that can' t have type.
by Alexandre Julliard March 7, 2011

March 7, 2011

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: Trace ref counts for all dom objects.
by Alexandre Julliard March 7, 2011

March 7, 2011

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 _wcslwr_s implementation.
by Alexandre Julliard March 7, 2011

March 7, 2011

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

Henri Verbeet : wined3d: Clear SFLAG_LOCKED as soon as possible in IWineD3DSurfaceImpl_Unmap().
by Alexandre Julliard March 7, 2011

March 7, 2011

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

Hans Leidekker : msi: Reduce filename to the long name in ITERATE_RemoveFiles.
by Alexandre Julliard March 7, 2011

March 7, 2011

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: Avoid registering duplicate source list information.
by Alexandre Julliard March 7, 2011

March 7, 2011

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/tests: Check the result of get_system_dirs and get_user_dirs.
by Alexandre Julliard March 7, 2011

March 7, 2011

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

Henri Verbeet : wined3d: Get rid of the SFLAG_LOCKED hack in flush_to_framebuffer_drawpixels().
by Alexandre Julliard March 7, 2011

March 7, 2011

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