October 2008 - Wine-Commits

Piotr Caban : msxml: Partial implementation of ISAXXMLReader_putProperty.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: c7fc92655255024820207cd945281d60cb0765a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7fc92655255024820207cd94… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Oct 1 19:52:36 2008 +0200 msxml: Partial implementation of ISAXXMLReader_putProperty. --- dlls/msxml3/saxreader.c | 171 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 165 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 646df91..7d3946a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -55,7 +55,12 @@ typedef struct _saxreader struct IVBSAXContentHandler *vbcontentHandler; struct ISAXErrorHandler *errorHandler; struct IVBSAXErrorHandler *vberrorHandler; + struct ISAXLexicalHandler *lexicalHandler; + struct IVBSAXLexicalHandler *vblexicalHandler; + struct ISAXDeclHandler *declHandler; + struct IVBSAXDeclHandler *vbdeclHandler; xmlSAXHandler sax; + BOOL isParsing; } saxreader; typedef struct _saxlocator @@ -1664,8 +1669,10 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz locator->pParserCtxt->sax = &locator->saxreader->sax; locator->pParserCtxt->userData = locator; + This->isParsing = TRUE; if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL; else hr = locator->ret; + This->isParsing = FALSE; if(locator->pParserCtxt) { @@ -1702,6 +1709,7 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt return E_FAIL; } + This->isParsing = TRUE; while(1) { hr = IStream_Read(stream, data, sizeof(data), &dataRead); @@ -1721,6 +1729,7 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt break; } } + This->isParsing = FALSE; locator->pParserCtxt->sax = NULL; xmlFreeParserCtxt(locator->pParserCtxt); @@ -1975,6 +1984,143 @@ static HRESULT WINAPI internal_parseURL( return S_OK; } +static HRESULT WINAPI internal_putProperty( + saxreader* This, + const WCHAR *pProp, + VARIANT value, + BOOL vbInterface) +{ + static const WCHAR wszCharset[] = { + 'c','h','a','r','s','e','t',0 + }; + static const WCHAR wszDeclarationHandler[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/', + 's','a','x','/','p','r','o','p','e','r','t','i','e','s','/', + 'd','e','c','l','a','r','a','t','i','o','n', + '-','h','a','n','d','l','e','r',0 + }; + static const WCHAR wszDomNode[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/', + 's','a','x','/','p','r','o','p','e','r','t','i','e','s','/', + 'd','o','m','-','n','o','d','e',0 + }; + static const WCHAR wszInputSource[] = { + 'i','n','p','u','t','-','s','o','u','r','c','e',0 + }; + static const WCHAR wszLexicalHandler[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/', + 's','a','x','/','p','r','o','p','e','r','t','i','e','s','/', + 'l','e','x','i','c','a','l','-','h','a','n','d','l','e','r',0 + }; + static const WCHAR wszMaxElementDepth[] = { + 'm','a','x','-','e','l','e','m','e','n','t','-','d','e','p','t','h',0 + }; + static const WCHAR wszMaxXMLSize[] = { + 'm','a','x','-','x','m','l','-','s','i','z','e',0 + }; + static const WCHAR wszSchemaDeclarationHandler[] = { + 's','c','h','e','m','a','-', + 'd','e','c','l','a','r','a','t','i','o','n','-', + 'h','a','n','d','l','e','r',0 + }; + static const WCHAR wszXMLDeclEncoding[] = { + 'x','m','l','d','e','c','l','-','e','n','c','o','d','i','n','g',0 + }; + static const WCHAR wszXMLDeclStandalone[] = { + 'x','m','l','d','e','c','l', + '-','s','t','a','n','d','a','l','o','n','e',0 + }; + static const WCHAR wszXMLDeclVersion[] = { + 'x','m','l','d','e','c','l','-','v','e','r','s','i','o','n',0 + }; + + FIXME("(%p)->(%s): semi-stub\n", This, debugstr_w(pProp)); + + if(!memcmp(pProp, wszCharset, sizeof(wszCharset))) + return E_NOTIMPL; + + if(!memcmp(pProp, wszDeclarationHandler, sizeof(wszDeclarationHandler))) + { + if(This->isParsing) return E_FAIL; + + if(V_UNKNOWN(&value)) + { + if(vbInterface) + IVBSAXDeclHandler_AddRef((IVBSAXDeclHandler*)V_UNKNOWN(&value)); + else + ISAXDeclHandler_AddRef((ISAXDeclHandler*)V_UNKNOWN(&value)); + } + if((vbInterface && This->vbdeclHandler) + || (!vbInterface && This->declHandler)) + { + if(vbInterface) + IVBSAXDeclHandler_Release(This->vbdeclHandler); + else + ISAXDeclHandler_Release(This->declHandler); + } + if(vbInterface) + This->vbdeclHandler = (IVBSAXDeclHandler*)V_UNKNOWN(&value); + else + This->declHandler = (ISAXDeclHandler*)V_UNKNOWN(&value); + return S_OK; + } + + if(!memcmp(pProp, wszDomNode, sizeof(wszDomNode))) + return E_FAIL; + + if(!memcmp(pProp, wszInputSource, sizeof(wszInputSource))) + return E_NOTIMPL; + + if(!memcmp(pProp, wszLexicalHandler, sizeof(wszLexicalHandler))) + { + if(This->isParsing) return E_FAIL; + + if(V_UNKNOWN(&value)) + { + if(vbInterface) + IVBSAXLexicalHandler_AddRef( + (IVBSAXLexicalHandler*)V_UNKNOWN(&value)); + else + ISAXLexicalHandler_AddRef( + (ISAXLexicalHandler*)V_UNKNOWN(&value)); + } + if((vbInterface && This->vblexicalHandler) + || (!vbInterface && This->lexicalHandler)) + { + if(vbInterface) + IVBSAXLexicalHandler_Release(This->vblexicalHandler); + else + ISAXLexicalHandler_Release(This->lexicalHandler); + } + if(vbInterface) + This->vblexicalHandler = (IVBSAXLexicalHandler*)V_UNKNOWN(&value); + else + This->lexicalHandler = (ISAXLexicalHandler*)V_UNKNOWN(&value); + return S_OK; + } + + if(!memcmp(pProp, wszMaxElementDepth, sizeof(wszMaxElementDepth))) + return E_NOTIMPL; + + if(!memcmp(pProp, wszMaxXMLSize, sizeof(wszMaxXMLSize))) + return E_NOTIMPL; + + if(!memcmp(pProp, wszSchemaDeclarationHandler, + sizeof(wszSchemaDeclarationHandler))) + return E_NOTIMPL; + + if(!memcmp(pProp, wszXMLDeclEncoding, sizeof(wszXMLDeclEncoding))) + return E_FAIL; + + if(!memcmp(pProp, wszXMLDeclStandalone, sizeof(wszXMLDeclStandalone))) + return E_FAIL; + + if(!memcmp(pProp, wszXMLDeclVersion, sizeof(wszXMLDeclVersion))) + return E_FAIL; + + return E_INVALIDARG; +} + /*** IVBSAXXMLReader interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI saxxmlreader_QueryInterface(IVBSAXXMLReader* iface, REFIID riid, void **ppvObject) @@ -2036,6 +2182,18 @@ static ULONG WINAPI saxxmlreader_Release( if(This->vberrorHandler) IVBSAXErrorHandler_Release(This->vberrorHandler); + if(This->lexicalHandler) + ISAXLexicalHandler_Release(This->lexicalHandler); + + if(This->vblexicalHandler) + IVBSAXLexicalHandler_Release(This->vblexicalHandler); + + if(This->declHandler) + ISAXDeclHandler_Release(This->declHandler); + + if(This->vbdeclHandler) + IVBSAXDeclHandler_Release(This->vbdeclHandler); + HeapFree( GetProcessHeap(), 0, This ); } @@ -2164,9 +2322,7 @@ static HRESULT WINAPI saxxmlreader_putProperty( VARIANT value) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - - FIXME("(%p)->(%s) stub\n", This, debugstr_w(pProp)); - return E_NOTIMPL; + return internal_putProperty(This, pProp, value, TRUE); } static HRESULT WINAPI saxxmlreader_get_entityResolver( @@ -2379,9 +2535,7 @@ static HRESULT WINAPI isaxxmlreader_putProperty( VARIANT value) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_putProperty( - (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, - pProp, value); + return internal_putProperty(This, pProp, value, FALSE); } static HRESULT WINAPI isaxxmlreader_getEntityResolver( @@ -2546,6 +2700,11 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->vbcontentHandler = NULL; reader->errorHandler = NULL; reader->vberrorHandler = NULL; + reader->lexicalHandler = NULL; + reader->vblexicalHandler = NULL; + reader->declHandler = NULL; + reader->vbdeclHandler = NULL; + reader->isParsing = FALSE; memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC;

1 0

Andrew Nguyen : wine.inf: Add entry for fake wintab32.dll.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: f55a2a4eb5f9b2de33084af166e2836ca61f9eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55a2a4eb5f9b2de33084af16… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Oct 1 13:05:51 2008 -0500 wine.inf: Add entry for fake wintab32.dll. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 3497ce3..00e9b97 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2309,6 +2309,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,wininet.dll 11,,winmm.dll 11,,winspool.drv +11,,wintab32.dll 11,,winver.exe 11,,ws2_32.dll 11,,wsock32.dll

1 0

Dylan Smith : richedit: Print hex string for strcmp test failing on Windows 95, 98 & NT4.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 5157798836e169c1721dc3d67d13df0f5087b353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5157798836e169c1721dc3d67… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Oct 2 01:59:46 2008 -0400 richedit: Print hex string for strcmp test failing on Windows 95, 98 & NT4. --- dlls/riched20/tests/editor.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 649d7e7..8274721 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -21,6 +21,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <assert.h> #include <windef.h> #include <winbase.h> @@ -323,11 +324,26 @@ static void test_EM_GETLINE(void) !strncmp(dest+2, origdest+2, nBuf-2), "buffer_len=1\n"); else { + /* Prepare hex strings of buffers to dump on failure. */ + char expectedbuf[1024]; + char resultbuf[1024]; + int j; + expectedbuf[0] = '\0'; + for (j = 0; j < 32; j++) + sprintf(expectedbuf+strlen(expectedbuf), "%02x", dest[j] & 0xFF); + resultbuf[0] = '\0'; + for (j = 0; j < expected_bytes_written; j++) + sprintf(resultbuf+strlen(resultbuf), "%02x", gl[i].text[j] & 0xFF); + for (; j < 32; j++) + sprintf(resultbuf+strlen(resultbuf), "%02x", origdest[j] & 0xFF); + ok(!strncmp(dest, gl[i].text, expected_bytes_written), - "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + "%d: expected_bytes_written=%d\n" "expected=0x%s\n" "but got= 0x%s\n", + i, expected_bytes_written, expectedbuf, resultbuf); ok(!strncmp(dest + expected_bytes_written, origdest + expected_bytes_written, nBuf - expected_bytes_written), - "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + "%d: expected_bytes_written=%d\n" "expected=0x%s\n" "but got= 0x%s\n", + i, expected_bytes_written, expectedbuf, resultbuf); } }

1 0

Dmitry Timoshkov : winex11.drv: Add support for _NET_WORKAREA.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 9aaa24091f9b93f8071b9685b6eaa8c6f16ff826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aaa24091f9b93f8071b9685b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 2 04:00:18 2008 +0900 winex11.drv: Add support for _NET_WORKAREA. --- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 30 ++++++++++++++++++++++++++++-- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f35ae5a..e5a40aa 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -614,6 +614,7 @@ enum x11drv_atoms XATOM__NET_WM_WINDOW_TYPE_DIALOG, XATOM__NET_WM_WINDOW_TYPE_NORMAL, XATOM__NET_WM_WINDOW_TYPE_UTILITY, + XATOM__NET_WORKAREA, XATOM__XEMBED_INFO, XATOM_XdndAware, XATOM_XdndEnter, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 25a86f0..fc9996a 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -150,6 +150,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_WM_WINDOW_TYPE_DIALOG", "_NET_WM_WINDOW_TYPE_NORMAL", "_NET_WM_WINDOW_TYPE_UTILITY", + "_NET_WORKAREA", "_XEMBED_INFO", "XdndAware", "XdndEnter", diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index f68cf2a..f3af0c3 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -65,6 +65,25 @@ static inline int monitor_to_index( HMONITOR handle ) return index - 1; } +static void query_work_area( RECT *rc_work ) +{ + Atom type; + int format; + unsigned long count, remaining; + long *work_area; + + if (!XGetWindowProperty( gdi_display, DefaultRootWindow(gdi_display), x11drv_atom(_NET_WORKAREA), 0, + ~0, False, XA_CARDINAL, &type, &format, &count, + &remaining, (unsigned char **)&work_area )) + { + if (type == XA_CARDINAL && format == 32 && count >= 4) + { + SetRect( rc_work, work_area[0], work_area[1], + work_area[0] + work_area[2], work_area[1] + work_area[3] ); + } + XFree( work_area ); + } +} #ifdef SONAME_LIBXINERAMA @@ -92,10 +111,13 @@ static int query_screens(void) { int i, count, event_base, error_base; XineramaScreenInfo *screens; + RECT rc_work; if (!monitors) /* first time around */ load_xinerama(); + query_work_area( &rc_work ); + if (!pXineramaQueryExtension || !pXineramaQueryScreens || !pXineramaQueryExtension( gdi_display, &event_base, &error_base ) || !(screens = pXineramaQueryScreens( gdi_display, &count ))) return 0; @@ -111,8 +133,9 @@ static int query_screens(void) monitors[i].rcMonitor.top = screens[i].y_org; monitors[i].rcMonitor.right = screens[i].x_org + screens[i].width; monitors[i].rcMonitor.bottom = screens[i].y_org + screens[i].height; - monitors[i].rcWork = monitors[i].rcMonitor; monitors[i].dwFlags = 0; + if (!IntersectRect( &monitors[i].rcWork, &rc_work, &monitors[i].rcMonitor )) + monitors[i].rcWork = monitors[i].rcMonitor; /* FIXME: using the same device name for all monitors for now */ lstrcpyW( monitors[i].szDevice, default_monitor.szDevice ); } @@ -147,6 +170,8 @@ void xinerama_init( unsigned int width, unsigned int height ) if (root_window != DefaultRootWindow( gdi_display ) || !query_screens()) { default_monitor.rcWork = default_monitor.rcMonitor = rect; + if (root_window == DefaultRootWindow( gdi_display )) + query_work_area( &default_monitor.rcWork ); nb_monitors = 1; monitors = &default_monitor; } @@ -159,8 +184,9 @@ void xinerama_init( unsigned int width, unsigned int height ) { OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); - TRACE( "monitor %p: %s%s\n", + TRACE( "monitor %p: %s work %s%s\n", index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), + wine_dbgstr_rect(&monitors[i].rcWork), (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); }

1 0

Alexandre Julliard : inetcomm: Add missing license header.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 1e344db7a67e71d45cee74d20bf246d57a9f5675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e344db7a67e71d45cee74d20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 2 10:30:55 2008 -0500 inetcomm: Add missing license header. --- dlls/inetcomm/imaptransport.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/imaptransport.c b/dlls/inetcomm/imaptransport.c index 99011b2..4cef083 100644 --- a/dlls/inetcomm/imaptransport.c +++ b/dlls/inetcomm/imaptransport.c @@ -2,7 +2,20 @@ * IMAP Transport * * Copyright 2008 Hans Leidekker 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 */ #define COBJMACROS

1 0

Rob Shearman : wininet: Move internet time tests from http.c to internet.c.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: f55afa8a596b90c128471fc2a04a3198ec4ef020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55afa8a596b90c128471fc2a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Oct 2 11:38:45 2008 +0100 wininet: Move internet time tests from http.c to internet.c. --- dlls/wininet/tests/http.c | 120 ------------------------------------ dlls/wininet/tests/internet.c | 135 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 130 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f55afa8a596b90c128471…

1 0

Aric Stewart : user32/tests: GetMenuItemCount returns INT so check for -1 ( Coverity 542).
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: a7e48d7d98e3cd7cb777b6b427bb3fb0cae8b88f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e48d7d98e3cd7cb777b6b42… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 2 07:52:55 2008 -0500 user32/tests: GetMenuItemCount returns INT so check for -1 (Coverity 542). --- dlls/user32/tests/menu.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 6c60335..e4c4cea 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2005,9 +2005,10 @@ static void test_menu_hilitemenuitem( void ) static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type, UINT checked_state) { - UINT i, count; + INT i, count; count = GetMenuItemCount(hmenu); + ok (count != -1, "GetMenuItemCount returned -1\n"); for (i = 0; i < count; i++) {

1 0

Aric Stewart : user32/tests: GetMenuItemCount returns an INT which can be -1 (Coverity 543).
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 6aa6fc8a46aeb41af89557653849305e3ad90685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa6fc8a46aeb41af89557653… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 2 07:42:34 2008 -0500 user32/tests: GetMenuItemCount returns an INT which can be -1 (Coverity 543). --- dlls/user32/tests/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 0eabe50..6c60335 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2148,7 +2148,7 @@ static void test_menu_resource_layout(void) { MF_SEPARATOR, MF_GRAYED|MF_DISABLED, 8, "" } }; HMENU hmenu; - UINT count, i; + INT count, i; BOOL ret; hmenu = LoadMenuIndirect(&menu_template);

1 0

Rob Shearman : wininet: Fix behaviour of InternetTimeFromSystemTimeA/ W when a buffer that is too small is passed in.
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: fa066c74e3b96bde9f1c1badc6f1d6e300348079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa066c74e3b96bde9f1c1badc… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Oct 2 11:38:38 2008 +0100 wininet: Fix behaviour of InternetTimeFromSystemTimeA/W when a buffer that is too small is passed in. --- dlls/wininet/internet.c | 14 ++++++++++++-- dlls/wininet/tests/http.c | 3 --- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6166ff8..ea1d294 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2478,6 +2478,12 @@ BOOL WINAPI InternetTimeFromSystemTimeA( const SYSTEMTIME* time, DWORD format, L TRACE( "%p 0x%08x %p 0x%08x\n", time, format, string, size ); + if (size < INTERNET_RFC1123_BUFSIZE * sizeof(*string)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + ret = InternetTimeFromSystemTimeW( time, format, stringW, sizeof(stringW) ); if (ret) WideCharToMultiByte( CP_ACP, 0, stringW, -1, string, size, NULL, NULL ); @@ -2495,10 +2501,14 @@ BOOL WINAPI InternetTimeFromSystemTimeW( const SYSTEMTIME* time, DWORD format, L TRACE( "%p 0x%08x %p 0x%08x\n", time, format, string, size ); - if (!time || !string) return FALSE; + if (!time || !string || format != INTERNET_RFC1123_FORMAT) + return FALSE; - if (format != INTERNET_RFC1123_FORMAT || size < INTERNET_RFC1123_BUFSIZE * sizeof(WCHAR)) + if (size < INTERNET_RFC1123_BUFSIZE * sizeof(*string)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; + } sprintfW( string, date, WININET_wkday[time->wDayOfWeek], diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index db4f075..bfdcf80 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -800,12 +800,10 @@ static void InternetTimeFromSystemTimeA_test(void) SetLastError(0xdeadbeef); ret = pInternetTimeFromSystemTimeA( &time, INTERNET_RFC1123_FORMAT, string, 0 ); error = GetLastError(); - todo_wine { ok( !ret, "InternetTimeFromSystemTimeA should have returned FALSE\n" ); ok( error == ERROR_INSUFFICIENT_BUFFER, "InternetTimeFromSystemTimeA failed with ERROR_INSUFFICIENT_BUFFER instead of %u\n", error ); - } } static void InternetTimeFromSystemTimeW_test(void) @@ -827,7 +825,6 @@ static void InternetTimeFromSystemTimeW_test(void) ret = pInternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT, string, sizeof(string)/sizeof(string[0]) ); error = GetLastError(); ok( !ret, "InternetTimeFromSystemTimeW should have returned FALSE\n" ); - todo_wine ok( error == ERROR_INSUFFICIENT_BUFFER, "InternetTimeFromSystemTimeW failed with ERROR_INSUFFICIENT_BUFFER instead of %u\n", error );

1 0

Aric Stewart : mlang: Correct use of uninitialized rfcstr value ( Coverity 796).
by Alexandre Julliard Oct. 2, 2008

Oct. 2, 2008

Module: wine Branch: master Commit: 52b2b5b7b01babfba0838b58e5121e585c9c5098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52b2b5b7b01babfba0838b58e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 2 07:20:01 2008 -0500 mlang: Correct use of uninitialized rfcstr value (Coverity 796). --- dlls/mlang/tests/mlang.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index f5e7c01..a1e5793 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -406,16 +406,16 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) if (memcmp(cpinfo[i].wszWebCharset, autoW, 5 * sizeof(WCHAR))) { ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08x\n", ret); - #ifdef DUMP_CP_INFO +#ifdef DUMP_CP_INFO trace("%s: %u %u %s\n", wine_dbgstr_w(cpinfo[i].wszWebCharset), mcsi.uiCodePage, mcsi.uiInternetEncoding, wine_dbgstr_w(mcsi.wszCharset)); - #endif +#endif ok(!lstrcmpiW(cpinfo[i].wszWebCharset, mcsi.wszCharset), - #ifdef DUMP_CP_INFO +#ifdef DUMP_CP_INFO "%s != %s\n", wine_dbgstr_w(cpinfo[i].wszWebCharset), wine_dbgstr_w(mcsi.wszCharset)); - #else +#else "wszWebCharset mismatch\n"); - #endif +#endif if (0) { @@ -437,16 +437,16 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) if (memcmp(cpinfo[i].wszHeaderCharset, autoW, 5 * sizeof(WCHAR))) { ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08x\n", ret); - #ifdef DUMP_CP_INFO +#ifdef DUMP_CP_INFO trace("%s: %u %u %s\n", wine_dbgstr_w(cpinfo[i].wszHeaderCharset), mcsi.uiCodePage, mcsi.uiInternetEncoding, wine_dbgstr_w(mcsi.wszCharset)); - #endif +#endif ok(!lstrcmpiW(cpinfo[i].wszHeaderCharset, mcsi.wszCharset), - #ifdef DUMP_CP_INFO +#ifdef DUMP_CP_INFO "%s != %s\n", wine_dbgstr_w(cpinfo[i].wszHeaderCharset), wine_dbgstr_w(mcsi.wszCharset)); - #else +#else "wszHeaderCharset mismatch\n"); - #endif +#endif if (0) { @@ -468,16 +468,16 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) if (memcmp(cpinfo[i].wszBodyCharset, autoW, 5 * sizeof(WCHAR))) { ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08x\n", ret); - #ifdef DUMP_CP_INFO +#ifdef DUMP_CP_INFO trace("%s: %u %u %s\n", wine_dbgstr_w(cpinfo[i].wszBodyCharset), mcsi.uiCodePage, mcsi.uiInternetEncoding, wine_dbgstr_w(mcsi.wszCharset)); - #endif +#endif ok(!lstrcmpiW(cpinfo[i].wszBodyCharset, mcsi.wszCharset), - #ifdef DUMP_CP_INFO +#ifdef DUMP_CP_INFO "%s != %s\n", wine_dbgstr_w(cpinfo[i].wszBodyCharset), wine_dbgstr_w(mcsi.wszCharset)); - #else +#else "wszBodyCharset mismatch\n"); - #endif +#endif if (0) { @@ -815,8 +815,8 @@ static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) hr = IMultiLanguage2_GetRfc1766FromLcid(iML2, lcid, &rfcstr); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok_w2("Expected \"%s\", got \"%s\"n", kok, rfcstr); + SysFreeString(rfcstr); } - SysFreeString(rfcstr); } static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2)

1 0