February 2023 - Wine-Commits

Eric Pouech : dbghelp/tests: Only retrieve the system directories once.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 160d961e3230e8029b12fb7157b23a26253b710b URL: https://gitlab.winehq.org/wine/wine/-/commit/160d961e3230e8029b12fb7157b23a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Feb 25 17:50:53 2023 +0100 dbghelp/tests: Only retrieve the system directories once. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 576a25200dd..0c95a2a6206 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -26,6 +26,8 @@ #include "winternl.h" static const BOOL is_win64 = sizeof(void*) > sizeof(int); +static WCHAR system_directory[MAX_PATH]; +static WCHAR wow64_directory[MAX_PATH]; #if defined(__i386__) || defined(__x86_64__) @@ -550,7 +552,6 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI struct loaded_module_aggregation* aggregation = usr; IMAGEHLP_MODULEW64 im; BOOL ret, wow64; - WCHAR buffer[MAX_PATH]; memset(&im, 0, sizeof(im)); im.SizeOfStruct = sizeof(im); @@ -590,12 +591,10 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI aggregation->count_exe++; if (!wcsicmp(im.ModuleName, L"ntdll")) aggregation->count_ntdll++; - if (GetSystemDirectoryW(buffer, ARRAY_SIZE(buffer)) && - !wcsnicmp(imagename, buffer, wcslen(buffer))) + if (!wcsnicmp(imagename, system_directory, wcslen(system_directory))) aggregation->count_systemdir++; if (is_win64 && IsWow64Process(aggregation->proc, &wow64) && wow64 && - GetSystemWow64DirectoryW(buffer, ARRAY_SIZE(buffer)) && - !wcsnicmp(imagename, buffer, wcslen(buffer))) + !wcsnicmp(imagename, wow64_directory, wcslen(wow64_directory))) aggregation->count_wowdir++; return TRUE; @@ -756,6 +755,12 @@ START_TEST(dbghelp) ret = SymCleanup(GetCurrentProcess()); ok(ret, "got error %lu\n", GetLastError()); + ret = GetSystemDirectoryW(system_directory, ARRAY_SIZE(system_directory)); + ok(ret, "GetSystemDirectoryW failed: %lu\n", GetLastError()); + /* failure happens on a 32bit only wine setup */ + if (!GetSystemWow64DirectoryW(wow64_directory, ARRAY_SIZE(wow64_directory))) + wow64_directory[0] = L'\0'; + if (test_modules()) { test_modules_overlap();

1 0

Eric Pouech : dbghelp/tests: Introduce get_machine_bitness() helper.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 8aea0395075dad57457fae1b50e8a06353ae49e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/8aea0395075dad57457fae1b50e8a0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Feb 25 17:50:55 2023 +0100 dbghelp/tests: Introduce get_machine_bitness() helper. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 0c95a2a6206..c5b04b7dd7f 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -206,6 +206,23 @@ static BOOL ends_withW(const WCHAR* str, const WCHAR* suffix) return strlen >= sfxlen && !wcsicmp(str + strlen - sfxlen, suffix); } +static unsigned get_machine_bitness(USHORT machine) +{ + switch (machine) + { + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARM: + case IMAGE_FILE_MACHINE_ARMNT: + return 32; + case IMAGE_FILE_MACHINE_AMD64: + case IMAGE_FILE_MACHINE_ARM64: + return 64; + default: + ok(0, "Unsupported machine %x\n", machine); + return 0; + } +} + static USHORT get_module_machine(const char* path) { HANDLE hFile, hMap; @@ -570,22 +587,11 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI ok(ret, "SymGetModuleInfoW64 failed: %lu\n", GetLastError()); } - switch (im.MachineType) + switch (get_machine_bitness(im.MachineType)) { - case IMAGE_FILE_MACHINE_UNKNOWN: - break; - case IMAGE_FILE_MACHINE_I386: - case IMAGE_FILE_MACHINE_ARM: - case IMAGE_FILE_MACHINE_ARMNT: - aggregation->count_32bit++; - break; - case IMAGE_FILE_MACHINE_AMD64: - case IMAGE_FILE_MACHINE_ARM64: - aggregation->count_64bit++; - break; - default: - ok(0, "Unsupported machine %lx\n", im.MachineType); - break; + case 32: aggregation->count_32bit++; break; + case 64: aggregation->count_64bit++; break; + default: break; } if (ends_withW(imagename, L".exe")) aggregation->count_exe++;

1 0

Eric Pouech : dbghelp/tests: Introduce ends_withW helper.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 91a644ae8acb2fda56f5460ad59f90286ffc3d78 URL: https://gitlab.winehq.org/wine/wine/-/commit/91a644ae8acb2fda56f5460ad59f90… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Feb 25 17:50:52 2023 +0100 dbghelp/tests: Introduce ends_withW helper. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 34df4dd437b..576a25200dd 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -196,6 +196,14 @@ static void test_search_path(void) ok(!strcmp(search_path, "."), "Got search path '%s', expected '.'\n", search_path); } +static BOOL ends_withW(const WCHAR* str, const WCHAR* suffix) +{ + size_t strlen = wcslen(str); + size_t sfxlen = wcslen(suffix); + + return strlen >= sfxlen && !wcsicmp(str + strlen - sfxlen, suffix); +} + static USHORT get_module_machine(const char* path) { HANDLE hFile, hMap; @@ -541,18 +549,15 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI { struct loaded_module_aggregation* aggregation = usr; IMAGEHLP_MODULEW64 im; - size_t image_len; BOOL ret, wow64; WCHAR buffer[MAX_PATH]; memset(&im, 0, sizeof(im)); im.SizeOfStruct = sizeof(im); - image_len = wcslen(imagename); - ret = SymGetModuleInfoW64(aggregation->proc, base, &im); if (ret) - ok(aggregation->count_exe && image_len >= 4 && !wcscmp(imagename + image_len - 4, L".exe"), + ok(aggregation->count_exe && ends_withW(imagename, L".exe"), "%ls shouldn't already be loaded\n", imagename); else { @@ -581,7 +586,7 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI ok(0, "Unsupported machine %lx\n", im.MachineType); break; } - if (image_len >= 4 && !wcsicmp(imagename + image_len - 4, L".exe")) + if (ends_withW(imagename, L".exe")) aggregation->count_exe++; if (!wcsicmp(im.ModuleName, L"ntdll")) aggregation->count_ntdll++;

1 0

Alexandre Julliard : winedbg: Use the Zydis library for disassembly.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 1774db388be65dc89b8e887995e6628dacfad3d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1774db388be65dc89b8e887995e662… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 12:46:57 2023 +0100 winedbg: Use the Zydis library for disassembly. --- programs/winedbg/Makefile.in | 5 +- programs/winedbg/be_i386.c | 5 +- programs/winedbg/be_x86_64.c | 4 +- programs/winedbg/db_disasm.c | 1815 ---------------------------------------- programs/winedbg/db_disasm64.c | 1670 ------------------------------------ programs/winedbg/debugger.h | 1 + programs/winedbg/memory.c | 97 ++- 7 files changed, 92 insertions(+), 3505 deletions(-)

1 0

Eric Pouech : dbghelp/tests: Add wrapper for EnumerateLoadedModulesW64().
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 394361cdd0ec55f5c6b584007ebe53360cf171ed URL: https://gitlab.winehq.org/wine/wine/-/commit/394361cdd0ec55f5c6b584007ebe53… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Feb 25 17:50:49 2023 +0100 dbghelp/tests: Add wrapper for EnumerateLoadedModulesW64(). Since this API sporadically fails with STATUS_INFO_LENGTH_MISMATCH as GetLastError() (sic!) on Windows 11, retrying the call let us get the relevant output. No clear explanation of the cause of the failure, it's maybe generated when modules are still loaded into child process and it detects modification of the modules' list while enumerating all modules. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 618ee6e8cdb..04833e28dc7 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windows.h" #include "psapi.h" #include "verrsrc.h" @@ -308,6 +310,24 @@ static BOOL CALLBACK nth_module_cb(const char* name, DWORD64 base, void* usr) return FALSE; } +/* wrapper around EnumerateLoadedModuleW64 which sometimes fails for unknown reasons on Win11, + * with STATUS_INFO_LENGTH_MISMATCH as GetLastError()! + */ +static BOOL wrapper_EnumerateLoadedModulesW64(HANDLE proc, PENUMLOADED_MODULES_CALLBACKW64 cb, void* usr) +{ + BOOL ret; + int retry; + + for (retry = !strcmp(winetest_platform, "wine") ? 1 : 5; retry >= 0; retry--) + { + ret = EnumerateLoadedModulesW64(proc, cb, usr); + if (ret || GetLastError() != STATUS_INFO_LENGTH_MISMATCH) + break; + Sleep(10); + } + return ret; +} + static BOOL test_modules(void) { BOOL ret; @@ -600,7 +620,7 @@ static void test_loaded_modules(void) memset(&aggregation, 0, sizeof(aggregation)); aggregation.proc = pi.hProcess; - ret = EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation); + ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); if (is_win64) @@ -649,7 +669,7 @@ static void test_loaded_modules(void) memset(&aggregation, 0, sizeof(aggregation)); aggregation.proc = pi.hProcess; - ret = EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation); + ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); todo_wine @@ -687,7 +707,7 @@ static void test_loaded_modules(void) ok(ret, "SymInitialize failed: %lu\n", GetLastError()); memset(&aggregation2, 0, sizeof(aggregation2)); aggregation2.proc = pi.hProcess; - ret = EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation2); + ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation2); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); ok(aggregation2.count_32bit && aggregation2.count_64bit, "Wrong bitness aggregation count %u %u\n",

1 0

Alexandre Julliard : libs: Import the Zydis library version 4.0.0.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 7bc94bc8f0e92960c6de458982875fa2c7410f4d URL: https://gitlab.winehq.org/wine/wine/-/commit/7bc94bc8f0e92960c6de458982875f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 11:41:16 2023 +0100 libs: Import the Zydis library version 4.0.0. Also some needed header files from Zycore version 1.4.1. --- configure | 28 + configure.ac | 2 + libs/zydis/LICENSE | 23 + libs/zydis/Makefile.in | 18 + libs/zydis/include/Zycore/Allocator.h | 142 + libs/zydis/include/Zycore/Comparison.h | 316 + libs/zydis/include/Zycore/Defines.h | 527 ++ libs/zydis/include/Zycore/Format.h | 285 + libs/zydis/include/Zycore/LibC.h | 511 ++ libs/zydis/include/Zycore/Object.h | 84 + libs/zydis/include/Zycore/Status.h | 287 + libs/zydis/include/Zycore/String.h | 1011 +++ libs/zydis/include/Zycore/Types.h | 236 + libs/zydis/include/Zycore/Vector.h | 722 ++ libs/zydis/include/Zydis/Decoder.h | 303 + libs/zydis/include/Zydis/DecoderTypes.h | 1447 ++++ libs/zydis/include/Zydis/Defines.h | 76 + libs/zydis/include/Zydis/Disassembler.h | 135 + libs/zydis/include/Zydis/Encoder.h | 460 ++ libs/zydis/include/Zydis/Formatter.h | 1146 +++ libs/zydis/include/Zydis/FormatterBuffer.h | 306 + libs/zydis/include/Zydis/Generated/EnumISAExt.h | 104 + libs/zydis/include/Zydis/Generated/EnumISASet.h | 198 + .../Zydis/Generated/EnumInstructionCategory.h | 124 + libs/zydis/include/Zydis/Generated/EnumMnemonic.h | 1770 +++++ libs/zydis/include/Zydis/Generated/EnumRegister.h | 321 + libs/zydis/include/Zydis/Internal/DecoderData.h | 332 + libs/zydis/include/Zydis/Internal/FormatterATT.h | 183 + libs/zydis/include/Zydis/Internal/FormatterBase.h | 324 + libs/zydis/include/Zydis/Internal/FormatterIntel.h | 271 + libs/zydis/include/Zydis/Internal/SharedData.h | 979 +++ libs/zydis/include/Zydis/Internal/String.h | 470 ++ libs/zydis/include/Zydis/MetaInfo.h | 86 + libs/zydis/include/Zydis/Mnemonic.h | 88 + libs/zydis/include/Zydis/Register.h | 337 + libs/zydis/include/Zydis/Segment.h | 178 + libs/zydis/include/Zydis/SharedTypes.h | 727 ++ libs/zydis/include/Zydis/ShortString.h | 93 + libs/zydis/include/Zydis/Status.h | 167 + libs/zydis/include/Zydis/Utils.h | 111 + libs/zydis/include/Zydis/Zydis.h | 185 + libs/zydis/src/Decoder.c | 5074 +++++++++++++ libs/zydis/src/DecoderData.c | 174 + libs/zydis/src/Disassembler.c | 105 + libs/zydis/src/Formatter.c | 656 ++ libs/zydis/src/FormatterATT.c | 422 ++ libs/zydis/src/FormatterBase.c | 797 ++ libs/zydis/src/FormatterBuffer.c | 191 + libs/zydis/src/FormatterIntel.c | 455 ++ libs/zydis/src/Generated/AccessedFlags.inc | 78 + libs/zydis/src/Generated/DecoderTables.inc | 7585 +++++++++++++++++++ libs/zydis/src/Generated/EnumMnemonic.inc | 1758 +++++ libs/zydis/src/Generated/EnumRegister.inc | 289 + libs/zydis/src/Generated/FormatterStrings.inc | 816 ++ .../zydis/src/Generated/InstructionDefinitions.inc | 7839 ++++++++++++++++++++ libs/zydis/src/Generated/InstructionEncodings.inc | 23 + libs/zydis/src/Generated/OperandDefinitions.inc | 7816 +++++++++++++++++++ libs/zydis/src/Generated/RegisterClassLookup.inc | 23 + libs/zydis/src/Generated/RegisterLookup.inc | 269 + libs/zydis/src/Mnemonic.c | 52 + libs/zydis/src/Register.c | 265 + libs/zydis/src/SharedData.c | 186 + libs/zydis/src/String.c | 376 + libs/zydis/src/Utils.c | 171 + libs/zydis/src/Zydis.c | 86 + 65 files changed, 50619 insertions(+)

1 0

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

Feb. 27, 2023

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

Alexandre Julliard : winegcc: Stop using the deprecated prelink tool.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

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

Rémi Bernon : oleaut32/tests: Test VARIANT_UserUnmarshal allocation sizes.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 3e82dc30e2244b7ad4942bd368964988d5700ced URL: https://gitlab.winehq.org/wine/wine/-/commit/3e82dc30e2244b7ad4942bd3689649… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 24 11:46:33 2023 +0100 oleaut32/tests: Test VARIANT_UserUnmarshal allocation sizes. --- dlls/oleaut32/tests/usrmarshal.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index c4f4381b47f..d4ffdbde82f 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -898,7 +898,9 @@ static void test_marshal_VARIANT(void) RPC_MESSAGE rpcMsg = { 0 }; USER_MARSHAL_CB umcb = { 0 }; unsigned char *buffer, *next; + IMalloc *allocator; void *oldbuffer; + SIZE_T size; ULONG ul; short s; double d; @@ -916,6 +918,10 @@ static void test_marshal_VARIANT(void) VARTYPE vt, vt2; IUnknown *unk; + hr = CoGetMalloc(MEMCTX_TASK, &allocator); + ok(hr == S_OK, "got hr %#lx\n", hr); + ok(!!allocator, "got allocator %p\n", allocator); + stubMsg.RpcMsg = &rpcMsg; umcb.Flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); @@ -1098,7 +1104,8 @@ static void test_marshal_VARIANT(void) ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(*V_UI4REF(&v) == *V_UI4REF(&v2), "got ui4 ref %lx expect ui4 ref %lx\n", *V_UI4REF(&v), *V_UI4REF(&v2)); - + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_UI4(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1212,7 +1219,8 @@ static void test_marshal_VARIANT(void) ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(*V_R8REF(&v) == *V_R8REF(&v2), "got r8 ref %f expect %f\n", *V_R8REF(&v), *V_R8REF(&v2)); - + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_R8(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1307,7 +1315,8 @@ static void test_marshal_VARIANT(void) ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(!memcmp(V_DECIMALREF(&v), V_DECIMALREF(&v2), sizeof(DECIMAL)), "decimals differ\n"); - + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_DECIMAL(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1418,7 +1427,8 @@ static void test_marshal_VARIANT(void) ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(SysStringByteLen(*V_BSTRREF(&v)) == SysStringByteLen(*V_BSTRREF(&v2)), "bstr string lens differ\n"); ok(!memcmp(*V_BSTRREF(&v), *V_BSTRREF(&v2), SysStringByteLen(*V_BSTRREF(&v))), "bstrs differ\n"); - + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_BSTR(&v2)), "got size %#Ix\n", size); SysFreeString(b2); HeapFree(GetProcessHeap(), 0, oldbuffer); SysFreeString(b); @@ -1503,6 +1513,9 @@ static void test_marshal_VARIANT(void) SafeArrayGetVartype(*V_ARRAYREF(&v), &vt); SafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + todo_wine_if(sizeof(void *) == 8) + ok(size == sizeof(V_ARRAY(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1594,6 +1607,8 @@ static void test_marshal_VARIANT(void) ok(V_VT(V_VARIANTREF(&v)) == V_VT(V_VARIANTREF(&v3)), "vts differ %x %x\n", V_VT(V_VARIANTREF(&v)), V_VT(V_VARIANTREF(&v3))); ok(V_R8(V_VARIANTREF(&v)) == V_R8(V_VARIANTREF(&v3)), "r8s differ\n"); + size = IMalloc_GetSize(allocator, V_BYREF(&v3)); + ok(size == sizeof(*V_VARIANTREF(&v3)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v3); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1704,6 +1719,8 @@ static void test_marshal_VARIANT(void) ok(heap_unknown->refs == 2, "got refcount %ld\n", heap_unknown->refs); ok(V_VT(&v) == V_VT(&v3), "got vt %d expect %d\n", V_VT(&v), V_VT(&v3)); ok(*V_UNKNOWNREF(&v) == *V_UNKNOWNREF(&v3), "got %p expect %p\n", *V_UNKNOWNREF(&v), *V_UNKNOWNREF(&v3)); + size = IMalloc_GetSize(allocator, V_BYREF(&v3)); + ok(size == sizeof(V_BSTR(&v3)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v3); ok(heap_unknown->refs == 1, "%ld refcounts of IUnknown leaked\n", heap_unknown->refs - 1); IUnknown_Release(&heap_unknown->IUnknown_iface); @@ -1732,8 +1749,12 @@ static void test_marshal_VARIANT(void) ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v2), V_VT(&v)); ok(!*V_UNKNOWNREF(&v2), "got %p expect NULL\n", *V_UNKNOWNREF(&v2)); + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_BSTR(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); + + IMalloc_Release(allocator); }

1 0

Rémi Bernon : oleaut32: Allocate a full pointer when unmarshalling byref arrays.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 76e7f030feb3b26ae409c2f1027f16168bcdd420 URL: https://gitlab.winehq.org/wine/wine/-/commit/76e7f030feb3b26ae409c2f1027f16… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 15:01:21 2023 +0100 oleaut32: Allocate a full pointer when unmarshalling byref arrays. Instead of the 4 bytes array wire size returned by get_type_size, which will truncate the pointer on 64-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54562 --- dlls/oleaut32/tests/usrmarshal.c | 1 - dlls/oleaut32/usrmarshal.c | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index d4ffdbde82f..6559cdcd865 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1514,7 +1514,6 @@ static void test_marshal_VARIANT(void) SafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); size = IMalloc_GetSize(allocator, V_BYREF(&v2)); - todo_wine_if(sizeof(void *) == 8) ok(size == sizeof(V_ARRAY(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index aa54a2b092b..4a874a23413 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -506,7 +506,10 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe ULONG mem_size; Pos += 4; - switch (header->vt & ~VT_BYREF) + /* byref array needs to allocate a SAFEARRAY pointer */ + if (header->vt & VT_ARRAY) + mem_size = sizeof(void *); + else switch (header->vt & ~VT_BYREF) { /* these types have a different memory size compared to wire size */ case VT_UNKNOWN:

1 0