From dff7b6b562595ca00bfec970a0809165fb9b7f8e Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 13 Jun 2014 22:47:13 +0200 Subject: [PATCH] Update winepulse patches to latest revision (extracted from 1.7.19). --- ...-Load-winealsa-if-winepulse-is-found.patch | 4 +- ...-initial-stub-for-pulseaudio-support.patch | 48 +++++++++++-------- ...epulse-Add-format-and-period-probing.patch | 4 +- .../0004-winepulse-Add-audioclient.patch | 4 +- ...udioRenderClient-and-IAudioCaptureCl.patch | 4 +- ...lse-Add-IAudioClock-and-IAudioClock2.patch | 4 +- ...0007-winepulse-Add-audiostreamvolume.patch | 4 +- .../0008-winepulse-Add-session-support.patch | 4 +- .../0009-fix-fdels-trailing-whitespaces.patch | 4 +- patches/06-winepulse/0010-winepulse-v12.patch | 4 +- ...d-support-for-missing-formats-and-si.patch | 4 +- ...d-official-warning-wine-doesn-t-want.patch | 4 +- .../0013-winepulse-v17-Fix-winmm-tests.patch | 4 +- ...Latency-and-compilation-improvements.patch | 4 +- ...I-Compatibility-with-1.5.2-onward-v2.patch | 4 +- ...16-winepulse-Fix-low-latency-support.patch | 4 +- ...ealtime-priority-before-thread-destr.patch | 4 +- ...-bogus-SetEvent-from-pulse_started_c.patch | 4 +- ...e-the-setevent-part-of-the-latency-h.patch | 4 +- ...-fix-the-checks-in-IsFormatSupported.patch | 4 +- ...epulse-fixup-IsFormatSupported-calls.patch | 10 ++-- ...eturn-early-if-padding-didn-t-update.patch | 4 +- ...winepulse-fix-unneeded-free-in-write.patch | 4 +- ...v23-fixup-a-invalid-free-in-mmdevapi.patch | 4 +- ...lse-use-a-pi-mutex-for-serialization.patch | 4 +- ...6-winepulse-add-support-for-IMarshal.patch | 4 +- .../00273da7-72f8-4025-9e96-0c2bc95dacdb.def | 4 +- patches/patch-list.patch | 2 +- 28 files changed, 85 insertions(+), 75 deletions(-) diff --git a/patches/06-winepulse/0001-winmm-Load-winealsa-if-winepulse-is-found.patch b/patches/06-winepulse/0001-winmm-Load-winealsa-if-winepulse-is-found.patch index 3e784aa4..216a4b89 100644 --- a/patches/06-winepulse/0001-winmm-Load-winealsa-if-winepulse-is-found.patch +++ b/patches/06-winepulse/0001-winmm-Load-winealsa-if-winepulse-is-found.patch @@ -1,6 +1,6 @@ -From 3822f907cd790b0405d2bad772a8240d559aa0aa Mon Sep 17 00:00:00 2001 +From 8cb75a25d71c1ea659ce69fa74f725cd9b9a64f0 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:53 +0100 Subject: [PATCH 08/42] winmm: Load winealsa if winepulse is found Fixes midi on winepulse diff --git a/patches/06-winepulse/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch b/patches/06-winepulse/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch index d8de3bce..b3be2ae5 100644 --- a/patches/06-winepulse/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch +++ b/patches/06-winepulse/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch @@ -1,28 +1,28 @@ -From ddd8b17270df0d8ba557d15e1c9425cab8c7fe12 Mon Sep 17 00:00:00 2001 +From dac832bfc418de315808a109ab9adba0c5936be5 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:53 +0100 Subject: [PATCH 09/42] winepulse: Add initial stub for pulseaudio support --- Just the basic of initialization and pulseaudio mainloop support is added here. --- - configure | 97 +++++++++++- - configure.ac | 31 +++- + configure | 99 +++++++++++- + configure.ac | 32 +++- dlls/mmdevapi/main.c | 2 +- dlls/winepulse.drv/Makefile.in | 7 + dlls/winepulse.drv/mmdevdrv.c | 290 ++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/winepulse.drv.spec | 5 + - 6 files changed, 427 insertions(+), 5 deletions(-) + 6 files changed, 430 insertions(+), 5 deletions(-) create mode 100644 dlls/winepulse.drv/Makefile.in create mode 100644 dlls/winepulse.drv/mmdevdrv.c create mode 100644 dlls/winepulse.drv/winepulse.drv.spec diff --git a/configure b/configure -index b4dfb47..c8f9168 100755 +index 246b888..d9f6ddd 100755 --- a/configure +++ b/configure -@@ -653,6 +633,8 @@ OSS4_CFLAGS +@@ -653,6 +653,8 @@ OSS4_CFLAGS ALSA_LIBS GSTREAMER_LIBS GSTREAMER_CFLAGS @@ -31,7 +31,7 @@ index b4dfb47..c8f9168 100755 GETTEXTPO_LIBS Z_LIBS FREETYPE_LIBS -@@ -830,6 +832,7 @@ with_osmesa +@@ -824,6 +826,7 @@ with_osmesa with_oss with_png with_pthread @@ -39,7 +39,15 @@ index b4dfb47..c8f9168 100755 with_sane with_tiff with_v4l -@@ -2044,6 +2047,7 @@ Optional Packages: +@@ -1253,6 +1256,7 @@ enable_winemapi + enable_winemp3_acm + enable_wineoss_drv + enable_wineps_drv ++enable_winepulse_drv + enable_wineqtdecoder + enable_winex11_drv + enable_wing32 +@@ -2079,6 +2083,7 @@ Optional Packages: --without-oss do not use the OSS sound support --without-png do not use PNG --without-pthread do not use the pthread library @@ -47,7 +55,7 @@ index b4dfb47..c8f9168 100755 --without-sane do not use SANE (scanner support) --without-tiff do not use TIFF --without-v4l do not use v4l1 (v4l support) -@@ -3281,6 +3285,12 @@ if test "${with_pthread+set}" = set; then : +@@ -3320,6 +3325,12 @@ if test "${with_pthread+set}" = set; then : fi @@ -60,7 +68,7 @@ index b4dfb47..c8f9168 100755 # Check whether --with-sane was given. if test "${with_sane+set}" = set; then : withval=$with_sane; -@@ -12095,6 +12105,87 @@ esac +@@ -12083,6 +12094,87 @@ esac fi fi @@ -148,7 +156,7 @@ index b4dfb47..c8f9168 100755 if test "x$with_gstreamer" != "xno" then if ${GSTREAMER_CFLAGS:+false} :; then : -@@ -13394,12 +13473,13 @@ fi +@@ -13394,12 +13486,14 @@ fi test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} @@ -157,6 +165,7 @@ index b4dfb47..c8f9168 100755 test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} -if test "x$ALSA_LIBS$COREAUDIO_LIBS" = "x" -a \ ++if test "x$ALSA_LIBS$COREAUDIO_LIBS$PULSELIBS" = "x" -a \ +if test "x$ALSALIBS$COREAUDIO$PULSELIBS" = "x" -a \ "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \ - "x$with_alsa$with_coreaudio$with_oss" != xnonono @@ -164,7 +173,7 @@ index b4dfb47..c8f9168 100755 then as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent." fi -@@ -17130,6 +17222,7 @@ wine_fn_config_dll winemp3.acm enable_winemp3_acm +@@ -17203,6 +17297,7 @@ wine_fn_config_dll winemp3.acm enable_winemp3_acm wine_fn_config_dll wineoss.drv enable_wineoss_drv wine_fn_config_dll wineps.drv enable_wineps_drv clean,po wine_fn_config_dll wineps16.drv16 enable_win16 @@ -173,7 +182,7 @@ index b4dfb47..c8f9168 100755 wine_fn_config_dll winex11.drv enable_winex11_drv wine_fn_config_dll wing.dll16 enable_win16 diff --git a/configure.ac b/configure.ac -index 3c1101c..cf2cb7f 100644 +index de807d2..ec3db46 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,7 @@ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound @@ -184,7 +193,7 @@ index 3c1101c..cf2cb7f 100644 AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) -@@ -1522,6 +1523,30 @@ then +@@ -1512,6 +1513,30 @@ then [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) fi @@ -215,7 +224,7 @@ index 3c1101c..cf2cb7f 100644 dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then -@@ -1730,13 +1755,14 @@ fi +@@ -1730,13 +1755,15 @@ fi dnl **** Disable unsupported winmm drivers **** test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} @@ -225,6 +234,7 @@ index 3c1101c..cf2cb7f 100644 dnl **** Check for any sound system **** -if test "x$ALSA_LIBS$COREAUDIO_LIBS" = "x" -a \ ++if test "x$ALSA_LIBS$COREAUDIO_LIBS$PULSELIBS" = "x" -a \ +if test "x$ALSALIBS$COREAUDIO$PULSELIBS" = "x" -a \ "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \ - "x$with_alsa$with_coreaudio$with_oss" != xnonono @@ -232,7 +242,7 @@ index 3c1101c..cf2cb7f 100644 then WINE_WARNING([No sound system was found. Windows applications will be silent.]) fi -@@ -3184,6 +3210,7 @@ WINE_CONFIG_DLL(winemp3.acm) +@@ -3217,6 +3244,7 @@ WINE_CONFIG_DLL(winemp3.acm) WINE_CONFIG_DLL(wineoss.drv) WINE_CONFIG_DLL(wineps.drv,,[clean,po]) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) @@ -255,13 +265,13 @@ index 447813f..b9ae99e 100644 DriverFuncs driver; diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in new file mode 100644 -index 0000000..ae66542 +index 0000000..158bbc0 --- /dev/null +++ b/dlls/winepulse.drv/Makefile.in @@ -0,0 +1,7 @@ +MODULE = winepulse.drv +IMPORTS = dxguid uuid winmm user32 advapi32 ole32 -+EXTRALIBS = @PULSELIBS@ @PTHREAD_LIBS@ ++EXTRALIBS = @PULSELIBS@ $(PTHREAD_LIBS) +EXTRAINCL = @PULSEINCL@ + +C_SRCS = \ diff --git a/patches/06-winepulse/0003-winepulse-Add-format-and-period-probing.patch b/patches/06-winepulse/0003-winepulse-Add-format-and-period-probing.patch index 27fa43a9..00eeee49 100644 --- a/patches/06-winepulse/0003-winepulse-Add-format-and-period-probing.patch +++ b/patches/06-winepulse/0003-winepulse-Add-format-and-period-probing.patch @@ -1,6 +1,6 @@ -From 04a80af2cccad7e15b49dd1dd6c04fe2e00da2e9 Mon Sep 17 00:00:00 2001 +From ac6de861806e5692fa004cb2c449feba95287323 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:53 +0100 Subject: [PATCH 10/42] winepulse: Add format and period probing --- diff --git a/patches/06-winepulse/0004-winepulse-Add-audioclient.patch b/patches/06-winepulse/0004-winepulse-Add-audioclient.patch index c596d930..8e8190df 100644 --- a/patches/06-winepulse/0004-winepulse-Add-audioclient.patch +++ b/patches/06-winepulse/0004-winepulse-Add-audioclient.patch @@ -1,6 +1,6 @@ -From faac72c2c84e0a156e3c7def10b945b4a45f01f6 Mon Sep 17 00:00:00 2001 +From 54c37abb982df8e5aefccfe2add2a05fa5707db8 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:53 +0100 Subject: [PATCH 11/42] winepulse: Add audioclient --- diff --git a/patches/06-winepulse/0005-winepulse-Add-IAudioRenderClient-and-IAudioCaptureCl.patch b/patches/06-winepulse/0005-winepulse-Add-IAudioRenderClient-and-IAudioCaptureCl.patch index c3f025fc..0e2083c9 100644 --- a/patches/06-winepulse/0005-winepulse-Add-IAudioRenderClient-and-IAudioCaptureCl.patch +++ b/patches/06-winepulse/0005-winepulse-Add-IAudioRenderClient-and-IAudioCaptureCl.patch @@ -1,6 +1,6 @@ -From d8b1b43529fa98eb0a04d1616f1b98d264d2018b Mon Sep 17 00:00:00 2001 +From 4191de925518baace7ad4c13a0c72750a91f1abd Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:54 +0100 Subject: [PATCH 12/42] winepulse: Add IAudioRenderClient and IAudioCaptureClient diff --git a/patches/06-winepulse/0006-winepulse-Add-IAudioClock-and-IAudioClock2.patch b/patches/06-winepulse/0006-winepulse-Add-IAudioClock-and-IAudioClock2.patch index 4ac90e05..3ef9102e 100644 --- a/patches/06-winepulse/0006-winepulse-Add-IAudioClock-and-IAudioClock2.patch +++ b/patches/06-winepulse/0006-winepulse-Add-IAudioClock-and-IAudioClock2.patch @@ -1,6 +1,6 @@ -From 96b254276b471a85c6705b0043894bed308118f1 Mon Sep 17 00:00:00 2001 +From 2e3b7073ee776ecbd5b186d8f146e80ef30775b8 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:54 +0100 Subject: [PATCH 13/42] winepulse: Add IAudioClock and IAudioClock2 --- diff --git a/patches/06-winepulse/0007-winepulse-Add-audiostreamvolume.patch b/patches/06-winepulse/0007-winepulse-Add-audiostreamvolume.patch index 16623063..412082c9 100644 --- a/patches/06-winepulse/0007-winepulse-Add-audiostreamvolume.patch +++ b/patches/06-winepulse/0007-winepulse-Add-audiostreamvolume.patch @@ -1,6 +1,6 @@ -From d67a96e9b1cc13a5fa98bfb0f1a9a0b638d7f117 Mon Sep 17 00:00:00 2001 +From 85e33b703dd8c082af2b4a008215adca70308fc5 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:54 +0100 Subject: [PATCH 14/42] winepulse: Add audiostreamvolume --- diff --git a/patches/06-winepulse/0008-winepulse-Add-session-support.patch b/patches/06-winepulse/0008-winepulse-Add-session-support.patch index 27b34853..b7d27c1e 100644 --- a/patches/06-winepulse/0008-winepulse-Add-session-support.patch +++ b/patches/06-winepulse/0008-winepulse-Add-session-support.patch @@ -1,6 +1,6 @@ -From 6adc30134f5b3223b038041752e4a7020342c9d9 Mon Sep 17 00:00:00 2001 +From ca90d6371ca330a63447c4a67cda50d65d51a73b Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:54 +0100 Subject: [PATCH 15/42] winepulse: Add session support --- diff --git a/patches/06-winepulse/0009-fix-fdels-trailing-whitespaces.patch b/patches/06-winepulse/0009-fix-fdels-trailing-whitespaces.patch index c1cb80f2..f7a244cc 100644 --- a/patches/06-winepulse/0009-fix-fdels-trailing-whitespaces.patch +++ b/patches/06-winepulse/0009-fix-fdels-trailing-whitespaces.patch @@ -1,6 +1,6 @@ -From 743d1d5364e1e62c8a1c05a1a7eed1baed18febf Mon Sep 17 00:00:00 2001 +From bef79b1cc995c36d4dccc6e7a7251f2954eef89a Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:54 +0100 Subject: [PATCH 16/42] fix fdels trailing whitespaces Happy? :P diff --git a/patches/06-winepulse/0010-winepulse-v12.patch b/patches/06-winepulse/0010-winepulse-v12.patch index b0ffae59..45ed136f 100644 --- a/patches/06-winepulse/0010-winepulse-v12.patch +++ b/patches/06-winepulse/0010-winepulse-v12.patch @@ -1,6 +1,6 @@ -From 61642a5c08f38b32d2eef819b82f6adc24466932 Mon Sep 17 00:00:00 2001 +From 8a7d39774081539935d060f405fc0f4f1718cb5b Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:54 +0100 Subject: [PATCH 17/42] winepulse v12 Changes since v11: diff --git a/patches/06-winepulse/0011-winepulse-v15-Add-support-for-missing-formats-and-si.patch b/patches/06-winepulse/0011-winepulse-v15-Add-support-for-missing-formats-and-si.patch index 1f074d65..b4a826f4 100644 --- a/patches/06-winepulse/0011-winepulse-v15-Add-support-for-missing-formats-and-si.patch +++ b/patches/06-winepulse/0011-winepulse-v15-Add-support-for-missing-formats-and-si.patch @@ -1,6 +1,6 @@ -From 1966576a4b5cdc7b6003cb93cb0953670aaa9235 Mon Sep 17 00:00:00 2001 +From 91657e70984483200e08c29ed9431027cf10db24 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:54 +0100 Subject: [PATCH 18/42] winepulse v15: Add support for missing formats, and silence an error for missing format tags diff --git a/patches/06-winepulse/0012-winepulse-v16-Add-official-warning-wine-doesn-t-want.patch b/patches/06-winepulse/0012-winepulse-v16-Add-official-warning-wine-doesn-t-want.patch index 2b8ab763..a4de04f0 100644 --- a/patches/06-winepulse/0012-winepulse-v16-Add-official-warning-wine-doesn-t-want.patch +++ b/patches/06-winepulse/0012-winepulse-v16-Add-official-warning-wine-doesn-t-want.patch @@ -1,6 +1,6 @@ -From 3edd1b44eec39916de3284b02d62e121b5d86d23 Mon Sep 17 00:00:00 2001 +From 7cdac1f6eb46245e55ed93b819c561da2380ccef Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:54 +0100 Subject: [PATCH 19/42] winepulse v16: Add official warning wine doesn't want to support winepulse diff --git a/patches/06-winepulse/0013-winepulse-v17-Fix-winmm-tests.patch b/patches/06-winepulse/0013-winepulse-v17-Fix-winmm-tests.patch index 73b89b7d..b8dab3df 100644 --- a/patches/06-winepulse/0013-winepulse-v17-Fix-winmm-tests.patch +++ b/patches/06-winepulse/0013-winepulse-v17-Fix-winmm-tests.patch @@ -1,6 +1,6 @@ -From 3749b1e2e55d2bebc795420b81209a992602cf2d Mon Sep 17 00:00:00 2001 +From d8b279f724839e5fbd5443e2d2a6f3e8f7c93dac Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:54 +0100 Subject: [PATCH 20/42] winepulse v17: Fix winmm tests Handle dwChannelMask = SPEAKER_ALL better so WAVE_FORMAT_EXTENSIBLE tests pass too diff --git a/patches/06-winepulse/0014-winepulse-v18-Latency-and-compilation-improvements.patch b/patches/06-winepulse/0014-winepulse-v18-Latency-and-compilation-improvements.patch index 36f3d79f..d2639640 100644 --- a/patches/06-winepulse/0014-winepulse-v18-Latency-and-compilation-improvements.patch +++ b/patches/06-winepulse/0014-winepulse-v18-Latency-and-compilation-improvements.patch @@ -1,6 +1,6 @@ -From c70efb35703e991685bf33b2e3faba3a1365a58f Mon Sep 17 00:00:00 2001 +From 4e4971813a136b9535b912fb95995b5b13dba8bb Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:54 +0100 +Date: Sat, 8 Feb 2014 16:08:54 +0100 Subject: [PATCH 21/42] winepulse v18: Latency and compilation improvements Changes since v17: diff --git a/patches/06-winepulse/0015-winepulse-API-Compatibility-with-1.5.2-onward-v2.patch b/patches/06-winepulse/0015-winepulse-API-Compatibility-with-1.5.2-onward-v2.patch index f4d31d44..fd398da1 100644 --- a/patches/06-winepulse/0015-winepulse-API-Compatibility-with-1.5.2-onward-v2.patch +++ b/patches/06-winepulse/0015-winepulse-API-Compatibility-with-1.5.2-onward-v2.patch @@ -1,6 +1,6 @@ -From a2da4fbf74405222a8c5e69656242ab98e941d4a Mon Sep 17 00:00:00 2001 +From 7a2597d90627ce1bacf0e1969cc4b2eea4e1cd5d Mon Sep 17 00:00:00 2001 From: Juergen Tretthahn -Date: Sat, 4 Jan 2014 07:08:55 +0100 +Date: Sat, 8 Feb 2014 16:08:54 +0100 Subject: [PATCH 22/42] winepulse: API Compatibility with 1.5.2 onward, v2 V2: Add winepulse.drv.spec to commit too diff --git a/patches/06-winepulse/0016-winepulse-Fix-low-latency-support.patch b/patches/06-winepulse/0016-winepulse-Fix-low-latency-support.patch index e2392097..4e308831 100644 --- a/patches/06-winepulse/0016-winepulse-Fix-low-latency-support.patch +++ b/patches/06-winepulse/0016-winepulse-Fix-low-latency-support.patch @@ -1,6 +1,6 @@ -From 32b8b1c43320d5bf11a5f312e9d9ee33ee7ffd96 Mon Sep 17 00:00:00 2001 +From e8533a5bf1e137ccfbe8b44e5e6a645805de8d2b Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:55 +0100 +Date: Sat, 8 Feb 2014 16:08:54 +0100 Subject: [PATCH 23/42] winepulse: Fix low latency support Some games request a 20 ms buffer and will only fill 20 ms. diff --git a/patches/06-winepulse/0017-winepulse-drop-realtime-priority-before-thread-destr.patch b/patches/06-winepulse/0017-winepulse-drop-realtime-priority-before-thread-destr.patch index d5cfe517..4ecd3bf4 100644 --- a/patches/06-winepulse/0017-winepulse-drop-realtime-priority-before-thread-destr.patch +++ b/patches/06-winepulse/0017-winepulse-drop-realtime-priority-before-thread-destr.patch @@ -1,6 +1,6 @@ -From 3d1c3802f07a5b499bf50f3a8b6d4b98fe85689c Mon Sep 17 00:00:00 2001 +From 3487d764ca9c97a2f6b7898acf653a616c8c8dae Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:55 +0100 +Date: Sat, 8 Feb 2014 16:08:55 +0100 Subject: [PATCH 24/42] winepulse: drop realtime priority before thread destruction diff --git a/patches/06-winepulse/0018-winepulse-remove-bogus-SetEvent-from-pulse_started_c.patch b/patches/06-winepulse/0018-winepulse-remove-bogus-SetEvent-from-pulse_started_c.patch index 8f5e2091..a268d907 100644 --- a/patches/06-winepulse/0018-winepulse-remove-bogus-SetEvent-from-pulse_started_c.patch +++ b/patches/06-winepulse/0018-winepulse-remove-bogus-SetEvent-from-pulse_started_c.patch @@ -1,6 +1,6 @@ -From df52b1440f1020c33eaf5d17e6d34b62bf44f648 Mon Sep 17 00:00:00 2001 +From 7806b9b3fd846e8ce55e13ac4abdfeca4b26a270 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:55 +0100 +Date: Sat, 8 Feb 2014 16:08:55 +0100 Subject: [PATCH 25/42] winepulse: remove bogus SetEvent from pulse_started_callback diff --git a/patches/06-winepulse/0019-winepulse-disable-the-setevent-part-of-the-latency-h.patch b/patches/06-winepulse/0019-winepulse-disable-the-setevent-part-of-the-latency-h.patch index 365d1426..3747750c 100644 --- a/patches/06-winepulse/0019-winepulse-disable-the-setevent-part-of-the-latency-h.patch +++ b/patches/06-winepulse/0019-winepulse-disable-the-setevent-part-of-the-latency-h.patch @@ -1,6 +1,6 @@ -From 018a86a638ab1389e221e2839eeac778d744d2d4 Mon Sep 17 00:00:00 2001 +From 78a28b81d51df9aebcd7b130f8535437af9df6fa Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:55 +0100 +Date: Sat, 8 Feb 2014 16:08:55 +0100 Subject: [PATCH 26/42] winepulse: disable the setevent part of the latency hack diff --git a/patches/06-winepulse/0020-winepulse-v20-fix-the-checks-in-IsFormatSupported.patch b/patches/06-winepulse/0020-winepulse-v20-fix-the-checks-in-IsFormatSupported.patch index d487e411..e0fdc922 100644 --- a/patches/06-winepulse/0020-winepulse-v20-fix-the-checks-in-IsFormatSupported.patch +++ b/patches/06-winepulse/0020-winepulse-v20-fix-the-checks-in-IsFormatSupported.patch @@ -1,6 +1,6 @@ -From 27bdbc72c331dcc4d8c3279e66ced92935ab1426 Mon Sep 17 00:00:00 2001 +From 67159f14084007bfdd743b5e2194942e3fa1fe7a Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:55 +0100 +Date: Sat, 8 Feb 2014 16:08:55 +0100 Subject: [PATCH 27/42] winepulse v20: fix the checks in IsFormatSupported Thanks to DGhost001 for reporting and isolating the issue. diff --git a/patches/06-winepulse/0021-winepulse-fixup-IsFormatSupported-calls.patch b/patches/06-winepulse/0021-winepulse-fixup-IsFormatSupported-calls.patch index 2fa4fad8..a0f33885 100644 --- a/patches/06-winepulse/0021-winepulse-fixup-IsFormatSupported-calls.patch +++ b/patches/06-winepulse/0021-winepulse-fixup-IsFormatSupported-calls.patch @@ -1,6 +1,6 @@ -From de619f9370f4a2efc3c7074ad9649eb98add3d7e Mon Sep 17 00:00:00 2001 +From d563d66ef2dda02730d8211e9334906fd9daf2e2 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:55 +0100 +Date: Sat, 8 Feb 2014 16:08:55 +0100 Subject: [PATCH 28/42] winepulse: fixup IsFormatSupported calls --- @@ -9,10 +9,10 @@ Subject: [PATCH 28/42] winepulse: fixup IsFormatSupported calls 2 files changed, 283 insertions(+), 57 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c -index 026be48..19b5b56 100644 +index 4c8221b..c9e4636 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c -@@ -477,6 +477,169 @@ static void test_formats(AUDCLNT_SHAREMODE mode) +@@ -467,6 +467,169 @@ static void test_formats(AUDCLNT_SHAREMODE mode) } } @@ -182,7 +182,7 @@ index 026be48..19b5b56 100644 static void test_references(void) { IAudioClient *ac; -@@ -2255,6 +2418,7 @@ START_TEST(render) +@@ -2245,6 +2408,7 @@ START_TEST(render) test_audioclient(); test_formats(AUDCLNT_SHAREMODE_EXCLUSIVE); test_formats(AUDCLNT_SHAREMODE_SHARED); diff --git a/patches/06-winepulse/0022-winepulse-v21-return-early-if-padding-didn-t-update.patch b/patches/06-winepulse/0022-winepulse-v21-return-early-if-padding-didn-t-update.patch index 2ef326dc..eee5254d 100644 --- a/patches/06-winepulse/0022-winepulse-v21-return-early-if-padding-didn-t-update.patch +++ b/patches/06-winepulse/0022-winepulse-v21-return-early-if-padding-didn-t-update.patch @@ -1,6 +1,6 @@ -From fc95e404034572b4335b8239dfd7206aa5c53ce2 Mon Sep 17 00:00:00 2001 +From 50da53d33c85896f752802990aecf79fe29dc735 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:55 +0100 +Date: Sat, 8 Feb 2014 16:08:55 +0100 Subject: [PATCH 29/42] winepulse v21: return early if padding didn't update --- diff --git a/patches/06-winepulse/0023-winepulse-fix-unneeded-free-in-write.patch b/patches/06-winepulse/0023-winepulse-fix-unneeded-free-in-write.patch index c231ebbc..04b25ab4 100644 --- a/patches/06-winepulse/0023-winepulse-fix-unneeded-free-in-write.patch +++ b/patches/06-winepulse/0023-winepulse-fix-unneeded-free-in-write.patch @@ -1,6 +1,6 @@ -From d4513fb8e321a39f693bb47b21150779894d0ff6 Mon Sep 17 00:00:00 2001 +From 5b3f36aed665d2edb524eda22908664442234184 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:55 +0100 +Date: Sat, 8 Feb 2014 16:08:55 +0100 Subject: [PATCH 30/42] winepulse: fix unneeded free in write.. --- diff --git a/patches/06-winepulse/0024-winepulse-v23-fixup-a-invalid-free-in-mmdevapi.patch b/patches/06-winepulse/0024-winepulse-v23-fixup-a-invalid-free-in-mmdevapi.patch index 753b2349..776c7565 100644 --- a/patches/06-winepulse/0024-winepulse-v23-fixup-a-invalid-free-in-mmdevapi.patch +++ b/patches/06-winepulse/0024-winepulse-v23-fixup-a-invalid-free-in-mmdevapi.patch @@ -1,6 +1,6 @@ -From 1845d1db19da5e3007231e2632d9ed093b8faa11 Mon Sep 17 00:00:00 2001 +From fa89aaea30c0956c25a01ac8ad38fa4713bf47ca Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:55 +0100 +Date: Sat, 8 Feb 2014 16:08:55 +0100 Subject: [PATCH 31/42] winepulse v23: fixup a invalid free in mmdevapi array members of ids should be dynamically allocated, judging from valgrind output. diff --git a/patches/06-winepulse/0025-winepulse-use-a-pi-mutex-for-serialization.patch b/patches/06-winepulse/0025-winepulse-use-a-pi-mutex-for-serialization.patch index 6b90bedc..241a7a0c 100644 --- a/patches/06-winepulse/0025-winepulse-use-a-pi-mutex-for-serialization.patch +++ b/patches/06-winepulse/0025-winepulse-use-a-pi-mutex-for-serialization.patch @@ -1,6 +1,6 @@ -From 04887220fbd530e03cc73ef45dd8f55f8a6f3b12 Mon Sep 17 00:00:00 2001 +From 8fd7e21cea105091d14f36511317af643cb256be Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:55 +0100 +Date: Sat, 8 Feb 2014 16:08:56 +0100 Subject: [PATCH 38/42] winepulse: use a pi-mutex for serialization. The winepulse thread is realtime, to prevent blocking it indefinitely diff --git a/patches/06-winepulse/0026-winepulse-add-support-for-IMarshal.patch b/patches/06-winepulse/0026-winepulse-add-support-for-IMarshal.patch index e087012c..f985f667 100644 --- a/patches/06-winepulse/0026-winepulse-add-support-for-IMarshal.patch +++ b/patches/06-winepulse/0026-winepulse-add-support-for-IMarshal.patch @@ -1,6 +1,6 @@ -From 20e40bc5eb0a8cbd8e9c6817091311bc05b53f94 Mon Sep 17 00:00:00 2001 +From 09d3be12108151fe6746f6f33a86b5fa2473e3dc Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Sat, 4 Jan 2014 07:08:55 +0100 +Date: Sat, 8 Feb 2014 16:08:56 +0100 Subject: [PATCH 39/42] winepulse: add support for IMarshal Fixes bug 32161 for winepulse. Based On Jeff Klein's patches for the diff --git a/patches/06-winepulse/00273da7-72f8-4025-9e96-0c2bc95dacdb.def b/patches/06-winepulse/00273da7-72f8-4025-9e96-0c2bc95dacdb.def index 2cc01463..bc5a2bc5 100644 --- a/patches/06-winepulse/00273da7-72f8-4025-9e96-0c2bc95dacdb.def +++ b/patches/06-winepulse/00273da7-72f8-4025-9e96-0c2bc95dacdb.def @@ -1,3 +1,3 @@ -Revision: 2 +Revision: 3 Author: Maarten Lankhorst -Title: Winepulse patches extracted from https://launchpad.net/~mlankhorst/+archive/ppa/+files/wine1.7_1.7.10-0ubuntu1~saucy1.debian.tar.gz. +Title: Winepulse patches extracted from https://launchpad.net/~ubuntu-wine/+archive/ppa/+files/wine1.7_1.7.19-0ubuntu2~trusty2.debian.tar.gz. diff --git a/patches/patch-list.patch b/patches/patch-list.patch index e3394885..a3eafd75 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -22,7 +22,7 @@ index a273502..5fa0cd5 100644 + { "5d6bb7b5-ec88-4ed3-907d-9ad2173a2f88:1", "Sebastian Lackner", "Enable/disable windows when they are (un)mapped by foreign applications." }, + { "94186fff-6dbf-44d0-8eb1-2463d1608a0f:1", "Sebastian Lackner", "Update gl_drawable for embedded windows." }, + { "cbe240e8-2c58-430a-b61c-7fbb9d0e1e11:1", "Sebastian Lackner", "Change return value of stub SetNamedPipeHandleState to TRUE." }, -+ { "00273da7-72f8-4025-9e96-0c2bc95dacdb:2", "Maarten Lankhorst", "Winepulse patches extracted from https://launchpad.net/~mlankhorst/+archive/ppa/+files/wine1.7_1.7.10-0ubuntu1~saucy1.debian.tar.gz." }, ++ { "00273da7-72f8-4025-9e96-0c2bc95dacdb:3", "Maarten Lankhorst", "Winepulse patches extracted from https://launchpad.net/~ubuntu-wine/+archive/ppa/+files/wine1.7_1.7.19-0ubuntu2~trusty2.debian.tar.gz." }, + { "fbea4ef6-85ac-4524-b32d-fc9882b73e5a:1", "Erich E. Hoover", "Implement GetVolumePathName." }, + { "4cd13e94-7f2d-11e3-b5eb-0090f5c75ad5:1", "Erich E. Hoover", "Support for junction points/reparse points." }, + { "5fb1f5c8-7f17-11e3-9b62-0090f5c75ad5:1", "Erich E. Hoover", "Implement TransmitFile." },