October 2023 - Wine-Commits

Alexandre Julliard : msvcrt: Export more exception handling functions on ARM platforms.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 76496e90fce7120c361215b42b65d606339681a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/76496e90fce7120c361215b42b65d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 19 17:46:13 2023 +0200 msvcrt: Export more exception handling functions on ARM platforms. --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4c5648e1953..37aee60487d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -541,7 +541,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) @ stub __CxxCallUnwindDelDtor @ stub __CxxCallUnwindDtor @@ -1042,7 +1042,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) @@ -1286,7 +1286,7 @@ @ cdecl _seterrormode(long) @ cdecl -norelay _setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 -@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) __wine_setjmpex +@ cdecl -arch=!i386 -norelay _setjmpex(ptr ptr) __wine_setjmpex @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 584663fdfc4..d1fc7c2de55 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -872,7 +872,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) @ cdecl __CxxDetectRethrow(ptr) @ cdecl __CxxExceptionFilter(ptr ptr long ptr) @@ -1399,7 +1399,7 @@ @ cdecl -arch=i386 -norelay _libm_sse2_sqrt_precise() __libm_sse2_sqrt_precise @ cdecl -arch=i386 -norelay _libm_sse2_tan_precise() __libm_sse2_tan @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) @@ -1643,7 +1643,7 @@ @ cdecl _seterrormode(long) @ cdecl -norelay _setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 -@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) __wine_setjmpex +@ cdecl -arch=!i386 -norelay _setjmpex(ptr ptr) __wine_setjmpex @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index fcdfb49ee0f..9576cd52edb 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -857,7 +857,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) @ cdecl __CxxDetectRethrow(ptr) @ cdecl __CxxExceptionFilter(ptr ptr long ptr) @@ -1410,7 +1410,7 @@ @ cdecl -arch=i386 -norelay _libm_sse2_sqrt_precise() __libm_sse2_sqrt_precise @ cdecl -arch=i386 -norelay _libm_sse2_tan_precise() __libm_sse2_tan @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) @@ -1655,7 +1655,7 @@ @ cdecl _seterrormode(long) @ cdecl -norelay _setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 -@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) __wine_setjmpex +@ cdecl -arch=!i386 -norelay _setjmpex(ptr ptr) __wine_setjmpex @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d5aa4020471..591a25f3cce 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -852,7 +852,7 @@ @ cdecl __AdjustPointer(ptr ptr) msvcr120.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) msvcr120.__C_specific_handler +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) msvcr120.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) msvcr120.__CppXcptFilter @ cdecl __CxxDetectRethrow(ptr) msvcr120.__CxxDetectRethrow @ cdecl __CxxExceptionFilter(ptr ptr long ptr) msvcr120.__CxxExceptionFilter @@ -1274,7 +1274,7 @@ @ cdecl -arch=i386 -norelay _libm_sse2_sin_precise() msvcr120._libm_sse2_sin_precise @ cdecl -arch=i386 -norelay _libm_sse2_sqrt_precise() msvcr120._libm_sse2_sqrt_precise @ cdecl -arch=i386 -norelay _libm_sse2_tan_precise() msvcr120._libm_sse2_tan_precise -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) msvcr120._local_unwind +@ cdecl -arch=win64 _local_unwind(ptr ptr) msvcr120._local_unwind @ cdecl -arch=i386 _local_unwind2(ptr long) msvcr120._local_unwind2 @ cdecl -arch=i386 _local_unwind4(ptr ptr long) msvcr120._local_unwind4 @ cdecl _localtime32(ptr) msvcr120._localtime32 @@ -1377,7 +1377,7 @@ @ cdecl _set_purecall_handler(ptr) msvcr120._set_purecall_handler @ cdecl -norelay _setjmp(ptr) msvcr120._setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcr120._setjmp3 -@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) msvcr120._setjmpex +@ cdecl -arch=!i386 -norelay _setjmpex(ptr ptr) msvcr120._setjmpex @ cdecl _setmaxstdio(long) msvcr120._setmaxstdio @ cdecl _setmbcp(long) msvcr120._setmbcp @ cdecl _setmode(long long) msvcr120._setmode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ae134b8141c..6c3c87ada0f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -175,7 +175,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) @ stub __CxxCallUnwindDelDtor @ stub __CxxCallUnwindDtor @@ -714,7 +714,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) @@ -966,7 +966,7 @@ @ cdecl _seterrormode(long) @ cdecl -norelay _setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 -@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) __wine_setjmpex +@ cdecl -arch=!i386 -norelay _setjmpex(ptr ptr) __wine_setjmpex @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 213d7fd2f9f..efaef544b7d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -166,7 +166,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=!i386 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) @ stub __CxxCallUnwindDelDtor @ stub __CxxCallUnwindDtor @@ -692,7 +692,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 69d97016282..8515f13263f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -660,7 +660,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 10dbe5f5e65..d61b70ede0a 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -381,7 +381,7 @@ @ cdecl _kbhit() @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=win64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl _lock(long) @ cdecl _locking(long long long)

1 0

Alexandre Julliard : kernelbase: Export the extended context functions on all platforms.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: e57e8856881b1adfe0b39fca337b8766d5289491 URL: https://gitlab.winehq.org/wine/wine/-/commit/e57e8856881b1adfe0b39fca337b87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 19 18:16:38 2023 +0200 kernelbase: Export the extended context functions on all platforms. --- dlls/kernel32/kernel32.spec | 6 +++--- dlls/kernelbase/kernelbase.spec | 6 +++--- dlls/kernelbase/memory.c | 33 +++++++++++++++++++++------------ 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2a41ee5751a..2723a9c5d43 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -256,7 +256,7 @@ @ stdcall -import ConvertThreadToFiber(ptr) @ stdcall -import ConvertThreadToFiberEx(ptr long) @ stdcall ConvertToGlobalHandle(long) -@ stdcall -import -arch=i386,x86_64 CopyContext(ptr long ptr) +@ stdcall -import CopyContext(ptr long ptr) @ stdcall CopyFileA(str str long) @ stdcall CopyFileExA (str str ptr ptr ptr long) @ stdcall -import CopyFileExW(wstr wstr ptr ptr ptr long) @@ -962,8 +962,8 @@ @ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) kernelbase.InitOnceExecuteOnce @ stdcall InitOnceInitialize(ptr) NTDLL.RtlRunOnceInitialize @ stdcall InitializeConditionVariable(ptr) NTDLL.RtlInitializeConditionVariable -@ stdcall -import -arch=i386,x86_64 InitializeContext(ptr long ptr ptr) -@ stdcall -import -arch=i386,x86_64 InitializeContext2(ptr long ptr ptr int64) +@ stdcall -import InitializeContext(ptr long ptr ptr) +@ stdcall -import InitializeContext2(ptr long ptr ptr int64) @ stdcall InitializeCriticalSection(ptr) NTDLL.RtlInitializeCriticalSection @ stdcall -import InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall -import InitializeCriticalSectionEx(ptr long long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 61c958fc428..e85f2b67d74 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -167,7 +167,7 @@ @ stdcall ConvertThreadToFiber(ptr) @ stdcall ConvertThreadToFiberEx(ptr long) @ stdcall ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) -@ stdcall -arch=i386,x86_64 CopyContext(ptr long ptr) +@ stdcall CopyContext(ptr long ptr) # @ stub CopyFile2 @ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) @ stdcall CopyFileW(wstr wstr long) @@ -831,8 +831,8 @@ @ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize @ stdcall InitializeAcl(ptr long long) @ stdcall InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable -@ stdcall -arch=i386,x86_64 InitializeContext(ptr long ptr ptr) -@ stdcall -arch=i386,x86_64 InitializeContext2(ptr long ptr ptr int64) +@ stdcall InitializeContext(ptr long ptr ptr) +@ stdcall InitializeContext2(ptr long ptr ptr int64) @ stdcall InitializeCriticalSection(ptr) ntdll.RtlInitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall InitializeCriticalSectionEx(ptr long long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 804d46d7c36..05d521da321 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1453,17 +1453,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryVirtualMemoryInformation( HANDLE process, con ***********************************************************************/ -#if defined(__i386__) || defined(__x86_64__) -/*********************************************************************** - * GetEnabledXStateFeatures (kernelbase.@) - */ -DWORD64 WINAPI GetEnabledXStateFeatures(void) -{ - TRACE( "\n" ); - return RtlGetEnabledExtendedFeatures( ~(ULONG64)0 ); -} - - /*********************************************************************** * InitializeContext2 (kernelbase.@) */ @@ -1519,10 +1508,19 @@ BOOL WINAPI CopyContext( CONTEXT *dst, DWORD context_flags, CONTEXT *src ) { return set_ntstatus( RtlCopyContext( dst, context_flags, src )); } -#endif #if defined(__x86_64__) + +/*********************************************************************** + * GetEnabledXStateFeatures (kernelbase.@) + */ +DWORD64 WINAPI GetEnabledXStateFeatures(void) +{ + TRACE( "\n" ); + return RtlGetEnabledExtendedFeatures( ~(ULONG64)0 ); +} + /*********************************************************************** * LocateXStateFeature (kernelbase.@) */ @@ -1583,7 +1581,18 @@ BOOL WINAPI GetXStateFeaturesMask( CONTEXT *context, DWORD64 *feature_mask ) return TRUE; } + #elif defined(__i386__) + +/*********************************************************************** + * GetEnabledXStateFeatures (kernelbase.@) + */ +DWORD64 WINAPI GetEnabledXStateFeatures(void) +{ + TRACE( "\n" ); + return RtlGetEnabledExtendedFeatures( ~(ULONG64)0 ); +} + /*********************************************************************** * LocateXStateFeature (kernelbase.@) */

1 0

Alexandre Julliard : ntdll: Simplify platform checks for exception handling functions.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: cf21c75bbf0490627e48c02c91460196ee5a3c1f URL: https://gitlab.winehq.org/wine/wine/-/commit/cf21c75bbf0490627e48c02c914601… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 19 17:14:21 2023 +0200 ntdll: Simplify platform checks for exception handling functions. And sync the corresponding forwards. --- dlls/kernel32/kernel32.spec | 18 +++++++++--------- dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/ntdll/ntdll.spec | 24 ++++++++++++------------ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 20 ++++++++++---------- 4 files changed, 33 insertions(+), 33 deletions(-)

1 0

Alex Henrie : commdlg: Set lCustData the same in GetSaveFileName as GetOpenFileName.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: fbbabca177dabb83c8bdc23b70063c1dbf3f2491 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbbabca177dabb83c8bdc23b70063c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Oct 18 21:32:23 2023 -0600 commdlg: Set lCustData the same in GetSaveFileName as GetOpenFileName. Fixes: 691c7775d11f9f62c363aa419d00eee1e8d7da55 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55715 --- dlls/commdlg.dll16/filedlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 33feda55ca3..62af940e754 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -664,7 +664,7 @@ BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure w ofn32.nFileOffset = lpofn->nFileOffset; ofn32.nFileExtension = lpofn->nFileExtension; ofn32.lpstrDefExt = MapSL( lpofn->lpstrDefExt ); - ofn32.lCustData = lpofn->lCustData; + ofn32.lCustData = ofn; /* See WM_INITDIALOG in the hook proc */ ofn32.lpfnHook = dummy_hook; /* this is to force old 3.1 dialog style */ if (lpofn->Flags & OFN_ENABLETEMPLATE)

1 0

Alexandre Julliard : Revert "loader: Translate wine.desktop to Catalan".
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 8db7f7a6ae0b833c1807ff14c944f59aa4365c0d URL: https://gitlab.winehq.org/wine/wine/-/commit/8db7f7a6ae0b833c1807ff14c944f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 19 14:56:12 2023 +0200 Revert "loader: Translate wine.desktop to Catalan". This reverts commit 7a22152ba11052eb8e26283af640d48f390a0570. There was already a translation. --- loader/wine.desktop | 1 - 1 file changed, 1 deletion(-) diff --git a/loader/wine.desktop b/loader/wine.desktop index 277d34c48cd..d232a756b9b 100644 --- a/loader/wine.desktop +++ b/loader/wine.desktop @@ -2,7 +2,6 @@ Type=Application Name=Wine Windows Program Loader Name[ar]=منظومة واين لتشغيل برامج وندوز -Name[ca]=Wine - Carregador de programes de Windows Name[cs]=Zavaděč programů pro Wine Name[de]=Wine Windows-Programmstarter Name[es]=Wine - Cargador de programas de Windows

1 0

Alexandre Julliard : msvcrt: Simplify platform checks for exception handling functions.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: 2468b2b84d586120134f14bbf7701f7f54a37ea5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2468b2b84d586120134f14bbf7701f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 19 17:31:22 2023 +0200 msvcrt: Simplify platform checks for exception handling functions. --- dlls/crtdll/crtdll.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 20 ++++++++++---------- dlls/msvcr110/msvcr110.spec | 20 ++++++++++---------- dlls/msvcr120/msvcr120.spec | 20 ++++++++++---------- dlls/msvcr120_app/msvcr120_app.spec | 20 ++++++++++---------- dlls/msvcr70/msvcr70.spec | 14 +++++++------- dlls/msvcr71/msvcr71.spec | 16 ++++++++-------- dlls/msvcr80/msvcr80.spec | 20 ++++++++++---------- dlls/msvcr90/msvcr90.spec | 20 ++++++++++---------- dlls/msvcrt/msvcrt.spec | 24 ++++++++++++------------ dlls/msvcrt20/msvcrt20.spec | 8 ++++---- dlls/msvcrt40/msvcrt40.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 8 ++++---- dlls/ucrtbase/ucrtbase.spec | 26 +++++++++++++------------- dlls/vcruntime140/vcruntime140.spec | 22 +++++++++++----------- 15 files changed, 126 insertions(+), 126 deletions(-)

1 0

Alexandre Julliard : kernel32: Export the Ums functions on ARM64.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: f13a6dee5ef554b5d8423362d45a91fb43451ac0 URL: https://gitlab.winehq.org/wine/wine/-/commit/f13a6dee5ef554b5d8423362d45a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 19 18:10:45 2023 +0200 kernel32: Export the Ums functions on ARM64. --- dlls/kernel32/kernel32.spec | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9e1095a45a3..2a41ee5751a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -343,8 +343,8 @@ @ stdcall -import CreateTimerQueue() @ stdcall -import CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) -@ stdcall -arch=x86_64 CreateUmsCompletionList(ptr) -@ stdcall -arch=x86_64 CreateUmsThreadContext(ptr) +@ stdcall -arch=win64 CreateUmsCompletionList(ptr) +@ stdcall -arch=win64 CreateUmsThreadContext(ptr) @ stub CreateVirtualBuffer @ stdcall CreateWaitableTimerA(ptr long str) @ stdcall CreateWaitableTimerExA(ptr str long long) @@ -377,11 +377,11 @@ @ stdcall DeleteTimerQueue(long) @ stdcall -import DeleteTimerQueueEx(long long) @ stdcall -import DeleteTimerQueueTimer(long long long) -@ stdcall -arch=x86_64 DeleteUmsCompletionList(ptr) -@ stdcall -arch=x86_64 DeleteUmsThreadContext(ptr) +@ stdcall -arch=win64 DeleteUmsCompletionList(ptr) +@ stdcall -arch=win64 DeleteUmsThreadContext(ptr) @ stdcall DeleteVolumeMountPointA(str) @ stdcall -import DeleteVolumeMountPointW(wstr) -@ stdcall -arch=x86_64 DequeueUmsCompletionListItems(ptr long ptr) +@ stdcall -arch=win64 DequeueUmsCompletionListItems(ptr long ptr) @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) KERNEL32_DeviceIoControl @ stdcall -import DisableThreadLibraryCalls(long) @ stdcall -import DisconnectNamedPipe(long) @@ -438,10 +438,10 @@ @ stdcall -import EnumUILanguagesW(ptr long long) # @ stub EnumerateLocalComputerNamesA # @ stub EnumerateLocalComputerNamesW -@ stdcall -arch=x86_64 EnterUmsSchedulingMode(ptr) +@ stdcall -arch=win64 EnterUmsSchedulingMode(ptr) @ stdcall EraseTape(ptr long long) @ stdcall -import EscapeCommFunction(long long) -@ stdcall -arch=x86_64 ExecuteUmsThread(ptr) +@ stdcall -arch=win64 ExecuteUmsThread(ptr) @ stdcall ExitProcess(long) @ stdcall ExitThread(long) NTDLL.RtlExitUserThread @ stub ExitVDM @@ -643,7 +643,7 @@ @ stdcall -norelay GetCurrentThread() KERNEL32_GetCurrentThread @ stdcall -norelay GetCurrentThreadId() KERNEL32_GetCurrentThreadId @ stdcall -import GetCurrentThreadStackLimits(ptr ptr) -@ stdcall -arch=x86_64 GetCurrentUmsThread() +@ stdcall -arch=win64 GetCurrentUmsThread() @ stdcall -import GetDateFormatA(long long ptr str ptr long) @ stdcall -import GetDateFormatEx(wstr long ptr wstr ptr long wstr) @ stdcall -import GetDateFormatW(long long ptr wstr ptr long) @@ -746,7 +746,7 @@ @ stdcall GetNamedPipeServerProcessId(long ptr) @ stdcall GetNamedPipeServerSessionId(long ptr) @ stdcall -import GetNativeSystemInfo(ptr) -@ stdcall -arch=x86_64 GetNextUmsListItem(ptr) +@ stdcall -arch=win64 GetNextUmsListItem(ptr) @ stub GetNextVDMCommand @ stub GetNlsSectionName # @ stub GetNumaAvailableMemory @@ -883,8 +883,8 @@ @ stdcall -import GetTimeZoneInformation(ptr) @ stdcall -import GetTimeZoneInformationForYear(long ptr ptr) # @ stub GetUILanguageInfo -@ stdcall -arch=x86_64 GetUmsCompletionListEvent(ptr ptr) -# @ stub -arch=x86_64 GetUmsSystemThreadInformation +@ stdcall -arch=win64 GetUmsCompletionListEvent(ptr ptr) +# @ stub -arch=win64 GetUmsSystemThreadInformation @ stdcall -import GetUserDefaultLCID() @ stdcall -import GetUserDefaultLangID() @ stdcall -import GetUserDefaultLocaleName(ptr long) @@ -1200,7 +1200,7 @@ @ stdcall -import QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling @ stdcall -import QueryThreadpoolStackInformation(ptr ptr) -@ stdcall -arch=x86_64 QueryUmsThreadInformation(ptr long ptr long ptr) +@ stdcall -arch=win64 QueryUmsThreadInformation(ptr long ptr long ptr) @ stdcall -import QueryUnbiasedInterruptTime(ptr) @ stub QueryWin31IniFilesMappedToRegistry @ stdcall -import QueueUserAPC(ptr long long) @@ -1497,7 +1497,7 @@ @ stdcall SetThreadpoolWait(ptr long ptr) NTDLL.TpSetWait @ stdcall -import SetTimeZoneInformation(ptr) @ stub SetTimerQueueTimer -@ stdcall -arch=x86_64 SetUmsThreadInformation(ptr long ptr long) +@ stdcall -arch=win64 SetUmsThreadInformation(ptr long ptr long) @ stdcall -import SetUnhandledExceptionFilter(ptr) @ stdcall -import SetUserGeoID(long) @ stdcall -import SetUserGeoName(wstr) @@ -1558,7 +1558,7 @@ # @ stub -arch=x86_64 uaw_wcsicmp # @ stub -arch=x86_64 uaw_wcslen # @ stub -arch=x86_64 uaw_wcsrchr -@ stdcall -arch=x86_64 UmsThreadYield(ptr) +@ stdcall -arch=win64 UmsThreadYield(ptr) # @ stub -arch=x86_64 __misaligned_access @ stdcall -i386 -private UTRegister(long str str str ptr ptr ptr) krnl386.exe16.UTRegister @ stdcall -i386 -private UTUnRegister(long) krnl386.exe16.UTUnRegister

1 0

Alex Henrie : wined3d: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: e8d849efce454658f459739bdc054d83a9d75834 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8d849efce454658f459739bdc054d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:33:23 2023 -0600 wined3d: Use debugstr_fourcc instead of debugstr_an. --- dlls/wined3d/shader_sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 74391cc1be8..f76bd693b3b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -2070,7 +2070,7 @@ static HRESULT shader_dxbc_process_section(struct wined3d_shader *shader, unsign break; default: - TRACE("Skipping chunk %s.\n", debugstr_an((const char *)&tag, 4)); + TRACE("Skipping chunk %s.\n", debugstr_fourcc(tag)); break; }

1 0

Conor McCarthy : vkd3d-shader/spirv: Align constant buffer sizes to 16 bytes.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: 9b64d04ed397168b358c5b505fda5b40cddaf5ca URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9b64d04ed397168b358c5b505fda5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 6 00:39:34 2023 +1000 vkd3d-shader/spirv: Align constant buffer sizes to 16 bytes. DXIL constant buffer sizes are not aligned to 16 bytes. --- libs/vkd3d-shader/spirv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bd9e7a33..2dab97cc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5639,7 +5639,8 @@ static void spirv_compiler_emit_cbv_declaration(struct spirv_compiler *compiler, reg.idx[1].offset = range->first; reg.idx[2].offset = range->last; - size = size_in_bytes / (VKD3D_VEC4_SIZE * sizeof(uint32_t)); + size = align(size_in_bytes, VKD3D_VEC4_SIZE * sizeof(uint32_t)); + size /= VKD3D_VEC4_SIZE * sizeof(uint32_t); if ((push_cb = spirv_compiler_find_push_constant_buffer(compiler, range))) {

1 0

Conor McCarthy : vkd3d-shader/dxil: Read CBV descriptors.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: b7b128595ee9ba4513d445c72cb30de39aaa11db URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b7b128595ee9ba4513d445c72cb30… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sun Oct 15 13:47:25 2023 +1000 vkd3d-shader/dxil: Read CBV descriptors. --- libs/vkd3d-shader/dxil.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 166 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 4bfebea2..19ce2936 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2821,6 +2821,11 @@ static bool sm6_metadata_value_is_node(const struct sm6_metadata_value *m) return m && m->type == VKD3D_METADATA_NODE; } +static bool sm6_metadata_value_is_value(const struct sm6_metadata_value *m) +{ + return m && m->type == VKD3D_METADATA_VALUE; +} + static bool sm6_metadata_value_is_string(const struct sm6_metadata_value *m) { return m && m->type == VKD3D_METADATA_STRING; @@ -3375,11 +3380,170 @@ static const struct sm6_metadata_value *sm6_parser_find_named_metadata(struct sm return NULL; } +static bool sm6_parser_resources_load_register_range(struct sm6_parser *sm6, + const struct sm6_metadata_node *node, struct vkd3d_shader_register_range *range) +{ + unsigned int size; + + if (!sm6_metadata_value_is_value(node->operands[1])) + { + WARN("Resource data type is not a value.\n"); + return false; + } + if (!sm6_type_is_pointer(node->operands[1]->value_type)) + { + WARN("Resource type is not a pointer.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH, + "Resource metadata value type is not a pointer."); + } + + if (!sm6_metadata_get_uint_value(sm6, node->operands[3], &range->space)) + { + WARN("Failed to load register space.\n"); + return false; + } + if (!sm6_metadata_get_uint_value(sm6, node->operands[4], &range->first)) + { + WARN("Failed to load register first.\n"); + return false; + } + if (!sm6_metadata_get_uint_value(sm6, node->operands[5], &size)) + { + WARN("Failed to load register range size.\n"); + return false; + } + if (!size || (size != UINT_MAX && !vkd3d_bound_range(range->first, size, UINT_MAX))) + { + WARN("Invalid register range, first %u, size %u.\n", range->first, size); + return false; + } + range->last = (size == UINT_MAX) ? UINT_MAX : range->first + size - 1; + + return true; +} + +static enum vkd3d_result sm6_parser_resources_load_cbv(struct sm6_parser *sm6, + const struct sm6_metadata_node *node, const struct vkd3d_shader_register_range *range, + unsigned int register_id, struct vkd3d_shader_instruction *ins) +{ + struct vkd3d_shader_register *reg; + unsigned int buffer_size; + + if (node->operand_count < 7) + { + WARN("Invalid operand count %u.\n", node->operand_count); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND_COUNT, + "Invalid operand count %u for a CBV descriptor.", node->operand_count); + return VKD3D_ERROR_INVALID_SHADER; + } + if (node->operand_count > 7 && node->operands[7]) + { + WARN("Ignoring %u extra operands.\n", node->operand_count - 7); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring %u extra operands for a CBV descriptor.", node->operand_count - 7); + } + + if (!sm6_metadata_get_uint_value(sm6, node->operands[6], &buffer_size)) + { + WARN("Failed to load buffer size.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Constant buffer size metadata value is not an integer."); + return VKD3D_ERROR_INVALID_SHADER; + } + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_DCL_CONSTANT_BUFFER); + ins->resource_type = VKD3D_SHADER_RESOURCE_BUFFER; + ins->declaration.cb.size = buffer_size; + ins->declaration.cb.src.swizzle = VKD3D_SHADER_NO_SWIZZLE; + ins->declaration.cb.src.modifiers = VKD3DSPSM_NONE; + + reg = &ins->declaration.cb.src.reg; + vsir_register_init(reg, VKD3DSPR_CONSTBUFFER, VKD3D_DATA_FLOAT, 3); + reg->idx[0].offset = register_id; + reg->idx[1].offset = range->first; + reg->idx[2].offset = range->last; + + ins->declaration.cb.range = *range; + + return VKD3D_OK; +} + +static enum vkd3d_result sm6_parser_descriptor_type_init(struct sm6_parser *sm6, + enum vkd3d_shader_descriptor_type type, const struct sm6_metadata_node *descriptor_node) +{ + struct vkd3d_shader_register_range range; + struct vkd3d_shader_instruction *ins; + const struct sm6_metadata_node *node; + const struct sm6_metadata_value *m; + unsigned int i, register_id; + enum vkd3d_result ret; + + for (i = 0; i < descriptor_node->operand_count; ++i) + { + m = descriptor_node->operands[i]; + if (!sm6_metadata_value_is_node(m)) + { + WARN("Resource descriptor is not a node.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource descriptor is not a metadata node."); + return VKD3D_ERROR_INVALID_SHADER; + } + + node = m->u.node; + if (node->operand_count < 6) + { + WARN("Invalid operand count %u.\n", node->operand_count); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND_COUNT, + "Invalid operand count %u for a descriptor.", node->operand_count); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!sm6_metadata_get_uint_value(sm6, node->operands[0], &register_id)) + { + WARN("Failed to load resource id.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource id metadata value is not an integer."); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!sm6_parser_resources_load_register_range(sm6, node, &range)) + { + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource register range is invalid."); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!(ins = sm6_parser_require_space(sm6, 1))) + { + ERR("Failed to allocate instruction.\n"); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + switch (type) + { + case VKD3D_SHADER_DESCRIPTOR_TYPE_CBV: + if ((ret = sm6_parser_resources_load_cbv(sm6, node, &range, register_id, ins)) < 0) + return ret; + break; + default: + FIXME("Unsupported descriptor type %u.\n", type); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource descriptor type %u is unsupported.", type); + return VKD3D_ERROR_INVALID_SHADER; + } + + ++sm6->p.instructions.count; + } + + return VKD3D_OK; +} + static enum vkd3d_result sm6_parser_resources_init(struct sm6_parser *sm6) { const struct sm6_metadata_value *m = sm6_parser_find_named_metadata(sm6, "dx.resources"); enum vkd3d_shader_descriptor_type type; const struct sm6_metadata_node *node; + enum vkd3d_result ret; if (!m) return VKD3D_OK; @@ -3406,7 +3570,8 @@ static enum vkd3d_result sm6_parser_resources_init(struct sm6_parser *sm6) return VKD3D_ERROR_INVALID_SHADER; } - FIXME("Descriptor info is unhandled.\n"); + if ((ret = sm6_parser_descriptor_type_init(sm6, type, m->u.node)) < 0) + return ret; } return VKD3D_OK;

1 0