December 2008 - Wine-Commits

Alexandre Julliard : msvcrt: Rewrite va_list to string conversions to avoid depending on va_copy.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 6718b9bce7ef7a40f9d64b3bfc7105dbc13ec1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=6718b9bce7ef7a40f9d64b3bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 12:55:30 2008 +0100 msvcrt: Rewrite va_list to string conversions to avoid depending on va_copy. --- dlls/msvcrt/process.c | 141 ++++++++++++++++++------------------------------ 1 files changed, 53 insertions(+), 88 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 5298520..bb57b9f 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -271,52 +271,34 @@ static MSVCRT_wchar_t *msvcrt_argvtos_aw(const char * const *arg, MSVCRT_wchar_t */ static MSVCRT_wchar_t *msvcrt_valisttos(const MSVCRT_wchar_t *arg0, va_list alist, MSVCRT_wchar_t delim) { - va_list alist2; - unsigned long len; - const MSVCRT_wchar_t *arg; - MSVCRT_wchar_t *p, *ret; - -#ifdef HAVE_VA_COPY - va_copy(alist2,alist); -#else -# ifdef HAVE___VA_COPY - __va_copy(alist2,alist); -# else - alist2 = alist; -# endif -#endif - - if (!arg0) - { - /* Return NULL for an empty environment list */ - return NULL; - } + unsigned int size = 0, pos = 0; + const MSVCRT_wchar_t *arg; + MSVCRT_wchar_t *new, *ret = NULL; - /* get length */ - arg = arg0; - len = 0; - do { - len += strlenW(arg) + 1; - arg = va_arg(alist, MSVCRT_wchar_t*); - } while (arg != NULL); - - ret = MSVCRT_malloc((len + 1) * sizeof(MSVCRT_wchar_t)); - if (!ret) - return NULL; - - /* fill string */ - arg = arg0; - p = ret; - do { - len = strlenW(arg); - memcpy(p, arg, len * sizeof(MSVCRT_wchar_t)); - p += len; - *p++ = delim; - arg = va_arg(alist2, MSVCRT_wchar_t*); - } while (arg != NULL); - if (delim && p > ret) p[-1] = 0; - else *p = 0; - return ret; + for (arg = arg0; arg; arg = va_arg( alist, MSVCRT_wchar_t * )) + { + unsigned int len = strlenW( arg ) + 1; + if (pos + len >= size) + { + size = max( 256, size * 2 ); + size = max( size, pos + len + 1 ); + if (!(new = MSVCRT_realloc( ret, size * sizeof(MSVCRT_wchar_t) ))) + { + MSVCRT_free( ret ); + return NULL; + } + ret = new; + } + strcpyW( ret + pos, arg ); + pos += len; + ret[pos - 1] = delim; + } + if (pos) + { + if (delim) ret[pos - 1] = 0; + else ret[pos] = 0; + } + return ret; } /* INTERNAL: Convert ansi va_list to a single 'delim'-separated wide string, with an @@ -324,50 +306,33 @@ static MSVCRT_wchar_t *msvcrt_valisttos(const MSVCRT_wchar_t *arg0, va_list alis */ static MSVCRT_wchar_t *msvcrt_valisttos_aw(const char *arg0, va_list alist, MSVCRT_wchar_t delim) { - va_list alist2; - unsigned long len; - const char *arg; - MSVCRT_wchar_t *p, *ret; - -#ifdef HAVE_VA_COPY - va_copy(alist2,alist); -#else -# ifdef HAVE___VA_COPY - __va_copy(alist2,alist); -# else - alist2 = alist; -# endif -#endif - - if (!arg0) - { - /* Return NULL for an empty environment list */ - return NULL; - } + unsigned int size = 0, pos = 0; + const char *arg; + MSVCRT_wchar_t *new, *ret = NULL; - /* get length */ - arg = arg0; - len = 0; - do { - len += MultiByteToWideChar(CP_ACP, 0, arg, -1, NULL, 0); - arg = va_arg(alist, char*); - } while (arg != NULL); - - ret = MSVCRT_malloc((len + 1) * sizeof(MSVCRT_wchar_t)); - if (!ret) - return NULL; - - /* fill string */ - arg = arg0; - p = ret; - do { - p += MultiByteToWideChar(CP_ACP, 0, arg, strlen(arg), p, len - (p - ret)); - *p++ = delim; - arg = va_arg(alist2, char*); - } while (arg != NULL); - if (delim && p > ret) p[-1] = 0; - else *p = 0; - return ret; + for (arg = arg0; arg; arg = va_arg( alist, char * )) + { + unsigned int len = MultiByteToWideChar( CP_ACP, 0, arg, -1, NULL, 0 ); + if (pos + len >= size) + { + size = max( 256, size * 2 ); + size = max( size, pos + len + 1 ); + if (!(new = MSVCRT_realloc( ret, size * sizeof(MSVCRT_wchar_t) ))) + { + MSVCRT_free( ret ); + return NULL; + } + ret = new; + } + pos += MultiByteToWideChar( CP_ACP, 0, arg, -1, ret + pos, size - pos ); + ret[pos - 1] = delim; + } + if (pos) + { + if (delim) ret[pos - 1] = 0; + else ret[pos] = 0; + } + return ret; } /* INTERNAL: retrieve COMSPEC environment variable */

1 0

Alistair Leslie-Hughes : msxml3: Corrected getAttributeNode to return correct values.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 561cf9f746250a03c22816ce232812adfcf1cfee URL: http://source.winehq.org/git/wine.git/?a=commit;h=561cf9f746250a03c22816ce2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Dec 13 20:12:02 2008 +1100 msxml3: Corrected getAttributeNode to return correct values. --- dlls/msxml3/element.c | 15 ++++++++++++--- dlls/msxml3/tests/domdoc.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index a31f80e..f479395 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -587,23 +587,32 @@ static HRESULT WINAPI domelem_getAttributeNode( xmlNodePtr element; xmlAttrPtr attr; IUnknown *unk; - HRESULT hr = E_FAIL; + HRESULT hr = S_FALSE; TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), attributeNode); + if(!attributeNode) + return E_FAIL; + + *attributeNode = NULL; + element = get_element( This ); if ( !element ) return E_FAIL; xml_name = xmlChar_from_wchar(p); + if(!xmlValidateNameValue(xml_name)) + { + HeapFree(GetProcessHeap(), 0, xml_name); + return E_FAIL; + } + attr = xmlHasProp(element, xml_name); if(attr) { unk = create_attribute((xmlNodePtr)attr); hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMAttribute, (void**)attributeNode); IUnknown_Release(unk); - }else { - *attributeNode = NULL; } HeapFree(GetProcessHeap(), 0, xml_name); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bac7e3f..73ba932 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -958,12 +958,22 @@ static void test_domnode( void ) ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); VariantClear(&var); + r = IXMLDOMElement_getAttributeNode( element, str, NULL); + ok( r == E_FAIL, "getAttributeNode ret %08x\n", r ); + attr = (IXMLDOMAttribute*)0xdeadbeef; r = IXMLDOMElement_getAttributeNode( element, str, &attr); ok( r == E_FAIL, "getAttributeNode ret %08x\n", r ); ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr ); SysFreeString( str ); + attr = (IXMLDOMAttribute*)0xdeadbeef; + str = _bstr_("nonExisitingAttribute"); + r = IXMLDOMElement_getAttributeNode( element, str, &attr); + ok( r == S_FALSE, "getAttributeNode ret %08x\n", r ); + ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr ); + SysFreeString( str ); + str = SysAllocString( szdl ); V_VT(&var) = VT_I4; V_I4(&var) = 0x1234;

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get_backgroundImage.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 177767c418637804b5db1050e2e9fff211841183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177767c418637804b5db1050e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 11 22:45:24 2008 +1100 mshtml: Implement IHTMLStyle get_backgroundImage. --- dlls/mshtml/htmlstyle.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index c8f8594..705f44a 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -715,8 +715,10 @@ static HRESULT WINAPI HTMLStyle_put_backgroundImage(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_get_backgroundImage(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_BACKGROUND_IMAGE, p); } static HRESULT WINAPI HTMLStyle_put_backgroundRepeat(IHTMLStyle *iface, BSTR v)

1 0

Lei Zhang : gdi32: Prevent integer overflow in CreateBitmapIndirect.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 6d790d6ed0af3b26f20de24bb09747356b9d2b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d790d6ed0af3b26f20de24bb… Author: Lei Zhang <thestig(a)google.com> Date: Tue Dec 16 18:24:29 2008 -0800 gdi32: Prevent integer overflow in CreateBitmapIndirect. --- dlls/gdi32/bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index e7370a2..2a083c5 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -274,7 +274,7 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) /* Windows ignores the provided bm.bmWidthBytes */ bm.bmWidthBytes = BITMAP_GetWidthBytes( bm.bmWidth, bm.bmBitsPixel ); /* XP doesn't allow to create bitmaps larger than 128 Mb */ - if (bm.bmHeight * bm.bmWidthBytes > 128 * 1024 * 1024) + if (bm.bmHeight > 128 * 1024 * 1024 / bm.bmWidthBytes) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return 0;

1 0

Andrew Talbot : d3dx9_27: Remove unused Wine debug channel.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: e742dbb7229acb305e4c5f1dcc2217277d9457c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e742dbb7229acb305e4c5f1dc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 16 21:58:50 2008 +0000 d3dx9_27: Remove unused Wine debug channel. --- dlls/d3dx9_27/d3dx9_27_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_27/d3dx9_27_main.c b/dlls/d3dx9_27/d3dx9_27_main.c index 1dfe8e0..1591983 100644 --- a/dlls/d3dx9_27/d3dx9_27_main.c +++ b/dlls/d3dx9_27/d3dx9_27_main.c @@ -28,12 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0

Andrew Talbot : d3dx9_25: Remove unused Wine debug channel.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: b11b5991d27e111fa2e5a78fe4f2e61f66afbca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11b5991d27e111fa2e5a78fe… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 16 21:58:44 2008 +0000 d3dx9_25: Remove unused Wine debug channel. --- dlls/d3dx9_25/d3dx9_25_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_25/d3dx9_25_main.c b/dlls/d3dx9_25/d3dx9_25_main.c index 2820664..57a0669 100644 --- a/dlls/d3dx9_25/d3dx9_25_main.c +++ b/dlls/d3dx9_25/d3dx9_25_main.c @@ -28,12 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0

Andrew Talbot : d3dx9_26: Remove unused Wine debug channel.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: cd270853008314da25e4a26a11fc36bdc8c7c3b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd270853008314da25e4a26a1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 16 21:58:47 2008 +0000 d3dx9_26: Remove unused Wine debug channel. --- dlls/d3dx9_26/d3dx9_26_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_26/d3dx9_26_main.c b/dlls/d3dx9_26/d3dx9_26_main.c index 3924412..1ce818b 100644 --- a/dlls/d3dx9_26/d3dx9_26_main.c +++ b/dlls/d3dx9_26/d3dx9_26_main.c @@ -28,12 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0

Andrew Talbot : d3dx8: Remove unused Wine debug channel.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 8652b6f186fdc6d5ac3b945c686bc416e5ffa58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8652b6f186fdc6d5ac3b945c6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 16 21:58:38 2008 +0000 d3dx8: Remove unused Wine debug channel. --- dlls/d3dx8/mesh.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx8/mesh.c b/dlls/d3dx8/mesh.c index b9ba976..c1d242b 100644 --- a/dlls/d3dx8/mesh.c +++ b/dlls/d3dx8/mesh.c @@ -20,10 +20,6 @@ #include "wingdi.h" #include "d3dx8.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *pmin, CONST D3DXVECTOR3 *pmax, CONST D3DXVECTOR3 *prayposition, CONST D3DXVECTOR3 *praydirection) /* Algorithm taken from the article: An Efficient and Robust Ray-Box Intersection Algoritm

1 0

Andrew Talbot : d3drm: Remove unused Wine debug channel.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 0fb481e0fd066f750e0924a4b8f1611ff28ef78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb481e0fd066f750e0924a4b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 16 21:58:35 2008 +0000 d3drm: Remove unused Wine debug channel. --- dlls/d3drm/math.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 76b73c0..ff416b6 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -30,10 +30,6 @@ #include "wingdi.h" #include "d3drmdef.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3drm); - /* Create a RGB color from its components */ D3DCOLOR WINAPI D3DRMCreateColorRGB(D3DVALUE red, D3DVALUE green, D3DVALUE blue) {

1 0

Andrew Talbot : d3dx9_24: Remove unused Wine debug channel.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 9fe63be66142eb4fc446dba5e37ec275ccf8daa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fe63be66142eb4fc446dba5e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 16 21:58:41 2008 +0000 d3dx9_24: Remove unused Wine debug channel. --- dlls/d3dx9_24/d3dx9_24_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24_main.c b/dlls/d3dx9_24/d3dx9_24_main.c index bd3e5bd..cc6ffbf 100644 --- a/dlls/d3dx9_24/d3dx9_24_main.c +++ b/dlls/d3dx9_24/d3dx9_24_main.c @@ -28,12 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0