wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Nikolay Sivov : msxml3: Simplify ::appendData() for Text, Comment and CDATA nodes.
by Alexandre Julliard 16 Feb '10

16 Feb '10

Module: wine Branch: master Commit: 19c30897d4c64e1f534672eb355aa0f15a17eb95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c30897d4c64e1f534672eb3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 16 02:40:16 2010 +0300 msxml3: Simplify ::appendData() for Text, Comment and CDATA nodes. --- dlls/msxml3/cdata.c | 30 +++++++++++++++++------------- dlls/msxml3/comment.c | 46 ++++++++++++++++++---------------------------- dlls/msxml3/text.c | 31 ++++++++++++++++++------------- 3 files changed, 53 insertions(+), 54 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 07323ce..12bc03d 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -582,26 +582,30 @@ static HRESULT WINAPI domcdata_appendData( BSTR p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - xmlChar *pContent; - HRESULT hr = S_FALSE; + HRESULT hr; + BSTR data; + LONG p_len; TRACE("%p %p\n", This, debugstr_w(p)); /* Nothing to do if NULL or an Empty string passed in. */ - if(SysStringLen(p) == 0) - return S_OK; + if((p_len = SysStringLen(p)) == 0) return S_OK; - pContent = xmlChar_from_wchar( p ); - if(pContent) + hr = IXMLDOMCDATASection_get_data(iface, &data); + if(hr == S_OK) { - if(xmlTextConcat(This->node.node, pContent, SysStringLen(p) ) == 0) - hr = S_OK; - else - hr = E_FAIL; + LONG len = SysStringLen(data); + BSTR str = SysAllocStringLen(NULL, p_len + len); + + memcpy(str, data, len*sizeof(WCHAR)); + memcpy(&str[len], p, p_len*sizeof(WCHAR)); + str[len+p_len] = 0; + + hr = IXMLDOMCDATASection_put_data(iface, str); + + SysFreeString(str); + SysFreeString(data); } - else - hr = E_FAIL; - heap_free(pContent); return hr; } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 223c9cc..c669eac 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -576,40 +576,30 @@ static HRESULT WINAPI domcomment_appendData( BSTR p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - xmlChar *pContent; - HRESULT hr = S_FALSE; + HRESULT hr; + BSTR data; + LONG p_len; - TRACE("%p\n", iface); + TRACE("%p %s\n", This, debugstr_w(p)); /* Nothing to do if NULL or an Empty string passed in. */ - if(p == NULL || SysStringLen(p) == 0) - return S_OK; + if((p_len = SysStringLen(p)) == 0) return S_OK; - pContent = xmlChar_from_wchar( p ); - if(pContent) + hr = IXMLDOMComment_get_data(iface, &data); + if(hr == S_OK) { - /* Older versions of libxml < 2.6.27 didn't correctly support - xmlTextConcat on Comment nodes. Fallback to setting the - contents directly if xmlTextConcat fails. - */ - if(xmlTextConcat(This->node.node, pContent, SysStringLen(p) ) == 0) - hr = S_OK; - else - { - xmlChar *pNew; - pNew = xmlStrcat(xmlNodeGetContent(This->node.node), pContent); - if(pNew) - { - xmlNodeSetContent(This->node.node, pNew); - hr = S_OK; - } - else - hr = E_FAIL; - } - HeapFree( GetProcessHeap(), 0, pContent ); + LONG len = SysStringLen(data); + BSTR str = SysAllocStringLen(NULL, p_len + len); + + memcpy(str, data, len*sizeof(WCHAR)); + memcpy(&str[len], p, p_len*sizeof(WCHAR)); + str[len+p_len] = 0; + + hr = IXMLDOMComment_put_data(iface, str); + + SysFreeString(str); + SysFreeString(data); } - else - hr = E_FAIL; return hr; } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 629adb6..e21b203 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -584,25 +584,30 @@ static HRESULT WINAPI domtext_appendData( BSTR p) { domtext *This = impl_from_IXMLDOMText( iface ); - xmlChar *pContent; - HRESULT hr = S_FALSE; + HRESULT hr; + BSTR data; + LONG p_len; - TRACE("%p\n", iface); + TRACE("%p %s\n", This, debugstr_w(p)); /* Nothing to do if NULL or an Empty string passed in. */ - if(SysStringLen(p) == 0) return S_OK; + if((p_len = SysStringLen(p)) == 0) return S_OK; - pContent = xmlChar_from_wchar( p ); - if(pContent) + hr = IXMLDOMText_get_data(iface, &data); + if(hr == S_OK) { - if(xmlTextConcat(This->node.node, pContent, SysStringLen(p)) == 0) - hr = S_OK; - else - hr = E_FAIL; - heap_free( pContent ); + LONG len = SysStringLen(data); + BSTR str = SysAllocStringLen(NULL, p_len + len); + + memcpy(str, data, len*sizeof(WCHAR)); + memcpy(&str[len], p, p_len*sizeof(WCHAR)); + str[len+p_len] = 0; + + hr = IXMLDOMText_put_data(iface, str); + + SysFreeString(str); + SysFreeString(data); } - else - hr = E_FAIL; return hr; }

1 0

Nikolay Sivov : msxml3: Implement ::replaceData() for Text, Comment and CDATA nodes.
by Alexandre Julliard 16 Feb '10

16 Feb '10

Module: wine Branch: master Commit: 02066602b63dfef4989f530335160795a35f55bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=02066602b63dfef4989f53033… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 16 01:52:15 2010 +0300 msxml3: Implement ::replaceData() for Text, Comment and CDATA nodes. --- dlls/msxml3/cdata.c | 13 +++- dlls/msxml3/comment.c | 13 +++- dlls/msxml3/tests/domdoc.c | 213 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/text.c | 13 +++- 4 files changed, 246 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02066602b63dfef4989f5…

1 0

Nikolay Sivov : msxml3: Simplify ::insertData() for Text, Comment and CDATA nodes.
by Alexandre Julliard 16 Feb '10

16 Feb '10

Module: wine Branch: master Commit: 88d8218731cc73c380f39b4e0681d040215bf328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d8218731cc73c380f39b4e0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 16 01:24:09 2010 +0300 msxml3: Simplify ::insertData() for Text, Comment and CDATA nodes. --- dlls/msxml3/cdata.c | 65 ++++++++++++++++-------------------------------- dlls/msxml3/comment.c | 61 +++++++++++++++------------------------------- dlls/msxml3/text.c | 59 ++++++++++++++------------------------------ 3 files changed, 61 insertions(+), 124 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e35d945..58bd611 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -585,10 +585,10 @@ static HRESULT WINAPI domcdata_appendData( xmlChar *pContent; HRESULT hr = S_FALSE; - TRACE("%p\n", iface); + TRACE("%p %p\n", This, debugstr_w(p)); /* Nothing to do if NULL or an Empty string passed in. */ - if(p == NULL || SysStringLen(p) == 0) + if(SysStringLen(p) == 0) return S_OK; pContent = xmlChar_from_wchar( p ); @@ -611,16 +611,14 @@ static HRESULT WINAPI domcdata_insertData( LONG offset, BSTR p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - xmlChar *pXmlContent; - BSTR sNewString; - HRESULT hr = S_FALSE; - LONG nLength = 0, nLengthP = 0; - xmlChar *str = NULL; + HRESULT hr; + BSTR data; + LONG p_len; - TRACE("%p\n", This); + TRACE("%p %d %s\n", This, offset, debugstr_w(p)); /* If have a NULL or empty string, don't do anything. */ - if(SysStringLen(p) == 0) + if((p_len = SysStringLen(p)) == 0) return S_OK; if(offset < 0) @@ -628,48 +626,29 @@ static HRESULT WINAPI domcdata_insertData( return E_INVALIDARG; } - pXmlContent = xmlNodeGetContent(This->node.node); - if(pXmlContent) + hr = IXMLDOMCDATASection_get_data(iface, &data); + if(hr == S_OK) { - BSTR sContent = bstr_from_xmlChar( pXmlContent ); - nLength = SysStringLen(sContent); - nLengthP = SysStringLen(p); + LONG len = SysStringLen(data); + BSTR str; - if(nLength < offset) + if(len < offset) { - SysFreeString(sContent); - xmlFree(pXmlContent); - + SysFreeString(data); return E_INVALIDARG; } - sNewString = SysAllocStringLen(NULL, nLength + nLengthP + 1); - if(sNewString) - { - if(offset > 0) - memcpy(sNewString, sContent, offset * sizeof(WCHAR)); - - memcpy(&sNewString[offset], p, nLengthP * sizeof(WCHAR)); - - if(offset+nLengthP < nLength) - memcpy(&sNewString[offset+nLengthP], &sContent[offset], (nLength-offset) * sizeof(WCHAR)); - - sNewString[nLengthP + nLength] = 0; - - str = xmlChar_from_wchar(sNewString); - if(str) - { - xmlNodeSetContent(This->node.node, str); - hr = S_OK; - } - heap_free(str); + str = SysAllocStringLen(NULL, len + p_len); + /* start part, supplied string and end part */ + memcpy(str, data, offset*sizeof(WCHAR)); + memcpy(&str[offset], p, p_len*sizeof(WCHAR)); + memcpy(&str[offset+p_len], &data[offset], (len-offset)*sizeof(WCHAR)); + str[len+p_len] = 0; - SysFreeString(sNewString); - } - - SysFreeString(sContent); + hr = IXMLDOMCDATASection_put_data(iface, str); - xmlFree(pXmlContent); + SysFreeString(str); + SysFreeString(data); } return hr; diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index bc9d8b3..3cf951d 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -619,16 +619,14 @@ static HRESULT WINAPI domcomment_insertData( LONG offset, BSTR p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - xmlChar *pXmlContent; - BSTR sNewString; - HRESULT hr = S_FALSE; - LONG nLength = 0, nLengthP = 0; - xmlChar *str = NULL; + HRESULT hr; + BSTR data; + LONG p_len; - TRACE("%p %d %p\n", iface, offset, p); + TRACE("%p %d %s\n", This, offset, debugstr_w(p)); /* If have a NULL or empty string, don't do anything. */ - if(SysStringLen(p) == 0) + if((p_len = SysStringLen(p)) == 0) return S_OK; if(offset < 0) @@ -636,48 +634,29 @@ static HRESULT WINAPI domcomment_insertData( return E_INVALIDARG; } - pXmlContent = xmlNodeGetContent(This->node.node); - if(pXmlContent) + hr = IXMLDOMComment_get_data(iface, &data); + if(hr == S_OK) { - BSTR sContent = bstr_from_xmlChar( pXmlContent ); - nLength = SysStringLen(sContent); - nLengthP = SysStringLen(p); + LONG len = SysStringLen(data); + BSTR str; - if(nLength < offset) + if(len < offset) { - SysFreeString(sContent); - xmlFree(pXmlContent); - + SysFreeString(data); return E_INVALIDARG; } - sNewString = SysAllocStringLen(NULL, nLength + nLengthP + 1); - if(sNewString) - { - if(offset > 0) - memcpy(sNewString, sContent, offset * sizeof(WCHAR)); - - memcpy(&sNewString[offset], p, nLengthP * sizeof(WCHAR)); - - if(offset+nLengthP < nLength) - memcpy(&sNewString[offset+nLengthP], &sContent[offset], (nLength-offset) * sizeof(WCHAR)); + str = SysAllocStringLen(NULL, len + p_len); + /* start part, supplied string and end part */ + memcpy(str, data, offset*sizeof(WCHAR)); + memcpy(&str[offset], p, p_len*sizeof(WCHAR)); + memcpy(&str[offset+p_len], &data[offset], (len-offset)*sizeof(WCHAR)); + str[len+p_len] = 0; - sNewString[nLengthP + nLength] = 0; - - str = xmlChar_from_wchar(sNewString); - if(str) - { - xmlNodeSetContent(This->node.node, str); - hr = S_OK; - } - HeapFree( GetProcessHeap(), 0, str ); - - SysFreeString(sNewString); - } - - SysFreeString(sContent); + hr = IXMLDOMComment_put_data(iface, str); - xmlFree(pXmlContent); + SysFreeString(str); + SysFreeString(data); } return hr; diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index cdf136b..1d18dac 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -612,16 +612,14 @@ static HRESULT WINAPI domtext_insertData( LONG offset, BSTR p) { domtext *This = impl_from_IXMLDOMText( iface ); - xmlChar *pXmlContent; - BSTR sNewString; - HRESULT hr = S_FALSE; - LONG nLength = 0, nLengthP = 0; - xmlChar *str = NULL; + HRESULT hr; + BSTR data; + LONG p_len; TRACE("%p %d %s\n", This, offset, debugstr_w(p)); /* If have a NULL or empty string, don't do anything. */ - if(SysStringLen(p) == 0) + if((p_len = SysStringLen(p)) == 0) return S_OK; if(offset < 0) @@ -629,48 +627,29 @@ static HRESULT WINAPI domtext_insertData( return E_INVALIDARG; } - pXmlContent = xmlNodeGetContent(This->node.node); - if(pXmlContent) + hr = IXMLDOMText_get_data(iface, &data); + if(hr == S_OK) { - BSTR sContent = bstr_from_xmlChar( pXmlContent ); - nLength = SysStringLen(sContent); - nLengthP = SysStringLen(p); + LONG len = SysStringLen(data); + BSTR str; - if(nLength < offset) + if(len < offset) { - SysFreeString(sContent); - xmlFree(pXmlContent); - + SysFreeString(data); return E_INVALIDARG; } - sNewString = SysAllocStringLen(NULL, nLength + nLengthP + 1); - if(sNewString) - { - if(offset > 0) - memcpy(sNewString, sContent, offset * sizeof(WCHAR)); - - memcpy(&sNewString[offset], p, nLengthP * sizeof(WCHAR)); - - if(offset+nLengthP < nLength) - memcpy(&sNewString[offset+nLengthP], &sContent[offset], (nLength-offset) * sizeof(WCHAR)); - - sNewString[nLengthP + nLength] = 0; - - str = xmlChar_from_wchar(sNewString); - if(str) - { - xmlNodeSetContent(This->node.node, str); - hr = S_OK; - } - heap_free(str); + str = SysAllocStringLen(NULL, len + p_len); + /* start part, supplied string and end part */ + memcpy(str, data, offset*sizeof(WCHAR)); + memcpy(&str[offset], p, p_len*sizeof(WCHAR)); + memcpy(&str[offset+p_len], &data[offset], (len-offset)*sizeof(WCHAR)); + str[len+p_len] = 0; - SysFreeString(sNewString); - } - - SysFreeString(sContent); + hr = IXMLDOMText_put_data(iface, str); - xmlFree(pXmlContent); + SysFreeString(str); + SysFreeString(data); } return hr;

1 0

Nikolay Sivov : msxml3: Use interface methods for ::get_length() calls.
by Alexandre Julliard 16 Feb '10

16 Feb '10

Module: wine Branch: master Commit: b8282638bbf47c58c08e2ac0a20628279a4bb066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8282638bbf47c58c08e2ac0a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 16 00:14:29 2010 +0300 msxml3: Use interface methods for ::get_length() calls. --- dlls/msxml3/cdata.c | 23 +++++++++-------------- dlls/msxml3/comment.c | 25 ++++++++++--------------- dlls/msxml3/text.c | 30 ++++++++++++------------------ 3 files changed, 31 insertions(+), 47 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 7d02a94..e35d945 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -480,7 +480,7 @@ static HRESULT WINAPI domcdata_get_data( BSTR *p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - HRESULT hr = E_FAIL; + HRESULT hr; VARIANT vRet; if(!p) @@ -500,7 +500,6 @@ static HRESULT WINAPI domcdata_put_data( BSTR data) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - HRESULT hr = E_FAIL; VARIANT val; TRACE("%p %s\n", This, debugstr_w(data) ); @@ -508,9 +507,7 @@ static HRESULT WINAPI domcdata_put_data( V_VT(&val) = VT_BSTR; V_BSTR(&val) = data; - hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), val ); - - return hr; + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), val ); } static HRESULT WINAPI domcdata_get_length( @@ -518,23 +515,21 @@ static HRESULT WINAPI domcdata_get_length( LONG *len) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - xmlChar *pContent; - LONG nLength = 0; + HRESULT hr; + BSTR data; - TRACE("%p\n", iface); + TRACE("%p %p\n", This, len); if(!len) return E_INVALIDARG; - pContent = xmlNodeGetContent(This->node.node); - if(pContent) + hr = IXMLDOMCDATASection_get_data(iface, &data); + if(hr == S_OK) { - nLength = xmlStrlen(pContent); - xmlFree(pContent); + *len = SysStringLen(data); + SysFreeString(data); } - *len = nLength; - return S_OK; } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 1e3b965..bc9d8b3 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -474,7 +474,7 @@ static HRESULT WINAPI domcomment_get_data( BSTR *p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - HRESULT hr = E_FAIL; + HRESULT hr; VARIANT vRet; if(!p) @@ -494,7 +494,6 @@ static HRESULT WINAPI domcomment_put_data( BSTR data) { domcomment *This = impl_from_IXMLDOMComment( iface ); - HRESULT hr = E_FAIL; VARIANT val; TRACE("%p %s\n", This, debugstr_w(data) ); @@ -502,9 +501,7 @@ static HRESULT WINAPI domcomment_put_data( V_VT(&val) = VT_BSTR; V_BSTR(&val) = data; - hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), val ); - - return hr; + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), val ); } static HRESULT WINAPI domcomment_get_length( @@ -512,24 +509,22 @@ static HRESULT WINAPI domcomment_get_length( LONG *len) { domcomment *This = impl_from_IXMLDOMComment( iface ); - xmlChar *pContent; - LONG nLength = 0; + HRESULT hr; + BSTR data; - TRACE("%p\n", iface); + TRACE("%p %p\n", This, len); if(!len) return E_INVALIDARG; - pContent = xmlNodeGetContent(This->node.node); - if(pContent) + hr = IXMLDOMComment_get_data(iface, &data); + if(hr == S_OK) { - nLength = xmlStrlen(pContent); - xmlFree(pContent); + *len = SysStringLen(data); + SysFreeString(data); } - *len = nLength; - - return S_OK; + return hr; } static HRESULT WINAPI domcomment_substringData( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 70ca3ef..cdf136b 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -482,7 +482,7 @@ static HRESULT WINAPI domtext_get_data( BSTR *p) { domtext *This = impl_from_IXMLDOMText( iface ); - HRESULT hr = E_FAIL; + HRESULT hr; VARIANT vRet; if(!p) @@ -502,7 +502,6 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); - HRESULT hr = E_FAIL; VARIANT val; TRACE("%p %s\n", This, debugstr_w(data) ); @@ -510,9 +509,7 @@ static HRESULT WINAPI domtext_put_data( V_VT(&val) = VT_BSTR; V_BSTR(&val) = data; - hr = IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), val ); - - return hr; + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(&This->node), val ); } static HRESULT WINAPI domtext_get_length( @@ -520,24 +517,22 @@ static HRESULT WINAPI domtext_get_length( LONG *len) { domtext *This = impl_from_IXMLDOMText( iface ); - xmlChar *pContent; - LONG nLength = 0; + HRESULT hr; + BSTR data; - TRACE("%p\n", iface); + TRACE("%p %p\n", This, len); if(!len) return E_INVALIDARG; - pContent = xmlNodeGetContent(This->node.node); - if(pContent) + hr = IXMLDOMText_get_data(iface, &data); + if(hr == S_OK) { - nLength = xmlStrlen(pContent); - xmlFree(pContent); + *len = SysStringLen(data); + SysFreeString(data); } - *len = nLength; - - return S_OK; + return hr; } static HRESULT WINAPI domtext_substringData( @@ -595,8 +590,7 @@ static HRESULT WINAPI domtext_appendData( TRACE("%p\n", iface); /* Nothing to do if NULL or an Empty string passed in. */ - if(p == NULL || SysStringLen(p) == 0) - return S_OK; + if(SysStringLen(p) == 0) return S_OK; pContent = xmlChar_from_wchar( p ); if(pContent) @@ -624,7 +618,7 @@ static HRESULT WINAPI domtext_insertData( LONG nLength = 0, nLengthP = 0; xmlChar *str = NULL; - TRACE("%p\n", This); + TRACE("%p %d %s\n", This, offset, debugstr_w(p)); /* If have a NULL or empty string, don't do anything. */ if(SysStringLen(p) == 0)

1 0

Roderick Colenbrander : winex11: Fix palette conversion bug.
by Alexandre Julliard 16 Feb '10

16 Feb '10

Module: wine Branch: master Commit: 3afa65763644d2a4aae5781c91c61ea8392f7c1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3afa65763644d2a4aae5781c9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Feb 16 00:25:40 2010 +0100 winex11: Fix palette conversion bug. The LookupPixel code assumed we want to convert pixels to the format corresponding the default color shifts. --- dlls/winex11.drv/dib.c | 4 ++-- dlls/winex11.drv/palette.c | 8 +++++--- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 587c7c7..bf18519 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -371,7 +371,7 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping, } else for (i = start; i < end; i++, rgb++) - colorMapping[i] = X11DRV_PALETTE_LookupPixel(RGB(rgb->rgbRed, + colorMapping[i] = X11DRV_PALETTE_LookupPixel(physDev->color_shifts, RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue)); } @@ -395,7 +395,7 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping, } else for (i = start; i < end; i++, rgb++) - colorMapping[i] = X11DRV_PALETTE_LookupPixel(RGB(rgb->rgbtRed, + colorMapping[i] = X11DRV_PALETTE_LookupPixel(physDev->color_shifts, RGB(rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue)); } diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index cbdf2d1..adff6c1 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -1026,7 +1026,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) /*********************************************************************** * X11DRV_PALETTE_LookupPixel */ -int X11DRV_PALETTE_LookupPixel(COLORREF color ) +int X11DRV_PALETTE_LookupPixel(ColorShifts *shifts, COLORREF color ) { unsigned char spec_type = color >> 24; @@ -1048,7 +1048,9 @@ int X11DRV_PALETTE_LookupPixel(COLORREF color ) } else { - ColorShifts *shifts = &X11DRV_PALETTE_default_shifts; + /* No shifts are set in case of 1-bit */ + if(!shifts) shifts = &X11DRV_PALETTE_default_shifts; + /* scale each individually and construct the TrueColor pixel value */ if (shifts->physicalRed.scale < 8) red = red >> (8-shifts->physicalRed.scale); @@ -1265,7 +1267,7 @@ UINT X11DRV_RealizePalette( X11DRV_PDEVICE *physDev, HPALETTE hpal, BOOL primary } else if ( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL ) { - index = X11DRV_PALETTE_LookupPixel( RGB( entries[i].peRed, entries[i].peGreen, entries[i].peBlue )); + index = X11DRV_PALETTE_LookupPixel( physDev->color_shifts, RGB( entries[i].peRed, entries[i].peGreen, entries[i].peBlue )); } /* we have to map to existing entry in the system palette */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9be93c6..03b3750 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -491,7 +491,7 @@ extern BOOL X11DRV_IsSolidColor(COLORREF color); extern COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel); extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color); -extern int X11DRV_PALETTE_LookupPixel(COLORREF color); +extern int X11DRV_PALETTE_LookupPixel(ColorShifts *shifts, COLORREF color); extern void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long redMask, unsigned long greenMask, unsigned long blueMask); extern unsigned int depth_to_bpp( unsigned int depth );

1 0

Henri Verbeet : wined3d: Drop buffer objects from the stream info as well when PreLoad drops them.
by Alexandre Julliard 16 Feb '10

16 Feb '10

Module: wine Branch: master Commit: f97565191cd07d5dee5210066bd1a08fb14cacf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97565191cd07d5dee5210066… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 09:50:39 2010 +0100 wined3d: Drop buffer objects from the stream info as well when PreLoad drops them. --- dlls/wined3d/device.c | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f10348c..578d8e4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -179,8 +179,6 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, { /* We need to deal with frequency data! */ IWineD3DVertexDeclarationImpl *declaration = (IWineD3DVertexDeclarationImpl *)This->stateBlock->vertexDecl; - UINT stream_count = This->stateBlock->streamIsUP ? 0 : declaration->num_streams; - const DWORD *streams = declaration->streams; unsigned int i; stream_info->use_map = 0; @@ -307,17 +305,29 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, } } - /* Now call PreLoad on all the vertex buffers. In the very rare case - * that the buffers stopps converting PreLoad will dirtify the VDECL again. - * The vertex buffer can now use the strided structure in the device instead of finding its - * own again. - * - * NULL streams won't be recorded in the array, UP streams won't be either. A stream is only - * once in there. */ - for (i = 0; i < stream_count; ++i) + if (!This->stateBlock->streamIsUP) { - IWineD3DBuffer *vb = This->stateBlock->streamSource[streams[i]]; - if (vb) IWineD3DBuffer_PreLoad(vb); + WORD map = stream_info->use_map; + + /* PreLoad all the vertex buffers. */ + for (i = 0; map; map >>= 1, ++i) + { + struct wined3d_stream_info_element *element; + struct wined3d_buffer *buffer; + + if (!(map & 1)) continue; + + element = &stream_info->elements[i]; + buffer = (struct wined3d_buffer *)This->stateBlock->streamSource[element->stream_idx]; + IWineD3DBuffer_PreLoad((IWineD3DBuffer *)buffer); + + /* If PreLoad dropped the buffer object, update the stream info. */ + if (buffer->buffer_object != element->buffer_object) + { + element->buffer_object = 0; + element->data = buffer_get_sysmem(buffer) + (ptrdiff_t)element->data; + } + } } }

1 0

Henri Verbeet : wined3d: Move the gl info structure to wined3d_private.h.
by Alexandre Julliard 16 Feb '10

16 Feb '10

Module: wine Branch: master Commit: 974f888dfaabb62dfef094690085a32e4ac97ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=974f888dfaabb62dfef094690… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 09:50:38 2010 +0100 wined3d: Move the gl info structure to wined3d_private.h. --- dlls/wined3d/wined3d_gl.h | 81 ---------------------------------------- dlls/wined3d/wined3d_private.h | 79 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 81 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8dead6a..f8097d6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4496,85 +4496,4 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma USE_GL_FUNC(WINED3D_PFNWGLQUERYPBUFFERARBPROC, wglQueryPbufferARB, 0, NULL) \ USE_GL_FUNC(WINED3D_PFNWGLSETPIXELFORMATWINE, wglSetPixelFormatWINE, 0, NULL) -struct wined3d_fbo_ops -{ - PGLFNGLISRENDERBUFFERPROC glIsRenderbuffer; - PGLFNGLBINDRENDERBUFFERPROC glBindRenderbuffer; - PGLFNGLDELETERENDERBUFFERSPROC glDeleteRenderbuffers; - PGLFNGLGENRENDERBUFFERSPROC glGenRenderbuffers; - PGLFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage; - PGLFNRENDERBUFFERSTORAGEMULTISAMPLEPROC glRenderbufferStorageMultisample; - PGLFNGLGETRENDERBUFFERPARAMETERIVPROC glGetRenderbufferParameteriv; - PGLFNGLISFRAMEBUFFERPROC glIsFramebuffer; - PGLFNGLBINDFRAMEBUFFERPROC glBindFramebuffer; - PGLFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers; - PGLFNGLGENFRAMEBUFFERSPROC glGenFramebuffers; - PGLFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus; - PGLFNGLFRAMEBUFFERTEXTURE1DPROC glFramebufferTexture1D; - PGLFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D; - PGLFNGLFRAMEBUFFERTEXTURE3DPROC glFramebufferTexture3D; - PGLFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer; - PGLFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC glGetFramebufferAttachmentParameteriv; - PGLFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer; - PGLFNGLGENERATEMIPMAPPROC glGenerateMipmap; -}; - -struct wined3d_gl_limits -{ - UINT buffers; - UINT lights; - UINT textures; - UINT texture_stages; - UINT fragment_samplers; - UINT vertex_samplers; - UINT combined_samplers; - UINT general_combiners; - UINT sampler_stages; - UINT clipplanes; - UINT texture_size; - UINT texture3d_size; - float pointsize_max; - float pointsize_min; - UINT point_sprite_units; - UINT blends; - UINT anisotropy; - float shininess; - - UINT glsl_varyings; - UINT glsl_vs_float_constants; - UINT glsl_ps_float_constants; - - UINT arb_vs_float_constants; - UINT arb_vs_native_constants; - UINT arb_vs_instructions; - UINT arb_vs_temps; - UINT arb_ps_float_constants; - UINT arb_ps_local_constants; - UINT arb_ps_native_constants; - UINT arb_ps_instructions; - UINT arb_ps_temps; -}; - -#define USE_GL_FUNC(type, pfn, ext, replace) type pfn; - -struct wined3d_gl_info -{ - UINT vidmem; - struct wined3d_gl_limits limits; - DWORD reserved_glsl_constants; - DWORD quirks; - BOOL supported[WINED3D_GL_EXT_COUNT]; - GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1]; - - struct wined3d_fbo_ops fbo_ops; - /* GL function pointers */ - GL_EXT_FUNCS_GEN - /* WGL function pointers */ - WGL_EXT_FUNCS_GEN - - struct GlPixelFormatDesc *gl_formats; -}; - -#undef USE_GL_FUNC - #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5dcc521..819b55e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1337,6 +1337,85 @@ enum wined3d_pci_device CARD_INTEL_X3100 = 0x2a02, /* Found in Macs. Same as GMA 965? */ }; +struct wined3d_fbo_ops +{ + PGLFNGLISRENDERBUFFERPROC glIsRenderbuffer; + PGLFNGLBINDRENDERBUFFERPROC glBindRenderbuffer; + PGLFNGLDELETERENDERBUFFERSPROC glDeleteRenderbuffers; + PGLFNGLGENRENDERBUFFERSPROC glGenRenderbuffers; + PGLFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage; + PGLFNRENDERBUFFERSTORAGEMULTISAMPLEPROC glRenderbufferStorageMultisample; + PGLFNGLGETRENDERBUFFERPARAMETERIVPROC glGetRenderbufferParameteriv; + PGLFNGLISFRAMEBUFFERPROC glIsFramebuffer; + PGLFNGLBINDFRAMEBUFFERPROC glBindFramebuffer; + PGLFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers; + PGLFNGLGENFRAMEBUFFERSPROC glGenFramebuffers; + PGLFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus; + PGLFNGLFRAMEBUFFERTEXTURE1DPROC glFramebufferTexture1D; + PGLFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D; + PGLFNGLFRAMEBUFFERTEXTURE3DPROC glFramebufferTexture3D; + PGLFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer; + PGLFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC glGetFramebufferAttachmentParameteriv; + PGLFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer; + PGLFNGLGENERATEMIPMAPPROC glGenerateMipmap; +}; + +struct wined3d_gl_limits +{ + UINT buffers; + UINT lights; + UINT textures; + UINT texture_stages; + UINT fragment_samplers; + UINT vertex_samplers; + UINT combined_samplers; + UINT general_combiners; + UINT sampler_stages; + UINT clipplanes; + UINT texture_size; + UINT texture3d_size; + float pointsize_max; + float pointsize_min; + UINT point_sprite_units; + UINT blends; + UINT anisotropy; + float shininess; + + UINT glsl_varyings; + UINT glsl_vs_float_constants; + UINT glsl_ps_float_constants; + + UINT arb_vs_float_constants; + UINT arb_vs_native_constants; + UINT arb_vs_instructions; + UINT arb_vs_temps; + UINT arb_ps_float_constants; + UINT arb_ps_local_constants; + UINT arb_ps_native_constants; + UINT arb_ps_instructions; + UINT arb_ps_temps; +}; + +struct wined3d_gl_info +{ + UINT vidmem; + struct wined3d_gl_limits limits; + DWORD reserved_glsl_constants; + DWORD quirks; + BOOL supported[WINED3D_GL_EXT_COUNT]; + GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1]; + + struct wined3d_fbo_ops fbo_ops; +#define USE_GL_FUNC(type, pfn, ext, replace) type pfn; + /* GL function pointers */ + GL_EXT_FUNCS_GEN + /* WGL function pointers */ + WGL_EXT_FUNCS_GEN +#undef USE_GL_FUNC + + struct GlPixelFormatDesc *gl_formats; +}; + struct wined3d_driver_info { enum wined3d_pci_vendor vendor;

1 0

Henri Verbeet : wined3d: Remove some unused extensions.
by Alexandre Julliard 16 Feb '10

16 Feb '10

Module: wine Branch: master Commit: 1a880cb1f92ea3ccffd428937138f428fc091fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a880cb1f92ea3ccffd428937… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 09:50:37 2010 +0100 wined3d: Remove some unused extensions. --- dlls/wined3d/directx.c | 6 --- dlls/wined3d/wined3d_gl.h | 91 --------------------------------------------- 2 files changed, 0 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a880cb1f92ea3ccffd42…

1 0

Vincent Povirk : shlwapi: GetUrlPart can get the scheme of url's without a ://.
by Alexandre Julliard 16 Feb '10

16 Feb '10

Module: wine Branch: master Commit: 90b7ccc36ae8b7dd4ee7af8ef62c2ea59929fd25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b7ccc36ae8b7dd4ee7af8ef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 15 15:09:55 2010 -0600 shlwapi: GetUrlPart can get the scheme of url's without a ://. --- dlls/shlwapi/tests/url.c | 7 +++++++ dlls/shlwapi/url.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 4dd5d9c..3d86ae7 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -570,6 +570,7 @@ static void test_UrlGetPart(void) { const char* file_url = "file://h o s t/c:/windows/file"; const char* http_url = "http://user:pass 123(a)www.wine hq.org"; + const char* about_url = "about:blank"; CHAR szPart[INTERNET_MAX_URL_LENGTH]; DWORD dwSize; @@ -607,6 +608,12 @@ static void test_UrlGetPart(void) test_url_part(http_url, URL_PART_HOSTNAME, 0, "www.wine hq.org"); test_url_part(http_url, URL_PART_PASSWORD, 0, "pass 123"); + test_url_part(about_url, URL_PART_SCHEME, 0, "about"); + + dwSize = sizeof(szPart); + res = pUrlGetPartA(about_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); + ok(res==E_FAIL, "returned %08x\n", res); + dwSize = sizeof(szPart); res = pUrlGetPartA("file://c:\\index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==S_FALSE, "returned %08x\n", res); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index d3dea24..4a93b23 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1938,7 +1938,7 @@ static LONG URL_ParseUrl(LPCWSTR pszUrl, WINE_PARSE_URL *pl) work = URL_ScanID(pl->pScheme, &pl->szScheme, SCHEME); if (!*work || (*work != ':')) goto ErrorExit; work++; - if ((*work != '/') || (*(work+1) != '/')) goto ErrorExit; + if ((*work != '/') || (*(work+1) != '/')) goto SuccessExit; pl->pUserName = work + 2; work = URL_ScanID(pl->pUserName, &pl->szUserName, USERPASS); if (*work == ':' ) { @@ -1979,6 +1979,7 @@ static LONG URL_ParseUrl(LPCWSTR pszUrl, WINE_PARSE_URL *pl) pl->pQuery = strchrW(work, '?'); if (pl->pQuery) pl->szQuery = strlenW(pl->pQuery); } + SuccessExit: TRACE("parse successful: scheme=%p(%d), user=%p(%d), pass=%p(%d), host=%p(%d), port=%p(%d), query=%p(%d)\n", pl->pScheme, pl->szScheme, pl->pUserName, pl->szUserName,

1 0

Vincent Povirk : comdlg32: Add a minimal test for the font dialog.
by Alexandre Julliard 16 Feb '10

16 Feb '10

Module: wine Branch: master Commit: f45b648634ed713dde2ceea71d1b8f6da79d2e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45b648634ed713dde2ceea71… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 15 14:13:44 2010 -0600 comdlg32: Add a minimal test for the font dialog. --- dlls/comdlg32/tests/Makefile.in | 1 + dlls/comdlg32/tests/fontdlg.c | 75 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/Makefile.in b/dlls/comdlg32/tests/Makefile.in index 11ee930..969ad6b 100644 --- a/dlls/comdlg32/tests/Makefile.in +++ b/dlls/comdlg32/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = comdlg32 user32 gdi32 kernel32 CTESTS = \ filedlg.c \ + fontdlg.c \ printdlg.c RC_SRCS = rsrc.rc diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c new file mode 100644 index 0000000..422bf8d --- /dev/null +++ b/dlls/comdlg32/tests/fontdlg.c @@ -0,0 +1,75 @@ +/* + * Unit test suite for comdlg32 API functions: font dialogs + * + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winuser.h" +#include "objbase.h" + +#include "commdlg.h" + +#include "wine/test.h" + +static UINT_PTR CALLBACK CFHookProcOK(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + PostMessageA(hdlg, WM_COMMAND, IDOK, FALSE); + return 0; + default: + return 0; + } +} + +static void test_ChooseFontA(void) +{ + LOGFONTA lfa; + CHOOSEFONTA cfa; + BOOL ret; + + memset(&lfa, 0, sizeof(LOGFONTA)); + lfa.lfHeight = -16; + lfa.lfWeight = FW_NORMAL; + strcpy(lfa.lfFaceName, "Tahoma"); + + memset(&cfa, 0, sizeof(CHOOSEFONTA)); + cfa.lStructSize = sizeof(cfa); + cfa.lpLogFont = &lfa; + cfa.Flags = CF_ENABLEHOOK|CF_INITTOLOGFONTSTRUCT|CF_SCREENFONTS; + cfa.lpfnHook = CFHookProcOK; + + ret = ChooseFontA(&cfa); + + ok(ret == TRUE, "ChooseFontA returned FALSE\n"); + ok(lfa.lfHeight == -16, "Expected -16, got %i\n", lfa.lfHeight); + ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); + ok(strcmp(lfa.lfFaceName, "Tahoma") == 0, "Expected Arial, got %s\n", lfa.lfFaceName); +} + +START_TEST(fontdlg) +{ + test_ChooseFontA(); +}

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010