wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_X32_TYPELESS_G8X24_UINT.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: 81cd4e21bf7c5f3951a8cd9554e00dc9bfb22da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81cd4e21bf7c5f3951a8cd95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 03:04:58 2020 +0430 wined3d: Add Vulkan format information for WINED3DFMT_X32_TYPELESS_G8X24_UINT. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b5df4a2b10..be3ad90107 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4202,6 +4202,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, }, + {WINED3DFMT_X32_TYPELESS_G8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties;

1 0

Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_R32_FLOAT_X8X24_TYPELESS.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: 4ecb026c49634396564b05c8d0c78e824a22d92a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ecb026c49634396564b05c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 03:04:57 2020 +0430 wined3d: Add Vulkan format information for WINED3DFMT_R32_FLOAT_X8X24_TYPELESS. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0397056441..b5df4a2b10 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4201,6 +4201,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, + {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties;

1 0

Jactry Zeng : zh-cn: Update forums page.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: website Branch: master Commit: dccd8b12e3bce9d7a9cc2112e5111b1ca6c614be URL: https://source.winehq.org/git/website.git/?a=commit;h=dccd8b12e3bce9d7a9cc2… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Apr 28 22:32:30 2020 +0800 zh-cn: Update forums page. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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@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@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@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@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@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@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@winehq.org">wine-patches(a)winehq.org</a> - 一个中等流量（45封/天）的开放性列表，只用于提交 patches。 + <a href="mailto:wine-patches@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@winehq.org">wine-devel(a)winehq.org</a> 代替。 </li> <li> + <a href="mailto:wine-cvs@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@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@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@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@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@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@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@winehq.org">wine-tests-results(a)winehq.org</a> + [<a href="//www.winehq.org/pipermail/wine-tests-results/">存档</a>] 一个中等流量（10封/天）的开放性列表，用于提交测试结果。 </li>

1 0

Andrew Eikum : include/xapo.idl: Add XAPO registration flags.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: 7ccc45f754a39a425ecc2358a4cfc5675ff11ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ccc45f754a39a425ecc2358… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 28 13:18:16 2020 -0500 include/xapo.idl: Add XAPO registration flags. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xapo.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/xapo.idl b/include/xapo.idl index 7b28ac9f43..841793d4fa 100644 --- a/include/xapo.idl +++ b/include/xapo.idl @@ -20,6 +20,13 @@ import "unknwn.idl"; #define XAPO_REGISTRATION_STRING_LENGTH 256 +cpp_quote("#define XAPO_FLAG_CHANNELS_MUST_MATCH 0x1") +cpp_quote("#define XAPO_FLAG_FRAMERATE_MUST_MATCH 0x2") +cpp_quote("#define XAPO_FLAG_BITSPERSAMPLE_MUST_MATCH 0x4") +cpp_quote("#define XAPO_FLAG_BUFFERCOUNT_MUST_MATCH 0x8") +cpp_quote("#define XAPO_FLAG_INPLACE_SUPPORTED 0x10") +cpp_quote("#define XAPO_FLAG_INPLACE_REQUIRED 0x20") + cpp_quote("#if 0") typedef struct WAVEFORMATEX {

1 0

Jacek Caban : server: Delay setting system registers until suspending select is waken.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: 341068aa61a71afecb712feda9aabb3dc1c3ab5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=341068aa61a71afecb712fed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 28 19:38:25 2020 +0200 server: Delay setting system registers until suspending select is waken. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/server/thread.c b/server/thread.c index 99ae99b26f..ea545d5c30 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1706,7 +1706,13 @@ DECL_HANDLER(select) else if (get_error() != STATUS_PENDING && get_reply_max_size() == sizeof(context_t) && current->context && current->suspend_cookie == req->cookie) { - if (current->context->regs.flags) set_reply_data( &current->context->regs, sizeof(context_t) ); + if (current->context->regs.flags) + { + unsigned int system_flags = get_context_system_regs(current->process->cpu) & + current->context->regs.flags; + if (system_flags) set_thread_context( current, &current->context->regs, system_flags ); + set_reply_data( &current->context->regs, sizeof(context_t) ); + } release_object( current->context ); current->context = NULL; } @@ -1896,14 +1902,13 @@ DECL_HANDLER(set_thread_context) else { unsigned int system_flags = get_context_system_regs(context->cpu) & context->flags; - unsigned int client_flags = context->flags & ~system_flags; - if (system_flags) set_thread_context( thread, context, system_flags ); - if (thread != current && !get_error()) stop_thread( thread ); + if (thread != current) stop_thread( thread ); + else if (system_flags) set_thread_context( thread, context, system_flags ); if (thread->context && !get_error()) { copy_context( &thread->context->regs, context, context->flags ); - thread->context->regs.flags |= client_flags; + thread->context->regs.flags |= context->flags; } }

1 0

Jacek Caban : server: Don't try to synchronize system registers on not initialized threads in get_thread_context request.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: e5a9c256ce08868f65ed730c00cf016a97369ce3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5a9c256ce08868f65ed730c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 28 19:38:09 2020 +0200 server: Don't try to synchronize system registers on not initialized threads in get_thread_context request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index 7c1c1108eb..99ae99b26f 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1840,7 +1840,7 @@ DECL_HANDLER(get_thread_context) if (thread->context) { /* make sure that system regs are valid in thread context */ - if (req->flags & system_flags & ~thread->context->regs.flags) + if (thread->unix_tid != -1 && (req->flags & system_flags & ~thread->context->regs.flags)) get_thread_context( thread, &thread->context->regs, req->flags & system_flags ); if (!get_error()) thread_context = (struct context *)grab_object( thread->context ); }

1 0

Piotr Caban : msvcrt: Improve string to double conversion accuracy.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: ed07d07bed0b2c7197c193010742c87247ea34af URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed07d07bed0b2c7197c19301… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 28 19:21:57 2020 +0200 msvcrt: Improve string to double conversion accuracy. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 266 ++++++++++++++++++++++++++++--------------- dlls/ucrtbase/tests/string.c | 17 ++- 2 files changed, 184 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed07d07bed0b2c7197c1…

1 0

Piotr Caban : msvcrt: Fix overflow checks in parse_double.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: 405c99ef52d00ad032dcd672f7d08c52504aa0f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=405c99ef52d00ad032dcd672… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 28 19:21:40 2020 +0200 msvcrt: Fix overflow checks in parse_double. Old check is optimized out in gcc 9.3.0 when -O2 optimization is enabled. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 8183feacc0..9d122872d0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -555,8 +555,8 @@ static double strtod16(MSVCRT_wchar_t get(void *ctx), void unget(void *ctx), if((nch!=MSVCRT_WEOF) && (nch < '0' || nch > '9')) unget(ctx); e *= s; - if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN; - else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; + if(e<0 && exp<INT_MIN-e) exp = INT_MIN; + else if(e>0 && exp>INT_MAX-e) exp = INT_MAX; else exp += e; } else { if(nch != MSVCRT_WEOF) unget(ctx); @@ -784,8 +784,8 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), if(nch != MSVCRT_WEOF) unget(ctx); e *= s; - if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN; - else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; + if(e<0 && exp<INT_MIN-e) exp = INT_MIN; + else if(e>0 && exp>INT_MAX-e) exp = INT_MAX; else exp += e; } else { if(nch != MSVCRT_WEOF) unget(ctx);

1 0

Jactry Zeng : qcap/videocapture: Reimplement source_get_media_type().
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: d0a926baf40b1b652911e49be404f2be707a552e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a926baf40b1b652911e49b… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Apr 28 11:55:21 2020 -0500 qcap/videocapture: Reimplement source_get_media_type(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 71ca4502b9..7b759f0173 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -515,16 +515,16 @@ static HRESULT source_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE } static HRESULT source_get_media_type(struct strmbase_pin *pin, - unsigned int iPosition, AM_MEDIA_TYPE *pmt) + unsigned int index, AM_MEDIA_TYPE *pmt) { VfwCapture *filter = impl_from_strmbase_pin(pin); AM_MEDIA_TYPE *vfw_pmt; HRESULT hr; - if (iPosition > 0) + if (index >= qcap_driver_get_caps_count(filter->driver_info)) return VFW_S_NO_MORE_ITEMS; - hr = qcap_driver_get_format(filter->driver_info, &vfw_pmt); + hr = qcap_driver_get_caps(filter->driver_info, index, &vfw_pmt, NULL); if (SUCCEEDED(hr)) { CopyMediaType(pmt, vfw_pmt); DeleteMediaType(vfw_pmt);

1 0

Jactry Zeng : qcap/videocapture: Implement IAMStreamConfig::GetStreamCaps().
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: c8b1b993adf992d71c0a88e8908c6ad1dd81a70d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8b1b993adf992d71c0a88e8… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Apr 28 11:55:20 2020 -0500 qcap/videocapture: Implement IAMStreamConfig::GetStreamCaps(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capture.h | 2 ++ dlls/qcap/tests/videocapture.c | 22 ++++++++++++++++++++++ dlls/qcap/v4l.c | 21 +++++++++++++++++++++ dlls/qcap/vfwcapture.c | 12 +++++++----- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index e34c33fb0f..615988bda3 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -27,6 +27,8 @@ 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, + VIDEO_STREAM_CONFIG_CAPS *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 112c57e89b..afc9bf2c93 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -624,6 +624,21 @@ error: return NULL; } +HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **type, + VIDEO_STREAM_CONFIG_CAPS *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; @@ -703,6 +718,12 @@ 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, + VIDEO_STREAM_CONFIG_CAPS *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 8fb0c0d7bd..71ca4502b9 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -257,12 +257,14 @@ static HRESULT WINAPI AMStreamConfig_GetNumberOfCapabilities(IAMStreamConfig *if return S_OK; } -static HRESULT WINAPI -AMStreamConfig_GetStreamCaps( IAMStreamConfig *iface, int iIndex, - AM_MEDIA_TYPE **pmt, BYTE *pSCC ) +static HRESULT WINAPI 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 *filter = impl_from_IAMStreamConfig(iface); + + TRACE("filter %p, index %d, pmt %p, vscc %p.\n", filter, index, pmt, vscc); + + return qcap_driver_get_caps(filter->driver_info, index, pmt, (VIDEO_STREAM_CONFIG_CAPS *)vscc); } static const IAMStreamConfigVtbl IAMStreamConfig_VTable =

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
102
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2020