May 2024 - Wine-commits - list.winehq.org

Eric Pouech : msvcrt: Correctly unmangle qualified pointer to function/method.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: ecfe99af150e636d50cf47316a320996601f84b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/ecfe99af150e636d50cf47316a3209… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 17 09:30:44 2024 +0200 msvcrt: Correctly unmangle qualified pointer to function/method. Signesd-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/tests/cpp.c | 4 ++-- dlls/msvcrt/undname.c | 28 ++++++++++++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index bed1a5d4530..29bb126bcda 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1177,7 +1177,7 @@ static void test_demangle(void) /* 23 */ {"??0streambuf@@QAE(a)ABV0@@Z", "public: __thiscall streambuf::streambuf(class streambuf const &)"}, /* 24 */ {"??0strstreambuf@@QAE(a)ABV0@@Z", "public: __thiscall strstreambuf::strstreambuf(class strstreambuf const &)"}, /* 25 */ {"??0strstreambuf@@QAE(a)H@Z", "public: __thiscall strstreambuf::strstreambuf(int)"}, -/* 26 */ {"??0strstreambuf@@QAE(a)P6APAXJ@ZP6AXPAX(a)Z@Z", "public: __thiscall strstreambuf::strstreambuf(void * (__cdecl*)(long),void (__cdecl*)(void *))"}, +/* 26 */ {"??0strstreambuf@@QAE(a)Q6APAXJ@ZS6AXPAX(a)Z@Z", "public: __thiscall strstreambuf::strstreambuf(void * (__cdecl*const)(long),void (__cdecl*const volatile)(void *))"}, /* 27 */ {"??0strstreambuf@@QAE(a)PADH0@Z", "public: __thiscall strstreambuf::strstreambuf(char *,int,char *)"}, /* 28 */ {"??0strstreambuf@@QAE(a)PAEH0@Z", "public: __thiscall strstreambuf::strstreambuf(unsigned char *,int,unsigned char *)"}, /* 29 */ {"??0strstreambuf@@QAE(a)XZ", "public: __thiscall strstreambuf::strstreambuf(void)"}, @@ -1212,7 +1212,7 @@ static void test_demangle(void) /* 58 */ {"?do_get@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHAAJ(a)Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,long &)const "}, /* 59 */ {"?do_get@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHAAK(a)Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,unsigned long &)const "}, /* 60 */ {"?do_get@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHAAM(a)Z", "protected: virtual class std::istreambuf_iterator<char,struct std::char_traits<char> > __thiscall std::num_get<char,class std::istreambuf_iterator<char,struct std::char_traits<char> > >::do_get(class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::istreambuf_iterator<char,struct std::char_traits<char> >,class std::ios_base &,int &,float &)const "}, -/* 61 */ {"?_query_new_handler@@YAP6AHI(a)ZXZ", "int (__cdecl*__cdecl _query_new_handler(void))(unsigned int)"}, +/* 61 */ {"?_query_new_handler@@YAR6AHI(a)ZXZ", "int (__cdecl*__cdecl _query_new_handler(void))(unsigned int)"}, /* 62 */ {"?register_callback(a)ios_base@std@@QAEXP6AXW4event(a)12@AAV12(a)H@ZH(a)Z", "public: void __thiscall std::ios_base::register_callback(void (__cdecl*)(enum std::ios_base::event,class std::ios_base &,int),int)"}, /* 63 */ {"?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z", "public: class std::basic_istream<char,struct std::char_traits<char> > & __thiscall std::basic_istream<char,struct std::char_traits<char> >::seekg(long,enum std::ios_base::seekdir)"}, /* 64 */ {"?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z", "public: class std::basic_istream<char,struct std::char_traits<char> > & __thiscall std::basic_istream<char,struct std::char_traits<char> >::seekg(class std::fpos<int>)"}, diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 74856504685..923ec67d363 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -997,14 +997,22 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case 'B': /* volatile reference */ if (!get_qualified_type(ct, sym, dt, flags)) goto done; break; + case 'P': /* Pointer */ case 'Q': /* const pointer */ case 'R': /* volatile pointer */ case 'S': /* const volatile pointer */ - if (!get_qualified_type(ct, sym, (flags & IN_ARGS) ? dt : 'P', flags)) goto done; - break; - case 'P': /* Pointer */ + if (!(flags & IN_ARGS)) dt = 'P'; if (isdigit(*sym->current)) - { + { + const char *ptr_qualif; + switch (dt) + { + default: + case 'P': ptr_qualif = NULL; break; + case 'Q': ptr_qualif = "const"; break; + case 'R': ptr_qualif = "volatile"; break; + case 'S': ptr_qualif = "const volatile"; break; + } /* FIXME: * P6 = Function pointer * P8 = Member function pointer @@ -1022,10 +1030,10 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!get_function_qualifier(sym, &function_qualifier)) goto done; if (!get_function_signature(sym, &fs)) - goto done; + goto done; - ct->left = str_printf(sym, "%s%s (%s %s::*", - fs.return_ct.left, fs.return_ct.right, fs.call_conv, class); + ct->left = str_printf(sym, "%s%s (%s %s::*%s", + fs.return_ct.left, fs.return_ct.right, fs.call_conv, class, ptr_qualif); ct->right = str_printf(sym, ")%s%s", fs.arguments, function_qualifier); } else if (*sym->current == '6') @@ -1037,14 +1045,14 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!get_function_signature(sym, &fs)) goto done; - ct->left = str_printf(sym, "%s%s (%s*", - fs.return_ct.left, fs.return_ct.right, fs.call_conv); + ct->left = str_printf(sym, "%s%s (%s*%s", + fs.return_ct.left, fs.return_ct.right, fs.call_conv, ptr_qualif); ct->flags = DT_NO_LEADING_WS; ct->right = str_printf(sym, ")%s", fs.arguments); } else goto done; } - else if (!get_qualified_type(ct, sym, 'P', flags)) goto done; + else if (!get_qualified_type(ct, sym, dt, flags)) goto done; break; case 'W': if (*sym->current == '4')

1 0

Eric Pouech : winedump: Correctly unmangle qualified pointer to function/method.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: d45cbca3780a0f69d16f22fd9811b10fdebddf39 URL: https://gitlab.winehq.org/wine/wine/-/commit/d45cbca3780a0f69d16f22fd9811b1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 17 11:27:51 2024 +0200 winedump: Correctly unmangle qualified pointer to function/method. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/msmangle.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index 2ac96a3fe5a..17954740cff 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -887,14 +887,22 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case 'B': /* volatile reference */ if (!get_qualified_type(ct, sym, dt, flags)) goto done; break; + case 'P': /* Pointer */ case 'Q': /* const pointer */ case 'R': /* volatile pointer */ case 'S': /* const volatile pointer */ - if (!get_qualified_type(ct, sym, (flags & IN_ARGS) ? dt : 'P', flags)) goto done; - break; - case 'P': /* Pointer */ + if (!(flags & IN_ARGS)) dt = 'P'; if (isdigit(*sym->current)) - { + { + const char *ptr_qualif; + switch (dt) + { + default: + case 'P': ptr_qualif = NULL; break; + case 'Q': ptr_qualif = "const"; break; + case 'R': ptr_qualif = "volatile"; break; + case 'S': ptr_qualif = "const volatile"; break; + } /* FIXME: * P6 = Function pointer * P8 = Member function pointer @@ -912,10 +920,10 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!get_function_qualifier(sym, &function_qualifier)) goto done; if (!get_function_signature(sym, &fs)) - goto done; + goto done; - ct->left = str_printf(sym, "%s%s (%s %s::*", - fs.return_ct.left, fs.return_ct.right, fs.call_conv, class); + ct->left = str_printf(sym, "%s%s (%s %s::*%s", + fs.return_ct.left, fs.return_ct.right, fs.call_conv, class, ptr_qualif); ct->right = str_printf(sym, ")%s%s", fs.arguments, function_qualifier); } else if (*sym->current == '6') @@ -927,14 +935,14 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!get_function_signature(sym, &fs)) goto done; - ct->left = str_printf(sym, "%s%s (%s*", - fs.return_ct.left, fs.return_ct.right, fs.call_conv); + ct->left = str_printf(sym, "%s%s (%s*%s", + fs.return_ct.left, fs.return_ct.right, fs.call_conv, ptr_qualif); ct->flags = DT_NO_LEADING_WS; ct->right = str_printf(sym, ")%s", fs.arguments); } else goto done; } - else if (!get_qualified_type(ct, sym, 'P', flags)) goto done; + else if (!get_qualified_type(ct, sym, dt, flags)) goto done; break; case 'W': if (*sym->current == '4')

1 0

Huw Davies : mmdevapi: Remove unused ACImpl typedef.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: f612029d4e6a7198c88ad4f3ef94677db85c93d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f612029d4e6a7198c88ad4f3ef9467… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 17 08:32:09 2024 +0100 mmdevapi: Remove unused ACImpl typedef. --- dlls/mmdevapi/mmdevdrv.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h index df21859cbad..1f4d65e4436 100644 --- a/dlls/mmdevapi/mmdevdrv.h +++ b/dlls/mmdevapi/mmdevdrv.h @@ -19,8 +19,6 @@ #include <wine/list.h> -typedef struct audio_client ACImpl; - typedef struct audio_session { GUID guid; struct list clients;

1 0

Alexandre Julliard : msvcrt: Resync cxx.h with msvcp90.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 9680ef7ea99f0aabe9a8fd8a41d41522bafc8e3e URL: https://gitlab.winehq.org/wine/wine/-/commit/9680ef7ea99f0aabe9a8fd8a41d415… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 09:36:19 2024 +0200 msvcrt: Resync cxx.h with msvcp90. --- dlls/concrt140/concrt140.c | 2 +- dlls/concrt140/details.h | 2 +- dlls/msvcp90/cxx.h | 25 +++-- dlls/msvcp90/exception.c | 28 +++--- dlls/msvcrt/concurrency.c | 3 +- dlls/msvcrt/cpp.c | 12 +-- dlls/msvcrt/cppexcept.h | 188 ++++-------------------------------- dlls/msvcrt/cxx.h | 226 ++++++++++++++++++++++++++++++++++++-------- dlls/msvcrt/except_i386.c | 7 +- dlls/msvcrt/exception_ptr.c | 2 +- dlls/msvcrt/handler4.c | 2 - 11 files changed, 239 insertions(+), 258 deletions(-)

1 0

Alexandre Julliard : msvcrt: Unify __CppXcptFilter implementations.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 670e45934669ae89fda4cc5b9324ac0a4c96427f URL: https://gitlab.winehq.org/wine/wine/-/commit/670e45934669ae89fda4cc5b9324ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:31:49 2024 +0200 msvcrt: Unify __CppXcptFilter implementations. --- dlls/msvcrt/except.c | 10 ++++++++++ dlls/msvcrt/except_arm.c | 11 ----------- dlls/msvcrt/except_arm64.c | 11 ----------- dlls/msvcrt/except_arm64ec.c | 11 ----------- dlls/msvcrt/except_i386.c | 10 ---------- dlls/msvcrt/except_x86_64.c | 11 ----------- 6 files changed, 10 insertions(+), 54 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index a7140a9011f..ba8a6c6b216 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -277,6 +277,16 @@ int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) return msvcrt_exception_filter(ptr); } +/********************************************************************* + * __CppXcptFilter (MSVCRT.@) + */ +int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) +{ + /* only filter c++ exceptions */ + if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; + return _XcptFilter(ex, ptr); +} + /********************************************************************* * _abnormal_termination (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index a79cbe63c44..21173db4925 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -61,17 +61,6 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler(EXCEPTION_RECORD *rec, DWORD frame } -/********************************************************************* - * __CppXcptFilter (MSVCRT.@) - */ -int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) -{ - /* only filter c++ exceptions */ - if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; - return _XcptFilter(ex, ptr); -} - - /********************************************************************* * __CxxDetectRethrow (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 793c71f3251..9a7a91a3b2e 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -62,17 +62,6 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler(EXCEPTION_RECORD *rec, ULONG64 fra } -/********************************************************************* - * __CppXcptFilter (MSVCRT.@) - */ -int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) -{ - /* only filter c++ exceptions */ - if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; - return _XcptFilter(ex, ptr); -} - - /********************************************************************* * __CxxDetectRethrow (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c index d9ea54c4d1c..f90e3797d05 100644 --- a/dlls/msvcrt/except_arm64ec.c +++ b/dlls/msvcrt/except_arm64ec.c @@ -61,17 +61,6 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 fr } -/********************************************************************* - * __CppXcptFilter (MSVCRT.@) - */ -int CDECL __CppXcptFilter( NTSTATUS ex, PEXCEPTION_POINTERS ptr ) -{ - /* only filter c++ exceptions */ - if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; - return _XcptFilter(ex, ptr); -} - - /********************************************************************* * __CxxDetectRethrow (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index f63d3910e04..98956f2ec48 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -689,16 +689,6 @@ void __stdcall __CxxLongjmpUnwind( const _JUMP_BUFFER *buf ) cxx_local_unwind( frame, descr, buf->TryLevel ); } -/********************************************************************* - * __CppXcptFilter (MSVCRT.@) - */ -int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) -{ - /* only filter c++ exceptions */ - if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; - return _XcptFilter( ex, ptr ); -} - /********************************************************************* * __CxxDetectRethrow (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 3a2e13b3082..b4b49ba9373 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -655,17 +655,6 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 fr } -/********************************************************************* - * __CppXcptFilter (MSVCRT.@) - */ -int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) -{ - /* only filter c++ exceptions */ - if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; - return _XcptFilter( ex, ptr ); -} - - /********************************************************************* * __CxxDetectRethrow (MSVCRT.@) */

1 0

Alexandre Julliard : msvcrt: Unify __CxxQueryExceptionSize implementations.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: e5e52a9a9fbc1c552613a8144a608d83489b67bf URL: https://gitlab.winehq.org/wine/wine/-/commit/e5e52a9a9fbc1c552613a8144a608d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:32:12 2024 +0200 msvcrt: Unify __CxxQueryExceptionSize implementations. --- dlls/msvcrt/except.c | 8 ++++++++ dlls/msvcrt/except_arm.c | 9 --------- dlls/msvcrt/except_arm64.c | 9 --------- dlls/msvcrt/except_arm64ec.c | 9 --------- dlls/msvcrt/except_i386.c | 9 --------- dlls/msvcrt/except_x86_64.c | 9 --------- 6 files changed, 8 insertions(+), 45 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index ba8a6c6b216..c224c472c55 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -287,6 +287,14 @@ int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) return _XcptFilter(ex, ptr); } +/********************************************************************* + * __CxxQueryExceptionSize (MSVCRT.@) + */ +unsigned int CDECL __CxxQueryExceptionSize(void) +{ + return sizeof(cxx_exception_type); +} + /********************************************************************* * _abnormal_termination (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 21173db4925..84a2f358213 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -85,15 +85,6 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) } -/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /********************************************************************* * _fpieee_flt (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 9a7a91a3b2e..fc1af2e2689 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -86,15 +86,6 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) } -/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /******************************************************************* * _setjmp (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c index f90e3797d05..826884f4df4 100644 --- a/dlls/msvcrt/except_arm64ec.c +++ b/dlls/msvcrt/except_arm64ec.c @@ -85,15 +85,6 @@ BOOL CDECL __CxxDetectRethrow( PEXCEPTION_POINTERS ptrs ) } -/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /********************************************************************* * _fpieee_flt (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 98956f2ec48..6ce65fc7122 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -712,15 +712,6 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) return (msvcrt_get_thread_data()->exc_record == rec); } -/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /********************************************************************* * _EH_prolog (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index b4b49ba9373..a2537c9a549 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -679,15 +679,6 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) } -/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /******************************************************************* * longjmp (MSVCRT.@) */

1 0

Alexandre Julliard : msvcrt: Unify __CxxDetectRethrow implementations.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 6945ce6bc37225f691549e1f8114ba681c8e8114 URL: https://gitlab.winehq.org/wine/wine/-/commit/6945ce6bc37225f691549e1f8114ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:36:30 2024 +0200 msvcrt: Unify __CxxDetectRethrow implementations. --- dlls/msvcrt/cppexcept.h | 6 ++++++ dlls/msvcrt/except.c | 23 +++++++++++++++++++++++ dlls/msvcrt/except_arm.c | 24 ------------------------ dlls/msvcrt/except_arm64.c | 24 ------------------------ dlls/msvcrt/except_arm64ec.c | 24 ------------------------ dlls/msvcrt/except_i386.c | 23 ----------------------- dlls/msvcrt/except_x86_64.c | 24 ------------------------ 7 files changed, 29 insertions(+), 119 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 9760e6222bb..d5ad0f8a0f6 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -28,6 +28,12 @@ #define CXX_FRAME_MAGIC_VC8 0x19930522 #define CXX_EXCEPTION 0xe06d7363 +#ifdef __x86_64__ +#define CXX_EXCEPTION_PARAMS 4 +#else +#define CXX_EXCEPTION_PARAMS 3 +#endif + #define FUNC_DESCR_SYNCHRONOUS 1 /* synchronous exceptions only (built with /EHs and /EHsc) */ #define FUNC_DESCR_NOEXCEPT 4 /* noexcept function */ diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index c224c472c55..ce1a7525d4a 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -287,6 +287,29 @@ int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) return _XcptFilter(ex, ptr); } +/********************************************************************* + * __CxxDetectRethrow (MSVCRT.@) + */ +BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) +{ + PEXCEPTION_RECORD rec; + + if (!ptrs) + return FALSE; + + rec = ptrs->ExceptionRecord; + + if (rec->ExceptionCode == CXX_EXCEPTION && + rec->NumberParameters == CXX_EXCEPTION_PARAMS && + rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && + rec->ExceptionInformation[2]) + { + ptrs->ExceptionRecord = msvcrt_get_thread_data()->exc_record; + return TRUE; + } + return (msvcrt_get_thread_data()->exc_record == rec); +} + /********************************************************************* * __CxxQueryExceptionSize (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 84a2f358213..47194b4e8ae 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -61,30 +61,6 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler(EXCEPTION_RECORD *rec, DWORD frame } -/********************************************************************* - * __CxxDetectRethrow (MSVCRT.@) - */ -BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) -{ - PEXCEPTION_RECORD rec; - - if (!ptrs) - return FALSE; - - rec = ptrs->ExceptionRecord; - - if (rec->ExceptionCode == CXX_EXCEPTION && - rec->NumberParameters == 3 && - rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && - rec->ExceptionInformation[2]) - { - ptrs->ExceptionRecord = msvcrt_get_thread_data()->exc_record; - return TRUE; - } - return (msvcrt_get_thread_data()->exc_record == rec); -} - - /********************************************************************* * _fpieee_flt (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index fc1af2e2689..bbff0f618cc 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -62,30 +62,6 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler(EXCEPTION_RECORD *rec, ULONG64 fra } -/********************************************************************* - * __CxxDetectRethrow (MSVCRT.@) - */ -BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) -{ - PEXCEPTION_RECORD rec; - - if (!ptrs) - return FALSE; - - rec = ptrs->ExceptionRecord; - - if (rec->ExceptionCode == CXX_EXCEPTION && - rec->NumberParameters == 3 && - rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && - rec->ExceptionInformation[2]) - { - ptrs->ExceptionRecord = msvcrt_get_thread_data()->exc_record; - return TRUE; - } - return (msvcrt_get_thread_data()->exc_record == rec); -} - - /******************************************************************* * _setjmp (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c index 826884f4df4..5ef9dae809b 100644 --- a/dlls/msvcrt/except_arm64ec.c +++ b/dlls/msvcrt/except_arm64ec.c @@ -61,30 +61,6 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 fr } -/********************************************************************* - * __CxxDetectRethrow (MSVCRT.@) - */ -BOOL CDECL __CxxDetectRethrow( PEXCEPTION_POINTERS ptrs ) -{ - PEXCEPTION_RECORD rec; - - if (!ptrs) - return FALSE; - - rec = ptrs->ExceptionRecord; - - if (rec->ExceptionCode == CXX_EXCEPTION && - rec->NumberParameters == 3 && - rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && - rec->ExceptionInformation[2]) - { - ptrs->ExceptionRecord = msvcrt_get_thread_data()->exc_record; - return TRUE; - } - return (msvcrt_get_thread_data()->exc_record == rec); -} - - /********************************************************************* * _fpieee_flt (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 6ce65fc7122..8ae6056ff8f 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -689,29 +689,6 @@ void __stdcall __CxxLongjmpUnwind( const _JUMP_BUFFER *buf ) cxx_local_unwind( frame, descr, buf->TryLevel ); } -/********************************************************************* - * __CxxDetectRethrow (MSVCRT.@) - */ -BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) -{ - PEXCEPTION_RECORD rec; - - if (!ptrs) - return FALSE; - - rec = ptrs->ExceptionRecord; - - if (rec->ExceptionCode == CXX_EXCEPTION && - rec->NumberParameters == 3 && - rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && - rec->ExceptionInformation[2]) - { - ptrs->ExceptionRecord = msvcrt_get_thread_data()->exc_record; - return TRUE; - } - return (msvcrt_get_thread_data()->exc_record == rec); -} - /********************************************************************* * _EH_prolog (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index a2537c9a549..fee2ec236a1 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -655,30 +655,6 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 fr } -/********************************************************************* - * __CxxDetectRethrow (MSVCRT.@) - */ -BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) -{ - PEXCEPTION_RECORD rec; - - if (!ptrs) - return FALSE; - - rec = ptrs->ExceptionRecord; - - if (rec->ExceptionCode == CXX_EXCEPTION && - rec->NumberParameters == 4 && - rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && - rec->ExceptionInformation[2]) - { - ptrs->ExceptionRecord = msvcrt_get_thread_data()->exc_record; - return TRUE; - } - return (msvcrt_get_thread_data()->exc_record == rec); -} - - /******************************************************************* * longjmp (MSVCRT.@) */

1 0

Alexandre Julliard : msvcrt: Unify checks for valid C++ exception.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: ea81150e3a02f70c702a7c865156f3653dd95f09 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea81150e3a02f70c702a7c865156f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 13:00:16 2024 +0200 msvcrt: Unify checks for valid C++ exception. --- dlls/msvcrt/cpp.c | 10 ++-------- dlls/msvcrt/cppexcept.h | 8 ++++++++ dlls/msvcrt/except.c | 15 ++------------- dlls/msvcrt/except_i386.c | 5 +---- 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index b4966641204..943f5936a19 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1048,10 +1048,7 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) { EXCEPTION_RECORD *rec = ep->ExceptionRecord; - if (rec->ExceptionCode==CXX_EXCEPTION && rec->NumberParameters==3 && - (rec->ExceptionInformation[0]==CXX_FRAME_MAGIC_VC6 || - rec->ExceptionInformation[0]==CXX_FRAME_MAGIC_VC7 || - rec->ExceptionInformation[0]==CXX_FRAME_MAGIC_VC8)) + if (is_cxx_exception( rec )) { const cxx_type_info_table *tit = ((cxx_exception_type*)rec->ExceptionInformation[2])->type_info_table; int i; @@ -1086,10 +1083,7 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) { EXCEPTION_RECORD *rec = ep->ExceptionRecord; - if (rec->ExceptionCode==CXX_EXCEPTION && rec->NumberParameters==4 && - (rec->ExceptionInformation[0]==CXX_FRAME_MAGIC_VC6 || - rec->ExceptionInformation[0]==CXX_FRAME_MAGIC_VC7 || - rec->ExceptionInformation[0]==CXX_FRAME_MAGIC_VC8)) + if (is_cxx_exception( rec )) { const cxx_exception_type *et = (cxx_exception_type*)rec->ExceptionInformation[2]; const cxx_type_info_table *tit = (const cxx_type_info_table*)(rec->ExceptionInformation[3]+et->type_info_table); diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index d5ad0f8a0f6..48b370d1be6 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -51,6 +51,14 @@ typedef DWORD (*cxx_exc_custom_handler)( PEXCEPTION_RECORD, struct __cxx_excepti void WINAPI _CxxThrowException(void*,const cxx_exception_type*); int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS); +static inline BOOL is_cxx_exception( EXCEPTION_RECORD *rec ) +{ + if (rec->ExceptionCode != CXX_EXCEPTION) return FALSE; + if (rec->NumberParameters != CXX_EXCEPTION_PARAMS) return FALSE; + return (rec->ExceptionInformation[0] >= CXX_FRAME_MAGIC_VC6 && + rec->ExceptionInformation[0] <= CXX_FRAME_MAGIC_VC8); +} + typedef struct { EXCEPTION_RECORD *rec; diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index ce1a7525d4a..e61e1e74e54 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -298,11 +298,7 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) return FALSE; rec = ptrs->ExceptionRecord; - - if (rec->ExceptionCode == CXX_EXCEPTION && - rec->NumberParameters == CXX_EXCEPTION_PARAMS && - rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && - rec->ExceptionInformation[2]) + if (is_cxx_exception( rec ) && rec->ExceptionInformation[2]) { ptrs->ExceptionRecord = msvcrt_get_thread_data()->exc_record; return TRUE; @@ -447,14 +443,7 @@ void CDECL __DestructExceptionObject(EXCEPTION_RECORD *rec) TRACE("(%p)\n", rec); - if (rec->ExceptionCode != CXX_EXCEPTION) return; -#ifndef __x86_64__ - if (rec->NumberParameters != 3) return; -#else - if (rec->NumberParameters != 4) return; -#endif - if (rec->ExceptionInformation[0] < CXX_FRAME_MAGIC_VC6 || - rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8) return; + if (!is_cxx_exception( rec )) return; if (!info || !info->destructor) return; diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 8ae6056ff8f..1bba898d1da 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -477,10 +477,7 @@ int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, if (!ti) return EXCEPTION_EXECUTE_HANDLER; rec = ptrs->ExceptionRecord; - if (rec->ExceptionCode != CXX_EXCEPTION || rec->NumberParameters != 3 || - rec->ExceptionInformation[0] < CXX_FRAME_MAGIC_VC6 || - rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8) - return EXCEPTION_CONTINUE_SEARCH; + if (!is_cxx_exception( rec )) return EXCEPTION_CONTINUE_SEARCH; if (rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) {

1 0

Nikolay Sivov : vkd3d-shader/fx: Implement writing shared buffers.
by Alexandre Julliard 16 May '24

16 May '24

Module: vkd3d Branch: master Commit: a913ac78445e3e700e573f085b44e2aaba6d1bb4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a913ac78445e3e700e573f085b44e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 21 19:06:55 2024 +0200 vkd3d-shader/fx: Implement writing shared buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 70 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 6fb2e8a0..9ad33f25 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -82,7 +82,9 @@ struct fx_write_context uint32_t technique_count; uint32_t group_count; uint32_t buffer_count; + uint32_t shared_buffer_count; uint32_t numeric_variable_count; + uint32_t shared_numeric_variable_count; uint32_t object_variable_count; uint32_t shared_object_count; uint32_t shader_count; @@ -969,11 +971,11 @@ static const struct fx_write_context_ops fx_4_ops = .are_child_effects_supported = true, }; -static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, struct fx_write_context *fx) +static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, bool shared, struct fx_write_context *fx) { struct vkd3d_bytecode_buffer *buffer = &fx->structured; + uint32_t name_offset, type_offset, value_offset; uint32_t semantic_offset, flags = 0; - uint32_t name_offset, type_offset; enum fx_4_numeric_variable_flags { HAS_EXPLICIT_BIND_POINT = 0x4, @@ -993,12 +995,24 @@ static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, struct fx_write semantic_offset = put_u32(buffer, semantic_offset); /* Semantic */ put_u32(buffer, var->buffer_offset); /* Offset in the constant buffer */ - put_u32(buffer, 0); /* FIXME: default value offset */ + value_offset = put_u32(buffer, 0); /* Default value offset */ put_u32(buffer, flags); /* Flags */ - put_u32(buffer, 0); /* Annotations count */ - if (has_annotations(var)) - hlsl_fixme(ctx, &ctx->location, "Writing annotations for numeric variables is not implemented."); + if (shared) + { + fx->shared_numeric_variable_count++; + } + else + { + /* FIXME: write default value */ + set_u32(buffer, value_offset, 0); + + put_u32(buffer, 0); /* Annotations count */ + if (has_annotations(var)) + hlsl_fixme(ctx, &ctx->location, "Writing annotations for numeric variables is not implemented."); + + fx->numeric_variable_count++; + } } struct rhs_named_value @@ -1395,6 +1409,9 @@ static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx struct hlsl_ctx *ctx = fx->ctx; struct hlsl_ir_var *var; uint32_t count_offset; + bool shared; + + shared = fx->child_effect && b->modifiers & HLSL_STORAGE_SHARED; if (b->reservation.reg_type) bind_point = b->reservation.reg_index; @@ -1411,9 +1428,17 @@ static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx count_offset = put_u32(buffer, 0); put_u32(buffer, bind_point); /* Bind point */ - put_u32(buffer, 0); /* Annotations count */ - if (b->annotations) - hlsl_fixme(ctx, &b->loc, "Writing annotations for buffers is not implemented."); + if (shared) + { + ++fx->shared_buffer_count; + } + else + { + put_u32(buffer, 0); /* Annotations count */ + if (b->annotations) + hlsl_fixme(ctx, &b->loc, "Writing annotations for buffers is not implemented."); + ++fx->buffer_count; + } count = 0; size = 0; @@ -1422,18 +1447,16 @@ static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx if (var->buffer != b) continue; - write_fx_4_numeric_variable(var, fx); + write_fx_4_numeric_variable(var, shared, fx); size += get_fx_4_type_size(var->data_type); ++count; } set_u32(buffer, count_offset, count); set_u32(buffer, size_offset, align(size, 16)); - - fx->numeric_variable_count += count; } -static void write_buffers(struct fx_write_context *fx) +static void write_buffers(struct fx_write_context *fx, bool shared) { struct hlsl_buffer *buffer; @@ -1443,9 +1466,10 @@ static void write_buffers(struct fx_write_context *fx) continue; if (!strcmp(buffer->name, "$Params")) continue; + if (fx->child_effect && (shared != !!(buffer->modifiers & HLSL_STORAGE_SHARED))) + continue; write_fx_4_buffer(buffer, fx); - ++fx->buffer_count; } } @@ -1505,9 +1529,9 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&fx.unstructured, 0); /* Empty string placeholder. */ - write_buffers(&fx); + write_buffers(&fx, false); write_objects(&fx, false); - /* TODO: shared buffers */ + write_buffers(&fx, true); write_objects(&fx, true); write_techniques(ctx->globals, &fx); @@ -1516,9 +1540,9 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, fx.buffer_count); /* Buffer count. */ put_u32(&buffer, fx.numeric_variable_count); /* Numeric variable count. */ put_u32(&buffer, fx.object_variable_count); /* Object variable count. */ - put_u32(&buffer, 0); /* Pool buffer count. */ - put_u32(&buffer, 0); /* Pool variable count. */ - put_u32(&buffer, fx.shared_object_count); /* Shared object count. */ + put_u32(&buffer, fx.shared_buffer_count); + put_u32(&buffer, fx.shared_numeric_variable_count); + put_u32(&buffer, fx.shared_object_count); put_u32(&buffer, fx.technique_count); size_offset = put_u32(&buffer, 0); /* Unstructured size. */ put_u32(&buffer, 0); /* String count. */ @@ -1564,7 +1588,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&fx.unstructured, 0); /* Empty string placeholder. */ - write_buffers(&fx); + write_buffers(&fx, false); write_objects(&fx, false); /* TODO: interface variables */ @@ -1574,9 +1598,9 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, fx.buffer_count); /* Buffer count. */ put_u32(&buffer, fx.numeric_variable_count); /* Numeric variable count. */ put_u32(&buffer, fx.object_variable_count); /* Object variable count. */ - put_u32(&buffer, 0); /* Pool buffer count. */ - put_u32(&buffer, 0); /* Pool variable count. */ - put_u32(&buffer, 0); /* Pool object count. */ + put_u32(&buffer, fx.shared_buffer_count); + put_u32(&buffer, fx.shared_numeric_variable_count); + put_u32(&buffer, fx.shared_object_count); put_u32(&buffer, fx.technique_count); size_offset = put_u32(&buffer, 0); /* Unstructured size. */ put_u32(&buffer, 0); /* String count. */

1 0

Nikolay Sivov : vkd3d-shader/fx: Use correct type name when reusing types.
by Alexandre Julliard 16 May '24

16 May '24

Module: vkd3d Branch: master Commit: 9c83caeda652d7968c10e54cca2ae3b7fc18f384 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c83caeda652d7968c10e54cca2ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 21 20:11:05 2024 +0200 vkd3d-shader/fx: Use correct type name when reusing types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 9ad33f25..57b4ac24 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -129,9 +129,11 @@ static void write_pass(struct hlsl_ir_var *var, struct fx_write_context *fx) } static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_context *fx); +static const char * get_fx_4_type_name(const struct hlsl_type *type); static uint32_t write_type(const struct hlsl_type *type, struct fx_write_context *fx) { + const struct hlsl_type *element_type; struct type_entry *type_entry; unsigned int elements_count; const char *name; @@ -140,15 +142,17 @@ static uint32_t write_type(const struct hlsl_type *type, struct fx_write_context if (type->class == HLSL_CLASS_ARRAY) { - name = hlsl_get_multiarray_element_type(type)->name; elements_count = hlsl_get_multiarray_size(type); + element_type = hlsl_get_multiarray_element_type(type); } else { - name = type->name; elements_count = 0; + element_type = type; } + name = get_fx_4_type_name(element_type); + LIST_FOR_EACH_ENTRY(type_entry, &fx->types, struct type_entry, entry) { if (strcmp(type_entry->name, name))

1 0