Rebase against c64aa0006e4a33d755a57a693cd81dc1ed95fa9d.

patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch

@@ -1,4 +1,4 @@
-From d4094baaba721220b0a81170d1f9e6c276dae4ae Mon Sep 17 00:00:00 2001
+From 05ebaac121b440567aa88de7a77d0ef19a8d9242 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 12:09:22 -0500
 Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores.
@@ -16,10 +16,10 @@ Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores.
  create mode 100644 dlls/ntdll/unix/esync.h
 
 diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
-index f8ca3e689ec..82af2152595 100644
+index 74e6da5bb56..a2b498759a9 100644
 --- a/dlls/ntdll/Makefile.in
 +++ b/dlls/ntdll/Makefile.in
-@@ -47,6 +47,7 @@ C_SRCS = \
+@@ -48,6 +48,7 @@ SOURCES = \
  	unix/cdrom.c \
  	unix/debug.c \
  	unix/env.c \
@@ -345,7 +345,7 @@ index 00000000000..a50a755149a
 +
 +extern int receive_fd( obj_handle_t *handle ) DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
-index 5b8b6962b4a..92855f7cccc 100644
+index 42b5aa9d84e..974a3624a28 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
 @@ -87,6 +87,7 @@
@@ -354,9 +354,9 @@ index 5b8b6962b4a..92855f7cccc 100644
  #include "unix_private.h"
 +#include "esync.h"
  #include "wine/list.h"
+ #include "ntsyscalls.h"
  #include "wine/debug.h"
- 
-@@ -2055,6 +2056,7 @@ static void start_main_thread(void)
+@@ -1811,6 +1812,7 @@ static void start_main_thread(void)
      signal_alloc_thread( teb );
      dbg_init();
      startup_info_size = server_init_process();
@@ -365,7 +365,7 @@ index 5b8b6962b4a..92855f7cccc 100644
      init_cpu_info();
      init_files();
 diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
-index 227784448d3..99563e43cc3 100644
+index 7211457387c..cd8dbbdcc10 100644
 --- a/dlls/ntdll/unix/server.c
 +++ b/dlls/ntdll/unix/server.c
 @@ -103,7 +103,7 @@ sigset_t server_block_set;  /* signals to block during server calls */
@@ -377,7 +377,7 @@ index 227784448d3..99563e43cc3 100644
  
  /* atomically exchange a 64-bit value */
  static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val )
-@@ -907,7 +907,7 @@ void wine_server_send_fd( int fd )
+@@ -918,7 +918,7 @@ void wine_server_send_fd( int fd )
   *
   * Receive a file descriptor passed from the server.
   */
@@ -387,7 +387,7 @@ index 227784448d3..99563e43cc3 100644
      struct iovec vec;
      struct msghdr msghdr;
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index d1e4e5ee111..b5299c323e3 100644
+index bfbcaf4a851..f21ceb80298 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
 @@ -63,6 +63,7 @@
@@ -421,5 +421,5 @@ index 35b4833fd4c..75ef586df30 100644
  int do_esync(void)
  {
 -- 
-2.40.1
+2.42.0
 

patches/sapi-ISpObjectToken-CreateInstance/0004-sapi-ISpObjectToken-CreateInstance-support-ISpAudio.patch

@@ -68,7 +68,7 @@ index 6cc7ccd6d73..79594301c35 100644
 +
 +    if (!ref)
 +    {
-+        heap_free(audio);
++        free(audio);
 +    }
 +
 +    return ref;
@@ -274,7 +274,7 @@ index 6cc7ccd6d73..79594301c35 100644
 +
 +static HRESULT speech_audio_create(void **obj)
 +{
-+    struct speech_audio *This = heap_alloc(sizeof(*This));
++    struct speech_audio *This = malloc(sizeof(*This));
 +
 +    if (!This)
 +        return E_OUTOFMEMORY;

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

@@ -1,4 +1,4 @@
-From bc89b07a911b8af2a171b26defec4794fc408881 Mon Sep 17 00:00:00 2001
+From 82a9000e59fbec65e788ee7c3b3037b364aacce2 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(+), 34 deletions(-)
 
 diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
-index 28afb5b788d..67116899da7 100644
+index 62658fc98e6..6958950e0f6 100644
 --- a/dlls/winepulse.drv/pulse.c
 +++ b/dlls/winepulse.drv/pulse.c
-@@ -681,7 +681,8 @@ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIB
+@@ -693,7 +693,8 @@ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIB
      fmt->dwChannelMask = pa_mask;
  }
  
@@ -22,7 +22,7 @@ index 28afb5b788d..67116899da7 100644
  {
      WAVEFORMATEX *wfx = &fmt->Format;
      pa_stream *stream;
-@@ -704,7 +705,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
+@@ -716,7 +717,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 28afb5b788d..67116899da7 100644
      if (stream)
          pa_stream_set_state_callback(stream, pulse_stream_state, NULL);
      if (!stream)
-@@ -715,7 +716,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
+@@ -727,7 +728,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 28afb5b788d..67116899da7 100644
                  pa_stream_get_state(stream) == PA_STREAM_CREATING)
          {}
          if (pa_stream_get_state(stream) == PA_STREAM_READY) {
-@@ -726,7 +727,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
+@@ -738,7 +739,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 28afb5b788d..67116899da7 100644
                      pa_stream_get_state(stream) == PA_STREAM_READY)
              {}
          }
-@@ -774,34 +775,33 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -786,34 +787,33 @@ static NTSTATUS pulse_test_connect(void *args)
      pa_operation *o;
      int ret;
      char *name = wstr_to_str(params->name);
@@ -96,7 +96,7 @@ index 28afb5b788d..67116899da7 100644
  
          if (state == PA_CONTEXT_FAILED || state == PA_CONTEXT_TERMINATED)
              goto fail;
-@@ -810,12 +810,12 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -822,12 +822,12 @@ static NTSTATUS pulse_test_connect(void *args)
              break;
      }
  
@@ -112,9 +112,9 @@ index 28afb5b788d..67116899da7 100644
  
      free_phys_device_lists();
      list_init(&g_phys_speakers);
-@@ -824,34 +824,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");
+@@ -837,34 +837,32 @@ static NTSTATUS pulse_test_connect(void *args)
+     pulse_add_device(&g_phys_speakers, NULL, 0, Speakers, 0, "", "PulseAudio Output");
+     pulse_add_device(&g_phys_sources, NULL, 0, Microphone, 0, "", "PulseAudio Input");
  
 -    o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL);
 +    o = pa_context_get_sink_info_list(ctx, &pulse_phys_speakers_cb, NULL);
@@ -155,7 +155,7 @@ index 28afb5b788d..67116899da7 100644
  
      pulse_unlock();
  
-@@ -859,10 +857,8 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -872,10 +870,8 @@ static NTSTATUS pulse_test_connect(void *args)
      return STATUS_SUCCESS;
  
  fail:
@@ -169,5 +169,5 @@ index 28afb5b788d..67116899da7 100644
      params->priority = Priority_Unavailable;
      return STATUS_SUCCESS;
 -- 
-2.39.2
+2.42.0
 

staging/upstream-commit

@@ -1 +1 @@
-b0ad8b8cfb6e664cc6cfdd87ddb28af077149417
+c64aa0006e4a33d755a57a693cd81dc1ed95fa9d