Zebediah Figura : qcap/vfwcapture: Return VFW_S_CANT_CUE from GetState(), not Pause().
Alexandre Julliard
julliard at winehq.org
Wed Jul 22 16:34:28 CDT 2020
Module: wine
Branch: master
Commit: 5e407cec530e2d79f04a755e7f818c2ef84d725e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e407cec530e2d79f04a755e7f818c2ef84d725e
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Jul 21 17:49:58 2020 -0500
qcap/vfwcapture: Return VFW_S_CANT_CUE from GetState(), not Pause().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/qcap/vfwcapture.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c
index 7d82a01109..910be107b0 100644
--- a/dlls/qcap/vfwcapture.c
+++ b/dlls/qcap/vfwcapture.c
@@ -124,7 +124,7 @@ static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface)
VfwCapture *filter = impl_from_strmbase_filter(iface);
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)
@@ -140,7 +140,7 @@ static HRESULT vfw_capture_stop_stream(struct strmbase_filter *iface)
VfwCapture *filter = impl_from_strmbase_filter(iface);
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)
@@ -151,6 +151,11 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface)
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 =
{
.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_stop_stream = vfw_capture_stop_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)
More information about the wine-cvs
mailing list