November 2022 - Wine-Commits

Brendan Shanks : ntdll: Set the QoS class of the main Wine thread on macOS.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

Module: wine Branch: master Commit: ed666db8d8d6afd740a266584a38e08622474821 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed666db8d8d6afd740a266584a38e0… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Nov 2 11:09:00 2022 -0700 ntdll: Set the QoS class of the main Wine thread on macOS. --- dlls/ntdll/unix/loader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bca6db5bfe8..3295f7f918b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2335,6 +2335,9 @@ static void apple_create_wine_thread( void *arg ) pthread_attr_init( &attr ); pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ); + /* Use the same QoS class as the process main thread (user-interactive). */ + if (pthread_attr_set_qos_class_np) + pthread_attr_set_qos_class_np( &attr, QOS_CLASS_USER_INTERACTIVE, 0 ); if (pthread_create( &thread, &attr, apple_wine_thread, NULL )) exit(1); pthread_attr_destroy( &attr ); }

1 0

Rémi Bernon : winebuild: Split output_static_lib into output_(import|static)_lib.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

Module: wine Branch: master Commit: fd7cee3e319374d73638dedc724c5a4931b12504 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd7cee3e319374d73638dedc724c5a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Oct 2 22:08:36 2022 +0200 winebuild: Split output_static_lib into output_(import|static)_lib. --- tools/winebuild/build.h | 3 ++- tools/winebuild/import.c | 24 ++++++++++-------------- tools/winebuild/main.c | 4 ++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 9918c2341f4..7ce502143e3 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -305,7 +305,8 @@ extern void output_module( DLLSPEC *spec ); extern void output_stubs( DLLSPEC *spec ); extern void output_syscalls( DLLSPEC *spec ); extern void output_imports( DLLSPEC *spec ); -extern void output_static_lib( DLLSPEC *spec, struct strarray files ); +extern void output_import_lib( DLLSPEC *spec, struct strarray files ); +extern void output_static_lib( const char *output_name, struct strarray files, int create ); extern void output_exports( DLLSPEC *spec ); extern int load_res32_file( const char *name, DLLSPEC *spec ); extern void output_resources( DLLSPEC *spec ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index b1c14db9cab..a2ada71ae36 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1552,7 +1552,7 @@ static void assemble_files( const char *prefix ) } /* build a library from the current asm files and any additional object files in argv */ -static void build_library( const char *output_name, struct strarray files, int create ) +void output_static_lib( const char *output_name, struct strarray files, int create ) { struct strarray args; @@ -1582,7 +1582,7 @@ static void build_library( const char *output_name, struct strarray files, int c } /* create a Windows-style import library */ -static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec ) +static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) { struct strarray args; char *def_file; @@ -1623,10 +1623,12 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec ) } spawn( args ); + + if (files.count) output_static_lib( output_file_name, files, 0 ); } /* create a Unix-style import library */ -static void build_unix_import_lib( DLLSPEC *spec ) +static void build_unix_import_lib( DLLSPEC *spec, struct strarray files ) { int i, total; const char *name, *prefix; @@ -1679,19 +1681,13 @@ static void build_unix_import_lib( DLLSPEC *spec ) assemble_files( spec->file_name ); free( dll_name ); + + output_static_lib( output_file_name, files, 1 ); } /* output an import library for a Win32 module and additional object files */ -void output_static_lib( DLLSPEC *spec, struct strarray files ) +void output_import_lib( DLLSPEC *spec, struct strarray files ) { - if (is_pe()) - { - if (spec) build_windows_import_lib( output_file_name, spec ); - if (files.count || !spec) build_library( output_file_name, files, !spec ); - } - else - { - if (spec) build_unix_import_lib( spec ); - build_library( output_file_name, files, 1 ); - } + if (!is_pe()) build_unix_import_lib( spec, files ); + else build_windows_import_lib( output_file_name, spec, files ); } diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index cfccee6cf8b..cbe1e4669c1 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -669,10 +669,10 @@ int main(int argc, char **argv) case MODE_IMPLIB: if (!spec_file_name) fatal_error( "missing .spec file\n" ); if (!parse_input_file( spec )) break; - output_static_lib( spec, files ); + output_import_lib( spec, files ); break; case MODE_STATICLIB: - output_static_lib( NULL, files ); + output_static_lib( output_file_name, files, 1 ); break; case MODE_BUILTIN: if (!files.count) fatal_error( "missing file argument for --builtin option\n" );

1 0

Rémi Bernon : opengl32: Create a unixlib interface for GL functions.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

Module: wine Branch: master Commit: 7dcc6ccf5eb6938e672c7ffc479400b7bd003d6d URL: https://gitlab.winehq.org/wine/wine/-/commit/7dcc6ccf5eb6938e672c7ffc479400… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 18:06:35 2022 +0200 opengl32: Create a unixlib interface for GL functions. --- dlls/opengl32/Makefile.in | 2 + dlls/opengl32/make_opengl | 233 +++- dlls/opengl32/opengl_norm.c | 2340 --------------------------------- dlls/opengl32/thunks.c | 2695 ++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unix_thunks.c | 3013 +++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unixlib.h | 2486 +++++++++++++++++++++++++++++++++++ 6 files changed, 8402 insertions(+), 2367 deletions(-)

1 0

Rémi Bernon : opengl32: Use the unixlib for glGet(String|Integerv).
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

Module: wine Branch: master Commit: cd93ca033c900ddfdd31283da1e8b9a748e244ae URL: https://gitlab.winehq.org/wine/wine/-/commit/cd93ca033c900ddfdd31283da1e8b9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 7 18:19:47 2022 +0200 opengl32: Use the unixlib for glGet(String|Integerv). --- dlls/opengl32/make_opengl | 4 ---- dlls/opengl32/unix_thunks.c | 18 ++++++++++++++++++ dlls/opengl32/unixlib.h | 14 ++++++++++++++ dlls/opengl32/wgl.c | 43 +++++++++++++++++++++++++++++-------------- 4 files changed, 61 insertions(+), 18 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 4c1fb10f0ef..f1506b25cbf 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -935,7 +935,6 @@ print OUT "#include \"wine/unixlib.h\"\n\n"; foreach (sort keys %norm_functions) { next if defined $manual_win_functions{$_}; - next if needs_wrapper( $_, $norm_functions{$_} ); print OUT generate_func_params($_, $norm_functions{$_}); } @@ -944,7 +943,6 @@ print OUT "{\n"; foreach (sort keys %norm_functions) { next if defined $manual_win_functions{$_}; - next if needs_wrapper( $_, $norm_functions{$_} ); printf OUT " unix_%s,\n", $_; } print OUT "};\n\n"; @@ -1005,7 +1003,6 @@ print OUT "#include \"opengl_ext.h\"\n\n"; foreach (sort keys %norm_functions) { next if defined $manual_win_functions{$_}; - next if needs_wrapper( $_, $norm_functions{$_} ); print OUT generate_unix_thunk($_, $norm_functions{$_}, "gl"); } @@ -1014,7 +1011,6 @@ print OUT "{\n"; foreach (sort keys %norm_functions) { next if defined $manual_win_functions{$_}; - next if needs_wrapper( $_, $norm_functions{$_} ); printf OUT " &gl_%s,\n", $_; } print OUT "};\n"; diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 45bff7f40c0..d8e8a772c3b 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -841,6 +841,14 @@ static NTSTATUS gl_glGetFloatv( void *args ) return STATUS_SUCCESS; } +static NTSTATUS gl_glGetIntegerv( void *args ) +{ + struct glGetIntegerv_params *params = args; + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + funcs->gl.p_glGetIntegerv( params->pname, params->data ); + return STATUS_SUCCESS; +} + static NTSTATUS gl_glGetLightfv( void *args ) { struct glGetLightfv_params *params = args; @@ -937,6 +945,14 @@ static NTSTATUS gl_glGetPolygonStipple( void *args ) return STATUS_SUCCESS; } +static NTSTATUS gl_glGetString( void *args ) +{ + struct glGetString_params *params = args; + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + params->ret = funcs->gl.p_glGetString( params->name ); + return STATUS_SUCCESS; +} + static NTSTATUS gl_glGetTexEnvfv( void *args ) { struct glGetTexEnvfv_params *params = args; @@ -2780,6 +2796,7 @@ const unixlib_function_t __wine_unix_call_funcs[] = &gl_glGetDoublev, &gl_glGetError, &gl_glGetFloatv, + &gl_glGetIntegerv, &gl_glGetLightfv, &gl_glGetLightiv, &gl_glGetMapdv, @@ -2792,6 +2809,7 @@ const unixlib_function_t __wine_unix_call_funcs[] = &gl_glGetPixelMapusv, &gl_glGetPointerv, &gl_glGetPolygonStipple, + &gl_glGetString, &gl_glGetTexEnvfv, &gl_glGetTexEnviv, &gl_glGetTexGendv, diff --git a/dlls/opengl32/unixlib.h b/dlls/opengl32/unixlib.h index 59de686daa7..a99d9c8e729 100644 --- a/dlls/opengl32/unixlib.h +++ b/dlls/opengl32/unixlib.h @@ -669,6 +669,12 @@ struct glGetFloatv_params GLfloat *data; }; +struct glGetIntegerv_params +{ + GLenum pname; + GLint *data; +}; + struct glGetLightfv_params { GLenum light; @@ -747,6 +753,12 @@ struct glGetPolygonStipple_params GLubyte *mask; }; +struct glGetString_params +{ + GLenum name; + const GLubyte *ret; +}; + struct glGetTexEnvfv_params { GLenum target; @@ -2247,6 +2259,7 @@ enum unix_funcs unix_glGetDoublev, unix_glGetError, unix_glGetFloatv, + unix_glGetIntegerv, unix_glGetLightfv, unix_glGetLightiv, unix_glGetMapdv, @@ -2259,6 +2272,7 @@ enum unix_funcs unix_glGetPixelMapusv, unix_glGetPointerv, unix_glGetPolygonStipple, + unix_glGetString, unix_glGetTexEnvfv, unix_glGetTexEnviv, unix_glGetTexGendv, diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index c7058322b8c..2c2be3e0ace 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -26,6 +26,8 @@ #include <sys/types.h> #include <math.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -35,6 +37,9 @@ #include "winnt.h" #include "opengl_ext.h" + +#include "unixlib.h" + #include "wine/gdi_driver.h" #include "wine/glu.h" #include "wine/debug.h" @@ -835,27 +840,32 @@ static BOOL filter_extensions( const char *extensions, GLubyte **exts_list, GLui void WINAPI glGetIntegerv(GLenum pname, GLint *data) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + struct glGetIntegerv_params args = { .pname = pname, .data = data, }; + NTSTATUS status; + + TRACE( "pname %d, data %p\n", pname, data ); - TRACE("(%d, %p)\n", pname, data); if (pname == GL_NUM_EXTENSIONS) { struct wgl_handle *ptr = get_current_context_ptr(); + GLuint **disabled = &ptr->u.context->disabled_exts; - if (ptr->u.context->disabled_exts || - filter_extensions(NULL, NULL, &ptr->u.context->disabled_exts)) + if (*disabled || filter_extensions( NULL, NULL, disabled )) { - const GLuint *disabled_exts = ptr->u.context->disabled_exts; + const GLuint *disabled_exts = *disabled; GLint count, disabled_count = 0; - funcs->gl.p_glGetIntegerv(pname, &count); + args.data = &count; + if ((status = UNIX_CALL( glGetIntegerv, &args ))) WARN( "glGetIntegerv returned %#x\n", status ); + while (*disabled_exts++ != ~0u) disabled_count++; *data = count - disabled_count; return; } } - funcs->gl.p_glGetIntegerv(pname, data); + + if ((status = UNIX_CALL( glGetIntegerv, &args ))) WARN( "glGetIntegerv returned %#x\n", status ); } const GLubyte * WINAPI glGetStringi(GLenum name, GLuint index) @@ -1739,17 +1749,22 @@ GLint WINAPI glDebugEntry( GLint unknown1, GLint unknown2 ) */ const GLubyte * WINAPI glGetString( GLenum name ) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - const GLubyte *ret = funcs->gl.p_glGetString( name ); + struct glGetString_params args = { .name = name, }; + NTSTATUS status; + + TRACE( "name %d\n", name ); - if (name == GL_EXTENSIONS && ret) + if ((status = UNIX_CALL( glGetString, &args ))) WARN( "glGetString returned %#x\n", status ); + + if (name == GL_EXTENSIONS && args.ret) { struct wgl_handle *ptr = get_current_context_ptr(); - if (ptr->u.context->extensions || - filter_extensions((const char *)ret, &ptr->u.context->extensions, &ptr->u.context->disabled_exts)) - ret = ptr->u.context->extensions; + GLubyte **extensions = &ptr->u.context->extensions; + GLuint **disabled = &ptr->u.context->disabled_exts; + if (*extensions || filter_extensions( (const char *)args.ret, extensions, disabled )) return *extensions; } - return ret; + + return args.ret; } /* wrapper for glDebugMessageCallback* functions */

1 0

Rémi Bernon : winebuild: Split get_link_name into a separate get_abi_name helper.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

Module: wine Branch: master Commit: 6932138f179eb644747d58e9a8d2edde1934058d URL: https://gitlab.winehq.org/wine/wine/-/commit/6932138f179eb644747d58e9a8d2ed… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Oct 2 23:32:57 2022 +0200 winebuild: Split get_link_name into a separate get_abi_name helper. --- tools/winebuild/utils.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 4f1bdf7cd2d..bac249673b6 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -728,28 +728,28 @@ const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ) } /* return the stdcall-decorated name for an entry point */ -const char *get_link_name( const ORDDEF *odp ) +static const char *get_abi_name( const ORDDEF *odp, const char *name ) { static char *buffer; char *ret; - if (target.cpu != CPU_i386) return odp->link_name; + if (target.cpu != CPU_i386) return name; switch (odp->type) { case TYPE_STDCALL: if (is_pe()) { - if (odp->flags & FLAG_THISCALL) return odp->link_name; - if (odp->flags & FLAG_FASTCALL) ret = strmake( "@%s@%u", odp->link_name, get_args_size( odp )); - else if (!kill_at) ret = strmake( "%s@%u", odp->link_name, get_args_size( odp )); - else return odp->link_name; + if (odp->flags & FLAG_THISCALL) return name; + if (odp->flags & FLAG_FASTCALL) ret = strmake( "@%s@%u", name, get_args_size( odp )); + else if (!kill_at) ret = strmake( "%s@%u", name, get_args_size( odp )); + else return name; } else { - if (odp->flags & FLAG_THISCALL) ret = strmake( "__thiscall_%s", odp->link_name ); - else if (odp->flags & FLAG_FASTCALL) ret = strmake( "__fastcall_%s", odp->link_name ); - else return odp->link_name; + if (odp->flags & FLAG_THISCALL) ret = strmake( "__thiscall_%s", name ); + else if (odp->flags & FLAG_FASTCALL) ret = strmake( "__fastcall_%s", name ); + else return name; } break; @@ -758,13 +758,13 @@ const char *get_link_name( const ORDDEF *odp ) { int args = get_args_size( odp ); if (odp->flags & FLAG_REGISTER) args += get_ptr_size(); /* context argument */ - ret = strmake( "%s@%u", odp->link_name, args ); + ret = strmake( "%s@%u", name, args ); } - else return odp->link_name; + else return name; break; default: - return odp->link_name; + return name; } free( buffer ); @@ -772,6 +772,11 @@ const char *get_link_name( const ORDDEF *odp ) return ret; } +const char *get_link_name( const ORDDEF *odp ) +{ + return get_abi_name( odp, odp->link_name ); +} + /******************************************************************* * sort_func_list *

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.233.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

Module: wine Branch: master Commit: b04d09158f35ab8bafaa1854d0ab5c4515d1962f URL: https://gitlab.winehq.org/wine/wine/-/commit/b04d09158f35ab8bafaa1854d0ab5c… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Nov 3 10:50:22 2022 +0100 winevulkan: Update to VK spec version 1.3.233. --- dlls/winevulkan/loader_thunks.c | 54 +++++++++++ dlls/winevulkan/loader_thunks.h | 38 ++++++++ dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 207 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 21 ++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 123 +++++++++++++++++++++++- 7 files changed, 444 insertions(+), 3 deletions(-)

1 0

Rémi Bernon : winebuild: Use asm_name to add underscore prefix in asm_globl.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

Module: wine Branch: master Commit: f35fbc5be9e4c293c88f713be309183a2f2638ac URL: https://gitlab.winehq.org/wine/wine/-/commit/f35fbc5be9e4c293c88f713be30918… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Oct 2 23:38:36 2022 +0200 winebuild: Use asm_name to add underscore prefix in asm_globl. --- tools/winebuild/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index bac249673b6..16d9c28d918 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1021,8 +1021,7 @@ const char *asm_globl( const char *func ) break; case PLATFORM_MINGW: case PLATFORM_WINDOWS: - buffer = strmake( "\t.globl %s%s\n%s%s:", target.cpu == CPU_i386 ? "_" : "", func, - target.cpu == CPU_i386 ? "_" : "", func ); + buffer = strmake( "\t.globl %s\n%s:", asm_name( func ), asm_name( func ) ); break; default: buffer = strmake( "\t.globl %s\n\t.hidden %s\n%s:", func, func, func );

1 0

Georg Lehmann : winevulkan: VkDeviceAddress needs alignment.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

Module: wine Branch: master Commit: c3769732f86652dc688737418fb028b96eff08cd URL: https://gitlab.winehq.org/wine/wine/-/commit/c3769732f86652dc688737418fb028… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Nov 3 10:52:30 2022 +0100 winevulkan: VkDeviceAddress needs alignment. --- dlls/winevulkan/loader_thunks.h | 12 ++++++------ dlls/winevulkan/make_vulkan | 2 +- include/wine/vulkan.h | 40 ++++++++++++++++++++-------------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/winevulkan/loader_thunks.h b/dlls/winevulkan/loader_thunks.h index b29fb18cf08..e79209cfb97 100644 --- a/dlls/winevulkan/loader_thunks.h +++ b/dlls/winevulkan/loader_thunks.h @@ -1051,7 +1051,7 @@ struct vkCmdCopyImageToBuffer2KHR_params struct vkCmdCopyMemoryIndirectNV_params { VkCommandBuffer commandBuffer; - VkDeviceAddress copyBufferAddress; + VkDeviceAddress DECLSPEC_ALIGN(8) copyBufferAddress; uint32_t copyCount; uint32_t stride; }; @@ -1065,7 +1065,7 @@ struct vkCmdCopyMemoryToAccelerationStructureKHR_params struct vkCmdCopyMemoryToImageIndirectNV_params { VkCommandBuffer commandBuffer; - VkDeviceAddress copyBufferAddress; + VkDeviceAddress DECLSPEC_ALIGN(8) copyBufferAddress; uint32_t copyCount; uint32_t stride; VkImage DECLSPEC_ALIGN(8) dstImage; @@ -1129,8 +1129,8 @@ struct vkCmdDebugMarkerInsertEXT_params struct vkCmdDecompressMemoryIndirectCountNV_params { VkCommandBuffer commandBuffer; - VkDeviceAddress indirectCommandsAddress; - VkDeviceAddress indirectCommandsCountAddress; + VkDeviceAddress DECLSPEC_ALIGN(8) indirectCommandsAddress; + VkDeviceAddress DECLSPEC_ALIGN(8) indirectCommandsCountAddress; uint32_t stride; }; @@ -2209,7 +2209,7 @@ struct vkCmdSubpassShadingHUAWEI_params struct vkCmdTraceRaysIndirect2KHR_params { VkCommandBuffer commandBuffer; - VkDeviceAddress indirectDeviceAddress; + VkDeviceAddress DECLSPEC_ALIGN(8) indirectDeviceAddress; }; struct vkCmdTraceRaysIndirectKHR_params @@ -2219,7 +2219,7 @@ struct vkCmdTraceRaysIndirectKHR_params const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable; const VkStridedDeviceAddressRegionKHR *pHitShaderBindingTable; const VkStridedDeviceAddressRegionKHR *pCallableShaderBindingTable; - VkDeviceAddress indirectDeviceAddress; + VkDeviceAddress DECLSPEC_ALIGN(8) indirectDeviceAddress; }; struct vkCmdTraceRaysKHR_params diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d3a0b8fac62..6d5ead98833 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1176,7 +1176,7 @@ class VkVariable(object): return False elif self.type == "size_t": return False - elif self.type in ["uint64_t", "VkDeviceSize"]: + elif self.type in ["uint64_t", "VkDeviceAddress", "VkDeviceSize"]: return True elif self.is_struct(): return self.struct.needs_alignment() diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 4e1ef24442c..fc42e784e6a 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -4695,7 +4695,7 @@ typedef struct VkAccelerationStructureCreateInfoKHR VkDeviceSize WINE_VK_ALIGN(8) offset; VkDeviceSize WINE_VK_ALIGN(8) size; VkAccelerationStructureTypeKHR type; - VkDeviceAddress deviceAddress; + VkDeviceAddress WINE_VK_ALIGN(8) deviceAddress; } VkAccelerationStructureCreateInfoKHR; typedef struct VkAccelerationStructureDeviceAddressInfoKHR @@ -4910,7 +4910,7 @@ typedef VkBindImagePlaneMemoryInfo VkBindImagePlaneMemoryInfoKHR; typedef struct VkBindIndexBufferIndirectCommandNV { - VkDeviceAddress bufferAddress; + VkDeviceAddress WINE_VK_ALIGN(8) bufferAddress; uint32_t size; VkIndexType indexType; } VkBindIndexBufferIndirectCommandNV; @@ -4922,7 +4922,7 @@ typedef struct VkBindShaderGroupIndirectCommandNV typedef struct VkBindVertexBufferIndirectCommandNV { - VkDeviceAddress bufferAddress; + VkDeviceAddress WINE_VK_ALIGN(8) bufferAddress; uint32_t size; uint32_t stride; } VkBindVertexBufferIndirectCommandNV; @@ -4960,7 +4960,7 @@ typedef struct VkBufferDeviceAddressCreateInfoEXT { VkStructureType sType; const void *pNext; - VkDeviceAddress deviceAddress; + VkDeviceAddress WINE_VK_ALIGN(8) deviceAddress; } VkBufferDeviceAddressCreateInfoEXT; typedef struct VkBufferDeviceAddressInfo @@ -5245,8 +5245,8 @@ typedef struct VkCopyDescriptorSet typedef struct VkCopyMemoryIndirectCommandNV { - VkDeviceAddress srcAddress; - VkDeviceAddress dstAddress; + VkDeviceAddress WINE_VK_ALIGN(8) srcAddress; + VkDeviceAddress WINE_VK_ALIGN(8) dstAddress; VkDeviceSize WINE_VK_ALIGN(8) size; } VkCopyMemoryIndirectCommandNV; @@ -5371,8 +5371,8 @@ typedef struct VkDebugUtilsObjectTagInfoEXT typedef struct VkDecompressMemoryRegionNV { - VkDeviceAddress srcAddress; - VkDeviceAddress dstAddress; + VkDeviceAddress WINE_VK_ALIGN(8) srcAddress; + VkDeviceAddress WINE_VK_ALIGN(8) dstAddress; VkDeviceSize WINE_VK_ALIGN(8) compressedSize; VkDeviceSize WINE_VK_ALIGN(8) decompressedSize; VkMemoryDecompressionMethodFlagsNV decompressionMethod; @@ -5521,7 +5521,7 @@ typedef struct VkDeviceAddressBindingCallbackDataEXT VkStructureType sType; void *pNext; VkDeviceAddressBindingFlagsEXT flags; - VkDeviceAddress baseAddress; + VkDeviceAddress WINE_VK_ALIGN(8) baseAddress; VkDeviceSize WINE_VK_ALIGN(8) size; VkDeviceAddressBindingTypeEXT bindingType; } VkDeviceAddressBindingCallbackDataEXT; @@ -5544,7 +5544,7 @@ typedef struct VkDeviceDiagnosticsConfigCreateInfoNV typedef struct VkDeviceFaultAddressInfoEXT { VkDeviceFaultAddressTypeEXT addressType; - VkDeviceAddress reportedAddress; + VkDeviceAddress WINE_VK_ALIGN(8) reportedAddress; VkDeviceSize WINE_VK_ALIGN(8) addressPrecision; } VkDeviceFaultAddressInfoEXT; @@ -5657,13 +5657,13 @@ typedef struct VkDeviceMemoryOverallocationCreateInfoAMD typedef union VkDeviceOrHostAddressConstKHR { - VkDeviceAddress deviceAddress; + VkDeviceAddress WINE_VK_ALIGN(8) deviceAddress; const void *hostAddress; } VkDeviceOrHostAddressConstKHR; typedef union VkDeviceOrHostAddressKHR { - VkDeviceAddress deviceAddress; + VkDeviceAddress WINE_VK_ALIGN(8) deviceAddress; void *hostAddress; } VkDeviceOrHostAddressKHR; @@ -6123,7 +6123,7 @@ typedef struct VkImageViewAddressPropertiesNVX { VkStructureType sType; void *pNext; - VkDeviceAddress deviceAddress; + VkDeviceAddress WINE_VK_ALIGN(8) deviceAddress; VkDeviceSize WINE_VK_ALIGN(8) size; } VkImageViewAddressPropertiesNVX; @@ -6386,7 +6386,7 @@ typedef struct VkMicromapCreateInfoEXT VkDeviceSize WINE_VK_ALIGN(8) offset; VkDeviceSize WINE_VK_ALIGN(8) size; VkMicromapTypeEXT type; - VkDeviceAddress deviceAddress; + VkDeviceAddress WINE_VK_ALIGN(8) deviceAddress; } VkMicromapCreateInfoEXT; typedef struct VkMicromapTriangleEXT @@ -9870,7 +9870,7 @@ typedef struct VkStencilOpState typedef struct VkStridedDeviceAddressRegionKHR { - VkDeviceAddress deviceAddress; + VkDeviceAddress WINE_VK_ALIGN(8) deviceAddress; VkDeviceSize WINE_VK_ALIGN(8) stride; VkDeviceSize WINE_VK_ALIGN(8) size; } VkStridedDeviceAddressRegionKHR; @@ -10115,15 +10115,15 @@ typedef VkTimelineSemaphoreSubmitInfo VkTimelineSemaphoreSubmitInfoKHR; typedef struct VkTraceRaysIndirectCommand2KHR { - VkDeviceAddress raygenShaderRecordAddress; + VkDeviceAddress WINE_VK_ALIGN(8) raygenShaderRecordAddress; VkDeviceSize WINE_VK_ALIGN(8) raygenShaderRecordSize; - VkDeviceAddress missShaderBindingTableAddress; + VkDeviceAddress WINE_VK_ALIGN(8) missShaderBindingTableAddress; VkDeviceSize WINE_VK_ALIGN(8) missShaderBindingTableSize; VkDeviceSize WINE_VK_ALIGN(8) missShaderBindingTableStride; - VkDeviceAddress hitShaderBindingTableAddress; + VkDeviceAddress WINE_VK_ALIGN(8) hitShaderBindingTableAddress; VkDeviceSize WINE_VK_ALIGN(8) hitShaderBindingTableSize; VkDeviceSize WINE_VK_ALIGN(8) hitShaderBindingTableStride; - VkDeviceAddress callableShaderBindingTableAddress; + VkDeviceAddress WINE_VK_ALIGN(8) callableShaderBindingTableAddress; VkDeviceSize WINE_VK_ALIGN(8) callableShaderBindingTableSize; VkDeviceSize WINE_VK_ALIGN(8) callableShaderBindingTableStride; uint32_t width; @@ -10490,7 +10490,7 @@ typedef struct VkCopyMemoryToAccelerationStructureInfoKHR typedef struct VkCopyMemoryToImageIndirectCommandNV { - VkDeviceAddress srcAddress; + VkDeviceAddress WINE_VK_ALIGN(8) srcAddress; uint32_t bufferRowLength; uint32_t bufferImageHeight; VkImageSubresourceLayers imageSubresource;

1 0

Alex Henrie : msvcrt: Change return type of wcsncat_s to errno_t.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

Module: wine Branch: master Commit: 26c9879a6c19847fb867d74340950535cc4014a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/26c9879a6c19847fb867d743409505… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 2 22:12:21 2022 -0600 msvcrt: Change return type of wcsncat_s to errno_t. --- dlls/msvcrt/wcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index afc2498dae2..c5696071846 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2508,7 +2508,7 @@ wchar_t* __cdecl wcscat( wchar_t *dst, const wchar_t *src ) /********************************************************************* * wcsncat_s (MSVCRT.@) */ -INT CDECL wcsncat_s(wchar_t *dst, size_t elem, const wchar_t *src, size_t count) +errno_t CDECL wcsncat_s(wchar_t *dst, size_t elem, const wchar_t *src, size_t count) { size_t i, j;

1 0

Alex Henrie : include: Add wcsncat_s.
by Alexandre Julliard Nov. 3, 2022

Nov. 3, 2022

Module: wine Branch: master Commit: 5f46d556fe22415ce423b34e453c20a89e809d34 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f46d556fe22415ce423b34e453c20… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 2 22:12:21 2022 -0600 include: Add wcsncat_s. Needed to compile Tera Term. --- include/msvcrt/corecrt_wstring.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/corecrt_wstring.h b/include/msvcrt/corecrt_wstring.h index 00e7863b5c3..bcf9f947625 100644 --- a/include/msvcrt/corecrt_wstring.h +++ b/include/msvcrt/corecrt_wstring.h @@ -59,6 +59,7 @@ _ACRTIMP errno_t __cdecl wcscpy_s(wchar_t*,size_t,const wchar_t*); _ACRTIMP size_t __cdecl wcscspn(const wchar_t*,const wchar_t*); _ACRTIMP size_t __cdecl wcslen(const wchar_t*); _ACRTIMP wchar_t* __cdecl wcsncat(wchar_t*,const wchar_t*,size_t); +_ACRTIMP errno_t __cdecl wcsncat_s(wchar_t*,size_t,const wchar_t*,size_t); _ACRTIMP int __cdecl wcsncmp(const wchar_t*,const wchar_t*,size_t); _ACRTIMP wchar_t* __cdecl wcsncpy(wchar_t*,const wchar_t*,size_t); _ACRTIMP errno_t __cdecl wcsncpy_s(wchar_t*,size_t,const wchar_t*,size_t);

1 0