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

qcap/vfwcapture: Return VFW_S_CANT_CUE from GetState(), not Pause(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-07-21 17:49:58 -05:00 committed by Alexandre Julliard
parent 7f0347bb04
commit 5e407cec53
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/qcap/vfwcapture.c
View File

@ -124,7 +124,7 @@ static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface)
VfwCapture *filter = impl_from_strmbase_filter(iface); VfwCapture *filter = impl_from_strmbase_filter(iface);
filter->device->ops->init_stream(filter->device); filter->device->ops->init_stream(filter->device);
return VFW_S_CANT_CUE; return S_OK;
} }
static HRESULT vfw_capture_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time) static HRESULT vfw_capture_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time)
@ -140,7 +140,7 @@ static HRESULT vfw_capture_stop_stream(struct strmbase_filter *iface)
VfwCapture *filter = impl_from_strmbase_filter(iface); VfwCapture *filter = impl_from_strmbase_filter(iface);
filter->device->ops->stop_stream(filter->device); filter->device->ops->stop_stream(filter->device);
return VFW_S_CANT_CUE; return S_OK;
} }
static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface)
@ -151,6 +151,11 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface)
return S_OK; return S_OK;
} }
static HRESULT vfw_capture_wait_state(struct strmbase_filter *iface, DWORD timeout)
{
return iface->state == State_Paused ? VFW_S_CANT_CUE : S_OK;
}
static const struct strmbase_filter_ops filter_ops = static const struct strmbase_filter_ops filter_ops =
{ {
.filter_get_pin = vfw_capture_get_pin, .filter_get_pin = vfw_capture_get_pin,
@ -160,6 +165,7 @@ static const struct strmbase_filter_ops filter_ops =
.filter_start_stream = vfw_capture_start_stream, .filter_start_stream = vfw_capture_start_stream,
.filter_stop_stream = vfw_capture_stop_stream, .filter_stop_stream = vfw_capture_stop_stream,
.filter_cleanup_stream = vfw_capture_cleanup_stream, .filter_cleanup_stream = vfw_capture_cleanup_stream,
.filter_wait_state = vfw_capture_wait_state,
}; };
static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig *iface, REFIID iid, void **out) static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig *iface, REFIID iid, void **out)