[PATCH v2 1/2] winegstreamer: Make callback parameter names more generic.

[Derek Lesho]

Signed-off-by: Derek Lesho 
---
v2:
  Rename commit.
---
 dlls/winegstreamer/gst_cbs.c  | 28 ++++++++++++++--------------
 dlls/winegstreamer/gst_cbs.h  | 18 +++++++++---------
 dlls/winegstreamer/gstdemux.c | 14 +++++++-------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c
index 679d87c52f..71c8180098 100644
--- a/dlls/winegstreamer/gst_cbs.c
+++ b/dlls/winegstreamer/gst_cbs.c
@@ -89,9 +89,9 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user)
 {
     struct cb_data cbdata = { EXISTING_NEW_PAD };

-    cbdata.u.existing_new_pad_data.bin = bin;
-    cbdata.u.existing_new_pad_data.pad = pad;
-    cbdata.u.existing_new_pad_data.user = user;
+    cbdata.u.pad_added_data.element = bin;
+    cbdata.u.pad_added_data.pad = pad;
+    cbdata.u.pad_added_data.user = user;

call_cb(&cbdata);
 }
@@ -123,11 +123,11 @@ gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode,
     return cbdata.u.activate_mode_data.ret;
 }

-void no_more_pads_wrapper(GstElement *decodebin, gpointer user)
+void no_more_pads_wrapper(GstElement *element, gpointer user)
 {
     struct cb_data cbdata = { NO_MORE_PADS };

-    cbdata.u.no_more_pads_data.decodebin = decodebin;
+    cbdata.u.no_more_pads_data.element = element;
     cbdata.u.no_more_pads_data.user = user;

call_cb(&cbdata);
@@ -138,15 +138,15 @@ GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64
 {
     struct cb_data cbdata = { REQUEST_BUFFER_SRC };

-    cbdata.u.request_buffer_src_data.pad = pad;
-    cbdata.u.request_buffer_src_data.parent = parent;
-    cbdata.u.request_buffer_src_data.ofs = ofs;
-    cbdata.u.request_buffer_src_data.len = len;
-    cbdata.u.request_buffer_src_data.buf = buf;
+    cbdata.u.getrange_data.pad = pad;
+    cbdata.u.getrange_data.parent = parent;
+    cbdata.u.getrange_data.ofs = ofs;
+    cbdata.u.getrange_data.len = len;
+    cbdata.u.getrange_data.buf = buf;

call_cb(&cbdata);

-    return cbdata.u.request_buffer_src_data.ret;
+    return cbdata.u.getrange_data.ret;
 }

gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event)
@@ -192,9 +192,9 @@ void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user)
 {
     struct cb_data cbdata = { REMOVED_DECODED_PAD };

-    cbdata.u.removed_decoded_pad_data.bin = bin;
-    cbdata.u.removed_decoded_pad_data.pad = pad;
-    cbdata.u.removed_decoded_pad_data.user = user;
+    cbdata.u.pad_removed_data.element = bin;
+    cbdata.u.pad_removed_data.pad = pad;
+    cbdata.u.pad_removed_data.user = user;

call_cb(&cbdata);
 }
diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h
index a425671da7..b3e2b237bb 100644
--- a/dlls/winegstreamer/gst_cbs.h
+++ b/dlls/winegstreamer/gst_cbs.h
@@ -54,11 +54,11 @@ struct cb_data {
             gpointer user;
             GstBusSyncReply ret;
         } watch_bus_data;
-        struct existing_new_pad_data {
-            GstElement *bin;
+        struct pad_added_data {
+            GstElement *element;
             GstPad *pad;
             gpointer user;
-        } existing_new_pad_data;
+        } pad_added_data;
         struct query_function_data {
             GstPad *pad;
             GstObject *parent;
@@ -73,17 +73,17 @@ struct cb_data {
             gboolean ret;
         } activate_mode_data;
         struct no_more_pads_data {
-            GstElement *decodebin;
+            GstElement *element;
             gpointer user;
         } no_more_pads_data;
-        struct request_buffer_src_data {
+        struct getrange_data {
             GstPad *pad;
             GstObject *parent;
             guint64 ofs;
             guint len;
             GstBuffer **buf;
             GstFlowReturn ret;
-        } request_buffer_src_data;
+        } getrange_data;
         struct event_src_data {
             GstPad *pad;
             GstObject *parent;
@@ -102,11 +102,11 @@ struct cb_data {
             GstBuffer *buf;
             GstFlowReturn ret;
         } got_data_sink_data;
-        struct removed_decoded_pad_data {
-            GstElement *bin;
+        struct pad_removed_data {
+            GstElement *element;
             GstPad *pad;
             gpointer user;
-        } removed_decoded_pad_data;
+        } pad_removed_data;
         struct autoplug_blacklist_data {
             GstElement *bin;
             GstPad *pad;
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 9d7f85b82d..3a29a03499 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -2186,8 +2186,8 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user)
         }
     case EXISTING_NEW_PAD:
         {
-            struct existing_new_pad_data *data = &cbdata->u.existing_new_pad_data;
-            existing_new_pad(data->bin, data->pad, data->user);
+            struct pad_added_data *data = &cbdata->u.pad_added_data;
+            existing_new_pad(data->element, data->pad, data->user);
             break;
         }
     case QUERY_FUNCTION:
@@ -2205,13 +2205,13 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user)
     case NO_MORE_PADS:
         {
             struct no_more_pads_data *data = &cbdata->u.no_more_pads_data;
-            no_more_pads(data->decodebin, data->user);
+            no_more_pads(data->element, data->user);
             break;
         }
     case REQUEST_BUFFER_SRC:
         {
-            struct request_buffer_src_data *data = &cbdata->u.request_buffer_src_data;
-            cbdata->u.request_buffer_src_data.ret = request_buffer_src(data->pad, data->parent,
+            struct getrange_data *data = &cbdata->u.getrange_data;
+            cbdata->u.getrange_data.ret = request_buffer_src(data->pad, data->parent,
                     data->ofs, data->len, data->buf);
             break;
         }
@@ -2235,8 +2235,8 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user)
         }
     case REMOVED_DECODED_PAD:
         {
-            struct removed_decoded_pad_data *data = &cbdata->u.removed_decoded_pad_data;
-            removed_decoded_pad(data->bin, data->pad, data->user);
+            struct pad_removed_data *data = &cbdata->u.pad_removed_data;
+            removed_decoded_pad(data->element, data->pad, data->user);
             break;
         }
     case AUTOPLUG_BLACKLIST:

[PATCH v2 2/2] winegstreamer: Move broad callback handling code to gst_cbs.

[Derek Lesho]

Signed-off-by: Derek Lesho 
---
v2:
  - Mark more functions and variables as static.
  - Improve formatting
  - Remove redundant logging.
---
 dlls/winegstreamer/gst_cbs.c  | 68 ++++++++++++++++++++++++++++++++++-
 dlls/winegstreamer/gst_cbs.h  |  9 ++---
 dlls/winegstreamer/gstdemux.c | 60 +++----------------------------
 3 files changed, 74 insertions(+), 63 deletions(-)

diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c
index 71c8180098..87f93d8af2 100644
--- a/dlls/winegstreamer/gst_cbs.c
+++ b/dlls/winegstreamer/gst_cbs.c
@@ -20,10 +20,76 @@

#include <gst/gst.h>

+#include "objbase.h"
+
 #include "wine/list.h"

#include "gst_cbs.h"

+static pthread_key_t wine_gst_key;
+
+void mark_wine_thread(void)
+{
+    /* set it to non-NULL to indicate that this is a Wine thread */
+    pthread_setspecific(wine_gst_key, &wine_gst_key);
+}
+
+static BOOL is_wine_thread(void)
+{
+    return pthread_getspecific(wine_gst_key) != NULL;
+}
+
+static pthread_mutex_t cb_list_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t cb_list_cond = PTHREAD_COND_INITIALIZER;
+static struct list cb_list = LIST_INIT(cb_list);
+
+static void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user)
+{
+    struct cb_data *cbdata = user;
+
+    if (cbdata->type < GSTDEMUX_MAX)
+        perform_cb_gstdemux(cbdata);
+
+    pthread_mutex_lock(&cbdata->lock);
+    cbdata->finished = 1;
+    pthread_cond_broadcast(&cbdata->cond);
+    pthread_mutex_unlock(&cbdata->lock);
+}
+
+static DWORD WINAPI dispatch_thread(void *user)
+{
+    struct cb_data *cbdata;
+
+    CoInitializeEx(NULL, COINIT_MULTITHREADED);
+
+    pthread_mutex_lock(&cb_list_lock);
+
+    while (1)
+    {
+        pthread_cond_wait(&cb_list_cond, &cb_list_lock);
+
+        while (!list_empty(&cb_list))
+        {
+            cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry);
+            list_remove(&cbdata->entry);
+
+            TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL);
+        }
+    }
+
+    pthread_mutex_unlock(&cb_list_lock);
+
+    CoUninitialize();
+
+    return 0;
+}
+
+static void start_dispatch_thread(void)
+{
+    pthread_key_create(&wine_gst_key, NULL);
+    CloseHandle(CreateThread(NULL, 0, &dispatch_thread, NULL, 0, NULL));
+}
+
 /* gstreamer calls our callbacks from threads that Wine did not create. Some
  * callbacks execute code which requires Wine to have created the thread
  * (critical sections, debug logging, dshow client code). Since gstreamer can't
@@ -31,7 +97,7 @@
  * callbacks in code which avoids the Wine thread requirement, and then
  * dispatch those callbacks on a thread that is known to be created by Wine.
  *
- * This file must not contain any code that depends on the Wine TEB!
+ * This thread must not run any code that depends on the Wine TEB!
  */

static void call_cb(struct cb_data *cbdata)
diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h
index b3e2b237bb..4725f23ad1 100644
--- a/dlls/winegstreamer/gst_cbs.h
+++ b/dlls/winegstreamer/gst_cbs.h
@@ -42,7 +42,8 @@ enum CB_TYPE {
     REMOVED_DECODED_PAD,
     AUTOPLUG_BLACKLIST,
     UNKNOWN_TYPE,
-    QUERY_SINK
+    QUERY_SINK,
+    GSTDEMUX_MAX
 };

struct cb_data {
@@ -135,12 +136,8 @@ struct cb_data {
     struct list entry;
 };

-extern pthread_mutex_t cb_list_lock DECLSPEC_HIDDEN;
-extern pthread_cond_t cb_list_cond DECLSPEC_HIDDEN;
-extern struct list cb_list DECLSPEC_HIDDEN;
-void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) DECLSPEC_HIDDEN;
-BOOL is_wine_thread(void) DECLSPEC_HIDDEN;
 void mark_wine_thread(void) DECLSPEC_HIDDEN;
+void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN;

GstBusSyncReply watch_bus_wrapper(GstBus *bus, GstMessage *msg, gpointer user) DECLSPEC_HIDDEN;
 void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN;
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 3a29a03499..3c8d0d48b7 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer);

static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};

-static pthread_key_t wine_gst_key;
-
 struct gstdemux
 {
     struct strmbase_filter filter;
@@ -100,17 +98,6 @@ static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface);
 static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface);
 static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface);

-void mark_wine_thread(void)
-{
-    /* set it to non-NULL to indicate that this is a Wine thread */
-    pthread_setspecific(wine_gst_key, &wine_gst_key);
-}
-
-BOOL is_wine_thread(void)
-{
-    return pthread_getspecific(wine_gst_key) != NULL;
-}
-
 static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE *amt)
 {
     WAVEFORMATEXTENSIBLE *wfe;
@@ -2168,14 +2155,8 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This)
     return S_OK;
 }

-pthread_mutex_t cb_list_lock = PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t cb_list_cond = PTHREAD_COND_INITIALIZER;
-struct list cb_list = LIST_INIT(cb_list);
-
-void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user)
+void perform_cb_gstdemux(struct cb_data *cbdata)
 {
-    struct cb_data *cbdata = user;
-
     switch(cbdata->type)
     {
     case WATCH_BUS:
@@ -2259,44 +2240,11 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user)
                     data->query);
             break;
         }
-    }
-
-    pthread_mutex_lock(&cbdata->lock);
-    cbdata->finished = 1;
-    pthread_cond_broadcast(&cbdata->cond);
-    pthread_mutex_unlock(&cbdata->lock);
-}
-
-static DWORD WINAPI dispatch_thread(void *user)
-{
-    struct cb_data *cbdata;
-
-    CoInitializeEx(NULL, COINIT_MULTITHREADED);
-
-    pthread_mutex_lock(&cb_list_lock);
-
-    while(1){
-        pthread_cond_wait(&cb_list_cond, &cb_list_lock);
-
-        while(!list_empty(&cb_list)){
-            cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry);
-            list_remove(&cbdata->entry);
-
-            TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL);
+    default:
+        {
+            assert(0);
         }
     }
-
-    pthread_mutex_unlock(&cb_list_lock);
-
-    CoUninitialize();
-
-    return 0;
-}
-
-void start_dispatch_thread(void)
-{
-    pthread_key_create(&wine_gst_key, NULL);
-    CloseHandle(CreateThread(NULL, 0, &dispatch_thread, NULL, 0, NULL));
 }

static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b)

[PATCH v2 2/2] winegstreamer: Move broad callback handling code to gst_cbs.

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=67686

Your paranoid android.

=== debiant (build log) ===

/home/winetest/tools/testbot/var/wine-win32/dlls/winegstreamer/../../../wine/dlls/winegstreamer/main.c:199: undefined reference to `start_dispatch_thread'
collect2: error: ld returned 1 exit status
Task: The win32 build failed

=== debiant (build log) ===

/home/winetest/tools/testbot/var/wine-wow64/dlls/winegstreamer/../../../wine/dlls/winegstreamer/main.c:199: undefined reference to `start_dispatch_thread'
collect2: error: ld returned 1 exit status
Task: The wow64 build failed

[PATCH v2 2/2] winegstreamer: Move broad callback handling code to gst_cbs.

[Derek Lesho]

On 2020-03-20 14:54, Derek Lesho wrote:
> Signed-off-by: Derek Lesho
>
> v2:
> - Mark more functions and variables as static.
> - Improve formatting
> - Remove redundant logging.
>
> dlls/winegstreamer/gst_cbs.c  | 68 ++++++++++++++++++++++++++++++++++-
>   dlls/winegstreamer/gst_cbs.h  |  9 ++---
>   dlls/winegstreamer/gstdemux.c | 60 +++----------------------------
>   3 files changed, 74 insertions(+), 63 deletions(-)
>
> diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c
> index 71c8180098..87f93d8af2 100644
> --- a/dlls/winegstreamer/gst_cbs.c
> +++ b/dlls/winegstreamer/gst_cbs.c
> @@ -20,10 +20,76 @@
>
> #include <gst/gst.h>
>
> +#include "objbase.h"
> -
>
> #include "wine/list.h"
>
> #include "gst_cbs.h"
>
> +static pthread_key_t wine_gst_key;
> -
>
> +void mark_wine_thread(void)
> +{
> - /* set it to non-NULL to indicate that this is a Wine thread */
> - pthread_setspecific(wine_gst_key, &wine_gst_key);
>
> +}
> -
>
> +static BOOL is_wine_thread(void)
> +{
> - return pthread_getspecific(wine_gst_key) != NULL;
>
> +}
> -
>
> +static pthread_mutex_t cb_list_lock = PTHREAD_MUTEX_INITIALIZER;
> +static pthread_cond_t cb_list_cond = PTHREAD_COND_INITIALIZER;
> +static struct list cb_list = LIST_INIT(cb_list);
> -
>
> +static void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user)
> +{
> - struct cb_data *cbdata = user;
> -
> - if (cbdata->type < GSTDEMUX_MAX)
> -
>    perform_cb_gstdemux(cbdata);
> -
> - pthread_mutex_lock(&cbdata->lock);
> - cbdata->finished = 1;
> - pthread_cond_broadcast(&cbdata->cond);
> - pthread_mutex_unlock(&cbdata->lock);
>
> +}
> -
>
> +static DWORD WINAPI dispatch_thread(void *user)
> +{
> - struct cb_data *cbdata;
> -
> - CoInitializeEx(NULL, COINIT_MULTITHREADED);
> -
> - pthread_mutex_lock(&cb_list_lock);
> -
> - while (1)
> - {
> -
>    pthread_cond_wait(&cb_list_cond, &cb_list_lock);
> -
> -
>    while (!list_empty(&cb_list))
> -
>    {
> -
>        cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry);
> -
>        list_remove(&cbdata->entry);
> -
> -
>        TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL);
> -
>    }
> - }
> -
> - pthread_mutex_unlock(&cb_list_lock);
> -
> - CoUninitialize();
> -
> - return 0;
>
> +}
> -
>
> +static void start_dispatch_thread(void)

Oops, just realized that this is a public function exposed through 
gst_private.h, so it shouldn't be marked static.
> +{
> - pthread_key_create(&wine_gst_key, NULL);
> - CloseHandle(CreateThread(NULL, 0, &dispatch_thread, NULL, 0, NULL));
>
> +}
> - /* gstreamer calls our callbacks from threads that Wine did not create. Some
> - callbacks execute code which requires Wine to have created the thread
> - (critical sections, debug logging, dshow client code). Since gstreamer can't
>
> @@ -31,7 +97,7 @@
> - callbacks in code which avoids the Wine thread requirement, and then
> - dispatch those callbacks on a thread that is known to be created by Wine.
> -
> -
> - This file must not contain any code that depends on the Wine TEB!
> -
> - This thread must not run any code that depends on the Wine TEB!
>
> */
>
> static void call_cb(struct cb_data *cbdata)
>
> diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h
> index b3e2b237bb..4725f23ad1 100644
> --- a/dlls/winegstreamer/gst_cbs.h
> +++ b/dlls/winegstreamer/gst_cbs.h
> @@ -42,7 +42,8 @@ enum CB_TYPE {
>       REMOVED_DECODED_PAD,
>       AUTOPLUG_BLACKLIST,
>       UNKNOWN_TYPE,
> - QUERY_SINK
> -
>
> QUERY_SINK,
> -
>
> GSTDEMUX_MAX
> };
>
> struct cb_data {
>
> @@ -135,12 +136,8 @@ struct cb_data {
>       struct list entry;
>   };
>
> -extern pthread_mutex_t cb_list_lock DECLSPEC_HIDDEN;
> -extern pthread_cond_t cb_list_cond DECLSPEC_HIDDEN;
> -extern struct list cb_list DECLSPEC_HIDDEN;
> -void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) DECLSPEC_HIDDEN;
> -BOOL is_wine_thread(void) DECLSPEC_HIDDEN;
>   void mark_wine_thread(void) DECLSPEC_HIDDEN;
> +void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN;
>
> GstBusSyncReply watch_bus_wrapper(GstBus *bus, GstMessage *msg, gpointer user) DECLSPEC_HIDDEN;
>   void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN;
> diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
> index 3a29a03499..3c8d0d48b7 100644
> --- a/dlls/winegstreamer/gstdemux.c
> +++ b/dlls/winegstreamer/gstdemux.c
> @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer);
>
> static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
>
> -static pthread_key_t wine_gst_key;
> - struct gstdemux
> {
>     struct strmbase_filter filter;
>
> @@ -100,17 +98,6 @@ static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface);
>   static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface);
>   static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface);
>
> -void mark_wine_thread(void)
> -{
> - /* set it to non-NULL to indicate that this is a Wine thread */
> - pthread_setspecific(wine_gst_key, &wine_gst_key);
>
> -}
> -
>
> -BOOL is_wine_thread(void)
> -{
> - return pthread_getspecific(wine_gst_key) != NULL;
>
> -}
> - static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE *amt)
> {
>     WAVEFORMATEXTENSIBLE *wfe;
>
> @@ -2168,14 +2155,8 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This)
>       return S_OK;
>   }
>
> -pthread_mutex_t cb_list_lock = PTHREAD_MUTEX_INITIALIZER;
> -pthread_cond_t cb_list_cond = PTHREAD_COND_INITIALIZER;
> -struct list cb_list = LIST_INIT(cb_list);
> -
>
> -void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user)
> +void perform_cb_gstdemux(struct cb_data *cbdata)
>   {
> - struct cb_data *cbdata = user;
> -
> switch(cbdata->type)
> {
> case WATCH_BUS:
>
> @@ -2259,44 +2240,11 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user)
>                       data->query);
>               break;
>           }
> - }
> -
> - pthread_mutex_lock(&cbdata->lock);
> - cbdata->finished = 1;
> - pthread_cond_broadcast(&cbdata->cond);
> - pthread_mutex_unlock(&cbdata->lock);
>
> -}
> -
>
> -static DWORD WINAPI dispatch_thread(void *user)
> -{
> - struct cb_data *cbdata;
> -
> - CoInitializeEx(NULL, COINIT_MULTITHREADED);
> -
> - pthread_mutex_lock(&cb_list_lock);
> -
> - while(1){
> -
>    pthread_cond_wait(&cb_list_cond, &cb_list_lock);
> -
> -
>    while(!list_empty(&cb_list)){
> -
>        cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry);
> -
>        list_remove(&cbdata->entry);
> -
> -
>        TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL);
> - default:
> -
>    {
> -
>        assert(0);
>     }
> }
> -
> - pthread_mutex_unlock(&cb_list_lock);
> -
> - CoUninitialize();
> -
> - return 0;
>
> -}
> -
>
> -void start_dispatch_thread(void)
> -{
> -
>
> pthread_key_create(&wine_gst_key, NULL);
> -
>
> CloseHandle(CreateThread(NULL, 0, &dispatch_thread, NULL, 0, NULL));
> }
>
> static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b)

[PATCH v3 2/2] winegstreamer: Move broad callback handling code to gst_cbs.

[Derek Lesho]

Signed-off-by: Derek Lesho 
---
v3:
  Fix incorrect static usage.
---
 dlls/winegstreamer/gst_cbs.c  | 68 ++++++++++++++++++++++++++++++++++-
 dlls/winegstreamer/gst_cbs.h  |  9 ++---
 dlls/winegstreamer/gstdemux.c | 60 +++----------------------------
 3 files changed, 74 insertions(+), 63 deletions(-)

diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c
index 71c8180098..a0618798d8 100644
--- a/dlls/winegstreamer/gst_cbs.c
+++ b/dlls/winegstreamer/gst_cbs.c
@@ -20,10 +20,76 @@

#include <gst/gst.h>

+#include "objbase.h"
+
 #include "wine/list.h"

#include "gst_cbs.h"

+static pthread_key_t wine_gst_key;
+
+void mark_wine_thread(void)
+{
+    /* set it to non-NULL to indicate that this is a Wine thread */
+    pthread_setspecific(wine_gst_key, &wine_gst_key);
+}
+
+static BOOL is_wine_thread(void)
+{
+    return pthread_getspecific(wine_gst_key) != NULL;
+}
+
+static pthread_mutex_t cb_list_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t cb_list_cond = PTHREAD_COND_INITIALIZER;
+static struct list cb_list = LIST_INIT(cb_list);
+
+static void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user)
+{
+    struct cb_data *cbdata = user;
+
+    if (cbdata->type < GSTDEMUX_MAX)
+        perform_cb_gstdemux(cbdata);
+
+    pthread_mutex_lock(&cbdata->lock);
+    cbdata->finished = 1;
+    pthread_cond_broadcast(&cbdata->cond);
+    pthread_mutex_unlock(&cbdata->lock);
+}
+
+static DWORD WINAPI dispatch_thread(void *user)
+{
+    struct cb_data *cbdata;
+
+    CoInitializeEx(NULL, COINIT_MULTITHREADED);
+
+    pthread_mutex_lock(&cb_list_lock);
+
+    while (1)
+    {
+        pthread_cond_wait(&cb_list_cond, &cb_list_lock);
+
+        while (!list_empty(&cb_list))
+        {
+            cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry);
+            list_remove(&cbdata->entry);
+
+            TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL);
+        }
+    }
+
+    pthread_mutex_unlock(&cb_list_lock);
+
+    CoUninitialize();
+
+    return 0;
+}
+
+void start_dispatch_thread(void)
+{
+    pthread_key_create(&wine_gst_key, NULL);
+    CloseHandle(CreateThread(NULL, 0, &dispatch_thread, NULL, 0, NULL));
+}
+
 /* gstreamer calls our callbacks from threads that Wine did not create. Some
  * callbacks execute code which requires Wine to have created the thread
  * (critical sections, debug logging, dshow client code). Since gstreamer can't
@@ -31,7 +97,7 @@
  * callbacks in code which avoids the Wine thread requirement, and then
  * dispatch those callbacks on a thread that is known to be created by Wine.
  *
- * This file must not contain any code that depends on the Wine TEB!
+ * This thread must not run any code that depends on the Wine TEB!
  */

static void call_cb(struct cb_data *cbdata)
diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h
index b3e2b237bb..4725f23ad1 100644
--- a/dlls/winegstreamer/gst_cbs.h
+++ b/dlls/winegstreamer/gst_cbs.h
@@ -42,7 +42,8 @@ enum CB_TYPE {
     REMOVED_DECODED_PAD,
     AUTOPLUG_BLACKLIST,
     UNKNOWN_TYPE,
-    QUERY_SINK
+    QUERY_SINK,
+    GSTDEMUX_MAX
 };

struct cb_data {
@@ -135,12 +136,8 @@ struct cb_data {
     struct list entry;
 };

-extern pthread_mutex_t cb_list_lock DECLSPEC_HIDDEN;
-extern pthread_cond_t cb_list_cond DECLSPEC_HIDDEN;
-extern struct list cb_list DECLSPEC_HIDDEN;
-void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) DECLSPEC_HIDDEN;
-BOOL is_wine_thread(void) DECLSPEC_HIDDEN;
 void mark_wine_thread(void) DECLSPEC_HIDDEN;
+void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN;

GstBusSyncReply watch_bus_wrapper(GstBus *bus, GstMessage *msg, gpointer user) DECLSPEC_HIDDEN;
 void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN;
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 3a29a03499..3c8d0d48b7 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer);

static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};

-static pthread_key_t wine_gst_key;
-
 struct gstdemux
 {
     struct strmbase_filter filter;
@@ -100,17 +98,6 @@ static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface);
 static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface);
 static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface);

-void mark_wine_thread(void)
-{
-    /* set it to non-NULL to indicate that this is a Wine thread */
-    pthread_setspecific(wine_gst_key, &wine_gst_key);
-}
-
-BOOL is_wine_thread(void)
-{
-    return pthread_getspecific(wine_gst_key) != NULL;
-}
-
 static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE *amt)
 {
     WAVEFORMATEXTENSIBLE *wfe;
@@ -2168,14 +2155,8 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This)
     return S_OK;
 }

-pthread_mutex_t cb_list_lock = PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t cb_list_cond = PTHREAD_COND_INITIALIZER;
-struct list cb_list = LIST_INIT(cb_list);
-
-void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user)
+void perform_cb_gstdemux(struct cb_data *cbdata)
 {
-    struct cb_data *cbdata = user;
-
     switch(cbdata->type)
     {
     case WATCH_BUS:
@@ -2259,44 +2240,11 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user)
                     data->query);
             break;
         }
-    }
-
-    pthread_mutex_lock(&cbdata->lock);
-    cbdata->finished = 1;
-    pthread_cond_broadcast(&cbdata->cond);
-    pthread_mutex_unlock(&cbdata->lock);
-}
-
-static DWORD WINAPI dispatch_thread(void *user)
-{
-    struct cb_data *cbdata;
-
-    CoInitializeEx(NULL, COINIT_MULTITHREADED);
-
-    pthread_mutex_lock(&cb_list_lock);
-
-    while(1){
-        pthread_cond_wait(&cb_list_cond, &cb_list_lock);
-
-        while(!list_empty(&cb_list)){
-            cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry);
-            list_remove(&cbdata->entry);
-
-            TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL);
+    default:
+        {
+            assert(0);
         }
     }
-
-    pthread_mutex_unlock(&cb_list_lock);
-
-    CoUninitialize();
-
-    return 0;
-}
-
-void start_dispatch_thread(void)
-{
-    pthread_key_create(&wine_gst_key, NULL);
-    CloseHandle(CreateThread(NULL, 0, &dispatch_thread, NULL, 0, NULL));
 }

static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b)

[PATCH v3 2/2] winegstreamer: Move broad callback handling code to gst_cbs.

[Zebediah Figura]

Signed-off-by: Zebediah Figura

[Zebediah Figura]

Signed-off-by: Zebediah Figura