Rebase against 1d0f66a3c6c6cf77ab49c834ba0d05f5232f637d.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "7546b4a63d437c2f7f8673cae9341d358f84f1a5"
+	echo "1d0f66a3c6c6cf77ab49c834ba0d05f5232f637d"
 }
 
 # Show version information

patches/winepulse-PulseAudio_Support/0001-winepulse.drv-Use-a-separate-mainloop-and-ctx-for-pu.patch

@@ -1,4 +1,4 @@
-From 16d09c005e260719275cd32fc6db5ed35f44d174 Mon Sep 17 00:00:00 2001
+From 2700c7d5ef1b90ecb2140736e8380c07a1decd13 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Wed, 4 Nov 2015 02:57:56 +0100
 Subject: [PATCH] winepulse.drv: Use a separate mainloop and ctx for
@@ -9,10 +9,10 @@ Subject: [PATCH] winepulse.drv: Use a separate mainloop and ctx for
  1 file changed, 30 insertions(+), 32 deletions(-)
 
 diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
-index bd918b6f260..9690de61e20 100644
+index cbd9b3b97ae..abd0f286ffc 100644
 --- a/dlls/winepulse.drv/pulse.c
 +++ b/dlls/winepulse.drv/pulse.c
-@@ -661,7 +661,8 @@ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIB
+@@ -669,7 +669,8 @@ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIB
      fmt->dwChannelMask = pa_mask;
  }
  
@@ -22,7 +22,7 @@ index bd918b6f260..9690de61e20 100644
  {
      WAVEFORMATEX *wfx = &fmt->Format;
      pa_stream *stream;
-@@ -684,7 +685,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
+@@ -692,7 +693,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
      attr.minreq = attr.fragsize = pa_frame_size(&ss);
      attr.prebuf = 0;
  
@@ -31,7 +31,7 @@ index bd918b6f260..9690de61e20 100644
      if (stream)
          pa_stream_set_state_callback(stream, pulse_stream_state, NULL);
      if (!stream)
-@@ -695,7 +696,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
+@@ -703,7 +704,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
      else
          ret = pa_stream_connect_record(stream, pulse_name, &attr, PA_STREAM_START_CORKED|PA_STREAM_FIX_RATE|PA_STREAM_FIX_CHANNELS|PA_STREAM_EARLY_REQUESTS);
      if (ret >= 0) {
@@ -40,7 +40,7 @@ index bd918b6f260..9690de61e20 100644
                  pa_stream_get_state(stream) == PA_STREAM_CREATING)
          {}
          if (pa_stream_get_state(stream) == PA_STREAM_READY) {
-@@ -706,7 +707,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
+@@ -714,7 +715,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
              else
                  length = pa_stream_get_buffer_attr(stream)->fragsize;
              pa_stream_disconnect(stream);
@@ -49,7 +49,7 @@ index bd918b6f260..9690de61e20 100644
                      pa_stream_get_state(stream) == PA_STREAM_READY)
              {}
          }
-@@ -753,31 +754,32 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -761,31 +762,32 @@ static NTSTATUS pulse_test_connect(void *args)
      PhysDevice *dev;
      pa_operation *o;
      int ret;
@@ -72,7 +72,7 @@ index bd918b6f260..9690de61e20 100644
 -        pulse_ml = NULL;
 +        pa_mainloop_free(ml);
          pulse_unlock();
-         params->result = E_FAIL;
+         params->priority = Priority_Unavailable;
          return STATUS_SUCCESS;
      }
  
@@ -93,7 +93,7 @@ index bd918b6f260..9690de61e20 100644
  
          if (state == PA_CONTEXT_FAILED || state == PA_CONTEXT_TERMINATED)
              goto fail;
-@@ -786,12 +788,12 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -794,12 +796,12 @@ static NTSTATUS pulse_test_connect(void *args)
              break;
      }
  
@@ -109,7 +109,7 @@ index bd918b6f260..9690de61e20 100644
  
      free_phys_device_lists();
      list_init(&g_phys_speakers);
-@@ -800,34 +802,32 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -808,34 +810,32 @@ static NTSTATUS pulse_test_connect(void *args)
      pulse_add_device(&g_phys_speakers, NULL, 0, Speakers, 0, "", "PulseAudio");
      pulse_add_device(&g_phys_sources, NULL, 0, Microphone, 0, "", "PulseAudio");
  
@@ -152,7 +152,7 @@ index bd918b6f260..9690de61e20 100644
  
      pulse_unlock();
  
-@@ -835,10 +835,8 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -843,10 +843,8 @@ static NTSTATUS pulse_test_connect(void *args)
      return STATUS_SUCCESS;
  
  fail:
@@ -163,7 +163,7 @@ index bd918b6f260..9690de61e20 100644
 +    pa_context_unref(ctx);
 +    pa_mainloop_free(ml);
      pulse_unlock();
-     params->result = E_FAIL;
+     params->priority = Priority_Unavailable;
      return STATUS_SUCCESS;
 -- 
 2.35.1

staging/upstream-commit

@@ -1 +1 @@
-7546b4a63d437c2f7f8673cae9341d358f84f1a5
+1d0f66a3c6c6cf77ab49c834ba0d05f5232f637d