wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Francois Gouget : wsock32: Fix ASCII / ANSI mixups in comments.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: ece94cd412493cc50dae2701697f9d5667817c9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ece94cd412493cc50dae2701… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:12:46 2021 +0200 wsock32: Fix ASCII / ANSI mixups in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsock32/service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wsock32/service.c b/dlls/wsock32/service.c index 2b6e4e7b58d..f2a45c983b5 100644 --- a/dlls/wsock32/service.c +++ b/dlls/wsock32/service.c @@ -65,7 +65,7 @@ INT WINAPI GetAddressByNameW(DWORD dwNameSpace, LPGUID lpServiceType, LPWSTR lpS * Retrieve a service type GUID for a network service specified by name. * * PARAMETERS - * lpServiceName [I] NUL-terminated ASCII string that uniquely represents the name of the service + * lpServiceName [I] NUL-terminated ANSI string that uniquely represents the name of the service * lpServiceType [O] Destination for the service type GUID * * RETURNS @@ -114,7 +114,7 @@ INT WINAPI GetTypeByNameW(LPWSTR lpServiceName, LPGUID lpServiceType) * dwNameSpace [I] Name space or set of name spaces within which the function will operate * dwOperation [I] Operation to perform * dwFlags [I] Flags to modify the function's operation - * lpServiceInfo [I] Pointer to a ASCII SERVICE_INFO structure + * lpServiceInfo [I] Pointer to an ANSI SERVICE_INFO structure * lpServiceAsyncInfo [I] Reserved for future use. Must be NULL. * lpdwStatusFlags [O] Destination for function status information * @@ -167,7 +167,7 @@ INT WINAPI SetServiceW(DWORD dwNameSpace, DWORD dwOperation, DWORD dwFlags, LPSE * dwNameSpace [I] Name space or set of name spaces within which the function * will operate. * lpGuid [I] Pointer to GUID of network service type. - * lpServiceName [I] NUL-terminated ASCII string that uniquely represents the name + * lpServiceName [I] NUL-terminated ANSI string that uniquely represents the name * of the service. * dwProperties [I] Flags specifying which information to return in lpBuffer. * lpBuffer [O] Pointer to buffer where the function returns an array

1 0

Paul Gofman : winhttp: Execute WinHttpReadData() synchronously if the data is available.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: be5acd1c07e093c3b4fe079bff3db74f300ea83b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be5acd1c07e093c3b4fe079b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 25 12:57:54 2021 +0300 winhttp: Execute WinHttpReadData() synchronously if the data is available. Fixes eFootball PES 2021 in game contents download. Signed-off-by: Paul Gofman <pgofman(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 | 9 ++++++--- dlls/winhttp/tests/notification.c | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 03f895a7fdb..001fff74a87 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2931,6 +2931,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L { DWORD ret; struct request *request; + BOOL async; TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_read, read); @@ -2946,7 +2947,8 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L return FALSE; } - if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !end_of_read_data( request ) + && !query_data_ready( request )) { struct read_data *r; @@ -2962,12 +2964,13 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L release_object( &request->hdr ); free( r ); } + else ret = ERROR_IO_PENDING; } - else ret = read_data( request, buffer, to_read, read, FALSE ); + else ret = read_data( request, buffer, to_read, read, async ); release_object( &request->hdr ); SetLastError( ret ); - return !ret; + return !ret || ret == ERROR_IO_PENDING; } static DWORD write_data( struct request *request, const void *buffer, DWORD to_write, DWORD *written, BOOL async ) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 7d1bfa78a49..4cfffe6687e 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -615,6 +615,11 @@ static void test_async( void ) WaitForSingleObject( info.wait, INFINITE ); + ok(info.last_status == WINHTTP_CALLBACK_STATUS_READ_COMPLETE, "got status %#x.\n", status); + ok((err == ERROR_SUCCESS && info.last_thread_id == GetCurrentThreadId()) + || (err == ERROR_IO_PENDING && info.last_thread_id != GetCurrentThreadId()), + "Got unexpected thread %#x, err %#x.\n", info.last_thread_id, err); + setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con );

1 0

Paul Gofman : winhttp: Execute WinHttpQueryDataAvailable() synchronously if the data is available.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 1c659954df22593771c455a731b1bee761fb8742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c659954df22593771c455a7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 25 12:57:53 2021 +0300 winhttp: Execute WinHttpQueryDataAvailable() synchronously if the data is available. Signed-off-by: Paul Gofman <pgofman(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 | 9 ++++++--- dlls/winhttp/tests/notification.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b8f5817737e..03f895a7fdb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2873,6 +2873,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) { DWORD ret; struct request *request; + BOOL async; TRACE("%p, %p\n", hrequest, available); @@ -2888,7 +2889,8 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return FALSE; } - if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !end_of_read_data( request ) + && !query_data_ready( request )) { struct query_data *q; @@ -2902,12 +2904,13 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) release_object( &request->hdr ); free( q ); } + else ret = ERROR_IO_PENDING; } - else ret = query_data_available( request, available, FALSE ); + else ret = query_data_available( request, available, async ); release_object( &request->hdr ); SetLastError( ret ); - return !ret; + return !ret || ret == ERROR_IO_PENDING; } static void CALLBACK task_read_data( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 98e4024867f..7d1bfa78a49 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -71,6 +71,8 @@ struct info unsigned int index; HANDLE wait; unsigned int line; + DWORD last_thread_id; + DWORD last_status; }; struct test_request @@ -85,6 +87,9 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW BOOL status_ok, function_ok; struct info *info = (struct info *)context; + info->last_status = status; + info->last_thread_id = GetCurrentThreadId(); + if (status == WINHTTP_CALLBACK_STATUS_HANDLE_CREATED) { DWORD size = sizeof(struct info *); @@ -177,6 +182,8 @@ static void setup_test( struct info *info, enum api function, unsigned int line ok_(__FILE__,line)(info->test[info->index].function == function, "unexpected function %u, expected %u. probably some notifications were missing\n", info->test[info->index].function, function); + info->last_thread_id = 0xdeadbeef; + info->last_status = 0xdeadbeef; } static void end_test( struct info *info, unsigned int line ) @@ -597,6 +604,10 @@ static void test_async( void ) ok(err == ERROR_SUCCESS || err == ERROR_IO_PENDING || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); WaitForSingleObject( info.wait, INFINITE ); + ok(info.last_status == WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, "got status %#x.\n", status); + ok((err == ERROR_SUCCESS && info.last_thread_id == GetCurrentThreadId()) + || (err == ERROR_IO_PENDING && info.last_thread_id != GetCurrentThreadId()), + "Got unexpected thread %#x, err %#x.\n", info.last_thread_id, err); setup_test( &info, winhttp_read_data, __LINE__ ); ret = WinHttpReadData( req, buffer, sizeof(buffer), NULL );

1 0

Paul Gofman : winhttp: Factor out query_data_ready() function.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: bc5305e5991632445309a374b40efa582362fdc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc5305e5991632445309a374… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 25 12:57:52 2021 +0300 winhttp: Factor out query_data_ready() function. Signed-off-by: Paul Gofman <pgofman(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 | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a6c16d7b653..b8f5817737e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2815,19 +2815,26 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) return !ret; } +static DWORD query_data_ready( struct request *request ) +{ + DWORD count; + + count = get_available_data( request ); + if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); + + return count; +} + static DWORD query_data_available( struct request *request, DWORD *available, BOOL async ) { DWORD ret = ERROR_SUCCESS, count = 0; if (end_of_read_data( request )) goto done; - count = get_available_data( request ); - if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); - if (!count) + if (!(count = query_data_ready( request ))) { if ((ret = refill_buffer( request, async ))) goto done; - count = get_available_data( request ); - if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); + count = query_data_ready( request ); } done:

1 0

Michael Stefaniuc : msvcrt/tests: Remove redundant NULL check before free().
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 2d9e89a80f25ae9cf031c3662d5b65a74893a07c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d9e89a80f25ae9cf031c366… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 25 22:39:08 2021 +0200 msvcrt/tests: Remove redundant NULL check before free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 80eab3364ba..15105ca60dd 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1101,8 +1101,7 @@ static void test_demangle_datatype(void) name = p__unDName(0, demangle[i].mangled, 0, malloc, free, 0x2800); todo_wine_if (!demangle[i].test_in_wine) ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); - if(name) - free(name); + free(name); } }

1 0

Alexandre Julliard : dpnet: Fix short buffer check also for the A case.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: b95cc688944fc9eacf5bd3a0ef30e78c2d0188b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b95cc688944fc9eacf5bd3a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 26 12:46:18 2021 +0200 dpnet: Fix short buffer check also for the A case. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/address.c | 3 --- dlls/dpnet/tests/address.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 7216576dbf1..d7e802f8106 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -326,10 +326,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface return DPNERR_INVALIDPOINTER; if(url && *length) - { - url[0] = '\0'; buffer = heap_alloc(*length * sizeof(WCHAR)); - } hr = IDirectPlay8Address_GetURLW(iface, buffer, length); if(hr == DPN_OK) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index b3ab80f2b3c..fe17cfde52d 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -400,9 +400,10 @@ static void address_urlA(void) ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); bufflen2 = bufflen/2; + memset( buffer, 0x55, sizeof(buffer) ); hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen2); ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); - ok(!strlen(buffer), "wrong length\n"); + ok(buffer[0] == 0x55, "buffer modified\n"); hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alexandre Julliard : winecrt0: Add fallback implementation for __wine_unix_call().
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 53bd74489d7eed82068f2351017d162a82de1abc URL: https://source.winehq.org/git/wine.git/?a=commit;h=53bd74489d7eed82068f2351… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 26 17:41:21 2021 +0200 winecrt0: Add fallback implementation for __wine_unix_call(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/unix_lib.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index e3a1437026a..584da22ab71 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -27,8 +27,10 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "wine/unixlib.h" static NTSTATUS (__cdecl *p__wine_init_unix_lib)( HMODULE, DWORD, const void *, void * ); +static NTSTATUS (WINAPI *p__wine_unix_call)( unixlib_handle_t, unsigned int, void * ); static void load_func( void **func, const char *name, void *def ) { @@ -46,10 +48,21 @@ static NTSTATUS __cdecl fallback__wine_init_unix_lib( HMODULE module, DWORD reas return STATUS_DLL_NOT_FOUND; } +static NTSTATUS __cdecl fallback__wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) +{ + return STATUS_DLL_NOT_FOUND; +} + NTSTATUS __cdecl __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) { LOAD_FUNC( __wine_init_unix_lib ); return p__wine_init_unix_lib( module, reason, ptr_in, ptr_out ); } +NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) +{ + LOAD_FUNC( __wine_unix_call ); + return p__wine_unix_call( handle, code, args ); +} + #endif /* _WIN32 */

1 0

Alexandre Julliard : ntdll: Move the syscall dispatcher implementation to the platform-specific files.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: ff04d8a4c2fda2a61bc5bdbd8ef52027826abd05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff04d8a4c2fda2a61bc5bdbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 25 18:25:15 2021 +0200 ntdll: Move the syscall dispatcher implementation to the platform-specific files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 73 +++++++ dlls/ntdll/unix/signal_arm64.c | 127 +++++++++++ dlls/ntdll/unix/signal_i386.c | 131 ++++++++++- dlls/ntdll/unix/signal_x86_64.c | 142 ++++++++++++ tools/winebuild/import.c | 466 ---------------------------------------- 5 files changed, 472 insertions(+), 467 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff04d8a4c2fda2a61bc5…

1 0

Alexandre Julliard : ntdll: Store the syscall table in the syscall frame on all platforms.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 847db3c1d3f5444808814cbea8f2920b16a96fcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=847db3c1d3f5444808814cbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 25 15:15:01 2021 +0200 ntdll: Store the syscall table in the syscall frame on all platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 6 ++ dlls/ntdll/unix/signal_arm.c | 10 ++- dlls/ntdll/unix/signal_arm64.c | 14 +++-- dlls/ntdll/unix/signal_i386.c | 51 ++++++++-------- dlls/ntdll/unix/signal_x86_64.c | 7 ++- include/wine/unixlib.h | 2 + include/winternl.h | 8 +++ tools/winebuild/import.c | 131 ++++++++++++++++++---------------------- 8 files changed, 122 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=847db3c1d3f544480881…

1 0

Alexandre Julliard : ntdll: Store the syscall flags in the syscall frame on all platforms.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 77f5e2963f769bbebd9f95fcb743af290a40ff06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f5e2963f769bbebd9f95fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 25 13:31:49 2021 +0200 ntdll: Store the syscall flags in the syscall frame on all platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 12 +++++++----- dlls/ntdll/unix/signal_x86_64.c | 15 ++++++++++----- dlls/ntdll/unix/unix_private.h | 1 - tools/winebuild/import.c | 7 ++----- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 1cd6ef7bb39..04645a9c4a6 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -519,6 +519,8 @@ C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, sysca #define SYSCALL_HAVE_XSAVEC 2 #define SYSCALL_HAVE_FXSAVE 4 +static unsigned int syscall_flags; + static inline struct x86_thread_data *x86_thread_data(void) { return (struct x86_thread_data *)ntdll_get_thread_data()->cpu_data; @@ -1614,7 +1616,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void callback_frame.frame.esp = (ULONG_PTR)stack; callback_frame.frame.eip = (ULONG_PTR)pKiUserCallbackDispatcher; callback_frame.frame.eflags = 0x202; - callback_frame.frame.syscall_flags = __wine_syscall_flags; + callback_frame.frame.syscall_flags = frame->syscall_flags; callback_frame.frame.prev_frame = frame; x86_thread_data()->syscall_frame = &callback_frame.frame; @@ -2340,9 +2342,9 @@ void signal_init_process(void) x86_thread_data()->syscall_frame = (struct syscall_frame *)kernel_stack - 1; - if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_FXSR) __wine_syscall_flags |= SYSCALL_HAVE_FXSAVE; - if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) __wine_syscall_flags |= SYSCALL_HAVE_XSAVE; - if (xstate_compaction_enabled) __wine_syscall_flags |= SYSCALL_HAVE_XSAVEC; + if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_FXSR) syscall_flags |= SYSCALL_HAVE_FXSAVE; + if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) syscall_flags |= SYSCALL_HAVE_XSAVE; + if (xstate_compaction_enabled) syscall_flags |= SYSCALL_HAVE_XSAVEC; sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_SIGINFO | SA_RESTART | SA_ONSTACK; @@ -2417,7 +2419,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B frame->esp = (DWORD)stack; frame->eip = (DWORD)pLdrInitializeThunk; frame->prev_frame = NULL; - frame->syscall_flags = __wine_syscall_flags; + frame->syscall_flags = syscall_flags; frame->restore_flags |= CONTEXT_INTEGER; pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index e6971b4629a..cc2238f62c4 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -285,6 +285,8 @@ C_ASSERT( sizeof(struct stack_layout) == 0x590 ); /* Should match the size in ca #define SYSCALL_HAVE_PTHREAD_TEB 4 #define SYSCALL_HAVE_WRFSGSBASE 8 +static unsigned int syscall_flags; + /* stack layout when calling an user apc function. * FIXME: match Windows ABI. */ struct apc_stack_layout @@ -325,7 +327,8 @@ struct syscall_frame DWORD restore_flags; /* 0094 */ ULONG64 rbp; /* 0098 */ struct syscall_frame *prev_frame; /* 00a0 */ - ULONG64 align[3]; /* 00a8 */ + DWORD syscall_flags; /* 00a8 */ + DWORD align[5]; /* 00ac */ XMM_SAVE_AREA32 xsave; /* 00c0 */ DECLSPEC_ALIGN(64) XSTATE xstate; /* 02c0 */ }; @@ -2314,6 +2317,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void callback_frame.frame.eflags = 0x200; callback_frame.frame.restore_flags = CONTEXT_CONTROL | CONTEXT_INTEGER; callback_frame.frame.prev_frame = frame; + callback_frame.frame.syscall_flags = frame->syscall_flags; amd64_thread_data()->syscall_frame = &callback_frame.frame; __wine_syscall_dispatcher_return( &callback_frame.frame, 0 ); @@ -2935,8 +2939,8 @@ void signal_init_process(void) anon_mmap_fixed( ptr, page_size, PROT_READ | PROT_WRITE, 0 ); *(void **)ptr = __wine_syscall_dispatcher; - if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) __wine_syscall_flags |= SYSCALL_HAVE_XSAVE; - if (xstate_compaction_enabled) __wine_syscall_flags |= SYSCALL_HAVE_XSAVEC; + if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) syscall_flags |= SYSCALL_HAVE_XSAVE; + if (xstate_compaction_enabled) syscall_flags |= SYSCALL_HAVE_XSAVEC; #ifdef __linux__ if (NtCurrentTeb()->WowTebOffset) @@ -2948,8 +2952,8 @@ void signal_init_process(void) if ((sel = alloc_fs_sel( -1, teb32 )) != -1) { fs32_sel = (sel << 3) | 3; - __wine_syscall_flags |= SYSCALL_HAVE_PTHREAD_TEB; - if (getauxval( AT_HWCAP2 ) & 2) __wine_syscall_flags |= SYSCALL_HAVE_WRFSGSBASE; + syscall_flags |= SYSCALL_HAVE_PTHREAD_TEB; + if (getauxval( AT_HWCAP2 ) & 2) syscall_flags |= SYSCALL_HAVE_WRFSGSBASE; } else ERR_(seh)( "failed to allocate %%fs selector\n" ); } @@ -3038,6 +3042,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B frame->rcx = (ULONG64)ctx; frame->prev_frame = NULL; frame->restore_flags |= CONTEXT_INTEGER; + frame->syscall_flags = syscall_flags; pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); __wine_syscall_dispatcher_return( frame, 0 ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 961ba42b232..731b12d332c 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -252,7 +252,6 @@ extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE ent extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ) DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; extern void WINAPI DECLSPEC_NORETURN __wine_syscall_dispatcher_return( void *frame, ULONG_PTR retval ) DECLSPEC_HIDDEN; -extern unsigned int __wine_syscall_flags DECLSPEC_HIDDEN; extern NTSTATUS signal_set_full_context( CONTEXT *context ) DECLSPEC_HIDDEN; extern NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) DECLSPEC_HIDDEN; extern NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) DECLSPEC_HIDDEN; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 5f1946e0c4f..4b1e0b18b46 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1576,7 +1576,7 @@ static void output_syscall_dispatcher(void) /* Legends of Runeterra hooks the first system call return instruction, and * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x70(%%rcx)\n" ); - output( "\tmovl %s(%%rip),%%r14d\n", asm_name("__wine_syscall_flags") ); + output( "\tmovl 0xa8(%%rcx),%%r14d\n" ); /* frame->syscall_flags */ output( "\ttestl $3,%%r14d\n" ); /* SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC */ output( "\tjz 2f\n" ); output( "\tmovl $7,%%eax\n" ); @@ -1685,7 +1685,7 @@ static void output_syscall_dispatcher(void) output( "5:\tmovl $0x%x,%%edx\n", invalid_param ); output( "\tmovq %%rsp,%%rcx\n" ); output( "%s\n", asm_globl("__wine_syscall_dispatcher_return") ); - output( "\tmovl %s(%%rip),%%r14d\n", asm_name("__wine_syscall_flags") ); + output( "\tmovl 0xa8(%%rcx),%%r14d\n" ); /* frame->syscall_flags */ output( "\tmovq %%rdx,%%rax\n" ); output( "\tjmp 2b\n" ); break; @@ -1932,9 +1932,6 @@ void output_syscalls( DLLSPEC *spec ) output( ".Lsyscall_args:\n" ); for (i = 0; i < count; i++) output( "\t.byte %u\n", get_args_size( syscalls[i] )); - output( "\t.align %d\n", get_alignment(4) ); - output( "%s\n", asm_globl("__wine_syscall_flags") ); - output( "\t.long 0\n" ); return; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021