December 2009 - Wine-Commits

Alexandre Julliard : rpcrt4/tests: Skip the get_ranged_enum test on old Windows versions.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: e48f4253a493e4b91224810db3e0fd0976e6793b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48f4253a493e4b91224810db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 12:56:04 2009 +0100 rpcrt4/tests: Skip the get_ranged_enum test on old Windows versions. --- dlls/rpcrt4/tests/server.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 6453f53..2a32b45 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -904,8 +904,11 @@ basic_tests(void) x = echo_ranged_int(100); ok(x == 100, "echo_ranged_int() returned %d instead of 100\n", x); - get_ranged_enum(&re); - ok(re == RE3, "get_ranged_enum() returned %d instead of RE3\n", re); + if (!old_windows_version) + { + get_ranged_enum(&re); + ok(re == RE3, "get_ranged_enum() returned %d instead of RE3\n", re); + } } static void

1 0

Marcus Meissner : cmd: Break out of the argument scan loop (Coverity).
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: f62218fc66016079b5455e0a7f6c161b8c2b6a2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62218fc66016079b5455e0a7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 4 10:06:13 2009 +0100 cmd: Break out of the argument scan loop (Coverity). --- programs/cmd/wcmdmain.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 9f5b6df..fed1fbd 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1153,13 +1153,10 @@ void WCMD_run_program (WCHAR *command, int called) { WCMD_run_program(command, called); return; } - if (!status) { - WCMD_print_error (); - /* If a command fails to launch, it sets errorlevel 9009 - which - does not seem to have any associated constant definition */ - errorlevel = 9009; - return; - } + + if (!status) + break; + if (!assumeInternal && !console) errorlevel = 0; else {

1 0

Marcus Meissner : msvcrt: Remove unnecessary NULL check (Coverity).
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 4da51e087d922431651c9bdec7151336d8471c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da51e087d922431651c9bdec… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 4 10:10:48 2009 +0100 msvcrt: Remove unnecessary NULL check (Coverity). --- dlls/msvcrt/wcs.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0f3e9ee..6e08822 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -810,12 +810,9 @@ int CDECL MSVCRT_vsnprintf( char *str, unsigned int len, out.used = 0; out.len = len; - if( format ) - { - sz = MultiByteToWideChar( CP_ACP, 0, format, -1, NULL, 0 ); - formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); - } + sz = MultiByteToWideChar( CP_ACP, 0, format, -1, NULL, 0 ); + formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); r = pf_vsnprintf( &out, formatW, valist );

1 0

Marcus Meissner : winex11.drv: Handle if cursor not found (Cpverity).
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 478592cd3d709f16de1c6a4feb54adbbab9ba3f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478592cd3d709f16de1c6a4fe… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 4 09:48:53 2009 +0100 winex11.drv: Handle if cursor not found (Cpverity). --- dlls/winex11.drv/wintab.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index c333539..7d7bfcc 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -991,6 +991,10 @@ int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) for (loop=0; loop < num_devices; loop ++) if (strcmp(devices[loop].name, cursorNameA) == 0) target = &devices[loop]; + if (!target) { + WARN("Cursor Name %s not found in list of targets.\n", cursorNameA); + continue; + } TRACE("Opening cursor %i id %i\n",cur_loop,(INT)target->id);

1 0

Vincent Povirk : ole32: Forbid substorages of simple mode storages.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: cf5e6c571ad7b7a78289a116e9fdf2c2d7910997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5e6c571ad7b7a78289a116e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 2 11:28:09 2009 -0600 ole32: Forbid substorages of simple mode storages. --- dlls/ole32/storage32.c | 11 +++++++++++ dlls/ole32/tests/storage32.c | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 089206d..3991b9e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -530,6 +530,12 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( goto end; } + if (This->openFlags & STGM_SIMPLE) + { + res = STG_E_INVALIDFUNCTION; + goto end; + } + /* as documented */ if (snbExclude != NULL) { @@ -1022,6 +1028,11 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( if (ppstg == 0) return STG_E_INVALIDPOINTER; + if (This->openFlags & STGM_SIMPLE) + { + return STG_E_INVALIDFUNCTION; + } + if (pwcsName == 0) return STG_E_INVALIDNAME; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 53811db..6e222c7 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1774,9 +1774,10 @@ static void test_simple(void) { /* Tests for STGM_SIMPLE mode */ - IStorage *stg; + IStorage *stg, *stg2; HRESULT r; IStream *stm; + static const WCHAR stgname[] = { 'S','t','g',0 }; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; static const WCHAR stmname2[] = { 'S','m','a','l','l',0 }; LARGE_INTEGER pos; @@ -1789,6 +1790,10 @@ static void test_simple(void) r = StgCreateDocfile( filename, STGM_SIMPLE | STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stg); ok(r == S_OK, "got %08x\n", r); + r = IStorage_CreateStorage(stg, stgname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stg2); + ok(r == STG_E_INVALIDFUNCTION, "got %08x\n", r); + if (SUCCEEDED(r)) IStorage_Release(stg2); + r = IStorage_CreateStream(stg, stmname, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); ok(r == STG_E_INVALIDFLAG, "got %08x\n", r); r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); @@ -1853,6 +1858,10 @@ static void test_simple(void) } ok(r == S_OK, "got %08x\n", r); + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, NULL, 0, &stg2); + ok(r == STG_E_INVALIDFUNCTION, "got %08x\n", r); + if (SUCCEEDED(r)) IStorage_Release(stg2); + r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm); ok(r == S_OK, "got %08x\n", r);

1 0

Francois Gouget : wininet: Make FTP_FtpOpenFileW() static.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: f3b738f63c3e3987f51fda1dfd94de8a05718e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b738f63c3e3987f51fda1df… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 4 11:43:25 2009 +0100 wininet: Make FTP_FtpOpenFileW() static. --- dlls/wininet/ftp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 1d8a8f9..1736ad5 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1308,7 +1308,7 @@ static const object_vtbl_t FTPFILEVtbl = { * NULL on failure * */ -HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, +static HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, LPCWSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, DWORD_PTR dwContext) {

1 0

Roderick Colenbrander : wgl: Add a direct rendering check to new winediag channel.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: a191184ae9b2c3f7d94fd39c3674066fe79494b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a191184ae9b2c3f7d94fd39c3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Dec 3 21:12:26 2009 +0100 wgl: Add a direct rendering check to new winediag channel. --- dlls/winex11.drv/opengl.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 19e3fe3..aadb7f1 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -29,12 +29,20 @@ #include <stdlib.h> #include <string.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_SYS_UN_H +#include <sys/un.h> +#endif + #include "x11drv.h" #include "winternl.h" #include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef SONAME_LIBGL @@ -351,6 +359,19 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) TRACE("Client GLX vendor: : %s.\n", WineGLInfo.glxClientVendor); TRACE("Direct rendering enabled: %s\n", WineGLInfo.glxDirect ? "True" : "False"); + if(!WineGLInfo.glxDirect) + { + int fd = ConnectionNumber(gdi_display); + struct sockaddr_un uaddr; + unsigned int uaddrlen = sizeof(struct sockaddr_un); + + /* In general indirect rendering on a local X11 server indicates a driver problem. + * Detect a local X11 server by checking whether the X11 socket is a Unix socket. + */ + if(!getsockname(fd, &uaddr, &uaddrlen) && uaddr.sun_family == AF_UNIX) + ERR_(winediag)("Direct rendering is disabled, most likely your OpenGL drivers haven't been installed correctly\n"); + } + if(vis) XFree(vis); if(ctx) { pglXMakeCurrent(gdi_display, None, NULL);

1 0

Nikolay Sivov : kernel32/lcformat: Avoid back jumps on failure.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 1a2609189f9d96e919d32ac6560976b55a40cc39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2609189f9d96e919d32ac65… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 3 21:23:43 2009 +0300 kernel32/lcformat: Avoid back jumps on failure. --- dlls/kernel32/lcformat.c | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index f1b5ba5..83c190f 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -355,11 +355,7 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, /* Verify our arguments */ if ((cchOut && !lpStr) || !(node = NLS_GetFormats(lcid, dwFlags))) - { -NLS_GetDateTimeFormatW_InvalidParameter: - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } + goto invalid_parameter; if (dwFlags & ~(DATE_DATEVARSONLY|TIME_TIMEVARSONLY)) { @@ -367,15 +363,13 @@ NLS_GetDateTimeFormatW_InvalidParameter: ((dwFlags & DATE_DATEVARSONLY && dwFlags & ~DATE_FORMAT_FLAGS) || (dwFlags & TIME_TIMEVARSONLY && dwFlags & ~TIME_FORMAT_FLAGS))) { -NLS_GetDateTimeFormatW_InvalidFlags: - SetLastError(ERROR_INVALID_FLAGS); - return 0; + goto invalid_flags; } if (dwFlags & DATE_DATEVARSONLY) { if ((dwFlags & (DATE_LTRREADING|DATE_RTLREADING)) == (DATE_LTRREADING|DATE_RTLREADING)) - goto NLS_GetDateTimeFormatW_InvalidFlags; + goto invalid_flags; else if (dwFlags & (DATE_LTRREADING|DATE_RTLREADING)) FIXME("Unsupported flags: DATE_LTRREADING/DATE_RTLREADING\n"); @@ -387,10 +381,10 @@ NLS_GetDateTimeFormatW_InvalidFlags: case DATE_LONGDATE: case DATE_YEARMONTH: if (lpFormat) - goto NLS_GetDateTimeFormatW_InvalidFlags; + goto invalid_flags; break; default: - goto NLS_GetDateTimeFormatW_InvalidFlags; + goto invalid_flags; } } } @@ -429,7 +423,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: st.wDay = lpTime->wDay; if (st.wDay > 31 || st.wMonth > 12 || !SystemTimeToFileTime(&st, &ftTmp)) - goto NLS_GetDateTimeFormatW_InvalidParameter; + goto invalid_parameter; FileTimeToSystemTime(&ftTmp, &st); lpTime = &st; @@ -439,7 +433,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: { /* Verify the time */ if (lpTime->wHour > 24 || lpTime->wMinute > 59 || lpTime->wSecond > 59) - goto NLS_GetDateTimeFormatW_InvalidParameter; + goto invalid_parameter; } } @@ -464,7 +458,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: if (!cchOut) cchWritten++; /* Count size only */ else if (cchWritten >= cchOut) - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; else if (!bSkipping) { lpStr[cchWritten] = *lpFormat; @@ -624,7 +618,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: else { memcpy(lpStr + cchWritten, szAdd, (cchOut - cchWritten) * sizeof(WCHAR)); - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; } } cchWritten += dwLen; @@ -636,7 +630,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: if (!cchOut) cchWritten++; /* Count size only */ else if (cchWritten >= cchOut) - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; else if (!bSkipping || *lpFormat == ' ') { lpStr[cchWritten] = *lpFormat; @@ -650,7 +644,7 @@ NLS_GetDateTimeFormatW_InvalidFlags: if (cchOut) { if (cchWritten >= cchOut) - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; else lpStr[cchWritten] = '\0'; } @@ -659,10 +653,18 @@ NLS_GetDateTimeFormatW_InvalidFlags: TRACE("returning length=%d, ouput=%s\n", cchWritten, debugstr_w(lpStr)); return cchWritten; -NLS_GetDateTimeFormatW_Overrun: +overrun: TRACE("returning 0, (ERROR_INSUFFICIENT_BUFFER)\n"); SetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; + +invalid_parameter: + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + +invalid_flags: + SetLastError(ERROR_INVALID_FLAGS); + return 0; } /******************************************************************************

1 0

Juan Lang : wininet: Correct length of data passed to callback when resolving a name.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: b967fde0a86e5adaa7233d76b4691d6a5f5686ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b967fde0a86e5adaa7233d76b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 3 18:19:00 2009 -0800 wininet: Correct length of data passed to callback when resolving a name. --- dlls/wininet/ftp.c | 2 +- dlls/wininet/http.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index bbef8ca..1d8a8f9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2535,7 +2535,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, } SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_RESOLVING_NAME, - (LPWSTR) lpszServerName, strlenW(lpszServerName)); + (LPWSTR) lpszServerName, (strlenW(lpszServerName)+1) * sizeof(WCHAR)); sock_namelen = sizeof(socketAddr); if (!GetAddress(lpszServerName, lpwfs->serverport, (struct sockaddr *)&socketAddr, &sock_namelen)) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 19a34cb..024d5d8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1389,7 +1389,7 @@ static DWORD HTTP_ResolveName(http_request_t *lpwhr) INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESOLVING_NAME, lpwhs->lpszServerName, - strlenW(lpwhs->lpszServerName)+1); + (strlenW(lpwhs->lpszServerName)+1) * sizeof(WCHAR)); lpwhs->sa_len = sizeof(lpwhs->socketAddress); if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort,

1 0

Jacek Caban : jscript: Correctly handle NaN and Infinity in to_int32 and to_uint32.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: efda5561d01c68f54c27b4c0ab9558ab09dbc085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efda5561d01c68f54c27b4c0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 4 02:56:04 2009 +0100 jscript: Correctly handle NaN and Infinity in to_int32 and to_uint32. --- dlls/jscript/jsutils.c | 10 ++++++++-- dlls/jscript/tests/lang.js | 12 ++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 80cce59..304980d 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -467,7 +467,10 @@ HRESULT to_int32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, INT *ret) if(FAILED(hres)) return hres; - *ret = V_VT(&num) == VT_I4 ? V_I4(&num) : (INT)V_R8(&num); + if(V_VT(&num) == VT_I4) + *ret = V_I4(&num); + else + *ret = isnan(V_R8(&num)) || isinf(V_R8(&num)) ? 0 : (INT)V_R8(&num); return S_OK; } @@ -481,7 +484,10 @@ HRESULT to_uint32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, DWORD *ret) if(FAILED(hres)) return hres; - *ret = V_VT(&num) == VT_I4 ? V_I4(&num) : (DWORD)V_R8(&num); + if(V_VT(&num) == VT_I4) + *ret = V_I4(&num); + else + *ret = isnan(V_R8(&num)) || isinf(V_R8(&num)) ? 0 : (DWORD)V_R8(&num); return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index bd22c52..1359e05 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -346,6 +346,15 @@ tmp = -3.5 | 0; ok(tmp === -3, "-3.5 | 0 !== -3"); ok(getVT(tmp) === "VT_I4", "getVT(3.5|0) = " + getVT(tmp)); +tmp = 0 | NaN; +ok(tmp === 0, "0 | NaN = " + tmp); + +tmp = 0 | Infinity; +ok(tmp === 0, "0 | NaN = " + tmp); + +tmp = 0 | (-Infinity); +ok(tmp === 0, "0 | NaN = " + tmp); + tmp = 10; ok((tmp |= 0x10) === 26, "tmp(10) |= 0x10 !== 26"); ok(getVT(tmp) === "VT_I4", "getVT(tmp |= 10) = " + getVT(tmp)); @@ -380,6 +389,9 @@ ok(tmp === 2, "8 >> 2 = " + tmp); tmp = -64 >>> 4; ok(tmp === 0x0ffffffc, "-64 >>> 4 = " + tmp); +tmp = 4 >>> NaN; +ok(tmp === 4, "4 >>> NaN = " + tmp); + tmp = 10; ok((tmp &= 8) === 8, "tmp(10) &= 8 !== 8"); ok(getVT(tmp) === "VT_I4", "getVT(tmp &= 8) = " + getVT(tmp));

1 0