December 2010 - Wine-commits

Alexandre Julliard : kernel32: Use RtlDosPathNameToNtPathName_U to validate the path in GetVolumeInformationW .
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 56c2c8c75c6819a8654453b17738964094ede701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c2c8c75c6819a8654453b17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 12:17:35 2010 +0200 kernel32: Use RtlDosPathNameToNtPathName_U to validate the path in GetVolumeInformationW. (cherry picked from commit ee0f0da69b3a99ce6b682b38fc6910a253ca23f8) --- dlls/kernel32/tests/volume.c | 9 ++++----- dlls/kernel32/volume.c | 35 +++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index f52c592..534f0e3 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -324,7 +324,6 @@ static void test_GetVolumeInformationA(void) ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); - todo_wine ok(ret, "GetVolumeInformationA root failed, last error %u\n", GetLastError()); /* check for error on no trailing \ when current dir is subdir (windows) of queried drive */ @@ -392,7 +391,7 @@ static void test_GetVolumeInformationA(void) /* \ is current on root drive, call succeeds */ ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); - todo_wine ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); + ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); /* again, SetCurrentDirectory on another drive does not matter */ ret = SetCurrentDirectory(Root_Slash); @@ -403,7 +402,7 @@ static void test_GetVolumeInformationA(void) /* \ is current on root drive, call succeeds */ ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); - todo_wine ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); + ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); } /* try null root directory to return "root of the current directory" */ @@ -420,7 +419,7 @@ static void test_GetVolumeInformationA(void) SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(Root_UNC, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); - todo_wine ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), + ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError()); /* try again with device name space */ @@ -428,7 +427,7 @@ static void test_GetVolumeInformationA(void) SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(Root_UNC, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); - todo_wine ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), + ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError()); /* try again with a directory off the root - should generate error */ diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 7596864..002a7e6 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -513,26 +513,29 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, static const WCHAR fat32W[] = {'F','A','T','3','2',0}; static const WCHAR ntfsW[] = {'N','T','F','S',0}; static const WCHAR cdfsW[] = {'C','D','F','S',0}; + static const WCHAR default_rootW[] = {'\\',0}; WCHAR device[] = {'\\','\\','.','\\','A',':',0}; HANDLE handle; + UNICODE_STRING nt_name; + WCHAR *p; enum fs_type type = FS_UNKNOWN; + BOOL ret = FALSE; - if (!root) + if (!root) root = default_rootW; + if (!RtlDosPathNameToNtPathName_U( root, &nt_name, NULL, NULL )) { - WCHAR path[MAX_PATH]; - GetCurrentDirectoryW( MAX_PATH, path ); - device[4] = path[0]; + SetLastError( ERROR_PATH_NOT_FOUND ); + return FALSE; } - else + /* there must be exactly one backslash in the name, at the end */ + p = memchrW( nt_name.Buffer + 4, '\\', (nt_name.Length - 4) / sizeof(WCHAR) ); + if (p != nt_name.Buffer + nt_name.Length / sizeof(WCHAR) - 1) { - if (!root[0] || root[1] != ':' || root[lstrlenW(root)-1] != '\\' ) - { - SetLastError( ERROR_INVALID_NAME ); - return FALSE; - } - device[4] = root[0]; + SetLastError( ERROR_INVALID_NAME ); + goto done; } + device[4] = nt_name.Buffer[4]; /* try to open the device */ @@ -566,7 +569,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, } CloseHandle( handle ); TRACE( "%s: found fs type %d\n", debugstr_w(device), type ); - if (type == FS_ERROR) return FALSE; + if (type == FS_ERROR) goto done; if (label && label_len) VOLUME_GetSuperblockLabel( device, type, superblock, label, label_len ); if (serial) *serial = VOLUME_GetSuperblockSerial( device, type, superblock ); @@ -581,7 +584,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, case DRIVE_UNKNOWN: case DRIVE_NO_ROOT_DIR: SetLastError( ERROR_NOT_READY ); - return FALSE; + goto done; case DRIVE_REMOVABLE: case DRIVE_FIXED: case DRIVE_REMOTE: @@ -618,7 +621,11 @@ fill_fs_info: /* now fill in the information that depends on the file system ty if (flags) *flags = FILE_CASE_PRESERVED_NAMES; break; } - return TRUE; + ret = TRUE; + +done: + RtlFreeUnicodeString( &nt_name ); + return ret; }

1 0

Alexandre Julliard : configure: Disable Fortify if it's enabled by default, it's too broken.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: ce6a613147264988fc065cc1b9d578d7d1cc9b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6a613147264988fc065cc1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 17:13:57 2010 +0200 configure: Disable Fortify if it's enabled by default, it's too broken. (cherry picked from commit 105793bff75f6a869bd9ccfb390b2f88fa861235) --- configure | 33 +++++++++++++++++++++++++++++++++ configure.ac | 13 +++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ab8f4dd..1832286 100755 --- a/configure +++ b/configure @@ -11941,6 +11941,39 @@ $as_echo "#define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__))" >>con fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the need to disable Fortify" >&5 +$as_echo_n "checking for the need to disable Fortify... " >&6; } +if test "${ac_cv_c_fortify_enabled+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <string.h> +int +main () +{ +#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0 +#error Fortify enabled +#endif + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_fortify_enabled=no +else + ac_cv_c_fortify_enabled=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_fortify_enabled" >&5 +$as_echo "$ac_cv_c_fortify_enabled" >&6; } +if test "$ac_cv_c_fortify_enabled" = yes +then + EXTRACFLAGS="$EXTRACFLAGS -D_FORTIFY_SOURCE=0" +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether external symbols need an underscore prefix" >&5 $as_echo_n "checking whether external symbols need an underscore prefix... " >&6; } if test "${ac_cv_c_extern_prefix+set}" = set; then : diff --git a/configure.ac b/configure.ac index 76999c3..8d1d298 100644 --- a/configure.ac +++ b/configure.ac @@ -1626,6 +1626,19 @@ then fi fi +dnl **** Disable Fortify, it has too many false positives + +AC_CACHE_CHECK([for the need to disable Fortify], ac_cv_c_fortify_enabled, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], +[[#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0 +#error Fortify enabled +#endif]])], + [ac_cv_c_fortify_enabled=no],[ac_cv_c_fortify_enabled=yes])) +if test "$ac_cv_c_fortify_enabled" = yes +then + EXTRACFLAGS="$EXTRACFLAGS -D_FORTIFY_SOURCE=0" +fi + dnl **** Check for underscore on external symbols **** AC_CACHE_CHECK([whether external symbols need an underscore prefix], ac_cv_c_extern_prefix,

1 0

Alexandre Julliard : configure: More aggressive disabling of Fortify.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 07ccfd952eb709fd264fdc88835316bad17d45cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ccfd952eb709fd264fdc888… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 14:25:01 2010 +0200 configure: More aggressive disabling of Fortify. (cherry picked from commit b10fb86a91c0fcef9db236076929842c8dc45baa) --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1832286..b92e6a0 100755 --- a/configure +++ b/configure @@ -11970,7 +11970,7 @@ fi $as_echo "$ac_cv_c_fortify_enabled" >&6; } if test "$ac_cv_c_fortify_enabled" = yes then - EXTRACFLAGS="$EXTRACFLAGS -D_FORTIFY_SOURCE=0" + CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" fi diff --git a/configure.ac b/configure.ac index 8d1d298..85c6017 100644 --- a/configure.ac +++ b/configure.ac @@ -1636,7 +1636,7 @@ AC_CACHE_CHECK([for the need to disable Fortify], ac_cv_c_fortify_enabled, [ac_cv_c_fortify_enabled=no],[ac_cv_c_fortify_enabled=yes])) if test "$ac_cv_c_fortify_enabled" = yes then - EXTRACFLAGS="$EXTRACFLAGS -D_FORTIFY_SOURCE=0" + CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" fi dnl **** Check for underscore on external symbols ****

1 0

Alexandre Julliard : kernel32: Fix a FAT format sanity check for floppies.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 277061efb96784e935d02911deb620426dae1bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=277061efb96784e935d02911d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 12:40:54 2010 +0200 kernel32: Fix a FAT format sanity check for floppies. (cherry picked from commit 1379269587e6f158a22e2bc784861a881e23f3d1) --- dlls/kernel32/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 002a7e6..9810260 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -336,7 +336,7 @@ static enum fs_type VOLUME_ReadFATSuperblock( HANDLE handle, BYTE *buff ) reasonable = num_boot_sectors < total_sectors && num_fats < 16 && bytes_per_sector >= 512 && bytes_per_sector % 512 == 0 && - sectors_per_cluster > 1; + sectors_per_cluster >= 1; if (!reasonable) return FS_UNKNOWN; sectors = total_sectors - num_boot_sectors - num_fats * sect_per_fat - (num_root_dir_ents * 32 + bytes_per_sector - 1) / bytes_per_sector;

1 0

Alexandre Julliard : winegcc: Detect the appropriate lib directory for 32/ 64 cross-builds.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 955d9a24c58a4cb8b94402e0dd4da6452601f976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=955d9a24c58a4cb8b94402e0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 20:42:00 2010 +0200 winegcc: Detect the appropriate lib directory for 32/64 cross-builds. (cherry picked from commit 81b1c3ed60855d317ed3828b7e2378f63e5c73bf) --- tools/winegcc/winegcc.c | 60 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5fed4a3..c5b8537 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -311,6 +311,60 @@ static const strarray* get_translator(struct options *opts) return ret; } +/* check that file is a library for the correct platform */ +static int check_platform( struct options *opts, const char *file ) +{ + int ret = 0, fd = open( file, O_RDONLY ); + if (fd != -1) + { + unsigned char header[16]; + if (read( fd, header, sizeof(header) ) == sizeof(header)) + { + /* FIXME: only ELF is supported, platform is not checked beyond 32/64 */ + if (!memcmp( header, "\177ELF", 4 )) + { + if (header[4] == 2) /* 64-bit */ + ret = (opts->force_pointer_size == 8 || + (!opts->force_pointer_size && opts->target_cpu == CPU_x86_64)); + else + ret = (opts->force_pointer_size == 4 || + (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64)); + } + } + close( fd ); + } + return ret; +} + +static char *get_lib_dir( struct options *opts ) +{ + static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; + unsigned int i; + + for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) + { + char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + sizeof("32/libwine.so") ); + strcpy( buffer, stdlibpath[i] ); + p = buffer + strlen(buffer); + while (p > buffer && p[-1] == '/') p--; + strcpy( p, "/libwine.so" ); + if (check_platform( opts, buffer )) return buffer; + if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) p -= 2; + if (opts->force_pointer_size == 4 || (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64)) + { + strcpy( p, "32/libwine.so" ); + if (check_platform( opts, buffer )) return buffer; + } + if (opts->force_pointer_size == 8 || (!opts->force_pointer_size && opts->target_cpu == CPU_x86_64)) + { + strcpy( p, "64/libwine.so" ); + if (check_platform( opts, buffer )) return buffer; + } + free( buffer ); + } + return xstrdup( LIBDIR ); +} + static void compile(struct options* opts, const char* lang) { strarray* comp_args = strarray_alloc(); @@ -577,7 +631,6 @@ static const char *mingw_unicode_hack( struct options *opts ) static void build(struct options* opts) { - static const char *stdlibpath[] = { DLLDIR, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; strarray *lib_dirs, *files; strarray *spec_args, *link_args; char *output_file; @@ -627,9 +680,10 @@ static void build(struct options* opts) /* prepare the linking path */ if (!opts->wine_objdir) { + char *lib_dir = get_lib_dir( opts ); lib_dirs = strarray_dup(opts->lib_dirs); - for ( j = 0; j < sizeof(stdlibpath)/sizeof(stdlibpath[0]); j++ ) - strarray_add(lib_dirs, stdlibpath[j]); + strarray_add( lib_dirs, strmake( "%s/wine", lib_dir )); + strarray_add( lib_dirs, lib_dir ); } else {

1 0

Alexandre Julliard : winegcc: Fix the lib dir detection.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 8fdb4620bdeae112a349bf37387744c566b39417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fdb4620bdeae112a349bf373… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 28 11:45:05 2010 +0200 winegcc: Fix the lib dir detection. Spotted by André Hentschel. (cherry picked from commit 62f9966fdc8e37720d9ad60a87592b0a593a03a9) --- tools/winegcc/winegcc.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index c5b8537..dbf66c8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -339,28 +339,36 @@ static int check_platform( struct options *opts, const char *file ) static char *get_lib_dir( struct options *opts ) { static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; + static const char libwine[] = "/libwine.so"; unsigned int i; for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) { - char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + sizeof("32/libwine.so") ); + char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen(libwine) + 3 ); strcpy( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; - strcpy( p, "/libwine.so" ); - if (check_platform( opts, buffer )) return buffer; + strcpy( p, libwine ); + if (check_platform( opts, buffer )) goto found; if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) p -= 2; if (opts->force_pointer_size == 4 || (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64)) { - strcpy( p, "32/libwine.so" ); - if (check_platform( opts, buffer )) return buffer; + strcpy( p, "32" ); + strcat( p, libwine ); + if (check_platform( opts, buffer )) goto found; } if (opts->force_pointer_size == 8 || (!opts->force_pointer_size && opts->target_cpu == CPU_x86_64)) { - strcpy( p, "64/libwine.so" ); - if (check_platform( opts, buffer )) return buffer; + strcpy( p, "64" ); + strcat( p, libwine ); + if (check_platform( opts, buffer )) goto found; } free( buffer ); + continue; + + found: + buffer[strlen(buffer) - strlen(libwine)] = 0; + return buffer; } return xstrdup( LIBDIR ); }

1 0

Alexandre Julliard : winedbg: Don' t start another instance of the debugger when it crashes.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 1f7822981bf6bf457dddbb46eecd606c797f7404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f7822981bf6bf457dddbb46e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 12:55:53 2010 +0200 winedbg: Don't start another instance of the debugger when it crashes. (cherry picked from commit 052eb24b03ff0a2b32887518395154d4c7351bc2) --- programs/winedbg/winedbg.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 3e64506..a074098 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -603,6 +603,12 @@ void dbg_start_interactive(HANDLE hFile) dbg_save_internal_vars(); } +static LONG CALLBACK top_filter( EXCEPTION_POINTERS *ptr ) +{ + dbg_printf( "winedbg: Internal crash at %p\n", ptr->ExceptionRecord->ExceptionAddress ); + return EXCEPTION_EXECUTE_HANDLER; +} + struct backend_cpu* be_cpu; #ifdef __i386__ extern struct backend_cpu be_i386; @@ -636,6 +642,8 @@ int main(int argc, char** argv) /* Initialize the output */ dbg_houtput = GetStdHandle(STD_OUTPUT_HANDLE); + SetUnhandledExceptionFilter( top_filter ); + /* Initialize internal vars */ if (!dbg_load_internal_vars()) return -1;

1 0

Dan Kegel : ws2_32: Null select() should fail with WSAEINVAL.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 6eb260766cdb37616374fb4c7e11f113cc047c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb260766cdb37616374fb4c7… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Oct 18 10:42:16 2010 +0000 ws2_32: Null select() should fail with WSAEINVAL. (cherry picked from commit 6733c40d789744ec0ee6fa30f8e14816968a0887) --- dlls/ws2_32/socket.c | 8 ++++++-- dlls/ws2_32/tests/sock.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4c8a2db..8dffeeb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2975,7 +2975,11 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set if (writefds) count += writefds->fd_count; if (exceptfds) count += exceptfds->fd_count; *count_ptr = count; - if (!count) return NULL; + if (!count) + { + SetLastError(WSAEINVAL); + return NULL; + } if (!(fds = HeapAlloc( GetProcessHeap(), 0, count * sizeof(fds[0])))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); @@ -3098,7 +3102,7 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, TRACE("read %p, write %p, excp %p timeout %p\n", ws_readfds, ws_writefds, ws_exceptfds, ws_timeout); - if (!(pollfds = fd_sets_to_poll( ws_readfds, ws_writefds, ws_exceptfds, &count )) && count) + if (!(pollfds = fd_sets_to_poll( ws_readfds, ws_writefds, ws_exceptfds, &count ))) return SOCKET_ERROR; if (ws_timeout) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8d7c7a6..96430ff 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1941,6 +1941,17 @@ static void test_select(void) FD_ZERO(&readfds); FD_ZERO(&writefds); FD_ZERO(&exceptfds); + + SetLastError(0); + ret = select(maxfd+1, 0, 0, 0, &select_timeout); + ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAEINVAL, "expected WSAEINVAL, got %i\n", ret); + + SetLastError(0); + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAEINVAL, "expected WSAEINVAL, got %i\n", ret); + FD_SET(INVALID_SOCKET, &readfds); SetLastError(0); ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout);

1 0

Detlef Riekenberg : shell32: We have a Unicode parameter when launching a CPL.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: e8d8e3ac635cc05d11cb36dbbfc1c313aa50b30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d8e3ac635cc05d11cb36dbb… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 17 23:50:44 2010 +0200 shell32: We have a Unicode parameter when launching a CPL. (cherry picked from commit 463dafc3aca5a606b85025b3ca908389e3688710) --- dlls/shell32/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 3346ddc..3be0494 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -817,7 +817,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) } if (applet->info[sp].dwSize) { - if (!applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts)) + if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts)) applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData); }

1 0

Juan Lang : wininet: Honor security flags when verifying certificates.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: a5fdb4e373043cac85e8bdb3b149778f08f43f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fdb4e373043cac85e8bdb3b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 29 07:53:53 2010 -0700 wininet: Honor security flags when verifying certificates. (cherry picked from commit 44112c367f6a08a7dd0d841b34d0ead3d6bcac63) --- dlls/wininet/netconnection.c | 52 +++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 5676020..ba0f12a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -215,7 +215,7 @@ static PCCERT_CONTEXT X509_to_cert_context(X509 *cert) } static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, - WCHAR *server) + WCHAR *server, DWORD security_flags) { BOOL ret; CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; @@ -232,30 +232,49 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, { if (chain->TrustStatus.dwErrorStatus) { + static const DWORD supportedErrors = + CERT_TRUST_IS_NOT_TIME_VALID | + CERT_TRUST_IS_UNTRUSTED_ROOT | + CERT_TRUST_IS_OFFLINE_REVOCATION | + CERT_TRUST_REVOCATION_STATUS_UNKNOWN | + CERT_TRUST_IS_REVOKED | + CERT_TRUST_IS_NOT_VALID_FOR_USAGE; + if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID) err = ERROR_INTERNET_SEC_CERT_DATE_INVALID; else if (chain->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_UNTRUSTED_ROOT) + CERT_TRUST_IS_UNTRUSTED_ROOT && + !(security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) err = ERROR_INTERNET_INVALID_CA; - else if ((chain->TrustStatus.dwErrorStatus & + else if (!(security_flags & SECURITY_FLAG_IGNORE_REVOCATION) && + ((chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_OFFLINE_REVOCATION) || - (chain->TrustStatus.dwErrorStatus & - CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) + (chain->TrustStatus.dwErrorStatus & + CERT_TRUST_REVOCATION_STATUS_UNKNOWN))) err = ERROR_INTERNET_SEC_CERT_NO_REV; - else if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_REVOKED) + else if (!(security_flags & SECURITY_FLAG_IGNORE_REVOCATION) && + (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_REVOKED)) err = ERROR_INTERNET_SEC_CERT_REVOKED; - else if (chain->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_NOT_VALID_FOR_USAGE) + else if (!(security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE) && + (chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_VALID_FOR_USAGE)) err = ERROR_INTERNET_SEC_INVALID_CERT; - else + else if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) err = ERROR_INTERNET_SEC_INVALID_CERT; } - else + if (!err) { CERT_CHAIN_POLICY_PARA policyPara; SSL_EXTRA_CERT_CHAIN_POLICY_PARA sslExtraPolicyPara; CERT_CHAIN_POLICY_STATUS policyStatus; + CERT_CHAIN_CONTEXT chainCopy; + /* Clear chain->TrustStatus.dwErrorStatus so + * CertVerifyCertificateChainPolicy will verify additional checks + * rather than stopping with an existing, ignored error. + */ + memcpy(&chainCopy, chain, sizeof(chainCopy)); + chainCopy.TrustStatus.dwErrorStatus = 0; sslExtraPolicyPara.u.cbSize = sizeof(sslExtraPolicyPara); sslExtraPolicyPara.dwAuthType = AUTHTYPE_SERVER; sslExtraPolicyPara.pwszServerName = server; @@ -263,14 +282,18 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, policyPara.dwFlags = 0; policyPara.pvExtraPolicyPara = &sslExtraPolicyPara; ret = CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_SSL, - chain, &policyPara, &policyStatus); + &chainCopy, &policyPara, &policyStatus); /* Any error in the policy status indicates that the * policy couldn't be verified. */ if (ret && policyStatus.dwError) { if (policyStatus.dwError == CERT_E_CN_NO_MATCH) - err = ERROR_INTERNET_SEC_CERT_CN_INVALID; + { + if (!(security_flags & + SECURITY_FLAG_IGNORE_CERT_CN_INVALID)) + err = ERROR_INTERNET_SEC_CERT_CN_INVALID; + } else err = ERROR_INTERNET_SEC_INVALID_CERT; } @@ -288,10 +311,12 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) BOOL ret = FALSE; HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + WININET_NETCONNECTION *conn; ssl = pX509_STORE_CTX_get_ex_data(ctx, pSSL_get_ex_data_X509_STORE_CTX_idx()); server = pSSL_get_ex_data(ssl, hostname_idx); + conn = pSSL_get_ex_data(ssl, conn_idx); if (store) { X509 *cert; @@ -318,7 +343,8 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) if (!endCert) ret = FALSE; if (ret) { - DWORD_PTR err = netconn_verify_cert(endCert, store, server); + DWORD_PTR err = netconn_verify_cert(endCert, store, server, + conn->security_flags); if (err) {

1 0