November 2006 - Wine-commits

Marcus Meissner : oleaut32: Protect against integer overflow in SysAllocStringLen.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: caa301a73670d49a4553faab165d65f44c315693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa301a73670d49a4553faab1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Nov 24 08:45:57 2006 +0100 oleaut32: Protect against integer overflow in SysAllocStringLen. --- dlls/oleaut32/oleaut.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 8ffdc72..d6a08a9 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <string.h> +#include <limits.h> #define COBJMACROS @@ -217,6 +218,9 @@ BSTR WINAPI SysAllocStringLen(const OLEC DWORD* newBuffer; WCHAR* stringBuffer; + /* Detect integer overflow. */ + if (len >= ((UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))/sizeof(WCHAR))) + return NULL; /* * Find the length of the buffer passed-in, in bytes. */ @@ -234,8 +238,8 @@ BSTR WINAPI SysAllocStringLen(const OLEC /* * If the memory allocation failed, return a null pointer. */ - if (newBuffer==0) - return 0; + if (!newBuffer) + return NULL; /* * Copy the length of the string in the placeholder.

1 0

Francois Gouget : msvcrt/tests: We cannot link with _initterm() with Visual C++, so we have to load it dynamically.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 1a145bb53225d4dc5efc8e5964f4be1e8499fd7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a145bb53225d4dc5efc8e596… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 23 21:38:51 2006 +0100 msvcrt/tests: We cannot link with _initterm() with Visual C++, so we have to load it dynamically. --- dlls/msvcrt/tests/data.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index b13d722..74980a2 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -32,7 +32,7 @@ #include <errno.h> typedef void (*_INITTERMFUN)(void); -extern unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end); +static unsigned int (*p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); static int callbacked; @@ -43,7 +43,7 @@ void initcallback(void) #define initterm_test(start, end, expected) \ callbacked = 0; \ - rc = _initterm(start, end); \ + rc = p_initterm(start, end); \ ok(expected == rc, "_initterm: return result mismatch: got %i, expected %i\n", rc, expected); \ ok(expected == callbacked,"_initterm: callbacks count mismatch: got %i, expected %i\n", callbacked, expected); @@ -53,6 +53,9 @@ void test_initterm(void) int rc; static _INITTERMFUN callbacks[4]; + if (!p_initterm) + return; + for (i = 0; i < 4; i++) { callbacks[i] = initcallback; @@ -68,5 +71,11 @@ void test_initterm(void) START_TEST(data) { + HMODULE hmsvcrt; + hmsvcrt = GetModuleHandleA("msvcrt.dll"); + if (!hmsvcrt) + hmsvcrt = GetModuleHandleA("msvcrtd.dll"); + if (hmsvcrt) + p_initterm=(void*)GetProcAddress(hmsvcrt, "_initterm"); test_initterm(); }

1 0

Andrew Talbot : winmm/wineoss: Cast-qual warning fix.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 89bb54601f8fadff98cdf119524314095b7df59e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89bb54601f8fadff98cdf1195… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Nov 23 20:29:00 2006 +0000 winmm/wineoss: Cast-qual warning fix. --- dlls/winmm/wineoss/dscapture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/wineoss/dscapture.c b/dlls/winmm/wineoss/dscapture.c index 62c4e38..065bd79 100644 --- a/dlls/winmm/wineoss/dscapture.c +++ b/dlls/winmm/wineoss/dscapture.c @@ -853,7 +853,7 @@ static void * my_memcpy(void * dst, cons { int i; for (i = 0; i < length; i++) - ((char *)dst)[i] = ((char *)src)[i]; + ((char *)dst)[i] = ((const char *)src)[i]; return dst; }

1 0

Andrew Talbot : ws2_32: Cast-qual warnings fix.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: d9cdd2341109524b9877cccc7a022aee51132b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9cdd2341109524b9877cccc7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Nov 23 22:39:34 2006 +0000 ws2_32: Cast-qual warnings fix. --- dlls/ws2_32/socket.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 727c118..e90c4b2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -860,7 +860,7 @@ static struct sockaddr* ws_sockaddr_ws2u #endif case WS_AF_INET6: { struct sockaddr_in6* uin6; - const struct WS_sockaddr_in6* win6 = (struct WS_sockaddr_in6*)wsaddr; + const struct WS_sockaddr_in6* win6 = (const struct WS_sockaddr_in6*)wsaddr; /* Note: Windows has 2 versions of the sockaddr_in6 struct, one with * scope_id, one without. Check: @@ -883,7 +883,7 @@ static struct sockaddr* ws_sockaddr_ws2u } case WS_AF_INET: { struct sockaddr_in* uin; - const struct WS_sockaddr_in* win = (struct WS_sockaddr_in*)wsaddr; + const struct WS_sockaddr_in* win = (const struct WS_sockaddr_in*)wsaddr; if (wsaddrlen<sizeof(struct WS_sockaddr_in)) return NULL; @@ -988,7 +988,7 @@ static int ws_sockaddr_u2ws(const struct break; #endif case AF_INET6: { - const struct sockaddr_in6* uin6 = (struct sockaddr_in6*)uaddr; + const struct sockaddr_in6* uin6 = (const struct sockaddr_in6*)uaddr; struct WS_sockaddr_in6_old* win6old = (struct WS_sockaddr_in6_old*)wsaddr; if (*wsaddrlen < sizeof(struct WS_sockaddr_in6_old)) @@ -1008,7 +1008,7 @@ static int ws_sockaddr_u2ws(const struct return 0; } case AF_INET: { - struct sockaddr_in* uin = (struct sockaddr_in*)uaddr; + const struct sockaddr_in* uin = (const struct sockaddr_in*)uaddr; struct WS_sockaddr_in* win = (struct WS_sockaddr_in*)wsaddr; if (*wsaddrlen < sizeof(struct WS_sockaddr_in)) @@ -2699,8 +2699,8 @@ int WINAPI WS_setsockopt(SOCKET s, int l SetLastError(WSAEFAULT); return SOCKET_ERROR; } - get_per_thread_data()->opentype = *(int *)optval; - TRACE("setting global SO_OPENTYPE to 0x%x\n", *(int *)optval ); + get_per_thread_data()->opentype = *(const int *)optval; + TRACE("setting global SO_OPENTYPE to 0x%x\n", *(const int *)optval ); return 0; } @@ -2721,7 +2721,7 @@ int WINAPI WS_setsockopt(SOCKET s, int l { case IPX_PTYPE: fd = get_sock_fd( s, 0, NULL ); - TRACE("trying to set IPX_PTYPE: %d (fd: %d)\n", *(int*)optval, fd); + TRACE("trying to set IPX_PTYPE: %d (fd: %d)\n", *(const int*)optval, fd); /* We try to set the ipx type on ipx socket level. */ #ifdef SOL_IPX @@ -2758,13 +2758,13 @@ int WINAPI WS_setsockopt(SOCKET s, int l /* Is a privileged and useless operation, so we don't. */ if ((optname == WS_SO_DEBUG) && (level == WS_SOL_SOCKET)) { - FIXME("(%d,SOL_SOCKET,SO_DEBUG,%p(%d)) attempted (is privileged). Ignoring.\n",s,optval,*(DWORD*)optval); + FIXME("(%d,SOL_SOCKET,SO_DEBUG,%p(%d)) attempted (is privileged). Ignoring.\n",s,optval,*(const DWORD*)optval); return 0; } if(optname == WS_SO_DONTLINGER && level == WS_SOL_SOCKET) { /* This is unique to WinSock and takes special conversion */ - linger.l_onoff = *((int*)optval) ? 0: 1; + linger.l_onoff = *((const int*)optval) ? 0: 1; linger.l_linger = 0; optname=SO_LINGER; optval = (char*)&linger; @@ -2788,7 +2788,7 @@ int WINAPI WS_setsockopt(SOCKET s, int l } else if (optval && optlen < sizeof(int)) { - woptval= *((INT16 *) optval); + woptval= *((const INT16 *) optval); optval= (char*) &woptval; optlen=sizeof(int); } @@ -2796,8 +2796,8 @@ int WINAPI WS_setsockopt(SOCKET s, int l { if (optlen == sizeof(UINT32)) { /* WinSock passes miliseconds instead of struct timeval */ - tval.tv_usec = (*(PUINT32)optval % 1000) * 1000; - tval.tv_sec = *(PUINT32)optval / 1000; + tval.tv_usec = (*(const UINT32*)optval % 1000) * 1000; + tval.tv_sec = *(const UINT32*)optval / 1000; /* min of 500 milisec */ if (tval.tv_sec == 0 && tval.tv_usec < 500000) tval.tv_usec = 500000; @@ -2810,9 +2810,9 @@ int WINAPI WS_setsockopt(SOCKET s, int l return 0; } } - if (level == SOL_SOCKET && optname == SO_RCVBUF && *(int*)optval < 2048) + if (level == SOL_SOCKET && optname == SO_RCVBUF && *(const int*)optval < 2048) { - WARN("SO_RCVBF for %d bytes is too small: ignored\n", *(int*)optval ); + WARN("SO_RCVBF for %d bytes is too small: ignored\n", *(const int*)optval ); return 0; } }

1 0

Andrew Talbot : winspool.drv: Cast-qual warning fix + make function static.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 972826b267f3ddc46974e9aca7b9b903888a5214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=972826b267f3ddc46974e9aca… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Nov 23 21:28:54 2006 +0000 winspool.drv: Cast-qual warning fix + make function static. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 38e4dc8..2a62883 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -383,7 +383,7 @@ WINSPOOL_SetDefaultPrinter(const char *d } } -BOOL add_printer_driver(const char *name) +static BOOL add_printer_driver(char *name) { DRIVER_INFO_3A di3a;

1 0

Detlef Riekenberg : localspl/tests: Add test for DeletePort.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 8fcd1107bb146da8b2dff5ed9cf9579dc58555a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fcd1107bb146da8b2dff5ed9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Nov 23 21:49:42 2006 +0100 localspl/tests: Add test for DeletePort. --- dlls/localspl/tests/localmon.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index e8e3b08..ada1a76 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -58,6 +58,7 @@ static BOOL (WINAPI *pXcvOpenPort)(HAND static DWORD (WINAPI *pXcvDataPort)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD); static BOOL (WINAPI *pXcvClosePort)(HANDLE); +static WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; static WCHAR emptyW[] = {0}; static WCHAR invalid_serverW[] = {'\\','\\','i','n','v','a','l','i','d','_','s','e','r','v','e','r',0}; static WCHAR Monitors_LocalPortW[] = { \ @@ -78,6 +79,7 @@ static void test_ConfigurePort(void) { DWORD res; + /* moved to localui.dll since w2k */ if (!pConfigurePort) return; #if 0 @@ -113,6 +115,38 @@ static void test_ConfigurePort(void) /* ########################### */ +static void test_DeletePort(void) +{ + DWORD res; + + /* moved to localui.dll since w2k */ + if (!pDeletePort) return; + +#if 0 + /* NT4 crash on this test */ + res = pDeletePort(NULL, 0, NULL); +#endif + + /* Testing-Results (localmon.dll from NT4.0): + - Case of Portname is ignored (returned '1' on Success) + - "COM1:" and "COM01:" are different (Compared as string) + - server_does_not_exist (LPT1:) => Port deleted, Success (Servername is ignored) + - Empty Portname => => FALSE (LastError not changed) + - Port "does_not_exist" => FALSE (LastError not changed) + */ + + SetLastError(0xdeadbeef); + res = pDeletePort(NULL, 0, emptyW); + ok(!res, "returned %d with 0x%x (expected '0')\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = pDeletePort(NULL, 0, does_not_existW); + ok(!res, "returned %d with 0x%x (expected '0')\n", res, GetLastError()); + +} + +/* ########################### */ + static void test_EnumPorts(void) { DWORD res; @@ -286,5 +320,6 @@ START_TEST(localmon) test_InitializePrintMonitor(); test_ConfigurePort(); + test_DeletePort(); test_EnumPorts(); }

1 0

Detlef Riekenberg : localspl: Implement DeletePort.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: ca199009af7c65682bf3263339b29a7b7576be41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca199009af7c65682bf326333… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Nov 23 21:49:46 2006 +0100 localspl: Implement DeletePort. --- dlls/localspl/localmon.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 72b6b35..4f65417 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -197,6 +197,39 @@ BOOL WINAPI localmon_ConfigurePortW(LPWS } /***************************************************** + * localmon_DeletePortW [exported through MONITOREX] + * + * Delete a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window + * pPortName [I] Name of the Port, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +BOOL WINAPI localmon_DeletePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName) +{ + DWORD res; + HKEY hroot; + + TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); + + if ((!pPortName) || (!pPortName[0])) return FALSE; + + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_PortsW, &hroot); + if (res == ERROR_SUCCESS) { + res = RegDeleteValueW(hroot, pPortName); + RegCloseKey(hroot); + } + TRACE("=> %d\n", (res == ERROR_SUCCESS)); + return (res == ERROR_SUCCESS); +} + +/***************************************************** * localmon_EnumPortsW [exported through MONITOREX] * * Enumerate all local Ports @@ -290,7 +323,8 @@ LPMONITOREX WINAPI InitializePrintMonito NULL, /* localmon_ClosePortW */ NULL, /* localmon_AddPortW */ NULL, /* localmon_AddPortExW */ - localmon_ConfigurePortW + localmon_ConfigurePortW, + localmon_DeletePortW } };

1 0

Paul Vriens : advpack: Remove test that crashes on systems with IE7.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 9d0b69d130b1a6d2db984caab02f1fb1b742a287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0b69d130b1a6d2db984caab… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Nov 24 10:12:58 2006 +0100 advpack: Remove test that crashes on systems with IE7. --- dlls/advpack/tests/advpack.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index ff812f3..be3fb46 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -434,10 +434,14 @@ static void setperusersecvalues_test(voi peruser.bRollback = FALSE; /* try a NULL pPerUser */ - hr = pSetPerUserSecValues(NULL); - todo_wine - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - ok(!OPEN_GUID_KEY(), "Expected guid key to not exist\n"); + if (0) + { + /* This crashes on systems with IE7 */ + hr = pSetPerUserSecValues(NULL); + todo_wine + ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(!OPEN_GUID_KEY(), "Expected guid key to not exist\n"); + } /* at the very least, szGUID must be valid */ peruser.szGUID[0] = '\0';

1 0

Jacek Caban : mshtml: Added Exec(IDM_FONTSIZE) implementation.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 958596b70adb674d6a85606c4c31323394b97304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=958596b70adb674d6a85606c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 10:17:54 2006 +0100 mshtml: Added Exec(IDM_FONTSIZE) implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/editor.c | 233 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 4 + dlls/mshtml/nsiface.idl | 33 ++++++- dlls/mshtml/olecmd.c | 40 +++++++- 5 files changed, 308 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=958596b70adb674d6a856…

1 0

Jacek Caban : mshtml: Added missing break.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: c6d7f14296754bb8f6fa02acfb893c61adbd790b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d7f14296754bb8f6fa02acf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 10:10:54 2006 +0100 mshtml: Added missing break. --- dlls/mshtml/nsembed.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 0f38db4..b348e6c 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -530,6 +530,7 @@ static void nsnode_to_nsstring_rec(nsICo nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMDocument, (void**)&nsdoc); nsIContentSerializer_AppendDocumentStart(serializer, nsdoc, str); nsIDOMDocument_Release(nsdoc); + break; } default: FIXME("Unhandled type %u\n", type);

1 0