February 2022 - Wine-Commits

Zebediah Figura : user32: Remove no longer needed assert() workarounds for MinGW.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 60c20ee2c5c3805d8625e651bf878b5567d94110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60c20ee2c5c3805d8625e651… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 31 17:00:58 2022 -0600 user32: Remove no longer needed assert() workarounds for MinGW. We build with msvcrt, so we don't link against MinGW's assert() anymore. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_private.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 3b542ea1452..d1016780658 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -296,12 +296,6 @@ typedef struct extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; -/* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ -#ifdef __MINGW32__ -#undef assert -#define assert(expr) ((void)0) -#endif - extern struct user_api_hook *user_api DECLSPEC_HIDDEN; LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcrt: Don't use fegetenv in nearbyintf.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 201266769dace8f2afb57924a3f9c6e3f571aa21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=201266769dace8f2afb57924… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 31 21:36:40 2022 +0100 msvcrt: Don't use fegetenv in nearbyintf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3907dc9dc94..b13a4e03fd1 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -6873,13 +6873,25 @@ double CDECL nearbyint(double x) */ float CDECL nearbyintf(float x) { - fenv_t env; + BOOL update_cw, update_sw; + unsigned int cw, sw; - fegetenv(&env); - _control87(_MCW_EM, _MCW_EM); + _setfp(&cw, 0, &sw, 0); + update_cw = !(cw & _EM_INEXACT); + update_sw = !(sw & _SW_INEXACT); + if (update_cw) + { + cw |= _EM_INEXACT; + _setfp(&cw, _EM_INEXACT, NULL, 0); + } x = rintf(x); - feclearexcept(FE_INEXACT); - feupdateenv(&env); + if (update_cw || update_sw) + { + sw = 0; + cw &= ~_EM_INEXACT; + _setfp(update_cw ? &cw : NULL, _EM_INEXACT, + update_sw ? &sw : NULL, _SW_INEXACT); + } return x; }

1 0

Alexandre Julliard : testbot: Use the main website's favicon.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: tools Branch: master Commit: d928db151c2c42267622d945d6e71a667e7fdc68 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d928db151c2c42267622d94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 1 11:28:03 2022 +0100 testbot: Use the main website's favicon. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 3 +-- testbot/web/WineFavIcon.png | Bin 917 -> 0 bytes 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 613bddd..fa40699 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -209,8 +209,7 @@ sub GenerateHeader($$) <html> <head> <title>$Title</title> - <link rel='icon' href='/${ProjectName}FavIcon.png' type='image/png'> - <link rel='shortcut icon' href='/${ProjectName}FavIcon.png' type='image/png'> + <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_32.png"> <link rel='stylesheet' href='/${ProjectName}TestBot.css' type='text/css' media='screen'> </head> EOF diff --git a/testbot/web/WineFavIcon.png b/testbot/web/WineFavIcon.png deleted file mode 100644 index 83d2c4c..0000000 Binary files a/testbot/web/WineFavIcon.png and /dev/null differ

1 0

Francois Gouget : testbot/SetWinLocale: Add support for the Powershell locale APIs.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: tools Branch: master Commit: a7b80207edc733ca488d071bb006b1665bb2bb42 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a7b80207edc733ca488d071… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 1 15:50:28 2022 +0100 testbot/SetWinLocale: Add support for the Powershell locale APIs. Doing so requires Windows 8+ so keep the intl.cpl code path as a fallback. Support for --sys-copy and --def-copy even requires Windows 11 so keep leveraging intl.cpl to perform the copies. Allow skipping the Powershell APIs by passing --use-intl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 21 +++++++++++++------ testbot/bin/SetWinLocale.ps1 | 49 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 81bb221..9f89280 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -316,7 +316,7 @@ sub CheckLocale($$) return undef; } -my ($OptHostName, $OptShow, $OptSysCopy, $OptDefCopy, $OptReboot); +my ($OptHostName, $OptShow, $OptSysCopy, $OptDefCopy, $OptUseIntl, $OptReboot); my ($OptDefault, $OptLocale, $OptCountry, $OptSystem, $OptUTF8, $OptMUI, $OptKeyboard); while (@ARGV) { @@ -329,6 +329,10 @@ while (@ARGV) { $OptShow = 1; } + elsif ($Arg eq "--use-intl") + { + $OptUseIntl = 1; + } elsif ($Arg eq "--sys-copy") { $OptSysCopy = 1; @@ -457,15 +461,16 @@ if (!defined $Usage) Error("you must specify at least one locale to change\n"); $Usage = 2; } - if (defined $OptReboot) + if ($OptUseIntl or defined $OptReboot) { - Error("--(no-)reboot can only be used when changing a locale\n"); + Error("--use-intl and --(no-)reboot can only be used when changing a locale\n"); $Usage = 2; } } if ($OptShow and ($OptLocale or $OptCountry or $OptSystem or $OptUTF8 or $OptMUI or $OptKeyboard or defined $OptSysCopy or - defined $OptDefCopy or defined $OptReboot)) + defined $OptDefCopy or defined $OptUseIntl or + defined $OptReboot)) { Error("--show and the locale options are mutually incompatible\n"); $Usage = 2; @@ -488,7 +493,7 @@ if (defined $Usage) exit $Usage; } print "Usage: $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-sys-copy] [--no-def-copy] [--no-reboot] HOSTNAME\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-sys-copy] [--no-def-copy] [--use-intl] [--no-reboot] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; @@ -563,6 +568,9 @@ if (defined $Usage) print " . Powershell (Windows 11+): Copy-UserInternationalSettingsToSystem -NewUser \$True\n"; print " . Intl.cpl: CopySettingsToDefaultUserAcct='true'\n"; print " --no-def-copy Do not copy the current locales to the default user account.\n"; + print " --use-intl Change the locale using the intl.cpl control panel module\n"; + print " instead of Powershell. This option should only be used for\n"; + print " debugging.\n"; print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; print " effect after the next reboot. This will also prevent working\n"; print " around cases where some locale changes do not stick after a\n"; @@ -835,7 +843,8 @@ sub SetWinLocales($$$$$$$$) "$name0.ps1", "locales", $Locale || ".", $CountryId || ".", $System || ".", $UTF8 ? "true" : "false", $MUI || ".", $KeyboardIds ? $KeyboardIds->[0] : ".", - $SysCopy ? "true" : "false", $DefCopy ? "true" : "false"]; + $SysCopy ? "true" : "false", $DefCopy ? "true" : "false", + $OptUseIntl ? "true" : "false"]; Debug(Elapsed($Start), " Running: ", join(" ", @$Cmd), "\n"); my $Ret = $TA->RunAndWait($Cmd, 0, 30, undef, "$name0.out", "$name0.out"); FatalError("$name0.ps1 locales failed: ", $TA->GetLastError(), "\n") if ($Ret < 0); diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 index afb60d6..00e9a1a 100644 --- a/testbot/bin/SetWinLocale.ps1 +++ b/testbot/bin/SetWinLocale.ps1 @@ -188,6 +188,40 @@ function SetCodePages($Value) } } +$SWC_Success = $True + +function SetWinCulture([string]$Locale, [string]$CountryId, [string]$System, [bool]$UTF8, [string]$MUI, [string]$KeyboardId, [bool]$SysCopy, [bool]$DefCopy) +{ + $Cmd = Get-Command Set-Culture -ErrorAction SilentlyContinue + if ($Cmd -eq $null) { + Write-Output "Set-Culture is not supported" + $global:SWC_Success = $False + return + } + + if ($Locale) { Set-Culture $Locale } + if ($CountryId) { Set-WinHomeLocation $CountryId } + if ($System) { Set-WinSystemLocale $System } + if ($UTF8) { SetCodePages(65001) } + if ($MUI) { Set-WinUILanguageOverride $MUI } + if ($KeyboardId) { Set-WinDefaultInputMethodOverride $KeyboardId } + if ($SysCopy -or $DefCopy) + { + $Cmd = Get-Command Copy-UserInternationalSettingsToSystem -ErrorAction SilentlyContinue + if ($Cmd -ne $null) + { + Copy-UserInternationalSettingsToSystem -WelcomeScreen $SysCopy -NewUser $DefCopy + } + else + { + Write-Output "Copy-UserInternationalSettingsToSystem is not supported. Falling back to intl.cpl for the locales copies." + WriteIntlCplConfig $undef $undef $undef $undef $undef $SysCopy $DefCopy >"$Name0.xml" + RunIntlCpl "$Name0.xml" + Remove-Item -Path "$Name0.xml" + } + } +} + # # The locale-change actions @@ -226,6 +260,14 @@ function SetLocales($Argv) $DefCopy = $Argv[8] -ne "false" $UseIntlCpl = $Argv[9] -eq "true" + if ($UseIntlCpl -eq $False) + { + Write-OutPut "Setting the locales using the Powershell APIs" + SetWinCulture $Locale $CountryId $System $UTF8 $MUI $KeyboardId $SysCopy $DefCopy + if ($SWC_Success -eq $True) { exit 0 } + Write-Output "Falling back to intl.cpl" + } + WriteIntlCplConfig $Locale $CountryId $System $MUI $KeyboardId $SysCopy $DefCopy >"$Name0.xml" RunIntlCpl "$Name0.xml" Remove-Item -Path "$Name0.xml" @@ -243,7 +285,7 @@ function ShowUsage() { Write-Output "Usage: $Name0 settings" Write-Output "or $Name0 intlconfig LOCALE COUNTRYID SYSTEM UTF8 MUI KEYBOARDID SYSCOPY DEFCOPY" - Write-Output "or $Name0 locales LOCALE COUNTRYID SYSTEM UTF8 MUI KEYBOARDID SYSCOPY DEFCOPY" + Write-Output "or $Name0 locales LOCALE COUNTRYID SYSTEM UTF8 MUI KEYBOARDID SYSCOPY DEFCOPY USEINTLCPL" Write-Output "or $Name0 -?" Write-Output "" Write-Output "Shows or modifies the Windows locales." @@ -251,7 +293,8 @@ function ShowUsage() Write-Output "Where:" Write-Output " settings Show the current Windows locale settings." Write-Output " intlconfig Generates an XML configuration file for intl.cpl." - Write-Output " locales Modifies the locales by invoking intl.cpl." + Write-Output " locales Modifies the locales either through the Powershell APIs or" + Write-Output " intl.cpl." Write-Output " LOCALE Is the BCP-47 locale to use for formats, date and time." Write-Output " COUNTRYID Is the numerical country code." Write-Output " SYSTEM Is the BCP-47 locale to use as the system locale." @@ -262,6 +305,8 @@ function ShowUsage() Write-Output " (such as used for the logon screen). This is the default." Write-Output " DEFCOPY If 'true' the locale settings will be copied to the default account" Write-Output " (for new users). This is the default." + Write-Output " USEINTLCPL If 'true' apply the changes using intl.cpl instead of first trying" + Write-Output " the Powershell APIs." Write-Output " -? Shows this help message." }

1 0

Alexandre Julliard : Also update the extracted favicon files.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: website Branch: master Commit: eea813e89e344eb3f365ad42a965fb879e4118ea URL: https://source.winehq.org/git/website.git/?a=commit;h=eea813e89e344eb3f365a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 1 11:10:22 2022 +0100 Also update the extracted favicon files. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52088 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- images/winehq_logo_16.png | Bin 917 -> 844 bytes images/winehq_logo_32.png | Bin 0 -> 2153 bytes templates/en/global/layout/content.template | 2 +- templates/zh-cn/global/layout/content.template | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/winehq_logo_16.png b/images/winehq_logo_16.png index 83d2c4c0..504a0b91 100644 Binary files a/images/winehq_logo_16.png and b/images/winehq_logo_16.png differ diff --git a/images/winehq_logo_32.png b/images/winehq_logo_32.png new file mode 100644 index 00000000..1b1d013a Binary files /dev/null and b/images/winehq_logo_32.png differ diff --git a/templates/en/global/layout/content.template b/templates/en/global/layout/content.template index 9641b1ec..8e0ba114 100644 --- a/templates/en/global/layout/content.template +++ b/templates/en/global/layout/content.template @@ -29,7 +29,7 @@ <script defer src="https://use.fontawesome.com/releases/v5.0.10/js/all.js" integrity="sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+" crossorigin="anonymous"></script> {$js_links} - <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> + <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_32.png"> {$rss_link} </head> <body class="page-{$page_name}{$page_body_class}"> diff --git a/templates/zh-cn/global/layout/content.template b/templates/zh-cn/global/layout/content.template index a7705992..69b7782d 100644 --- a/templates/zh-cn/global/layout/content.template +++ b/templates/zh-cn/global/layout/content.template @@ -29,7 +29,7 @@ <script defer src="https://use.fontawesome.com/releases/v5.0.10/js/all.js" integrity="sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+" crossorigin="anonymous"></script> {$js_links} - <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> + <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_32.png"> {$rss_link} </head> <body class="page-{$page_name}{$page_body_class}">

1 0