February 2022 - Wine-commits

Zebediah Figura : user32/tests: Remove unnecessary redefinitions of SPI_GETDESKWALLPAPER.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 69fd35d57d854e7ba94c88340b1a48e80dd10a7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=69fd35d57d854e7ba94c8834… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 31 17:00:59 2022 -0600 user32/tests: Remove unnecessary redefinitions of SPI_GETDESKWALLPAPER. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 4 ---- dlls/user32/tests/win.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 89a524407bf..f2d9694bd6f 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -30,10 +30,6 @@ #include "winuser.h" #include "winnls.h" -#ifndef SPI_GETDESKWALLPAPER -# define SPI_GETDESKWALLPAPER 0x0073 -#endif - static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); static BOOL (WINAPI *pIsProcessDPIAware)(void); static BOOL (WINAPI *pSetProcessDPIAware)(void); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ba9b16d89bd..5ce7eb02f1c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -34,10 +34,6 @@ #include "wine/test.h" -#ifndef SPI_GETDESKWALLPAPER -#define SPI_GETDESKWALLPAPER 0x0073 -#endif - #ifndef WM_SYSTIMER #define WM_SYSTIMER 0x0118 #endif

1 0

Fabian Maurer : xmllite/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 7e2cbad2ebbe476fd04dce5e7f04490ac08ea37e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e2cbad2ebbe476fd04dce5e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:06 2022 +0100 xmllite/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 12 ++++++------ dlls/xmllite/tests/writer.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index cb3a3f4e571..c4e53a5c40c 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -797,16 +797,16 @@ if (0) nodetype = XmlNodeType_Element; hr = IXmlReader_Read(reader, &nodetype); -todo_wine + todo_wine ok(FAILED(hr), "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); -todo_wine + todo_wine TEST_READER_STATE(reader, XmlReadState_Error); nodetype = XmlNodeType_Element; hr = IXmlReader_Read(reader, &nodetype); -todo_wine + todo_wine ok(FAILED(hr), "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); @@ -1006,11 +1006,11 @@ todo_wine { type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine + todo_wine ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); TEST_READER_POSITION(reader, 1, 41); -todo_wine + todo_wine TEST_READER_STATE(reader, XmlReadState_Error); IStream_Release(stream); @@ -1556,7 +1556,7 @@ static void test_read_pending(void) ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); /* newer versions are happy when it's enough data to detect node type, older versions keep reading until it fails to read more */ -todo_wine + todo_wine ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); ok(type == XmlNodeType_Comment || broken(type == XmlNodeType_None), "got %d\n", type); diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 13d67becbe4..c69aa42598d 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -434,7 +434,7 @@ static void test_writeroutput(void) unk = NULL; hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); ok(hr == S_OK, "got %08x\n", hr); -todo_wine + todo_wine ok(unk != NULL && unk != output, "got %p, output %p\n", unk, output); EXPECT_REF(output, 2); /* releasing 'unk' crashes on native */ @@ -1694,7 +1694,7 @@ static void test_WriteAttributeString(void) hr = write_attribute_string(writer, attribute_tests[i].prefix, attribute_tests[i].local, attribute_tests[i].uri, attribute_tests[i].value); - todo_wine_if(attribute_tests[i].todo_hr) + todo_wine_if(attribute_tests[i].todo_hr) ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#x, expected %#x.\n", i, hr, attribute_tests[i].hr); hr = IXmlWriter_Flush(writer); @@ -1734,7 +1734,7 @@ static void test_WriteAttributeString(void) ok(hr == S_OK, "Failed to write attribute string, hr %#x.\n", hr); hr = write_attribute_string(writer, "prefix", "local", NULL, "b"); -todo_wine + todo_wine ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr); hr = write_start_element(writer, NULL, "b", NULL);

1 0

Alexandre Julliard : testbot: Use the main website's favicon.
by Alexandre Julliard 01 Feb '22

01 Feb '22

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 01 Feb '22

01 Feb '22

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 01 Feb '22

01 Feb '22

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