October 2008 - Wine-commits

Alistair Leslie-Hughes : oleview: Fixed crash with loading typelib information.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: stable Commit: 8e4fe4db4dbaaf3295ecaf2f201984938b5a357c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e4fe4db4dbaaf3295ecaf2f2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 8 17:52:43 2008 +1000 oleview: Fixed crash with loading typelib information. (cherry picked from commit d4f0685173a0a20b39176540047aab2f251de1aa) --- programs/oleview/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 5dbffb0..e1d39a3 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -677,7 +677,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen if (V_VT(param) == VT_BSTR) { AddToTLDataStrW(tld, wszInvertedComa); - AddToTLDataStrW(tld, V_BSTR(&var)); + AddToTLDataStrW(tld, V_BSTR(param)); AddToTLDataStrW(tld, wszInvertedComa); } else if (VariantChangeType(&var, param, 0, VT_BSTR) == S_OK) AddToTLDataStrW(tld, V_BSTR(&var));

1 0

Vitaly Lipatov : wineboot: Do registry update with wineboot --update in any case.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: stable Commit: d40aded70a4051517ff7d94c827e76e7fd6da3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d40aded70a4051517ff7d94c8… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed Sep 17 16:58:52 2008 +0400 wineboot: Do registry update with wineboot --update in any case. (cherry picked from commit 977b7d398e1eaa13dfaf9f11dbaf3e70678b3449) --- programs/wineboot/wineboot.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 717a175..2201ed5 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -115,7 +115,7 @@ static char *get_wine_inf_path(void) } /* update the timestamp if different from the reference time */ -static BOOL update_timestamp( const char *config_dir, unsigned long timestamp, int force ) +static BOOL update_timestamp( const char *config_dir, unsigned long timestamp ) { BOOL ret = FALSE; int fd, count; @@ -132,7 +132,7 @@ static BOOL update_timestamp( const char *config_dir, unsigned long timestamp, i { buffer[count] = 0; if (!strncmp( buffer, "disable", sizeof("disable")-1 )) goto done; - if (!force && timestamp == strtoul( buffer, NULL, 10 )) goto done; + if (timestamp == strtoul( buffer, NULL, 10 )) goto done; } lseek( fd, 0, SEEK_SET ); ftruncate( fd, 0 ); @@ -681,7 +681,7 @@ static void update_wineprefix( int force ) goto done; } - if (update_timestamp( config_dir, st.st_mtime, force )) + if (update_timestamp( config_dir, st.st_mtime ) || force) { WCHAR *buffer; DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, NULL, 0 );

1 0

Alexandre Julliard : dnsapi: Fix compile without the resolv library.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: stable Commit: 6dd2655ec02129b707de701efca55b57052de711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd2655ec02129b707de701ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 25 16:14:51 2008 +0200 dnsapi: Fix compile without the resolv library. (cherry picked from commit 348b3b3af030712d6a939c611d8b2fe671153d27) --- dlls/dnsapi/dnsapi.h | 5 +++++ dlls/dnsapi/ns_name.c | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index e617012..aa15174 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif static inline void *heap_alloc( SIZE_T size ) { @@ -140,7 +143,9 @@ static inline LPSTR dns_strdup_ua( const char *src ) const char *dns_type_to_str( unsigned short ); +#ifdef HAVE_RESOLV int dns_ns_initparse( const u_char *, int, ns_msg * ); int dns_ns_parserr( ns_msg *, ns_sect, int, ns_rr * ); int dns_ns_name_skip( const u_char **, const u_char * ); int dns_ns_name_uncompress( const u_char *, const u_char *, const u_char *, char *, size_t ); +#endif diff --git a/dlls/dnsapi/ns_name.c b/dlls/dnsapi/ns_name.c index a108c56..4bb3e4a 100644 --- a/dlls/dnsapi/ns_name.c +++ b/dlls/dnsapi/ns_name.c @@ -17,6 +17,8 @@ #include "config.h" +#ifdef HAVE_RESOLV + #include <sys/types.h> #ifdef HAVE_NETINET_IN_H @@ -441,3 +443,5 @@ static int printable(int ch) { return (ch > 0x20 && ch < 0x7f); } + +#endif /* HAVE_RESOLV */

1 0

Alexandre Julliard : Avoid exporting common symbols since that' s broken on Mac OS X.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: stable Commit: 03e18cc988c92559bc361b3903122a6dfc59973d URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e18cc988c92559bc361b390… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 21 14:47:55 2008 +0200 Avoid exporting common symbols since that's broken on Mac OS X. (cherry picked from commit 9c29dbd9873b41f5334a858d8806a256bf00f880) --- dlls/crtdll/crtdll_main.c | 16 ++++++------ dlls/msvcrt/data.c | 56 +++++++++++++++++++++--------------------- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/locale.c | 10 +++--- dlls/msvcrt/mbcs.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 4 +- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c index 8e5cc18..60c4264 100644 --- a/dlls/crtdll/crtdll_main.c +++ b/dlls/crtdll/crtdll_main.c @@ -37,14 +37,14 @@ extern void CDECL __getmainargs( int *argc, char ***argv, char ***envp, int expand_wildcards, int *new_mode ); /* The following data items are not exported from msvcrt */ -unsigned int CRTDLL__basemajor_dll; -unsigned int CRTDLL__baseminor_dll; -unsigned int CRTDLL__baseversion_dll; -unsigned int CRTDLL__cpumode_dll; -unsigned int CRTDLL__osmajor_dll; -unsigned int CRTDLL__osminor_dll; -unsigned int CRTDLL__osmode_dll; -unsigned int CRTDLL__osversion_dll; +unsigned int CRTDLL__basemajor_dll = 0; +unsigned int CRTDLL__baseminor_dll = 0; +unsigned int CRTDLL__baseversion_dll = 0; +unsigned int CRTDLL__cpumode_dll = 0; +unsigned int CRTDLL__osmajor_dll = 0; +unsigned int CRTDLL__osminor_dll = 0; +unsigned int CRTDLL__osmode_dll = 0; +unsigned int CRTDLL__osversion_dll = 0; /* dev_t is a short in crtdll but an unsigned int in msvcrt */ typedef short crtdll_dev_t; diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 578130b..ec2894f 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -29,34 +29,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -int MSVCRT___argc; -unsigned int MSVCRT_basemajor;/* FIXME: */ -unsigned int MSVCRT_baseminor;/* FIXME: */ -unsigned int MSVCRT_baseversion; /* FIXME: */ -unsigned int MSVCRT__commode; -unsigned int MSVCRT__fmode; -unsigned int MSVCRT_osmajor;/* FIXME: */ -unsigned int MSVCRT_osminor;/* FIXME: */ -unsigned int MSVCRT_osmode;/* FIXME: */ -unsigned int MSVCRT__osver; -unsigned int MSVCRT_osversion; /* FIXME: */ -unsigned int MSVCRT__winmajor; -unsigned int MSVCRT__winminor; -unsigned int MSVCRT__winver; -unsigned int MSVCRT___setlc_active; -unsigned int MSVCRT___unguarded_readlc_active; -double MSVCRT__HUGE; -char **MSVCRT___argv; -MSVCRT_wchar_t **MSVCRT___wargv; -char *MSVCRT__acmdln; -MSVCRT_wchar_t *MSVCRT__wcmdln; -char **MSVCRT__environ = 0; -MSVCRT_wchar_t **_wenviron = 0; -char **MSVCRT___initenv = 0; -MSVCRT_wchar_t **MSVCRT___winitenv = 0; -int MSVCRT_app_type; -char* MSVCRT__pgmptr = 0; -WCHAR* MSVCRT__wpgmptr = 0; +int MSVCRT___argc = 0; +unsigned int MSVCRT_basemajor = 0;/* FIXME: */ +unsigned int MSVCRT_baseminor = 0;/* FIXME: */ +unsigned int MSVCRT_baseversion = 0; /* FIXME: */ +unsigned int MSVCRT__commode = 0; +unsigned int MSVCRT__fmode = 0; +unsigned int MSVCRT_osmajor = 0;/* FIXME: */ +unsigned int MSVCRT_osminor = 0;/* FIXME: */ +unsigned int MSVCRT_osmode = 0;/* FIXME: */ +unsigned int MSVCRT__osver = 0; +unsigned int MSVCRT_osversion = 0; /* FIXME: */ +unsigned int MSVCRT__winmajor = 0; +unsigned int MSVCRT__winminor = 0; +unsigned int MSVCRT__winver = 0; +unsigned int MSVCRT___setlc_active = 0; +unsigned int MSVCRT___unguarded_readlc_active = 0; +double MSVCRT__HUGE = 0; +char **MSVCRT___argv = NULL; +MSVCRT_wchar_t **MSVCRT___wargv = NULL; +char *MSVCRT__acmdln = NULL; +MSVCRT_wchar_t *MSVCRT__wcmdln = NULL; +char **MSVCRT__environ = NULL; +MSVCRT_wchar_t **_wenviron = NULL; +char **MSVCRT___initenv = NULL; +MSVCRT_wchar_t **MSVCRT___winitenv = NULL; +int MSVCRT_app_type = 0; +char* MSVCRT__pgmptr = NULL; +WCHAR* MSVCRT__wpgmptr = NULL; /* Get a snapshot of the current environment * and construct the __p__environ array diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f85afd3..cd15e40 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -75,7 +75,7 @@ typedef struct { static ioinfo MSVCRT_fdesc[MSVCRT_MAX_FILES]; -MSVCRT_FILE MSVCRT__iob[3]; +MSVCRT_FILE MSVCRT__iob[3] = { { 0 } }; static int MSVCRT_fdstart = 3; /* first unallocated fd */ static int MSVCRT_fdend = 3; /* highest allocated fd */ diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e679a28..6447436 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -43,11 +43,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); */ #define MAX_ELEM_LEN 64 /* Max length of country/language/CP string */ #define MAX_LOCALE_LENGTH 256 -char MSVCRT_current_lc_all[MAX_LOCALE_LENGTH]; -LCID MSVCRT_current_lc_all_lcid; -int MSVCRT___lc_codepage; -int MSVCRT___lc_collate_cp; -HANDLE MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1]; +char MSVCRT_current_lc_all[MAX_LOCALE_LENGTH] = { 0 }; +LCID MSVCRT_current_lc_all_lcid = 0; +int MSVCRT___lc_codepage = 0; +int MSVCRT___lc_collate_cp = 0; +HANDLE MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; /* MT */ #define LOCK_LOCALE _mlock(_SETLOCALE_LOCK); diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 4acc52f..c99d167 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -unsigned char MSVCRT_mbctype[257]; +unsigned char MSVCRT_mbctype[257] = { 0 }; static int g_mbcp_is_multibyte = 0; int MSVCRT___mb_cur_max = 1; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cda3476..564c55b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); WINE_DECLARE_DEBUG_CHANNEL(relay); -KSYSTEM_TIME KeTickCount; +KSYSTEM_TIME KeTickCount = { 0, 0, 0 }; typedef struct _KSERVICE_TABLE_DESCRIPTOR { @@ -50,7 +50,7 @@ typedef struct _KSERVICE_TABLE_DESCRIPTOR PUCHAR Number; } KSERVICE_TABLE_DESCRIPTOR, *PKSERVICE_TABLE_DESCRIPTOR; -KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4]; +KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN);

1 0

Kirill K. Smirnov : shell32: Avoid usage of undefined xdg_results variable, since XDG_UserDirLookup() always corrupts it.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: stable Commit: e57c00776775863ced2e1f5b0e5592ab7b6e8b77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57c00776775863ced2e1f5b0… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Jul 19 00:38:03 2008 +0400 shell32: Avoid usage of undefined xdg_results variable, since XDG_UserDirLookup() always corrupts it. (cherry picked from commit de3afabf084c3ee3e5b94d9f61bfec69ec4251dc) --- dlls/shell32/shellpath.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index fb0c309..362a25a 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2139,7 +2139,7 @@ static void _SHCreateSymbolicLinks(void) const char *pszHome; HRESULT hr; const unsigned int num = sizeof(xdg_dirs) / sizeof(xdg_dirs[0]); - char ** xdg_results = NULL; + char ** xdg_results; char * xdg_desktop_dir; /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ @@ -2149,7 +2149,8 @@ static void _SHCreateSymbolicLinks(void) pszPersonal = wine_get_unix_file_name(wszTempPath); if (!pszPersonal) return; - XDG_UserDirLookup(xdg_dirs, num, &xdg_results); + hr = XDG_UserDirLookup(xdg_dirs, num, &xdg_results); + if (FAILED(hr)) xdg_results = NULL; pszHome = getenv("HOME"); if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) {

1 0

Lei Zhang : sane.ds: Replace wsprintfW with sprintfW.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: stable Commit: d50bcaa378759de33aa9d459027fd0f4e9f050ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50bcaa378759de33aa9d4590… Author: Lei Zhang <thestig(a)google.com> Date: Fri Sep 5 08:21:32 2008 -0700 sane.ds: Replace wsprintfW with sprintfW. (cherry picked from commit 887aa9eb3dd3fc22d4f50df125080f5fc82b583c) --- dlls/sane.ds/ui.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 83006c5..236a91d 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -36,6 +36,7 @@ #include "sane_i.h" #include "wine/debug.h" #include "resource.h" +#include "wine/unicode.h" #ifdef SONAME_LIBSANE @@ -622,7 +623,7 @@ static void UpdateRelevantEdit(HWND hwnd, const SANE_Option_Descriptor *opt, else si = position; - len = wsprintfW( buffer, formatW, si ); + len = sprintfW( buffer, formatW, si ); } else if (opt->type == SANE_TYPE_FIXED) { @@ -636,7 +637,7 @@ static void UpdateRelevantEdit(HWND hwnd, const SANE_Option_Descriptor *opt, else dd = position * 0.01; - len = wsprintfW( buffer, formatW, dd ); + len = sprintfW( buffer, formatW, dd ); } else return;

1 0

Lei Zhang : version: Prevent infinite looping in VersionInfo32_FindChild.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: stable Commit: ffa493e780c4a7a3dbf9398e46ca28289b535894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa493e780c4a7a3dbf9398e4… Author: Lei Zhang <thestig(a)google.com> Date: Mon Oct 13 14:29:32 2008 -0700 version: Prevent infinite looping in VersionInfo32_FindChild. (cherry picked from commit 69871bedf1d787f25fe31df6075bf168d871cc3b) --- dlls/version/info.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 395895b..51e25b3 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -664,6 +664,7 @@ static const VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( const VS_VERSION if (!strncmpiW( child->szKey, szKey, cbKey ) && !child->szKey[cbKey]) return child; + if (!(child->wLength)) return NULL; child = VersionInfo32_Next( child ); }

1 0

Juan Lang : crypt32: Free memory using the correct function on failure.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: stable Commit: d27f41fc311621ae450e55313975f74d6c14204f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27f41fc311621ae450e55313… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 15 16:39:09 2008 -0700 crypt32: Free memory using the correct function on failure. (cherry picked from commit 1799ceb8c1a0764d9ae8077207f661ec55c01c07) --- dlls/crypt32/encode.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index ee42a3d..0d62b02 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1561,6 +1561,14 @@ static BOOL CRYPT_AsnEncodeUnicodeStringCoerce(const CERT_NAME_VALUE *value, return ret; } +static void CRYPT_FreeSpace(PCRYPT_ENCODE_PARA pEncodePara, LPVOID pv) +{ + if (pEncodePara && pEncodePara->pfnFree) + pEncodePara->pfnFree(pv); + else + LocalFree(pv); +} + static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -1602,7 +1610,7 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, } } if (!ret && (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)) - CryptMemFree(*(BYTE **)pbEncoded); + CRYPT_FreeSpace(pEncodePara, *(BYTE **)pbEncoded); } } return ret; @@ -1656,7 +1664,7 @@ static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value, } } if (!ret && (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)) - CryptMemFree(*(BYTE **)pbEncoded); + CRYPT_FreeSpace(pEncodePara, *(BYTE **)pbEncoded); } } return ret; @@ -1703,7 +1711,7 @@ static BOOL CRYPT_AsnEncodeIA5String(const CERT_NAME_VALUE *value, } } if (!ret && (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)) - CryptMemFree(*(BYTE **)pbEncoded); + CRYPT_FreeSpace(pEncodePara, *(BYTE **)pbEncoded); } } return ret;

1 0

Rob Shearman : shell32: Free the correct pointer in XDG_UserDirLookup.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: stable Commit: 7d44bdc1b84170cc37e5144f74a79a8114ed170a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d44bdc1b84170cc37e5144f7… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jun 19 07:51:26 2008 +0100 shell32: Free the correct pointer in XDG_UserDirLookup. out_ptr is a stack variable. *out_ptr is heap allocated and is what was meant to be freed. (cherry picked from commit ff838008393cf57431013aac84d919e5c18c75d5) --- dlls/shell32/xdg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index c578b90..6eb13a2 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -963,7 +963,7 @@ xdg_user_dir_lookup_error: if (FAILED(hr)) { for (i = 0; i < num_dirs; i++) HeapFree(GetProcessHeap(), 0, out[i]); - HeapFree(GetProcessHeap(), 0, out_ptr); + HeapFree(GetProcessHeap(), 0, *out_ptr); } return hr; }

1 0

Jeff Zaroyko : ws2_32: Ignore lpFrom for connected sockets.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: stable Commit: a0ee64439e9c1c0bbddf5c912100a9dbeb640601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ee64439e9c1c0bbddf5c912… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Jun 13 18:05:22 2008 +1000 ws2_32: Ignore lpFrom for connected sockets. If the the socket is connected and lpFrom is not NULL, Linux will set msg_namelen to zero and ignore msg_name in recvfrom so don't try try to update lpFrom. (cherry picked from commit 30e6b81dd1890ce21e9a5bb22d251887fbd8188a) --- dlls/ws2_32/socket.c | 12 +++++- dlls/ws2_32/tests/sock.c | 103 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 31be2b9..989af4a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1103,7 +1103,17 @@ static int WS2_recv( int fd, struct iovec* iov, int count, if ( (n = recvmsg(fd, &hdr, *lpFlags)) == -1 ) return -1; - if ( lpFrom && + /* if this socket is connected and lpFrom is not NULL, Linux doesn't give us + * msg_name and msg_namelen from recvmsg, but it does set msg_namelen to zero. + * + * quoting linux 2.6 net/ipv4/tcp.c: + * "According to UNIX98, msg_name/msg_namelen are ignored + * on connected socket. I was just happy when found this 8) --ANK" + * + * likewise MSDN says that lpFrom and lpFromlen are ignored for + * connection-oriented sockets, so don't try to update lpFrom. + */ + if ( lpFrom && hdr.msg_namelen && ws_sockaddr_u2ws( &unix_sockaddr.addr, lpFrom, lpFromlen ) != 0 ) { /* The from buffer was too small, but we read the data diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6ba6667..c2c56ae 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -31,7 +31,7 @@ #include <winerror.h> #define MAX_CLIENTS 4 /* Max number of clients */ -#define NUM_TESTS 3 /* Number of tests performed */ +#define NUM_TESTS 4 /* Number of tests performed */ #define FIRST_CHAR 'A' /* First character in transferred pattern */ #define BIND_SLEEP 10 /* seconds to wait between attempts to bind() */ #define BIND_TRIES 6 /* Number of bind() attempts */ @@ -269,6 +269,16 @@ static int do_synchronous_recv ( SOCKET s, char *buf, int buflen, int recvlen ) return p - buf; } +static int do_synchronous_recvfrom ( SOCKET s, char *buf, int buflen,int flags,struct sockaddr *from, socklen_t *fromlen, int recvlen ) +{ + char* last = buf + buflen, *p; + int n = 1; + for ( p = buf; n > 0 && p < last; p += n ) + n = recvfrom ( s, p, min ( recvlen, last - p ), 0, from, fromlen ); + wsa_ok ( n, 0 <=, "do_synchronous_recv (%x): error %d:\n" ); + return p - buf; +} + /* * Call this routine right after thread startup. * SO_OPENTYPE must by 0, regardless what the server did. @@ -627,6 +637,76 @@ static VOID WINAPI simple_client ( client_params *par ) } /* + * simple_mixed_client: mixing send and recvfrom + */ +static VOID WINAPI simple_mixed_client ( client_params *par ) +{ + test_params *gen = par->general; + client_memory *mem; + int n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; + char *p; + socklen_t fromLen = sizeof(mem->addr); + struct sockaddr test; + + id = GetCurrentThreadId(); + trace ( "simple_client (%x): starting\n", id ); + /* wait here because we want to call set_so_opentype before creating a socket */ + WaitForSingleObject ( server_ready, INFINITE ); + trace ( "simple_client (%x): server ready\n", id ); + + check_so_opentype (); + set_so_opentype ( FALSE ); /* non-overlapped */ + client_start ( par ); + mem = TlsGetValue ( tls ); + + /* Connect */ + wsa_ok ( connect ( mem->s, (struct sockaddr*) &mem->addr, sizeof ( mem->addr ) ), + 0 ==, "simple_client (%x): connect error: %d\n" ); + ok ( set_blocking ( mem->s, TRUE ) == 0, + "simple_client (%x): failed to set blocking mode\n", id ); + trace ( "simple_client (%x) connected\n", id ); + + /* send data to server */ + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + ok ( n_sent == n_expected, + "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); + + /* shutdown send direction */ + wsa_ok ( shutdown ( mem->s, SD_SEND ), 0 ==, "simple_client (%x): shutdown failed: %d\n" ); + + /* this shouldn't change, since lpFrom, is not updated on + connection oriented sockets - exposed by bug 11640 + */ + ((struct sockaddr_in*)&test)->sin_addr.s_addr = inet_addr("0.0.0.0"); + + /* Receive data echoed back & check it */ + n_recvd = do_synchronous_recvfrom ( mem->s, + mem->recv_buf, + n_expected, + 0, + (struct sockaddr *)&test, + &fromLen, + par->buflen ); + ok ( n_recvd == n_expected, + "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); + + /* check that lpFrom was not updated */ + ok(0 == + strcmp( + inet_ntoa(((struct sockaddr_in*)&test)->sin_addr), + "0.0.0.0"), "lpFrom shouldn't be updated on connection oriented sockets\n"); + + /* check data */ + p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( p == NULL, "simple_client (%x): test pattern error: %d\n", id, p - mem->recv_buf); + + /* cleanup */ + read_zero_bytes ( mem->s ); + trace ( "simple_client (%x) exiting\n", id ); + client_stop (); +} + +/* * event_client: An event-driven client */ static void WINAPI event_client ( client_params *par ) @@ -1013,6 +1093,27 @@ static test_setup tests [NUM_TESTS] = 0, 128 } + }, + /* Test 3: synchronous mixed client and server */ + { + { + STD_STREAM_SOCKET, + 2048, + 16, + 2 + }, + simple_server, + { + NULL, + 0, + 64 + }, + simple_mixed_client, + { + NULL, + 0, + 128 + } } };

1 0