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

Alexandre Julliard : winecrt0: Use multiple load/store instructions in setjmp() on ARM.
by Alexandre Julliard June 22, 2021

June 22, 2021

Module: wine Branch: master Commit: 74776480347660f149d6ad3f21d4fb353fb61910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74776480347660f149d6ad3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 21 17:31:29 2021 +0200 winecrt0: Use multiple load/store instructions in setjmp() on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/setjmp.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/winecrt0/setjmp.c b/dlls/winecrt0/setjmp.c index 642e78e355e..d83df54b889 100644 --- a/dlls/winecrt0/setjmp.c +++ b/dlls/winecrt0/setjmp.c @@ -106,54 +106,27 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, #elif defined(__arm__) __ASM_GLOBAL_FUNC( __wine_setjmpex, - "str r1, [r0]\n\t" /* jmp_buf->Frame */ - "str r4, [r0, #0x4]\n\t" /* jmp_buf->R4 */ - "str r5, [r0, #0x8]\n\t" /* jmp_buf->R5 */ - "str r6, [r0, #0xc]\n\t" /* jmp_buf->R6 */ - "str r7, [r0, #0x10]\n\t" /* jmp_buf->R7 */ - "str r8, [r0, #0x14]\n\t" /* jmp_buf->R8 */ - "str r9, [r0, #0x18]\n\t" /* jmp_buf->R9 */ - "str r10, [r0, #0x1c]\n\t" /* jmp_buf->R10 */ - "str r11, [r0, #0x20]\n\t" /* jmp_buf->R11 */ + "stm r0, {r1,r4-r11}\n" /* jmp_buf->Frame,R4..R11 */ "str sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "str lr, [r0, #0x28]\n\t" /* jmp_buf->Pc */ #ifndef __SOFTFP__ "vmrs r2, fpscr\n\t" "str r2, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ - "vstr d8, [r0, #0x30]\n\t" /* jmp_buf->D[0] */ - "vstr d9, [r0, #0x38]\n\t" /* jmp_buf->D[1] */ - "vstr d10, [r0, #0x40]\n\t" /* jmp_buf->D[2] */ - "vstr d11, [r0, #0x48]\n\t" /* jmp_buf->D[3] */ - "vstr d12, [r0, #0x50]\n\t" /* jmp_buf->D[4] */ - "vstr d13, [r0, #0x58]\n\t" /* jmp_buf->D[5] */ - "vstr d14, [r0, #0x60]\n\t" /* jmp_buf->D[6] */ - "vstr d15, [r0, #0x68]\n\t" /* jmp_buf->D[7] */ + "add r0, r0, #0x30\n\t" + "vstm r0, {d8-d15}\n\t" /* jmp_buf->D[0..7] */ #endif "mov r0, #0\n\t" "bx lr" ) __ASM_GLOBAL_FUNC( __wine_longjmp, - "ldr r4, [r0, #0x4]\n\t" /* jmp_buf->R4 */ - "ldr r5, [r0, #0x8]\n\t" /* jmp_buf->R5 */ - "ldr r6, [r0, #0xc]\n\t" /* jmp_buf->R6 */ - "ldr r7, [r0, #0x10]\n\t" /* jmp_buf->R7 */ - "ldr r8, [r0, #0x14]\n\t" /* jmp_buf->R8 */ - "ldr r9, [r0, #0x18]\n\t" /* jmp_buf->R9 */ - "ldr r10, [r0, #0x1c]\n\t" /* jmp_buf->R10 */ - "ldr r11, [r0, #0x20]\n\t" /* jmp_buf->R11 */ + "ldm r0, {r3-r11}\n\t" /* jmp_buf->Frame,R4..R11 */ "ldr sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "ldr r2, [r0, #0x28]\n\t" /* jmp_buf->Pc */ #ifndef __SOFTFP__ "ldr r3, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ "vmsr fpscr, r3\n\t" - "vldr d8, [r0, #0x30]\n\t" /* jmp_buf->D[0] */ - "vldr d9, [r0, #0x38]\n\t" /* jmp_buf->D[1] */ - "vldr d10, [r0, #0x40]\n\t" /* jmp_buf->D[2] */ - "vldr d11, [r0, #0x48]\n\t" /* jmp_buf->D[3] */ - "vldr d12, [r0, #0x50]\n\t" /* jmp_buf->D[4] */ - "vldr d13, [r0, #0x58]\n\t" /* jmp_buf->D[5] */ - "vldr d14, [r0, #0x60]\n\t" /* jmp_buf->D[6] */ - "vldr d15, [r0, #0x68]\n\t" /* jmp_buf->D[7] */ + "add r0, r0, #0x30\n\t" + "vldm r0, {d8-d15}\n\t" /* jmp_buf->D[0..7] */ #endif "mov r0, r1\n\t" /* retval */ "bx r2" )

1 0

Alexandre Julliard : ntdll/tests: Add more tests for Wow64 contexts.
by Alexandre Julliard June 22, 2021

June 22, 2021

Module: wine Branch: master Commit: 9ae2b046ef2f645b122a2554cc8e32d3a3d79ccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ae2b046ef2f645b122a2554… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 17:08:11 2021 +0200 ntdll/tests: Add more tests for Wow64 contexts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 253 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 247 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9ae2b046ef2f645b122a…

1 0

Francois Gouget : pdh: Update PdhAddEnglishCounterA/W() to match Windows 10 >= 2004.
by Alexandre Julliard June 22, 2021

June 22, 2021

Module: wine Branch: master Commit: 071292bedd888b4cb3c690b40e5bb04cac7b65ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=071292bedd888b4cb3c690b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 22 12:03:21 2021 +0200 pdh: Update PdhAddEnglishCounterA/W() to match Windows 10 >= 2004. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh_main.c | 6 ++++-- dlls/pdh/tests/pdh.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 73d4fef2a14..3840b9d0288 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -284,7 +284,8 @@ PDH_STATUS WINAPI PdhAddEnglishCounterA( PDH_HQUERY query, LPCSTR path, { TRACE("%p %s %lx %p\n", query, debugstr_a(path), userdata, counter); - if (!query) return PDH_INVALID_ARGUMENT; + if (!counter) return PDH_INVALID_ARGUMENT; + if (!query) return PDH_INVALID_HANDLE; return PdhAddCounterA( query, path, userdata, counter ); } @@ -296,7 +297,8 @@ PDH_STATUS WINAPI PdhAddEnglishCounterW( PDH_HQUERY query, LPCWSTR path, { TRACE("%p %s %lx %p\n", query, debugstr_w(path), userdata, counter); - if (!query) return PDH_INVALID_ARGUMENT; + if (!counter) return PDH_INVALID_ARGUMENT; + if (!query) return PDH_INVALID_HANDLE; return PdhAddCounterW( query, path, userdata, counter ); } diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 71603f8c6ba..8165f32f50a 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -240,7 +240,8 @@ static void test_PdhAddEnglishCounterA( void ) ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterA failed 0x%08x\n", ret); ret = pPdhAddEnglishCounterA( NULL, "\\System\\System Up Time", 0, &counter ); - ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterA failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_HANDLE || broken(ret == PDH_INVALID_ARGUMENT) /* win10 <= 1909 */, + "PdhAddEnglishCounterA failed 0x%08x\n", ret); ret = pPdhAddEnglishCounterA( query, NULL, 0, &counter ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterA failed 0x%08x\n", ret); @@ -281,7 +282,8 @@ static void test_PdhAddEnglishCounterW( void ) ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n", ret); ret = pPdhAddEnglishCounterW( NULL, system_uptime, 0, &counter ); - ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n", ret); + ok(ret == PDH_INVALID_HANDLE || broken(ret == PDH_INVALID_ARGUMENT) /* win10 <= 1909 */, + "PdhAddEnglishCounterW failed 0x%08x\n", ret); ret = pPdhAddEnglishCounterW( query, NULL, 0, &counter ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n", ret);

1 0

Francois Gouget : Fix the case of PayPal.
by Alexandre Julliard June 22, 2021

June 22, 2021

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 : README: Fix some spelling issues.
by Alexandre Julliard June 22, 2021

June 22, 2021

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 CodeWeavers and CrossOver case.
by Alexandre Julliard June 22, 2021

June 22, 2021

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 June 21, 2021

June 21, 2021

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

Piotr Caban : msvcrt: Match native cosf results in -Pi/4 - Pi/4 range.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: 9008cd2f2437650ad41ce8a8924ed1828ca21889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9008cd2f2437650ad41ce8a8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 21 16:37:44 2021 +0200 msvcrt: Match native cosf results in -Pi/4 - Pi/4 range. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 949bf12d66b..ecf5fdce4d8 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -680,16 +680,17 @@ static float __sindf(double x) /* Copied from musl: src/math/__cosdf.c */ static float __cosdf(double x) { - static const double C0 = -0x1ffffffd0c5e81.0p-54, - C1 = 0x155553e1053a42.0p-57, - C2 = -0x16c087e80f1e27.0p-62, - C3 = 0x199342e0ee5069.0p-68; - double r, w, z; + static const double C0 = -0x1.0000000000000p-1, + C1 = 0x1.5555555555555p-5, + C2 = -0x1.6c16c16c16c17p-10, + C3 = 0x1.a01a01a01a01ap-16, + C4 = -0x1.27e4fb7789f5cp-22; + double z; z = x * x; - w = z * z; - r = C2 + z * C3; - return ((1.0 + z * C0) + w * C1) + (w * z) * r; + if (x > -7.8163146972656250e-03 && x < 7.8163146972656250e-03) + return 1 + C0 * z; + return 1.0 + z * (C0 + z * (C1 + z * (C2 + z * (C3 + z * C4)))); } static const UINT64 exp2f_T[] = {

1 0

Paul Gofman : jscript: Implement 'let' declaration in 'for' statement.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: 5c756468656afc9207c0f51f774bbc29267e1469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c756468656afc9207c0f51f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 21 20:48:20 2021 +0300 jscript: Implement 'let' declaration in 'for' statement. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 84 ++++++++++++++++++++++++++++++++++++++++-------- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 34 +++++++++++++++++--- dlls/mshtml/tests/es5.js | 12 +++++++ 4 files changed, 113 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c756468656afc9207c0…

1 0

Paul Gofman : jscript: Factor out compiler statement push and pop functions.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: deeadb4fa682db2852027396f4de079ba66ff851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=deeadb4fa682db2852027396… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 21 20:48:19 2021 +0300 jscript: Factor out compiler statement push and pop functions. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 1c4085dc64a..f14392b166f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -568,6 +568,24 @@ static HRESULT emit_member_expression(compiler_ctx_t *ctx, expression_t *expr) return S_OK; } +static void push_compiler_statement_ctx(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx) +{ + if (stat_ctx) + { + stat_ctx->next = ctx->stat_ctx; + ctx->stat_ctx = stat_ctx; + } +} + +static void pop_compiler_statement_ctx(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx) +{ + if (stat_ctx) + { + assert(ctx->stat_ctx == stat_ctx); + ctx->stat_ctx = stat_ctx->next; + } +} + static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *expr, unsigned flags) { HRESULT hres; @@ -1866,10 +1884,7 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, { HRESULT hres; - if(stat_ctx) { - stat_ctx->next = ctx->stat_ctx; - ctx->stat_ctx = stat_ctx; - } + push_compiler_statement_ctx(ctx, stat_ctx); set_compiler_loc(ctx, stat->loc); @@ -1926,10 +1941,7 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, DEFAULT_UNREACHABLE; } - if(stat_ctx) { - assert(ctx->stat_ctx == stat_ctx); - ctx->stat_ctx = stat_ctx->next; - } + pop_compiler_statement_ctx(ctx, stat_ctx); return hres; } @@ -2186,11 +2198,7 @@ static HRESULT visit_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, s { HRESULT hres = S_OK; - if(stat_ctx) - { - stat_ctx->next = ctx->stat_ctx; - ctx->stat_ctx = stat_ctx; - } + push_compiler_statement_ctx(ctx, stat_ctx); switch(stat->type) { case STAT_BLOCK: @@ -2352,11 +2360,7 @@ static HRESULT visit_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, s DEFAULT_UNREACHABLE; } - if(stat_ctx) - { - assert(ctx->stat_ctx == stat_ctx); - ctx->stat_ctx = stat_ctx->next; - } + pop_compiler_statement_ctx(ctx, stat_ctx); return hres; }

1 0