December 2022 - Wine-commits

Zebediah Figura : ntdll: Trace the name of critical sections which are released while not acquired.
by Alexandre Julliard 02 Dec '22

02 Dec '22

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: Always enable Mac driver on macOS.
by Alexandre Julliard 02 Dec '22

02 Dec '22

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

Brendan Shanks : configure: Remove ApplicationServices.framework check (always present on macOS).
by Alexandre Julliard 02 Dec '22

02 Dec '22

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 02 Dec '22

02 Dec '22

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

Brendan Shanks : configure: Remove CoreAudio.h check (always present on macOS).
by Alexandre Julliard 02 Dec '22

02 Dec '22

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

Rémi Bernon : inetcomm: Allocate PROPVARIANT memory with CoTaskMemAlloc.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 3c2ab50b09aa0dbbc657043c26a6f373a24d5ebd URL: https://gitlab.winehq.org/wine/wine/-/commit/3c2ab50b09aa0dbbc657043c26a6f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 01:30:13 2022 +0100 inetcomm: Allocate PROPVARIANT memory with CoTaskMemAlloc. --- dlls/inetcomm/mimeole.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index ceacf5ded42..232e09aa075 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1089,7 +1089,8 @@ static HRESULT WINAPI MimeBody_GetProp( { PropVariantClear(pValue); pValue->vt = VT_LPSTR; - pValue->pszVal = strdup(This->content_pri_type); + pValue->pszVal = CoTaskMemAlloc(strlen(This->content_pri_type) + 1); + strcpy(pValue->pszVal, This->content_pri_type); return S_OK; }

1 0

Rémi Bernon : advapi32/tests: Only free GetSecurityInfo pointer on success.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 0204e6e33a05f80fe4d19b71a9c6d8fba9acf3fb URL: https://gitlab.winehq.org/wine/wine/-/commit/0204e6e33a05f80fe4d19b71a9c6d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 01:25:29 2022 +0100 advapi32/tests: Only free GetSecurityInfo pointer on success. --- dlls/advapi32/tests/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 51bf60d0f36..8b4a868ee11 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8083,7 +8083,7 @@ static void test_pseudo_handle_security(void) "key %p: got error %u\n", keys[i], ret); else ok(!ret, "key %p: got error %u\n", keys[i], ret); - LocalFree(sd_ptr); + if (!ret) LocalFree(sd_ptr); ret = GetSecurityInfo(keys[i], SE_KERNEL_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr);

1 0

Rémi Bernon : kernel32/tests: Avoid releasing invalid path pointer.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 54b37a37027828864882e89ab4655c27f05f72cb URL: https://gitlab.winehq.org/wine/wine/-/commit/54b37a37027828864882e89ab4655c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 01:32:03 2022 +0100 kernel32/tests: Avoid releasing invalid path pointer. --- dlls/kernel32/tests/path.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 3c57e81f4c6..2c657e26b24 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2653,7 +2653,6 @@ static void test_LdrGetDllPath(void) ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); ok( ret == STATUS_INVALID_PARAMETER, "got %lx expected %lx\n", ret, STATUS_INVALID_PARAMETER ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); - pRtlReleasePath( path ); lstrcpyW( buffer, dlldir ); p = buffer + lstrlenW(buffer);

1 0

Rémi Bernon : user32: Avoid freeing invalid pointers in WIN_CreateWindowEx.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 984969be5600244b443c59287457a5b78e811b77 URL: https://gitlab.winehq.org/wine/wine/-/commit/984969be5600244b443c59287457a5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 01:25:50 2022 +0100 user32: Avoid freeing invalid pointers in WIN_CreateWindowEx. --- dlls/user32/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a6f43c188c4..d8869b2b9db 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -278,7 +278,7 @@ static BOOL is_default_coord( int x ) */ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) { - UNICODE_STRING class, window_name; + UNICODE_STRING class, window_name = {0}; HWND hwnd, top_child = 0; MDICREATESTRUCTW mdi_cs; WNDCLASSEXW info; @@ -401,7 +401,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, cs->x, cs->y, cs->cx, cs->cy, cs->hwndParent, menu, module, cs->lpCreateParams, 0, NULL, 0, !unicode ); if (!hwnd && menu && menu != cs->hMenu) NtUserDestroyMenu( menu ); - if (!unicode) RtlFreeUnicodeString( &window_name ); + if (!unicode && window_name.Buffer != name_buf) RtlFreeUnicodeString( &window_name ); return hwnd; }

1 0

Zebediah Figura : winspool: Define copy_file() only if CUPS is available.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: d69cdbf103ebdeb6a5377d2becffbebe568fc24f URL: https://gitlab.winehq.org/wine/wine/-/commit/d69cdbf103ebdeb6a5377d2becffbe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 1 23:29:29 2022 -0600 winspool: Define copy_file() only if CUPS is available. Avoid unused function warnings. --- dlls/winspool.drv/cups.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 6d2d9fa1c8e..ccb64325e7b 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -161,29 +161,6 @@ static NTSTATUS process_attach( void *args ) #endif /* SONAME_LIBCUPS */ } -static BOOL copy_file( const char *src, const char *dst ) -{ - int fds[2] = { -1, -1 }, num; - char buf[1024]; - BOOL ret = FALSE; - - fds[0] = open( src, O_RDONLY ); - fds[1] = open( dst, O_CREAT | O_TRUNC | O_WRONLY, 0666 ); - if (fds[0] == -1 || fds[1] == -1) goto fail; - - while ((num = read( fds[0], buf, sizeof(buf) )) != 0) - { - if (num == -1) goto fail; - if (write( fds[1], buf, num ) != num) goto fail; - } - ret = TRUE; - -fail: - if (fds[1] != -1) close( fds[1] ); - if (fds[0] != -1) close( fds[0] ); - return ret; -} - static char *get_unix_file_name( LPCWSTR path ) { UNICODE_STRING nt_name; @@ -246,6 +223,29 @@ static BOOL cups_is_scanner( cups_dest_t *dest ) return cups_get_printer_type( dest ) & 0x2000000 /* CUPS_PRINTER_SCANNER */; } +static BOOL copy_file( const char *src, const char *dst ) +{ + int fds[2] = { -1, -1 }, num; + char buf[1024]; + BOOL ret = FALSE; + + fds[0] = open( src, O_RDONLY ); + fds[1] = open( dst, O_CREAT | O_TRUNC | O_WRONLY, 0666 ); + if (fds[0] == -1 || fds[1] == -1) goto fail; + + while ((num = read( fds[0], buf, sizeof(buf) )) != 0) + { + if (num == -1) goto fail; + if (write( fds[1], buf, num ) != num) goto fail; + } + ret = TRUE; + +fail: + if (fds[1] != -1) close( fds[1] ); + if (fds[0] != -1) close( fds[0] ); + return ret; +} + static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, time_t *modtime, char *buffer, size_t bufsize ) {

1 0