December 2022 - Wine-Commits

Brendan Shanks : configure: Remove DiskArbitration.framework check (always present on macOS).
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: c8f9ee0bf059fa4ba8278d25e4a3f0e4436cf4b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8f9ee0bf059fa4ba8278d25e4a3f0… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Nov 9 15:26:20 2022 -0800 configure: Remove DiskArbitration.framework check (always present on macOS). --- configure | 25 +++++++++---------------- configure.ac | 15 ++++++--------- dlls/mountmgr.sys/diskarb.c | 8 ++++---- include/config.h.in | 4 ---- 4 files changed, 19 insertions(+), 33 deletions(-) diff --git a/configure b/configure index 2574923cc01..4de5e53629d 100755 --- a/configure +++ b/configure @@ -745,12 +745,12 @@ METAL_LIBS OPENCL_LIBS COREAUDIO_LIBS SECURITY_LIBS -DISKARBITRATION_LIBS SYSTEMCONFIGURATION_LIBS APPKIT_LIBS CORESERVICES_LIBS APPLICATIONSERVICES_LIBS IOKIT_LIBS +DISKARBITRATION_LIBS COREFOUNDATION_LIBS CARBON_LIBS ac_ct_OBJC @@ -7849,12 +7849,6 @@ if test "x$ac_cv_header_CL_cl_h" = xyes then : printf "%s\n" "#define HAVE_CL_CL_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "DiskArbitration/DiskArbitration.h" "ac_cv_header_DiskArbitration_DiskArbitration_h" "$ac_includes_default" -if test "x$ac_cv_header_DiskArbitration_DiskArbitration_h" = xyes -then : - printf "%s\n" "#define HAVE_DISKARBITRATION_DISKARBITRATION_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "EGL/egl.h" "ac_cv_header_EGL_egl_h" "$ac_includes_default" if test "x$ac_cv_header_EGL_egl_h" = xyes @@ -9794,6 +9788,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu COREFOUNDATION_LIBS="-framework CoreFoundation" + DISKARBITRATION_LIBS="-framework DiskArbitration -framework CoreFoundation" + IOKIT_LIBS="-framework IOKit -framework CoreFoundation" APPLICATIONSERVICES_LIBS="-framework ApplicationServices" @@ -9933,11 +9929,6 @@ fi as_fn_append wine_warnings "|can't build Wine preloader; many programs won't work" fi - if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" - then - DISKARBITRATION_LIBS="-framework DiskArbitration -framework CoreFoundation" - - fi if test "$ac_cv_header_Security_Security_h" = "yes" then SECURITY_LIBS="-framework Security -framework CoreFoundation" @@ -16124,8 +16115,9 @@ fi CPPFLAGS=$ac_save_CPPFLAGS fi -if test "x$ac_cv_lib_soname_dbus_1" = "x" -a \ - "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes" +case $host_os in + darwin*|macosx*) ;; + *) if test "x$ac_cv_lib_soname_dbus_1" = "x" then : case "x$with_dbus" in x) as_fn_append wine_notices "|libdbus ${notice_platform}development files not found, no dynamic device support." ;; @@ -16134,7 +16126,8 @@ then : This is an error since --with-dbus was requested." "$LINENO" 5 ;; esac -fi +fi ;; +esac if test "x$with_gnutls" != "xno" then @@ -23248,12 +23241,12 @@ OBJCFLAGS = $OBJCFLAGS ac_ct_OBJC = $ac_ct_OBJC CARBON_LIBS = $CARBON_LIBS COREFOUNDATION_LIBS = $COREFOUNDATION_LIBS +DISKARBITRATION_LIBS = $DISKARBITRATION_LIBS IOKIT_LIBS = $IOKIT_LIBS APPLICATIONSERVICES_LIBS = $APPLICATIONSERVICES_LIBS CORESERVICES_LIBS = $CORESERVICES_LIBS APPKIT_LIBS = $APPKIT_LIBS SYSTEMCONFIGURATION_LIBS = $SYSTEMCONFIGURATION_LIBS -DISKARBITRATION_LIBS = $DISKARBITRATION_LIBS SECURITY_LIBS = $SECURITY_LIBS COREAUDIO_LIBS = $COREAUDIO_LIBS OPENCL_LIBS = $OPENCL_LIBS diff --git a/configure.ac b/configure.ac index 56743a14e0d..a80310fee3b 100644 --- a/configure.ac +++ b/configure.ac @@ -407,7 +407,6 @@ AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ AL/al.h \ CL/cl.h \ - DiskArbitration/DiskArbitration.h \ EGL/egl.h \ IOKit/IOKitLib.h \ IOKit/hid/IOHIDLib.h \ @@ -682,6 +681,7 @@ case $host_os in dnl declare needed frameworks AC_SUBST(CARBON_LIBS,"-framework Carbon") AC_SUBST(COREFOUNDATION_LIBS,"-framework CoreFoundation") + AC_SUBST(DISKARBITRATION_LIBS,"-framework DiskArbitration -framework CoreFoundation") AC_SUBST(IOKIT_LIBS,"-framework IOKit -framework CoreFoundation") AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices") AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") @@ -710,11 +710,6 @@ case $host_os in WINE_WARNING([can't build Wine preloader; many programs won't work]) fi - if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" - then - dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found - AC_SUBST(DISKARBITRATION_LIBS,"-framework DiskArbitration -framework CoreFoundation") - fi if test "$ac_cv_header_Security_Security_h" = "yes" then AC_SUBST(SECURITY_LIBS,"-framework Security -framework CoreFoundation") @@ -1428,9 +1423,11 @@ then [WINE_CHECK_SONAME(dbus-1, dbus_connection_close,,[DBUS_CFLAGS=""],[$DBUS_LIBS])], [DBUS_CFLAGS=""])]) fi -WINE_NOTICE_WITH(dbus,[test "x$ac_cv_lib_soname_dbus_1" = "x" -a \ - "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"], - [libdbus ${notice_platform}development files not found, no dynamic device support.]) +case $host_os in + darwin*|macosx*) ;; + *) WINE_NOTICE_WITH(dbus,[test "x$ac_cv_lib_soname_dbus_1" = "x"], + [libdbus ${notice_platform}development files not found, no dynamic device support.]) ;; +esac dnl **** Check for libgnutls **** if test "x$with_gnutls" != "xno" diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 4bcd72c8916..18d4b65a625 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -31,7 +31,7 @@ #include <stdio.h> #include <unistd.h> #include <sys/ioctl.h> -#ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H +#ifdef __APPLE__ #include <DiskArbitration/DiskArbitration.h> #endif #if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) @@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); -#ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H +#ifdef __APPLE__ typedef struct { @@ -218,14 +218,14 @@ void run_diskarbitration_loop(void) CFRelease( session ); } -#else /* HAVE_DISKARBITRATION_DISKARBITRATION_H */ +#else /* __APPLE__ */ void run_diskarbitration_loop(void) { TRACE( "Skipping, Disk Arbitration support not compiled in\n" ); } -#endif /* HAVE_DISKARBITRATION_DISKARBITRATION_H */ +#endif /* __APPLE__ */ #if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) diff --git a/include/config.h.in b/include/config.h.in index e2b123e9049..3c42a13525e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -36,10 +36,6 @@ /* Define to 1 if you have the <cups/ppd.h> header file. */ #undef HAVE_CUPS_PPD_H -/* Define to 1 if you have the <DiskArbitration/DiskArbitration.h> header - file. */ -#undef HAVE_DISKARBITRATION_DISKARBITRATION_H - /* Define to 1 if you have the `dlinfo' function. */ #undef HAVE_DLINFO

1 0

Brendan Shanks : configure: Remove Metal.framework check (present in all supported macOS SDKs).
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 6706784c334bf8f89e0338fbe0c6c5eb9935fa54 URL: https://gitlab.winehq.org/wine/wine/-/commit/6706784c334bf8f89e0338fbe0c6c5… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Dec 1 11:53:32 2022 -0800 configure: Remove Metal.framework check (present in all supported macOS SDKs). --- configure | 421 +++++++++++++++++----------------------- configure.ac | 26 +-- dlls/winemac.drv/cocoa_window.m | 16 -- dlls/winemac.drv/macdrv_cocoa.h | 4 - include/config.h.in | 3 - 5 files changed, 189 insertions(+), 281 deletions(-)

1 0

Brendan Shanks : configure: Remove CoreAudio.h check (always present on macOS).
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 8b415f8bb516b6a772025702eb6427b196f20f2e URL: https://gitlab.winehq.org/wine/wine/-/commit/8b415f8bb516b6a772025702eb6427… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 22 13:54:03 2022 -0800 configure: Remove CoreAudio.h check (always present on macOS). --- configure | 10 ++-------- configure.ac | 6 ++---- include/config.h.in | 3 --- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 04dca04127f..2574923cc01 100755 --- a/configure +++ b/configure @@ -4189,7 +4189,7 @@ fi # Check whether --with-coreaudio was given. if test ${with_coreaudio+y} then : - withval=$with_coreaudio; if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi + withval=$with_coreaudio; fi @@ -7849,12 +7849,6 @@ if test "x$ac_cv_header_CL_cl_h" = xyes then : printf "%s\n" "#define HAVE_CL_CL_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "CoreAudio/CoreAudio.h" "ac_cv_header_CoreAudio_CoreAudio_h" "$ac_includes_default" -if test "x$ac_cv_header_CoreAudio_CoreAudio_h" = xyes -then : - printf "%s\n" "#define HAVE_COREAUDIO_COREAUDIO_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "DiskArbitration/DiskArbitration.h" "ac_cv_header_DiskArbitration_DiskArbitration_h" "$ac_includes_default" if test "x$ac_cv_header_DiskArbitration_DiskArbitration_h" = xyes @@ -9949,7 +9943,7 @@ fi SECURITY_LIBS="-framework Security -framework CoreFoundation" fi - if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" + if test "x$with_coreaudio" != "xno"; then COREAUDIO_LIBS="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI" diff --git a/configure.ac b/configure.ac index 505f1d9afa5..56743a14e0d 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,7 @@ AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror],[treat compilation warnin AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support])) AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)])) -AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support]), - [if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi]) +AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support])) AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)])) AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms])) @@ -408,7 +407,6 @@ AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ AL/al.h \ CL/cl.h \ - CoreAudio/CoreAudio.h \ DiskArbitration/DiskArbitration.h \ EGL/egl.h \ IOKit/IOKitLib.h \ @@ -721,7 +719,7 @@ case $host_os in then AC_SUBST(SECURITY_LIBS,"-framework Security -framework CoreFoundation") fi - if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" + if test "x$with_coreaudio" != "xno"; then AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} diff --git a/include/config.h.in b/include/config.h.in index b880b8c0899..e2b123e9049 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -30,9 +30,6 @@ /* Define to 1 if you have the <CL/cl.h> header file. */ #undef HAVE_CL_CL_H -/* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */ -#undef HAVE_COREAUDIO_COREAUDIO_H - /* Define to 1 if you have the <cups/cups.h> header file. */ #undef HAVE_CUPS_CUPS_H

1 0

Brendan Shanks : configure: Always enable Mac driver on macOS.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 87eb0a544aac616df7c45254b71b82d43047a317 URL: https://gitlab.winehq.org/wine/wine/-/commit/87eb0a544aac616df7c45254b71b82… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 22 13:22:03 2022 -0800 configure: Always enable Mac driver on macOS. --- configure | 14 +------------- configure.ac | 10 +--------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 256e95f2644..de1ca2c9692 100755 --- a/configure +++ b/configure @@ -9807,6 +9807,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" + enable_winemac_drv=${enable_winemac_drv:-yes} COREFOUNDATION_LIBS="-framework CoreFoundation" IOKIT_LIBS="-framework IOKit -framework CoreFoundation" @@ -10034,19 +10035,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi - - if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes" - then - ac_save_LIBS="$LIBS" - LIBS="$LIBS $APPLICATIONSERVICES_LIBS" - ac_fn_c_check_func "$LINENO" "CGDisplayModeGetWidth" "ac_cv_func_CGDisplayModeGetWidth" -if test "x$ac_cv_func_CGDisplayModeGetWidth" = xyes -then : - enable_winemac_drv=${enable_winemac_drv:-yes} -fi - - LIBS="$ac_save_LIBS" fi UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/" diff --git a/configure.ac b/configure.ac index cb91c9c02b5..d9d112fa2a4 100644 --- a/configure.ac +++ b/configure.ac @@ -682,6 +682,7 @@ case $host_os in LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" + enable_winemac_drv=${enable_winemac_drv:-yes} dnl declare needed frameworks AC_SUBST(COREFOUNDATION_LIBS,"-framework CoreFoundation") AC_SUBST(IOKIT_LIBS,"-framework IOKit -framework CoreFoundation") @@ -760,15 +761,6 @@ case $host_os in AC_LANG_POP([Objective C]) fi - dnl Enable Mac driver on Mac OS X 10.6 or later - if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes" - then - ac_save_LIBS="$LIBS" - LIBS="$LIBS $APPLICATIONSERVICES_LIBS" - AC_CHECK_FUNC(CGDisplayModeGetWidth,enable_winemac_drv=${enable_winemac_drv:-yes}) - LIBS="$ac_save_LIBS" - fi - UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/" AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib") AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"])

1 0

Zebediah Figura : ntdll: Trace the name of critical sections which are released while not acquired.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: e2c081a8ebc0722df08e85e32fc26bd42c23ae46 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2c081a8ebc0722df08e85e32fc26b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 18 20:08:09 2022 -0600 ntdll: Trace the name of critical sections which are released while not acquired. --- dlls/ntdll/sync.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index f9f906df723..4f5ee820286 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -155,6 +155,13 @@ static BOOL crit_section_has_debuginfo( const RTL_CRITICAL_SECTION *crit ) return crit->DebugInfo != NULL && crit->DebugInfo != no_debug_info_marker; } +static const char *crit_section_get_name( const RTL_CRITICAL_SECTION *crit ) +{ + if (crit_section_has_debuginfo( crit )) + return (char *)crit->DebugInfo->Spare[0]; + return "?"; +} + static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit ) { HANDLE ret = crit->LockSemaphore; @@ -311,9 +318,8 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if ( status == STATUS_TIMEOUT ) { - const char *name = NULL; - if (crit_section_has_debuginfo( crit )) name = (char *)crit->DebugInfo->Spare[0]; - if (!name) name = "?"; + const char *name = crit_section_get_name( crit ); + ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (60 sec)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); status = wait_semaphore( crit, 60 ); @@ -461,7 +467,7 @@ NTSTATUS WINAPI RtlLeaveCriticalSection( RTL_CRITICAL_SECTION *crit ) if (--crit->RecursionCount) { if (crit->RecursionCount > 0) InterlockedDecrement( &crit->LockCount ); - else ERR( "section %p is not acquired\n", crit ); + else ERR( "section %p %s is not acquired\n", crit, debugstr_a( crit_section_get_name( crit ))); } else {

1 0

Brendan Shanks : configure: Remove ApplicationServices.framework check (always present on macOS).
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 650b6a9fc4081ba15cdca751af6e5cf2513b7cca URL: https://gitlab.winehq.org/wine/wine/-/commit/650b6a9fc4081ba15cdca751af6e5c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 22 13:27:56 2022 -0800 configure: Remove ApplicationServices.framework check (always present on macOS). --- configure | 6 ------ configure.ac | 1 - dlls/winspool.drv/cups.c | 4 ++-- include/config.h.in | 4 ---- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/configure b/configure index de1ca2c9692..c92683ffaa5 100755 --- a/configure +++ b/configure @@ -7843,12 +7843,6 @@ if test "x$ac_cv_header_AL_al_h" = xyes then : printf "%s\n" "#define HAVE_AL_AL_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default" -if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = xyes -then : - printf "%s\n" "#define HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "CL/cl.h" "ac_cv_header_CL_cl_h" "$ac_includes_default" if test "x$ac_cv_header_CL_cl_h" = xyes diff --git a/configure.ac b/configure.ac index d9d112fa2a4..c057b318f2b 100644 --- a/configure.ac +++ b/configure.ac @@ -407,7 +407,6 @@ AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ AL/al.h \ - ApplicationServices/ApplicationServices.h \ CL/cl.h \ Carbon/Carbon.h \ CoreAudio/CoreAudio.h \ diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index ccb64325e7b..1034277aad6 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -41,7 +41,7 @@ #include <cups/ppd.h> #endif -#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H +#ifdef __APPLE__ #define GetCurrentProcess GetCurrentProcess_Mac #define GetCurrentThread GetCurrentThread_Mac #define LoadResource LoadResource_Mac @@ -386,7 +386,7 @@ static NTSTATUS get_ppd( void *args ) static NTSTATUS get_default_page_size( void *args ) { -#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H +#ifdef __APPLE__ const struct get_default_page_size_params *params = args; NTSTATUS status = STATUS_UNSUCCESSFUL; PMPrintSession session = NULL; diff --git a/include/config.h.in b/include/config.h.in index 509dd2869bf..2c62db978bc 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -9,10 +9,6 @@ /* Define to 1 if you have the <AL/al.h> header file. */ #undef HAVE_AL_AL_H -/* Define to 1 if you have the <ApplicationServices/ApplicationServices.h> - header file. */ -#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H - /* Define to 1 if you have the <arpa/inet.h> header file. */ #undef HAVE_ARPA_INET_H

1 0

Brendan Shanks : configure: Remove Carbon.framework check (always present on macOS).
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 40baab6444ee8c4e79a1bdb19e5cfdf2f5ea584c URL: https://gitlab.winehq.org/wine/wine/-/commit/40baab6444ee8c4e79a1bdb19e5cfd… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Dec 1 10:17:18 2022 -0800 configure: Remove Carbon.framework check (always present on macOS). --- configure | 19 +++++-------------- configure.ac | 6 +----- dlls/win32u/freetype.c | 16 ++++++++-------- include/config.h.in | 3 --- 4 files changed, 14 insertions(+), 30 deletions(-) diff --git a/configure b/configure index c92683ffaa5..04dca04127f 100755 --- a/configure +++ b/configure @@ -742,7 +742,6 @@ WINELOADER_DEPENDS LIBWINE_LDFLAGS LIBWINE_SHAREDLIB METAL_LIBS -CARBON_LIBS OPENCL_LIBS COREAUDIO_LIBS SECURITY_LIBS @@ -753,6 +752,7 @@ CORESERVICES_LIBS APPLICATIONSERVICES_LIBS IOKIT_LIBS COREFOUNDATION_LIBS +CARBON_LIBS ac_ct_OBJC OBJCFLAGS OBJC @@ -7849,12 +7849,6 @@ if test "x$ac_cv_header_CL_cl_h" = xyes then : printf "%s\n" "#define HAVE_CL_CL_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "Carbon/Carbon.h" "ac_cv_header_Carbon_Carbon_h" "$ac_includes_default" -if test "x$ac_cv_header_Carbon_Carbon_h" = xyes -then : - printf "%s\n" "#define HAVE_CARBON_CARBON_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "CoreAudio/CoreAudio.h" "ac_cv_header_CoreAudio_CoreAudio_h" "$ac_includes_default" if test "x$ac_cv_header_CoreAudio_CoreAudio_h" = xyes @@ -9802,7 +9796,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" enable_winemac_drv=${enable_winemac_drv:-yes} - COREFOUNDATION_LIBS="-framework CoreFoundation" + CARBON_LIBS="-framework Carbon" + + COREFOUNDATION_LIBS="-framework CoreFoundation" IOKIT_LIBS="-framework IOKit -framework CoreFoundation" @@ -9979,11 +9975,6 @@ fi LIBS="$ac_save_LIBS" fi - if test "$ac_cv_header_Carbon_Carbon_h" = "yes" - then - CARBON_LIBS="-framework Carbon" - - fi if test "$ac_cv_header_Metal_Metal_h" = "yes" then METAL_LIBS="-framework Metal" @@ -23261,6 +23252,7 @@ CONFIGURE_TARGETS = $CONFIGURE_TARGETS OBJC = $OBJC OBJCFLAGS = $OBJCFLAGS ac_ct_OBJC = $ac_ct_OBJC +CARBON_LIBS = $CARBON_LIBS COREFOUNDATION_LIBS = $COREFOUNDATION_LIBS IOKIT_LIBS = $IOKIT_LIBS APPLICATIONSERVICES_LIBS = $APPLICATIONSERVICES_LIBS @@ -23271,7 +23263,6 @@ DISKARBITRATION_LIBS = $DISKARBITRATION_LIBS SECURITY_LIBS = $SECURITY_LIBS COREAUDIO_LIBS = $COREAUDIO_LIBS OPENCL_LIBS = $OPENCL_LIBS -CARBON_LIBS = $CARBON_LIBS METAL_LIBS = $METAL_LIBS LIBWINE_SHAREDLIB = $LIBWINE_SHAREDLIB LIBWINE_LDFLAGS = $LIBWINE_LDFLAGS diff --git a/configure.ac b/configure.ac index c057b318f2b..505f1d9afa5 100644 --- a/configure.ac +++ b/configure.ac @@ -408,7 +408,6 @@ AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ AL/al.h \ CL/cl.h \ - Carbon/Carbon.h \ CoreAudio/CoreAudio.h \ DiskArbitration/DiskArbitration.h \ EGL/egl.h \ @@ -683,6 +682,7 @@ case $host_os in LDDLLFLAGS="-fPIC" enable_winemac_drv=${enable_winemac_drv:-yes} dnl declare needed frameworks + AC_SUBST(CARBON_LIBS,"-framework Carbon") AC_SUBST(COREFOUNDATION_LIBS,"-framework CoreFoundation") AC_SUBST(IOKIT_LIBS,"-framework IOKit -framework CoreFoundation") AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices") @@ -739,10 +739,6 @@ case $host_os in LIBS="$ac_save_LIBS" fi - if test "$ac_cv_header_Carbon_Carbon_h" = "yes" - then - AC_SUBST(CARBON_LIBS,"-framework Carbon") - fi if test "$ac_cv_header_Metal_Metal_h" = "yes" then AC_SUBST(METAL_LIBS,"-framework Metal") diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index ca235ff66ec..fd402758daa 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -40,7 +40,7 @@ #include <assert.h> #include <unistd.h> -#ifdef HAVE_CARBON_CARBON_H +#ifdef __APPLE__ #define LoadResource __carbon_LoadResource #define CheckMenuItem __carbon_CheckMenuItem #define CompareString __carbon_CompareString @@ -93,7 +93,7 @@ #undef ResizePalette #undef SetRectRgn #undef ShowWindow -#endif /* HAVE_CARBON_CARBON_H */ +#endif /* __APPLE__ */ #ifdef HAVE_FT2BUILD_H #include <ft2build.h> @@ -325,7 +325,7 @@ static BOOL freetype_set_bitmap_text_metrics( struct gdi_font *font ); * cga40woa.fon=cga40850.fon */ -#ifdef HAVE_CARBON_CARBON_H +#ifdef __APPLE__ static char *find_cache_dir(void) { FSRef ref; @@ -525,7 +525,7 @@ static char **expand_mac_font(const char *path) return ret.array; } -#endif /* HAVE_CARBON_CARBON_H */ +#endif /* __APPLE__ */ /* This function builds an FT_Fixed from a double. It fails if the absolute @@ -1377,7 +1377,7 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon /* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */ assert(unix_name || !(flags & ADDFONT_EXTERNAL_FONT)); -#ifdef HAVE_CARBON_CARBON_H +#ifdef __APPLE__ if(unix_name) { char **mac_list = expand_mac_font(unix_name); @@ -1396,7 +1396,7 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon return 1; } } -#endif /* HAVE_CARBON_CARBON_H */ +#endif /* __APPLE__ */ if (!dos_name && unix_name) dos_name = filename = get_dos_file_name( unix_name ); @@ -1691,7 +1691,7 @@ done: if (done_set) pFcStrSetDestroy( done_set ); } -#elif defined(HAVE_CARBON_CARBON_H) +#elif defined(__APPLE__) static void load_mac_font_callback(const void *value, void *context) { @@ -1885,7 +1885,7 @@ static void freetype_load_fonts(void) { #ifdef SONAME_LIBFONTCONFIG load_fontconfig_fonts(); -#elif defined(HAVE_CARBON_CARBON_H) +#elif defined(__APPLE__) load_mac_fonts(); #elif defined(__ANDROID__) ReadFontDir("/system/fonts", TRUE); diff --git a/include/config.h.in b/include/config.h.in index 2c62db978bc..b880b8c0899 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -24,9 +24,6 @@ /* Define to 1 if you have the <capi20.h> header file. */ #undef HAVE_CAPI20_H -/* Define to 1 if you have the <Carbon/Carbon.h> header file. */ -#undef HAVE_CARBON_CARBON_H - /* Define to 1 if you have the `clock_gettime' function. */ #undef HAVE_CLOCK_GETTIME

1 0

Rémi Bernon : ntdll: Keep subheap parent heap pointer and check for mismatches.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: c2bff6b65f9a6861af3e631f54be192a0cacae3e URL: https://gitlab.winehq.org/wine/wine/-/commit/c2bff6b65f9a6861af3e631f54be19… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 1 19:09:50 2022 +0100 ntdll: Keep subheap parent heap pointer and check for mismatches. --- dlls/ntdll/heap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 3eb29257d3b..aafbbd0f523 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -949,6 +949,7 @@ static SUBHEAP *create_subheap( struct heap *heap, DWORD flags, SIZE_T total_siz if (!(subheap = allocate_region( heap, flags, &total_size, &commit_size ))) return NULL; + subheap->user_value = heap; subheap_set_bounds( subheap, (char *)subheap + commit_size, (char *)subheap + total_size ); block_size = (SIZE_T)ROUND_ADDR( subheap_size( subheap ) - subheap_overhead( subheap ), BLOCK_ALIGN - 1 ); block_init_free( first_block( subheap ), flags, subheap, block_size ); @@ -1195,7 +1196,8 @@ static inline struct block *unsafe_block_from_ptr( struct heap *heap, ULONG flag else if (block_get_type( block ) == BLOCK_TYPE_USED) { const char *base = subheap_base( subheap ), *commit_end = subheap_commit_end( subheap ); - if (!contains( base, commit_end - base, block, block_get_size( block ) )) err = "invalid block size"; + if (subheap->user_value != heap) err = "mismatching heap"; + else if (!contains( base, commit_end - base, block, block_get_size( block ) )) err = "invalid block size"; } else if (block_get_type( block ) == BLOCK_TYPE_LARGE) { @@ -1374,6 +1376,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, void *addr, SIZE_T total_size, SIZE_T } subheap = &heap->subheap; + subheap->user_value = heap; subheap_set_bounds( subheap, (char *)heap + commit_size, (char *)heap + total_size ); block_size = (SIZE_T)ROUND_ADDR( subheap_size( subheap ) - subheap_overhead( subheap ), BLOCK_ALIGN - 1 ); block_init_free( first_block( subheap ), flags, subheap, block_size );

1 0

Rémi Bernon : ntdll: Move the insertion of the first block out of create_subheap.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 4502c1daa9da65f54ae894ee6b67b9ebda6b527a URL: https://gitlab.winehq.org/wine/wine/-/commit/4502c1daa9da65f54ae894ee6b67b9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 1 11:17:36 2022 +0100 ntdll: Move the insertion of the first block out of create_subheap. --- dlls/ntdll/heap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 8c23585fbd1..3eb29257d3b 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -954,7 +954,6 @@ static SUBHEAP *create_subheap( struct heap *heap, DWORD flags, SIZE_T total_siz block_init_free( first_block( subheap ), flags, subheap, block_size ); list_add_head( &heap->subheap_list, &subheap->entry ); - insert_free_block( heap, flags, subheap, first_block( subheap ) ); return subheap; } @@ -1000,9 +999,7 @@ static struct block *find_free_block( struct heap *heap, ULONG flags, SIZE_T blo TRACE( "created new sub-heap %p of %#Ix bytes for heap %p\n", subheap, subheap_size( subheap ), heap ); - entry = first_block( subheap ); - list_remove( &entry->entry ); - return &entry->block; + return first_block( subheap ); }

1 0

Rémi Bernon : ntdll: Split create_free_block into block_init_free / insert_free_block.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 2e8b19ec271c3932460197b97002063767dd8f27 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e8b19ec271c3932460197b9700206… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 25 18:46:13 2022 +0100 ntdll: Split create_free_block into block_init_free / insert_free_block. --- dlls/ntdll/heap.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index b8996415da0..8c23585fbd1 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -707,12 +707,10 @@ static inline BOOL subheap_decommit( const struct heap *heap, SUBHEAP *subheap, return TRUE; } - -static void create_free_block( struct heap *heap, ULONG flags, SUBHEAP *subheap, struct block *block, SIZE_T block_size ) +static void block_init_free( struct block *block, ULONG flags, SUBHEAP *subheap, SIZE_T block_size ) { const char *end = (char *)block + block_size, *commit_end = subheap_commit_end( subheap ); - struct entry *entry = (struct entry *)block, *list; - struct block *next; + struct entry *entry = (struct entry *)block; valgrind_make_writable( block, sizeof(*entry) ); block_set_type( block, BLOCK_TYPE_FREE ); @@ -724,6 +722,12 @@ static void create_free_block( struct heap *heap, ULONG flags, SUBHEAP *subheap, if (end > commit_end) end = commit_end; if (end > (char *)(entry + 1)) mark_block_free( entry + 1, end - (char *)(entry + 1), flags ); +} + +static void insert_free_block( struct heap *heap, ULONG flags, SUBHEAP *subheap, struct block *block ) +{ + struct entry *entry = (struct entry *)block, *list; + struct block *next; if ((next = next_block( subheap, block ))) { @@ -796,7 +800,8 @@ static NTSTATUS heap_free_block( struct heap *heap, ULONG flags, struct block *b return STATUS_SUCCESS; } - create_free_block( heap, flags, subheap, block, block_size ); + block_init_free( block, flags, subheap, block_size ); + insert_free_block( heap, flags, subheap, block ); /* keep room for a full committed block as hysteresis */ if (!next) subheap_decommit( heap, subheap, (char *)((struct entry *)block + 1) + REGION_ALIGN ); @@ -946,8 +951,10 @@ static SUBHEAP *create_subheap( struct heap *heap, DWORD flags, SIZE_T total_siz subheap_set_bounds( subheap, (char *)subheap + commit_size, (char *)subheap + total_size ); block_size = (SIZE_T)ROUND_ADDR( subheap_size( subheap ) - subheap_overhead( subheap ), BLOCK_ALIGN - 1 ); - create_free_block( heap, flags, subheap, first_block( subheap ), block_size ); + block_init_free( first_block( subheap ), flags, subheap, block_size ); + list_add_head( &heap->subheap_list, &subheap->entry ); + insert_free_block( heap, flags, subheap, first_block( subheap ) ); return subheap; } @@ -1372,7 +1379,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, void *addr, SIZE_T total_size, SIZE_T subheap = &heap->subheap; subheap_set_bounds( subheap, (char *)heap + commit_size, (char *)heap + total_size ); block_size = (SIZE_T)ROUND_ADDR( subheap_size( subheap ) - subheap_overhead( subheap ), BLOCK_ALIGN - 1 ); - create_free_block( heap, flags, subheap, first_block( subheap ), block_size ); + block_init_free( first_block( subheap ), flags, subheap, block_size ); + + insert_free_block( heap, flags, subheap, first_block( subheap ) ); list_add_head( &heap->subheap_list, &subheap->entry ); heap_set_debug_flags( heap ); @@ -1502,7 +1511,10 @@ static NTSTATUS heap_allocate_block( struct heap *heap, ULONG flags, SIZE_T bloc subheap = block_get_subheap( heap, block ); if ((next = split_block( heap, flags, block, old_block_size, block_size ))) - create_free_block( heap, flags, subheap, next, old_block_size - block_size ); + { + block_init_free( next, flags, subheap, old_block_size - block_size ); + insert_free_block( heap, flags, subheap, next ); + } block_set_type( block, BLOCK_TYPE_USED ); block_set_flags( block, ~0, BLOCK_USER_FLAGS( flags ) ); @@ -1637,7 +1649,10 @@ static NTSTATUS heap_resize_block( struct heap *heap, ULONG flags, struct block } if ((next = split_block( heap, flags, block, old_block_size, block_size ))) - create_free_block( heap, flags, subheap, next, old_block_size - block_size ); + { + block_init_free( next, flags, subheap, old_block_size - block_size ); + insert_free_block( heap, flags, subheap, next ); + } valgrind_notify_resize( block + 1, *old_size, size ); block_set_flags( block, BLOCK_FLAG_USER_MASK & ~BLOCK_FLAG_USER_INFO, BLOCK_USER_FLAGS( flags ) );

1 0