January 2024 - Wine-commits

Alexandre Julliard : msvcp: Consistently use __int64 types in number conversion functions.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: c7c862425008c84ae001d68227bd2a0d3adb7c2e URL: https://gitlab.winehq.org/wine/wine/-/commit/c7c862425008c84ae001d68227bd2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 11:17:32 2024 +0100 msvcp: Consistently use __int64 types in number conversion functions. This avoids unaligned access warnings with clang. --- dlls/msvcp60/msvcp.h | 8 ++++---- dlls/msvcp90/locale.c | 40 ++++++++++++++++++++-------------------- dlls/msvcp90/msvcp90.h | 8 ++++---- 3 files changed, 28 insertions(+), 28 deletions(-)

1 0

Alexandre Julliard : include: Add a typedef for user callback function pointers.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 3031f15784b556cd3ff773960d4dd7b0b4eeee7e URL: https://gitlab.winehq.org/wine/wine/-/commit/3031f15784b556cd3ff773960d4dd7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 10:26:59 2024 +0100 include: Add a typedef for user callback function pointers. --- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_arm64ec.c | 2 +- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/tests/exception.c | 8 ++++---- dlls/opengl32/wgl.c | 2 +- dlls/user.exe16/message.c | 2 +- dlls/user32/user_main.c | 19 +++++++++++-------- dlls/wineandroid.drv/dllmain.c | 2 +- dlls/winemac.drv/dllmain.c | 5 ++--- dlls/winevulkan/loader.c | 2 +- dlls/winex11.drv/dllmain.c | 5 ++--- include/winternl.h | 4 +++- 14 files changed, 31 insertions(+), 28 deletions(-)

1 0

Alexandre Julliard : ntdll: Share KiUserCallbackDispatcher implementation across platforms.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: d89037a826ae5cd7d006e2f98b1a6a33d9afa084 URL: https://gitlab.winehq.org/wine/wine/-/commit/d89037a826ae5cd7d006e2f98b1a6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 11:06:41 2024 +0100 ntdll: Share KiUserCallbackDispatcher implementation across platforms. --- dlls/ntdll/exception.c | 24 ++++++++++++++++++++++++ dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 25 ++++++------------------- dlls/ntdll/signal_arm64.c | 25 ++++++------------------- dlls/ntdll/signal_arm64ec.c | 25 ++++++------------------- dlls/ntdll/signal_i386.c | 18 +++--------------- dlls/ntdll/signal_x86_64.c | 27 ++++++++------------------- 7 files changed, 54 insertions(+), 91 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 7a230237f0c..1691680d3c6 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -185,6 +185,30 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) } +/******************************************************************* + * dispatch_user_callback + * + * Implementation of KiUserCallbackDispatcher. + */ +NTSTATUS WINAPI dispatch_user_callback( void *args, ULONG len, ULONG id ) +{ + NTSTATUS status; + + __TRY + { + KERNEL_CALLBACK_PROC func = NtCurrentTeb()->Peb->KernelCallbackTable[id]; + status = func( args, len ); + } + __EXCEPT_ALL + { + ERR( "ignoring exception\n" ); + status = STATUS_SUCCESS; + } + __ENDTRY + return status; +} + + /******************************************************************* * raise_status * diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a7967a6c242..11cf2b39e1a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -49,6 +49,7 @@ extern UINT_PTR page_size; /* exceptions */ extern LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ); +extern NTSTATUS WINAPI dispatch_user_callback( void *args, ULONG len, ULONG id ); extern void DECLSPEC_NORETURN raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ); extern LONG WINAPI call_unhandled_exception_filter( PEXCEPTION_POINTERS eptr ); diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index f29d7f0ba6f..0b711481e98 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -575,24 +575,6 @@ __ASM_GLOBAL_FUNC( KiUserApcDispatcher, /******************************************************************* * KiUserCallbackDispatcher (NTDLL.@) */ -void WINAPI dispatch_callback( void *args, ULONG len, ULONG id ) -{ - NTSTATUS status; - - __TRY - { - KERNEL_CALLBACK_PROC func = NtCurrentTeb()->Peb->KernelCallbackTable[id]; - status = NtCallbackReturn( NULL, 0, func( args, len )); - } - __EXCEPT_ALL - { - ERR_(seh)( "ignoring exception\n" ); - status = NtCallbackReturn( 0, 0, 0 ); - } - __ENDTRY - - RtlRaiseStatus( status ); -} __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, __ASM_SEH(".seh_custom 0xee,0x01\n\t") /* MSFT_OP_MACHINE_FRAME */ "nop\n\t" @@ -606,7 +588,12 @@ __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, "ldr r0, [sp]\n\t" /* args */ "ldr r1, [sp, #0x04]\n\t" /* len */ "ldr r2, [sp, #0x08]\n\t" /* id */ - "bl " __ASM_NAME("dispatch_callback") "\n\t" + "bl " __ASM_NAME("dispatch_user_callback") "\n\t" + "mov r2, r0\n\t" /* status */ + "mov r1, #0\n\t" /* ret_len */ + "mov r0, r1\n\t" /* ret_ptr */ + "bl " __ASM_NAME("NtCallbackReturn") "\n\t" + "bl " __ASM_NAME("RtlRaiseStatus") "\n\t" "udf #1" ) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2fd56ed5ddc..a731dc77795 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -605,24 +605,6 @@ __ASM_GLOBAL_FUNC( KiUserApcDispatcher, /******************************************************************* * KiUserCallbackDispatcher (NTDLL.@) */ -void WINAPI dispatch_callback( void *args, ULONG len, ULONG id ) -{ - NTSTATUS status; - - __TRY - { - KERNEL_CALLBACK_PROC func = NtCurrentTeb()->Peb->KernelCallbackTable[id]; - status = NtCallbackReturn( NULL, 0, func( args, len )); - } - __EXCEPT_ALL - { - ERR_(seh)( "ignoring exception\n" ); - status = NtCallbackReturn( 0, 0, 0 ); - } - __ENDTRY - - RtlRaiseStatus( status ); -} __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, __ASM_SEH(".seh_pushframe\n\t") "nop\n\t" @@ -632,7 +614,12 @@ __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, __ASM_SEH(".seh_endprologue\n\t") "ldr x0, [sp]\n\t" /* args */ "ldp w1, w2, [sp, #0x08]\n\t" /* len, id */ - "bl " __ASM_NAME("dispatch_callback") "\n\t" + "bl " __ASM_NAME("dispatch_user_callback") "\n\t" + "mov x2, x0\n\t" /* status */ + "mov x1, #0\n\t" /* ret_len */ + "mov x0, x1\n\t" /* ret_ptr */ + "bl " __ASM_NAME("NtCallbackReturn") "\n\t" + "bl " __ASM_NAME("RtlRaiseStatus") "\n\t" "brk #1" ) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 9953ab8e60d..1974ed63dd9 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1716,24 +1716,6 @@ __ASM_GLOBAL_FUNC( "#KiUserApcDispatcher", /******************************************************************* * KiUserCallbackDispatcher (NTDLL.@) */ -void WINAPI dispatch_callback( void *args, ULONG len, ULONG id ) -{ - NTSTATUS status; - - __TRY - { - KERNEL_CALLBACK_PROC func = NtCurrentTeb()->Peb->KernelCallbackTable[id]; - status = NtCallbackReturn( NULL, 0, func( args, len )); - } - __EXCEPT_ALL - { - ERR_(seh)( "ignoring exception\n" ); - status = NtCallbackReturn( 0, 0, 0 ); - } - __ENDTRY - - RtlRaiseStatus( status ); -} __ASM_GLOBAL_FUNC( "#KiUserCallbackDispatcher", __ASM_SEH(".seh_pushframe\n\t") "nop\n\t" @@ -1743,7 +1725,12 @@ __ASM_GLOBAL_FUNC( "#KiUserCallbackDispatcher", __ASM_SEH(".seh_endprologue\n\t") "ldr x0, [sp]\n\t" /* args */ "ldp w1, w2, [sp, #0x08]\n\t" /* len, id */ - "bl " __ASM_NAME("dispatch_callback") "\n\t" + "bl " __ASM_NAME("dispatch_user_callback") "\n\t" + "mov x2, x0\n\t" /* status */ + "mov x1, #0\n\t" /* ret_len */ + "mov x0, x1\n\t" /* ret_ptr */ + "bl " __ASM_NAME("NtCallbackReturn") "\n\t" + "bl " __ASM_NAME("RtlRaiseStatus") "\n\t" "brk #1" ) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index c4aaba5e0a8..865faa93ea9 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -294,21 +294,9 @@ __ASM_STDCALL_FUNC( KiUserApcDispatcher, 20, */ void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) { - NTSTATUS status; - - __TRY - { - KERNEL_CALLBACK_PROC func = NtCurrentTeb()->Peb->KernelCallbackTable[id]; - status = NtCallbackReturn( NULL, 0, func( args, len )); - } - __EXCEPT_ALL - { - ERR_(seh)( "ignoring exception\n" ); - status = NtCallbackReturn( 0, 0, 0 ); - } - __ENDTRY - - RtlRaiseStatus( status ); + NTSTATUS status = dispatch_user_callback( args, len, id ); + status = NtCallbackReturn( NULL, 0, status ); + for (;;) RtlRaiseStatus( status ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 9c6049552b2..c56552a74a7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -691,24 +691,6 @@ __ASM_GLOBAL_FUNC( KiUserApcDispatcher, /******************************************************************* * KiUserCallbackDispatcher (NTDLL.@) */ -void WINAPI dispatch_callback( void *args, ULONG len, ULONG id ) -{ - NTSTATUS status; - - __TRY - { - KERNEL_CALLBACK_PROC func = NtCurrentTeb()->Peb->KernelCallbackTable[id]; - status = NtCallbackReturn( NULL, 0, func( args, len )); - } - __EXCEPT_ALL - { - ERR_(seh)( "ignoring exception\n" ); - status = NtCallbackReturn( 0, 0, 0 ); - } - __ENDTRY - - RtlRaiseStatus( status ); -} __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, __ASM_SEH(".seh_pushframe\n\t") __ASM_SEH(".seh_stackalloc 0x30\n\t") @@ -720,7 +702,14 @@ __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, "movq 0x20(%rsp),%rcx\n\t" /* args */ "movl 0x28(%rsp),%edx\n\t" /* len */ "movl 0x2c(%rsp),%r8d\n\t" /* id */ - "call " __ASM_NAME("dispatch_callback") ) + "call " __ASM_NAME("dispatch_user_callback") "\n\t" + "xorq %rcx,%rcx\n\t" /* ret_ptr */ + "xorl %edx,%edx\n\t" /* ret_len */ + "movl %eax,%r8d\n\t" /* status */ + "call " __ASM_NAME("NtCallbackReturn") "\n\t" + "movl %eax,%ecx\n\t" /* status */ + "call " __ASM_NAME("RtlRaiseStatus") "\n\t" + "int3" ) /**************************************************************************

1 0

Alexandre Julliard : ntdll: Report failure in KiUserCallbackDispatcher when catching an exception.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 7344a124d7f6607991ce9dccc1600c4adc9eae04 URL: https://gitlab.winehq.org/wine/wine/-/commit/7344a124d7f6607991ce9dccc1600c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 11:26:41 2024 +0100 ntdll: Report failure in KiUserCallbackDispatcher when catching an exception. --- dlls/ntdll/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 1691680d3c6..98733045e17 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -201,8 +201,8 @@ NTSTATUS WINAPI dispatch_user_callback( void *args, ULONG len, ULONG id ) } __EXCEPT_ALL { - ERR( "ignoring exception\n" ); - status = STATUS_SUCCESS; + status = GetExceptionCode(); + ERR( "ignoring exception %lx\n", status ); } __ENDTRY return status;

1 0

Alexandre Julliard : ntdll: Export KiUserCallbackDispatcherReturn.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 47aebf67a5149ab9953944fa5e6729b9b71a5c31 URL: https://gitlab.winehq.org/wine/wine/-/commit/47aebf67a5149ab9953944fa5e6729… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 11:28:41 2024 +0100 ntdll: Export KiUserCallbackDispatcherReturn. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 2 ++ dlls/ntdll/signal_arm64.c | 2 ++ dlls/ntdll/signal_arm64ec.c | 2 ++ 5 files changed, 8 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 90b64627ce5..18dddf928cf 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -70,6 +70,7 @@ @ stdcall -norelay KiRaiseUserExceptionDispatcher() @ stdcall -norelay KiUserApcDispatcher(ptr long long long ptr) @ stdcall -norelay KiUserCallbackDispatcher(long ptr long) +@ stdcall -norelay -arch=arm,arm64,arm64ec KiUserCallbackDispatcherReturn() @ stdcall -norelay KiUserExceptionDispatcher(ptr ptr) # @ stub LdrAccessOutOfProcessResource @ stdcall LdrAccessResource(long ptr ptr ptr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 11cf2b39e1a..1512bc17132 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -57,6 +57,7 @@ extern void WINAPI LdrInitializeThunk(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR); extern NTSTATUS WINAPI KiUserExceptionDispatcher(EXCEPTION_RECORD*,CONTEXT*); extern void WINAPI KiUserApcDispatcher(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC); extern void WINAPI KiUserCallbackDispatcher(ULONG,void*,ULONG); +extern void WINAPI KiUserCallbackDispatcherReturn(void); extern void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT *context ); #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0b711481e98..ccb3f10b9f5 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -589,6 +589,8 @@ __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, "ldr r1, [sp, #0x04]\n\t" /* len */ "ldr r2, [sp, #0x08]\n\t" /* id */ "bl " __ASM_NAME("dispatch_user_callback") "\n\t" + ".globl " __ASM_NAME("KiUserCallbackDispatcherReturn") "\n" + __ASM_NAME("KiUserCallbackDispatcherReturn") ":\n\t" "mov r2, r0\n\t" /* status */ "mov r1, #0\n\t" /* ret_len */ "mov r0, r1\n\t" /* ret_ptr */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index a731dc77795..8a59f9050b1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -615,6 +615,8 @@ __ASM_GLOBAL_FUNC( KiUserCallbackDispatcher, "ldr x0, [sp]\n\t" /* args */ "ldp w1, w2, [sp, #0x08]\n\t" /* len, id */ "bl " __ASM_NAME("dispatch_user_callback") "\n\t" + ".globl " __ASM_NAME("KiUserCallbackDispatcherReturn") "\n" + __ASM_NAME("KiUserCallbackDispatcherReturn") ":\n\t" "mov x2, x0\n\t" /* status */ "mov x1, #0\n\t" /* ret_len */ "mov x0, x1\n\t" /* ret_ptr */ diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 1974ed63dd9..fb6654f4340 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1726,6 +1726,8 @@ __ASM_GLOBAL_FUNC( "#KiUserCallbackDispatcher", "ldr x0, [sp]\n\t" /* args */ "ldp w1, w2, [sp, #0x08]\n\t" /* len, id */ "bl " __ASM_NAME("dispatch_user_callback") "\n\t" + ".globl \"#KiUserCallbackDispatcherReturn\"\n" + "\"#KiUserCallbackDispatcherReturn\":\n\t" "mov x2, x0\n\t" /* status */ "mov x1, #0\n\t" /* ret_len */ "mov x0, x1\n\t" /* ret_ptr */

1 0

Vijay Kiran Kamuju : wine.inf: Create security directory.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: f51b4d014e1291cd3a394c7819516e7d1fce75ac URL: https://gitlab.winehq.org/wine/wine/-/commit/f51b4d014e1291cd3a394c7819516e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Jan 20 14:15:09 2024 +0100 wine.inf: Create security directory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52399 --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 68eac159456..9a8865698ea 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2197,6 +2197,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,help, 10,logs, 10,performance\winsat\datastore, +10,security, 10,tasks, 10,temp, 11,catroot,

1 0

Vijay Kiran Kamuju : msvcp140: Add stub for _XGetLastError.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: b6199254be9acb5a08b3cc840e8a7cab51b852ae URL: https://gitlab.winehq.org/wine/wine/-/commit/b6199254be9acb5a08b3cc840e8a7c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Jan 20 14:52:29 2024 +0100 msvcp140: Add stub for _XGetLastError. --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/exception.c | 8 ++++++++ dlls/msvcp_win/msvcp_win.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index c04e870eb72..bc18d7b5be8 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1672,7 +1672,7 @@ @ cdecl ?_Winerror_map(a)std@@YAHH(a)Z(long) _Winerror_map @ cdecl -arch=win32 ?_Winerror_message(a)std@@YAKKPADK(a)Z(long ptr long) _Winerror_message @ cdecl -arch=win64 ?_Winerror_message(a)std@@YAKKPEADK(a)Z(long ptr long) _Winerror_message -@ stub ?_XGetLastError(a)std@@YAXXZ +@ cdecl ?_XGetLastError(a)std@@YAXXZ() _XGetLastError @ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 01cb2bb5dab..4cfa70c4c72 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -997,6 +997,14 @@ bool __cdecl MSVCP__uncaught_exception(void) return __uncaught_exception(); } +#if _MSVCP_VER >= 140 +/* ?_XGetLastError(a)std@@YAXXZ */ +void __cdecl _XGetLastError(void) +{ + FIXME("stub\n"); +} +#endif + #if _MSVCP_VER >= 110 typedef struct { diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index 813d2ba67da..71dc2c1e953 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -1672,7 +1672,7 @@ @ cdecl ?_Winerror_map(a)std@@YAHH(a)Z(long) msvcp140.?_Winerror_map(a)std@@YAHH(a)Z @ cdecl -arch=win32 ?_Winerror_message(a)std@@YAKKPADK(a)Z(long ptr long) msvcp140.?_Winerror_message(a)std@@YAKKPADK(a)Z @ cdecl -arch=win64 ?_Winerror_message(a)std@@YAKKPEADK(a)Z(long ptr long) msvcp140.?_Winerror_message(a)std@@YAKKPEADK(a)Z -@ stub ?_XGetLastError(a)std@@YAXXZ +@ cdecl ?_XGetLastError(a)std@@YAXXZ() msvcp140.?_XGetLastError(a)std@@YAXXZ @ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) msvcp140.?_XLgamma(a)std@@YAMM(a)Z @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) msvcp140.?_XLgamma(a)std@@YANN(a)Z @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) msvcp140.?_XLgamma(a)std@@YAOO(a)Z

1 0

Piotr Caban : msvcp140: Add _XGetLastError implementation.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 1d917529f13a14fc304cec8540e18c48ba39c15a URL: https://gitlab.winehq.org/wine/wine/-/commit/1d917529f13a14fc304cec8540e18c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jan 20 20:20:54 2024 +0100 msvcp140: Add _XGetLastError implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46904 --- dlls/msvcp90/exception.c | 14 +++++++++++++- dlls/msvcp90/misc.c | 49 +++++++++++++++++++++++++++++++++--------------- dlls/msvcp90/msvcp90.h | 3 +++ 3 files changed, 50 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 4cfa70c4c72..c881b37cd97 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1001,7 +1001,19 @@ bool __cdecl MSVCP__uncaught_exception(void) /* ?_XGetLastError(a)std@@YAXXZ */ void __cdecl _XGetLastError(void) { - FIXME("stub\n"); + int err = GetLastError(); + system_error se; + const char *msg; + + TRACE("() GetLastError()=%d\n", err); + + msg = _Winerror_map_str(err); + MSVCP_runtime_error_ctor(&se.base, &msg); + se.code.code = err; + se.code.category = std_system_category(); + se.base.e.vtable = &system_error_vtable; + + _CxxThrowException(&se, &system_error_cxx_type); } #endif diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index f82456cbf4b..a08101052da 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1063,6 +1063,13 @@ bool __thiscall custom_category_equivalent_code(custom_category *this, return FALSE; } +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(iostream_category_name, 4) const char* __thiscall iostream_category_name(const custom_category *this) { @@ -1090,7 +1097,7 @@ const error_category* __cdecl std_iostream_category(void) } #endif -#if _MSVCP_VER == 100 +#if _MSVCP_VER == 100 || _MSVCP_VER >= 140 static custom_category system_category; DEFINE_RTTI_DATA1(system_category, 0, &error_category_rtti_base_descriptor, ".?AV_System_error_category(a)std@@") @@ -1099,13 +1106,32 @@ extern const vtable_ptr system_category_vtable; static void system_category_ctor(custom_category *this) { this->base.vtable = &system_category_vtable; +#if _MSVCP_VER == 100 this->type = "system"; +#endif } -DEFINE_THISCALL_WRAPPER(custom_category_name, 4) -const char* __thiscall custom_category_name(const custom_category *this) +DEFINE_THISCALL_WRAPPER(system_category_name, 4) +const char* __thiscall system_category_name(const custom_category *this) { +#if _MSVCP_VER == 100 return this->type; +#else + return "system"; +#endif +} + +DEFINE_THISCALL_WRAPPER(system_category_message, 12) +basic_string_char* __thiscall system_category_message(const custom_category *this, + basic_string_char *ret, int err) +{ +#if _MSVCP_VER > 100 + const char *msg = _Winerror_map_str(err); + if (!msg) return MSVCP_basic_string_char_ctor_cstr(ret, "unknown error"); + return MSVCP_basic_string_char_ctor_cstr(ret, msg); +#else + return custom_category_message(this, ret, err); +#endif } /* ?system_category(a)std@@YAABVerror_category(a)1@XZ */ @@ -1140,13 +1166,6 @@ const char* __thiscall generic_category_name(const custom_category *this) #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 */ /* ?generic_category(a)std@@YAAEBVerror_category(a)1@XZ */ const error_category* __cdecl std_generic_category(void) @@ -1729,11 +1748,11 @@ __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)); -#if _MSVCP_VER == 100 +#if _MSVCP_VER == 100 || _MSVCP_VER >= 140 __ASM_VTABLE(system_category, VTABLE_ADD_FUNC(custom_category_vector_dtor) - VTABLE_ADD_FUNC(custom_category_name) - VTABLE_ADD_FUNC(custom_category_message) + VTABLE_ADD_FUNC(system_category_name) + VTABLE_ADD_FUNC(system_category_message) VTABLE_ADD_FUNC(custom_category_default_error_condition) VTABLE_ADD_FUNC(custom_category_equivalent) VTABLE_ADD_FUNC(custom_category_equivalent_code)); @@ -1759,7 +1778,7 @@ void init_misc(void *base) init_generic_category_rtti(base); init_iostream_category_rtti(base); #endif -#if _MSVCP_VER == 100 +#if _MSVCP_VER == 100 || _MSVCP_VER >= 140 init_system_category_rtti(base); #endif #if _MSVCP_VER >= 110 @@ -1772,7 +1791,7 @@ void init_misc(void *base) generic_category_ctor(&generic_category); #endif -#if _MSVCP_VER == 100 +#if _MSVCP_VER == 100 || _MSVCP_VER >= 140 system_category_ctor(&system_category); #endif } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 3b97cfefd4b..9471b896ba5 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -694,12 +694,15 @@ typedef struct { const error_category* __cdecl std_iostream_category(void); const error_category* __cdecl std_generic_category(void); +const error_category* __cdecl std_system_category(void); typedef struct { int code; const error_category *category; } error_code; + +const char *_Winerror_map_str(int err); #endif #if _MSVCP_VER < 80

1 0

Henri Verbeet : vkd3d-shader/ir: Store the shader version in struct vsir_program.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 23dcd4f22b5048360a11c14ab793790cb9ca6111 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/23dcd4f22b5048360a11c14ab7937… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 16 16:40:30 2024 +0100 vkd3d-shader/ir: Store the shader version in struct vsir_program. --- libs/vkd3d-shader/d3d_asm.c | 14 ++++++------- libs/vkd3d-shader/d3dbc.c | 30 ++++++++++++++------------- libs/vkd3d-shader/dxil.c | 4 ++-- libs/vkd3d-shader/ir.c | 35 ++++++++++++++++++-------------- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/tpf.c | 9 ++++---- libs/vkd3d-shader/vkd3d_shader_main.c | 12 +++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 11 +++++----- 8 files changed, 61 insertions(+), 56 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/ir: Store the "use_vocp" field in struct vsir_program.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 7b85cd6a313ad89c26bbe2dbd743e85817260b9f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b85cd6a313ad89c26bbe2dbd743e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 20:39:55 2024 +0100 vkd3d-shader/ir: Store the "use_vocp" field in struct vsir_program. --- libs/vkd3d-shader/ir.c | 15 ++++++++------- libs/vkd3d-shader/spirv.c | 7 ++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 8be14291..48ac2a8e 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1241,20 +1241,21 @@ static void shader_instruction_normalise_io_params(struct vkd3d_shader_instructi static enum vkd3d_result shader_normalise_io_registers(struct vkd3d_shader_parser *parser) { struct io_normaliser normaliser = {parser->program.instructions}; + struct vsir_program *program = &parser->program; struct vkd3d_shader_instruction *ins; bool has_control_point_phase; unsigned int i, j; normaliser.phase = VKD3DSIH_INVALID; - normaliser.shader_type = parser->program.shader_version.type; - normaliser.major = parser->program.shader_version.major; + normaliser.shader_type = program->shader_version.type; + normaliser.major = program->shader_version.major; normaliser.input_signature = &parser->shader_desc.input_signature; normaliser.output_signature = &parser->shader_desc.output_signature; normaliser.patch_constant_signature = &parser->shader_desc.patch_constant_signature; - for (i = 0, has_control_point_phase = false; i < parser->program.instructions.count; ++i) + for (i = 0, has_control_point_phase = false; i < program->instructions.count; ++i) { - ins = &parser->program.instructions.elements[i]; + ins = &program->instructions.elements[i]; switch (ins->handler_idx) { @@ -1297,7 +1298,7 @@ static enum vkd3d_result shader_normalise_io_registers(struct vkd3d_shader_parse || !shader_signature_merge(&parser->shader_desc.output_signature, normaliser.output_range_map, false) || !shader_signature_merge(&parser->shader_desc.patch_constant_signature, normaliser.pc_range_map, true)) { - parser->program.instructions = normaliser.instructions; + program->instructions = normaliser.instructions; return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -1305,8 +1306,8 @@ static enum vkd3d_result shader_normalise_io_registers(struct vkd3d_shader_parse for (i = 0; i < normaliser.instructions.count; ++i) shader_instruction_normalise_io_params(&normaliser.instructions.elements[i], &normaliser); - parser->program.instructions = normaliser.instructions; - parser->shader_desc.use_vocp = normaliser.use_vocp; + program->instructions = normaliser.instructions; + program->use_vocp = normaliser.use_vocp; return VKD3D_OK; } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1128788b..0e01df4c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9680,6 +9680,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_desc *shader_desc = &parser->shader_desc; struct vkd3d_shader_instruction_array instructions; + struct vsir_program *program = &parser->program; enum vkd3d_result result = VKD3D_OK; unsigned int i; @@ -9699,8 +9700,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, if (parser->shader_desc.block_count && !spirv_compiler_init_blocks(compiler, parser->shader_desc.block_count)) return VKD3D_ERROR_OUT_OF_MEMORY; - instructions = parser->program.instructions; - memset(&parser->program.instructions, 0, sizeof(parser->program.instructions)); + instructions = program->instructions; + memset(&program->instructions, 0, sizeof(program->instructions)); compiler->input_signature = shader_desc->input_signature; compiler->output_signature = shader_desc->output_signature; @@ -9708,7 +9709,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, memset(&shader_desc->input_signature, 0, sizeof(shader_desc->input_signature)); memset(&shader_desc->output_signature, 0, sizeof(shader_desc->output_signature)); memset(&shader_desc->patch_constant_signature, 0, sizeof(shader_desc->patch_constant_signature)); - compiler->use_vocp = parser->shader_desc.use_vocp; + compiler->use_vocp = program->use_vocp; compiler->block_names = parser->shader_desc.block_names; compiler->block_name_count = parser->shader_desc.block_name_count; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f350e0bc..8ffaf553 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1031,8 +1031,6 @@ struct vkd3d_shader_desc uint32_t used, external; } flat_constant_count[3]; - bool use_vocp; - const char **block_names; size_t block_name_count; }; @@ -1274,6 +1272,8 @@ struct vsir_program { struct vkd3d_shader_version shader_version; struct vkd3d_shader_instruction_array instructions; + + bool use_vocp; }; bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_version *version, unsigned int reserve);

1 0