June 2023 - Wine-commits - list.winehq.org

Alex Henrie : advpack: Check the return value of adv_install in DoInfInstallW (scan-build).
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: wine Branch: master Commit: 29d543d12a2085be8513859369291bbcc35694db URL: https://gitlab.winehq.org/wine/wine/-/commit/29d543d12a2085be8513859369291b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 16 21:56:14 2023 -0600 advpack: Check the return value of adv_install in DoInfInstallW (scan-build). --- dlls/advpack/install.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index deaa82d6d98..f7768cf7852 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -533,7 +533,7 @@ static HRESULT DoInfInstallW(const SETUPCOMMAND_PARAMSW *setup) done: install_release(&info); - return S_OK; + return hr; } /***********************************************************************

1 0

David Kahurani : gdiplus: Allow NULL format in GdipAddPathString.
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: wine Branch: master Commit: 101bcc221d4a446aca3c959f5150757de9e5b88c URL: https://gitlab.winehq.org/wine/wine/-/commit/101bcc221d4a446aca3c959f515075… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Sun Jun 18 14:41:45 2023 +0300 gdiplus: Allow NULL format in GdipAddPathString. GdipAddPathString accepts NULL for format and presumably uses the default format for formating Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 4da84a9eac5..ad4dde58ccd 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1010,9 +1010,12 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT TEXTMETRICW textmetric; TRACE("(%p, %s, %d, %p, %d, %f, %p, %p)\n", path, debugstr_w(string), length, family, style, emSize, layoutRect, format); - if (!path || !string || !family || !emSize || !layoutRect || !format) + if (!path || !string || !family || !emSize || !layoutRect) return InvalidParameter; + if (!format) + format = &default_drawstring_format; + status = GdipGetEmHeight(family, style, &native_height); if (status != Ok) return status;

1 0

Olivier F. R. Dierick : ntoskrnl.exe: Add Ke386QueryIoAccessMap stub.
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: wine Branch: master Commit: 58e81212fc426d8022d93f40490abb8de532c289 URL: https://gitlab.winehq.org/wine/wine/-/commit/58e81212fc426d8022d93f40490abb… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Sun Jun 18 15:48:09 2023 +0200 ntoskrnl.exe: Add Ke386QueryIoAccessMap stub. Simply print a FIXME, instead of triggering the display of a terminal window to show 'call to unimplemented function' debugging info. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54380 --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 407e7c4f5e9..7e3ad603549 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3527,6 +3527,15 @@ BOOLEAN WINAPI Ke386IoSetAccessProcess(PEPROCESS *process, ULONG flag) return FALSE; } +/***************************************************** + * Ke386QueryIoAccessMap (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI Ke386QueryIoAccessMap(ULONG flag, PVOID buffer) +{ + FIXME("(%ld %p) stub\n", flag, buffer); + return FALSE; +} + /***************************************************** * Ke386SetIoAccessMap (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0b694b08de0..068806e52bc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -526,7 +526,7 @@ @ stdcall KdRefreshDebuggerNotPresent() @ stub Ke386CallBios @ stdcall Ke386IoSetAccessProcess(ptr long) -@ stub Ke386QueryIoAccessMap +@ stdcall Ke386QueryIoAccessMap(long ptr) @ stdcall Ke386SetIoAccessMap(long ptr) @ stub KeAcquireInterruptSpinLock @ stdcall KeAcquireSpinLockAtDpcLevel(ptr)

1 0

Alex Henrie : wininet: Don't overallocate in urlcache_encode_url_alloc (scan-build).
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: wine Branch: master Commit: 0a07f5984ef2366a20bf5ad896c23321f3c838b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a07f5984ef2366a20bf5ad896c233… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 16 22:09:35 2023 -0600 wininet: Don't overallocate in urlcache_encode_url_alloc (scan-build). The URL is encoded in UTF-8, not UTF-16. --- dlls/wininet/urlcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 8118bae50dc..cad4c39046b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1926,7 +1926,7 @@ static BOOL urlcache_encode_url_alloc(const WCHAR *url, char **encoded_url) if(!encoded_len) return FALSE; - ret = malloc(encoded_len * sizeof(WCHAR)); + ret = malloc(encoded_len); if(!ret) return FALSE;

1 0

Alexandre Julliard : include: Disallow fastcall functions in Unix libraries.
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: wine Branch: master Commit: 718068c42ca1f70ac8f94027f898354b5d4c94e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/718068c42ca1f70ac8f94027f89835… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 19 13:43:42 2023 +0200 include: Disallow fastcall functions in Unix libraries. --- include/ddk/wdm.h | 29 +++++++++++++++++------------ include/windef.h | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index bf240f4fe53..0e54d59a7f6 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1665,6 +1665,8 @@ static inline void IoCopyCurrentIrpStackLocationToNext(IRP *irp) #define SYMBOLIC_LINK_QUERY 0x0001 #define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) +#ifndef WINE_UNIX_LIB + NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG, ULONG); void FASTCALL ExAcquireFastMutex(FAST_MUTEX*); @@ -1775,10 +1777,6 @@ void WINAPI KeInitializeDpc(KDPC*,PKDEFERRED_ROUTINE,void*); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN); void WINAPI KeInitializeMutex(PRKMUTEX,ULONG); void WINAPI KeInitializeSemaphore(PRKSEMAPHORE,LONG,LONG); -static FORCEINLINE void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock ) -{ - *lock = 0; -} void WINAPI KeInitializeTimerEx(PKTIMER,TIMER_TYPE); void WINAPI KeInitializeTimer(KTIMER*); BOOLEAN WINAPI KeInsertDeviceQueue(KDEVICE_QUEUE*,KDEVICE_QUEUE_ENTRY*); @@ -1821,14 +1819,6 @@ MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); void WINAPI MmProbeAndLockPages(PMDLX, KPROCESSOR_MODE, LOCK_OPERATION); void WINAPI MmUnmapLockedPages(void*, PMDL); -static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) -{ - if (mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL)) - return mdl->MappedSystemVa; - else - return MmMapLockedPagesSpecifyCache(mdl, KernelMode, MmCached, NULL, FALSE, priority); -} - void FASTCALL ObfReferenceObject(void*); void WINAPI ObDereferenceObject(void*); USHORT WINAPI ObGetFilterVersion(void); @@ -1972,4 +1962,19 @@ static inline void ExInitializeFastMutex( FAST_MUTEX *mutex ) KeInitializeEvent( &mutex->Event, SynchronizationEvent, FALSE ); } +static FORCEINLINE void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock ) +{ + *lock = 0; +} + +static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) +{ + if (mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL)) + return mdl->MappedSystemVa; + else + return MmMapLockedPagesSpecifyCache(mdl, KernelMode, MmCached, NULL, FALSE, priority); +} + +#endif /* WINE_UNIX_LIB */ + #endif diff --git a/include/windef.h b/include/windef.h index b5f8f3d0b4c..366a195febd 100644 --- a/include/windef.h +++ b/include/windef.h @@ -59,7 +59,7 @@ extern "C" { #ifdef WINE_UNIX_LIB # define __stdcall # define __cdecl -# define __fastcall +# undef __fastcall #else # undef __stdcall # ifdef __i386__

1 0

Alexandre Julliard : loader: Force building the main loader as PIE on 64-bit.
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: wine Branch: master Commit: 78ed343842dcd8ffb95c416420953e121959d40d URL: https://gitlab.winehq.org/wine/wine/-/commit/78ed343842dcd8ffb95c416420953e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 19 16:32:37 2023 +0200 loader: Force building the main loader as PIE on 64-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55050 --- configure | 29 +---------------------------- configure.ac | 3 +-- loader/Makefile.in | 1 + 3 files changed, 3 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 93cdaa0a365..98481fd6a49 100755 --- a/configure +++ b/configure @@ -10342,34 +10342,7 @@ then : fi ;; *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5 -printf %s "checking whether the compiler supports -Wl,-pie... " >&6; } -if test ${ac_cv_cflags__Wl__pie+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,-pie" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_cflags__Wl__pie=yes -else $as_nop - ac_cv_cflags__Wl__pie=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__pie" >&5 -printf "%s\n" "$ac_cv_cflags__Wl__pie" >&6; } -if test "x$ac_cv_cflags__Wl__pie" = xyes -then : - WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie" -fi + WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie" ;; esac ;; diff --git a/configure.ac b/configure.ac index dd8520f6f48..9c98646a344 100644 --- a/configure.ac +++ b/configure.ac @@ -787,8 +787,7 @@ case $host_os in [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) ;; *) - WINE_TRY_CFLAGS([-Wl,-pie], - [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie"]) + WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie" ;; esac ;; diff --git a/loader/Makefile.in b/loader/Makefile.in index 7302c231915..30413fc8677 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -12,6 +12,7 @@ SOURCES = \ PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) +UNIX_CFLAGS = -fPIE preloader_EXTRADEFS = -fno-builtin

1 0

Alexandre Julliard : loader: Always build the main loader as PIE if we have a preloader.
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: wine Branch: master Commit: c55578f3a54c63084657e7d79c043b22b10df989 URL: https://gitlab.winehq.org/wine/wine/-/commit/c55578f3a54c63084657e7d79c043b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 19 16:35:02 2023 +0200 loader: Always build the main loader as PIE if we have a preloader. --- configure | 93 +++++++++++++++++++++--------------------------------------- configure.ac | 31 ++++++++++---------- 2 files changed, 48 insertions(+), 76 deletions(-) diff --git a/configure b/configure index 98481fd6a49..e2f60383fa0 100755 --- a/configure +++ b/configure @@ -10245,104 +10245,77 @@ if test "x$ac_cv_cflags__Wl___export_dynamic" = xyes then : WINELOADER_LDFLAGS="-Wl,--export-dynamic" fi - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - case $host_cpu in - *i[3456789]86* | arm*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000" >&5 -printf %s "checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000... " >&6; } -if test ${ac_cv_cflags__Wl__Ttext_segment_0x7bc00000+y} + case $host_os in + linux*) + as_fn_append WINELOADER_LDFLAGS " -pie" + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" + ;; + *) + case $HOST_ARCH in + i386|arm) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x60000000" >&5 +printf %s "checking whether the compiler supports -Wl,-Ttext-segment=0x60000000... " >&6; } +if test ${ac_cv_cflags__Wl__Ttext_segment_0x60000000+y} then : printf %s "(cached) " >&6 else $as_nop ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,-Ttext-segment=0x7bc00000" +CFLAGS="$CFLAGS -Wl,-Ttext-segment=0x60000000" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=yes + ac_cv_cflags__Wl__Ttext_segment_0x60000000=yes else $as_nop - ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=no + ac_cv_cflags__Wl__Ttext_segment_0x60000000=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&5 -printf "%s\n" "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; } -if test "x$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__Ttext_segment_0x60000000" >&5 +printf "%s\n" "$ac_cv_cflags__Wl__Ttext_segment_0x60000000" >&6; } +if test "x$ac_cv_cflags__Wl__Ttext_segment_0x60000000" = xyes then : - case $host_os in - freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; - *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; - esac + as_fn_append WINELOADER_LDFLAGS " -Wl,-Ttext-segment=0x60000000" else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7d000400" >&5 -printf %s "checking whether the compiler supports -Wl,--section-start,.interp=0x7d000400... " >&6; } -if test ${ac_cv_cflags__Wl___section_start__interp_0x7d000400+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x60000400" >&5 +printf %s "checking whether the compiler supports -Wl,--section-start,.interp=0x60000400... " >&6; } +if test ${ac_cv_cflags__Wl___section_start__interp_0x60000400+y} then : printf %s "(cached) " >&6 else $as_nop ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7d000400" +CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x60000400" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_cflags__Wl___section_start__interp_0x7d000400=yes + ac_cv_cflags__Wl___section_start__interp_0x60000400=yes else $as_nop - ac_cv_cflags__Wl___section_start__interp_0x7d000400=no + ac_cv_cflags__Wl___section_start__interp_0x60000400=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7d000400" >&5 -printf "%s\n" "$ac_cv_cflags__Wl___section_start__interp_0x7d000400" >&6; } -if test "x$ac_cv_cflags__Wl___section_start__interp_0x7d000400" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x60000400" >&5 +printf "%s\n" "$ac_cv_cflags__Wl___section_start__interp_0x60000400" >&6; } +if test "x$ac_cv_cflags__Wl___section_start__interp_0x60000400" = xyes then : - 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 + as_fn_append WINELOADER_LDFLAGS " -Wl,--section-start,.interp=0x60000400" 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; } -if test ${ac_cv_cflags__Wl__z_max_page_size_0x1000+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,-z,max-page-size=0x1000" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_cflags__Wl__z_max_page_size_0x1000=yes -else $as_nop - ac_cv_cflags__Wl__z_max_page_size_0x1000=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__z_max_page_size_0x1000" >&5 -printf "%s\n" "$ac_cv_cflags__Wl__z_max_page_size_0x1000" >&6; } -if test "x$ac_cv_cflags__Wl__z_max_page_size_0x1000" = xyes -then : - WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000" -fi - ;; - *) - WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie" + ;; + *) + as_fn_append WINELOADER_LDFLAGS " -pie" + ;; + esac ;; esac ;; diff --git a/configure.ac b/configure.ac index 9c98646a344..562d50209a6 100644 --- a/configure.ac +++ b/configure.ac @@ -769,25 +769,24 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,-z,defs],[UNIXLDFLAGS="$UNIXLDFLAGS -Wl,-z,defs"]) WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - case $host_cpu in - *i[[3456789]]86* | arm*) - WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], - [case $host_os in - freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; - *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; - esac], - [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7d000400], - [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])]) - WINE_TRY_CFLAGS([-Wl,-z,max-page-size=0x1000], - [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) + case $host_os in + linux*) + AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -pie"]) + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" ;; *) - WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie" + case $HOST_ARCH in + i386|arm) + WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x60000000], + [AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -Wl,-Ttext-segment=0x60000000"])], + [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x60000400], + [AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -Wl,--section-start,.interp=0x60000400"])])]) + ;; + *) + AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -pie"]) + ;; + esac ;; esac ;;

1 0

Alexandre Julliard : loader: Build the preloader as PIE on 64-bit.
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: wine Branch: master Commit: ac1761d1dae8bf114a05e28ed6886deba6c2c860 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac1761d1dae8bf114a05e28ed6886d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 19 17:32:01 2023 +0200 loader: Build the preloader as PIE on 64-bit. --- configure | 38 +++++++++++++++++++++++++++++++++++++- configure.ac | 11 ++++++++++- loader/preloader.c | 7 ++++--- 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/configure b/configure index e2f60383fa0..f41b9cd687f 100755 --- a/configure +++ b/configure @@ -10245,11 +10245,47 @@ if test "x$ac_cv_cflags__Wl___export_dynamic" = xyes then : WINELOADER_LDFLAGS="-Wl,--export-dynamic" fi + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs" case $host_os in linux*) as_fn_append WINELOADER_LDFLAGS " -pie" - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" + case $HOST_ARCH in + i386|arm) + as_fn_append WINEPRELOADER_LDFLAGS " -static -Wl,-Ttext=0x7d400000" ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -static-pie" >&5 +printf %s "checking whether the compiler supports -static-pie... " >&6; } +if test ${ac_cv_cflags__static_pie+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -static-pie" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cflags__static_pie=yes +else $as_nop + ac_cv_cflags__static_pie=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__static_pie" >&5 +printf "%s\n" "$ac_cv_cflags__static_pie" >&6; } +if test "x$ac_cv_cflags__static_pie" = xyes +then : + as_fn_append WINEPRELOADER_LDFLAGS " -static-pie" +else $as_nop + as_fn_append WINEPRELOADER_LDFLAGS " -static -Wl,-Ttext=0x7d7d00000000" +fi + ;; + esac ;; *) case $HOST_ARCH in diff --git a/configure.ac b/configure.ac index 562d50209a6..bed7b2dec28 100644 --- a/configure.ac +++ b/configure.ac @@ -769,11 +769,20 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,-z,defs],[UNIXLDFLAGS="$UNIXLDFLAGS -Wl,-z,defs"]) WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs" case $host_os in linux*) AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -pie"]) - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" + case $HOST_ARCH in + i386|arm) + AS_VAR_APPEND([WINEPRELOADER_LDFLAGS],[" -static -Wl,-Ttext=0x7d400000"]) ;; + *) + WINE_TRY_CFLAGS([-static-pie], + [AS_VAR_APPEND([WINEPRELOADER_LDFLAGS],[" -static-pie"])], + [AS_VAR_APPEND([WINEPRELOADER_LDFLAGS],[" -static -Wl,-Ttext=0x7d7d00000000"])]) + ;; + esac ;; *) case $HOST_ARCH in diff --git a/loader/preloader.c b/loader/preloader.c index 3fbee0877d4..4045db64822 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -351,7 +351,7 @@ __ASM_GLOBAL_FUNC(_start, "movq %rsp,%rax\n\t" "leaq -144(%rsp),%rsp\n\t" /* allocate some space for extra aux values */ "movq %rax,(%rsp)\n\t" /* orig stack pointer */ - "movq $thread_data,%rsi\n\t" + "movq thread_data(%rip),%rsi\n\t" "movq $0x1002,%rdi\n\t" /* ARCH_SET_FS */ "movq $158,%rax\n\t" /* SYS_arch_prctl */ "syscall\n\t" @@ -439,7 +439,8 @@ __ASM_GLOBAL_FUNC(_start, "mov x0, SP\n\t" "sub SP, SP, #144\n\t" /* allocate some space for extra aux values */ "str x0, [SP]\n\t" /* orig stack pointer */ - "ldr x0, =thread_data\n\t" + "adrp x0, thread_data\n\t" + "add x0, x0, :lo12:thread_data\n\t" "msr tpidr_el0, x0\n\t" "mov x0, SP\n\t" /* ptr to orig stack pointer */ "bl wld_start\n\t" @@ -1398,7 +1399,7 @@ void* wld_start( void **stack ) page_size = get_auxiliary( av, AT_PAGESZ, 4096 ); page_mask = page_size - 1; - preloader_start = (char *)_start - ((unsigned long)_start & page_mask); + preloader_start = (char *)((unsigned long)_start & ~page_mask); preloader_end = (char *)((unsigned long)(_end + page_mask) & ~page_mask); #ifdef DUMP_AUX_INFO

1 0

Davide Beatrici : winepulse: Move stream_release into mmdevapi.
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: wine Branch: master Commit: 959dd9a9a38aace40ad741afb46dc55eff562713 URL: https://gitlab.winehq.org/wine/wine/-/commit/959dd9a9a38aace40ad741afb46dc5… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jun 17 09:43:05 2023 +0200 winepulse: Move stream_release into mmdevapi. --- dlls/mmdevapi/client.c | 12 ++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 16 +++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index a0a2b225c0b..5d807776ff0 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -177,6 +177,18 @@ static DWORD CALLBACK timer_loop_func(void *user) return 0; } +HRESULT stream_release(stream_handle stream, HANDLE timer_thread) +{ + struct release_stream_params params; + + params.stream = stream; + params.timer_thread = timer_thread; + + WINE_UNIX_CALL(release_stream, &params); + + return params.result; +} + static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, UINT *len) { WCHAR pn[37]; diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 6221856481d..4efc75dc5a5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -133,6 +133,8 @@ extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; +extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); + extern WCHAR *get_application_name(void); static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) @@ -147,14 +149,6 @@ static void pulse_call(enum unix_funcs code, void *params) assert(!status); } -static void pulse_release_stream(stream_handle stream, HANDLE timer) -{ - struct release_stream_params params; - params.stream = stream; - params.timer_thread = timer; - pulse_call(release_stream, &params); -} - static void set_stream_volumes(ACImpl *This) { struct set_volumes_params params; @@ -444,7 +438,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) TRACE("(%p) Refcount now %lu\n", This, ref); if (!ref) { if (This->stream) { - pulse_release_stream(This->stream, This->timer_thread); + stream_release(This->stream, This->timer_thread); This->stream = 0; sessions_lock(); list_remove(&This->entry); @@ -639,7 +633,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, if (!(This->vols = malloc(channel_count * sizeof(*This->vols)))) { - pulse_release_stream(stream, NULL); + stream_release(stream, NULL); sessions_unlock(); return E_OUTOFMEMORY; } @@ -652,7 +646,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, free(This->vols); This->vols = NULL; sessions_unlock(); - pulse_release_stream(stream, NULL); + stream_release(stream, NULL); return E_OUTOFMEMORY; }

1 0

Davide Beatrici : winealsa: Use mmdevapi's stream_release.
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: wine Branch: master Commit: d49a6b773e76e4c399a18d295d51e0c3053f2b87 URL: https://gitlab.winehq.org/wine/wine/-/commit/d49a6b773e76e4c399a18d295d51e0… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jun 17 09:43:39 2023 +0200 winealsa: Use mmdevapi's stream_release. --- dlls/winealsa.drv/mmdevdrv.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 916e04ff047..d8596c9371c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -81,6 +81,8 @@ extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; +extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); + extern WCHAR *get_application_name(void); void DECLSPEC_HIDDEN sessions_lock(void) @@ -127,18 +129,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -static HRESULT alsa_stream_release(stream_handle stream, HANDLE timer_thread) -{ - struct release_stream_params params; - - params.stream = stream; - params.timer_thread = timer_thread; - - ALSA_CALL(release_stream, &params); - - return params.result; -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -443,7 +433,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) } HeapFree(GetProcessHeap(), 0, This->vols); if (This->stream) - alsa_stream_release(This->stream, This->timer_thread); + stream_release(This->stream, This->timer_thread); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -648,7 +638,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, exit: if(FAILED(params.result)){ - alsa_stream_release(stream, NULL); + stream_release(stream, NULL); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; }else{

1 0