April 2020 - Wine-Devel - list.winehq.org

[opengl32] Add stub for wglSwapMultipleBuffers
by Vijay Kiran Kamuju April 28, 2020

April 28, 2020

supercedes 183300 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH] winex11.drv: Handle WM_GETMINMAXINFO while resizing resizable window.
by Jactry Zeng April 28, 2020

April 28, 2020

This patch only sets minimum tracking width/height when both ptMinTrackSize.x and ptMinTrackSize.y are non-zero value. And it didn't handle ptMaxTrackSize's case. Windows has a more complex behaviour which allows application to set minimum/maximum tracking width or height individually, but this patch already made some applications happy. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/winex11.drv/window.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 52e345ceb6..3c3e4bc9a5 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -694,6 +694,19 @@ static void set_size_hints( struct x11drv_win_data *data, DWORD style ) size_hints->min_height = size_hints->max_height; size_hints->flags |= PMinSize | PMaxSize; } + else + { + MINMAXINFO minmax; + + memset( &minmax, 0, sizeof(minmax) ); + SendMessageW( data->hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&minmax ); + if (minmax.ptMinTrackSize.x && minmax.ptMinTrackSize.y) + { + size_hints->min_width = minmax.ptMinTrackSize.x; + size_hints->min_height = minmax.ptMinTrackSize.y; + size_hints->flags |= PMinSize; + } + } } XSetWMNormalHints( data->display, data->whole_window, size_hints ); XFree( size_hints ); -- 2.26.2

1 0

[PATCH v3 2/2] d3dx9_36: Add more checks for D3DXOptimizeFaces
by Vijay Kiran Kamuju April 28, 2020

April 28, 2020

Remove warnings Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 2/2] d3dx9_36: Add more checks for D3DXOptimizeFaces
by Vijay Kiran Kamuju April 28, 2020

April 28, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 1/2] d3dx9_36: Add semi-stub for D3DXOptimizeVertices.
by Vijay Kiran Kamuju April 28, 2020

April 28, 2020

Added more checks and tests >From : Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/2] d3dx9_36: Add more checks for D3DXOptimizeFaces
by Vijay Kiran Kamuju April 28, 2020

April 28, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[website v2] zh-cn: Update forums page.
by Jactry Zeng April 28, 2020

April 28, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- templates/zh-cn/forums.template | 81 +++++++++++++++------------------ 1 file changed, 37 insertions(+), 44 deletions(-) diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index a33228fa..7304801e 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -1,18 +1,17 @@  - <h1 class="title">主要的邮件列表/论坛</h1> - Wine 有很多邮件列表和论坛，这里列举了对用户最有用的一些： +Wine 有很多邮件列表和论坛，这里列举了对用户最有用的一些： <ul> - <li><a href="//forums.winehq.org"> WineHQ 论坛</a></li> + <li><a href="//forum.winehq.org">WineHQ 论坛</a></li> - <li> Ubuntu 用户也许还想去 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu 论坛 Wine 板块</a> + <li>Ubuntu 用户也许还想去 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu 论坛 Wine 板块</a> <li>或许您还想去 <a href="http://www.linuxforums.org/forum/wine/">Linux Forums 的 Wine 板块</a> - <li>如果你想被告知最新的发布，请订阅 <a href="//www.winehq.org/mailman/listinfo/wine-announce"> Wine-Announce 邮件列表 </a></li> + <li>如果你想被告知最新的发布，请订阅 <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce 邮件列表 </a></li> </ul> 请不要新建英文的 Wine 论坛了（除非是一个流行发行版主要论坛上的 Wine 板块）。 @@ -22,90 +21,84 @@ <h2>所有 WineHQ 邮件列表</h2> WineHQ 分别有用于提交 patches、追踪 Git 提交、讨论 Wine 的邮件列表。他们拥有可定制的用户订阅配置，可以<a href="//www.winehq.org/mailman/listinfo">通过 -WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表名称-request(a)winehq.org 来订阅。 -如果想取消订阅，则使用“unsubscribe 密码”作为标题，密码是你在你订阅时获得的。 +WWW</a>，或者发送一封标题为 <code>"subscribe"</code> 的邮件到 <code><指定列表名称>-request(a)winehq.org</code> 来订阅。 +如果想取消订阅，则使用 <code>"unsubscribe <密码>"</code> 作为标题，密码是你在你订阅时获得的。或者直接使用 <a href="//www.winehq.org/mailman/listinfo">Mailman web 界面</a>。 +<div class="alert alert-warning"> + <h3 class="nomargin-top"> Web 界面需要密码登录</h3> + + 因为邮件列表不断得受到爬虫干扰，访问 Mailman 的 web 界面开启了密码保护。 + + + 用户名： <code>mailman</code> + 密码： <code>getalist</code> + + 密码会时不时更新，请从这里获取最新的密码。 +</div> + 注意： 你必须订阅后才能发送邮件到列表，否则你的邮件将被邮件列表软件判定为垃圾邮件。 <ul class="roomy"> <li> + <a href="mailto:wine-announce(a)winehq.org">wine-announce(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-announce">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-announce/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.announce">via newsreader</a>] - <a href="mailto:wine-announce(a)winehq.org">wine-announce(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">存档 2</a>] 一个低流量（2封/月）的只读列表，用于宣布发布和其他主要的 Wine 或者 WineHQ 消息。 </li> <li> - [<a href="//www.winehq.org/pipermail/wine-users/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">存档 2</a>] - 一个中等流量（50封/天）的开放性列表，用于终端用户讨论。 - </li> - - <li> + <a href="mailto:wine-zh(a)freelists.org">wine-zh(a)freelists.org</a> [<a href="http://www.freelists.org/list/wine-zh">（取消）订阅</a>] - [<a href="http://www.freelists.org/archive/wine-zh/">存档</a>] - <a href="mailto:wine-zh(a)freelists.org">wine-zh(a)freelists.org</a> + [<a href="http://www.freelists.org/archive/wine-zh/">Archive</a>] 一个低流量（10封/天）的开放性列表，用于中文终端用户讨论。 </li> <li> + <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-devel">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-devel/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>] - <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">存档 2</a>] 一个中等流量（50封/天）的开放性列表，用于讨论 Wine 开发、WineHQ、patches 或者其他 Wine 开发者感兴趣的事情。 </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - 一个中等流量（45封/天）的开放性列表，只用于提交 patches。 + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">（取消）订阅</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">存档 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">存档 2</a>] + 一个已经废弃的用于提交补丁的列表。请使用 <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> 代替。 </li> <li> + <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] - <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">存档 2</a>] 一个中等流量（25封/天）的只读列表，用于追踪 Git tree 上的 commits。 </li> <li> + <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-releases">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-releases/">存档 1</a>] - <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> + [<a href="//www.winehq.org/pipermail/wine-releases/">存档 1</a>] 一个低流量（2封/月）的只读列表，用于接收每个 Wine official release 的大体积 diff 文件。 </li> <li> - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.license">存档 1</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.license">via newsreader</a>] - - 已经关闭的列表，用于讨论与 Wine 有关的法律议题，包括许可证议题。（关闭于 2004-12-16） - </li> - - <li> + <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-bugs/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] - <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">存档 2</a>] 一个大流量（100封/天）的只读列表，用于监听 <a href="//bugs.winehq.org/">Bug Tracking Database</a> 的活动。 </li> <li> + <a href="mailto:wine-tests-results(a)winehq.org">wine-tests-results(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-tests-results">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-tests-results/">存档</a>] - <a href="mailto:wine-tests-results(a)winehq.org">wine-tests-results(a)winehq.org</a> + [<a href="//www.winehq.org/pipermail/wine-tests-results/">存档</a>] 一个中等流量（10封/天）的开放性列表，用于提交测试结果。 </li> -- 2.26.2

1 0

[PATCH v2 6/6] qcap/videocapture: Reimplement source_get_media_type().
by Jactry Zeng April 28, 2020

April 28, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/vfwcapture.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 967bdba22e..14542ec7fc 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -522,11 +522,13 @@ static HRESULT source_get_media_type(struct strmbase_pin *pin, VfwCapture *filter = impl_from_strmbase_pin(pin); AM_MEDIA_TYPE *vfw_pmt; HRESULT hr; + LONG count; - if (iPosition > 0) + count = qcap_driver_get_caps_count(filter->driver_info); + if (iPosition >= count) return VFW_S_NO_MORE_ITEMS; - hr = qcap_driver_get_format(filter->driver_info, &vfw_pmt); + hr = qcap_driver_get_caps(filter->driver_info, iPosition, &vfw_pmt, NULL); if (SUCCEEDED(hr)) { CopyMediaType(pmt, vfw_pmt); DeleteMediaType(vfw_pmt); -- 2.26.2

1 0

[PATCH v2 5/6] qcap/videocapture: Implement IAMStreamConfig_GetStreamCaps().
by Jactry Zeng April 28, 2020

April 28, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/capture.h | 1 + dlls/qcap/tests/videocapture.c | 22 ++++++++++++++++++++++ dlls/qcap/v4l.c | 19 +++++++++++++++++++ dlls/qcap/vfwcapture.c | 11 +++++++---- 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index e34c33fb0f..f67936d15b 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -27,6 +27,7 @@ Capture *qcap_driver_init(struct strmbase_source *,USHORT) DECLSPEC_HIDDEN; HRESULT qcap_driver_destroy(Capture*) DECLSPEC_HIDDEN; HRESULT qcap_driver_check_format(Capture*,const AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_caps(Capture *device,LONG index,AM_MEDIA_TYPE **pmt,BYTE *vscc) DECLSPEC_HIDDEN; LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_prop_range(Capture*,VideoProcAmpProperty,LONG*,LONG*,LONG*,LONG*,LONG*) DECLSPEC_HIDDEN; diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index ab9e19b461..448136791b 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -64,6 +64,7 @@ static void test_stream_config(IPin *pin) { VIDEOINFOHEADER *video_info, *video_info2; AM_MEDIA_TYPE *format, *format2; + VIDEO_STREAM_CONFIG_CAPS vscc; IAMStreamConfig *stream_config; LONG depth, compression; LONG count, size; @@ -127,6 +128,12 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_GetNumberOfCapabilities(stream_config, NULL, &size); ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetStreamCaps(stream_config, 0, NULL, (BYTE *)&vscc); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetStreamCaps(stream_config, 0, &format, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); } hr = IAMStreamConfig_GetNumberOfCapabilities(stream_config, &count, &size); @@ -134,6 +141,21 @@ static void test_stream_config(IPin *pin) ok(count != 0xdeadbeef, "Got wrong count: %d.\n", count); ok(size == sizeof(VIDEO_STREAM_CONFIG_CAPS), "Got wrong size: %d.\n", size); + hr = IAMStreamConfig_GetStreamCaps(stream_config, 100000, NULL, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetStreamCaps(stream_config, 100000, &format, (BYTE *)&vscc); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetStreamCaps(stream_config, 0, &format, (BYTE *)&vscc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", + debugstr_guid(&MEDIATYPE_Video)); + ok(IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo) + || IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo2), "Got wrong guid: %s.\n", + debugstr_guid(&vscc.guid)); + FreeMediaType(format); + IAMStreamConfig_Release(stream_config); } diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 33e05dd545..6af456aae7 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -625,6 +625,20 @@ error: return NULL; } +HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **type, BYTE *vscc) +{ + if (index >= device->caps_count) + return S_FALSE; + + *type = CreateMediaType(&device->caps[index].media_type); + if (!*type) + return E_OUTOFMEMORY; + + if (vscc) + memcpy(vscc, &device->caps[index].config, sizeof(VIDEO_STREAM_CONFIG_CAPS)); + return S_OK; +} + LONG qcap_driver_get_caps_count(Capture *device) { return device->caps_count; @@ -704,6 +718,11 @@ void qcap_driver_cleanup_stream(Capture *device) ERR("v4l absent: shouldn't be called\n"); } +HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **type, BYTE *vscc) +{ + FAIL_WITH_ERR; +} + LONG qcap_driver_get_caps_count(Capture *device) { ERR("v4l absent: shouldn't be called\n"); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 652b213ccc..967bdba22e 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -259,11 +259,14 @@ AMStreamConfig_GetNumberOfCapabilities(IAMStreamConfig *iface, int *count, int * } static HRESULT WINAPI -AMStreamConfig_GetStreamCaps( IAMStreamConfig *iface, int iIndex, - AM_MEDIA_TYPE **pmt, BYTE *pSCC ) +AMStreamConfig_GetStreamCaps(IAMStreamConfig *iface, int index, + AM_MEDIA_TYPE **pmt, BYTE *vscc) { - FIXME("%p: %d %p %p - stub, intentional\n", iface, iIndex, pmt, pSCC); - return E_NOTIMPL; /* Not implemented for this interface */ + VfwCapture *This = impl_from_IAMStreamConfig(iface); + + TRACE("(%p, %d, %p, %p).\n", iface, index, pmt, vscc); + + return qcap_driver_get_caps(This->driver_info, index, pmt, vscc); } static const IAMStreamConfigVtbl IAMStreamConfig_VTable = -- 2.26.2

1 0

[PATCH v2 4/6] qcap/videocapture: Implement IAMStreamConfig_GetNumberOfCapabilities().
by Jactry Zeng April 28, 2020

April 28, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/capture.h | 1 + dlls/qcap/tests/videocapture.c | 18 ++++++++++++++++++ dlls/qcap/v4l.c | 11 +++++++++++ dlls/qcap/vfwcapture.c | 19 +++++++++++++------ 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index fa48324dd6..e34c33fb0f 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -27,6 +27,7 @@ Capture *qcap_driver_init(struct strmbase_source *,USHORT) DECLSPEC_HIDDEN; HRESULT qcap_driver_destroy(Capture*) DECLSPEC_HIDDEN; HRESULT qcap_driver_check_format(Capture*,const AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; +LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_prop_range(Capture*,VideoProcAmpProperty,LONG*,LONG*,LONG*,LONG*,LONG*) DECLSPEC_HIDDEN; HRESULT qcap_driver_get_prop(Capture*,VideoProcAmpProperty,LONG*,LONG*) DECLSPEC_HIDDEN; diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 39535adece..ab9e19b461 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -66,6 +66,7 @@ static void test_stream_config(IPin *pin) AM_MEDIA_TYPE *format, *format2; IAMStreamConfig *stream_config; LONG depth, compression; + LONG count, size; HRESULT hr; hr = IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **)&stream_config); @@ -116,6 +117,23 @@ static void test_stream_config(IPin *pin) ok(hr == E_FAIL, "Got hr %#x.\n", hr); FreeMediaType(format); + count = 0xdeadbeef; + size = 0xdeadbeef; + /* Crash on Windows */ + if (0) + { + hr = IAMStreamConfig_GetNumberOfCapabilities(stream_config, &count, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetNumberOfCapabilities(stream_config, NULL, &size); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + hr = IAMStreamConfig_GetNumberOfCapabilities(stream_config, &count, &size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count != 0xdeadbeef, "Got wrong count: %d.\n", count); + ok(size == sizeof(VIDEO_STREAM_CONFIG_CAPS), "Got wrong size: %d.\n", size); + IAMStreamConfig_Release(stream_config); } diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b065478d3a..33e05dd545 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -625,6 +625,11 @@ error: return NULL; } +LONG qcap_driver_get_caps_count(Capture *device) +{ + return device->caps_count; +} + #else Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) @@ -699,4 +704,10 @@ void qcap_driver_cleanup_stream(Capture *device) ERR("v4l absent: shouldn't be called\n"); } +LONG qcap_driver_get_caps_count(Capture *device) +{ + ERR("v4l absent: shouldn't be called\n"); + return 0; +} + #endif /* defined(VIDIOCMCAPTURE) */ diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 6c9cc3ce51..652b213ccc 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -167,7 +167,7 @@ static const struct strmbase_filter_ops filter_ops = .filter_cleanup_stream = vfw_capture_cleanup_stream, }; -/* AMStreamConfig interface, we only need to implement {G,S}etFormat */ +/* AMStreamConfig interface */ static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig *iface, REFIID iid, void **out) { VfwCapture *filter = impl_from_IAMStreamConfig(iface); @@ -243,12 +243,19 @@ AMStreamConfig_GetFormat( IAMStreamConfig *iface, AM_MEDIA_TYPE **pmt ) } static HRESULT WINAPI -AMStreamConfig_GetNumberOfCapabilities( IAMStreamConfig *iface, int *piCount, - int *piSize ) +AMStreamConfig_GetNumberOfCapabilities(IAMStreamConfig *iface, int *count, int *size) { - FIXME("%p: %p %p - stub, intentional\n", iface, piCount, piSize); - *piCount = 0; - return E_NOTIMPL; /* Not implemented for this interface */ + VfwCapture *This = impl_from_IAMStreamConfig(iface); + + TRACE("(%p, %p, %p).\n", iface, count, size); + + if (!count || !size) + return E_POINTER; + + *count = qcap_driver_get_caps_count(This->driver_info); + *size = sizeof(VIDEO_STREAM_CONFIG_CAPS); + + return S_OK; } static HRESULT WINAPI -- 2.26.2

1 0