November 2022 - Wine-commits

Paul Gofman : include: Add windows.gaming.ui.idl.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 0aacfd68611b4c6b464784616d56f5eadd8d4b2d URL: https://gitlab.winehq.org/wine/wine/-/commit/0aacfd68611b4c6b464784616d56f5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 3 10:42:43 2022 -0600 include: Add windows.gaming.ui.idl. --- include/Makefile.in | 1 + include/windows.gaming.ui.idl | 57 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 28ac4b3f2dc..6083fd2754d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -800,6 +800,7 @@ SOURCES = \ windows.gaming.input.custom.idl \ windows.gaming.input.forcefeedback.idl \ windows.gaming.input.idl \ + windows.gaming.ui.idl \ windows.globalization.idl \ windows.h \ windows.media.closedcaptioning.idl \ diff --git a/include/windows.gaming.ui.idl b/include/windows.gaming.ui.idl new file mode 100644 index 00000000000..fc7e661ccf9 --- /dev/null +++ b/include/windows.gaming.ui.idl @@ -0,0 +1,57 @@ +/* + * Copyright 2022 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +#ifndef DO_NO_IMPORTS +import "inspectable.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +#endif + +namespace Windows.Gaming.UI { + runtimeclass GameBar; + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.Gaming.UI.GameBar), + uuid(1db9a292-cc78-4173-be45-b61e67283ea7) + ] + interface IGameBarStatics : IInspectable + { + [eventadd] HRESULT VisibilityChanged([in] Windows.Foundation.EventHandler<IInspectable *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT VisibilityChanged([in] EventRegistrationToken token); + [eventadd] HRESULT IsInputRedirectedChanged([in] Windows.Foundation.EventHandler<IInspectable *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT IsInputRedirectedChanged([in] EventRegistrationToken token); + [propget] HRESULT Visible([out, retval] boolean *value); + [propget] HRESULT IsInputRedirected([out, retval] boolean *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + static(Windows.Gaming.UI.IGameBarStatics, Windows.Foundation.UniversalApiContract, 2.0), + threading(both) + ] + runtimeclass GameBar + { + } +}

1 0

Paul Gofman : windows.gaming.ui.gamebar: Add stub DLL.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: dde251a00845b463b991354c0cf7d061017d6f67 URL: https://gitlab.winehq.org/wine/wine/-/commit/dde251a00845b463b991354c0cf7d0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 3 10:55:35 2022 -0600 windows.gaming.ui.gamebar: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.gaming.ui.gamebar/Makefile.in | 8 ++ dlls/windows.gaming.ui.gamebar/classes.idl | 33 +++++ dlls/windows.gaming.ui.gamebar/main.c | 153 +++++++++++++++++++++ dlls/windows.gaming.ui.gamebar/private.h | 31 +++++ dlls/windows.gaming.ui.gamebar/tests/Makefile.in | 5 + dlls/windows.gaming.ui.gamebar/tests/gamebar.c | 86 ++++++++++++ .../windows.gaming.ui.gamebar.spec | 3 + 9 files changed, 324 insertions(+)

1 0

Paul Gofman : windows.gaming.ui.gamebar: Add IGameBarStatics interface.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 81ce03dfdd0ee615c04a666f64fb102390fab125 URL: https://gitlab.winehq.org/wine/wine/-/commit/81ce03dfdd0ee615c04a666f64fb10… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 3 17:42:35 2022 -0500 windows.gaming.ui.gamebar: Add IGameBarStatics interface. --- dlls/windows.gaming.ui.gamebar/main.c | 79 ++++++++++++++++++++++++++ dlls/windows.gaming.ui.gamebar/private.h | 38 +++++++++++++ dlls/windows.gaming.ui.gamebar/tests/gamebar.c | 23 ++++++++ 3 files changed, 140 insertions(+) diff --git a/dlls/windows.gaming.ui.gamebar/main.c b/dlls/windows.gaming.ui.gamebar/main.c index 517a96bcc23..ff44c6cd00e 100644 --- a/dlls/windows.gaming.ui.gamebar/main.c +++ b/dlls/windows.gaming.ui.gamebar/main.c @@ -24,9 +24,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(gamebar); +static EventRegistrationToken dummy_token = {.value = 0xdeadbeef}; + struct gamebar_statics { IActivationFactory IActivationFactory_iface; + IGameBarStatics IGameBarStatics_iface; LONG ref; }; @@ -51,6 +54,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IGameBarStatics )) + { + *out = &impl->IGameBarStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -109,9 +119,78 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( statics, IGameBarStatics, struct gamebar_statics, IActivationFactory_iface ) + +static HRESULT WINAPI statics_add_VisibilityChanged( IGameBarStatics *iface, + IEventHandler_IInspectable *handler, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, handler %p, token %p stub.\n", iface, handler, token ); + *token = dummy_token; + return S_OK; +} + +static HRESULT WINAPI statics_remove_VisibilityChanged( IGameBarStatics *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %#I64x stub.\n", iface, token.value ); + return S_OK; +} + +static HRESULT WINAPI statics_add_IsInputRedirectedChanged( IGameBarStatics *iface, + IEventHandler_IInspectable *handler, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, handler %p, token %p stub.\n", iface, handler, token ); + *token = dummy_token; + return S_OK; +} + +static HRESULT WINAPI statics_remove_IsInputRedirectedChanged( IGameBarStatics *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %#I64x stub.\n", iface, token.value ); + return S_OK; +} + +static HRESULT WINAPI statics_get_Visible( IGameBarStatics *iface, BOOLEAN *value) +{ + TRACE( "iface %p, value %p.\n", iface, value ); + + if (!value) return E_POINTER; + *value = FALSE; + return S_OK; +} + +static HRESULT WINAPI statics_get_IsInputRedirected( IGameBarStatics *iface, BOOLEAN *value ) +{ + TRACE( "iface %p, value %p.\n", iface, value ); + + if (!value) return E_POINTER; + *value = FALSE; + return S_OK; +} + +static const struct IGameBarStaticsVtbl statics_vtbl = +{ + statics_QueryInterface, + statics_AddRef, + statics_Release, + /* IInspectable methods */ + statics_GetIids, + statics_GetRuntimeClassName, + statics_GetTrustLevel, + /* IGameBarStatics methods */ + statics_add_VisibilityChanged, + statics_remove_VisibilityChanged, + statics_add_IsInputRedirectedChanged, + statics_remove_IsInputRedirectedChanged, + statics_get_Visible, + statics_get_IsInputRedirected, +}; + static struct gamebar_statics gamebar_statics = { {&factory_vtbl}, + {&statics_vtbl}, 1, }; diff --git a/dlls/windows.gaming.ui.gamebar/private.h b/dlls/windows.gaming.ui.gamebar/private.h index 545f4a2fd24..85f87b56e7b 100644 --- a/dlls/windows.gaming.ui.gamebar/private.h +++ b/dlls/windows.gaming.ui.gamebar/private.h @@ -29,3 +29,41 @@ #define WIDL_using_Windows_Gaming_UI #include "activation.h" #include "windows.gaming.ui.h" + +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) diff --git a/dlls/windows.gaming.ui.gamebar/tests/gamebar.c b/dlls/windows.gaming.ui.gamebar/tests/gamebar.c index f5315d00b9e..4c6c40f0589 100644 --- a/dlls/windows.gaming.ui.gamebar/tests/gamebar.c +++ b/dlls/windows.gaming.ui.gamebar/tests/gamebar.c @@ -48,7 +48,9 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_GameBarStatics(void) { static const WCHAR *gamebar_statics_name = L"Windows.Gaming.UI.GameBar"; + IGameBarStatics *gamebar_statics; IActivationFactory *factory; + BOOLEAN value; HSTRING str; HRESULT hr; LONG ref; @@ -69,6 +71,27 @@ static void test_GameBarStatics(void) check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + hr = IActivationFactory_QueryInterface( factory, &IID_IGameBarStatics, (void **)&gamebar_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + hr = IGameBarStatics_get_Visible( gamebar_statics, NULL ); + ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + + value = TRUE; + hr = IGameBarStatics_get_Visible( gamebar_statics, &value ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( !value, "got %d.\n", value ); + + hr = IGameBarStatics_get_IsInputRedirected( gamebar_statics, NULL ); + ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + + value = TRUE; + hr = IGameBarStatics_get_IsInputRedirected( gamebar_statics, &value ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( !value, "got %d.\n", value ); + + ref = IGameBarStatics_Release( gamebar_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0

Jinoh Kang : ntdll: Move CFI helper macros out of signal_x86_64.c.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 5aa2d45adf356ef60329722620d7f6a56dc36ab8 URL: https://gitlab.winehq.org/wine/wine/-/commit/5aa2d45adf356ef60329722620d7f6… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Nov 3 22:57:20 2022 +0900 ntdll: Move CFI helper macros out of signal_x86_64.c. --- dlls/ntdll/unix/dwarf.h | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 27 --------------------------- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/unix/dwarf.h b/dlls/ntdll/unix/dwarf.h index cae7d6288ee..d353f265dfe 100644 --- a/dlls/ntdll/unix/dwarf.h +++ b/dlls/ntdll/unix/dwarf.h @@ -1010,4 +1010,35 @@ static void apply_frame_state( CONTEXT *context, struct frame_state *state, *context = new_context; } +#if defined(__x86_64__) + +#define DW_OP_rcx DW_OP_breg2 +#define DW_OP_rbp DW_OP_breg6 +#define DW_OP_rsp DW_OP_breg7 + +#define DW_REG_rbx 0x03 +#define DW_REG_rsi 0x04 +#define DW_REG_rdi 0x05 +#define DW_REG_rbp 0x06 +#define DW_REG_rsp 0x07 +#define DW_REG_r12 0x0c +#define DW_REG_r13 0x0d +#define DW_REG_r14 0x0e +#define DW_REG_r15 0x0f +#define DW_REG_rip 0x10 + +#endif /* defined(__x86_64__) */ + +#define __ASM_CFI_STR(...) #__VA_ARGS__ +#define __ASM_CFI_ESC(...) \ + __ASM_CFI(".cfi_escape " __ASM_CFI_STR(__VA_ARGS__) "\n\t") +#define __ASM_CFI_CFA_IS_AT1(base, offset) \ + __ASM_CFI_ESC(DW_CFA_def_cfa_expression, 0x03, DW_OP_ ## base, offset, DW_OP_deref) +#define __ASM_CFI_REG_IS_AT1(reg, base, offset) \ + __ASM_CFI_ESC(DW_CFA_expression, DW_REG_ ## reg, 0x02, DW_OP_ ## base, offset) +#define __ASM_CFI_CFA_IS_AT2(base, lo, hi) \ + __ASM_CFI_ESC(DW_CFA_def_cfa_expression, 0x04, DW_OP_ ## base, lo, hi, DW_OP_deref) +#define __ASM_CFI_REG_IS_AT2(reg, base, lo, hi) \ + __ASM_CFI_ESC(DW_CFA_expression, DW_REG_ ## reg, 0x03, DW_OP_ ## base, lo, hi) + #endif /* __NTDLL_DWARF_H */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 72f4a56d764..dbc9bd9fe38 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2524,33 +2524,6 @@ __ASM_GLOBAL_FUNC( signal_exit_thread, __ASM_CFI(".cfi_rel_offset %r15,8\n\t") "call *%rsi" ) -#define DW_OP_rcx DW_OP_breg2 -#define DW_OP_rbp DW_OP_breg6 -#define DW_OP_rsp DW_OP_breg7 - -#define DW_REG_rbx 0x03 -#define DW_REG_rsi 0x04 -#define DW_REG_rdi 0x05 -#define DW_REG_rbp 0x06 -#define DW_REG_rsp 0x07 -#define DW_REG_r12 0x0c -#define DW_REG_r13 0x0d -#define DW_REG_r14 0x0e -#define DW_REG_r15 0x0f -#define DW_REG_rip 0x10 - -#define __ASM_CFI_STR(...) #__VA_ARGS__ -#define __ASM_CFI_ESC(...) \ - __ASM_CFI(".cfi_escape " __ASM_CFI_STR(__VA_ARGS__) "\n\t") -#define __ASM_CFI_CFA_IS_AT1(base, offset) \ - __ASM_CFI_ESC(DW_CFA_def_cfa_expression, 0x03, DW_OP_ ## base, offset, DW_OP_deref) -#define __ASM_CFI_REG_IS_AT1(reg, base, offset) \ - __ASM_CFI_ESC(DW_CFA_expression, DW_REG_ ## reg, 0x02, DW_OP_ ## base, offset) -#define __ASM_CFI_CFA_IS_AT2(base, lo, hi) \ - __ASM_CFI_ESC(DW_CFA_def_cfa_expression, 0x04, DW_OP_ ## base, lo, hi, DW_OP_deref) -#define __ASM_CFI_REG_IS_AT2(reg, base, lo, hi) \ - __ASM_CFI_ESC(DW_CFA_expression, DW_REG_ ## reg, 0x03, DW_OP_ ## base, lo, hi) - /*********************************************************************** * __wine_syscall_dispatcher */

1 0

Jinoh Kang : ntdll: Add CFI unwind info to __wine_syscall_dispatcher (i386).
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 53c4f638ef6edb7386e6e8973c59be75ae7b97dc URL: https://gitlab.winehq.org/wine/wine/-/commit/53c4f638ef6edb7386e6e8973c59be… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Nov 3 22:57:22 2022 +0900 ntdll: Add CFI unwind info to __wine_syscall_dispatcher (i386). This change is adding DWARF (CFI) unwind information to the hand-written assembly of the `__wine_syscall_dispatcher` function. This enables unwinding through the dispatcher from the Linux stack into (and through) the Windows stack. The general idea is that the `syscall_frame` struct contains the content of the callee-save registers before the function call (in particular the stack pointer and the return address). At any point of the execution, we have a pointer into the `syscall_frame` in $ebx, $ecx, $ebp, or $esp. For the CFI codes the general idea is that we are defining the computations of the callee-save registers based on the `syscall_frame` using DWARF’s `breg` instruction, rather than relative to CFA. --- dlls/ntdll/unix/dwarf.h | 23 +++++++++++++++- dlls/ntdll/unix/signal_i386.c | 61 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/dwarf.h b/dlls/ntdll/unix/dwarf.h index d353f265dfe..9acda7ca985 100644 --- a/dlls/ntdll/unix/dwarf.h +++ b/dlls/ntdll/unix/dwarf.h @@ -233,6 +233,8 @@ #define DW_EH_PE_indirect 0x80 #define DW_EH_PE_omit 0xff +#ifndef NTDLL_DWARF_H_NO_UNWINDER + struct dwarf_eh_bases { void *tbase; @@ -1010,7 +1012,26 @@ static void apply_frame_state( CONTEXT *context, struct frame_state *state, *context = new_context; } -#if defined(__x86_64__) +#endif /* NTDLL_DWARF_H_NO_UNWINDER */ + +#if defined(__i386__) + +#define DW_OP_ecx DW_OP_breg1 +#define DW_OP_ebx DW_OP_breg3 +#define DW_OP_esp DW_OP_breg4 +#define DW_OP_ebp DW_OP_breg5 + +#define DW_REG_eax 0x00 +#define DW_REG_ecx 0x01 +#define DW_REG_edx 0x02 +#define DW_REG_ebx 0x03 +#define DW_REG_esp 0x04 +#define DW_REG_ebp 0x05 +#define DW_REG_esi 0x06 +#define DW_REG_edi 0x07 +#define DW_REG_eip 0x08 + +#elif defined(__x86_64__) #define DW_OP_rcx DW_OP_breg2 #define DW_OP_rbp DW_OP_breg6 diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 2dfce706394..49d65ac1b3d 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -62,6 +62,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); +#define NTDLL_DWARF_H_NO_UNWINDER +#include "dwarf.h" + #undef ERR /* Solaris needs to define this */ /*********************************************************************** @@ -2500,11 +2503,17 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movl %fs:0x1f8,%ecx\n\t" /* x86_thread_data()->syscall_frame */ "movw $0,0x02(%ecx)\n\t" /* frame->restore_flags */ "popl 0x08(%ecx)\n\t" /* frame->eip */ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + __ASM_CFI_REG_IS_AT1(eip, ecx, 0x08) "pushfl\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "popl 0x04(%ecx)\n\t" /* frame->eflags */ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") ".globl " __ASM_NAME("__wine_syscall_dispatcher_prolog_end") "\n" __ASM_NAME("__wine_syscall_dispatcher_prolog_end") ":\n\t" "movl %esp,0x0c(%ecx)\n\t" /* frame->esp */ + __ASM_CFI_CFA_IS_AT1(ecx, 0x0c) + __ASM_CFI_REG_IS_AT1(esp, ecx, 0x0c) "movw %cs,0x10(%ecx)\n\t" "movw %ss,0x12(%ecx)\n\t" "movw %ds,0x14(%ecx)\n\t" @@ -2513,10 +2522,21 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movw %gs,0x1a(%ecx)\n\t" "movl %eax,0x1c(%ecx)\n\t" "movl %ebx,0x20(%ecx)\n\t" + __ASM_CFI_REG_IS_AT1(ebx, ecx, 0x20) "movl %edi,0x2c(%ecx)\n\t" + __ASM_CFI_REG_IS_AT1(edi, ecx, 0x2c) "movl %esi,0x30(%ecx)\n\t" + __ASM_CFI_REG_IS_AT1(esi, ecx, 0x30) "movl %ebp,0x34(%ecx)\n\t" + __ASM_CFI_REG_IS_AT1(ebp, ecx, 0x34) "leal 0x34(%ecx),%ebp\n\t" + __ASM_CFI_CFA_IS_AT1(ebp, 0x58) + __ASM_CFI_REG_IS_AT1(esp, ebp, 0x58) + __ASM_CFI_REG_IS_AT1(eip, ebp, 0x54) + __ASM_CFI_REG_IS_AT1(ebx, ebp, 0x6c) + __ASM_CFI_REG_IS_AT1(edi, ebp, 0x78) + __ASM_CFI_REG_IS_AT1(esi, ebp, 0x7c) + __ASM_CFI_REG_IS_AT1(ebp, ebp, 0x00) "leal 4(%esp),%esi\n\t" /* first argument */ "movl %eax,%ebx\n\t" "shrl $8,%ebx\n\t" @@ -2570,7 +2590,15 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "rep; movsl\n\t" "call *(%eax,%edx,4)\n\t" "leal -0x34(%ebp),%esp\n" - "5:\tmovl 0(%esp),%ecx\n\t" /* frame->syscall_flags + (frame->restore_flags << 16) */ + "5:\t" + __ASM_CFI_CFA_IS_AT1(esp, 0x0c) + __ASM_CFI_REG_IS_AT1(esp, esp, 0x0c) + __ASM_CFI_REG_IS_AT1(eip, esp, 0x08) + __ASM_CFI_REG_IS_AT1(ebx, esp, 0x20) + __ASM_CFI_REG_IS_AT1(edi, esp, 0x2c) + __ASM_CFI_REG_IS_AT1(esi, esp, 0x30) + __ASM_CFI_REG_IS_AT1(ebp, esp, 0x34) + "movl 0(%esp),%ecx\n\t" /* frame->syscall_flags + (frame->restore_flags << 16) */ "testl $0x68 << 16,%ecx\n\t" /* CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS | CONTEXT_XSAVE */ "jz 3f\n\t" "testl $3,%ecx\n\t" /* SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC */ @@ -2588,38 +2616,69 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "2:\tfrstor 0x40(%esp)\n\t" "fwait\n" "3:\tmovl 0x2c(%esp),%edi\n\t" + __ASM_CFI(".cfi_remember_state\n\t") + __ASM_CFI(".cfi_same_value %edi\n\t") "movl 0x30(%esp),%esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") "movl 0x34(%esp),%ebp\n\t" + __ASM_CFI(".cfi_same_value %ebp\n\t") "testl $0x7 << 16,%ecx\n\t" /* CONTEXT_CONTROL | CONTEXT_SEGMENTS | CONTEXT_INTEGER */ "jnz 1f\n\t" "movl 0x20(%esp),%ebx\n\t" + __ASM_CFI(".cfi_remember_state\n\t") + __ASM_CFI(".cfi_same_value %ebx\n\t") "movl 0x08(%esp),%ecx\n\t" /* frame->eip */ + __ASM_CFI(".cfi_register %eip, %ecx\n\t") "movl 0x0c(%esp),%esp\n\t" /* frame->esp */ + __ASM_CFI(".cfi_same_value %esp\n\t") "jmpl *%ecx\n" + __ASM_CFI("\t.cfi_restore_state\n") "1:\ttestl $0x2 << 16,%ecx\n\t" /* CONTEXT_INTEGER */ "jz 1f\n\t" "movl 0x1c(%esp),%eax\n\t" "movl 0x24(%esp),%ecx\n\t" "movl 0x28(%esp),%edx\n" "1:\tmovl 0x0c(%esp),%ebx\n\t" /* frame->esp */ + __ASM_CFI(".cfi_register %esp, %ebx\n\t") "movw 0x12(%esp),%ss\n\t" "xchgl %ebx,%esp\n\t" + __ASM_CFI(".cfi_def_cfa %esp, 0\n\t") + __ASM_CFI(".cfi_same_value %esp\n\t") + __ASM_CFI_REG_IS_AT1(eip, ebx, 0x08) + __ASM_CFI_REG_IS_AT1(ebx, ebx, 0x20) "pushl 0x04(%ebx)\n\t" /* frame->eflags */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl 0x10(%ebx)\n\t" /* frame->cs */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "pushl 0x08(%ebx)\n\t" /* frame->eip */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %eip, 0\n\t") "pushl 0x14(%ebx)\n\t" /* frame->ds */ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "movw 0x16(%ebx),%es\n\t" "movw 0x18(%ebx),%fs\n\t" "movw 0x1a(%ebx),%gs\n\t" "movl 0x20(%ebx),%ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") "popl %ds\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") "iret\n" + __ASM_CFI("\t.cfi_restore_state\n") "6:\tmovl $0xc000000d,%eax\n\t" /* STATUS_INVALID_PARAMETER */ "jmp 5b\n\t" ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" + __ASM_CFI(".cfi_remember_state\n\t") + __ASM_CFI(".cfi_def_cfa %esp, 4\n\t") + __ASM_CFI(".cfi_restore %esp\n\t") + __ASM_CFI(".cfi_restore %eip\n\t") + __ASM_CFI(".cfi_restore %ebx\n\t") + __ASM_CFI(".cfi_restore %edi\n\t") + __ASM_CFI(".cfi_restore %esi\n\t") + __ASM_CFI(".cfi_restore %ebp\n\t") "movl 8(%esp),%eax\n\t" "movl 4(%esp),%esp\n\t" + __ASM_CFI(".cfi_restore_state\n\t") "jmp 5b" )

1 0

Jacek Caban : winevulkan: Remove no longer used Direction.INPUT_OUTPUT.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: e8af92ac160105ce9b26a347944587d70bcf9326 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8af92ac160105ce9b26a347944587… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 22:26:04 2022 +0100 winevulkan: Remove no longer used Direction.INPUT_OUTPUT. --- dlls/winevulkan/make_vulkan | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index dcdf2c4ab10..783b781ff41 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -279,7 +279,6 @@ class Direction(Enum): """ Parameter direction: input, output, input_output. """ INPUT = 1 OUTPUT = 2 - INPUT_OUTPUT = 3 class VkBaseType(object):

1 0

Jacek Caban : winevulkan: Pass type as uint32_t to wine_vk_unwrap_handle.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: c09a414525f4162423ab3f4f6d4c20bb0e5499d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c09a414525f4162423ab3f4f6d4c20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 4 10:44:07 2022 +0100 winevulkan: Pass type as uint32_t to wine_vk_unwrap_handle. Fixes -Wenum-conversion warning when VkDebugReportObjectTypeEXT is used as a type. --- dlls/winevulkan/make_vulkan | 40 ++++++++++++++--------------- dlls/winevulkan/vulkan_private.h | 1 - dlls/winevulkan/vulkan_thunks.c | 54 ++++++++++++++++++++-------------------- 3 files changed, 47 insertions(+), 48 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 783b781ff41..a2e3d6e2017 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2349,6 +2349,26 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") + f.write("static uint64_t wine_vk_unwrap_handle(uint32_t type, uint64_t handle)\n") + f.write("{\n") + f.write(" switch(type)\n") + f.write(" {\n") + for handle in self.registry.handles: + if not handle.is_required() or not handle.is_wrapped() or handle.is_alias(): + continue + f.write(" case {}:\n".format(handle.object_type)) + if handle.is_dispatchable(): + f.write(" return (uint64_t) (uintptr_t) ") + f.write(handle.native_handle("(({}) (uintptr_t) handle)".format(handle.name))) + else: + f.write(" return (uint64_t) ") + f.write(handle.native_handle("handle")) + f.write(";\n"); + f.write(" default:\n") + f.write(" return handle;\n") + f.write(" }\n") + f.write("}\n\n") + # Generate any conversion helper functions. for conv in self.conversions: f.write(conv.definition()) @@ -2426,26 +2446,6 @@ class VkGenerator(object): f.write(";\n") f.write("}\n\n") - f.write("uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle)\n") - f.write("{\n") - f.write(" switch(type)\n") - f.write(" {\n") - for handle in self.registry.handles: - if not handle.is_required() or not handle.is_wrapped() or handle.is_alias(): - continue - f.write(" case {}:\n".format(handle.object_type)) - if handle.is_dispatchable(): - f.write(" return (uint64_t) (uintptr_t) ") - f.write(handle.native_handle("(({}) (uintptr_t) handle)".format(handle.name))) - else: - f.write(" return (uint64_t) ") - f.write(handle.native_handle("handle")) - f.write(";\n"); - f.write(" default:\n") - f.write(" return handle;\n") - f.write(" }\n") - f.write("}\n\n") - f.write("#if !defined(USE_STRUCT_CONVERSION)\n\n") f.write("const unixlib_entry_t __wine_unix_call_funcs[] =\n") diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 4221e97b73a..25890f00471 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -230,7 +230,6 @@ BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_is_type_wrapped(VkObjectType type) DECLSPEC_HIDDEN; -uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) DECLSPEC_HIDDEN; NTSTATUS init_vulkan(void *args) DECLSPEC_HIDDEN; diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 6a8b15b6e32..dbdd0368b2a 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -21,6 +21,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +static uint64_t wine_vk_unwrap_handle(uint32_t type, uint64_t handle) +{ + switch(type) + { + case VK_OBJECT_TYPE_COMMAND_BUFFER: + return (uint64_t) (uintptr_t) wine_cmd_buffer_from_handle(((VkCommandBuffer) (uintptr_t) handle))->command_buffer; + case VK_OBJECT_TYPE_COMMAND_POOL: + return (uint64_t) wine_cmd_pool_from_handle(handle)->command_pool; + case VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT: + return (uint64_t) wine_debug_report_callback_from_handle(handle)->debug_callback; + case VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT: + return (uint64_t) wine_debug_utils_messenger_from_handle(handle)->debug_messenger; + case VK_OBJECT_TYPE_DEVICE: + return (uint64_t) (uintptr_t) wine_device_from_handle(((VkDevice) (uintptr_t) handle))->device; + case VK_OBJECT_TYPE_INSTANCE: + return (uint64_t) (uintptr_t) wine_instance_from_handle(((VkInstance) (uintptr_t) handle))->instance; + case VK_OBJECT_TYPE_PHYSICAL_DEVICE: + return (uint64_t) (uintptr_t) wine_phys_dev_from_handle(((VkPhysicalDevice) (uintptr_t) handle))->phys_dev; + case VK_OBJECT_TYPE_QUEUE: + return (uint64_t) (uintptr_t) wine_queue_from_handle(((VkQueue) (uintptr_t) handle))->queue; + case VK_OBJECT_TYPE_SURFACE_KHR: + return (uint64_t) wine_surface_from_handle(handle)->surface; + default: + return handle; + } +} + #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkAcquireNextImageInfoKHR_win32_to_host(const VkAcquireNextImageInfoKHR *in, VkAcquireNextImageInfoKHR_host *out) { @@ -19636,33 +19663,6 @@ BOOL wine_vk_is_type_wrapped(VkObjectType type) type == VK_OBJECT_TYPE_SURFACE_KHR; } -uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) -{ - switch(type) - { - case VK_OBJECT_TYPE_COMMAND_BUFFER: - return (uint64_t) (uintptr_t) wine_cmd_buffer_from_handle(((VkCommandBuffer) (uintptr_t) handle))->command_buffer; - case VK_OBJECT_TYPE_COMMAND_POOL: - return (uint64_t) wine_cmd_pool_from_handle(handle)->command_pool; - case VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT: - return (uint64_t) wine_debug_report_callback_from_handle(handle)->debug_callback; - case VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT: - return (uint64_t) wine_debug_utils_messenger_from_handle(handle)->debug_messenger; - case VK_OBJECT_TYPE_DEVICE: - return (uint64_t) (uintptr_t) wine_device_from_handle(((VkDevice) (uintptr_t) handle))->device; - case VK_OBJECT_TYPE_INSTANCE: - return (uint64_t) (uintptr_t) wine_instance_from_handle(((VkInstance) (uintptr_t) handle))->instance; - case VK_OBJECT_TYPE_PHYSICAL_DEVICE: - return (uint64_t) (uintptr_t) wine_phys_dev_from_handle(((VkPhysicalDevice) (uintptr_t) handle))->phys_dev; - case VK_OBJECT_TYPE_QUEUE: - return (uint64_t) (uintptr_t) wine_queue_from_handle(((VkQueue) (uintptr_t) handle))->queue; - case VK_OBJECT_TYPE_SURFACE_KHR: - return (uint64_t) wine_surface_from_handle(handle)->surface; - default: - return handle; - } -} - #if !defined(USE_STRUCT_CONVERSION) const unixlib_entry_t __wine_unix_call_funcs[] =

1 0

Jacek Caban : winevulkan: Support output array conversion in _generate_array_conversion_func.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: d44aadc5276b4c7f459b2759011f94c85f2bcb99 URL: https://gitlab.winehq.org/wine/wine/-/commit/d44aadc5276b4c7f459b2759011f94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 20:15:10 2022 +0100 winevulkan: Support output array conversion in _generate_array_conversion_func. And get rid of _generate_static_array_conversion_func. --- dlls/winevulkan/make_vulkan | 82 +++++++++++------------------------------ dlls/winevulkan/vulkan_thunks.c | 2 +- 2 files changed, 23 insertions(+), 61 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index a2e3d6e2017..0125831dc84 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2003,6 +2003,9 @@ class ConversionFunction(object): self.unwrap = unwrap or not self.operand.needs_unwrapping() self.needs_alloc = direction != Direction.OUTPUT and variable.needs_alloc(conv, unwrap) + if variable.is_static_array() and direction == Direction.INPUT: + LOGGER.error("Static array input conversion is not supported") + self._set_name() def __eq__(self, other): @@ -2025,8 +2028,8 @@ class ConversionFunction(object): if self.conv: if self.direction == Direction.OUTPUT: - params = ["const {0} *in".format(host_type), "uint32_t count"] - return_type = self.type + params = ["const {0} *in".format(host_type), "{0} *out".format(self.type), "uint32_t count"] + return_type = None else: params = ["const {0} *in".format(self.type), "uint32_t count"] return_type = host_type @@ -2035,18 +2038,27 @@ class ConversionFunction(object): return_type = self.type # Generate function prototype. - body += "static inline {0} *{1}(".format(return_type, self.name) + if return_type: + body += "static inline {0} *{1}(".format(return_type, self.name) + else: + body += "static inline void {0}(".format(self.name) if self.needs_alloc: body += "struct conversion_context *ctx, " body += ", ".join(p for p in params) body += ")\n{\n" - body += " {0} *out;\n".format(return_type) + if return_type: + body += " {0} *out;\n".format(return_type) body += " unsigned int i;\n\n" - body += " if (!in || !count) return NULL;\n\n" - body += " out = conversion_context_alloc(ctx, count * sizeof(*out));\n" + if return_type: + body += " if (!in || !count) return NULL;\n\n" + else: + body += " if (!in) return;\n\n" + + if self.direction == Direction.INPUT: + body += " out = conversion_context_alloc(ctx, count * sizeof(*out));\n" body += " for (i = 0; i < count; i++)\n" body += " {\n" @@ -2063,8 +2075,9 @@ class ConversionFunction(object): LOGGER.warn("Unhandled conversion operand type") body += " out[i] = in[i];\n" - body += " }\n\n" - body += " return out;\n" + body += " }\n" + if return_type: + body += "\n return out;\n" body += "}\n" body += "#endif /* USE_STRUCT_CONVERSION */\n" @@ -2133,55 +2146,6 @@ class ConversionFunction(object): return body - def _generate_static_array_conversion_func(self): - """ Helper function for generating a conversion function for array operands. """ - - body = "" - - if self.conv: - body += "#if defined(USE_STRUCT_CONVERSION)\n" - if self.direction == Direction.OUTPUT: - params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] - else: - params = ["const {0} *in".format(self.type), "{0} *out_host".format(self.type), "uint32_t count"] - - - # Generate function prototype. - body += "static inline void {0}(".format(self.name) - body += ", ".join(p for p in params) - body += ")\n" - else: - body += "#if !defined(USE_STRUCT_CONVERSION)\n" - - params = ["const {0} *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] - - # Generate function prototype. - body += "static inline void {0}(".format(self.name) - body += ", ".join(p for p in params) - body += ")\n" - - body += "{\n" - body += " unsigned int i;\n\n" - body += " if (!in) return;\n\n" - body += " for (i = 0; i < count; i++)\n" - body += " {\n" - - if isinstance(self.operand, VkStruct): - for m in self.operand: - # TODO: support copying of pNext extension structures! - body += " " + m.copy("in[i].", "out[i].", self.direction, self.conv, self.unwrap) - elif isinstance(self.operand, VkHandle) and self.direction == Direction.INPUT: - body += " out[i] = " + self.operand.driver_handle("in[i]") + ";\n" - else: - LOGGER.warn("Unhandled conversion operand type") - body += " out[i] = in[i];\n" - - body += " }\n" - body += "}\n" - body += "#endif /* USE_STRUCT_CONVERSION) */\n\n" - - return body - def _set_name(self): name = "convert_{0}_".format(self.type) if self.array: @@ -2199,9 +2163,7 @@ class ConversionFunction(object): self.name = name def definition(self): - if self.array: - return self._generate_static_array_conversion_func() - elif self.dyn_array: + if self.array or self.dyn_array: return self._generate_array_conversion_func() else: return self._generate_conversion_func() diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index dbdd0368b2a..18039ca3c6f 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2036,7 +2036,7 @@ static inline void convert_VkMemoryHeap_static_array_host_to_win32(const VkMemor out[i].flags = in[i].flags; } } -#endif /* USE_STRUCT_CONVERSION) */ +#endif /* USE_STRUCT_CONVERSION */ #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win32(const VkPhysicalDeviceMemoryProperties_host *in, VkPhysicalDeviceMemoryProperties *out)

1 0

Jacek Caban : winevulkan: Drop "static_array" from conversion function names.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 0bfad6584ff5389115904a68cb77cb09ec802c0f URL: https://gitlab.winehq.org/wine/wine/-/commit/0bfad6584ff5389115904a68cb77cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 20:20:22 2022 +0100 winevulkan: Drop "static_array" from conversion function names. Static arrays need only output conversion and output conversion is the same for static and dynamic arrays. --- dlls/winevulkan/make_vulkan | 6 ++---- dlls/winevulkan/vulkan_thunks.c | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 0125831dc84..5949cea9543 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1323,7 +1323,7 @@ class VkMember(VkVariable): count = self.array_len if direction == Direction.OUTPUT: # Needed by VkMemoryHeap.memoryHeaps - return "convert_{0}_static_array_host_to_{5}({2}{1}, {3}{1}, {4});\n".format(self.type, self.name, input, output, count, win_type) + return "convert_{0}_array_host_to_{5}({2}{1}, {3}{1}, {4});\n".format(self.type, self.name, input, output, count, win_type) else: # Nothing needed this yet. LOGGER.warn("TODO: implement copying of static array for {0}.{1}".format(self.type, self.name)) @@ -2148,9 +2148,7 @@ class ConversionFunction(object): def _set_name(self): name = "convert_{0}_".format(self.type) - if self.array: - name += "static_array_" - elif self.dyn_array: + if self.array or self.dyn_array: name += "array_" win_type = "win32" if self.conv else "win64" diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 18039ca3c6f..cd00aa0b6fb 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2024,7 +2024,7 @@ static inline void convert_VkImageFormatProperties2_host_to_win32(const VkImageF #endif /* USE_STRUCT_CONVERSION */ #if defined(USE_STRUCT_CONVERSION) -static inline void convert_VkMemoryHeap_static_array_host_to_win32(const VkMemoryHeap_host *in, VkMemoryHeap *out, uint32_t count) +static inline void convert_VkMemoryHeap_array_host_to_win32(const VkMemoryHeap_host *in, VkMemoryHeap *out, uint32_t count) { unsigned int i; @@ -2046,7 +2046,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win32(const out->memoryTypeCount = in->memoryTypeCount; memcpy(out->memoryTypes, in->memoryTypes, VK_MAX_MEMORY_TYPES * sizeof(VkMemoryType)); out->memoryHeapCount = in->memoryHeapCount; - convert_VkMemoryHeap_static_array_host_to_win32(in->memoryHeaps, out->memoryHeaps, VK_MAX_MEMORY_HEAPS); + convert_VkMemoryHeap_array_host_to_win32(in->memoryHeaps, out->memoryHeaps, VK_MAX_MEMORY_HEAPS); } #endif /* USE_STRUCT_CONVERSION */

1 0

Jacek Caban : winevulkan: Use separated classes for struct and array conversions.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: a242422e954eef7d1c1e73ccc6ef32fc5dcb082d URL: https://gitlab.winehq.org/wine/wine/-/commit/a242422e954eef7d1c1e73ccc6ef32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 20:45:05 2022 +0100 winevulkan: Use separated classes for struct and array conversions. --- dlls/winevulkan/make_vulkan | 232 +++++++++++++++++++++++++------------------- 1 file changed, 130 insertions(+), 102 deletions(-)

1 0