[PATCH 0/11] MR1649: configure,winemac: Various macOS cleanups
From: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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"]) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1649
From: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 1 - dlls/winspool.drv/cups.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 6d2d9fa1c8e..1e6ad9a43a6 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; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1649
From: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 6 +----- dlls/win32u/freetype.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) 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); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1649
From: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1649
From: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 15 ++++++--------- dlls/mountmgr.sys/diskarb.c | 8 ++++---- 2 files changed, 10 insertions(+), 13 deletions(-) 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) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1649
From: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 8 -------- dlls/winebus.sys/bus_iohid.c | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index a80310fee3b..cff7d5d899b 100644 --- a/configure.ac +++ b/configure.ac @@ -409,7 +409,6 @@ AC_CHECK_HEADERS(\ CL/cl.h \ EGL/egl.h \ IOKit/IOKitLib.h \ - IOKit/hid/IOHIDLib.h \ OpenCL/opencl.h \ Security/Security.h \ SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ @@ -724,13 +723,6 @@ case $host_os in AC_SUBST(OPENCL_LIBS,"-framework OpenCL") ac_cv_lib_OpenCL_clGetPlatformInfo=yes fi - if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" - then - ac_save_LIBS="$LIBS" - LIBS="$LIBS $IOKIT_LIBS" - AC_CHECK_FUNCS(IOHIDManagerCreate) - LIBS="$ac_save_LIBS" - fi if test "$ac_cv_header_Metal_Metal_h" = "yes" then diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index e0527739199..99334d141bb 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -26,7 +26,7 @@ #include <stdarg.h> #include <sys/types.h> -#if defined(HAVE_IOKIT_HID_IOHIDLIB_H) +#ifdef __APPLE__ #define DWORD UInt32 #define LPDWORD UInt32* #define LONG SInt32 @@ -81,7 +81,7 @@ #undef LPLONG #undef E_PENDING #undef PAGE_SHIFT -#endif /* HAVE_IOKIT_HID_IOHIDLIB_H */ +#endif /* __APPLE__ */ #include <pthread.h> @@ -98,7 +98,7 @@ #include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); -#ifdef HAVE_IOHIDMANAGERCREATE +#ifdef __APPLE__ static pthread_mutex_t iohid_cs = PTHREAD_MUTEX_INITIALIZER; @@ -441,4 +441,4 @@ NTSTATUS iohid_bus_stop(void *args) return STATUS_NOT_IMPLEMENTED; } -#endif /* HAVE_IOHIDMANAGERCREATE */ +#endif /* __APPLE__ */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1649
From: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 1 - dlls/ntdll/unix/cdrom.c | 2 +- dlls/ntdll/unix/system.c | 6 ++---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index cff7d5d899b..8689c7ba425 100644 --- a/configure.ac +++ b/configure.ac @@ -408,7 +408,6 @@ AC_CHECK_HEADERS(\ AL/al.h \ CL/cl.h \ EGL/egl.h \ - IOKit/IOKitLib.h \ OpenCL/opencl.h \ Security/Security.h \ SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index 5ee4fecf26b..661a7067168 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -75,7 +75,7 @@ # include <sys/scsiio.h> #endif -#ifdef HAVE_IOKIT_IOKITLIB_H +#ifdef __APPLE__ # include <libkern/OSByteOrder.h> # include <sys/disk.h> # include <IOKit/IOKitLib.h> diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 2dc99316f9c..b9be2f53752 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -54,14 +54,12 @@ #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif -#ifdef HAVE_IOKIT_IOKITLIB_H +#ifdef __APPLE__ # include <CoreFoundation/CoreFoundation.h> # include <IOKit/IOKitLib.h> # include <IOKit/pwr_mgt/IOPM.h> # include <IOKit/pwr_mgt/IOPMLib.h> # include <IOKit/ps/IOPowerSources.h> -#endif -#ifdef __APPLE__ # include <mach/mach.h> # include <mach/machine.h> # include <mach/mach_init.h> @@ -3484,7 +3482,7 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) return STATUS_SUCCESS; } -#elif defined(HAVE_IOKIT_IOKITLIB_H) +#elif defined(__APPLE__) static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1649
From: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 26 ++++++++------------------ dlls/winemac.drv/cocoa_window.m | 16 ---------------- dlls/winemac.drv/macdrv_cocoa.h | 4 ---- 3 files changed, 8 insertions(+), 38 deletions(-) diff --git a/configure.ac b/configure.ac index 8689c7ba425..cff8fba397a 100644 --- a/configure.ac +++ b/configure.ac @@ -669,9 +669,6 @@ case $host_os in ;; darwin*|macosx*) - AC_LANG_PUSH([Objective C]) - AC_CHECK_HEADERS(Metal/Metal.h) - AC_LANG_POP([Objective C]) LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" @@ -681,6 +678,7 @@ case $host_os in AC_SUBST(COREFOUNDATION_LIBS,"-framework CoreFoundation") AC_SUBST(DISKARBITRATION_LIBS,"-framework DiskArbitration -framework CoreFoundation") AC_SUBST(IOKIT_LIBS,"-framework IOKit -framework CoreFoundation") + AC_SUBST(METAL_LIBS,"-framework Metal") AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices") AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") AC_SUBST(APPKIT_LIBS,"-framework AppKit") @@ -723,22 +721,14 @@ case $host_os in ac_cv_lib_OpenCL_clGetPlatformInfo=yes fi - if test "$ac_cv_header_Metal_Metal_h" = "yes" - then - AC_SUBST(METAL_LIBS,"-framework Metal") - fi - dnl Check for MTLDevice registryID property - if test "$ac_cv_header_Metal_Metal_h" = "yes" - then - AC_MSG_CHECKING([whether MTLDevice protocol supports registryID property]) - AC_LANG_PUSH([Objective C]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <Metal/Metal.h>]], [[id<MTLDevice> device; device.registryID;]])], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_MTLDEVICE_REGISTRYID, 1, [Define if MTLDevice protocol has registryID property.])], - [AC_MSG_RESULT(no)]) - AC_LANG_POP([Objective C]) - fi + AC_MSG_CHECKING([whether MTLDevice protocol supports registryID property]) + AC_LANG_PUSH([Objective C]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <Metal/Metal.h>]], [[id<MTLDevice> device; device.registryID;]])], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_MTLDEVICE_REGISTRYID, 1, [Define if MTLDevice protocol has registryID property.])], + [AC_MSG_RESULT(no)]) + AC_LANG_POP([Objective C]) UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/" AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib") diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index bfa7e2fe8cc..2525c894d09 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -23,9 +23,7 @@ #define GL_SILENCE_DEPRECATION #import <Carbon/Carbon.h> #import <CoreVideo/CoreVideo.h> -#ifdef HAVE_METAL_METAL_H #import <Metal/Metal.h> -#endif #import <QuartzCore/QuartzCore.h> #import "cocoa_window.h" @@ -339,7 +337,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @end -#ifdef HAVE_METAL_METAL_H @interface WineMetalView : WineBaseView { id<MTLDevice> _device; @@ -348,7 +345,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (id) initWithFrame:(NSRect)frame device:(id<MTLDevice>)device; @end -#endif @interface WineContentView : WineBaseView <NSTextInputClient, NSViewLayerContentScaleDelegate> @@ -366,9 +362,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi BOOL _retinaMode; int backingSize[2]; -#ifdef HAVE_METAL_METAL_H WineMetalView *_metalView; -#endif } @property (readonly, nonatomic) BOOL everHadGLContext; @@ -380,9 +374,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) wine_getBackingSize:(int*)outBackingSize; - (void) wine_setBackingSize:(const int*)newBackingSize; -#ifdef HAVE_METAL_METAL_H - (WineMetalView*) newMetalViewWithDevice:(id<MTLDevice>)device; -#endif @end @@ -657,7 +649,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } } -#ifdef HAVE_METAL_METAL_H - (WineMetalView*) newMetalViewWithDevice:(id<MTLDevice>)device { if (_metalView) return _metalView; @@ -672,7 +663,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return _metalView; } -#endif - (void) setRetinaMode:(int)mode { @@ -754,10 +744,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if (!view->_cachedHasGLDescendantValid || view->_cachedHasGLDescendant) [self invalidateHasGLDescendant]; } -#ifdef HAVE_METAL_METAL_H if (subview == _metalView) _metalView = nil; -#endif [super willRemoveSubview:subview]; } @@ -904,7 +892,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @end -#ifdef HAVE_METAL_METAL_H @implementation WineMetalView - (id) initWithFrame:(NSRect)frame device:(id<MTLDevice>)device @@ -948,7 +935,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } @end -#endif @implementation WineWindow @@ -3797,7 +3783,6 @@ void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) [pool release]; } -#ifdef HAVE_METAL_METAL_H macdrv_metal_device macdrv_create_metal_device(void) { macdrv_metal_device ret; @@ -3853,7 +3838,6 @@ void macdrv_view_release_metal_view(macdrv_metal_view v) [view release]; }); } -#endif int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]) { diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 27b130ca32e..6196032c08d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -137,11 +137,9 @@ typedef struct macdrv_opaque_window* macdrv_window; typedef struct macdrv_opaque_event_queue* macdrv_event_queue; typedef struct macdrv_opaque_view* macdrv_view; typedef struct macdrv_opaque_opengl_context* macdrv_opengl_context; -#ifdef HAVE_METAL_METAL_H typedef struct macdrv_opaque_metal_device* macdrv_metal_device; typedef struct macdrv_opaque_metal_view* macdrv_metal_view; typedef struct macdrv_opaque_metal_layer* macdrv_metal_layer; -#endif typedef struct macdrv_opaque_status_item* macdrv_status_item; struct macdrv_event; struct macdrv_query; @@ -589,13 +587,11 @@ extern void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_windo extern void macdrv_set_view_hidden(macdrv_view v, int hidden) DECLSPEC_HIDDEN; extern void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; -#ifdef HAVE_METAL_METAL_H extern macdrv_metal_device macdrv_create_metal_device(void) DECLSPEC_HIDDEN; extern void macdrv_release_metal_device(macdrv_metal_device d) DECLSPEC_HIDDEN; extern macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_device d) DECLSPEC_HIDDEN; extern macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) DECLSPEC_HIDDEN; extern void macdrv_view_release_metal_view(macdrv_metal_view v) DECLSPEC_HIDDEN; -#endif extern int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]) DECLSPEC_HIDDEN; extern void macdrv_set_view_backing_size(macdrv_view v, const int backing_size[2]) DECLSPEC_HIDDEN; extern uint32_t macdrv_window_background_color(void) DECLSPEC_HIDDEN; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1649
From: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 6 +----- dlls/crypt32/unixlib.c | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index cff8fba397a..836dd393517 100644 --- a/configure.ac +++ b/configure.ac @@ -409,7 +409,6 @@ AC_CHECK_HEADERS(\ CL/cl.h \ EGL/egl.h \ OpenCL/opencl.h \ - Security/Security.h \ SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ SystemConfiguration/SCNetworkConfiguration.h \ arpa/inet.h \ @@ -682,6 +681,7 @@ case $host_os in AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices") AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") AC_SUBST(APPKIT_LIBS,"-framework AppKit") + AC_SUBST(SECURITY_LIBS,"-framework Security -framework CoreFoundation") AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration") WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" @@ -706,10 +706,6 @@ case $host_os in WINE_WARNING([can't build Wine preloader; many programs won't work]) fi - if test "$ac_cv_header_Security_Security_h" = "yes" - then - AC_SUBST(SECURITY_LIBS,"-framework Security -framework CoreFoundation") - fi if test "x$with_coreaudio" != "xno"; then AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index 9a36d12f293..e90642fb0d5 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -29,7 +29,7 @@ #include <unistd.h> #include <dlfcn.h> #include <sys/stat.h> -#ifdef HAVE_SECURITY_SECURITY_H +#ifdef __APPLE__ #include <Security/Security.h> #endif #ifdef SONAME_LIBGNUTLS @@ -625,7 +625,7 @@ static void load_root_certs(void) { unsigned int i; -#ifdef HAVE_SECURITY_SECURITY_H +#ifdef __APPLE__ const SecTrustSettingsDomain domains[] = { kSecTrustSettingsDomainSystem, kSecTrustSettingsDomainAdmin, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1649
From: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 2 -- dlls/mountmgr.sys/dbus.c | 2 +- dlls/mountmgr.sys/diskarb.c | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 836dd393517..b0988819b85 100644 --- a/configure.ac +++ b/configure.ac @@ -409,8 +409,6 @@ AC_CHECK_HEADERS(\ CL/cl.h \ EGL/egl.h \ OpenCL/opencl.h \ - SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ - SystemConfiguration/SCNetworkConfiguration.h \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index cc115751a19..6fe6984c218 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -573,7 +573,7 @@ found: while (p_dbus_connection_read_write_dispatch( connection, -1 )) /* nothing */ ; } -#if !defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) || !defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) +#if !defined(__APPLE__) /* The udisks dispatch loop will block all threads using the same connection, so we'll use a private connection. Multiple threads can make methods calls at the same time diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 18d4b65a625..4817cfc61d6 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -33,8 +33,6 @@ #include <sys/ioctl.h> #ifdef __APPLE__ #include <DiskArbitration/DiskArbitration.h> -#endif -#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) #include <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> #include <SystemConfiguration/SCNetworkConfiguration.h> #endif @@ -227,7 +225,7 @@ void run_diskarbitration_loop(void) #endif /* __APPLE__ */ -#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) +#if defined(__APPLE__) static UInt8 map_option( unsigned int option ) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1649
From: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/macdrv_main.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 2350ec61b21..39bd66f3211 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -37,13 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv); -#ifndef kIOPMAssertionTypePreventUserIdleDisplaySleep -#define kIOPMAssertionTypePreventUserIdleDisplaySleep CFSTR("PreventUserIdleDisplaySleep") -#endif -#ifndef kCFCoreFoundationVersionNumber10_7 -#define kCFCoreFoundationVersionNumber10_7 635.00 -#endif - #define IS_OPTION_TRUE(ch) \ ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') @@ -593,13 +586,7 @@ BOOL macdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, } else if (powerAssertion == kIOPMNullAssertionID) { - CFStringRef assertName; - /*Are we running Lion or later?*/ - if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber10_7) - assertName = kIOPMAssertionTypePreventUserIdleDisplaySleep; - else - assertName = kIOPMAssertionTypeNoDisplaySleep; - IOPMAssertionCreateWithName( assertName, kIOPMAssertionLevelOn, + IOPMAssertionCreateWithName( kIOPMAssertionTypePreventUserIdleDisplaySleep, kIOPMAssertionLevelOn, CFSTR("Wine Process requesting no screen saver"), &powerAssertion); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1649
participants (2)
-
Brendan Shanks -
Brendan Shanks (＠bshanks)