September 2023 - Wine-commits

Alex Henrie : winmm: Use CRT allocation functions.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 43f01a2fe5f35025b21bafb7a1b47a855d642e60 URL: https://gitlab.winehq.org/wine/wine/-/commit/43f01a2fe5f35025b21bafb7a1b47a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 13 18:29:43 2023 -0600 winmm: Use CRT allocation functions. --- dlls/winmm/driver.c | 16 ++++----- dlls/winmm/lolvldrv.c | 37 +++++++++----------- dlls/winmm/mci.c | 93 +++++++++++++++++++++++--------------------------- dlls/winmm/mmio.c | 26 +++++++------- dlls/winmm/playsound.c | 24 ++++++------- dlls/winmm/waveform.c | 81 +++++++++++++++++++------------------------ dlls/winmm/winmm.c | 18 +++++----- 7 files changed, 135 insertions(+), 160 deletions(-)

1 0

Esme Povirk : user32/tests: Delete a faulty test.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 2da42cec5b087c15da540910ab6b800d84f1d234 URL: https://gitlab.winehq.org/wine/wine/-/commit/2da42cec5b087c15da540910ab6b80… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Sep 13 15:02:25 2023 -0500 user32/tests: Delete a faulty test. I prefer not to delete any tests, but I see no way to preserve this one while accounting for the possibility of an ignored message coming in during the 100 ms wait, and for the most part it seems redundant with other tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53435 --- dlls/user32/tests/msg.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c05982a9939..9ae772fc355 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -19688,11 +19688,6 @@ static void test_SendMessage_other_thread(int thread_n) /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); - ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); - /* FIXME: remove once Wine is fixed */ - todo_wine_if (thread_n == 2) - ok(ret == 0, "wrong status %08lx\n", ret); - if (winetest_debug > 1) trace("main: call PeekMessage\n"); ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); ok_sequence(WmEmptySeq, "SendMessage from other thread 5", thread_n == 2);

1 0

Esme Povirk : user32/tests: Account for ignored messages in PeekMessage call.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 2830f98518842cc142a217b41369f695faf59729 URL: https://gitlab.winehq.org/wine/wine/-/commit/2830f98518842cc142a217b41369f6… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Sep 13 15:28:18 2023 -0500 user32/tests: Account for ignored messages in PeekMessage call. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53435 --- dlls/user32/tests/msg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9ae772fc355..c931ca6a983 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -19689,7 +19689,9 @@ static void test_SendMessage_other_thread(int thread_n) MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); if (winetest_debug > 1) trace("main: call PeekMessage\n"); - ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { + ok(ignore_message(msg.message), "got unexpected message %04x from PeekMessageA\n", msg.message); + } ok_sequence(WmEmptySeq, "SendMessage from other thread 5", thread_n == 2); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE);

1 0

Piotr Caban : msvcp100: Fix failure class layout.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: d87d101af995d3817d32b72dd5a2187c066d3b70 URL: https://gitlab.winehq.org/wine/wine/-/commit/d87d101af995d3817d32b72dd5a218… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 12 20:29:33 2023 +0200 msvcp100: Fix failure class layout. --- dlls/msvcp90/exception.c | 14 +++------- dlls/msvcp90/misc.c | 70 +++++++++++++++++++++++++++++++----------------- dlls/msvcp90/msvcp90.h | 14 ++++++++++ 3 files changed, 63 insertions(+), 35 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 63c698f3c6c..949b896bb2e 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -637,7 +637,7 @@ DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dt typedef struct { runtime_error base; #if _MSVCP_VER > 90 - int err; + error_code code; #endif } system_error; typedef system_error _System_error; @@ -648,8 +648,8 @@ static failure* MSVCP_failure_ctor( failure *this, exception_name name ) TRACE("%p %s\n", this, EXCEPTION_STR(name)); MSVCP_runtime_error_ctor(&this->base, name); #if _MSVCP_VER > 90 - /* FIXME: set err correctly */ - this->err = 0; + this->code.code = 1; + this->code.category = std_iostream_category(); #endif this->base.e.vtable = &failure_vtable; return this; @@ -662,7 +662,7 @@ failure* __thiscall failure_copy_ctor( TRACE("%p %p\n", this, rhs); runtime_error_copy_ctor(&this->base, &rhs->base); #if _MSVCP_VER > 90 - this->err = rhs->err; + this->code = rhs->code; #endif this->base.e.vtable = &failure_vtable; return this; @@ -948,12 +948,6 @@ bool __cdecl MSVCP__uncaught_exception(void) } #if _MSVCP_VER >= 110 -typedef struct -{ - int code; - void *category; -} error_code; - typedef struct { logic_error base; diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 103eca6f4a3..8b9514c6edb 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -997,11 +997,7 @@ void __cdecl _Cnd_do_broadcast_at_thread_exit(void) #endif -#if _MSVCP_VER == 100 -typedef struct { - const vtable_ptr *vtable; -} error_category; - +#if _MSVCP_VER >= 100 typedef struct { error_category base; const char *type; @@ -1009,14 +1005,22 @@ typedef struct { static custom_category iostream_category; DEFINE_RTTI_DATA0(error_category, 0, ".?AVerror_category(a)std@@") +DEFINE_RTTI_DATA1(generic_category, 0, &error_category_rtti_base_descriptor, ".?AV_Generic_error_category(a)std@@") +#if _MSVCP_VER == 100 DEFINE_RTTI_DATA1(iostream_category, 0, &error_category_rtti_base_descriptor, ".?AV_Iostream_error_category(a)std@@") +#else +DEFINE_RTTI_DATA2(iostream_category, 0, &generic_category_rtti_base_descriptor, + &error_category_rtti_base_descriptor, ".?AV_Iostream_error_category(a)std@@") +#endif extern const vtable_ptr iostream_category_vtable; static void iostream_category_ctor(custom_category *this) { this->base.vtable = &iostream_category_vtable; +#if _MSVCP_VER == 100 this->type = "iostream"; +#endif } DEFINE_THISCALL_WRAPPER(custom_category_vector_dtor, 8) @@ -1037,19 +1041,6 @@ custom_category* __thiscall custom_category_vector_dtor(custom_category *this, u return this; } -DEFINE_THISCALL_WRAPPER(custom_category_name, 4) -const char* __thiscall custom_category_name(const custom_category *this) -{ - return this->type; -} - -DEFINE_THISCALL_WRAPPER(custom_category_message, 12) -basic_string_char* __thiscall custom_category_message(const custom_category *this, - basic_string_char *ret, int err) -{ - return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); -} - DEFINE_THISCALL_WRAPPER(custom_category_default_error_condition, 12) /*error_condition*/void* __thiscall custom_category_default_error_condition( custom_category *this, /*error_condition*/void *ret, int code) @@ -1068,12 +1059,22 @@ bool __thiscall custom_category_equivalent(const custom_category *this, DEFINE_THISCALL_WRAPPER(custom_category_equivalent_code, 12) bool __thiscall custom_category_equivalent_code(custom_category *this, - const /*error_code*/void *code, int condition) + const error_code *code, int condition) { FIXME("(%p %p %x) stub\n", this, code, condition); return FALSE; } +DEFINE_THISCALL_WRAPPER(iostream_category_name, 4) +const char* __thiscall iostream_category_name(const custom_category *this) +{ +#if _MSVCP_VER == 100 + return this->type; +#else + return "iostream"; +#endif +} + DEFINE_THISCALL_WRAPPER(iostream_category_message, 12) basic_string_char* __thiscall iostream_category_message(const custom_category *this, basic_string_char *ret, int err) @@ -1089,7 +1090,9 @@ const error_category* __cdecl std_iostream_category(void) TRACE("()\n"); return &iostream_category.base; } +#endif +#if _MSVCP_VER == 100 static custom_category system_category; DEFINE_RTTI_DATA1(system_category, 0, &error_category_rtti_base_descriptor, ".?AV_System_error_category(a)std@@") @@ -1101,6 +1104,19 @@ static void system_category_ctor(custom_category *this) this->type = "system"; } +DEFINE_THISCALL_WRAPPER(custom_category_name, 4) +const char* __thiscall custom_category_name(const custom_category *this) +{ + return this->type; +} + +DEFINE_THISCALL_WRAPPER(custom_category_message, 12) +basic_string_char* __thiscall custom_category_message(const custom_category *this, + basic_string_char *ret, int err) +{ + return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); +} + /* ?system_category(a)std@@YAABVerror_category(a)1@XZ */ /* ?system_category(a)std@@YAAEBVerror_category(a)1@XZ */ const error_category* __cdecl std_system_category(void) @@ -1110,7 +1126,6 @@ const error_category* __cdecl std_system_category(void) } static custom_category generic_category; -DEFINE_RTTI_DATA1(generic_category, 0, &error_category_rtti_base_descriptor, ".?AV_Generic_error_category(a)std@@") extern const vtable_ptr generic_category_vtable; @@ -1686,14 +1701,14 @@ int __cdecl _Winerror_map(int err) #if _MSVCP_VER >= 100 __ASM_BLOCK_BEGIN(misc_vtables) -#if _MSVCP_VER == 100 __ASM_VTABLE(iostream_category, VTABLE_ADD_FUNC(custom_category_vector_dtor) - VTABLE_ADD_FUNC(custom_category_name) + VTABLE_ADD_FUNC(iostream_category_name) VTABLE_ADD_FUNC(iostream_category_message) VTABLE_ADD_FUNC(custom_category_default_error_condition) VTABLE_ADD_FUNC(custom_category_equivalent) VTABLE_ADD_FUNC(custom_category_equivalent_code)); +#if _MSVCP_VER == 100 __ASM_VTABLE(system_category, VTABLE_ADD_FUNC(custom_category_vector_dtor) VTABLE_ADD_FUNC(custom_category_name) @@ -1718,19 +1733,24 @@ __ASM_BLOCK_END void init_misc(void *base) { #ifdef __x86_64__ -#if _MSVCP_VER == 100 +#if _MSVCP_VER >= 100 init_error_category_rtti(base); + init_generic_category_rtti(base); init_iostream_category_rtti(base); +#endif +#if _MSVCP_VER == 100 init_system_category_rtti(base); - init_generic_category_rtti(base); #endif #if _MSVCP_VER >= 110 init__Pad_rtti(base); #endif #endif -#if _MSVCP_VER == 100 +#if _MSVCP_VER >= 100 iostream_category_ctor(&iostream_category); +#endif + +#if _MSVCP_VER == 100 system_category_ctor(&system_category); generic_category_ctor(&generic_category); #endif diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index c9e8e05566c..a674d0704b1 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -668,6 +668,20 @@ typedef struct { double imag; } complex_double; +#if _MSVCP_VER >= 100 +typedef struct { + const vtable_ptr *vtable; +} error_category; + +const error_category* __cdecl std_iostream_category(void); + +typedef struct +{ + int code; + const error_category *category; +} error_code; +#endif + #if _MSVCP_VER < 80 static inline int memcpy_wrapper( void *dst, size_t size, const void *src, size_t count ) {

1 0

Piotr Caban : msvcp110: Add _Throw_C_error implementation.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: c57f5d98aba8bdf5f41be665dd74d8cd7b5a3113 URL: https://gitlab.winehq.org/wine/wine/-/commit/c57f5d98aba8bdf5f41be665dd74d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 12 20:53:53 2023 +0200 msvcp110: Add _Throw_C_error implementation. --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/exception.c | 52 +++++++++++++++++++++++++++++++++++-- dlls/msvcp90/misc.c | 34 +++++++++++++++++------- dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp_win/msvcp_win.spec | 2 +- 8 files changed, 80 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 4326e9a4589..1a100676743 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1778,7 +1778,7 @@ @ extern ?_Sync(a)ios_base@std@@0_NA ios_base_Sync @ cdecl -arch=win32 ?_Syserror_map(a)std@@YAPBDH(a)Z(long) _Syserror_map @ cdecl -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z(long) _Syserror_map -@ stub ?_Throw_C_error(a)std@@YAXH(a)Z +@ cdecl ?_Throw_C_error(a)std@@YAXH(a)Z(long) _Throw_C_error @ stub ?_Throw_Cpp_error(a)std@@YAXH(a)Z @ cdecl -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z(ptr) _Throw_future_error @ cdecl -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z(ptr) _Throw_future_error diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 615172a3376..b95330179e5 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1739,7 +1739,7 @@ @ extern ?_Sync(a)ios_base@std@@0_NA ios_base_Sync @ cdecl -arch=win32 ?_Syserror_map(a)std@@YAPBDH(a)Z(long) _Syserror_map @ cdecl -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z(long) _Syserror_map -@ stub ?_Throw_C_error(a)std@@YAXH(a)Z +@ cdecl ?_Throw_C_error(a)std@@YAXH(a)Z(long) _Throw_C_error @ stub ?_Throw_Cpp_error(a)std@@YAXH(a)Z @ cdecl -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z(ptr) _Throw_future_error @ cdecl -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z(ptr) _Throw_future_error diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index b8f7e4b69e2..9155a90e554 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1739,7 +1739,7 @@ @ extern ?_Sync(a)ios_base@std@@0_NA msvcp120.?_Sync(a)ios_base@std@@0_NA @ cdecl -arch=win32 ?_Syserror_map(a)std@@YAPBDH(a)Z(long) msvcp120.?_Syserror_map(a)std@@YAPBDH(a)Z @ cdecl -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z(long) msvcp120.?_Syserror_map(a)std@@YAPEBDH(a)Z -@ stub ?_Throw_C_error(a)std@@YAXH(a)Z +@ cdecl ?_Throw_C_error(a)std@@YAXH(a)Z(long) msvcp120.?_Throw_C_error(a)std@@YAXH(a)Z @ stub ?_Throw_Cpp_error(a)std@@YAXH(a)Z @ cdecl -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z(ptr) msvcp120.?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z @ cdecl -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z(ptr) msvcp120.?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 258a5acc648..a1a33787f31 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1623,7 +1623,7 @@ @ extern ?_Sync(a)ios_base@std@@0_NA ios_base_Sync @ cdecl -arch=win32 ?_Syserror_map(a)std@@YAPBDH(a)Z(long) _Syserror_map @ cdecl -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z(long) _Syserror_map -@ stub ?_Throw_C_error(a)std@@YAXH(a)Z +@ cdecl ?_Throw_C_error(a)std@@YAXH(a)Z(long) _Throw_C_error @ stub ?_Throw_Cpp_error(a)std@@YAXH(a)Z @ cdecl -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z(ptr) _Throw_future_error @ cdecl -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z(ptr) _Throw_future_error diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 949b896bb2e..ee59dbf2112 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <errno.h> #include <stdarg.h> #include "msvcp90.h" @@ -722,7 +723,9 @@ DEFINE_RTTI_DATA4(failure, 0, &system_error_rtti_base_descriptor, &_System_error_rtti_base_descriptor, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure(a)ios_base@std@@") DEFINE_CXX_TYPE_INFO(_System_error) -DEFINE_CXX_TYPE_INFO(system_error); +DEFINE_CXX_DATA3(system_error, &_System_error_cxx_type_info, + &runtime_error_cxx_type_info, &exception_cxx_type_info, + MSVCP_runtime_error_dtor) DEFINE_CXX_DATA4(failure, &system_error_cxx_type_info, &_System_error_cxx_type_info, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) @@ -732,7 +735,12 @@ DEFINE_RTTI_DATA2(system_error, 0, &runtime_error_rtti_base_descriptor, DEFINE_RTTI_DATA3(failure, 0, &system_error_rtti_base_descriptor, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure(a)ios_base@std@@") +#if _MSVCP_VER == 100 DEFINE_CXX_TYPE_INFO(system_error); +#else +DEFINE_CXX_DATA2(system_error, &runtime_error_cxx_type_info, + &exception_cxx_type_info, MSVCP_runtime_error_dtor) +#endif DEFINE_CXX_DATA3(failure, &system_error_cxx_type_info, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) #else @@ -1033,6 +1041,44 @@ void __cdecl _Rethrow_future_exception(const exception_ptr ep) { exception_ptr_rethrow(&ep); } + +/* ?_Throw_C_error(a)std@@YAXH(a)Z */ +void __cdecl _Throw_C_error(int code) +{ + system_error se; + const char *msg; + errno_t err; + + TRACE("(%d)\n", code); + + switch(code) + { + case 1: + case 2: + err = EAGAIN; + break; + case 3: + err = EBUSY; + break; + case 4: + err = EINVAL; + break; + default: +#if _MSVCP_VER >= 140 + abort(); +#else + return; +#endif + } + + msg = strerror(err); + MSVCP_runtime_error_ctor(&se.base, &msg); + se.code.code = err; + se.code.category = std_generic_category(); + se.base.e.vtable = &system_error_vtable; + + _CxxThrowException(&se, &system_error_cxx_type); +} #endif #if _MSVCP_VER >= 140 @@ -1509,8 +1555,10 @@ void init_exception(void *base) #if _MSVCP_VER > 110 init__System_error_cxx_type_info(base); #endif -#if _MSVCP_VER > 90 +#if _MSVCP_VER == 100 init_system_error_cxx_type_info(base); +#elif _MSVCP_VER > 100 + init_system_error_cxx(base); #endif init_failure_cxx(base); init_range_error_cxx(base); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 8b9514c6edb..ada8ee967d8 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1110,13 +1110,6 @@ const char* __thiscall custom_category_name(const custom_category *this) return this->type; } -DEFINE_THISCALL_WRAPPER(custom_category_message, 12) -basic_string_char* __thiscall custom_category_message(const custom_category *this, - basic_string_char *ret, int err) -{ - return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); -} - /* ?system_category(a)std@@YAABVerror_category(a)1@XZ */ /* ?system_category(a)std@@YAAEBVerror_category(a)1@XZ */ const error_category* __cdecl std_system_category(void) @@ -1124,7 +1117,9 @@ const error_category* __cdecl std_system_category(void) TRACE("()\n"); return &system_category.base; } +#endif +#if _MSVCP_VER >= 100 static custom_category generic_category; extern const vtable_ptr generic_category_vtable; @@ -1132,7 +1127,26 @@ extern const vtable_ptr generic_category_vtable; static void generic_category_ctor(custom_category *this) { this->base.vtable = &generic_category_vtable; +#if _MSVCP_VER == 100 this->type = "generic"; +#endif +} + +DEFINE_THISCALL_WRAPPER(generic_category_name, 4) +const char* __thiscall generic_category_name(const custom_category *this) +{ +#if _MSVCP_VER == 100 + return this->type; +#else + return "generic"; +#endif +} + +DEFINE_THISCALL_WRAPPER(custom_category_message, 12) +basic_string_char* __thiscall custom_category_message(const custom_category *this, + basic_string_char *ret, int err) +{ + return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); } /* ?generic_category(a)std@@YAABVerror_category(a)1@XZ */ @@ -1716,14 +1730,14 @@ __ASM_BLOCK_BEGIN(misc_vtables) VTABLE_ADD_FUNC(custom_category_default_error_condition) VTABLE_ADD_FUNC(custom_category_equivalent) VTABLE_ADD_FUNC(custom_category_equivalent_code)); +#endif __ASM_VTABLE(generic_category, VTABLE_ADD_FUNC(custom_category_vector_dtor) - VTABLE_ADD_FUNC(custom_category_name) + VTABLE_ADD_FUNC(generic_category_name) VTABLE_ADD_FUNC(custom_category_message) VTABLE_ADD_FUNC(custom_category_default_error_condition) VTABLE_ADD_FUNC(custom_category_equivalent) VTABLE_ADD_FUNC(custom_category_equivalent_code)); -#endif #if _MSVCP_VER >= 110 __ASM_VTABLE(_Pad, VTABLE_ADD_FUNC(_Pad__Go)); @@ -1748,11 +1762,11 @@ void init_misc(void *base) #if _MSVCP_VER >= 100 iostream_category_ctor(&iostream_category); + generic_category_ctor(&generic_category); #endif #if _MSVCP_VER == 100 system_category_ctor(&system_category); - generic_category_ctor(&generic_category); #endif } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index a674d0704b1..69f1785a32b 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -674,6 +674,7 @@ typedef struct { } error_category; const error_category* __cdecl std_iostream_category(void); +const error_category* __cdecl std_generic_category(void); typedef struct { diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index 99b34ccc9ac..a2107ea198a 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -1623,7 +1623,7 @@ @ extern ?_Sync(a)ios_base@std@@0_NA msvcp140.?_Sync(a)ios_base@std@@0_NA @ cdecl -arch=win32 ?_Syserror_map(a)std@@YAPBDH(a)Z(long) msvcp140.?_Syserror_map(a)std@@YAPBDH(a)Z @ cdecl -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z(long) msvcp140.?_Syserror_map(a)std@@YAPEBDH(a)Z -@ stub ?_Throw_C_error(a)std@@YAXH(a)Z +@ cdecl ?_Throw_C_error(a)std@@YAXH(a)Z(long) msvcp140.?_Throw_C_error(a)std@@YAXH(a)Z @ stub ?_Throw_Cpp_error(a)std@@YAXH(a)Z @ cdecl -arch=win32 ?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z(ptr) msvcp140.?_Throw_future_error(a)std@@YAXABVerror_code(a)1@@Z @ cdecl -arch=win64 ?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z(ptr) msvcp140.?_Throw_future_error(a)std@@YAXAEBVerror_code(a)1@@Z

1 0

Alex Henrie : winmm: Avoid explicitly casting the pointer returned from Heap(Re)Alloc.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 38111eb3c5ebd2696e0b37afb01baeba70b01a44 URL: https://gitlab.winehq.org/wine/wine/-/commit/38111eb3c5ebd2696e0b37afb01bae… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 13 18:29:43 2023 -0600 winmm: Avoid explicitly casting the pointer returned from Heap(Re)Alloc. --- dlls/winmm/lolvldrv.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 906405ac74f..37888b43f7b 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -334,6 +334,8 @@ static BOOL MMDRV_InitPerType(LPWINE_MM_DRIVER lpDrv, UINT type, UINT wMsg) DWORD ret; UINT count = 0; int i, k; + WINE_MLD *mem; + TRACE("(%p, %04x, %04x)\n", lpDrv, type, wMsg); part->nIDMin = part->nIDMax = 0; @@ -370,14 +372,14 @@ static BOOL MMDRV_InitPerType(LPWINE_MM_DRIVER lpDrv, UINT type, UINT wMsg) part->nIDMin, part->nIDMax, llTypes[type].wMaxId, lpDrv->drvname, llTypes[type].typestr); /* realloc translation table */ - if (llTypes[type].lpMlds) - llTypes[type].lpMlds = (LPWINE_MLD) - HeapReAlloc(GetProcessHeap(), 0, llTypes[type].lpMlds - 1, - sizeof(WINE_MLD) * (llTypes[type].wMaxId + 1)) + 1; - else - llTypes[type].lpMlds = (LPWINE_MLD) - HeapAlloc(GetProcessHeap(), 0, - sizeof(WINE_MLD) * (llTypes[type].wMaxId + 1)) + 1; + if (llTypes[type].lpMlds) { + mem = llTypes[type].lpMlds - 1; + mem = HeapReAlloc(GetProcessHeap(), 0, mem, sizeof(WINE_MLD) * (llTypes[type].wMaxId + 1)); + llTypes[type].lpMlds = mem + 1; + } else { + mem = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MLD) * (llTypes[type].wMaxId + 1)); + llTypes[type].lpMlds = mem + 1; + } /* re-build the translation table */ if (lpDrv->bIsMapper) {

1 0

Zebediah Figura : wined3d: Allow creating a feature level < 10 device if KHR_shader_draw_parameters is missing.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: c87786b30ed538a4f1c1410faccbffe79b769613 URL: https://gitlab.winehq.org/wine/wine/-/commit/c87786b30ed538a4f1c1410faccbff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 26 15:36:48 2023 -0600 wined3d: Allow creating a feature level < 10 device if KHR_shader_draw_parameters is missing. vkd3d-shader only needs it for SV_VertexID and SV_InstanceID, which are specific to shader model 4 and higher. --- dlls/wined3d/adapter_vk.c | 6 +++++- dlls/wined3d/wined3d_vk.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a728b840d07..3bedce4d0b4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -350,6 +350,8 @@ static void get_physical_device_info(const struct wined3d_adapter_vk *adapter_vk if (vk_info->api_version >= VK_API_VERSION_1_1) xfb_features->pNext = draw_parameters_features; + else + draw_parameters_features->shaderDrawParameters = vk_info->supported[WINED3D_VK_KHR_SHADER_DRAW_PARAMETERS]; xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; @@ -2224,6 +2226,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->features2.features.pipelineStatisticsQuery && info->features2.features.shaderClipDistance && info->features2.features.shaderCullDistance + && info->draw_parameters_features.shaderDrawParameters && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; } @@ -2389,7 +2392,7 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u, true}, {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1, true}, {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME,VK_API_VERSION_1_2}, - {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1, true}, + {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1}, {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u, true}, {VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME, VK_API_VERSION_1_2}, }; @@ -2403,6 +2406,7 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk { {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, WINED3D_VK_EXT_TRANSFORM_FEEDBACK}, {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE}, + {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, WINED3D_VK_KHR_SHADER_DRAW_PARAMETERS}, {VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME, WINED3D_VK_EXT_HOST_QUERY_RESET}, }; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 74bab95be2a..963328a215f 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -217,6 +217,7 @@ enum wined3d_vk_extension WINED3D_VK_EXT_TRANSFORM_FEEDBACK, WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, + WINED3D_VK_KHR_SHADER_DRAW_PARAMETERS, WINED3D_VK_EXT_HOST_QUERY_RESET, WINED3D_VK_EXT_COUNT,

1 0

Zebediah Figura : wined3d: Do not use EXT_host_query_reset if hostQueryReset is not actually supported.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 067c8acd95f1d594a64a672f2803cbae13d6089f URL: https://gitlab.winehq.org/wine/wine/-/commit/067c8acd95f1d594a64a672f2803cb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 7 17:23:22 2023 -0500 wined3d: Do not use EXT_host_query_reset if hostQueryReset is not actually supported. --- dlls/wined3d/adapter_vk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3bedce4d0b4..c3161906387 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2300,6 +2300,9 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ get_physical_device_info(adapter_vk, &device_info); + if (!device_info.host_query_reset_features.hostQueryReset) + adapter_vk->vk_info.supported[WINED3D_VK_EXT_HOST_QUERY_RESET] = FALSE; + adapter_vk->a.shader_backend->shader_get_caps(&adapter_vk->a, &shader_caps); adapter_vk->a.vertex_pipe->vp_get_caps(&adapter_vk->a, &vertex_caps); adapter_vk->a.fragment_pipe->get_caps(&adapter_vk->a, &fragment_caps);

1 0

Zebediah Figura : wined3d: Do not use EXT_transform_feedback if transformFeedback is not actually supported.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 85c89bd864dec24cf2b38116b1ac8c2c9803c474 URL: https://gitlab.winehq.org/wine/wine/-/commit/85c89bd864dec24cf2b38116b1ac8c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 7 17:24:17 2023 -0500 wined3d: Do not use EXT_transform_feedback if transformFeedback is not actually supported. --- dlls/wined3d/adapter_vk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index c3161906387..fffe33a76d4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2303,6 +2303,9 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ if (!device_info.host_query_reset_features.hostQueryReset) adapter_vk->vk_info.supported[WINED3D_VK_EXT_HOST_QUERY_RESET] = FALSE; + if (!device_info.xfb_features.transformFeedback) + adapter_vk->vk_info.supported[WINED3D_VK_EXT_TRANSFORM_FEEDBACK] = FALSE; + adapter_vk->a.shader_backend->shader_get_caps(&adapter_vk->a, &shader_caps); adapter_vk->a.vertex_pipe->vp_get_caps(&adapter_vk->a, &vertex_caps); adapter_vk->a.fragment_pipe->get_caps(&adapter_vk->a, &fragment_caps);

1 0

Zebediah Figura : wined3d: Remove the unused "sampler" local variable from wined3d_context_vk_load_shader_resources().
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 37a60f580c30d5b388f21b4a6984820993c7030b URL: https://gitlab.winehq.org/wine/wine/-/commit/37a60f580c30d5b388f21b4a698482… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 22 17:53:39 2023 -0500 wined3d: Remove the unused "sampler" local variable from wined3d_context_vk_load_shader_resources(). This was made unused by a42808b54ae28ab5a38d523e987dcbc619697609. --- dlls/wined3d/context_vk.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index f9ac0a59707..75f0e68395c 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3456,7 +3456,6 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * struct wined3d_unordered_access_view *uav; struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; - struct wined3d_sampler *sampler; struct wined3d_buffer *buffer; size_t i; @@ -3551,11 +3550,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * break; case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: - break; - case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: - if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) - sampler = context_vk->c.device->null_sampler; break; default:

1 0