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

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

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

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 : 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 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 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

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

Biswapriyo Nath : include/d3d10.idl: Use unions in D3D10_BUFFER_RTV structure.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 40690d0104fecf43f89e5fd64e9bf1615d4ed966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40690d0104fecf43f89e5fd6… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Aug 22 10:27:55 2020 +0530 include/d3d10.idl: Use unions in D3D10_BUFFER_RTV structure. 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/d3d10.idl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index f125956fdd..2e8927f318 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -660,8 +660,14 @@ typedef enum D3D10_RTV_DIMENSION { } D3D10_RTV_DIMENSION; typedef struct D3D10_BUFFER_RTV { - UINT ElementOffset; - UINT ElementWidth; + union { + UINT FirstElement; + UINT ElementOffset; + }; + union { + UINT NumElements; + UINT ElementWidth; + }; } D3D10_BUFFER_RTV; typedef struct D3D10_TEX1D_RTV {

1 0

Biswapriyo Nath : include/d3d10.idl: Use unions in D3D10_BUFFER_SRV structure.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 18f076d36859031114ddc0b1a3d145a6a57cbe58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f076d36859031114ddc0b1… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Aug 22 10:27:55 2020 +0530 include/d3d10.idl: Use unions in D3D10_BUFFER_SRV structure. 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/d3d10.idl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index 2e8927f318..4a94034a7c 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -723,8 +723,14 @@ typedef struct D3D10_RENDER_TARGET_VIEW_DESC { typedef D3D_SRV_DIMENSION D3D10_SRV_DIMENSION; typedef struct D3D10_BUFFER_SRV { - UINT ElementOffset; - UINT ElementWidth; + union { + UINT FirstElement; + UINT ElementOffset; + }; + union { + UINT NumElements; + UINT ElementWidth; + }; } D3D10_BUFFER_SRV; typedef struct D3D10_TEX1D_SRV {

1 0

Fabian Maurer : msvcrt/math: In _fcvt/_fcvt_s handle locale decimal separator properly.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 9a9319b0589065edbc60a1ff7735cad0dbe481af URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a9319b0589065edbc60a1ff… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Aug 24 22:01:30 2020 +0200 msvcrt/math: In _fcvt/_fcvt_s handle locale decimal separator properly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49730 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a75b551210..15d8fa4be7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2518,6 +2518,7 @@ char * CDECL MSVCRT__fcvt( double number, int ndigits, int *decpt, int *sign ) int stop, dec1, dec2; char *ptr1, *ptr2, *first; char buf[80]; /* ought to be enough */ + char decimal_separator = get_locinfo()->lconv->decimal_point[0]; if (!data->efcvt_buffer) data->efcvt_buffer = MSVCRT_malloc( 80 ); /* ought to be enough */ @@ -2549,7 +2550,7 @@ char * CDECL MSVCRT__fcvt( double number, int ndigits, int *decpt, int *sign ) } while (*ptr1 == '0') ptr1++; /* Skip leading zeroes */ - while (*ptr1 != '\0' && *ptr1 != '.') { + while (*ptr1 != '\0' && *ptr1 != decimal_separator) { if (!first) first = ptr2; if ((ptr1 - buf) < stop) { *ptr2++ = *ptr1++; @@ -2598,6 +2599,7 @@ int CDECL MSVCRT__fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int int stop, dec1, dec2; char *ptr1, *ptr2, *first; char buf[80]; /* ought to be enough */ + char decimal_separator = get_locinfo()->lconv->decimal_point[0]; if (!outbuffer || !decpt || !sign || size == 0) { @@ -2632,7 +2634,7 @@ int CDECL MSVCRT__fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int } while (*ptr1 == '0') ptr1++; /* Skip leading zeroes */ - while (*ptr1 != '\0' && *ptr1 != '.') { + while (*ptr1 != '\0' && *ptr1 != decimal_separator) { if (!first) first = ptr2; if ((ptr1 - buf) < stop) { if (size > 1) {

1 0