February 2023 - Wine-commits

Alexandre Julliard : winegcc: Stop using the deprecated prelink tool.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 4a0f3fbcb5876eb6e91165d3333f2dfaaaaa1cdf URL: https://gitlab.winehq.org/wine/wine/-/commit/4a0f3fbcb5876eb6e91165d3333f2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 11:01:47 2023 +0100 winegcc: Stop using the deprecated prelink tool. --- configure | 52 ----------------------------------------------- configure.ac | 7 +------ tools/winegcc/Makefile.in | 3 +-- tools/winegcc/winegcc.c | 17 ---------------- 4 files changed, 2 insertions(+), 77 deletions(-) diff --git a/configure b/configure index 01df4fa9773..f939d560c26 100755 --- a/configure +++ b/configure @@ -737,7 +737,6 @@ FAUDIO_PE_LIBS FAUDIO_PE_CFLAGS MINGW_PKG_CONFIG PE_ARCHS -PRELINK WINELOADER_DEPENDS ac_ct_OBJC OBJCFLAGS @@ -10266,56 +10265,6 @@ then : *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; esac fi - # Extract the first word of "prelink", so it can be a program name with args. -set dummy prelink; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PRELINK+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $PRELINK in - [\\/]* | ?:[\\/]*) - ac_cv_path_PRELINK="$PRELINK" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /sbin /usr/sbin $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PRELINK="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_PRELINK" && ac_cv_path_PRELINK="false" - ;; -esac -fi -PRELINK=$ac_cv_path_PRELINK -if test -n "$PRELINK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PRELINK" >&5 -printf "%s\n" "$PRELINK" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - if test "x$PRELINK" = xfalse - then - as_fn_append wine_warnings "|prelink not found and linker does not support relocation, base address of core dlls won't be set correctly." - fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-z,max-page-size=0x1000" >&5 printf %s "checking whether the compiler supports -Wl,-z,max-page-size=0x1000... " >&6; } @@ -23065,7 +23014,6 @@ OBJC = $OBJC OBJCFLAGS = $OBJCFLAGS ac_ct_OBJC = $ac_ct_OBJC WINELOADER_DEPENDS = $WINELOADER_DEPENDS -PRELINK = $PRELINK PE_ARCHS = $PE_ARCHS MINGW_PKG_CONFIG = $MINGW_PKG_CONFIG FAUDIO_PE_CFLAGS = $FAUDIO_PE_CFLAGS diff --git a/configure.ac b/configure.ac index 228002fd922..c5732f8ada4 100644 --- a/configure.ac +++ b/configure.ac @@ -779,12 +779,7 @@ case $host_os in [case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;; *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; - esac]) - AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) - if test "x$PRELINK" = xfalse - then - WINE_WARNING([prelink not found and linker does not support relocation, base address of core dlls won't be set correctly.]) - fi]) + esac])]) WINE_TRY_CFLAGS([-Wl,-z,max-page-size=0x1000], [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) ;; diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 8328d6f34a2..c4ef77da33c 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -16,7 +16,6 @@ winegcc_EXTRADEFS = \ -DCC="\"$(CC)\"" \ -DCPP="\"$(CPPBIN)\"" \ -DCXX="\"$(CXX)\"" \ - -DLD="\"$(LD)\"" \ - -DPRELINK="\"$(PRELINK)\"" + -DLD="\"$(LD)\"" INSTALL_DEV = $(PROGRAMS) $(winegcc_SYMLINKS) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0770ccfbe2a..c0f881df0a2 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -188,7 +188,6 @@ struct options const char* lib_suffix; const char* subsystem; const char* entry_point; - const char* prelink; const char* debug_file; const char* out_implib; struct strarray prefix; @@ -480,8 +479,6 @@ static struct strarray get_link_args( struct options *opts, const char *output_n { if (!try_link( opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)) ) strarray_add( &flags, strmake("-Wl,-Ttext-segment=%s", opts->image_base) ); - else - opts->prelink = PRELINK; } if (!try_link( opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) strarray_add( &flags, "-Wl,-z,max-page-size=0x1000"); @@ -1385,20 +1382,6 @@ static void build(struct options* opts) spawn(opts->prefix, implib_args, 0); } - /* set the base address with prelink if linker support is not present */ - if (opts->prelink && !opts->target_alias) - { - if (opts->prelink[0] && strcmp(opts->prelink,"false")) - { - struct strarray prelink_args = empty_strarray; - strarray_add(&prelink_args, opts->prelink); - strarray_add(&prelink_args, "--reloc-only"); - strarray_add(&prelink_args, opts->image_base); - strarray_add(&prelink_args, output_path); - spawn(opts->prefix, prelink_args, 1); - } - } - if (!is_pe) fixup_constructors( opts, output_path ); else if (opts->wine_builtin) make_wine_builtin( opts, output_path );

1 0

Alexandre Julliard : winebuild: Only allow the stdcall calling convention for system calls.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 921367fc57ccfe9a6a5d3db38f2fc39e46d74e98 URL: https://gitlab.winehq.org/wine/wine/-/commit/921367fc57ccfe9a6a5d3db38f2fc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 11:02:14 2023 +0100 winebuild: Only allow the stdcall calling convention for system calls. --- tools/winebuild/import.c | 2 +- tools/winebuild/parser.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 0c1cd291d21..fcf93addb50 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1437,7 +1437,7 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovl $%s,%%edx\n", asm_name("__wine_syscall") ); } output( "\tcall *%%edx\n" ); - output( "\tret $%u\n", odp->type == TYPE_STDCALL ? get_args_size( odp ) : 0 ); + output( "\tret $%u\n", get_args_size( odp )); break; case CPU_x86_64: /* Chromium depends on syscall thunks having the same form as on diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 141ed80eb26..5eed7e22ab0 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -315,9 +315,9 @@ static int parse_spec_arguments( ORDDEF *odp, DLLSPEC *spec, int optional ) } if (odp->flags & FLAG_SYSCALL) { - if (odp->type != TYPE_STDCALL && odp->type != TYPE_CDECL) + if (odp->type != TYPE_STDCALL) { - error( "A syscall function must use either the stdcall or the cdecl convention\n" ); + error( "A syscall function must use the stdcall convention\n" ); return 0; } }

1 0

Sven Baars : bcrypt: Remove unused fields from struct key_asymmetric32.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 533454111c88bef008cef0296f61da4dcf9e1ebc URL: https://gitlab.winehq.org/wine/wine/-/commit/533454111c88bef008cef0296f61da… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Feb 25 11:17:58 2023 +0100 bcrypt: Remove unused fields from struct key_asymmetric32. --- dlls/bcrypt/gnutls.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 3c64a3643ef..c54ebc471a9 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2285,8 +2285,6 @@ struct key_asymmetric32 { ULONG bitlen; /* ignored for ECC keys */ ULONG flags; - PTR32 pubkey; - ULONG pubkey_len; DSSSEED dss_seed; };

1 0

Gijs Vermeulen : shell32: Add Shell_GetCachedImageIndexA/W exports.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: a4e51c6beceb60c4d67e90559ce115cb60274432 URL: https://gitlab.winehq.org/wine/wine/-/commit/a4e51c6beceb60c4d67e90559ce115… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Feb 25 18:43:53 2023 +0100 shell32: Add Shell_GetCachedImageIndexA/W exports. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54581 --- dlls/shell32/iconcache.c | 4 ++-- dlls/shell32/shell32.spec | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 3f3741540d0..d75daa3fa8d 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -737,7 +737,7 @@ HRESULT WINAPI SHMapIDListToImageListIndexAsync(IUnknown *pts, IShellFolder *psf * Shell_GetCachedImageIndex [SHELL32.72] * */ -static INT Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateDoc) +INT WINAPI Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateDoc) { INT ret, len; LPWSTR szTemp; @@ -755,7 +755,7 @@ static INT Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateD return ret; } -static INT Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, BOOL bSimulateDoc) +INT WINAPI Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, BOOL bSimulateDoc) { WARN("(%s,%08x,%08x) semi-stub.\n",debugstr_w(szPath), nIndex, bSimulateDoc); diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 59285c89c57..4a64b80ddd9 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -453,6 +453,8 @@ @ stdcall ShellExecuteExW (long) @ stdcall ShellExecuteW (long wstr wstr wstr wstr long) @ stdcall ShellHookProc(long long long) +@ stdcall Shell_GetCachedImageIndexA(str long long) +@ stdcall Shell_GetCachedImageIndexW(wstr long long) @ stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA @ stdcall Shell_NotifyIconA(long ptr) @ stdcall Shell_NotifyIconW(long ptr)

1 0

Francois Gouget : kernel32/tests: Fix the NLSVersion test on Windows 10 22H2.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: ad5c8fb6ffacd965312aee36b182ca99d5ccb162 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad5c8fb6ffacd965312aee36b182ca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Feb 25 19:32:11 2023 +0100 kernel32/tests: Fix the NLSVersion test on Windows 10 22H2. Microsoft backported support for the 60403 NLS version from Windows 11 21H2 to Windows 10 22H2 to ensure better compatibility between the two systems. This is similar to when they preserved support for NLS version 6020f when switching Windows 10 2004 to 60305. So use larger version changes to check that IsValidNLSVersion() does reject invalid versions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54582 --- dlls/kernel32/tests/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b2c581dc518..a4c97286dc5 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7865,13 +7865,13 @@ static void test_NLSVersion(void) ok( ret, "IsValidNLSVersion failed err %lu\n", GetLastError() ); ok( GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError() ); - info.dwNLSVersion += 0x100; + info.dwNLSVersion += 0x700; /* much higher ver -> surely invalid */ SetLastError( 0xdeadbeef ); ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); ok( !ret, "IsValidNLSVersion succeeded\n" ); ok( GetLastError() == 0, "wrong error %lu\n", GetLastError() ); - info.dwNLSVersion -= 0x800; + info.dwNLSVersion -= 2 * 0x700; /* much lower ver -> surely invalid */ SetLastError( 0xdeadbeef ); ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); ok( !ret, "IsValidNLSVersion succeeded\n" );

1 0

Francois Gouget : kernel32/tests: Fix the NtGetNlsSectionPtr() test on Windows 11.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 705d35edfa94e2bd9a025045c745a388d8119663 URL: https://gitlab.winehq.org/wine/wine/-/commit/705d35edfa94e2bd9a025045c745a3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Feb 25 20:52:39 2023 +0100 kernel32/tests: Fix the NtGetNlsSectionPtr() test on Windows 11. NtGetNlsSectionPtr() supports an unknown section 14 which presumably takes no id parameter such that the call succeeds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54584 --- dlls/kernel32/tests/locale.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a4c97286dc5..f8d4ab14d38 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4974,6 +4974,11 @@ static void test_GetCPInfo(void) case 12: /* normalization */ ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "%u: failed %lx\n", i, status ); break; + case 14: /* unknown */ + ok( status == STATUS_INVALID_PARAMETER_1 || + status == STATUS_SUCCESS, /* win11 */ + "%u: failed %lx\n", i, status ); + break; default: ok( status == STATUS_INVALID_PARAMETER_1, "%u: failed %lx\n", i, status ); break;

1 0

Torge Matthies : kernelbase: Fix WaitForThreadpoolIoCallbacks spec entry.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 2db94ca8f98c9e760e0236fc36cf84af6cfc6984 URL: https://gitlab.winehq.org/wine/wine/-/commit/2db94ca8f98c9e760e0236fc36cf84… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Thu Feb 23 19:49:27 2023 +0100 kernelbase: Fix WaitForThreadpoolIoCallbacks spec entry. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 80cc163468c..e3a0ad257f2 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1734,7 +1734,7 @@ @ stdcall WaitForMultipleObjectsEx(long ptr long long long) @ stdcall WaitForSingleObject(long long) @ stdcall WaitForSingleObjectEx(long long long) -@ stdcall WaitForThreadpoolIoCallbacks(ptr) ntdll.TpWaitForIoCompletion +@ stdcall WaitForThreadpoolIoCallbacks(ptr long) ntdll.TpWaitForIoCompletion @ stdcall WaitForThreadpoolTimerCallbacks(ptr long) ntdll.TpWaitForTimer @ stdcall WaitForThreadpoolWaitCallbacks(ptr long) ntdll.TpWaitForWait @ stdcall WaitForThreadpoolWorkCallbacks(ptr long) ntdll.TpWaitForWork

1 0

Torge Matthies : kernel32: Fix WaitForThreadpoolIoCallbacks spec entry.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 78ce8e0018c8a5c806c596b10158343f705f4bf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/78ce8e0018c8a5c806c596b1015834… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Thu Feb 23 19:49:15 2023 +0100 kernel32: Fix WaitForThreadpoolIoCallbacks spec entry. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8068e45e5e5..d6b0eb62a69 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1603,7 +1603,7 @@ @ stdcall -import WaitForMultipleObjectsEx(long ptr long long long) @ stdcall -import WaitForSingleObject(long long) @ stdcall -import WaitForSingleObjectEx(long long long) -@ stdcall WaitForThreadpoolIoCallbacks(ptr) NTDLL.TpWaitForIoCompletion +@ stdcall WaitForThreadpoolIoCallbacks(ptr long) NTDLL.TpWaitForIoCompletion @ stdcall WaitForThreadpoolTimerCallbacks(ptr long) NTDLL.TpWaitForTimer @ stdcall WaitForThreadpoolWaitCallbacks(ptr long) NTDLL.TpWaitForWait @ stdcall WaitForThreadpoolWorkCallbacks(ptr long) NTDLL.TpWaitForWork

1 0

Giovanni Mascellani : vkd3d-shader: Do not pass client-given strings as printf()-style format strings.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: vkd3d Branch: master Commit: a1c6bb85ade1da5cae3ba2f9717f882b0c9bf611 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a1c6bb85ade1da5cae3ba2f9717f8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 23 16:21:55 2023 +0100 vkd3d-shader: Do not pass client-given strings as printf()-style format strings. --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f0cfee47..beee1548 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1767,7 +1767,7 @@ static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder, const rb_init(&builder->declarations, vkd3d_spirv_declaration_compare); builder->main_function_id = vkd3d_spirv_alloc_id(builder); - vkd3d_spirv_build_op_name(builder, builder->main_function_id, entry_point); + vkd3d_spirv_build_op_name(builder, builder->main_function_id, "%s", entry_point); } static void vkd3d_spirv_builder_begin_main_function(struct vkd3d_spirv_builder *builder)

1 0

Francois Gouget : winmm/tests: Ignore spurious WM_DWMCOLORIZATIONCOLORCHANGED messages.
by Alexandre Julliard 24 Feb '23

24 Feb '23

Module: wine Branch: master Commit: 632c8cfd2b8b1f9cb4a65e428c49202f4a736167 URL: https://gitlab.winehq.org/wine/wine/-/commit/632c8cfd2b8b1f9cb4a65e428c4920… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 22 15:57:22 2023 +0100 winmm/tests: Ignore spurious WM_DWMCOLORIZATIONCOLORCHANGED messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54557 --- dlls/winmm/tests/midi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index cf58e1e955a..d6f54e75f23 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -39,8 +39,9 @@ extern const char* mmsys_error(MMRESULT error); /* from wave.c */ static BOOL spurious_message(LPMSG msg) { - /* WM_DEVICECHANGE 0x0219 appears randomly */ - if(msg->message == WM_DEVICECHANGE) { + /* These messages appear randomly */ + if(msg->message == WM_DEVICECHANGE || + msg->message == WM_DWMCOLORIZATIONCOLORCHANGED) { trace("skipping spurious message %04x\n", msg->message); return TRUE; }

1 0