October 2021 - Wine-commits

Cressida Silver : typo
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 02b027007dd969eac91ec769f380ac506280ba7a URL: https://source.winehq.org/git/website.git/?a=commit;h=02b027007dd969eac91ec… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Oct 29 08:57:22 2021 -0500 typo --- wwn/en/wn20211029_406.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wwn/en/wn20211029_406.xml b/wwn/en/wn20211029_406.xml index 46d1e9ff..6f8be0d5 100644 --- a/wwn/en/wn20211029_406.xml +++ b/wwn/en/wn20211029_406.xml @@ -74,7 +74,7 @@ <section title="Unicode 14" subject="Unicode 14" archive="https://www.winehq.org/pipermail/wine-devel/2021-September/195389.html" posts="1"> <p> - Nikolay has moved Wine from the boring world of Unicode 13 to the brave new world of Unicode 14. Who wants to live in a world without the melting smiley face or the bitten lower lip? Not us — that’s for sure. When Unicode 14 is rolled out to the interwebs at large, there will be a grand total of characters to 144,697. Of course, Wine requires the underlying system fonts to support the new Unicode characters, which will take some time. + Nikolay has moved Wine from the boring world of Unicode 13 to the brave new world of Unicode 14. Who wants to live in a world without the melting smiley face or the bitten lower lip? Not us — that’s for sure. When Unicode 14 is rolled out to the interwebs at large, there will be a grand total of 144,697 characters. Of course, Wine requires the underlying system fonts to support the new Unicode characters, which will take some time. </p> <p>

1 0

Jeremy Newman : add nav link for news, add wwn archive link
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 702015e9559479c7f93129bce2a68fe92ec49046 URL: https://source.winehq.org/git/website.git/?a=commit;h=702015e9559479c7f9312… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 29 08:18:30 2021 -0500 add nav link for news, add wwn archive link --- templates/en/home.template | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/templates/en/home.template b/templates/en/home.template index 20212534..5183f1c8 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -111,6 +111,16 @@ </a> <div class="clear"></div> + <a class="winehq_menu_item appdb" href="{$root}/news"> + <span class="winehq_badge fa-4x fa-layers fa-fw"> + <i class="winehq_badge_inner fas fa-square"></i> + <i class="fa-inverse fas fa-newspaper" data-fa-transform="shrink-6"></i> + </span> + <span class="title">News</span> + <span class="subtitle">What is going on lately?</span> + </a> + <div class="clear"></div> + <a class="winehq_menu_item appdb" href="https://appdb.winehq.org"> <span class="winehq_badge fa-4x fa-layers fa-fw"> <i class="winehq_badge_inner fas fa-square"></i> @@ -163,7 +173,11 @@  - <p><a href="{$root}/news" class="btn btn-default"><span class="glyphicon glyphicon-chevron-right"></span> more news...</a></p> + <p> + <a href="{$root}/news" class="btn btn-default"><i class="fas fa-chevron-right"></i> News Archive</a> +   + <a href="{$root}/wwn" class="btn btn-default"><i class="fas fa-newspaper"></i> World Wine News</a> + </p> </div>

1 0

Jeremy Newman : move wwn link to top, add intro text, icon
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 37d874852c38bfb10281aac39ef79eed1ec71869 URL: https://source.winehq.org/git/website.git/?a=commit;h=37d874852c38bfb10281a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 29 08:24:01 2021 -0500 move wwn link to top, add intro text, icon --- templates/en/news.template | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/templates/en/news.template b/templates/en/news.template index 719e0727..6c5c125d 100644 --- a/templates/en/news.template +++ b/templates/en/news.template @@ -1,15 +1,17 @@  -<h1 class="title">News</h1> +<h1 class="title"><i class="far fa-newspaper"></i> News</h1> + +<p class="margin-bottom-lg"> + Latest news in the Wine community.<br> + More news can be found in our + <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> World Wine News Archive</a> +</p>  <hr> <div class="link-container"> - <p> - <a href="{$root}/wwn"><i class="fas fa-newspaper"></i> World Wine News Archive</a> -   <i class="fas fa-ellipsis-v"></i>   - <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ News RSS Feed</a> - </p> + <a href="{$root}/news/rss"><i class="fas fa-rss-square"></i> WineHQ News RSS Feed</a> </div>

1 0

Jeremy Newman : small layout tweak, icon
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 24930bca23eda7162b43879126631044e1406fe2 URL: https://source.winehq.org/git/website.git/?a=commit;h=24930bca23eda7162b438… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 29 08:37:17 2021 -0500 small layout tweak, icon --- templates/en/wwn.template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/en/wwn.template b/templates/en/wwn.template index a6a5ba31..e0dec76d 100644 --- a/templates/en/wwn.template +++ b/templates/en/wwn.template @@ -2,9 +2,8 @@   -<h1 class="title">World Wine News</h1> -<div style="font-size: x-small; margin-top: 0;">All the news that fits, we print.</div> - - +<h1 class="title"><i class="far fa-newspaper"></i> World Wine News</h1> +<p class="margin-bottom-lg">All the news that fits, we print.</p> +

1 0

Jeremy Newman : use buttons for nav
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 28c8ef80ede81077d168202a7d414a09043eb41b URL: https://source.winehq.org/git/website.git/?a=commit;h=28c8ef80ede81077d1682… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 29 08:37:47 2021 -0500 use buttons for nav --- include/wwn.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wwn.php b/include/wwn.php index 9231be81..6aeb7d35 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -172,22 +172,22 @@ class wwn if ($pos >= $perpage) { $prev = $pos - $perpage; - $prevLink = $html->ahref("<< Prev $perpage Issues", $html->_web_root."/".PAGE."/?pos=".$prev); + $prevLink = $html->ahref("<i class=\"fas fa-chevron-left\"></i> Prev $perpage Issues", $html->_web_root."/".PAGE."/?pos=".$prev, "class=\"btn btn-default\""); } else { - $prevLink = "<span class=\"disabled\"><< Prev $perpage Issues</span>"; + $prevLink = "<span class=\"btn btn-default disabled\"><i class=\"fas fa-chevron-left\"></i> Prev $perpage Issues</span>"; } // display next link if (($pos + $perpage) < $total) { $next = $where + 1; - $nextLink = $html->ahref("Next $perpage Issues >>",$html->_web_root."/".PAGE."/?pos=".$next); + $nextLink = $html->ahref("Next $perpage Issues <i class=\"fas fa-chevron-right\"></i>",$html->_web_root."/".PAGE."/?pos=".$next, "class=\"btn btn-default\""); } else { - $nextLink = "<span class=\"disabled\">Next $perpage Issues >></span>"; + $nextLink = "<span class=\"btn btn-default disabled\">Next $perpage Issues <i class=\"fas fa-chevron-right\"></i></span>"; }

1 0

Jeremy Newman : fix links
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 6ceffdd1d84fcc94b54b8337316d10c6b2a24bb8 URL: https://source.winehq.org/git/website.git/?a=commit;h=6ceffdd1d84fcc94b54b8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 29 08:02:00 2021 -0500 fix links --- news/en/2021102901.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/news/en/2021102901.xml b/news/en/2021102901.xml index e925ff60..c6e56ba1 100644 --- a/news/en/2021102901.xml +++ b/news/en/2021102901.xml @@ -4,11 +4,11 @@ <body> <a href="{$root}/wwn/406">WWN Issue 406</a> was released today. <ul> - <li><a href="/winehq_org/wwn/406#New Author">New Author</a></li> - <li><a href="/winehq_org/wwn/406#Highlights From Wine 6.18 to Today">Highlights From Wine 6.18 to Today</a></li> - <li><a href="/winehq_org/wwn/406#Dinput Now Uses HID">Dinput Now Uses HID</a></li> - <li><a href="/winehq_org/wwn/406#Unicode 14">Unicode 14</a></li> - <li><a href="/winehq_org/wwn/406#Wine Mono">Wine Mono</a></li> + <li><a href="{$root}/wwn/406#New Author">New Author</a></li> + <li><a href="{$root}/wwn/406#Highlights From Wine 6.18 to Today">Highlights From Wine 6.18 to Today</a></li> + <li><a href="{$root}/wwn/406#Dinput Now Uses HID">Dinput Now Uses HID</a></li> + <li><a href="{$root}/wwn/406#Unicode 14">Unicode 14</a></li> + <li><a href="{$root}/wwn/406#Wine Mono">Wine Mono</a></li> </ul> </body> </news>

1 0

Cressida Silver : WWN 406
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: 1d60c21c78a79661cf7d9bb42db1c71ff010c818 URL: https://source.winehq.org/git/website.git/?a=commit;h=1d60c21c78a79661cf7d9… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Oct 29 07:46:37 2021 -0500 WWN 406 --- wwn/en/wn20211029_406.xml | 105 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/wwn/en/wn20211029_406.xml b/wwn/en/wn20211029_406.xml new file mode 100644 index 00000000..46d1e9ff --- /dev/null +++ b/wwn/en/wn20211029_406.xml @@ -0,0 +1,105 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn(a)winehq.org">Cressida Silver</author> + <issue num="406" date="10/29/2021"/> + <intro> + <p> + This is the 406th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. + Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. + Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, + but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> + </p> + </intro> + + <section title="New Author" subject="WWN" archive="" posts=""> + <p> + Cressida Silver here. I am new to this, so please let's all play nice in the sandbox. I recently broke up with my former employer to start seeing CodeWeavers. So far so good. The goal is to bring you an edition of WWN the Friday following a Wine release. Feel free to provide tips, suggestions, insights, or generaly troll me (if you must) <a href="mailto:wwn(a)winehq.org">here.</a> + </p> + + <p> + Great, now that is out of the way and we are all friends, let's get to it. + </p> + </section> + + <section title="Highlights From Wine 6.18 to Today" subject="Overview" archive="" posts=""> + <p> + <b>Wine 6.18</b> + <ul> + <li>Shell32 and WineBus libraries converted to Portable Executable (PE)</li> + <li>Unicode data updated to Unicode version 14</li> + <li>Mono engine updated to version 6.4.0, with COM improvements</li> + <li>More work towards Dwarf 3/4 debug support</li> + <li>HID joystick enabled by default</li> + </ul> + </p> + + <p> + <b>Wine 6.19</b> + <ul> + <li>IPHlpApi, NsiProxy, WineDbg and a few other modules converted to PE</li> + <li>Additional work on HID</li> + <li>Kernel parts of GDI moved to Win32u</li> + <li>More work towards Dwarf 3/4 debug support</li> + </ul> + </p> + + <p> + <b>Wine 6.20</b> + <ul> + <li>MSXml, XAudio, DInput and a few other modules converted to PE</li> + <li>A few system libraries are bundled with the source to support PE builds</li> + <li>HID joystick is now the only supported joystick backend in DirectInput</li> + <li>Better support for MSVCRT builds in Winelib</li> + </ul> + </p> + </section> + + <section title="Dinput Now Uses HID" subject="HID" archive="" posts=""> + <p> + Tip of the hat to Rémi for this update. Previously, Wine’s DirectInput Implementation (dinput.dll and dinput8.dll) would talk directly to the hardware, and so would Wine's implementation of the lower-level HID APIs. Seeing double anyone? + That's right, Wine was talking to the hardware in two locations. Less than ideal, as this resulted in redundant + code. + </p> + + <p> + Windows currently implements dinput on top of the lower-level APIs. So Rémi’s work changed Wine to match that layout by + placing dinput above the lower-level APIs instead of allowing dinput to talk directly to the hardware. This results in a Wine that more accurately reflects Windows behavior, and allows applications to talk to both HID and dinput, as well as connect information from one to the other. + </p> + + <p> + Fewer places for APIs to speak with the hardware means fewer lines of code. Fewer lines of code means fewer opportunities for bugs. + Additionally, these changes will also make supporting additional backends easier in the future. The new layout means Wine more accurately reflects Windows behavior making controller support more consistent, and improving functionality of Windows applications that use both HID and dinput APIs. + </p> + </section> + + <section title="Unicode 14" subject="Unicode 14" archive="https://www.winehq.org/pipermail/wine-devel/2021-September/195389.html" posts="1"> + <p> + Nikolay has moved Wine from the boring world of Unicode 13 to the brave new world of Unicode 14. Who wants to live in a world without the melting smiley face or the bitten lower lip? Not us — that’s for sure. When Unicode 14 is rolled out to the interwebs at large, there will be a grand total of characters to 144,697. Of course, Wine requires the underlying system fonts to support the new Unicode characters, which will take some time. + </p> + + <p> + One hundred forty-four thousand six hundred ninety-seven characters on the wall, one hundred forty-four thousand... this is gonna take a while. In the meantime, you can read more about Unicode 14 <a href="//unicode.org/versions/Unicode14.0.0/">here.</a> + </p> + </section> + + <section title="Wine Mono" subject="Wine Mono" archive="" posts=""> + <p> + Updates to Wine Mono — the open-source, cross-platform implementation of .NET framework — by Esme improve the functionality + of the following: + <ul> + <li>IL-2 Sturmovik</li> + <li>Bizhawk</li> + <li>Magicka</li> + <li>FLY’N</li> + <li>The Sims 3 (launcher)</li> + <li>Sol Survivor</li> + <li>Stride</li> + <li>LiveSplit</li> + </ul> + </p> + + <p> + Also not to be overlooked, Esme has updated FNA to 21.08 and SDL to 2.0.16. FNA now uses mfplat instead of libtheorafile for media file handling, making it possible to load .wmv and .wma files if Wine has the necessary support. + </p> + </section> +</kc>

1 0

Jeremy Newman : WWN 406
by Jeremy Newman 29 Oct '21

29 Oct '21

Module: website Branch: master Commit: d07244b5b6800d4a04348bd7966164c030143678 URL: https://source.winehq.org/git/website.git/?a=commit;h=d07244b5b6800d4a04348… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 29 07:52:24 2021 -0500 WWN 406 --- news/en/2021102901.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/en/2021102901.xml b/news/en/2021102901.xml new file mode 100644 index 00000000..e925ff60 --- /dev/null +++ b/news/en/2021102901.xml @@ -0,0 +1,14 @@ +<news> + <date>October 29, 2021</date> + <title>World Wine News Issue 406</title> + <body> + <a href="{$root}/wwn/406">WWN Issue 406</a> was released today. + <ul> + <li><a href="/winehq_org/wwn/406#New Author">New Author</a></li> + <li><a href="/winehq_org/wwn/406#Highlights From Wine 6.18 to Today">Highlights From Wine 6.18 to Today</a></li> + <li><a href="/winehq_org/wwn/406#Dinput Now Uses HID">Dinput Now Uses HID</a></li> + <li><a href="/winehq_org/wwn/406#Unicode 14">Unicode 14</a></li> + <li><a href="/winehq_org/wwn/406#Wine Mono">Wine Mono</a></li> + </ul> + </body> +</news>

1 0

Nikolay Sivov : evr/presenter: Handle shutdown state in more methods.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: c94f86dac3dcd4708e77564e3d5b964616cf3cbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c94f86dac3dcd4708e77564e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 28 17:33:19 2021 +0300 evr/presenter: Handle shutdown state in more methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 68 +++++++++++++++++++++++++++++++++++++++++++++------- dlls/evr/tests/evr.c | 6 ----- 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 027d0338896..a91510b13bc 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -31,9 +31,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); +/* + Initial state represents just created object, presenter never returns to this state. + Shutdown state is entered on ReleaseServicePointers(), terminal state. + Started/stopped/paused states are controlled by clock state changes. +*/ + enum presenter_state { - PRESENTER_STATE_SHUT_DOWN = 0, + PRESENTER_STATE_INITIAL = 0, + PRESENTER_STATE_SHUT_DOWN, PRESENTER_STATE_STARTED, PRESENTER_STATE_STOPPED, PRESENTER_STATE_PAUSED, @@ -603,6 +610,9 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) IMFSample *sample; DWORD status; + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + return MF_E_SHUTDOWN; + if (!presenter->media_type) return S_OK; @@ -708,6 +718,9 @@ static HRESULT video_presenter_start_streaming(struct video_presenter *presenter { HRESULT hr; + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + return MF_E_SHUTDOWN; + if (presenter->thread.hthread) return S_OK; @@ -968,7 +981,12 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M switch (message) { case MFVP_MESSAGE_INVALIDATEMEDIATYPE: - hr = presenter->mixer ? video_presenter_invalidate_media_type(presenter) : MF_E_INVALIDREQUEST; + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!presenter->mixer) + hr = MF_E_INVALIDREQUEST; + else + hr = video_presenter_invalidate_media_type(presenter); break; case MFVP_MESSAGE_BEGINSTREAMING: hr = video_presenter_start_streaming(presenter); @@ -1238,6 +1256,7 @@ static HRESULT WINAPI video_presenter_control_GetNativeVideoSize(IMFVideoDisplay SIZE *aspect_ratio) { struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + HRESULT hr = S_OK; TRACE("%p, %p, %p.\n", iface, video_size, aspect_ratio); @@ -1245,21 +1264,40 @@ static HRESULT WINAPI video_presenter_control_GetNativeVideoSize(IMFVideoDisplay return E_POINTER; EnterCriticalSection(&presenter->cs); - if (video_size) - *video_size = presenter->native_size; - if (aspect_ratio) - *aspect_ratio = presenter->native_ratio; + + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + { + if (video_size) + *video_size = presenter->native_size; + if (aspect_ratio) + *aspect_ratio = presenter->native_ratio; + } + LeaveCriticalSection(&presenter->cs); - return S_OK; + return hr; } static HRESULT WINAPI video_presenter_control_GetIdealVideoSize(IMFVideoDisplayControl *iface, SIZE *min_size, SIZE *max_size) { + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + HRESULT hr; + FIXME("%p, %p, %p.\n", iface, min_size, max_size); - return E_NOTIMPL; + EnterCriticalSection(&presenter->cs); + + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = E_NOTIMPL; + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayControl *iface, @@ -1425,9 +1463,21 @@ static HRESULT WINAPI video_presenter_control_GetVideoWindow(IMFVideoDisplayCont static HRESULT WINAPI video_presenter_control_RepaintVideo(IMFVideoDisplayControl *iface) { + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + HRESULT hr; + FIXME("%p.\n", iface); - return E_NOTIMPL; + EnterCriticalSection(&presenter->cs); + + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = E_NOTIMPL; + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayControl *iface, BITMAPINFOHEADER *header, diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index b7e3ad174df..6a711e30581 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2353,18 +2353,15 @@ static void test_presenter_shutdown(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_BEGINSTREAMING, 0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_ENDSTREAMING, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_GetCurrentMediaType(presenter, &media_type); @@ -2374,11 +2371,9 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &size); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetIdealVideoSize(display_control, &size, &size); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); SetRect(&rect, 0, 0, 10, 10); @@ -2404,7 +2399,6 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_RepaintVideo(display_control); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client);

1 0

Nikolay Sivov : evr/mixer: Handle substream zorder for dxva blitting.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 58efe0f43ee61c4e972dee7dce85ba02ee624261 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58efe0f43ee61c4e972dee7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 28 17:33:20 2021 +0300 evr/mixer: Handle substream zorder for dxva blitting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 74 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 18 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 1db2fd3a9f4..631ee1ba645 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -81,6 +81,7 @@ struct video_mixer struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; unsigned int input_ids[MAX_MIXER_INPUT_STREAMS]; + struct input_stream *zorder[MAX_MIXER_INPUT_STREAMS]; unsigned int input_count; struct output_stream output; @@ -183,6 +184,22 @@ static void video_mixer_init_input(struct input_stream *stream) stream->rect.right = stream->rect.bottom = 1.0f; } +static int __cdecl video_mixer_zorder_sort_compare(const void *a, const void *b) +{ + const struct input_stream *left = *(void **)a, *right = *(void **)b; + return left->zorder != right->zorder ? (left->zorder < right->zorder ? -1 : 1) : 0; +}; + +static void video_mixer_update_zorder_map(struct video_mixer *mixer) +{ + unsigned int i; + + for (i = 0; i < mixer->input_count; ++i) + mixer->zorder[i] = &mixer->inputs[i]; + + qsort(mixer->zorder, mixer->input_count, sizeof(*mixer->zorder), video_mixer_zorder_sort_compare); +} + static void video_mixer_clear_types(struct video_mixer *mixer) { unsigned int i; @@ -501,6 +518,7 @@ static HRESULT WINAPI video_mixer_transform_DeleteInputStream(IMFTransform *ifac memmove(&mixer->inputs[idx], &mixer->inputs[idx + 1], (mixer->input_count - idx) * sizeof(*mixer->inputs)); memmove(&mixer->input_ids[idx], &mixer->input_ids[idx + 1], (mixer->input_count - idx) * sizeof(*mixer->input_ids)); + video_mixer_update_zorder_map(mixer); } } @@ -570,6 +588,8 @@ static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, input->zorder = zorder; zorder++; } + + video_mixer_update_zorder_map(mixer); } } LeaveCriticalSection(&mixer->cs); @@ -1227,13 +1247,13 @@ static void video_mixer_scale_rect(RECT *rect, unsigned int width, unsigned int static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) { - DXVA2_VideoSample samples[1] = {{ 0 }}; + DXVA2_VideoSample samples[MAX_MIXER_INPUT_STREAMS] = {{ 0 }}; DXVA2_VideoProcessBltParams params = { 0 }; MFVideoNormalizedRect zoom_rect; struct input_stream *stream; - IDirect3DSurface9 *surface; D3DSURFACE_DESC desc; - HRESULT hr; + HRESULT hr = S_OK; + unsigned int i; IDirect3DSurface9_GetDesc(rt, &desc); @@ -1246,26 +1266,40 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) video_mixer_scale_rect(&params.TargetRect, desc.Width, desc.Height, &zoom_rect); - /* FIXME: for now only handle reference stream. */ + for (i = 0; i < mixer->input_count; ++i) + { + IDirect3DSurface9 *surface; - video_mixer_get_input(mixer, 0, &stream); + stream = mixer->zorder[i]; - if (FAILED(hr = video_mixer_get_sample_surface(stream->sample, &surface))) - { - WARN("Failed to get source surface, hr %#x.\n", hr); - return; - } + if (FAILED(hr = video_mixer_get_sample_surface(stream->sample, &surface))) + { + WARN("Failed to get source surface for stream %u, hr %#x.\n", i, hr); + break; + } - IDirect3DSurface9_GetDesc(surface, &desc); + IDirect3DSurface9_GetDesc(surface, &desc); - samples[0].SrcSurface = surface; - SetRect(&samples[0].SrcRect, 0, 0, desc.Width, desc.Height); - video_mixer_scale_rect(&samples[0].DstRect, desc.Width, desc.Height, &stream->rect); + samples[i].SampleFormat.SampleFormat = stream->id == 0 ? DXVA2_SampleProgressiveFrame : DXVA2_SampleSubStream; + samples[i].SrcSurface = surface; + SetRect(&samples[i].SrcRect, 0, 0, desc.Width, desc.Height); + video_mixer_scale_rect(&samples[i].DstRect, desc.Width, desc.Height, &stream->rect); + } - if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, 1, NULL))) - WARN("Failed to process samples, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, + mixer->input_count, NULL))) + { + WARN("Failed to process samples, hr %#x.\n", hr); + } + } - IDirect3DSurface9_Release(surface); + for (i = 0; i < mixer->input_count; ++i) + { + if (samples[i].SrcSurface) + IDirect3DSurface9_Release(samples[i].SrcSurface); + } } static HRESULT video_mixer_get_sample_desired_time(IMFSample *sample, LONGLONG *timestamp, LONGLONG *duration) @@ -1542,8 +1576,11 @@ static HRESULT WINAPI video_mixer_control_SetStreamZOrder(IMFVideoMixerControl2 /* Lowest zorder only applies to reference stream. */ if (id && !zorder) hr = MF_E_INVALIDREQUEST; - else + else if (stream->zorder != zorder) + { stream->zorder = zorder; + video_mixer_update_zorder_map(mixer); + } } LeaveCriticalSection(&mixer->cs); @@ -2449,6 +2486,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->lower_bound = MFT_OUTPUT_BOUND_LOWER_UNBOUNDED; object->upper_bound = MFT_OUTPUT_BOUND_UPPER_UNBOUNDED; video_mixer_init_input(&object->inputs[0]); + video_mixer_update_zorder_map(object); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) {

1 0