From: Haoyang Chen chenhaoyang@kylinos.cn
--- dlls/qcap/tests/videocapture.c | 4 ++-- dlls/qcap/v4l.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index f681381ed33..f60ecee0180 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -275,10 +275,10 @@ static void test_stream_config(IPin *pin) test_format.lSampleSize = video_info.bmiHeader.biSizeImage;
hr = IPin_QueryAccept(pin, &test_format); - todo_wine ok(hr != S_OK, "Got hr %#lx.\n", hr); + ok(hr != S_OK, "Got hr %#lx.\n", hr);
hr = IAMStreamConfig_SetFormat(stream_config, &test_format); - todo_wine ok(hr == E_FAIL, "Got hr %#lx.\n", hr); + ok(hr == E_FAIL, "Got hr %#lx.\n", hr); } }
diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 5ab9613b4e2..5efb4b7e505 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -141,6 +141,7 @@ static const struct caps *find_caps(struct video_capture_device *device, const A struct caps *caps = &device->caps[index];
if (IsEqualGUID(&mt->formattype, &caps->media_type.formattype) + && IsEqualGUID(&mt->subtype, &caps->media_type.subtype) && video_info->bmiHeader.biWidth == caps->video_info.bmiHeader.biWidth && video_info->bmiHeader.biHeight == caps->video_info.bmiHeader.biHeight) return caps;