December 2021 - Wine-Commits

Ivo Ivanov : dinput: Check cbTypeSpecificParams before lpvTypeSpecificParams.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 5ce61fc04f2c274e3cccf12cccfe0757c9927383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ce61fc04f2c274e3cccf12c… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Dec 3 14:08:48 2021 +0100 dinput: Check cbTypeSpecificParams before lpvTypeSpecificParams. And return DIERR_MOREDATA the provided buffer is too short. Fixes the WheelCheck application not showing type specific params for Constant and Periodic effects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 86bb31737ab..56ef9ef6ce2 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2419,28 +2419,34 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa case PID_USAGE_ET_TRIANGLE: case PID_USAGE_ET_SAWTOOTH_UP: case PID_USAGE_ET_SAWTOOTH_DOWN: + capacity = params->cbTypeSpecificParams; + params->cbTypeSpecificParams = sizeof(DIPERIODIC); + if (capacity < sizeof(DIPERIODIC)) return DIERR_MOREDATA; if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != sizeof(DIPERIODIC)) return DIERR_INVALIDPARAM; memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DIPERIODIC) ); break; case PID_USAGE_ET_SPRING: case PID_USAGE_ET_DAMPER: case PID_USAGE_ET_INERTIA: case PID_USAGE_ET_FRICTION: - count = impl->params.cbTypeSpecificParams; capacity = params->cbTypeSpecificParams; - params->cbTypeSpecificParams = count; - if (capacity < count) return DIERR_MOREDATA; + params->cbTypeSpecificParams = impl->params.cbTypeSpecificParams; + if (capacity < impl->params.cbTypeSpecificParams) return DIERR_MOREDATA; + if (!params->lpvTypeSpecificParams) return E_POINTER; memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, params->cbTypeSpecificParams ); break; case PID_USAGE_ET_CONSTANT_FORCE: + capacity = params->cbTypeSpecificParams; + params->cbTypeSpecificParams = sizeof(DICONSTANTFORCE); + if (capacity < sizeof(DICONSTANTFORCE)) return DIERR_MOREDATA; if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) return DIERR_INVALIDPARAM; memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DICONSTANTFORCE) ); break; case PID_USAGE_ET_RAMP: + capacity = params->cbTypeSpecificParams; + params->cbTypeSpecificParams = sizeof(DIRAMPFORCE); + if (capacity < sizeof(DIRAMPFORCE)) return DIERR_MOREDATA; if (!params->lpvTypeSpecificParams) return E_POINTER; - if (params->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) return DIERR_INVALIDPARAM; memcpy( params->lpvTypeSpecificParams, impl->params.lpvTypeSpecificParams, sizeof(DIRAMPFORCE) ); break; case PID_USAGE_ET_CUSTOM_FORCE_DATA:

1 0

Jacek Caban : win32u: Move NtUserGetKeyboardLayoutName implementation from user32.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 72e3c91380efdbdd402dcd709ecb7cafd2ccc860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72e3c91380efdbdd402dcd70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 3 12:56:05 2021 +0100 win32u: Move NtUserGetKeyboardLayoutName implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 76 +-------------------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/user32/user_private.h | 1 - dlls/win32u/font.c | 2 +- dlls/win32u/input.c | 85 ++++++++++++++++++++++++++++++++++++++------ dlls/win32u/syscall.c | 2 ++ dlls/win32u/sysparams.c | 21 +++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 ++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 ++++ include/ntuser.h | 1 + 13 files changed, 114 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72e3c91380efdbdd402d…

1 0

Alexandre Julliard : rpcrt4/tests: Use the correct scanf format for a handle.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 8e0b337df1fe64b4a0d27e9cded611faff61c29d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e0b337df1fe64b4a0d27e9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 16:29:00 2021 +0100 rpcrt4/tests: Use the correct scanf format for a handle. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 7b340a11f87..3f34aac681d 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -2561,9 +2561,9 @@ START_TEST(server) } else if(!strcmp(argv[2], "run")) { - UINT_PTR event; - sscanf(argv[3], "%lx", &event); - run_server((HANDLE)event); + ULONG event; + sscanf(argv[3], "%x", &event); + run_server(ULongToHandle(event)); } } else

1 0

Huw Davies : winealsa: Don't acquire the sessions lock after the client lock.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 1acba9d959377074110cc05a74e47f9af3f5005d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1acba9d959377074110cc05a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 2 12:02:38 2021 +0000 winealsa: Don't acquire the sessions lock after the client lock. This could lead to a deadlock with AudioSessionControl_GetState() which acquires the locks in the other order. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 7f25cdcce1b..5aa1b4aab63 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1344,10 +1344,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } + EnterCriticalSection(&g_sessions_lock); EnterCriticalSection(&This->lock); if(This->initted){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; } @@ -1537,19 +1539,13 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->share = mode; This->flags = flags; - EnterCriticalSection(&g_sessions_lock); - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); - if(FAILED(hr)){ - LeaveCriticalSection(&g_sessions_lock); + if(FAILED(hr)) goto exit; - } list_add_tail(&This->session->clients, &This->entry); - LeaveCriticalSection(&g_sessions_lock); - This->initted = TRUE; TRACE("ALSA period: %lu frames\n", This->alsa_period_frames); @@ -1569,6 +1565,7 @@ exit: } LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return hr; }

1 0

Huw Davies : wineoss: Don't acquire the sessions lock after the client lock.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 7b426971245bea1c8884bca7c34f53ba8cf9c0e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b426971245bea1c8884bca7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 2 12:02:39 2021 +0000 wineoss: Don't acquire the sessions lock after the client lock. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 19a59cd9ba1..b340db00c3c 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1085,22 +1085,26 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } + EnterCriticalSection(&g_sessions_lock); EnterCriticalSection(&This->lock); if(This->initted){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; } hr = setup_oss_device(mode, This->fd, fmt, NULL); if(FAILED(hr)){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return hr; } This->fmt = clone_format(fmt); if(!This->fmt){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -1116,6 +1120,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->fmt); This->fmt = NULL; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -1124,6 +1129,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->fmt); This->fmt = NULL; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -1134,27 +1140,24 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->flags = flags; This->oss_bufsize_bytes = 0; - EnterCriticalSection(&g_sessions_lock); - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); if(FAILED(hr)){ - LeaveCriticalSection(&g_sessions_lock); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; CoTaskMemFree(This->fmt); This->fmt = NULL; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return hr; } list_add_tail(&This->session->clients, &This->entry); - LeaveCriticalSection(&g_sessions_lock); - This->initted = TRUE; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; }

1 0

Zebediah Figura : configure: Try to detect MinGW libxml2 using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: be8dd96d6671fdac1acd48d4e883a73c619c1fdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8dd96d6671fdac1acd48d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 2 19:22:09 2021 -0600 configure: Try to detect MinGW libxml2 using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 16 +++++ 2 files changed, 207 insertions(+) diff --git a/configure b/configure index 4fc23fb058d..e40ac5d2c1c 100755 --- a/configure +++ b/configure @@ -13014,6 +13014,197 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|libtiff ${notice_platform}MinGW development files not found; using bundled version." fi + if ${XML2_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + XML2_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libxml-2.0 2>/dev/null` +fi +fi +if ${XML2_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + XML2_PE_LIBS=`$MINGW_PKG_CONFIG --libs libxml-2.0 2>/dev/null` +fi +fi +XML2_PE_LIBS=${XML2_PE_LIBS:-"-lxml2"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $XML2_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW libxml/parser.h" >&5 +printf %s "checking for MinGW libxml/parser.h... " >&6; } +if test ${ac_cv_mingw_header_libxml_parser_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libxml/parser.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_libxml_parser_h=yes +else $as_nop + ac_cv_mingw_header_libxml_parser_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_libxml_parser_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_libxml_parser_h" >&6; } +if test "x$ac_cv_mingw_header_libxml_parser_h" = xyes +then : + +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW libxml/xmlsave.h" >&5 +printf %s "checking for MinGW libxml/xmlsave.h... " >&6; } +if test ${ac_cv_mingw_header_libxml_xmlsave_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libxml/xmlsave.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_libxml_xmlsave_h=yes +else $as_nop + ac_cv_mingw_header_libxml_xmlsave_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_libxml_xmlsave_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_libxml_xmlsave_h" >&6; } +if test "x$ac_cv_mingw_header_libxml_xmlsave_h" = xyes +then : + +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW libxml/SAX2.h" >&5 +printf %s "checking for MinGW libxml/SAX2.h... " >&6; } +if test ${ac_cv_mingw_header_libxml_SAX2_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libxml/SAX2.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_libxml_SAX2_h=yes +else $as_nop + ac_cv_mingw_header_libxml_SAX2_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_libxml_SAX2_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_libxml_SAX2_h" >&6; } +if test "x$ac_cv_mingw_header_libxml_SAX2_h" = xyes +then : + +fi + if test "$ac_cv_mingw_header_libxml_parser_h" = "yes" -a "$ac_cv_mingw_header_libxml_xmlsave_h" = "yes" -a "$ac_cv_mingw_header_libxml_SAX2_h" = "yes" + then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xmlFirstElementChild in MinGW -lxml2" >&5 +printf %s "checking for xmlFirstElementChild in MinGW -lxml2... " >&6; } +if test ${ac_cv_mingw_lib_xml2+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lxml2 $XML2_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char xmlFirstElementChild (); +int +main (void) +{ +return xmlFirstElementChild (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_xml2=yes +else $as_nop + ac_cv_mingw_lib_xml2=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_xml2" >&5 +printf "%s\n" "$ac_cv_mingw_lib_xml2" >&6; } +if test "x$ac_cv_mingw_lib_xml2" = xyes +then : + : +else $as_nop + XML2_PE_CFLAGS=""; XML2_PE_LIBS="" +fi + else + XML2_PE_CFLAGS="" + XML2_PE_LIBS="" + fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$XML2_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libxml2 ${notice_platform}MinGW development files not found (or too old); using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index e935a5ae27e..818d380419b 100644 --- a/configure.ac +++ b/configure.ac @@ -1091,6 +1091,22 @@ then WINE_NOTICE([libtiff ${notice_platform}MinGW development files not found; using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(XML2,[libxml-2.0],[-lxml2], + [WINE_CHECK_MINGW_HEADER(libxml/parser.h) + WINE_CHECK_MINGW_HEADER(libxml/xmlsave.h) + WINE_CHECK_MINGW_HEADER(libxml/SAX2.h) + if test "$ac_cv_mingw_header_libxml_parser_h" = "yes" -a "$ac_cv_mingw_header_libxml_xmlsave_h" = "yes" -a "$ac_cv_mingw_header_libxml_SAX2_h" = "yes" + then + WINE_CHECK_MINGW_LIB(xml2,xmlFirstElementChild,[:],[XML2_PE_CFLAGS=""; XML2_PE_LIBS=""],[$XML2_PE_LIBS]) + else + XML2_PE_CFLAGS="" + XML2_PE_LIBS="" + fi]) + if test "x$XML2_PE_LIBS" = "x" + then + WINE_NOTICE([libxml2 ${notice_platform}MinGW development files not found (or too old); using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Zebediah Figura : configure: Try to detect MinGW libtiff using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 089dd8560b2518f7dfdda8ef5276d896589f3ab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=089dd8560b2518f7dfdda8ef… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 2 19:22:08 2021 -0600 configure: Try to detect MinGW libtiff using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 +++++ 2 files changed, 119 insertions(+) diff --git a/configure b/configure index ffde96cb40e..4fc23fb058d 100755 --- a/configure +++ b/configure @@ -12904,6 +12904,116 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|libpng ${notice_platform}MinGW development files not found; using bundled version." fi + if ${TIFF_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + TIFF_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libtiff-4 2>/dev/null` +fi +fi +if ${TIFF_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + TIFF_PE_LIBS=`$MINGW_PKG_CONFIG --libs libtiff-4 2>/dev/null` +fi +fi + +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $TIFF_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW tiffio.h" >&5 +printf %s "checking for MinGW tiffio.h... " >&6; } +if test ${ac_cv_mingw_header_tiffio_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <tiffio.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_tiffio_h=yes +else $as_nop + ac_cv_mingw_header_tiffio_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_tiffio_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_tiffio_h" >&6; } +if test "x$ac_cv_mingw_header_tiffio_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFClientOpen in MinGW -ltiff" >&5 +printf %s "checking for TIFFClientOpen in MinGW -ltiff... " >&6; } +if test ${ac_cv_mingw_lib_tiff+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-ltiff $TIFF_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char TIFFClientOpen (); +int +main (void) +{ +return TIFFClientOpen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_tiff=yes +else $as_nop + ac_cv_mingw_lib_tiff=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_tiff" >&5 +printf "%s\n" "$ac_cv_mingw_lib_tiff" >&6; } +if test "x$ac_cv_mingw_lib_tiff" = xyes +then : + : +else $as_nop + TIFF_PE_CFLAGS=""; TIFF_PE_LIBS="" +fi +else $as_nop + TIFF_PE_CFLAGS=""; TIFF_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$TIFF_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libtiff ${notice_platform}MinGW development files not found; using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index d6c57bd41ad..e935a5ae27e 100644 --- a/configure.ac +++ b/configure.ac @@ -1082,6 +1082,15 @@ then WINE_NOTICE([libpng ${notice_platform}MinGW development files not found; using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(TIFF,[libtiff-4],, + [WINE_CHECK_MINGW_HEADER(tiffio.h, + [WINE_CHECK_MINGW_LIB(tiff,TIFFClientOpen,[:],[TIFF_PE_CFLAGS=""; TIFF_PE_LIBS=""],[$TIFF_PE_LIBS])], + [TIFF_PE_CFLAGS=""; TIFF_PE_LIBS=""])]) + if test "x$TIFF_PE_LIBS" = "x" + then + WINE_NOTICE([libtiff ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Zebediah Figura : configure: Try to detect MinGW libxslt using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 9469711946552f1dcba95f47a020aff85f443523 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9469711946552f1dcba95f47… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 2 19:22:10 2021 -0600 configure: Try to detect MinGW libxslt using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 15 ++++++ 2 files changed, 168 insertions(+) diff --git a/configure b/configure index e40ac5d2c1c..c37268fddad 100755 --- a/configure +++ b/configure @@ -13205,6 +13205,159 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|libxml2 ${notice_platform}MinGW development files not found (or too old); using bundled version." fi + if ${XSLT_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + XSLT_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libxslt 2>/dev/null` +fi +fi +if ${XSLT_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + XSLT_PE_LIBS=`$MINGW_PKG_CONFIG --libs libxslt 2>/dev/null` +fi +fi +XSLT_PE_LIBS=${XSLT_PE_LIBS:-"-lxslt"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $XSLT_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW libxslt/pattern.h" >&5 +printf %s "checking for MinGW libxslt/pattern.h... " >&6; } +if test ${ac_cv_mingw_header_libxslt_pattern_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libxslt/pattern.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_libxslt_pattern_h=yes +else $as_nop + ac_cv_mingw_header_libxslt_pattern_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_libxslt_pattern_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_libxslt_pattern_h" >&6; } +if test "x$ac_cv_mingw_header_libxslt_pattern_h" = xyes +then : + +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW libxslt/transform.h" >&5 +printf %s "checking for MinGW libxslt/transform.h... " >&6; } +if test ${ac_cv_mingw_header_libxslt_transform_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libxslt/transform.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_libxslt_transform_h=yes +else $as_nop + ac_cv_mingw_header_libxslt_transform_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_libxslt_transform_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_libxslt_transform_h" >&6; } +if test "x$ac_cv_mingw_header_libxslt_transform_h" = xyes +then : + +fi + if test "$ac_cv_mingw_header_libxslt_pattern_h" = "yes" -a "$ac_cv_mingw_header_libxslt_transform_h" = "yes" + then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xsltCompilePattern in MinGW -lxslt" >&5 +printf %s "checking for xsltCompilePattern in MinGW -lxslt... " >&6; } +if test ${ac_cv_mingw_lib_xslt+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lxslt $XSLT_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char xsltCompilePattern (); +int +main (void) +{ +return xsltCompilePattern (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_xslt=yes +else $as_nop + ac_cv_mingw_lib_xslt=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_xslt" >&5 +printf "%s\n" "$ac_cv_mingw_lib_xslt" >&6; } +if test "x$ac_cv_mingw_lib_xslt" = xyes +then : + : +else $as_nop + XSLT_PE_CFLAGS=""; XSLT_PE_LIBS="" +fi + else + XSLT_PE_CFLAGS="" + XSLT_PE_LIBS="" + fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$XSLT_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libxslt ${notice_platform}MinGW development files not found; using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index 818d380419b..4fdb1ef33df 100644 --- a/configure.ac +++ b/configure.ac @@ -1107,6 +1107,21 @@ then WINE_NOTICE([libxml2 ${notice_platform}MinGW development files not found (or too old); using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(XSLT,[libxslt],[-lxslt], + [WINE_CHECK_MINGW_HEADER(libxslt/pattern.h) + WINE_CHECK_MINGW_HEADER(libxslt/transform.h) + if test "$ac_cv_mingw_header_libxslt_pattern_h" = "yes" -a "$ac_cv_mingw_header_libxslt_transform_h" = "yes" + then + WINE_CHECK_MINGW_LIB(xslt,xsltCompilePattern,[:],[XSLT_PE_CFLAGS=""; XSLT_PE_LIBS=""],[$XSLT_PE_LIBS]) + else + XSLT_PE_CFLAGS="" + XSLT_PE_LIBS="" + fi]) + if test "x$XSLT_PE_LIBS" = "x" + then + WINE_NOTICE([libxslt ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Zebediah Figura : configure: Try to detect MinGW libpng using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: aafddb16c3406ba22d7c0c898f36cfc7eacd45a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aafddb16c3406ba22d7c0c89… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 2 19:22:07 2021 -0600 configure: Try to detect MinGW libpng using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 +++++ 2 files changed, 119 insertions(+) diff --git a/configure b/configure index 5948756e7ae..ffde96cb40e 100755 --- a/configure +++ b/configure @@ -12794,6 +12794,116 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|libmpg123 ${notice_platform}MinGW development files not found (or too old); using bundled version." fi + if ${PNG_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + PNG_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libpng 2>/dev/null` +fi +fi +if ${PNG_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + PNG_PE_LIBS=`$MINGW_PKG_CONFIG --libs libpng 2>/dev/null` +fi +fi + +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $PNG_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW png.h" >&5 +printf %s "checking for MinGW png.h... " >&6; } +if test ${ac_cv_mingw_header_png_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <png.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_png_h=yes +else $as_nop + ac_cv_mingw_header_png_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_png_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_png_h" >&6; } +if test "x$ac_cv_mingw_header_png_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png_create_read_struct in MinGW -lpng" >&5 +printf %s "checking for png_create_read_struct in MinGW -lpng... " >&6; } +if test ${ac_cv_mingw_lib_png+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lpng $PNG_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char png_create_read_struct (); +int +main (void) +{ +return png_create_read_struct (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_png=yes +else $as_nop + ac_cv_mingw_lib_png=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_png" >&5 +printf "%s\n" "$ac_cv_mingw_lib_png" >&6; } +if test "x$ac_cv_mingw_lib_png" = xyes +then : + : +else $as_nop + PNG_PE_CFLAGS=""; PNG_PE_LIBS="" +fi +else $as_nop + PNG_PE_CFLAGS=""; PNG_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$PNG_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libpng ${notice_platform}MinGW development files not found; using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index 2fe4b186fd6..d6c57bd41ad 100644 --- a/configure.ac +++ b/configure.ac @@ -1073,6 +1073,15 @@ then WINE_NOTICE([libmpg123 ${notice_platform}MinGW development files not found (or too old); using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(PNG,[libpng],, + [WINE_CHECK_MINGW_HEADER(png.h, + [WINE_CHECK_MINGW_LIB(png,png_create_read_struct,[:],[PNG_PE_CFLAGS=""; PNG_PE_LIBS=""],[$PNG_PE_LIBS])], + [PNG_PE_CFLAGS=""; PNG_PE_LIBS=""])]) + if test "x$PNG_PE_LIBS" = "x" + then + WINE_NOTICE([libpng ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Georg Lehmann : winevulkan: Fix concurrent modification in struct decoupling.
by Alexandre Julliard Dec. 3, 2021

Dec. 3, 2021

Module: wine Branch: master Commit: 2b6c2358988080867d832b4d4b3013e4a03addd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b6c2358988080867d832b4d… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Dec 2 23:04:35 2021 +0100 winevulkan: Fix concurrent modification in struct decoupling. This fixes the huge diffs generated by trivial winevulkan updates. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 3 +- include/wine/vulkan.h | 6220 +++++++++++++++++++++---------------------- 2 files changed, 3112 insertions(+), 3111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b6c2358988080867d83…

1 0