Skip to content

W
wine-cw
Commit 608acdc8 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

quartz/videorenderer: Make VideoRenderer_SendSampleData() infallible.

We already rejected any other format types when connecting. Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 90fc0204
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 8 deletions
dlls/quartz/videorenderer.c
View file @ 608acdc8
...@@ -134,7 +134,7 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) ...@@ -134,7 +134,7 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This)
ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_SHOW); ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_SHOW);
} }
static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) static void VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size)
{ {
const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt;
BITMAPINFOHEADER *bmiHeader; BITMAPINFOHEADER *bmiHeader;
...@@ -150,11 +150,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, ...@@ -150,11 +150,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data,
{ {
bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader;
} }
else
{
FIXME("Unknown subtype %s.\n", debugstr_guid(&amt->subtype));
return VFW_E_RUNTIME_ERROR;
}
TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect)); TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect));
TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect)); TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect));
...@@ -165,8 +160,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, ...@@ -165,8 +160,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data,
This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top, This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top,
data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY);
ReleaseDC(This->baseControlWindow.baseWindow.hWnd, dc); ReleaseDC(This->baseControlWindow.baseWindow.hWnd, dc);
return S_OK;
} }
static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter, static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment