wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Biswapriyo Nath : include/d3d11sdklayers.idl: Add d3d11 debug feature flags.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: b7e9ee466b244248f540285f775cb1442a8154ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7e9ee466b244248f540285f… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Aug 22 10:27:55 2020 +0530 include/d3d11sdklayers.idl: Add d3d11 debug feature flags. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11sdklayers.idl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/d3d11sdklayers.idl b/include/d3d11sdklayers.idl index 638e53ced6..e54ac01b03 100644 --- a/include/d3d11sdklayers.idl +++ b/include/d3d11sdklayers.idl @@ -20,6 +20,14 @@ import "oaidl.idl"; import "ocidl.idl"; import "d3d11.idl"; +const UINT D3D11_DEBUG_FEATURE_FLUSH_PER_RENDER_OP = 0x1; +const UINT D3D11_DEBUG_FEATURE_FINISH_PER_RENDER_OP = 0x2; +const UINT D3D11_DEBUG_FEATURE_PRESENT_PER_RENDER_OP = 0x4; +const UINT D3D11_DEBUG_FEATURE_ALWAYS_DISCARD_OFFERED_RESOURCE = 0x8; +const UINT D3D11_DEBUG_FEATURE_NEVER_DISCARD_OFFERED_RESOURCE = 0x10; +const UINT D3D11_DEBUG_FEATURE_AVOID_BEHAVIOR_CHANGING_DEBUG_AIDS = 0x40; +const UINT D3D11_DEBUG_FEATURE_DISABLE_TILED_RESOURCE_MAPPING_TRACKING_AND_VALIDATION = 0x80; + typedef enum D3D11_MESSAGE_CATEGORY { D3D11_MESSAGE_CATEGORY_APPLICATION_DEFINED, D3D11_MESSAGE_CATEGORY_MISCELLANEOUS,

1 0

Alexandre Julliard : ntdll: Use syscalls for a couple of Wine internal functions.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: a8ddcf7dfe64b727a0c06d0a008a0ca5b227868c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8ddcf7dfe64b727a0c06d0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 25 14:08:35 2020 +0200 ntdll: Use syscalls for a couple of Wine internal functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/process.c | 18 ------------------ dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/process.c | 19 +++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unix/virtual.c | 4 ++-- dlls/ntdll/unixlib.h | 4 +--- dlls/ntdll/virtual.c | 9 --------- 8 files changed, 24 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5f69cfe785..c4d667a79a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1586,7 +1586,7 @@ @ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr) @ cdecl -syscall wine_server_release_fd(long long) @ cdecl -syscall wine_server_send_fd(long) -@ cdecl __wine_make_process_system() +@ cdecl -syscall __wine_make_process_system() @ cdecl __wine_set_unix_funcs(long ptr) @ extern __wine_syscall_dispatcher @ extern -arch=i386 __wine_ldt_copy @@ -1598,7 +1598,7 @@ @ cdecl -norelay __wine_dbg_strdup(str) # Virtual memory -@ cdecl __wine_locked_recvmsg(long ptr long) +@ cdecl -syscall __wine_locked_recvmsg(long ptr long) # Version @ cdecl -syscall wine_get_version() diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 77ba5b371e..c0b36be38e 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -35,7 +35,6 @@ #include "winternl.h" #include "ntdll_misc.h" #include "wine/exception.h" -#include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(process); @@ -55,23 +54,6 @@ PEB * WINAPI RtlGetCurrentPeb(void) return NtCurrentTeb()->Peb; } -/*********************************************************************** - * __wine_make_process_system (NTDLL.@) - * - * Mark the current process as a system process. - * Returns the event that is signaled when all non-system processes have exited. - */ -HANDLE CDECL __wine_make_process_system(void) -{ - HANDLE ret = 0; - SERVER_START_REQ( make_process_system ) - { - if (!wine_server_call( req )) ret = wine_server_ptr_handle( reply->event ); - } - SERVER_END_REQ; - return ret; -} - /*********************************************************************** * restart_process */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 1a449714d0..40a7ce466c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1347,7 +1347,6 @@ static struct unix_funcs unix_funcs = get_unix_codepage_data, get_locales, virtual_map_section, - virtual_locked_recvmsg, virtual_release_address_space, exec_process, server_init_process_done, diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 9e48982839..6b41080cee 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1666,3 +1666,22 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) SERVER_END_REQ; return ret; } + + +/*********************************************************************** + * __wine_make_process_system (NTDLL.@) + * + * Mark the current process as a system process. + * Returns the event that is signaled when all non-system processes have exited. + */ +HANDLE CDECL __wine_make_process_system(void) +{ + HANDLE ret = 0; + + SERVER_START_REQ( make_process_system ) + { + if (!wine_server_call( req )) ret = wine_server_ptr_handle( reply->event ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a87657096d..aba102cf93 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -118,7 +118,6 @@ extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsigned short zero_bits_64, SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG alloc_type, ULONG protect, pe_image_info_t *image_info ) DECLSPEC_HIDDEN; -extern ssize_t CDECL virtual_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; extern void CDECL server_init_process_done( void *relay ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index e3f2820de5..1173293854 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3072,9 +3072,9 @@ ssize_t virtual_locked_pread( int fd, void *addr, size_t size, off_t offset ) /*********************************************************************** - * virtual_locked_recvmsg + * __wine_locked_recvmsg (NTDLL.@) */ -ssize_t CDECL virtual_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) +ssize_t CDECL __wine_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) { sigset_t sigset; size_t i; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index d3fedc196b..1c6841e980 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -24,11 +24,10 @@ #include "wine/server.h" #include "wine/debug.h" -struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 97 +#define NTDLL_UNIXLIB_VERSION 98 struct unix_funcs { @@ -83,7 +82,6 @@ struct unix_funcs NTSTATUS (CDECL *virtual_map_section)( HANDLE handle, PVOID *addr_ptr, unsigned short zero_bits_64, SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG alloc_type, ULONG protect, pe_image_info_t *image_info ); - ssize_t (CDECL *virtual_locked_recvmsg)( int fd, struct msghdr *hdr, int flags ); void (CDECL *virtual_release_address_space)(void); /* thread/process functions */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 64eef6aa84..acaa6f7565 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -120,12 +120,3 @@ void CDECL virtual_clear_thread_stack( void *stack_end ) NtFreeVirtualMemory( GetCurrentProcess(), &stack, &size, MEM_DECOMMIT ); NtAllocateVirtualMemory( GetCurrentProcess(), &stack, 0, &size, MEM_COMMIT, PAGE_READWRITE ); } - - -/*********************************************************************** - * __wine_locked_recvmsg - */ -ssize_t CDECL __wine_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) -{ - return unix_funcs->virtual_locked_recvmsg( fd, hdr, flags ); -}

1 0

Alexandre Julliard : ntdll: Use syscalls for the Wine version functions.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: af1a328fa0da4df7a73688528e49a568dcea995e URL: https://source.winehq.org/git/wine.git/?a=commit;h=af1a328fa0da4df7a7368852… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 25 14:04:23 2020 +0200 ntdll: Use syscalls for the Wine version functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 24 ------------------------ dlls/ntdll/ntdll.spec | 6 +++--- dlls/ntdll/unix/loader.c | 17 +++++++---------- dlls/ntdll/unixlib.h | 5 +---- include/wine/library.h | 2 -- loader/main.c | 2 ++ 6 files changed, 13 insertions(+), 43 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index a75188e981..9c7708a24a 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -38,30 +38,6 @@ LPCSTR debugstr_us( const UNICODE_STRING *us ) return debugstr_wn(us->Buffer, us->Length / sizeof(WCHAR)); } -/********************************************************************* - * wine_get_version (NTDLL.@) - */ -const char * CDECL wine_get_version(void) -{ - return unix_funcs->get_version(); -} - -/********************************************************************* - * wine_get_build_id (NTDLL.@) - */ -const char * CDECL wine_get_build_id(void) -{ - return unix_funcs->get_build_id(); -} - -/********************************************************************* - * wine_get_host_version (NTDLL.@) - */ -void CDECL wine_get_host_version( const char **sysname, const char **release ) -{ - return unix_funcs->get_host_version( sysname, release ); -} - /********************************************************************* * abs (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 77fa53f245..5f69cfe785 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1601,9 +1601,9 @@ @ cdecl __wine_locked_recvmsg(long ptr long) # Version -@ cdecl wine_get_version() -@ cdecl wine_get_build_id() -@ cdecl wine_get_host_version(ptr ptr) +@ cdecl -syscall wine_get_version() +@ cdecl -syscall wine_get_build_id() +@ cdecl -syscall wine_get_host_version(ptr ptr) # Codepages @ cdecl __wine_get_unix_codepage() diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 800d6bf57b..1a449714d0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -354,18 +354,18 @@ static void init_paths( int argc, char *argv[], char *envp[] ) /********************************************************************* - * get_version + * wine_get_version */ -const char * CDECL get_version(void) +const char * CDECL wine_get_version(void) { return PACKAGE_VERSION; } /********************************************************************* - * get_build_id + * wine_get_build_id */ -const char * CDECL get_build_id(void) +const char * CDECL wine_get_build_id(void) { extern const char wine_build[]; return wine_build; @@ -373,9 +373,9 @@ const char * CDECL get_build_id(void) /********************************************************************* - * get_host_version + * wine_get_host_version */ -void CDECL get_host_version( const char **sysname, const char **release ) +void CDECL wine_get_host_version( const char **sysname, const char **release ) { #ifdef HAVE_SYS_UTSNAME_H static struct utsname buf; @@ -1346,9 +1346,6 @@ static struct unix_funcs unix_funcs = get_initial_directory, get_unix_codepage_data, get_locales, - get_version, - get_build_id, - get_host_version, virtual_map_section, virtual_locked_recvmsg, virtual_release_address_space, @@ -1604,7 +1601,7 @@ static void check_command_line( int argc, char *argv[] ) } if (!strcmp( argv[1], "--version" )) { - printf( "%s\n", get_build_id() ); + printf( "%s\n", wine_get_build_id() ); exit(0); } } diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 22ccb0911b..d3fedc196b 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 96 +#define NTDLL_UNIXLIB_VERSION 97 struct unix_funcs { @@ -78,9 +78,6 @@ struct unix_funcs void (CDECL *get_initial_directory)( UNICODE_STRING *dir ); USHORT * (CDECL *get_unix_codepage_data)(void); void (CDECL *get_locales)( WCHAR *sys, WCHAR *user ); - const char * (CDECL *get_version)(void); - const char * (CDECL *get_build_id)(void); - void (CDECL *get_host_version)( const char **sysname, const char **release ); /* virtual memory functions */ NTSTATUS (CDECL *virtual_map_section)( HANDLE handle, PVOID *addr_ptr, unsigned short zero_bits_64, SIZE_T commit_size, diff --git a/include/wine/library.h b/include/wine/library.h index 090b834955..405ce0d9da 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -41,8 +41,6 @@ extern "C" { /* configuration */ -extern const char *wine_get_version(void); -extern const char *wine_get_build_id(void); extern void wine_init_argv0_path( const char *argv0 ); extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ); diff --git a/loader/main.c b/loader/main.c index 3c06728504..a92276fa41 100644 --- a/loader/main.c +++ b/loader/main.c @@ -42,6 +42,8 @@ extern char **environ; +extern const char *wine_get_build_id(void); + /* the preloader will set this variable */ const struct wine_preload_info *wine_main_preload_info = NULL;

1 0

Alexandre Julliard : ntdll: Use syscalls for the file path conversion functions.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 482b64effd44a8f601d3327eed84ce6d61432cf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=482b64effd44a8f601d3327e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 25 13:57:02 2020 +0200 ntdll: Use syscalls for the file path conversion functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 16 ---------------- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/path.c | 11 +---------- dlls/ntdll/unix/loader.c | 2 -- dlls/ntdll/unixlib.h | 5 +---- 5 files changed, 4 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index dbfba303b2..39641e9d4d 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -83,22 +83,6 @@ void init_directories(void) } -/****************************************************************************** - * wine_nt_to_unix_file_name (NTDLL.@) Not a Windows API - * - * Convert a file name from NT namespace to Unix namespace. - * - * If disposition is not FILE_OPEN or FILE_OVERWRITE, the last path - * element doesn't have to exist; in that case STATUS_NO_SUCH_FILE is - * returned, but the unix name is still filled in properly. - */ -NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, char *nameA, SIZE_T *size, - UINT disposition ) -{ - return unix_funcs->nt_to_unix_file_name( nameW, nameA, size, disposition ); -} - - /****************************************************************** * RtlWow64EnableFsRedirection (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8a1890ac09..77fa53f245 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1609,5 +1609,5 @@ @ cdecl __wine_get_unix_codepage() # Filesystem -@ cdecl wine_nt_to_unix_file_name(ptr ptr ptr long) -@ cdecl wine_unix_to_nt_file_name(str ptr ptr) +@ cdecl -syscall wine_nt_to_unix_file_name(ptr ptr ptr long) +@ cdecl -syscall wine_unix_to_nt_file_name(str ptr ptr) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 5f2d379071..53470b4f35 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -555,7 +555,7 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) for (;;) { if (!(nt_str = RtlAllocateHeap( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) break; - status = unix_funcs->unix_to_nt_file_name( unix_name, nt_str, &buflen ); + status = wine_unix_to_nt_file_name( unix_name, nt_str, &buflen ); if (status != STATUS_BUFFER_TOO_SMALL) break; RtlFreeHeap( GetProcessHeap(), 0, nt_str ); } @@ -892,12 +892,3 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) RtlReleasePebLock(); return nts; } - - -/****************************************************************** - * wine_unix_to_nt_file_name (NTDLL.@) Not a Windows API - */ -NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_T *size ) -{ - return unix_funcs->unix_to_nt_file_name( name, buffer, size ); -} diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 8ce7b22ddd..800d6bf57b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1354,8 +1354,6 @@ static struct unix_funcs unix_funcs = virtual_release_address_space, exec_process, server_init_process_done, - wine_nt_to_unix_file_name, - wine_unix_to_nt_file_name, set_show_dot_files, load_so_dll, load_builtin_dll, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 1c48864a0e..22ccb0911b 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 95 +#define NTDLL_UNIXLIB_VERSION 96 struct unix_funcs { @@ -96,9 +96,6 @@ struct unix_funcs void (CDECL *server_init_process_done)( void *relay ); /* file functions */ - NTSTATUS (CDECL *nt_to_unix_file_name)( const UNICODE_STRING *nameW, char *nameA, SIZE_T *size, - UINT disposition ); - NTSTATUS (CDECL *unix_to_nt_file_name)( const char *name, WCHAR *buffer, SIZE_T *size ); void (CDECL *set_show_dot_files)( BOOL enable ); /* loader functions */

1 0

Alexandre Julliard : ntdll: Use syscalls for the server functions.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 4e5811637ad027d01cc5033f76b03e6e8cfdd287 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e5811637ad027d01cc5033f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 25 13:54:32 2020 +0200 ntdll: Use syscalls for the server functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 - dlls/ntdll/loader.c | 2 + dlls/ntdll/ntdll.spec | 10 +-- dlls/ntdll/server.c | 139 ----------------------------------------- dlls/ntdll/unix/env.c | 6 +- dlls/ntdll/unix/loader.c | 5 -- dlls/ntdll/unix/process.c | 14 ++--- dlls/ntdll/unix/server.c | 24 +++---- dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 6 -- dlls/ntdll/unixlib.h | 9 +-- 11 files changed, 31 insertions(+), 187 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e5811637ad027d01cc5…

1 0

Alexandre Julliard : winebuild: Allow syscalls to use the cdecl convention.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 0e7f6e0ed32ffe5fe09ae429037fc28dcbebe6ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e7f6e0ed32ffe5fe09ae429… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 25 13:51:37 2020 +0200 winebuild: Allow syscalls to use the cdecl convention. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 2 +- tools/winebuild/parser.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 751335f36f..adb1a3dafe 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1700,7 +1700,7 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovl $%s,%%edx\n", asm_name("__wine_syscall") ); } output( "\tcall *%%edx\n" ); - output( "\tret $%u\n", get_args_size( odp )); + output( "\tret $%u\n", odp->type == TYPE_STDCALL ? get_args_size( odp ) : 0 ); break; case CPU_x86_64: /* Chromium depends on syscall thunks having the same form as on diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 54fffd8a1b..2e6424fe76 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -323,9 +323,9 @@ static int parse_spec_arguments( ORDDEF *odp, DLLSPEC *spec, int optional ) } if (odp->flags & FLAG_SYSCALL) { - if (odp->type != TYPE_STDCALL) + if (odp->type != TYPE_STDCALL && odp->type != TYPE_CDECL) { - error( "A syscall function must use the stdcall convention\n" ); + error( "A syscall function must use either the stdcall or the cdecl convention\n" ); return 0; } }

1 0

Martin Storsjo : ntdll/tests: Add a larger testcase covering most arm64 unwinding opcodes.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: a12e308ebaa226caaaa8e8c932bc2c7687914d21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a12e308ebaa226caaaa8e8c9… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Aug 25 12:26:29 2020 +0300 ntdll/tests: Add a larger testcase covering most arm64 unwinding opcodes. These all seem to be implemented correctly as no changes to the wine implementation is needed. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 139 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a12e308ebaa226caaaa8…

1 0

Martin Storsjo : ntdll: Implement the arm64 machine frame and context unwind opcodes.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: bc3284f818f70d2de0bc76beaa69a3352f27fd34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc3284f818f70d2de0bc76be… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Aug 25 12:26:28 2020 +0300 ntdll: Implement the arm64 machine frame and context unwind opcodes. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 13 ++++++- dlls/ntdll/tests/exception.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 5521e915a7..719c71f952 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -635,6 +635,15 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, ptr += len; continue; } + else if (*ptr == 0xe9) /* MSFT_OP_MACHINE_FRAME */ + { + context->Pc = ((DWORD64 *)context->Sp)[1]; + context->Sp = ((DWORD64 *)context->Sp)[0]; + } + else if (*ptr == 0xea) /* MSFT_OP_CONTEXT */ + { + memcpy( context, (DWORD64 *)context->Sp, sizeof(CONTEXT) ); + } else { WARN( "unsupported code %02x\n", *ptr ); @@ -891,13 +900,15 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, *handler_data = NULL; + context->Pc = 0; if (func->u.s.Flag) handler = unwind_packed_data( base, pc, func, context, ctx_ptr ); else handler = unwind_full_data( base, pc, func, context, handler_data, ctx_ptr ); TRACE( "ret: lr=%lx sp=%lx handler=%p\n", context->u.s.Lr, context->Sp, handler ); - context->Pc = context->u.s.Lr; + if (!context->Pc) + context->Pc = context->u.s.Lr; context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; *frame_ret = context->Sp; return handler; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 6c6bb97d02..d53b7b659c 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4539,12 +4539,94 @@ static void test_virtual_unwind(void) #endif }; + static const BYTE function_2[] = + { + 0xff, 0x43, 0x00, 0xd1, /* 00: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 04: nop */ + 0xff, 0x43, 0x00, 0xd1, /* 08: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 0c: nop */ + 0xc0, 0x03, 0x5f, 0xd6, /* 10: ret */ + }; + + static const DWORD unwind_info_2_header = + (sizeof(function_2)/4) | /* function length */ + (0 << 20) | /* X */ + (0 << 21) | /* E */ + (0 << 22) | /* epilog */ + (1 << 27); /* codes */ + + static const BYTE unwind_info_2[] = + { + DW(unwind_info_2_header), + + UWOP_ALLOC_SMALL(16), /* sub sp, sp, #16 */ + UWOP_MACHINE_FRAME, + UWOP_ALLOC_SMALL(16), /* sub sp, sp, #16 */ + UWOP_END, + }; + + /* Partial prologues with the custom frame opcodes (machine frame, + * context) behave like there's an off-by-one bug; unwinding from + * offset 0, which normally does nothing, executes one opcode if + * there's a machine frame or context in the prologue, and for other + * offsets, it behaves like unwinding from one instruction further + * ahead. So only test the full prologue case. */ + static const struct results results_2[] = + { + /* offset fp handler pc frame offset registers */ +#if 0 + { 0x00, 0x00, 0, ORIG_LR, 0x010, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0, 0x0008, 0x010, FALSE, { {-1,-1} }}, + { 0x08, 0x00, 0, 0x0018, 0x020, FALSE, { {-1,-1} }}, +#endif + { 0x0c, 0x00, 0, 0x0018, 0x020, FALSE, { {-1,-1} }}, + }; + + static const BYTE function_3[] = + { + 0xff, 0x43, 0x00, 0xd1, /* 00: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 04: nop */ + 0xff, 0x43, 0x00, 0xd1, /* 08: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 0c: nop */ + 0xc0, 0x03, 0x5f, 0xd6, /* 10: ret */ + }; + + static const DWORD unwind_info_3_header = + (sizeof(function_3)/4) | /* function length */ + (0 << 20) | /* X */ + (0 << 21) | /* E */ + (0 << 22) | /* epilog */ + (1 << 27); /* codes */ + + static const BYTE unwind_info_3[] = + { + DW(unwind_info_3_header), + + UWOP_ALLOC_SMALL(16), /* sub sp, sp, #16 */ + UWOP_CONTEXT, + UWOP_ALLOC_SMALL(16), /* sub sp, sp, #16 */ + UWOP_END, + }; + + static const struct results results_3[] = + { + /* offset fp handler pc frame offset registers */ +#if 0 + { 0x00, 0x00, 0, ORIG_LR, 0x010, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0 , 0x0108, 0x110, FALSE, { {x0, 0x08}, {x1, 0x10}, {x2, 0x18}, {x3, 0x20}, {x4, 0x28}, {x5, 0x30}, {x6, 0x38}, {x7, 0x40}, {x8, 0x48}, {x9, 0x50}, {x10, 0x58}, {x11, 0x60}, {x12, 0x68}, {x13, 0x70}, {x14, 0x78}, {x15, 0x80}, {x16, 0x88}, {x17, 0x90}, {x18, 0x98}, {x19, 0xA0}, {x20, 0xA8}, {x21, 0xB0}, {x22, 0xB8}, {x23, 0xC0}, {x24, 0xC8}, {x25, 0xD0}, {x26, 0xD8}, {x27, 0xE0}, {x28, 0xE8}, {x29, 0xF0}, {lr, 0xF8}, {d0, 0x110}, {d1, 0x120}, {d2, 0x130}, {d3, 0x140}, {d4, 0x150}, {d5, 0x160}, {d6, 0x170}, {d7, 0x180}, {d8, 0x190}, {d9, 0x1a0}, {d10, 0x1b0}, {d11, 0x1c0}, {d12, 0x1d0}, {d13, 0x1e0}, {d14, 0x1f0}, {d15, 0x200}, {-1,-1} }}, + { 0x08, 0x00, 0 , 0x0118, 0x120, FALSE, { {x0, 0x18}, {x1, 0x20}, {x2, 0x28}, {x3, 0x30}, {x4, 0x38}, {x5, 0x40}, {x6, 0x48}, {x7, 0x50}, {x8, 0x58}, {x9, 0x60}, {x10, 0x68}, {x11, 0x70}, {x12, 0x78}, {x13, 0x80}, {x14, 0x88}, {x15, 0x90}, {x16, 0x98}, {x17, 0xA0}, {x18, 0xA8}, {x19, 0xB0}, {x20, 0xB8}, {x21, 0xC0}, {x22, 0xC8}, {x23, 0xD0}, {x24, 0xD8}, {x25, 0xE0}, {x26, 0xE8}, {x27, 0xF0}, {x28, 0xF8}, {x29, 0x100}, {lr, 0x108}, {d0, 0x120}, {d1, 0x130}, {d2, 0x140}, {d3, 0x150}, {d4, 0x160}, {d5, 0x170}, {d6, 0x180}, {d7, 0x190}, {d8, 0x1a0}, {d9, 0x1b0}, {d10, 0x1c0}, {d11, 0x1d0}, {d12, 0x1e0}, {d13, 0x1f0}, {d14, 0x200}, {d15, 0x210}, {-1,-1} }}, +#endif + { 0x0c, 0x00, 0 , 0x0118, 0x120, FALSE, { {x0, 0x18}, {x1, 0x20}, {x2, 0x28}, {x3, 0x30}, {x4, 0x38}, {x5, 0x40}, {x6, 0x48}, {x7, 0x50}, {x8, 0x58}, {x9, 0x60}, {x10, 0x68}, {x11, 0x70}, {x12, 0x78}, {x13, 0x80}, {x14, 0x88}, {x15, 0x90}, {x16, 0x98}, {x17, 0xA0}, {x18, 0xA8}, {x19, 0xB0}, {x20, 0xB8}, {x21, 0xC0}, {x22, 0xC8}, {x23, 0xD0}, {x24, 0xD8}, {x25, 0xE0}, {x26, 0xE8}, {x27, 0xF0}, {x28, 0xF8}, {x29, 0x100}, {lr, 0x108}, {d0, 0x120}, {d1, 0x130}, {d2, 0x140}, {d3, 0x150}, {d4, 0x160}, {d5, 0x170}, {d6, 0x180}, {d7, 0x190}, {d8, 0x1a0}, {d9, 0x1b0}, {d10, 0x1c0}, {d11, 0x1d0}, {d12, 0x1e0}, {d13, 0x1f0}, {d14, 0x200}, {d15, 0x210}, {-1,-1} }}, + }; + static const struct unwind_test tests[] = { #define TEST(func, unwind, unwind_packed, results) \ { func, sizeof(func), unwind, unwind_packed ? 0 : sizeof(unwind), results, ARRAY_SIZE(results) } TEST(function_0, unwind_info_0, 0, results_0), TEST(function_1, unwind_info_1, 1, results_1), + TEST(function_2, unwind_info_2, 0, results_2), + TEST(function_3, unwind_info_3, 0, results_3), #undef TEST }; unsigned int i;

1 0

Martin Storsjo : ntdll/tests: Support testing float registers in the arm64 virtual unwind test.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 41d1fd3229eaaa42f4057fbfa335e0e6d665233e URL: https://source.winehq.org/git/wine.git/?a=commit;h=41d1fd3229eaaa42f4057fbf… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Aug 25 12:26:27 2020 +0300 ntdll/tests: Support testing float registers in the arm64 virtual unwind test. Only testing d0-d15, not d16-d31, for keeping the test references a bit smaller. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 528323c9bc..6c6bb97d02 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4265,7 +4265,7 @@ struct results ULONG_PTR pc; /* expected final pc value */ int frame; /* expected frame return value */ int frame_offset; /* whether the frame return value is an offset or an absolute value */ - int regs[32][2]; /* expected values for registers */ + int regs[48][2]; /* expected values for registers */ }; struct unwind_test @@ -4283,15 +4283,19 @@ enum regs x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, x16, x17, x18, x19, x20, x21, x22, x23, - x24, x25, x26, x27, x28, x29, lr, sp + x24, x25, x26, x27, x28, x29, lr, sp, + d0, d1, d2, d3, d4, d5, d6, d7, + d8, d9, d10, d11, d12, d13, d14, d15 }; -static const char * const reg_names[32] = +static const char * const reg_names[48] = { "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23", - "x24", "x25", "x26", "x27", "x28", "x29", "lr", "sp" + "x24", "x25", "x26", "x27", "x28", "x29", "lr", "sp", + "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", + "d8", "d9", "d10", "d11", "d12", "d13", "d14", "d15", }; #define ORIG_LR 0xCCCCCCCC @@ -4376,10 +4380,12 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) } } ok( frame - sp_offset == context.Sp, "%u/%u: wrong sp %p/%p\n", - testnum, i, (void *)frame - sp_offset, (void *)context.Sp); + testnum, i, (void *)(frame - sp_offset), (void *)context.Sp); - for (j = 0; j < 31; j++) /* Not including sp here */ + for (j = 0; j < 48; j++) { + if (j == sp) continue; /* Handling sp separately above */ + for (k = 0; k < nb_regs; k++) { if (test->results[i].regs[k][0] == -1) @@ -4399,11 +4405,25 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) "%u/%u: register %s wrong %p/%x\n", testnum, i, reg_names[j], (void *)context.X[j], test->results[i].regs[k][1] ); } + else if (j >= d8 && j <= d15 && (&ctx_ptr.D8)[j - d8]) + { + ok( k < nb_regs, "%u/%u: register %s should not be set to %llx\n", + testnum, i, reg_names[j], context.V[j - d0].Low ); + if (k < nb_regs) + ok( context.V[j - d0].Low == test->results[i].regs[k][1], + "%u/%u: register %s wrong %p/%x\n", + testnum, i, reg_names[j], (void *)context.V[j - d0].Low, test->results[i].regs[k][1] ); + } else if (k < nb_regs) { - ok( context.X[j] == test->results[i].regs[k][1], - "%u/%u: register %s wrong %p/%x\n", - testnum, i, reg_names[j], (void *)context.X[j], test->results[i].regs[k][1] ); + if (j < d0) + ok( context.X[j] == test->results[i].regs[k][1], + "%u/%u: register %s wrong %p/%x\n", + testnum, i, reg_names[j], (void *)context.X[j], test->results[i].regs[k][1] ); + else + ok( context.V[j - d0].Low == test->results[i].regs[k][1], + "%u/%u: register %s wrong %p/%x\n", + testnum, i, reg_names[j], (void *)context.V[j - d0].Low, test->results[i].regs[k][1] ); } else { @@ -4414,10 +4434,14 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) else if (j == x29) ok( context.Fp == orig_fp, "%u/%u: register fp wrong %p/unset\n", testnum, i, (void *)context.Fp ); - else + else if (j < d0) ok( context.X[j] == unset_reg, "%u/%u: register %s wrong %p/unset\n", testnum, i, reg_names[j], (void *)context.X[j]); + else + ok( context.V[j - d0].Low == unset_reg, + "%u/%u: register %s wrong %p/unset\n", + testnum, i, reg_names[j], (void *)context.V[j - d0].Low); } } }

1 0

Martin Storsjo : ntdll/tests: Add defines for the complete set of arm64 unwidning opcodes.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 8c0c70dd0f0cccfe1e2c9706f4645e7fce13078c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c0c70dd0f0cccfe1e2c9706… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Aug 25 12:26:26 2020 +0300 ntdll/tests: Add defines for the complete set of arm64 unwidning opcodes. Also correct the previous definition of UWOP_NOP which was a typo (but it wasn't used in any testcase yet). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 1e9047383b..528323c9bc 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4231,10 +4231,31 @@ static void test_debug_service(DWORD numexc) #define UWOP_TWOBYTES(x) (((x) >> 8) & 0xff), ((x) & 0xff) -#define UWOP_ALLOC_SMALL(size) (0x00 | (size / 16)) -#define UWOP_SAVE_REGP(reg, offset) UWOP_TWOBYTES((0xC8 << 8) | ((reg - 19) << 6) | (offset/8)) -#define UWOP_NOP 0xE5 -#define UWOP_END 0xE4 +#define UWOP_ALLOC_SMALL(size) (0x00 | (size/16)) +#define UWOP_SAVE_R19R20_X(offset) (0x20 | (offset/8)) +#define UWOP_SAVE_FPLR(offset) (0x40 | (offset/8)) +#define UWOP_SAVE_FPLR_X(offset) (0x80 | (offset/8 - 1)) +#define UWOP_ALLOC_MEDIUM(size) UWOP_TWOBYTES((0xC0 << 8) | (size/16)) +#define UWOP_SAVE_REGP(reg, offset) UWOP_TWOBYTES((0xC8 << 8) | ((reg - 19) << 6) | (offset/8)) +#define UWOP_SAVE_REGP_X(reg, offset) UWOP_TWOBYTES((0xCC << 8) | ((reg - 19) << 6) | (offset/8 - 1)) +#define UWOP_SAVE_REG(reg, offset) UWOP_TWOBYTES((0xD0 << 8) | ((reg - 19) << 6) | (offset/8)) +#define UWOP_SAVE_REG_X(reg, offset) UWOP_TWOBYTES((0xD4 << 8) | ((reg - 19) << 5) | (offset/8 - 1)) +#define UWOP_SAVE_LRP(reg, offset) UWOP_TWOBYTES((0xD6 << 8) | ((reg - 19)/2 << 6) | (offset/8)) +#define UWOP_SAVE_FREGP(reg, offset) UWOP_TWOBYTES((0xD8 << 8) | ((reg - 8) << 6) | (offset/8)) +#define UWOP_SAVE_FREGP_X(reg, offset) UWOP_TWOBYTES((0xDA << 8) | ((reg - 8) << 6) | (offset/8 - 1)) +#define UWOP_SAVE_FREG(reg, offset) UWOP_TWOBYTES((0xDC << 8) | ((reg - 8) << 6) | (offset/8)) +#define UWOP_SAVE_FREG_X(reg, offset) UWOP_TWOBYTES((0xDE << 8) | ((reg - 8) << 5) | (offset/8 - 1)) +#define UWOP_ALLOC_LARGE(size) UWOP_TWOBYTES((0xE0 << 8) | ((size/16) >> 16)), UWOP_TWOBYTES(size/16) +#define UWOP_SET_FP 0xE1 +#define UWOP_ADD_FP(offset) UWOP_TWOBYTES((0xE2 << 8) | (offset/8)) +#define UWOP_NOP 0xE3 +#define UWOP_END 0xE4 +#define UWOP_END_C 0xE5 +#define UWOP_SAVE_NEXT 0xE6 +#define UWOP_TRAP_FRAME 0xE8 +#define UWOP_MACHINE_FRAME 0xE9 +#define UWOP_CONTEXT 0xEA +#define UWOP_CLEAR_UNWOUND_TO_CALL 0xEC struct results {

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
70
Older →

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 2020