July 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Use malloc() to allocate the object attributes buffer.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: a07cff77d3bd452c3c4b99bf93503f727bf768cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a07cff77d3bd452c3c4b99bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:04:02 2020 +0200 ntdll: Use malloc() to allocate the object attributes buffer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 6 +++--- dlls/ntdll/unix/process.c | 6 +++--- dlls/ntdll/unix/sync.c | 19 +++++++++---------- dlls/ntdll/unix/thread.c | 4 ++-- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a77cb6d410..5ed7a21d8e 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3596,7 +3596,7 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU *handle = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); RtlFreeAnsiString( &unix_name ); } else WARN( "%s not found (%x)\n", debugstr_us(attr->ObjectName), io->u.Status ); @@ -3671,7 +3671,7 @@ NTSTATUS WINAPI NtCreateMailslotFile( HANDLE *handle, ULONG access, OBJECT_ATTRI } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); return status; } @@ -3719,7 +3719,7 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( HANDLE *handle, ULONG access, OBJECT_ATTR } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); return status; } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 33bee03c19..6c29055821 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -836,7 +836,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ if (socketpair( PF_UNIX, SOCK_STREAM, 0, socketfd ) == -1) { status = STATUS_TOO_MANY_OPENED_FILES; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); goto done; } #ifdef SO_PASSCRED @@ -873,7 +873,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ process_info = wine_server_ptr_handle( reply->info ); } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); if (status) { @@ -906,7 +906,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ } } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); if (status) goto done; /* create the child process */ diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 4402584f28..5080caef52 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -263,8 +263,7 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a len = (len + 3) & ~3; /* DWORD-align the entire structure */ - *ret = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); - if (!*ret) return STATUS_NO_MEMORY; + if (!(*ret = calloc( len, 1 ))) return STATUS_NO_MEMORY; (*ret)->rootdir = wine_server_obj_handle( attr->RootDirectory ); (*ret)->attributes = attr->Attributes; @@ -341,7 +340,7 @@ NTSTATUS WINAPI NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJ } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); return ret; } @@ -448,7 +447,7 @@ NTSTATUS WINAPI NtCreateEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_ } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); return ret; } @@ -601,7 +600,7 @@ NTSTATUS WINAPI NtCreateMutant( HANDLE *handle, ACCESS_MASK access, const OBJECT } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); return ret; } @@ -702,7 +701,7 @@ NTSTATUS WINAPI NtCreateJobObject( HANDLE *handle, ACCESS_MASK access, const OBJ *handle = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); return ret; } @@ -937,7 +936,7 @@ NTSTATUS WINAPI NtCreateTimer( HANDLE *handle, ACCESS_MASK access, const OBJECT_ } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); return ret; } @@ -1280,7 +1279,7 @@ NTSTATUS WINAPI NtCreateKeyedEvent( HANDLE *handle, ACCESS_MASK access, } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); return ret; } @@ -1370,7 +1369,7 @@ NTSTATUS WINAPI NtCreateIoCompletion( HANDLE *handle, ACCESS_MASK access, OBJECT } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); return status; } @@ -1583,7 +1582,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); return ret; } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 686d3991b7..299fb4be43 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -193,7 +193,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT if (server_pipe( request_pipe ) == -1) { - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); return STATUS_TOO_MANY_OPENED_FILES; } server_send_fd( request_pipe[0] ); @@ -216,7 +216,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, objattr ); + free( objattr ); if (status) { close( request_pipe[1] );

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate async I/O data.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: e9951dbe37c9fb018e677d872df9f563a0861295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9951dbe37c9fb018e677d87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:04:40 2020 +0200 ntdll: Use malloc() to allocate async I/O data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 18 +++++++++--------- dlls/ntdll/unix/serial.c | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 5ed7a21d8e..223c863dca 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4489,11 +4489,11 @@ static struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, while (io) { struct async_fileio *next = io->next; - RtlFreeHeap( GetProcessHeap(), 0, io ); + free( io ); io = next; } - if ((io = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + if ((io = malloc( size ))) { io->callback = callback; io->handle = handle; @@ -4676,7 +4676,7 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a } SERVER_END_REQ; - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + if (status != STATUS_PENDING) free( async ); if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), io ); return status; @@ -4714,7 +4714,7 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE } SERVER_END_REQ; - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + if (status != STATUS_PENDING) free( async ); if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), io ); return status; @@ -4759,7 +4759,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + if (status != STATUS_PENDING) free( async ); if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), io ); return status; @@ -4922,7 +4922,7 @@ static NTSTATUS register_async_file_read( HANDLE handle, HANDLE event, } SERVER_END_REQ; - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + if (status != STATUS_PENDING) free( fileio ); return status; } @@ -5388,7 +5388,7 @@ NTSTATUS WINAPI NtWriteFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, v } SERVER_END_REQ; - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + if (status != STATUS_PENDING) free( fileio ); goto err; } else /* synchronous write, wait for the fd to become ready */ @@ -5752,7 +5752,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE handle, IO_STATUS_BLOCK *io ) } SERVER_END_REQ; - if (ret != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + if (ret != STATUS_PENDING) free( async ); if (wait_handle) ret = wait_async( wait_handle, FALSE, io ); } @@ -5883,7 +5883,7 @@ NTSTATUS WINAPI NtNotifyChangeDirectoryFile( HANDLE handle, HANDLE event, PIO_AP } SERVER_END_REQ; - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + if (status != STATUS_PENDING) free( fileio ); return status; } diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index b807ee1e46..1c61a5e02f 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -1007,7 +1007,7 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) } stop_waiting(commio->hDevice); if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); - RtlFreeHeap(GetProcessHeap(), 0, commio); + free( commio ); return 0; } @@ -1019,7 +1019,7 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK if ((status = NtResetEvent(hEvent, NULL))) return status; - commio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof (async_commio)); + commio = malloc( sizeof(async_commio) ); if (!commio) return STATUS_NO_MEMORY; commio->hDevice = hDevice; @@ -1030,7 +1030,7 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK status = get_wait_mask(commio->hDevice, &commio->evtmask, &commio->cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL, TRUE); if (status) { - RtlFreeHeap(GetProcessHeap(), 0, commio); + free( commio ); return status; } @@ -1098,7 +1098,7 @@ error_caps: #endif out_now: stop_waiting(commio->hDevice); - RtlFreeHeap(GetProcessHeap(), 0, commio); + free( commio ); return status; }

1 0

Alexandre Julliard : ntdll: The loader is named wine64 only on platforms that support WoW64.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: b64208df0d8e94259783081084c5a731e0839542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b64208df0d8e942597830810… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 19:42:45 2020 +0200 ntdll: The loader is named wine64 only on platforms that support WoW64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49438 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 14 ++++++++------ dlls/ntdll/unix/process.c | 10 ++-------- dlls/ntdll/unix/unix_private.h | 3 +-- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a8af46e2df..e2074f9734 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -426,13 +426,13 @@ static void preloader_exec( char **argv ) execv( argv[1], argv + 1 ); } -static NTSTATUS loader_exec( const char *loader, char **argv, int is_child_64bit ) +static NTSTATUS loader_exec( const char *loader, char **argv, client_cpu_t cpu ) { char *p, *path; if (build_dir) { - argv[1] = build_path( build_dir, is_child_64bit ? "loader/wine64" : "loader/wine" ); + argv[1] = build_path( build_dir, (cpu == CPU_x86_64) ? "loader/wine64" : "loader/wine" ); preloader_exec( argv ); return STATUS_INVALID_IMAGE_FORMAT; } @@ -465,9 +465,11 @@ static NTSTATUS loader_exec( const char *loader, char **argv, int is_child_64bit * * argv[0] and argv[1] must be reserved for the preloader and loader respectively. */ -NTSTATUS exec_wineloader( char **argv, int socketfd, int is_child_64bit, - ULONGLONG res_start, ULONGLONG res_end ) +NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) { + int is_child_64bit = (pe_info->cpu == CPU_x86_64 || pe_info->cpu == CPU_ARM64); + ULONGLONG res_start = pe_info->base; + ULONGLONG res_end = pe_info->base + pe_info->map_size; const char *loader = argv0; const char *loader_env = getenv( "WINELOADER" ); char preloader_reserve[64], socket_env[64]; @@ -507,7 +509,7 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, int is_child_64bit, putenv( preloader_reserve ); putenv( socket_env ); - return loader_exec( loader, argv, is_child_64bit ); + return loader_exec( loader, argv, pe_info->cpu ); } @@ -1805,7 +1807,7 @@ void __wine_main( int argc, char *argv[], char *envp[] ) { char **new_argv = malloc( (argc + 2) * sizeof(*argv) ); memcpy( new_argv + 1, argv, (argc + 1) * sizeof(*argv) ); - loader_exec( argv0, new_argv, is_win64 ); + loader_exec( argv0, new_argv, client_cpu ); fatal_error( "could not exec the wine loader\n" ); } } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 6c29055821..b86c67e6af 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -523,7 +523,6 @@ static void set_stdio_fd( int stdin_fd, int stdout_fd ) static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int socketfd, int unixdir, char *winedebug, const pe_image_info_t *pe_info ) { - const int is_child_64bit = (pe_info->cpu == CPU_x86_64 || pe_info->cpu == CPU_ARM64); NTSTATUS status = STATUS_SUCCESS; int stdin_fd = -1, stdout_fd = -1; pid_t pid; @@ -556,8 +555,7 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so } argv = build_argv( &params->CommandLine, 2 ); - exec_wineloader( argv, socketfd, is_child_64bit, - pe_info->base, pe_info->base + pe_info->map_size ); + exec_wineloader( argv, socketfd, pe_info ); _exit(1); } @@ -586,7 +584,6 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ) { pe_image_info_t pe_info; - BOOL is_child_64bit; int unixdir, socketfd[2]; char **argv; HANDLE handle; @@ -601,7 +598,6 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST case STATUS_INVALID_IMAGE_NOT_MZ: if (getenv( "WINEPRELOADRESERVE" )) return status; if ((status = get_pe_file_info( path, &handle, &pe_info ))) return status; - is_child_64bit = (pe_info.cpu == CPU_x86_64 || pe_info.cpu == CPU_ARM64); break; case STATUS_INVALID_IMAGE_WIN_16: case STATUS_INVALID_IMAGE_NE_FORMAT: @@ -609,7 +605,6 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST /* we'll start winevdm */ memset( &pe_info, 0, sizeof(pe_info) ); pe_info.cpu = CPU_x86; - is_child_64bit = FALSE; break; default: return status; @@ -642,8 +637,7 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST fchdir( unixdir ); do { - status = exec_wineloader( argv, socketfd[0], is_child_64bit, - pe_info.base, pe_info.base + pe_info.map_size ); + status = exec_wineloader( argv, socketfd[0], &pe_info ); } #ifdef __APPLE__ while (errno == ENOTSUP && terminate_main_thread()); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 919988db13..e14da3ff7e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -157,8 +157,7 @@ extern void init_environment( int argc, char *argv[], char *envp[] ) DECLSPEC_HI extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) DECLSPEC_HIDDEN; extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; -extern NTSTATUS exec_wineloader( char **argv, int socketfd, int is_child_64bit, - ULONGLONG res_start, ULONGLONG res_end ) DECLSPEC_HIDDEN; +extern NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) DECLSPEC_HIDDEN; extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern ULONG_PTR get_image_address(void) DECLSPEC_HIDDEN;

1 0

Owen Rudge : winhttp/tests: Add tests for WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: e4e94ed72ebe06377a127c72499f2ef1882d0b8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e94ed72ebe06377a127c72… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Jul 3 10:21:37 2020 +0100 winhttp/tests: Add tests for WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 84063fdc82..79d700d4a1 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -5076,6 +5076,57 @@ done: if (ses) WinHttpCloseHandle( ses ); } +static void test_max_http_automatic_redirects (void) +{ + HINTERNET session, request, connection; + DWORD max_redirects, err; + BOOL ret; + + session = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, + WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); + ok(session != NULL, "WinHttpOpen failed to open session.\n"); + + connection = WinHttpConnect (session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + + /* Test with 2 redirects (page will try to redirect 3 times) */ + request = WinHttpOpenRequest(connection, L"GET", L"tests/redirecttest.php?max=3", NULL, WINHTTP_NO_REFERER, + WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); + if (request == NULL && GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED) + { + skip("Network unreachable, skipping.\n"); + goto done; + } + ok(request != NULL, "WinHttpOpenRequest failed to open a request, error: %u.\n", GetLastError()); + if (!request) goto done; + + max_redirects = 2; + ret = WinHttpSetOption(request, WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS, &max_redirects, sizeof(max_redirects)); + todo_wine ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + + ret = WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) + { + skip("connection failed, skipping\n"); + goto done; + } + ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpReceiveResponse(request, NULL); + todo_wine ok(!ret, "WinHttpReceiveResponse succeeded, expected failure\n"); + todo_wine ok(GetLastError() == ERROR_WINHTTP_REDIRECT_FAILED, "Expected ERROR_WINHTTP_REDIRECT_FAILED, got %u.\n", GetLastError()); + + done: + ret = WinHttpCloseHandle(request); + ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); + ret = WinHttpCloseHandle(connection); + ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); + ret = WinHttpCloseHandle(session); + ok(ret == TRUE, "WinHttpCloseHandle failed on closing session, got %d.\n", ret); +} + START_TEST (winhttp) { struct server_info si; @@ -5108,6 +5159,7 @@ START_TEST (winhttp) test_WinHttpGetIEProxyConfigForCurrentUser(); test_WinHttpGetProxyForUrl(); test_chunked_read(); + test_max_http_automatic_redirects(); si.event = CreateEventW(NULL, 0, 0, NULL); si.port = 7532;

1 0

Owen Rudge : winhttp: Implement WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: 5042687d012c351d394b4374ecc25f64059900da URL: https://source.winehq.org/git/wine.git/?a=commit;h=5042687d012c351d394b4374… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Jul 3 10:21:40 2020 +0100 winhttp: Implement WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 ++ dlls/winhttp/session.c | 17 +++++++++++++++++ dlls/winhttp/tests/winhttp.c | 6 +++--- dlls/winhttp/winhttp_private.h | 2 ++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e31803ccfe..31296cd02b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2720,6 +2720,8 @@ static DWORD receive_response( struct request *request, BOOL async ) if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS || request->hdr.redirect_policy == WINHTTP_OPTION_REDIRECT_POLICY_NEVER) break; + if (++request->redirect_count > request->max_redirects) return ERROR_WINHTTP_REDIRECT_FAILED; + if ((ret = handle_redirect( request, status ))) break; /* recurse synchronously */ diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 080837eb1e..319066db55 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -820,6 +820,11 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void str_to_buffer( buffer, request->connect->session->proxy_password, buflen ); return TRUE; + case WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS: + *(DWORD *)buffer = request->max_redirects; + *buflen = sizeof(DWORD); + return TRUE; + default: FIXME("unimplemented option %u\n", option); SetLastError( ERROR_INVALID_PARAMETER ); @@ -1028,6 +1033,17 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b FIXME("WINHTTP_OPTION_CONNECT_RETRIES\n"); return TRUE; + case WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS: + if (buflen == sizeof(DWORD)) + { + request->max_redirects = *(DWORD *)buffer; + SetLastError(NO_ERROR); + return TRUE; + } + + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + default: FIXME("unimplemented option %u\n", option); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); @@ -1121,6 +1137,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->send_timeout = connect->session->send_timeout; request->receive_timeout = connect->session->receive_timeout; request->receive_response_timeout = connect->session->receive_response_timeout; + request->max_redirects = 10; if (!verb || !verb[0]) verb = L"GET"; if (!(request->verb = strdupW( verb ))) goto end; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 79d700d4a1..5379640d5f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -5102,7 +5102,7 @@ static void test_max_http_automatic_redirects (void) max_redirects = 2; ret = WinHttpSetOption(request, WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS, &max_redirects, sizeof(max_redirects)); - todo_wine ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); ret = WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); err = GetLastError(); @@ -5115,8 +5115,8 @@ static void test_max_http_automatic_redirects (void) SetLastError(0xdeadbeef); ret = WinHttpReceiveResponse(request, NULL); - todo_wine ok(!ret, "WinHttpReceiveResponse succeeded, expected failure\n"); - todo_wine ok(GetLastError() == ERROR_WINHTTP_REDIRECT_FAILED, "Expected ERROR_WINHTTP_REDIRECT_FAILED, got %u.\n", GetLastError()); + ok(!ret, "WinHttpReceiveResponse succeeded, expected failure\n"); + ok(GetLastError() == ERROR_WINHTTP_REDIRECT_FAILED, "Expected ERROR_WINHTTP_REDIRECT_FAILED, got %u.\n", GetLastError()); done: ret = WinHttpCloseHandle(request); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 23aba00780..e279e58a5f 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -189,6 +189,8 @@ struct request int send_timeout; int receive_timeout; int receive_response_timeout; + DWORD max_redirects; + DWORD redirect_count; /* total number of redirects during this request */ WCHAR *status_text; DWORD content_length; /* total number of bytes to be read */ DWORD content_read; /* bytes read so far */

1 0

Gijs Vermeulen : amstream: Return E_POINTER on NULL stream in IMediaStreamFilter::GetMediaStream().
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: a2fe0d5759c6f658e2c527928f255e1bcd6dbf82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2fe0d5759c6f658e2c52792… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jul 3 14:41:13 2020 +0200 amstream: Return E_POINTER on NULL stream in IMediaStreamFilter::GetMediaStream(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 3 +++ dlls/amstream/tests/amstream.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 3dff686b21..0e09e492cb 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -513,6 +513,9 @@ static HRESULT WINAPI filter_GetMediaStream(IMediaStreamFilter *iface, REFMSPID TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(idPurpose), ppMediaStream); + if (!ppMediaStream) + return E_POINTER; + for (i = 0; i < This->nb_streams; i++) { IAMMediaStream_GetInformation(This->streams[i], &purpose_id, NULL); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index bbad585d48..3fb77f277a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -701,9 +701,13 @@ static void test_add_stream(void) ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryAudio, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_GetMediaStream(stream_filter, &MSPID_PrimaryAudio, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryVideo, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IMediaStreamFilter_GetMediaStream(stream_filter, &MSPID_PrimaryVideo, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); check_enum_stream(mmstream, stream_filter, 0, NULL);

1 0

Paul Gofman : ws2_32: Consider socket with zero ifindex unbound.
by Alexandre Julliard 03 Jul '20

03 Jul '20

Module: wine Branch: master Commit: d888f3ba3672a3e41af5d60c6494023cc38a0a02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d888f3ba3672a3e41af5d60c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 3 17:30:09 2020 +0300 ws2_32: Consider socket with zero ifindex unbound. Real interface index can't be zero. getsockopt(..., IP_UNICAST_IF, ...) may return success and zero interface index if IP_UNICAST_IF was never set. Avoids error output which doesn't inidcate a real error condition for such case. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 402ee86d96..69fbb37af2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3788,7 +3788,7 @@ static void interface_bind_check(int fd, struct sockaddr_in *addr) ret = getsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, &len); if (!ret) ifindex = ntohl(ifindex); #endif - if (!ret) + if (!ret && ifindex) { EnterCriticalSection(&cs_if_addr_cache); if (ifindex < if_addr_cache_size)

1 0

Piotr Caban : msi: Add disabled feature to show that it's not getting installed by patch.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: 99e7c801e4d5032110190acbb04d85eb069df867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99e7c801e4d5032110190acb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 1 10:43:18 2020 +0200 msi: Add disabled feature to show that it's not getting installed by patch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/patch.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 6449b7e67a..a846defef4 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -73,7 +73,8 @@ static const char file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" "File\tFile\n" - "patch.txt\tpatch\tpatch.txt\t1000\t\t\t0\t1\n"; + "patch.txt\tpatch\tpatch.txt\t1000\t\t\t0\t1\n" + "disable.txt\tdisable\tdisable.txt\t1000\t\t\t0\t1\n"; static const char directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -87,19 +88,22 @@ static const char component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" - "patch\t{4B79D87E-6D28-4FD3-92D6-CD9B26AF64F1}\tMSITESTDIR\t0\t\tpatch.txt\n"; + "patch\t{4B79D87E-6D28-4FD3-92D6-CD9B26AF64F1}\tMSITESTDIR\t0\t\tpatch.txt\n" + "disable\t{BDDBA0EE-0031-4591-ADC0-33308175AC19}\tMSITESTDIR\t0\t\tdisable.txt\n"; static const char feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" "Feature\tFeature\n" - "patch\t\t\tpatch feature\t1\t1\tMSITESTDIR\t0\n"; + "patch\t\t\tpatch feature\t1\t1\tMSITESTDIR\t0\n" + "disable\t\t\tdisabled feature\t1\t1\tMSITESTDIR\t0\n"; static const char feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" "FeatureComponents\tFeature_\tComponent_\n" - "patch\tpatch\n"; + "patch\tpatch\n" + "disable\tdisable\n"; static const char install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -121,6 +125,12 @@ static const char install_exec_seq_dat[] = "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; +static const char condition_dat[] = + "Feature_\tLevel\tCondition\n" + "s38\ti2\tS255\n" + "Condition\tFeature_\tLevel\n" + "disable\t0\tDISABLE_FEATURE\n"; + struct msi_table { const char *filename; @@ -139,7 +149,8 @@ static const struct msi_table tables[] = ADD_TABLE( feature_comp ), ADD_TABLE( property ), ADD_TABLE( install_exec_seq ), - ADD_TABLE( media ) + ADD_TABLE( media ), + ADD_TABLE( condition ) }; static void init_function_pointers( void ) @@ -757,7 +768,7 @@ static void test_simple_patch( void ) MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); - r = MsiInstallProductA( msifile, NULL ); + r = MsiInstallProductA( msifile, "DISABLE_FEATURE=1" ); if (r != ERROR_SUCCESS) { skip("Product installation failed with error code %u\n", r); @@ -1101,7 +1112,7 @@ static void test_system_tables( void ) MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); - r = MsiInstallProductA( msifile, NULL ); + r = MsiInstallProductA( msifile, "DISABLE_FEATURE=1" ); if (r != ERROR_SUCCESS) { skip("Product installation failed with error code %d\n", r); @@ -1290,7 +1301,7 @@ static void test_patch_registration( void ) MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); - r = MsiInstallProductA( msifile, NULL ); + r = MsiInstallProductA( msifile, "DISABLE_FEATURE=1" ); if (r != ERROR_SUCCESS) { skip("Product installation failed with error code %d\n", r);

1 0

Piotr Caban : msi: Install feature when new component is added.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: 877540b522c46134aa1b843519fa5694adb187ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=877540b522c46134aa1b8435… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 1 10:44:00 2020 +0200 msi: Install feature when new component is added. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49350 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 112 ++++++++++++++++++++++++++++++++++++++++++++----- dlls/msi/msipriv.h | 2 + dlls/msi/patch.c | 5 +++ dlls/msi/tests/patch.c | 2 +- 4 files changed, 110 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index bc7fecbd73..d02860e4d7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1374,6 +1374,49 @@ static UINT load_all_patches(MSIPACKAGE *package) return rc; } +static UINT iterate_patched_component( MSIRECORD *row, LPVOID param ) +{ + MSIPACKAGE *package = param; + const WCHAR *name; + MSICOMPONENT *c; + + name = MSI_RecordGetString( row, 1 ); + TRACE( "found patched component: %s\n", wine_dbgstr_w(name) ); + c = msi_get_loaded_component( package, name ); + if (!c) + return ERROR_SUCCESS; + + c->updated = 1; + if (!wcscmp( MSI_RecordGetString( row, 2 ), L"INSERT" )) + c->added = 1; + return ERROR_SUCCESS; +} + +static void mark_patched_components( MSIPACKAGE *package ) +{ + static const WCHAR select[] = L"SELECT `Row`, `Column` FROM `_TransformView` WHERE `Table`='Component'"; + MSIQUERY *q; + UINT r; + + r = MSI_OpenQuery( package->db, &q, select ); + if (r != ERROR_SUCCESS) + return; + + MSI_IterateRecords( q, NULL, iterate_patched_component, package ); + msiobj_release( &q->hdr ); + + while (1) + { + r = MSI_OpenQuery( package->db, &q, L"ALTER TABLE `_TransformView` FREE" ); + if (r != ERROR_SUCCESS) + return; + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + if (r != ERROR_SUCCESS) + return; + } +} + static UINT load_folder_persistence( MSIPACKAGE *package, MSIFOLDER *folder ) { static const WCHAR query[] = { @@ -1518,6 +1561,7 @@ static UINT ACTION_CostInitialize(MSIPACKAGE *package) msi_load_all_features( package ); load_all_files( package ); load_all_patches( package ); + mark_patched_components( package ); load_all_media( package ); return ERROR_SUCCESS; @@ -1802,12 +1846,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - if (feature->Feature_Parent) continue; - disable_children( feature, level ); - follow_parent( feature ); - } } else if (!msi_get_property_int( package->db, szInstalled, 0 )) { @@ -1834,15 +1872,69 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } - /* disable child features of unselected parent or follow parent */ + } + else + { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - if (feature->Feature_Parent) continue; - disable_children( feature, level ); - follow_parent( feature ); + ComponentList *cl; + MSIFEATURE *cur; + + if (!is_feature_selected( feature, level )) continue; + if (feature->ActionRequest != INSTALLSTATE_UNKNOWN) continue; + + LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) + { + if (!cl->component->updated && !cl->component->added) + continue; + + cur = feature; + while (cur) + { + if (cur->ActionRequest != INSTALLSTATE_UNKNOWN) + break; + + if (cur->Installed != INSTALLSTATE_ABSENT) + { + cur->Action = cur->Installed; + cur->ActionRequest = cur->Installed; + } + else if (!cl->component->added) + { + break; + } + else if (cur->Attributes & msidbFeatureAttributesFavorSource) + { + cur->Action = INSTALLSTATE_SOURCE; + cur->ActionRequest = INSTALLSTATE_SOURCE; + } + else if (cur->Attributes & msidbFeatureAttributesFavorAdvertise) + { + cur->Action = INSTALLSTATE_ADVERTISED; + cur->ActionRequest = INSTALLSTATE_ADVERTISED; + } + else + { + cur->Action = INSTALLSTATE_LOCAL; + cur->ActionRequest = INSTALLSTATE_LOCAL; + } + + if (!cur->Feature_Parent) + break; + cur = msi_get_loaded_feature(package, cur->Feature_Parent); + } + } } } + /* disable child features of unselected parent or follow parent */ + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + if (feature->Feature_Parent) continue; + disable_children( feature, level ); + follow_parent( feature ); + } + /* now we want to set component state based based on feature state */ LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index dbe833e613..a1b7f033c3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -544,6 +544,8 @@ typedef struct tagMSICOMPONENT unsigned int hasAdvertisedFeature:1; unsigned int hasLocalFeature:1; unsigned int hasSourceFeature:1; + unsigned int added:1; + unsigned int updated:1; } MSICOMPONENT; typedef struct tagComponentList diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index 1233ec306b..67da577841 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -274,9 +274,14 @@ static UINT apply_substorage_transform( MSIPACKAGE *package, MSIDATABASE *patch_ { ret = check_transform_applicable( package, stg ); if (ret == ERROR_SUCCESS) + { + msi_table_apply_transform( package->db, stg, MSITRANSFORM_ERROR_VIEWTRANSFORM ); msi_table_apply_transform( package->db, stg, 0 ); + } else + { TRACE("substorage transform %s wasn't applicable\n", debugstr_w(name)); + } IStorage_Release( stg ); } else diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index a846defef4..87f64d6c83 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -844,7 +844,7 @@ static void test_simple_patch( void ) size = get_pf_file_size( "msitest\\patch.txt" ); ok( size == 1002, "expected 1002, got %u\n", size ); size = get_pf_file_size( "msitest\\file.txt" ); - todo_wine ok( size == 1000, "expected 1000, got %u\n", size ); + ok( size == 1000, "expected 1000, got %u\n", size ); /* show that MsiOpenPackage applies registered patches */ r = MsiOpenPackageA( path, &hpackage );

1 0

Paul Gofman : ntdll: Don't reset rsp to context->Rsp until exception data is copied.
by Alexandre Julliard 02 Jul '20

02 Jul '20

Module: wine Branch: master Commit: 69b6572338396134a3e20189cb35445d68757ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=69b6572338396134a3e20189… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 2 11:06:04 2020 +0300 ntdll: Don't reset rsp to context->Rsp until exception data is copied. Context record may be stored on stack below context stack. This happens, e. g., with RtlRaiseException(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 5334a4d7cc..cb0fdfb00f 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1979,17 +1979,18 @@ __ASM_GLOBAL_FUNC( user_exception_dispatcher_trampoline, void WINAPI do_call_user_exception_dispatcher(EXCEPTION_RECORD *rec, CONTEXT *context, struct stack_layout *stack) { - memcpy(&stack->context, context, sizeof(*context)); + memmove(&stack->context, context, sizeof(*context)); memcpy(&stack->rec, rec, sizeof(*rec)); user_exception_dispatcher_trampoline( stack, pKiUserExceptionDispatcher ); } __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, - "movq 0x98(%rdx),%rsp\n\t" /* context->Rsp */ - "and $~0xf,%rsp\n\t" - "sub $0x630,%rsp\n\t" /* sizeof(struct stack_layout) */ - "movq %rsp,%r8\n\t" + "movq 0x98(%rdx),%r8\n\t" /* context->Rsp */ + "andq $~0xf,%r8\n\t" + "subq $0x630,%r8\n\t" /* sizeof(struct stack_layout) */ + "cmpq %r8,%rsp\n\t" + "cmovbq %r8,%rsp\n\t" "jmp " __ASM_NAME("do_call_user_exception_dispatcher") "\n\t") /***********************************************************************

1 0