ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quartz/videorenderer: Create the window on the same thread as the filter. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-10-02 22:01:08 -05:00 committed by Alexandre Julliard
parent 428c5b28e3
commit 3b5198c828
2 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/quartz/tests/filtergraph.c
View File

@ -4095,7 +4095,7 @@ static void test_window_threading(void)
if ((hwnd = get_renderer_hwnd(graph)))
{
tid = GetWindowThreadProcessId(hwnd, NULL);
todo_wine ok(tid == GetCurrentThreadId(), "Window should be created on main thread.\n");
ok(tid == GetCurrentThreadId(), "Window should be created on main thread.\n");
}
else
skip("Could not find renderer window.\n");

47
dlls/quartz/videorenderer.c
View File

@ -45,11 +45,8 @@ typedef struct VideoRendererImpl
IOverlay IOverlay_iface;
BOOL init;
HANDLE hThread;
DWORD ThreadID;
HANDLE hEvent;
BOOL ThreadResult;
RECT SourceRect;
RECT DestRect;
RECT WindowPos;
@ -83,57 +80,18 @@ static inline VideoRendererImpl *impl_from_BaseControlVideo(BaseControlVideo *if
return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlVideo);
}
static DWORD WINAPI MessageLoop(LPVOID lpParameter)
{
VideoRendererImpl* This = lpParameter;
MSG msg;
BOOL fGotMessage;
TRACE("Starting message loop\n");
if (FAILED(BaseWindowImpl_PrepareWindow(&This->baseControlWindow.baseWindow)))
{
This->ThreadResult = FALSE;
SetEvent(This->hEvent);
return 0;
}
This->ThreadResult = TRUE;
SetEvent(This->hEvent);
while ((fGotMessage = GetMessageW(&msg, NULL, 0, 0)) != 0 && fGotMessage != -1)
{
TranslateMessage(&msg);
DispatchMessageW(&msg);
}
TRACE("End of message loop\n");
return msg.wParam;
}
static BOOL CreateRenderingSubsystem(VideoRendererImpl* This)
{
This->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
if (!This->hEvent)
return FALSE;
This->hThread = CreateThread(NULL, 0, MessageLoop, This, 0, &This->ThreadID);
if (!This->hThread)
if (FAILED(BaseWindowImpl_PrepareWindow(&This->baseControlWindow.baseWindow)))
{
CloseHandle(This->hEvent);
return FALSE;
}
WaitForSingleObject(This->hEvent, INFINITE);
if (!This->ThreadResult)
{
CloseHandle(This->hEvent);
CloseHandle(This->hThread);
return FALSE;
}
return TRUE;
}
@ -379,9 +337,6 @@ static void video_renderer_destroy(BaseRenderer *iface)
BaseControlWindow_Destroy(&filter->baseControlWindow);
BaseControlVideo_Destroy(&filter->baseControlVideo);
PostThreadMessageW(filter->ThreadID, WM_QUIT, 0, 0);
WaitForSingleObject(filter->hThread, INFINITE);
CloseHandle(filter->hThread);
CloseHandle(filter->hEvent);
strmbase_renderer_cleanup(&filter->renderer);