June 2021 - Wine-commits - list.winehq.org

Francois Gouget : pdh/tests: Skip a test that crashes on Windows 10 >= 2004.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 95817b6386a9b9531d60ba86433e3055a1dc0a7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=95817b6386a9b9531d60ba86… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 22 12:06:43 2021 +0200 pdh/tests: Skip a test that crashes on Windows 10 >= 2004. Starting with Windows 10 2004 PdhMakeCounterPathA() does not check the query handle before using it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/tests/pdh.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 8165f32f50a..928714475bb 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -867,9 +867,11 @@ static void test_PdhMakeCounterPathA(void) ret = PdhMakeCounterPathA(NULL, NULL, &buflen, 0); ok(ret == PDH_INVALID_ARGUMENT, "PdhMakeCounterPathA failed 0x%08x\n", ret); + if (0) { /* Crashes on Windows 10 >= 2004 */ buflen = 0; ret = PdhMakeCounterPathA(NULL, buffer, &buflen, 0); ok(ret == PDH_INVALID_ARGUMENT, "PdhMakeCounterPathA failed 0x%08x\n", ret); + } buflen = sizeof(buffer); memset(&e, 0, sizeof(e));

1 0

Giovanni Mascellani : mf/sar: Query for current padding before requesting sample buffer.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: da171b8f90d07fa80a4b1bb53b3b295a3e0f003a URL: https://source.winehq.org/git/wine.git/?a=commit;h=da171b8f90d07fa80a4b1bb5… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jun 21 17:52:53 2021 +0200 mf/sar: Query for current padding before requesting sample buffer. According to both MSDN and our impementation, GetBufferSize returns the size of the buffer, but it doesn't guarantee that all of it is available. In order to know how much of it is available, the caller must also call GetCurrentPadding and subtract that number to the buffer size. Failing to do so might result in GetBuffer returning an error. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 77cbfcb21da..eba822ae0fe 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1751,7 +1751,7 @@ static HRESULT WINAPI audio_renderer_render_callback_GetParameters(IMFAsyncCallb static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResult *result) { - unsigned int src_frames, dst_frames, max_frames, src_len; + unsigned int src_frames, dst_frames, max_frames, pad_frames, src_len; struct queued_object *obj, *obj2; BOOL keep_sample = FALSE; IMFMediaBuffer *buffer; @@ -1775,20 +1775,24 @@ static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResul { if (SUCCEEDED(IAudioClient_GetBufferSize(renderer->audio_client, &max_frames))) { - src_frames -= obj->u.sample.frame_offset; - dst_frames = min(src_frames, max_frames); - - if (SUCCEEDED(hr = IAudioRenderClient_GetBuffer(renderer->audio_render_client, dst_frames, &dst))) + if (SUCCEEDED(IAudioClient_GetCurrentPadding(renderer->audio_client, &pad_frames))) { - memcpy(dst, src + obj->u.sample.frame_offset * renderer->frame_size, - dst_frames * renderer->frame_size); + max_frames -= pad_frames; + src_frames -= obj->u.sample.frame_offset; + dst_frames = min(src_frames, max_frames); - IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); + if (SUCCEEDED(hr = IAudioRenderClient_GetBuffer(renderer->audio_render_client, dst_frames, &dst))) + { + memcpy(dst, src + obj->u.sample.frame_offset * renderer->frame_size, + dst_frames * renderer->frame_size); - obj->u.sample.frame_offset += dst_frames; - } + IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); - keep_sample = FAILED(hr) || src_frames > max_frames; + obj->u.sample.frame_offset += dst_frames; + } + + keep_sample = FAILED(hr) || src_frames > max_frames; + } } } IMFMediaBuffer_Unlock(buffer);

1 0

Henri Verbeet : wined3d: Add decompression information for BC4_UNORM.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 2aeab85c27a202d0ef7b1e01d7ccab32d9d53c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aeab85c27a202d0ef7b1e01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 22 14:36:00 2021 +0200 wined3d: Add decompression information for BC4_UNORM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 153 ++++++++++++++++++++++++++++++++++++++ dlls/d3d11/tests/d3d11.c | 155 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 81 +++++++++++++++++++- 3 files changed, 387 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2aeab85c27a202d0ef7b…

1 0

Francois Gouget : README: Fix some spelling issues.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: website Branch: master Commit: 610a583f9b454cf942c2d953b26f627afbde1250 URL: https://source.winehq.org/git/website.git/?a=commit;h=610a583f9b454cf942c2d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 02:31:21 2021 +0200 README: Fix some spelling issues. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 6 +++--- images/shots/README | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index bca104cf..0b3100cb 100644 --- a/README +++ b/README @@ -28,15 +28,15 @@ For example, http://www.example.com/winehq_org/new_page is templates/en/new_page.template You can nest templates into subdirs. -The following varables can be used in templates. +The following variables can be used in templates. {$root} : relative path back to root of website {$base_url} : full URL of main website, as defined in winehq.conf {$self} : same as $_SERVER['PHP_SELF'] in PHP {$request_uri} : same as $_SERVER['REQUEST_URI'] in PHP -You can also add global vars to include/globals.conf and they will be availbe as -{$config_[key]} where [key] is the name you defined in globals.conf +You can also add global vars to include/globals.conf and they will be available +as {$config_[key]} where [key] is the name you defined in globals.conf Translating: ----------------------------------------------------------------------- diff --git a/images/shots/README b/images/shots/README index 65d05ab7..a15975b9 100644 --- a/images/shots/README +++ b/images/shots/README @@ -2,7 +2,7 @@ Screen Shots How To Place thumnail of 200x150 in this dir. Place Full Size image in ./full dir. -Place desription XML in ./desc dir. +Place description XML in ./desc dir. Images must be named incrementally as such.

1 0

Francois Gouget : Fix the case of PayPal.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: website Branch: master Commit: 8311ae7294f30cd9838857f2e47802b7a118b2cc URL: https://source.winehq.org/git/website.git/?a=commit;h=8311ae7294f30cd983885… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 02:32:21 2021 +0200 Fix the case of PayPal. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/de/donate.template | 2 +- templates/en/donate.template | 2 +- templates/fr/donate.template | 4 ++-- templates/nl/donate.template | 2 +- templates/pl/donate.template | 2 +- templates/pt/donate.template | 2 +- templates/tr/donate.template | 2 +- templates/zh-cn/donate.template | 2 +- wwn/en/wn20030207_156.xml | 8 ++++---- wwn/en/wn20060810_319.xml | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/templates/de/donate.template b/templates/de/donate.template index 1bc55348..3e1b5e73 100644 --- a/templates/de/donate.template +++ b/templates/de/donate.template @@ -36,7 +36,7 @@ </form> </td> <td valign="top"> - Mit Paypal kannst du per Kreditkarte oder Paypalkonto spenden. + Mit PayPal kannst du per Kreditkarte oder Paypalkonto spenden. </td> </tr> diff --git a/templates/en/donate.template b/templates/en/donate.template index 66a68a6f..c507abbc 100644 --- a/templates/en/donate.template +++ b/templates/en/donate.template @@ -25,7 +25,7 @@ questions or need further assistance, please visit the SFC site.</p> </form> </div> <div class="col-md-9"> - Donate with a credit card or registered account on Paypal. + Donate with a credit card or registered account on PayPal. </div> </div> diff --git a/templates/fr/donate.template b/templates/fr/donate.template index 26bcf162..9e030be8 100644 --- a/templates/fr/donate.template +++ b/templates/fr/donate.template @@ -23,8 +23,8 @@ </form> </td> <td valign="top"> - Avec Paypal, vous pouvez effectuer un don par carte de crédit ou - via votre compte Paypal. + Avec PayPal, vous pouvez effectuer un don par carte de crédit ou + via votre compte PayPal. </td> </tr> diff --git a/templates/nl/donate.template b/templates/nl/donate.template index 7c4cb47d..96bbf65f 100644 --- a/templates/nl/donate.template +++ b/templates/nl/donate.template @@ -26,7 +26,7 @@ of hulp bezoek de webpagina van SFC.</p> </form> </div> <div class="col-md-9"> - Doneren met een creditkaart of met Paypal. + Doneren met een creditkaart of met PayPal. </div> </div> diff --git a/templates/pl/donate.template b/templates/pl/donate.template index 84b6559e..ccbecd7b 100644 --- a/templates/pl/donate.template +++ b/templates/pl/donate.template @@ -24,7 +24,7 @@ </td> <td valign="top"> Z Paypalem możesz przekazać datki przez kartę kredytową lub - przez konto Paypal. + przez konto PayPal. </td> </tr> diff --git a/templates/pt/donate.template b/templates/pt/donate.template index 6429dc92..511c38ff 100644 --- a/templates/pt/donate.template +++ b/templates/pt/donate.template @@ -37,7 +37,7 @@ </form> </td> <td valign="top"> - Doe com um cartão de crédito ou um conta Paypal. + Doe com um cartão de crédito ou um conta PayPal. </td> </tr> diff --git a/templates/tr/donate.template b/templates/tr/donate.template index 1d654950..4ca7f09b 100644 --- a/templates/tr/donate.template +++ b/templates/tr/donate.template @@ -26,7 +26,7 @@ </form> </td> <td valign="top"> - Paypal hesabı üzerinde kayıtlı bir kredi kartı ile bağış yap. + PayPal hesabı üzerinde kayıtlı bir kredi kartı ile bağış yap. </td> </tr> diff --git a/templates/zh-cn/donate.template b/templates/zh-cn/donate.template index 55949e7c..b97e9226 100644 --- a/templates/zh-cn/donate.template +++ b/templates/zh-cn/donate.template @@ -30,7 +30,7 @@ Conservancy</a> 管理，她是一个 501(c)(3) 组织，捐款在美国可以 </form> </td> <td valign="top"> - 通过 Paypal 使用信用卡或者注册账号捐款。 + 通过 PayPal 使用信用卡或者注册账号捐款。 </td> </tr> diff --git a/wwn/en/wn20030207_156.xml b/wwn/en/wn20030207_156.xml index 27f1e142..ed32ff0d 100644 --- a/wwn/en/wn20030207_156.xml +++ b/wwn/en/wn20030207_156.xml @@ -321,7 +321,7 @@ United States. Jeremy White posted a note about formalizing it:</p> I'm filing papers (on a personal basis ) in Minnesota to do business as 'The Wine Project', and I've opened a personal account with the name 'The Wine Project', and I'm a few days away from having -a Paypal button all ready to go to accept donations. +a PayPal button all ready to go to accept donations. </p><p> You can thank Tom for this; he's the one that harangued me into it <grin>. @@ -342,8 +342,8 @@ and this also sounds like a worthy cause. <section - title="Paypal Link" - subject="Paypal link" + title="PayPal Link" + subject="PayPal link" archive="//www.winehq.org/hypermail/wine-devel/2003/02/0108.html" posts="1" startdate="02/03/2003" @@ -352,7 +352,7 @@ and this also sounds like a worthy cause. <p>Jeremy White wrote in to announce a link he set up for donations:</p> <quote who="Jeremy White"><p> -There is now a Paypal donations link up at +There is now a PayPal donations link up at <a href="//www.winehq.org/">www.winehq.org</a>; donations there go into a bank account I opened under the name "The Wine Project". diff --git a/wwn/en/wn20060810_319.xml b/wwn/en/wn20060810_319.xml index eb59a7f2..84add79b 100644 --- a/wwn/en/wn20060810_319.xml +++ b/wwn/en/wn20060810_319.xml @@ -214,7 +214,7 @@ Again, see this page for more details: <ul><a href="//www.winehq.org/wineconf/travel"> http://www.winehq.org/wineconf/travel</a></ul></p><p> -If you can't do Paypal, I can take a check in US currency as well. +If you can't do PayPal, I can take a check in US currency as well. </p></quote> <p>One last tip: <a href="http://www.kayak.com">kayak.com</a>. It's

1 0

Francois Gouget : Fix the CodeWeavers and CrossOver case.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: website Branch: master Commit: ac60e4469ba02535b215719f8620e54c9d406a03 URL: https://source.winehq.org/git/website.git/?a=commit;h=ac60e4469ba02535b2157… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 02:32:33 2021 +0200 Fix the CodeWeavers and CrossOver case. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/de/irc.template | 4 ++-- templates/en/irc.template | 4 ++-- templates/fr/about.template | 2 +- templates/ko/irc.template | 4 ++-- templates/nl/irc.template | 4 ++-- templates/zh-cn/irc.template | 2 +- wwn/en/wn20150116_383.xml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/de/irc.template b/templates/de/irc.template index 2195005f..f1beadee 100644 --- a/templates/de/irc.template +++ b/templates/de/irc.template @@ -17,7 +17,7 @@ welches Thema du erörtern möchtest:</p> <blockquote> <b>#winehq:</b> Unterstützung und Hilfe von anderen Benutzern beim Ausführen von Wine <br> - <b>#crossover:</b> Benutzer-Support und Hilfe beim Ausführen von Crossover <br> + <b>#crossover:</b> Benutzer-Support und Hilfe beim Ausführen von CrossOver <br> <b>#winehackers:</b> Entwicklung und andere Möglichkeiten um einen Beitrag für Wine zu leisten<br> <b>#winehq-social:</b> Ungezwungene, andere Themen betreffende Chats, mit verschiedenen Community Mitgliedern<br> </blockquote> @@ -83,7 +83,7 @@ ist und warum die Verbannung aufgehoben werden sollte.</p> <td>3</td> </tr> <tr> - <td>Nur Wine und Crossover werden in den jeweiligen Kanälen + <td>Nur Wine und CrossOver werden in den jeweiligen Kanälen unterstützt.</td> <td>Sidenet, WineDoors, Cedega, IEs4Linux, etc. werden <b>nicht</b> unterstützt.</td> diff --git a/templates/en/irc.template b/templates/en/irc.template index ae942fb9..62c335d4 100644 --- a/templates/en/irc.template +++ b/templates/en/irc.template @@ -16,7 +16,7 @@ channels for Wine. You can access the chat rooms using an IRC program such as <blockquote> <b>#winehq:</b> User support and help with running Wine<br> - <b>#crossover:</b> User support and help with running Crossover<br> + <b>#crossover:</b> User support and help with running CrossOver<br> <b>#winehackers:</b> Development and other ways of contributing to Wine<br> <b>#winehq-social:</b> Casual, off-topic chats with other community @@ -84,7 +84,7 @@ banned in the first place and why the ban should be lifted.</p> <td>3</td> </tr> <tr> - <td>Only Wine and Crossover are supported in their respective + <td>Only Wine and CrossOver are supported in their respective channels.</td> <td>Sidenet, WineDoors, Cedega, IEs4Linux, etc. are <b>not</b> supported.</td> diff --git a/templates/fr/about.template b/templates/fr/about.template index 7f5d96ab..7e95159d 100644 --- a/templates/fr/about.template +++ b/templates/fr/about.template @@ -19,7 +19,7 @@ qui utilisent Wine pour faire tourner leurs logiciels.</p> title="Licence de Wine">logiciel libre</a>. À peu près la moitié du code source de Wine est écrite par des volontaires. Le reste est sponsorisé par des intérêts commerciaux, en particulier <a href="http://www.codeweavers.com/products/" -title="Codeweavers Crossover Office">Codeweavers</a> qui vend une version de +title="CodeWeavers CrossOver Office">CodeWeavers</a> qui vend une version de Wine avec du support.</p> <p>Wine dépend fortement de sa communauté d'utilisateurs. Les tests des diff --git a/templates/ko/irc.template b/templates/ko/irc.template index 8d144ba6..11638885 100644 --- a/templates/ko/irc.template +++ b/templates/ko/irc.template @@ -15,7 +15,7 @@ <blockquote> <b>#winehq:</b> Wine 실행에 대한 사용자 지원과 도움<br> - <b>#crossover:</b> Crossover 실행에 대한 사용자 지원과 도움<br> + <b>#crossover:</b> CrossOver 실행에 대한 사용자 지원과 도움<br> <b>#winehackers:</b> Wine 개발과 기타 기여<br> <b>#winehq-social:</b> 다른 커뮤니티 구성원과의 일반적인 대화<br> </blockquote> @@ -81,7 +81,7 @@ href="//www.winehq.org/download">다운로드 페이지</a>에 있는 내용부 <td>3</td> </tr> <tr> - <td>Wine과 Crossover만 해당하는 채널에서 지원함</td> + <td>Wine과 CrossOver만 해당하는 채널에서 지원함</td> <td>Sidenet, WineDoors, Cedega, IEs4Linux 등은 지원되지 <b>않습니다</b>.</td> <td>2</td> <td>1</td> diff --git a/templates/nl/irc.template b/templates/nl/irc.template index b272da53..405f5a0b 100644 --- a/templates/nl/irc.template +++ b/templates/nl/irc.template @@ -32,7 +32,7 @@ kanalen over Wine. Gebruik uw favorite IRC programma met de volgende instellinge </tr> <tr> <td><b>#crossover:</b></td> - <td>Ondersteuning en hulp met Crossover voor gebruikers</td> + <td>Ondersteuning en hulp met CrossOver voor gebruikers</td> </tr> <tr> <td><b>#winehackers:</b></td> @@ -105,7 +105,7 @@ gezet en waarom de sanctie moet worden opgeheven.</p> <td>3</td> </tr> <tr> - <td>Alleen Wine en Crossover worden ondersteund</td> + <td>Alleen Wine en CrossOver worden ondersteund</td> <td>PlayOnLinux, PlayOnMac enz. worden <b>niet</b> ondersteund.</td> <td>2</td> diff --git a/templates/zh-cn/irc.template b/templates/zh-cn/irc.template index 3d990470..092f78ed 100644 --- a/templates/zh-cn/irc.template +++ b/templates/zh-cn/irc.template @@ -74,7 +74,7 @@ <td>3</td> </tr> <tr> - <td>只有 Wine 和 Crossover 才会在他们对应的频道获得支持。</td> + <td>只有 Wine 和 CrossOver 才会在他们对应的频道获得支持。</td> <td>Sidenet、WineDoors、Cedega、IEs4Linux 等等是<b>不会</b>被支持的。</td> <td>2</td> <td>1</td> diff --git a/wwn/en/wn20150116_383.xml b/wwn/en/wn20150116_383.xml index fbd82cf9..f9d54c87 100644 --- a/wwn/en/wn20150116_383.xml +++ b/wwn/en/wn20150116_383.xml @@ -40,7 +40,7 @@ There are two versions of Crosswin shipping as RPMs: 2.0 and 3.0. <p> Crosswin 2.0 is based on Wine 1.0-rc5 (2008). The default wineprefix is $HOME/.crosswin/win98, but there is an option in the GUI to use $HOME/.crosswin/win2000 instead. After some research i would say this looks -like an old Crossover (not sure if it still does it like that). WineCfg is reduced to only display +like an old CrossOver (not sure if it still does it like that). WineCfg is reduced to only display the Applications, Libraries and Drives tabs. When starting the Crosswin GUI, you can read "Initializing Windows 98" while in the background the win2000 prefix is created. Crosswin also comes without Wine Gecko, not sure how you would load it without real Internet access.

1 0

Georg Lehmann : winevulkan: Unwrap struct members with objecttype.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: 9d7cda922c19487aa6d700146a2ffa1285d5e1a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7cda922c19487aa6d70014… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Mon Jun 21 11:03:27 2021 +0200 winevulkan: Unwrap struct members with objecttype. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 31 +++++++---- dlls/winevulkan/vulkan.c | 73 -------------------------- dlls/winevulkan/vulkan_thunks.c | 112 +++++++++++++++++++++++++++++++--------- dlls/winevulkan/vulkan_thunks.h | 10 ---- 4 files changed, 110 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d7cda922c19487aa6d7…

1 0

Zhiyi Zhang : winex11.drv: Cache the current mode for detached outputs.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: 0f820e9c942a3256cf62cd037fb16ea2c45a7ee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f820e9c942a3256cf62cd03… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 21 17:09:18 2021 +0800 winex11.drv: Cache the current mode for detached outputs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index c3af35d8ec3..e3fa7a6e1d6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1390,6 +1390,7 @@ static void xrandr14_free_modes( DEVMODEW *modes ) static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) { + struct current_mode *mode_ptr = NULL; XRRScreenResources *screen_resources; XRROutputInfo *output_info = NULL; RROutput output = (RROutput)id; @@ -1406,13 +1407,15 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) continue; if (!current_modes[mode_idx].loaded) + { + mode_ptr = &current_modes[mode_idx]; break; + } memcpy( mode, &current_modes[mode_idx].mode, sizeof(*mode) ); LeaveCriticalSection( &current_modes_section ); return TRUE; } - LeaveCriticalSection( &current_modes_section ); screen_resources = xrandr_get_screen_resources(); if (!screen_resources) @@ -1473,21 +1476,15 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) mode->u1.s2.dmPosition.y = crtc_info->y - primary.top; ret = TRUE; - EnterCriticalSection( &current_modes_section ); - for (mode_idx = 0; mode_idx < current_mode_count; ++mode_idx) +done: + if (ret && mode_ptr) { - if (current_modes[mode_idx].id != id) - continue; - - memcpy( &current_modes[mode_idx].mode, mode, sizeof(*mode) ); - current_modes[mode_idx].mode.dmSize = sizeof(*mode); - current_modes[mode_idx].mode.dmDriverExtra = 0; - current_modes[mode_idx].loaded = TRUE; - break; + memcpy( &mode_ptr->mode, mode, sizeof(*mode) ); + mode_ptr->mode.dmSize = sizeof(*mode); + mode_ptr->mode.dmDriverExtra = 0; + mode_ptr->loaded = TRUE; } LeaveCriticalSection( &current_modes_section ); - -done: if (crtc_info) pXRRFreeCrtcInfo( crtc_info ); if (output_info)

1 0

Zhiyi Zhang : uxtheme/tests: Test SetWindowTheme() with a non-existent subclass.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: 59f3758ecb627000e8fa845d80190a29131096c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59f3758ecb627000e8fa845d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 21 17:14:37 2021 +0800 uxtheme/tests: Test SetWindowTheme() with a non-existent subclass. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 5b6c91dc481..ae4de902730 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -102,6 +102,7 @@ static void test_GetWindowTheme(void) static void test_SetWindowTheme(void) { + HTHEME hTheme; HRESULT hRes; HWND hWnd; @@ -110,12 +111,30 @@ todo_wine ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); /* Only do the bare minimum to get a valid hwnd */ - hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); + hWnd = CreateWindowExA(0, "button", "test", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); ok(hWnd != NULL, "Failed to create a test window.\n"); hRes = SetWindowTheme(hWnd, NULL, NULL); ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); + if (IsThemeActive()) + { + hTheme = OpenThemeData(hWnd, L"Button"); + ok(!!hTheme, "OpenThemeData failed.\n"); + CloseThemeData(hTheme); + + hRes = SetWindowTheme(hWnd, L"deadbeef", NULL); + ok(hRes == S_OK, "Expected S_OK, got 0x%08x.\n", hRes); + + hTheme = OpenThemeData(hWnd, L"Button"); + todo_wine ok(!!hTheme, "OpenThemeData failed.\n"); + CloseThemeData(hTheme); + } + else + { + skip("No active theme, skipping rest of SetWindowTheme tests.\n"); + } + DestroyWindow(hWnd); }

1 0

Zhiyi Zhang : uxtheme: Fall back to default class if the specified subclass is not found.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: 3e9fbda43c6d2f5fd10366f520fc93b0b9234dc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9fbda43c6d2f5fd10366f5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 21 17:14:43 2021 +0800 uxtheme: Fall back to default class if the specified subclass is not found. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50113 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 4 ++++ dlls/uxtheme/tests/system.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index a37e532500a..aaef03f0205 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -634,6 +634,10 @@ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) if (pszUseClassList) hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList); + + /* Fall back to default class if the specified subclass is not found */ + if (!hTheme) + hTheme = MSSTYLES_OpenThemeClass(NULL, pszUseClassList); } if(IsWindow(hwnd)) SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index ae4de902730..3f259d08f79 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -127,7 +127,7 @@ todo_wine ok(hRes == S_OK, "Expected S_OK, got 0x%08x.\n", hRes); hTheme = OpenThemeData(hWnd, L"Button"); - todo_wine ok(!!hTheme, "OpenThemeData failed.\n"); + ok(!!hTheme, "OpenThemeData failed.\n"); CloseThemeData(hTheme); } else

1 0