September 2010 - Wine-commits

Hans Leidekker : msi: Treat empty string as NULL in MsiGetSummaryInformationW.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 259b5fdfa6036a1f4d782d215c507c9aaeb33eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=259b5fdfa6036a1f4d782d215… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 09:58:12 2010 +0200 msi: Treat empty string as NULL in MsiGetSummaryInformationW. --- dlls/msi/suminfo.c | 2 +- dlls/msi/tests/suminfo.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 902a61f..b174e5b 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -469,7 +469,7 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, if( !pHandle ) return ERROR_INVALID_PARAMETER; - if( szDatabase ) + if( szDatabase && szDatabase[0] ) { LPCWSTR persist = uiUpdateCount ? MSIDBOPEN_TRANSACT : MSIDBOPEN_READONLY; diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index a0b225b..07202a3 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -86,7 +86,18 @@ static void test_suminfo(void) ok(r == ERROR_INVALID_PARAMETER, "MsiGetSummaryInformation wrong error\n"); r = MsiGetSummaryInformation(hdb, NULL, 0, &hsuminfo); - ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed\n"); + ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed %u\n", r); + + r = MsiCloseHandle(hsuminfo); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + r = MsiGetSummaryInformation(0, "", 0, &hsuminfo); + todo_wine + ok(r == ERROR_INSTALL_PACKAGE_INVALID || r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, + "MsiGetSummaryInformation failed %u\n", r); + + r = MsiGetSummaryInformation(hdb, "", 0, &hsuminfo); + ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed %u\n", r); r = MsiSummaryInfoGetPropertyCount(0, NULL); ok(r == ERROR_INVALID_HANDLE, "getpropcount failed\n");

1 0

Hans Leidekker : msvcrt: Implement wcsnlen.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 23fdfbc39253736ae07c13631ab0dd089117a642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23fdfbc39253736ae07c13631… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 09:57:52 2010 +0200 msvcrt: Implement wcsnlen. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 12 ++++++++++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7b8be69..79517e5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1644,7 +1644,7 @@ @ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp @ cdecl wcsncpy(ptr wstr long) msvcrt.wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) msvcrt.wcsncpy_s -@ stub wcsnlen +@ cdecl wcsnlen(wstr long) msvcrt.wcsnlen @ cdecl wcspbrk(wstr wstr) msvcrt.wcspbrk @ cdecl wcsrchr(wstr long) msvcrt.wcsrchr @ stub wcsrtombs diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 27c4088..3795264 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1498,7 +1498,7 @@ @ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp @ cdecl wcsncpy(ptr wstr long) msvcrt.wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) msvcrt.wcsncpy_s -@ stub wcsnlen +@ cdecl wcsnlen(wstr long) msvcrt.wcsnlen @ cdecl wcspbrk(wstr wstr) msvcrt.wcspbrk @ cdecl wcsrchr(wstr long) msvcrt.wcsrchr @ stub wcsrtombs diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 00ccade..c0ed8b6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1482,7 +1482,7 @@ @ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp @ cdecl wcsncpy(ptr wstr long) msvcrt.wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) msvcrt.wcsncpy_s -@ stub wcsnlen +@ cdecl wcsnlen(wstr long) msvcrt.wcsnlen @ cdecl wcspbrk(wstr wstr) msvcrt.wcspbrk @ cdecl wcsrchr(wstr long) msvcrt.wcsrchr @ stub wcsrtombs diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5325227..341093b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1444,7 +1444,7 @@ @ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp @ cdecl wcsncpy(ptr wstr long) ntdll.wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s -# stub wcsnlen +@ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk @ cdecl wcsrchr(wstr long) ntdll.wcsrchr # stub wcsrtombs diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d192c23..47a50b6 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1737,3 +1737,15 @@ unsigned __int64 CDECL MSVCRT__wcstoui64(const MSVCRT_wchar_t *nptr, { return MSVCRT__wcstoui64_l(nptr, endptr, base, NULL); } + +/****************************************************************** + * wcsnlen (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_wcsnlen(const MSVCRT_wchar_t *s, MSVCRT_size_t maxlen) +{ + MSVCRT_size_t i; + + for (i = 0; i < maxlen; i++) + if (!s[i]) break; + return i; +}

1 0

Francois Gouget : taskkill: The taskkill debug channel is unused so remove it.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 3cbf7097a9d3f899f6bb18883506f8f110cf70fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cbf7097a9d3f899f6bb18883… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:18 2010 +0200 taskkill: The taskkill debug channel is unused so remove it. --- programs/taskkill/taskkill.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index c3080e5..5508bfe 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -21,12 +21,10 @@ #include <windows.h> #include <psapi.h> -#include <wine/debug.h> #include <wine/unicode.h> #include "taskkill.h" -WINE_DEFAULT_DEBUG_CHANNEL(taskkill); int force_termination;

1 0

Francois Gouget : ktmw32: The ktm debug channel is unused so remove it.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: c71e5e67058fb6732fd9501b0375d565ac40295f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71e5e67058fb6732fd9501b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:24 2010 +0200 ktmw32: The ktm debug channel is unused so remove it. --- dlls/ktmw32/ktmw32_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 960def2..738b11d 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -23,9 +23,7 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(ktm); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {

1 0

Francois Gouget : mscoree: Make find_mono_dll() static.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 5c046d13d5f47d658cdc0dd2b5b84aa5516f22ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c046d13d5f47d658cdc0dd2b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:44 2010 +0200 mscoree: Make find_mono_dll() static. --- dlls/mscoree/mscoree_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7cc3887..980bed1 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int* abi_version) +static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int* abi_version) { static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; static const WCHAR libmono_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','.','d','l','l',0};

1 0

Francois Gouget : gameux/tests: Make test_install_uninstall_game() and _isFileExists() static.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 0c7c1de8d77c8db6f5f6fb2da207b9954e9bb127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7c1de8d77c8db6f5f6fb2da… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:49 2010 +0200 gameux/tests: Make test_install_uninstall_game() and _isFileExists() static. --- dlls/gameux/tests/gameexplorer.c | 3 ++- dlls/gameux/tests/gamestatistics.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 9ce0e39..ba22256 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -607,7 +607,8 @@ static void test_add_remove_game(void) IGameExplorer_Release(ge); } } -void test_install_uninstall_game(void) + +static void test_install_uninstall_game(void) { static const GUID applicationId = { 0x17A6558E, 0x60BE, 0x4078, { 0xB6, 0x6F, 0x9C, 0x3A, 0xDA, 0x2A, 0x32, 0xE6 }}; diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 29bfcf3..eac4398 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -168,7 +168,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta * TRUE file exists * FALSE file does not exist */ -BOOL _isFileExists(LPCWSTR lpFile) +static BOOL _isFileExists(LPCWSTR lpFile) { HANDLE hFile = CreateFileW(lpFile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);

1 0

Francois Gouget : ws2_32: Make WS2_AcceptEx() and WS2_GetAcceptExSockaddrs( ) static.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: d33ff209b3dd84150a28636b6341e32c835a0d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33ff209b3dd84150a28636b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:39 2010 +0200 ws2_32: Make WS2_AcceptEx() and WS2_GetAcceptExSockaddrs() static. --- dlls/ws2_32/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b01b623..f605d0d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1846,7 +1846,7 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, /*********************************************************************** * AcceptEx */ -BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD dest_len, +static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD dest_len, DWORD local_addr_len, DWORD rem_addr_len, LPDWORD received, LPOVERLAPPED overlapped) { @@ -1945,7 +1945,7 @@ BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD des /*********************************************************************** * GetAcceptExSockaddrs */ -void WINAPI WS2_GetAcceptExSockaddrs(PVOID buffer, DWORD data_size, DWORD local_size, DWORD remote_size, +static void WINAPI WS2_GetAcceptExSockaddrs(PVOID buffer, DWORD data_size, DWORD local_size, DWORD remote_size, struct WS_sockaddr **local_addr, LPINT local_addr_len, struct WS_sockaddr **remote_addr, LPINT remote_addr_len) {

1 0

Thomas Mullaly : urlmon: Improve IUri support for mk: URIs.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: da1ceb1154eb88ceff1868ec44a4e05e7f3f3d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1ceb1154eb88ceff1868ec4… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 27 18:00:21 2010 -0400 urlmon: Improve IUri support for mk: URIs. --- dlls/urlmon/tests/uri.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 5 ++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3e6f5a8..0453441 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4209,6 +4209,62 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_ABOUT,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + { "mk:@MSITStore:C:\\Program Files/AutoCAD 2008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",0,S_OK,FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY| + Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + FALSE, + { + {"mk:@MSITStore:C:\\Program%20Files/AutoCAD%202008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:C:\\Program%20Files/AutoCAD%202008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"@MSITStore:C:\\Program%20Files/AutoCAD%202008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"@MSITStore:C:\\Program%20Files/AutoCAD%202008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:C:\\Program Files/AutoCAD 2008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"mk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_MK,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "mk:@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",0,S_OK,FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY| + Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + FALSE, + { + {"mk:@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"mk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_MK,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index ef66186..2aee38a 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3081,6 +3081,11 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla if(!computeOnly) uri->canon_uri[uri->canon_len] = *ptr; ++uri->canon_len; + } else if(data->scheme_type == URL_SCHEME_MK && *ptr == '\\') { + /* MK URIs don't get '\\' percent encoded. */ + if(!computeOnly) + uri->canon_uri[uri->canon_len] = *ptr; + ++uri->canon_len; } else { if(!computeOnly) pct_encode_val(*ptr, uri->canon_uri+uri->canon_len);

1 0

Juan Lang : ws2_32: Implement WSAIoctl for SIO_ROUTING_INTERFACE_QUERY.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 9addae9d663ec0cff1e748190c12c4203dbbf5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9addae9d663ec0cff1e748190… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 13:18:12 2010 -0700 ws2_32: Implement WSAIoctl for SIO_ROUTING_INTERFACE_QUERY. --- dlls/ws2_32/socket.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 15 +++------ 2 files changed, 85 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f605d0d..22e6138 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3257,6 +3257,86 @@ INT WINAPI WSAIoctl(SOCKET s, release_sock_fd(s, fd); break; } + case WS_SIO_ROUTING_INTERFACE_QUERY: + { + struct WS_sockaddr *daddr = (struct WS_sockaddr *)lpvInBuffer; + struct WS_sockaddr_in *daddr_in = (struct WS_sockaddr_in *)daddr; + struct WS_sockaddr_in *saddr_in = (struct WS_sockaddr_in *)lpbOutBuffer; + MIB_IPFORWARDROW row; + PMIB_IPADDRTABLE ipAddrTable = NULL; + DWORD size, i, found_index; + + TRACE("-> WS_SIO_ROUTING_INTERFACE_QUERY request\n"); + + if (!lpvInBuffer) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (cbInBuffer < sizeof(struct WS_sockaddr)) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (!lpbOutBuffer) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (!lpcbBytesReturned) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (daddr->sa_family != AF_INET) + { + FIXME("unsupported address family %d\n", daddr->sa_family); + WSASetLastError(WSAEAFNOSUPPORT); + return SOCKET_ERROR; + } + if (cbOutBuffer < sizeof(struct WS_sockaddr_in)) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (GetBestRoute(daddr_in->sin_addr.S_un.S_addr, 0, &row) != NOERROR) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (GetIpAddrTable(NULL, &size, FALSE) != ERROR_INSUFFICIENT_BUFFER) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + ipAddrTable = HeapAlloc(GetProcessHeap(), 0, size); + if (GetIpAddrTable(ipAddrTable, &size, FALSE)) + { + HeapFree(GetProcessHeap(), 0, ipAddrTable); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + for (i = 0, found_index = ipAddrTable->dwNumEntries; + i < ipAddrTable->dwNumEntries; i++) + { + if (ipAddrTable->table[i].dwIndex == row.dwForwardIfIndex) + found_index = i; + } + if (found_index == ipAddrTable->dwNumEntries) + { + ERR("no matching IP address for interface %d\n", + row.dwForwardIfIndex); + HeapFree(GetProcessHeap(), 0, ipAddrTable); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + saddr_in->sin_family = AF_INET; + saddr_in->sin_addr.S_un.S_addr = ipAddrTable->table[found_index].dwAddr; + saddr_in->sin_port = 0; + *lpcbBytesReturned = sizeof(struct WS_sockaddr_in); + HeapFree(GetProcessHeap(), 0, ipAddrTable); + return 0; + } case WS_SIO_UDP_CONNRESET: FIXME("WS_SIO_UDP_CONNRESET stub\n"); break; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index abe0934..25bda61 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4290,17 +4290,14 @@ static void test_sioRoutingInterfaceQuery(void) } ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, NULL, 0, NULL, 0, NULL, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "expected WSAEFAULT, got %d\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, NULL, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "expected WSAEFAULT, got %d\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, &bytesReturned, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && (WSAGetLastError() == WSAEFAULT /* Win98 */ || WSAGetLastError() == WSAEINVAL /* NT4 */|| @@ -4310,7 +4307,6 @@ static void test_sioRoutingInterfaceQuery(void) sin.sin_family = AF_INET; ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, &bytesReturned, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && (WSAGetLastError() == WSAEFAULT /* Win98 */ || WSAGetLastError() == WSAEINVAL), @@ -4318,24 +4314,23 @@ static void test_sioRoutingInterfaceQuery(void) sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, &bytesReturned, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && (WSAGetLastError() == WSAEINVAL /* NT4 */ || WSAGetLastError() == WSAEFAULT), "expected WSAEINVAL or WSAEFAULT, got %d\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), &sout, sizeof(sout), &bytesReturned, NULL, NULL); - todo_wine ok(!ret || broken(WSAGetLastError() == WSAEINVAL /* NT4 */), "WSAIoctl failed: %d\n", WSAGetLastError()); if (!ret) { ok(sout.sin_family == AF_INET, "expected AF_INET, got %d\n", sout.sin_family); - if (sout.sin_family == AF_INET) - ok(sout.sin_addr.s_addr == htonl(INADDR_LOOPBACK), - "expected %08x, got %08x\n", htonl(INADDR_LOOPBACK), - htonl(sout.sin_addr.s_addr)); + /* We expect the source address to be INADDR_LOOPBACK as well, but + * there's no guarantee that a route to the loopback address exists, + * so rather than introduce spurious test failures we do not test the + * source address. + */ } closesocket(sock); }

1 0

Michael Stefaniuc : crypt32: Remove redundant NULL check before CryptMemFree (Smatch).
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: ef247562914f4d04debf776e0a360949710737ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef247562914f4d04debf776e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:44:02 2010 +0200 crypt32: Remove redundant NULL check before CryptMemFree (Smatch). --- dlls/crypt32/message.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index b57c407..51b874e 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -523,10 +523,9 @@ BOOL WINAPI CryptSignMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara, } else ret = FALSE; - if (crlBlob) - CryptMemFree(crlBlob); - if (certBlob) - CryptMemFree(certBlob); + + CryptMemFree(crlBlob); + CryptMemFree(certBlob); if (freeProv) CryptReleaseContext(hCryptProv, 0); return ret;

1 0