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

Alexandre Julliard : ntdll: The loader is named wine64 only on platforms that support WoW64.
by Alexandre Julliard July 3, 2020

July 3, 2020

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 July 3, 2020

July 3, 2020

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 July 3, 2020

July 3, 2020

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 July 3, 2020

July 3, 2020

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

Alexandre Julliard : ntdll: Use malloc() to allocate the object attributes buffer.
by Alexandre Julliard July 3, 2020

July 3, 2020

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 pthread mutexes for uninterrupted sections in the Unix library.
by Alexandre Julliard July 3, 2020

July 3, 2020

Module: wine Branch: master Commit: 72fc2ceaa6ae472a809b4d5c02be98c44388c1b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72fc2ceaa6ae472a809b4d5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:02:58 2020 +0200 ntdll: Use pthread mutexes for uninterrupted sections in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 22 ++---- dlls/ntdll/unix/signal_i386.c | 23 ++---- dlls/ntdll/unix/unix_private.h | 5 +- dlls/ntdll/unix/virtual.c | 174 ++++++++++++++++++++--------------------- 4 files changed, 102 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72fc2ceaa6ae472a809b…

1 0

Rémi Bernon : kernel32: Catch process creation breakpoint exceptions.
by Alexandre Julliard July 3, 2020

July 3, 2020

Module: wine Branch: master Commit: ceeb11d2a6545ae9db0c6825fb8d26b5cfe71889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceeb11d2a6545ae9db0c6825… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 3 10:13:30 2020 +0200 kernel32: Catch process creation breakpoint exceptions. Metal Gear Solid V: Ground Zeroes attaches itself and continues this specific breakpoint with DBG_EXCEPTION_NOT_HANDLED. It crashes the child process and the game terminates. It is correct for old Windows versions, but more recent versions are apparently catching exceptions here, and the process should continue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44127 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 9 +++++++++ dlls/kernel32/tests/debugger.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8f506fcf13..cfc11c867a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -155,6 +155,15 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) SetLastError( 0 ); /* clear error code */ if (being_debugged) DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY + + __TRY + { ExitThread( call_process_entry( peb, entry )); } __EXCEPT(UnhandledExceptionFilter) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 33e18d82e6..0a43fe91e6 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1062,15 +1062,46 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, if (flag) { + DWORD last_thread; + next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); ok(ctx.pid == pi.dwProcessId, "unexpected dwProcessId %x\n", ctx.ev.dwProcessId == ctx.pid); next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + last_thread = ctx.ev.dwThreadId; wait_for_breakpoint(&ctx); ok(ctx.dll_cnt > 2, "dll_cnt = %d\n", ctx.dll_cnt); + + ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwThreadId == last_thread, "unexpected thread\n"); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); + + /* Except for wxppro and w2008, the initial breakpoint is now somewhere else, possibly within LdrInitShimEngineDynamic, + * It's also catching exceptions and ContinueDebugEvent(DBG_EXCEPTION_NOT_HANDLED) should not crash the child now */ + if (broken(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint)) + { + win_skip("Ignoring initial breakpoint address check\n"); + pass_exception = FALSE; + } + else + { + todo_wine + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress != pDbgBreakPoint, "ExceptionAddress == pDbgBreakPoint\n"); + } + + if (pass_exception) + { + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); + ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ctx.ev.dwDebugEventCode = -1; + + next_event(&ctx, WAIT_EVENT_TIMEOUT); + ok(ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + } } else { @@ -1713,6 +1744,7 @@ START_TEST(debugger) test_debug_children(myARGV[0], DEBUG_PROCESS|DEBUG_ONLY_THIS_PROCESS, FALSE, FALSE); test_debug_children(myARGV[0], 0, FALSE, FALSE); test_debug_children(myARGV[0], 0, FALSE, TRUE); + test_debug_children(myARGV[0], DEBUG_ONLY_THIS_PROCESS, FALSE, TRUE); test_debugger(myARGV[0]); } }

1 0

Piotr Caban : msi: Add disabled feature to show that it's not getting installed by patch.
by Alexandre Julliard July 2, 2020

July 2, 2020

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

Jacek Caban : mshtml.idl: Add missing MoveUnitBounded to IMarkupPointer2.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: ffbee79c88545a1ff308bc9d9783f4a2d662c718 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffbee79c88545a1ff308bc9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 16:56:57 2020 +0200 mshtml.idl: Add missing MoveUnitBounded to IMarkupPointer2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index 2fd1e6f76c..77f4a9e8bb 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28449,6 +28449,10 @@ interface IMarkupPointer2 : IMarkupPointer [in] IMarkupContainer *pContainer, [in] long lMP); + HRESULT MoveUnitBounded( + [in] MOVEUNIT_ACTION muAction, + [in] IMarkupPointer *pIBoundary); + HRESULT IsInsideURL( [in] IMarkupPointer *pRight, [out] BOOL *pfResult);

1 0

Jacek Caban : mshtml: Add IMarkupServices::CreateMarkupPointer implementation.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 5679312635c075c7fc9a8ec7c2fc3c01a509bb30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5679312635c075c7fc9a8ec7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 16:57:21 2020 +0200 mshtml: Add IMarkupServices::CreateMarkupPointer implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/range.c | 294 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 22 ++++ 4 files changed, 321 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5679312635c075c7fc9a…

1 0