Module: wine Branch: master Commit: f65cb89cbcaf2fddd9d8e79113528f6cea8dc86b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65cb89cbcaf2fddd9d8e7911...
Author: Zebediah Figura z.figura12@gmail.com Date: Mon Sep 30 08:53:52 2019 -0500
winegstreamer: Initialize COM on the callback dispatcher thread.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47822 Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/quartz/tests/filtergraph.c | 1 - dlls/winegstreamer/gstdemux.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index d7ae766f11..c781a52857 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -760,7 +760,6 @@ static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) HRESULT hr;
hr = IFilterGraph2_RenderFile(graph, filename, NULL); -todo_wine ok(SUCCEEDED(hr), "RenderFile failed: %x\n", hr);
if (SUCCEEDED(hr)) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index cee90d195b..66b7114c52 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2273,6 +2273,8 @@ static DWORD WINAPI dispatch_thread(void *user) { struct cb_data *cbdata;
+ CoInitializeEx(NULL, COINIT_MULTITHREADED); + pthread_mutex_lock(&cb_list_lock);
while(1){ @@ -2288,6 +2290,8 @@ static DWORD WINAPI dispatch_thread(void *user)
pthread_mutex_unlock(&cb_list_lock);
+ CoUninitialize(); + return 0; }