December 2022 - Wine-Commits

Alex Henrie : include: Annotate ber_(alloc_t|bvdup|init) with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 68852827a19aaf81cfef9a6abf691601ea30d52a URL: https://gitlab.winehq.org/wine/wine/-/commit/68852827a19aaf81cfef9a6abf6916… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 1 20:05:25 2022 -0700 include: Annotate ber_(alloc_t|bvdup|init) with __WINE_(DEALLOC|MALLOC). --- include/winber.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/winber.h b/include/winber.h index 65d9d50c789..83055fa8c72 100644 --- a/include/winber.h +++ b/include/winber.h @@ -26,14 +26,15 @@ typedef int ber_int_t; typedef unsigned int ber_tag_t; typedef unsigned int ber_len_t; -BerElement * CDECL ber_alloc_t( int ); -BERVAL * CDECL ber_bvdup( BERVAL * ); -void CDECL ber_bvecfree( BERVAL ** ); +void CDECL ber_free( BerElement *, int ); void CDECL ber_bvfree( BERVAL * ); + +BerElement * CDECL ber_alloc_t( int ) __WINE_DEALLOC(ber_free) __WINE_MALLOC; +BERVAL * CDECL ber_bvdup( BERVAL * ) __WINE_DEALLOC(ber_bvfree) __WINE_MALLOC; +void CDECL ber_bvecfree( BERVAL ** ); ULONG CDECL ber_first_element( BerElement *, ULONG *, char ** ); int CDECL ber_flatten( BerElement *, BERVAL ** ); -void CDECL ber_free( BerElement *, int ); -BerElement * CDECL ber_init( BERVAL * ); +BerElement * CDECL ber_init( BERVAL * ) __WINE_DEALLOC(ber_free) __WINE_MALLOC; ULONG CDECL ber_next_element( BerElement *, ULONG *, char * ); ULONG CDECL ber_peek_tag( BerElement *, ULONG * ); int WINAPIV ber_printf( BerElement *, char *, ... );

1 0

Alexandre Julliard : setupapi: Fix wildcard matching for fakedlls inside the build dir.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 6a4e0d60fa8a5e955dda7a536da6cade05cf79c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a4e0d60fa8a5e955dda7a536da6ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 2 10:36:03 2022 +0100 setupapi: Fix wildcard matching for fakedlls inside the build dir. To avoid *.sys matching windows.system.profile.systemmanufacturers.dll. --- dlls/setupapi/fakedll.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 6a5a566278b..7f4d7367285 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -989,6 +989,8 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard, lstrcatW( name, data.name ); if (wcschr( data.name, '.' ) && install_fake_dll( dest, file, delete, &delay_copy )) continue; + if (wcschr( wildcard, '.' )) /* don't append default if wildcard has an explicit extension */ + continue; lstrcatW( name, default_ext ); } install_fake_dll( dest, file, delete, &delay_copy );

1 0

Alexandre Julliard : ntdll: Only build the wow64 function table on 64-bit.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 3242676e2e15e0210552e4f8d58917d2500d5be4 URL: https://gitlab.winehq.org/wine/wine/-/commit/3242676e2e15e0210552e4f8d58917… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 2 11:31:13 2022 +0100 ntdll: Only build the wow64 function table on 64-bit. --- dlls/ntdll/unix/loader.c | 3 +++ dlls/ntdll/unix/virtual.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0a445966cc0..7243be49489 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2136,6 +2136,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = }; +#ifdef _WIN64 + static NTSTATUS wow64_load_so_dll( void *args ) { return STATUS_INVALID_IMAGE_FORMAT; } static NTSTATUS wow64_init_builtin_dll( void *args ) { return STATUS_UNSUCCESSFUL; } static NTSTATUS wow64_unwind_builtin_dll( void *args ) { return STATUS_UNSUCCESSFUL; } @@ -2151,6 +2153,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = system_time_precise, }; +#endif /* _WIN64 */ /*********************************************************************** * start_main_thread diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 17ab6ae9622..2a00ac52811 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -647,7 +647,11 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun if (module == ntdll_module) { +#ifdef _WIN64 *funcs = wow ? __wine_unix_call_wow64_funcs : __wine_unix_call_funcs; +#else + *funcs = __wine_unix_call_funcs; +#endif return STATUS_SUCCESS; } @@ -657,7 +661,11 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun if (builtin->module != module) continue; if (builtin->unix_path && (p = strrchr( builtin->unix_path, '/' )) && !strcmp( p, "/ntdll.so" )) { +#ifdef _WIN64 *funcs = wow ? __wine_unix_call_wow64_funcs : __wine_unix_call_funcs; +#else + *funcs = __wine_unix_call_funcs; +#endif status = STATUS_SUCCESS; break; }

1 0

Brendan Shanks : winemac: Remove pre-Mac OS X 10.7 workaround.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 5f062fcf9971003d839215adc81c3bbefbe5b914 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f062fcf9971003d839215adc81c3b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Dec 1 20:18:44 2022 -0800 winemac: Remove pre-Mac OS X 10.7 workaround. --- 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); }

1 0

Alexandre Julliard : ntdll: Use ret instead of jmp to return from syscall dispatchers.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 0aae4b05633cb9b38eb37cc662f5a3aadb3ce108 URL: https://gitlab.winehq.org/wine/wine/-/commit/0aae4b05633cb9b38eb37cc662f5a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 2 14:51:54 2022 +0100 ntdll: Use ret instead of jmp to return from syscall dispatchers. --- dlls/ntdll/unix/signal_i386.c | 8 ++++++-- dlls/ntdll/unix/signal_x86_64.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6aa5219f963..d665e281176 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2669,7 +2669,9 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_register %eip, %ecx\n\t") "movl 0x0c(%esp),%esp\n\t" /* frame->esp */ __ASM_CFI(".cfi_same_value %esp\n\t") - "jmpl *%ecx\n" + "pushl %ecx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "ret\n" __ASM_CFI("\t.cfi_restore_state\n") "1:\ttestl $0x2 << 16,%ecx\n\t" /* CONTEXT_INTEGER */ "jz 1f\n\t" @@ -2770,7 +2772,9 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI(".cfi_register %eip, %ecx\n\t") "movl 0x0c(%esp),%esp\n\t" /* frame->esp */ __ASM_CFI(".cfi_same_value %esp\n\t") - "jmpl *%ecx" ) + "pushl %ecx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "ret" ) /*********************************************************************** diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 460f81545a3..fa8660ca914 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2798,7 +2798,9 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_same_value rsp\n\t") "movq 0x70(%rcx),%rcx\n\t" /* frame->rip */ __ASM_CFI(".cfi_register rip, rcx\n\t") - "jmpq *%rcx\n\t" + "pushq %rcx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + "ret\n\t" /* $rcx is now pointing to "frame" again */ __ASM_CFI(".cfi_restore_state\n\t") /* remember state when $rcx is pointing to "frame" */ @@ -2938,7 +2940,9 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "movq 0x88(%rcx),%rsp\n\t" __ASM_CFI(".cfi_def_cfa rsp, 0\n\t") __ASM_CFI(".cfi_same_value rsp\n\t") - "jmpq *0x70(%rcx)" ) /* frame->rip */ + "pushq 0x70(%rcx)\n\t" /* frame->rip */ + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + "ret" ) /***********************************************************************

1 0

Alexandre Julliard : configure: Remove obsolete AL/al.h check.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 92520c6a1a85e0c09583675ef53a536632cdc7bf URL: https://gitlab.winehq.org/wine/wine/-/commit/92520c6a1a85e0c09583675ef53a53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 2 11:03:26 2022 +0100 configure: Remove obsolete AL/al.h check. --- configure | 6 ------ configure.ac | 1 - include/config.h.in | 3 --- 3 files changed, 10 deletions(-) diff --git a/configure b/configure index 85a28e59928..0067b7f008c 100755 --- a/configure +++ b/configure @@ -7804,12 +7804,6 @@ then : printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "AL/al.h" "ac_cv_header_AL_al_h" "$ac_includes_default" -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" "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 b0988819b85..d40c6f600af 100644 --- a/configure.ac +++ b/configure.ac @@ -405,7 +405,6 @@ dnl **** Check for header files **** AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ - AL/al.h \ CL/cl.h \ EGL/egl.h \ OpenCL/opencl.h \ diff --git a/include/config.h.in b/include/config.h.in index 781afd13066..cf9c65c3fdc 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -6,9 +6,6 @@ /* Define to the file extension for executables. */ #undef EXEEXT -/* Define to 1 if you have the <AL/al.h> header file. */ -#undef HAVE_AL_AL_H - /* Define to 1 if you have the <arpa/inet.h> header file. */ #undef HAVE_ARPA_INET_H

1 0

Brendan Shanks : configure: Remove check for the HID Manager (always present on macOS).
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: ab8103e0e326b278370389cb02c6dd76ec6732f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab8103e0e326b278370389cb02c6dd… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 22 13:37:22 2022 -0800 configure: Remove check for the HID Manager (always present on macOS). --- configure | 19 ------------------- configure.ac | 8 -------- dlls/winebus.sys/bus_iohid.c | 8 ++++---- include/config.h.in | 6 ------ 4 files changed, 4 insertions(+), 37 deletions(-) diff --git a/configure b/configure index 4de5e53629d..d2e785eb542 100755 --- a/configure +++ b/configure @@ -7861,12 +7861,6 @@ if test "x$ac_cv_header_IOKit_IOKitLib_h" = xyes then : printf "%s\n" "#define HAVE_IOKIT_IOKITLIB_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "IOKit/hid/IOHIDLib.h" "ac_cv_header_IOKit_hid_IOHIDLib_h" "$ac_includes_default" -if test "x$ac_cv_header_IOKit_hid_IOHIDLib_h" = xyes -then : - printf "%s\n" "#define HAVE_IOKIT_HID_IOHIDLIB_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "OpenCL/opencl.h" "ac_cv_header_OpenCL_opencl_h" "$ac_includes_default" if test "x$ac_cv_header_OpenCL_opencl_h" = xyes @@ -9946,19 +9940,6 @@ fi 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_fn_c_check_func "$LINENO" "IOHIDManagerCreate" "ac_cv_func_IOHIDManagerCreate" -if test "x$ac_cv_func_IOHIDManagerCreate" = xyes -then : - printf "%s\n" "#define HAVE_IOHIDMANAGERCREATE 1" >>confdefs.h - -fi - - LIBS="$ac_save_LIBS" - fi if test "$ac_cv_header_Metal_Metal_h" = "yes" then 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__ */ diff --git a/include/config.h.in b/include/config.h.in index 3c42a13525e..ed55ed7ad78 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -111,12 +111,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `IOHIDManagerCreate' function. */ -#undef HAVE_IOHIDMANAGERCREATE - -/* Define to 1 if you have the <IOKit/hid/IOHIDLib.h> header file. */ -#undef HAVE_IOKIT_HID_IOHIDLIB_H - /* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */ #undef HAVE_IOKIT_IOKITLIB_H

1 0

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

Dec. 2, 2022

Module: wine Branch: master Commit: c39e229163b1f18f406d64fdc793b410216a485c URL: https://gitlab.winehq.org/wine/wine/-/commit/c39e229163b1f18f406d64fdc793b4… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 22 13:48:10 2022 -0800 configure: Remove Security.framework check (always present on macOS). --- configure | 17 ++++------------- configure.ac | 6 +----- dlls/crypt32/unixlib.c | 4 ++-- include/config.h.in | 3 --- 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/configure b/configure index 743940a343b..1a8af17a627 100755 --- a/configure +++ b/configure @@ -746,8 +746,8 @@ OBJCFLAGS OBJC OPENCL_LIBS COREAUDIO_LIBS -SECURITY_LIBS SYSTEMCONFIGURATION_LIBS +SECURITY_LIBS APPKIT_LIBS CORESERVICES_LIBS APPLICATIONSERVICES_LIBS @@ -7828,12 +7828,6 @@ if test "x$ac_cv_header_OpenCL_opencl_h" = xyes then : printf "%s\n" "#define HAVE_OPENCL_OPENCL_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "Security/Security.h" "ac_cv_header_Security_Security_h" "$ac_includes_default" -if test "x$ac_cv_header_Security_Security_h" = xyes -then : - printf "%s\n" "#define HAVE_SECURITY_SECURITY_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h" "ac_cv_header_SystemConfiguration_SCDynamicStoreCopyDHCPInfo_h" "$ac_includes_default" if test "x$ac_cv_header_SystemConfiguration_SCDynamicStoreCopyDHCPInfo_h" = xyes @@ -9466,6 +9460,8 @@ fi ;; APPKIT_LIBS="-framework AppKit" + SECURITY_LIBS="-framework Security -framework CoreFoundation" + SYSTEMCONFIGURATION_LIBS="-framework SystemConfiguration" @@ -9597,11 +9593,6 @@ fi as_fn_append wine_warnings "|can't build Wine preloader; many programs won't work" fi - if test "$ac_cv_header_Security_Security_h" = "yes" - then - SECURITY_LIBS="-framework Security -framework CoreFoundation" - - fi if test "x$with_coreaudio" != "xno"; then COREAUDIO_LIBS="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI" @@ -23160,8 +23151,8 @@ METAL_LIBS = $METAL_LIBS APPLICATIONSERVICES_LIBS = $APPLICATIONSERVICES_LIBS CORESERVICES_LIBS = $CORESERVICES_LIBS APPKIT_LIBS = $APPKIT_LIBS -SYSTEMCONFIGURATION_LIBS = $SYSTEMCONFIGURATION_LIBS SECURITY_LIBS = $SECURITY_LIBS +SYSTEMCONFIGURATION_LIBS = $SYSTEMCONFIGURATION_LIBS COREAUDIO_LIBS = $COREAUDIO_LIBS OPENCL_LIBS = $OPENCL_LIBS OBJC = $OBJC 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, diff --git a/include/config.h.in b/include/config.h.in index 35f0cf84463..146d0b7075c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -366,9 +366,6 @@ /* Define to 1 if you have the <SDL.h> header file. */ #undef HAVE_SDL_H -/* Define to 1 if you have the <Security/Security.h> header file. */ -#undef HAVE_SECURITY_SECURITY_H - /* Define to 1 if you have the `setproctitle' function. */ #undef HAVE_SETPROCTITLE

1 0

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

Dec. 2, 2022

Module: wine Branch: master Commit: 9207927d950ce8ab41a6d8c25cfa593ce770d5cf URL: https://gitlab.winehq.org/wine/wine/-/commit/9207927d950ce8ab41a6d8c25cfa59… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Dec 1 10:10:18 2022 -0800 configure: Remove SystemConfiguration header check (always present on macOS). --- configure | 12 ------------ configure.ac | 2 -- dlls/mountmgr.sys/dbus.c | 2 +- dlls/mountmgr.sys/diskarb.c | 4 +--- include/config.h.in | 8 -------- 5 files changed, 2 insertions(+), 26 deletions(-) diff --git a/configure b/configure index 1a8af17a627..85a28e59928 100755 --- a/configure +++ b/configure @@ -7828,18 +7828,6 @@ if test "x$ac_cv_header_OpenCL_opencl_h" = xyes then : printf "%s\n" "#define HAVE_OPENCL_OPENCL_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h" "ac_cv_header_SystemConfiguration_SCDynamicStoreCopyDHCPInfo_h" "$ac_includes_default" -if test "x$ac_cv_header_SystemConfiguration_SCDynamicStoreCopyDHCPInfo_h" = xyes -then : - printf "%s\n" "#define HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "SystemConfiguration/SCNetworkConfiguration.h" "ac_cv_header_SystemConfiguration_SCNetworkConfiguration_h" "$ac_includes_default" -if test "x$ac_cv_header_SystemConfiguration_SCNetworkConfiguration_h" = xyes -then : - printf "%s\n" "#define HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" if test "x$ac_cv_header_arpa_inet_h" = xyes 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 ) { diff --git a/include/config.h.in b/include/config.h.in index 146d0b7075c..781afd13066 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -501,14 +501,6 @@ /* Define to 1 if you have the `sysinfo' function. */ #undef HAVE_SYSINFO -/* Define to 1 if you have the - <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> header file. */ -#undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H - -/* Define to 1 if you have the <SystemConfiguration/SCNetworkConfiguration.h> - header file. */ -#undef HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H - /* Define to 1 if you have the <sys/attr.h> header file. */ #undef HAVE_SYS_ATTR_H

1 0

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

Dec. 2, 2022

Module: wine Branch: master Commit: 9645beb5c07685c521fa5718814ab2b13cf52f5b URL: https://gitlab.winehq.org/wine/wine/-/commit/9645beb5c07685c521fa5718814ab2… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 22 14:02:40 2022 -0800 configure: Remove check for IOKit (always present on macOS). --- configure | 6 ------ configure.ac | 1 - dlls/ntdll/unix/cdrom.c | 2 +- dlls/ntdll/unix/system.c | 6 ++---- include/config.h.in | 3 --- 5 files changed, 3 insertions(+), 15 deletions(-) diff --git a/configure b/configure index d2e785eb542..e09b930d702 100755 --- a/configure +++ b/configure @@ -7855,12 +7855,6 @@ if test "x$ac_cv_header_EGL_egl_h" = xyes then : printf "%s\n" "#define HAVE_EGL_EGL_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "IOKit/IOKitLib.h" "ac_cv_header_IOKit_IOKitLib_h" "$ac_includes_default" -if test "x$ac_cv_header_IOKit_IOKitLib_h" = xyes -then : - printf "%s\n" "#define HAVE_IOKIT_IOKITLIB_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "OpenCL/opencl.h" "ac_cv_header_OpenCL_opencl_h" "$ac_includes_default" if test "x$ac_cv_header_OpenCL_opencl_h" = xyes 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 ) { diff --git a/include/config.h.in b/include/config.h.in index ed55ed7ad78..e80ede4260f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -111,9 +111,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */ -#undef HAVE_IOKIT_IOKITLIB_H - /* Define to 1 if you have the `kqueue' function. */ #undef HAVE_KQUEUE

1 0