From 8d45dc126d130c9e7430354214777cc5dc61b034 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 6 Jan 2014 01:26:32 +0100 Subject: [PATCH] Updated winepulse patches --- ...-Load-winealsa-if-winepulse-is-found.patch | 10 ++--- ...-initial-stub-for-pulseaudio-support.patch | 42 +++++++++---------- ...epulse-Add-format-and-period-probing.patch | 6 +-- .../0004-winepulse-Add-audioclient.patch | 6 +-- ...udioRenderClient-and-IAudioCaptureCl.patch | 6 +-- ...lse-Add-IAudioClock-and-IAudioClock2.patch | 6 +-- ...0007-winepulse-Add-audiostreamvolume.patch | 6 +-- .../0008-winepulse-Add-session-support.patch | 6 +-- .../0009-fix-fdels-trailing-whitespaces.patch | 6 +-- patches/06-winepulse/0010-winepulse-v12.patch | 6 +-- ...d-support-for-missing-formats-and-si.patch | 6 +-- ...d-official-warning-wine-doesn-t-want.patch | 6 +-- .../0013-winepulse-v17-Fix-winmm-tests.patch | 6 +-- ...Latency-and-compilation-improvements.patch | 6 +-- ...I-Compatibility-with-1.5.2-onward-v2.patch | 6 +-- ...16-winepulse-Fix-low-latency-support.patch | 6 +-- ...ealtime-priority-before-thread-destr.patch | 6 +-- ...-bogus-SetEvent-from-pulse_started_c.patch | 6 +-- ...e-the-setevent-part-of-the-latency-h.patch | 6 +-- ...-fix-the-checks-in-IsFormatSupported.patch | 6 +-- ...epulse-fixup-IsFormatSupported-calls.patch | 6 +-- ...eturn-early-if-padding-didn-t-update.patch | 6 +-- ...winepulse-fix-unneeded-free-in-write.patch | 6 +-- ...v23-fixup-a-invalid-free-in-mmdevapi.patch | 6 +-- ...lse-use-a-pi-mutex-for-serialization.patch | 6 +-- ...6-winepulse-add-support-for-IMarshal.patch | 6 +-- .../00273da7-72f8-4025-9e96-0c2bc95dacdb.def | 4 +- patches/patch-list.patch | 2 +- 28 files changed, 100 insertions(+), 102 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 b95433ce..3e784aa4 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 39ad530e3367082d908738de82cc786fea804308 Mon Sep 17 00:00:00 2001 +From 3822f907cd790b0405d2bad772a8240d559aa0aa Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:57 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 08/42] winmm: Load winealsa if winepulse is found Fixes midi on winepulse @@ -9,10 +9,10 @@ Fixes midi on winepulse 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c -index f387323..3b1be27 100644 +index c3b3674..56cfe35 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c -@@ -543,7 +543,10 @@ static void MMDRV_Init(void) +@@ -544,7 +544,10 @@ static void MMDRV_Init(void) drvA = HeapAlloc(GetProcessHeap(), 0, size); WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, drvA, size, NULL, NULL); @@ -25,5 +25,5 @@ index f387323..3b1be27 100644 HeapFree(GetProcessHeap(), 0, drvA); PropVariantClear(&pv); -- -1.8.4.4 +1.8.5.2 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 8dce8534..210af8b1 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,6 +1,6 @@ -From a24bd3805faff36a0999f67ee0facda2989e189a Mon Sep 17 00:00:00 2001 +From ddd8b17270df0d8ba557d15e1c9425cab8c7fe12 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:57 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 09/42] winepulse: Add initial stub for pulseaudio support --- @@ -10,19 +10,19 @@ added here. configure | 97 +++++++++++- configure.ac | 31 +++- dlls/mmdevapi/main.c | 2 +- - dlls/winepulse.drv/Makefile.in | 9 ++ + dlls/winepulse.drv/Makefile.in | 7 + dlls/winepulse.drv/mmdevdrv.c | 290 ++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/winepulse.drv.spec | 5 + - 6 files changed, 429 insertions(+), 5 deletions(-) + 6 files changed, 427 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 17e8af6..7c5ed91 100755 +index b4dfb47..c8f9168 100755 --- a/configure +++ b/configure -@@ -658,6 +658,8 @@ OSS4INCL +@@ -653,6 +653,8 @@ OSS4INCL ALSALIBS GSTREAMER_LIBS GSTREAMER_CFLAGS @@ -31,7 +31,7 @@ index 17e8af6..7c5ed91 100755 LIBGETTEXTPO ZLIB FREETYPE_LIBS -@@ -835,6 +837,7 @@ with_osmesa +@@ -830,6 +832,7 @@ with_osmesa with_oss with_png with_pthread @@ -39,7 +39,7 @@ index 17e8af6..7c5ed91 100755 with_sane with_tiff with_v4l -@@ -2047,6 +2050,7 @@ Optional Packages: +@@ -2044,6 +2047,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 +47,7 @@ index 17e8af6..7c5ed91 100755 --without-sane do not use SANE (scanner support) --without-tiff do not use TIFF --without-v4l do not use v4l1 (v4l support) -@@ -3282,6 +3286,12 @@ if test "${with_pthread+set}" = set; then : +@@ -3281,6 +3285,12 @@ if test "${with_pthread+set}" = set; then : fi @@ -60,7 +60,7 @@ index 17e8af6..7c5ed91 100755 # Check whether --with-sane was given. if test "${with_sane+set}" = set; then : withval=$with_sane; -@@ -11720,6 +11730,87 @@ esac +@@ -12095,6 +12105,87 @@ esac fi fi @@ -148,7 +148,7 @@ index 17e8af6..7c5ed91 100755 if test "x$with_gstreamer" != "xno" then if test -n "$GSTREAMER_CFLAGS"; then : -@@ -13057,12 +13148,13 @@ fi +@@ -13432,12 +13523,13 @@ fi test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} @@ -164,7 +164,7 @@ index 17e8af6..7c5ed91 100755 then as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent." fi -@@ -17268,6 +17360,7 @@ wine_fn_config_dll winemp3.acm enable_winemp3_acm +@@ -17130,6 +17222,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,10 +173,10 @@ index 17e8af6..7c5ed91 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 98a73f2..f5d0035 100644 +index 3c1101c..cf2cb7f 100644 --- a/configure.ac +++ b/configure.ac -@@ -68,6 +68,7 @@ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound +@@ -70,6 +70,7 @@ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG])) AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) @@ -184,7 +184,7 @@ index 98a73f2..f5d0035 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)])) -@@ -1542,6 +1543,30 @@ then +@@ -1522,6 +1523,30 @@ then [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) fi @@ -215,7 +215,7 @@ index 98a73f2..f5d0035 100644 dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then -@@ -1766,13 +1791,14 @@ fi +@@ -1746,13 +1771,14 @@ fi dnl **** Disable unsupported winmm drivers **** test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} @@ -232,7 +232,7 @@ index 98a73f2..f5d0035 100644 then WINE_WARNING([No sound system was found. Windows applications will be silent.]) fi -@@ -3260,6 +3286,7 @@ WINE_CONFIG_DLL(winemp3.acm) +@@ -3184,6 +3210,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,10 +255,10 @@ 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..0f595f1 +index 0000000..ae66542 --- /dev/null +++ b/dlls/winepulse.drv/Makefile.in -@@ -0,0 +1,9 @@ +@@ -0,0 +1,7 @@ +MODULE = winepulse.drv +IMPORTS = dxguid uuid winmm user32 advapi32 ole32 +EXTRALIBS = @PULSELIBS@ @LIBPTHREAD@ @@ -266,8 +266,6 @@ index 0000000..0f595f1 + +C_SRCS = \ + mmdevdrv.c -+ -+@MAKE_DLL_RULES@ diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c new file mode 100644 index 0000000..d187bdc @@ -576,5 +574,5 @@ index 0000000..a089166 +@ stdcall -private GetAudioEndpoint(ptr ptr long ptr) AUDDRV_GetAudioEndpoint +@ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager -- -1.8.4.4 +1.8.5.2 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 54344295..27fa43a9 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 8dd6c030b4487907c24b6b98cc0b88c7bb15e953 Mon Sep 17 00:00:00 2001 +From 04a80af2cccad7e15b49dd1dd6c04fe2e00da2e9 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:57 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 10/42] winepulse: Add format and period probing --- @@ -168,5 +168,5 @@ index d187bdc..40db26d 100644 UINT *num, UINT *def_index) { -- -1.8.4.4 +1.8.5.2 diff --git a/patches/06-winepulse/0004-winepulse-Add-audioclient.patch b/patches/06-winepulse/0004-winepulse-Add-audioclient.patch index ca1b1b19..c596d930 100644 --- a/patches/06-winepulse/0004-winepulse-Add-audioclient.patch +++ b/patches/06-winepulse/0004-winepulse-Add-audioclient.patch @@ -1,6 +1,6 @@ -From e3638b92aba104a74831090f0acf7779dcf055dd Mon Sep 17 00:00:00 2001 +From faac72c2c84e0a156e3c7def10b945b4a45f01f6 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:57 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 11/42] winepulse: Add audioclient --- @@ -1094,5 +1094,5 @@ index 40db26d..37d85ff 100644 IAudioSessionManager2 **out) { -- -1.8.4.4 +1.8.5.2 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 ad30ddd8..c3f025fc 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 24e5a426ff9493945ff2c834375a57f688f0356b Mon Sep 17 00:00:00 2001 +From d8b1b43529fa98eb0a04d1616f1b98d264d2018b Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:57 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 12/42] winepulse: Add IAudioRenderClient and IAudioCaptureClient @@ -348,5 +348,5 @@ index 37d85ff..01cfd25 100644 IAudioSessionManager2 **out) { -- -1.8.4.4 +1.8.5.2 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 5dd13a8f..4ac90e05 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 fa8bdbe20707458b7b43f9afc2d93adaadc833be Mon Sep 17 00:00:00 2001 +From 96b254276b471a85c6705b0043894bed308118f1 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:57 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 13/42] winepulse: Add IAudioClock and IAudioClock2 --- @@ -205,5 +205,5 @@ index 01cfd25..3ed2288 100644 IAudioSessionManager2 **out) { -- -1.8.4.4 +1.8.5.2 diff --git a/patches/06-winepulse/0007-winepulse-Add-audiostreamvolume.patch b/patches/06-winepulse/0007-winepulse-Add-audiostreamvolume.patch index d4cc64d8..16623063 100644 --- a/patches/06-winepulse/0007-winepulse-Add-audiostreamvolume.patch +++ b/patches/06-winepulse/0007-winepulse-Add-audiostreamvolume.patch @@ -1,6 +1,6 @@ -From 3b427a167037eec4e3f6b0be941c11795235c635 Mon Sep 17 00:00:00 2001 +From d67a96e9b1cc13a5fa98bfb0f1a9a0b638d7f117 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:57 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 14/42] winepulse: Add audiostreamvolume --- @@ -281,5 +281,5 @@ index 3ed2288..b7414c2 100644 IAudioSessionManager2 **out) { -- -1.8.4.4 +1.8.5.2 diff --git a/patches/06-winepulse/0008-winepulse-Add-session-support.patch b/patches/06-winepulse/0008-winepulse-Add-session-support.patch index 14959b6e..27b34853 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 a75af9bfd896d14d0271aa9f67714e966c02211e Mon Sep 17 00:00:00 2001 +From 6adc30134f5b3223b038041752e4a7020342c9d9 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:57 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 15/42] winepulse: Add session support --- @@ -932,5 +932,5 @@ index b7414c2..64ee62e 100644 + return S_OK; } -- -1.8.4.4 +1.8.5.2 diff --git a/patches/06-winepulse/0009-fix-fdels-trailing-whitespaces.patch b/patches/06-winepulse/0009-fix-fdels-trailing-whitespaces.patch index b3a876bb..c1cb80f2 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 832d14f35d779db701a00fc839750d40d92092b2 Mon Sep 17 00:00:00 2001 +From 743d1d5364e1e62c8a1c05a1a7eed1baed18febf Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:57 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 16/42] fix fdels trailing whitespaces Happy? :P @@ -31,5 +31,5 @@ index 64ee62e..5a71a3d 100644 if (*pos < This->clock_lastpos) *pos = This->clock_lastpos; -- -1.8.4.4 +1.8.5.2 diff --git a/patches/06-winepulse/0010-winepulse-v12.patch b/patches/06-winepulse/0010-winepulse-v12.patch index 4016f839..b0ffae59 100644 --- a/patches/06-winepulse/0010-winepulse-v12.patch +++ b/patches/06-winepulse/0010-winepulse-v12.patch @@ -1,6 +1,6 @@ -From 34f9b00bfe94027b2e6763dfb9a66ddf13df2eff Mon Sep 17 00:00:00 2001 +From 61642a5c08f38b32d2eef819b82f6adc24466932 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 17/42] winepulse v12 Changes since v11: @@ -44,5 +44,5 @@ index 5a71a3d..960af3c 100644 copy = rem; if (copy > src_len) -- -1.8.4.4 +1.8.5.2 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 d02c5935..1f074d65 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 b60b5c38e4f55e60e951fb50a0905b76aa0dc815 Mon Sep 17 00:00:00 2001 +From 1966576a4b5cdc7b6003cb93cb0953670aaa9235 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 18/42] winepulse v15: Add support for missing formats, and silence an error for missing format tags @@ -37,5 +37,5 @@ index 960af3c..f52f119 100644 This->ss.channels = This->map.channels; if (!pa_channel_map_valid(&This->map) || This->ss.format == PA_SAMPLE_INVALID) { -- -1.8.4.4 +1.8.5.2 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 f69f60b1..2b8ab763 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 95ae131b414df0b866fb1cf42e384c0e69af79de Mon Sep 17 00:00:00 2001 +From 3edd1b44eec39916de3284b02d62e121b5d86d23 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 19/42] winepulse v16: Add official warning wine doesn't want to support winepulse @@ -75,5 +75,5 @@ index f52f119..76a2e0e 100644 return E_UNEXPECTED; -- -1.8.4.4 +1.8.5.2 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 b4e66ad1..73b89b7d 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 b5111c70a07ffd6ce97f4300686556d7bc1bccd3 Mon Sep 17 00:00:00 2001 +From 3749b1e2e55d2bebc795420b81209a992602cf2d Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 20/42] winepulse v17: Fix winmm tests Handle dwChannelMask = SPEAKER_ALL better so WAVE_FORMAT_EXTENSIBLE tests pass too @@ -121,5 +121,5 @@ index 76a2e0e..6e75674 100644 if (hr == S_OK || !out) { CoTaskMemFree(closest); -- -1.8.4.4 +1.8.5.2 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 a8042deb..36f3d79f 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 c87397b563c9eb30a1a2f347b7690a9d76c14fbb Mon Sep 17 00:00:00 2001 +From c70efb35703e991685bf33b2e3faba3a1365a58f Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:54 +0100 Subject: [PATCH 21/42] winepulse v18: Latency and compilation improvements Changes since v17: @@ -203,5 +203,5 @@ index 6e75674..8e76826 100644 /* Make time never go backwards */ if (*pos < This->clock_lastpos) -- -1.8.4.4 +1.8.5.2 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 6dfb31fa..f4d31d44 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 e2845d85e98107c4859b0efa521516dd31cf88ea Mon Sep 17 00:00:00 2001 +From a2da4fbf74405222a8c5e69656242ab98e941d4a Mon Sep 17 00:00:00 2001 From: Juergen Tretthahn -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:55 +0100 Subject: [PATCH 22/42] winepulse: API Compatibility with 1.5.2 onward, v2 V2: Add winepulse.drv.spec to commit too @@ -110,5 +110,5 @@ index a089166..612bf46 100644 +@ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager -- -1.8.4.4 +1.8.5.2 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 c5a5f9e3..e2392097 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 34aa975484571428eed615bb0774cbdcc3a3ea0a Mon Sep 17 00:00:00 2001 +From 32b8b1c43320d5bf11a5f312e9d9ee33ee7ffd96 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:55 +0100 Subject: [PATCH 23/42] winepulse: Fix low latency support Some games request a 20 ms buffer and will only fill 20 ms. @@ -54,5 +54,5 @@ index b374b53..7c07f54 100644 return S_OK; } -- -1.8.4.4 +1.8.5.2 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 012f8f4b..d5cfe517 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 ba6788c394705ebd5ce285585cf54c8347ddee80 Mon Sep 17 00:00:00 2001 +From 3d1c3802f07a5b499bf50f3a8b6d4b98fe85689c Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:55 +0100 Subject: [PATCH 24/42] winepulse: drop realtime priority before thread destruction @@ -23,5 +23,5 @@ index 7c07f54..ba68102 100644 pa_context_disconnect(pulse_ctx); pa_context_unref(pulse_ctx); -- -1.8.4.4 +1.8.5.2 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 055d00bb..8f5e2091 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 9b8cec1403996ee0cc21ef05d595862d63dd417e Mon Sep 17 00:00:00 2001 +From df52b1440f1020c33eaf5d17e6d34b62bf44f648 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:55 +0100 Subject: [PATCH 25/42] winepulse: remove bogus SetEvent from pulse_started_callback @@ -25,5 +25,5 @@ index ba68102..68de00c 100644 static void pulse_rd_loop(ACImpl *This, size_t bytes) -- -1.8.4.4 +1.8.5.2 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 a4cc75ee..365d1426 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 63638aee04429b7fd2f937a3005f96187082b8c1 Mon Sep 17 00:00:00 2001 +From 018a86a638ab1389e221e2839eeac778d744d2d4 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:55 +0100 Subject: [PATCH 26/42] winepulse: disable the setevent part of the latency hack @@ -38,5 +38,5 @@ index 68de00c..643d55e 100644 return S_OK; } -- -1.8.4.4 +1.8.5.2 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 da50ecd5..d487e411 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 767887f715fb48b3c7086878c8bd1b14a58f9a06 Mon Sep 17 00:00:00 2001 +From 27bdbc72c331dcc4d8c3279e66ced92935ab1426 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:55 +0100 Subject: [PATCH 27/42] winepulse v20: fix the checks in IsFormatSupported Thanks to DGhost001 for reporting and isolating the issue. @@ -24,5 +24,5 @@ index 643d55e..86dd10a 100644 CoTaskMemFree(closest); if (out) -- -1.8.4.4 +1.8.5.2 diff --git a/patches/06-winepulse/0021-winepulse-fixup-IsFormatSupported-calls.patch b/patches/06-winepulse/0021-winepulse-fixup-IsFormatSupported-calls.patch index 1e1662f0..2fa4fad8 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 74cd2906447824083af218b24a01e0b51f735add Mon Sep 17 00:00:00 2001 +From de619f9370f4a2efc3c7074ad9649eb98add3d7e Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:55 +0100 Subject: [PATCH 28/42] winepulse: fixup IsFormatSupported calls --- @@ -409,5 +409,5 @@ index 86dd10a..554a9fc 100644 TRACE("returning: %08x %p\n", hr, out ? *out : NULL); return hr; -- -1.8.4.4 +1.8.5.2 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 9771b948..2ef326dc 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 005fbf67be0686f3d94be74d31c8478778b43140 Mon Sep 17 00:00:00 2001 +From fc95e404034572b4335b8239dfd7206aa5c53ce2 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:55 +0100 Subject: [PATCH 29/42] winepulse v21: return early if padding didn't update --- @@ -24,5 +24,5 @@ index 554a9fc..a4575d5 100644 This->clock_written += oldpad - This->pad; TRACE("New pad: %zu (-%zu)\n", This->pad / pa_frame_size(&This->ss), (oldpad - This->pad) / pa_frame_size(&This->ss)); -- -1.8.4.4 +1.8.5.2 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 3f4e5adb..c231ebbc 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 e682f29100c601574e9503dc4c89267babe62228 Mon Sep 17 00:00:00 2001 +From d4513fb8e321a39f693bb47b21150779894d0ff6 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07:08:55 +0100 Subject: [PATCH 30/42] winepulse: fix unneeded free in write.. --- @@ -32,5 +32,5 @@ index a4575d5..3ca68fd 100644 This->locked_ptr = NULL; TRACE("Released %u, pad %zu\n", written_frames, This->pad / pa_frame_size(&This->ss)); -- -1.8.4.4 +1.8.5.2 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 573604b1..753b2349 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 b6806f13b832b9aaa68d266825092526730aee30 Mon Sep 17 00:00:00 2001 +From 1845d1db19da5e3007231e2632d9ed093b8faa11 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:58 +0100 +Date: Sat, 4 Jan 2014 07: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. @@ -47,5 +47,5 @@ index 3ca68fd..5b041a2 100644 (*keys)[0] = pulse_render_guid; else -- -1.8.4.4 +1.8.5.2 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 88f2ba64..6b90bedc 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 4e827b780247c1f99c122cd789af4f54b96447cf Mon Sep 17 00:00:00 2001 +From 04887220fbd530e03cc73ef45dd8f55f8a6f3b12 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:59 +0100 +Date: Sat, 4 Jan 2014 07:08:55 +0100 Subject: [PATCH 38/42] winepulse: use a pi-mutex for serialization. The winepulse thread is realtime, to prevent blocking it indefinitely @@ -63,5 +63,5 @@ index 5b041a2..a09ce7f 100644 if (pulse_thread) SetThreadPriority(pulse_thread, 0); -- -1.8.4.4 +1.8.5.2 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 2180687c..e087012c 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 fa9af27f56bcf069f02c41b529b3a3738dcfa80e Mon Sep 17 00:00:00 2001 +From 20e40bc5eb0a8cbd8e9c6817091311bc05b53f94 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Fri, 22 Nov 2013 21:29:59 +0100 +Date: Sat, 4 Jan 2014 07:08:55 +0100 Subject: [PATCH 39/42] winepulse: add support for IMarshal Fixes bug 32161 for winepulse. Based On Jeff Klein's patches for the @@ -133,5 +133,5 @@ index a09ce7f..f052a08 100644 return E_NOINTERFACE; } -- -1.8.4.4 +1.8.5.2 diff --git a/patches/06-winepulse/00273da7-72f8-4025-9e96-0c2bc95dacdb.def b/patches/06-winepulse/00273da7-72f8-4025-9e96-0c2bc95dacdb.def index ee02fea2..2cc01463 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: 1 +Revision: 2 Author: Maarten Lankhorst -Title: Winepulse patches extracted from https://launchpad.net/~mlankhorst/+archive/ppa/+files/wine1.7_1.7.7-0ubuntu2~saucy1.debian.tar.gz. +Title: Winepulse patches extracted from https://launchpad.net/~mlankhorst/+archive/ppa/+files/wine1.7_1.7.10-0ubuntu1~saucy1.debian.tar.gz. diff --git a/patches/patch-list.patch b/patches/patch-list.patch index c2d914a6..e6f35028 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -49,7 +49,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:1", "Maarten Lankhorst", "Winepulse patches extracted from https://launchpad.net/~mlankhorst/+archive/ppa/+files/wine1.7_1.7.7-0ubuntu2~saucy1.debian.tar.gz." }, ++ { "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." }, + { "eec5dea8-879d-417b-9f97-364deaae6576:1", "Sebastian Lackner", "Add tests for IVMRMonitorConfig." }, + { NULL, NULL, NULL } +};