January 2022 - Wine-Devel - list.winehq.org

Re: [PATCH 7/8] secur32: Properly handle NULL pInput argument for DTLS contexts in schan_InitializeSecurityContextW.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=105975 Your paranoid android. === w1064 (32 bit report) === secur32: schannel.c:1442: Test failed: got 00090317 schannel.c:1452: Test failed: DecryptMessage failed: 80090317 === w1064 (64 bit report) === secur32: schannel.c:1442: Test failed: got 00090317 schannel.c:1452: Test failed: DecryptMessage failed: 80090317

Jan. 25, 2022

Re: [PATCH 6/8] secur32: Clear SECBUFFER_ALERT output buffer count in schan_InitializeSecurityContextW.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=105974 Your paranoid android. === w1064 (32 bit report) === secur32: schannel.c:1442: Test failed: got 00090317 schannel.c:1452: Test failed: DecryptMessage failed: 80090317 === w1064 (64 bit report) === secur32: schannel.c:1442: Test failed: got 00090317 schannel.c:1452: Test failed: DecryptMessage failed: 80090317

Jan. 25, 2022

Re: [PATCH 4/8] secur32/tests: Add more output buffer size validation tests for schan_InitializeSecurityContextW.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=105972 Your paranoid android. === w1064 (32 bit report) === secur32: schannel.c:1442: Test failed: got 00090317 schannel.c:1452: Test failed: DecryptMessage failed: 80090317 === w1064 (64 bit report) === secur32: schannel.c:1442: Test failed: got 00090317 schannel.c:1452: Test failed: DecryptMessage failed: 80090317

Jan. 25, 2022

Re: [PATCH 3/8] secur32: Validate output buffer size in schan_InitializeSecurityContextW.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=105971 Your paranoid android. === w1064 (32 bit report) === secur32: schannel.c:1372: Test failed: got 00090317 schannel.c:1382: Test failed: DecryptMessage failed: 80090317 === w1064 (64 bit report) === secur32: schannel.c:1372: Test failed: got 00090317 schannel.c:1382: Test failed: DecryptMessage failed: 80090317

Jan. 25, 2022

Re: [PATCH 2/8] secur32/tests: Add tests for schan_InitializeSecurityContext phNewContext argument.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=105970 Your paranoid android. === w1064 (32 bit report) === secur32: schannel.c:1374: Test failed: got 00090317 schannel.c:1384: Test failed: DecryptMessage failed: 80090317 === w1064 (64 bit report) === secur32: schannel.c:1374: Test failed: got 00090317 schannel.c:1384: Test failed: DecryptMessage failed: 80090317

Jan. 25, 2022

[PATCH] widl: Add support for the [overload] attribute.

by Bernhard Kölbl

The attribute is used by WinRT and doesn't have any effect on the generated headers. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 2 ++ 4 files changed, 7 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 8fb5c91e6dc..6542b7acfc3 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -403,6 +403,7 @@ static const struct keyword attr_keywords[] = {"optimize", tOPTIMIZE, 0}, {"optional", tOPTIONAL, 0}, {"out", tOUT, 0}, + {"overload", tOVERLOAD, 0}, {"partial_ignore", tPARTIALIGNORE, 0}, {"pointer_default", tPOINTERDEFAULT, 0}, {"progid", tPROGID, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d7fc009c5c2..2c33fa1b9f3 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -231,6 +231,7 @@ static typelib_t *current_typelib; %token tOBJECT tODL tOLEAUTOMATION %token tOPTIMIZE tOPTIONAL %token tOUT +%token tOVERLOAD %token tPARTIALIGNORE tPASCAL %token tPOINTERDEFAULT %token tPRAGMA_WARNING @@ -669,6 +670,7 @@ attribute: { $$ = NULL; } | tOPTIMIZE '(' aSTRING ')' { $$ = make_attrp(ATTR_OPTIMIZE, $3); } | tOPTIONAL { $$ = make_attr(ATTR_OPTIONAL); } | tOUT { $$ = make_attr(ATTR_OUT); } + | tOVERLOAD '(' aSTRING ')' { $$ = make_attrp(ATTR_OVERLOAD, $3); } | tPARTIALIGNORE { $$ = make_attr(ATTR_PARTIALIGNORE); } | tPOINTERDEFAULT '(' pointer_type ')' { $$ = make_attrv(ATTR_POINTERDEFAULT, $3); } | tPROGID '(' aSTRING ')' { $$ = make_attrp(ATTR_PROGID, $3); } @@ -2385,6 +2387,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_OPTIMIZE */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optimize" }, /* ATTR_OPTIONAL */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optional" }, /* ATTR_OUT */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "out" }, + /* ATTR_OVERLOAD */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "overload" }, /* ATTR_PARAMLCID */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "lcid" }, /* ATTR_PARTIALIGNORE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "partial_ignore" }, /* ATTR_POINTERDEFAULT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "pointer_default" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 622c4708a87..3a344149621 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -146,6 +146,7 @@ enum attr_type ATTR_OPTIMIZE, ATTR_OPTIONAL, ATTR_OUT, + ATTR_OVERLOAD, ATTR_PARAMLCID, ATTR_PARTIALIGNORE, ATTR_POINTERDEFAULT, diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 7c00a7d59af..71f454a8c34 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1419,6 +1419,8 @@ static int add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) break; case ATTR_OUT: break; + case ATTR_OVERLOAD: + break; case ATTR_PROPGET: invokekind = 0x2; /* INVOKE_PROPERTYGET */ break; -- 2.34.1

Jan. 25, 2022

Re: [PATCH v3 07/13] loader: Don't clobber existing memory mappings when reserving addresses.

by Alexandre Julliard

Jinoh Kang <jinoh.kang.kr(a)gmail.com> writes: > Today, the preloader makes no attempt to avoid unmapping existing > memory mappings except the initial stack. This results in irrevocably > unmapping some useful preallocated memory areas, such as vDSO. > > Fix this by reading /proc/self/maps for existing VMAs, and splitting > mmap() calls to avoid erasing existing memory mappings. That defeats the purpose of using the preloader. The whole point is to make sure the specified ranges are available. Note that since you don't update the ranges info, the mappings will get erased by Wine later anyway. -- Alexandre Julliard julliard(a)winehq.org

Jan. 25, 2022

[tools 2/2] testbot/SetWinLocale: Add more information to the usage message.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index b6992d92e5..f725e30fd7 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -460,12 +460,16 @@ if (defined $Usage) print " . APIs: GetUserGeoID().\n"; print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; + print " . This requires elevated privileges.\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale.\n"; print " . APIs: GetSystemDefaultLCID(), GetThreadLocale().\n"; print " . Powershell: Set-WinSystemLocale -SystemLocale SYS\n"; print " --utf8 Set the code pages (ACP, MACCP and OEMCP) to UTF-8.\n"; + print " . This requires elevated privileges.\n"; + print " . Only supported on Windows 10+. This will render older Windows\n"; + print " versions unbootable.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale ->\n"; print " Beta: Use Unicode UTF-8 for worldwide language support.\n"; @@ -483,8 +487,9 @@ if (defined $Usage) print " . Windows 10 GUI: Time & language -> Language -> Keyboard ->\n"; print " Override for default input method.\n"; print " . Powershell: Set-WinDefaultInputMethodOverride -InputTip KBD-ID\n"; - print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; - print " effect after the next reboot.\n"; + print " --no-reboot Do not reboot Windows. Some locale changes only take effect\n"; + print " after a reboot so this option should only be used for\n"; + print " debugging.\n"; print " --debug Show more detailed information about progress.\n"; print " --help Shows this usage message.\n"; exit 0; -- 2.30.2

Jan. 25, 2022

[tools 1/2] testbot/SetWinLocale: Reorder the locales handling.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is mostly cosmetic but the --system and --utf8 options are closely related so it is more logical for them to be together and makes the code more understandable. The same goes for --locale and --country. testbot/bin/SetWinLocale | 49 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 911aa452d9..b6992d92e5 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -301,7 +301,7 @@ sub CheckLocale($$) } my ($OptHostName, $OptShow, $OptReboot); -my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard, $OptUTF8); +my ($OptDefault, $OptLocale, $OptCountry, $OptSystem, $OptUTF8, $OptMUI, $OptKeyboard); while (@ARGV) { my $Arg = shift @ARGV; @@ -339,10 +339,18 @@ while (@ARGV) { $OptLocale = CheckLocale($Arg, $OptLocale); } + elsif ($Arg eq "--country") + { + $OptCountry = CheckValue($Arg, $OptCountry); + } elsif ($Arg eq "--system") { $OptSystem = CheckLocale($Arg, $OptSystem); } + elsif ($Arg eq "--utf8") + { + $OptUTF8 = 1; + } elsif ($Arg eq "--mui") { $OptMUI = CheckLocale($Arg, $OptMUI); @@ -351,14 +359,6 @@ while (@ARGV) { $OptKeyboard = CheckLocale($Arg, $OptKeyboard); } - elsif ($Arg eq "--country") - { - $OptCountry = CheckValue($Arg, $OptCountry); - } - elsif ($Arg eq "--utf8") - { - $OptUTF8 = 1; - } elsif ($Arg eq "--debug") { $Debug = 1; @@ -437,7 +437,7 @@ if (defined $Usage) exit $Usage; } print "Usage: $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default DEF] [--locale LOC] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-reboot] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; @@ -454,6 +454,11 @@ if (defined $Usage) print " format.\n"; print " . APIs: GetUserDefaultLCID().\n"; print " . Powershell: Set-Culture LOC\n"; + print " --country CTY Specifies the location using only the country part of the\n"; + print " Windows locale (see --defaults).\n"; + print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; + print " . APIs: GetUserGeoID().\n"; + print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; @@ -478,11 +483,6 @@ if (defined $Usage) print " . Windows 10 GUI: Time & language -> Language -> Keyboard ->\n"; print " Override for default input method.\n"; print " . Powershell: Set-WinDefaultInputMethodOverride -InputTip KBD-ID\n"; - print " --country CTY Specifies the location using only the country part of the\n"; - print " Windows locale (see --defaults).\n"; - print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; - print " . APIs: GetUserGeoID().\n"; - print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; print " effect after the next reboot.\n"; print " --debug Show more detailed information about progress.\n"; @@ -885,14 +885,6 @@ if ($OptLocale) CheckSetting($Settings, "Locale", "0000$LCIDLocale", "for --locale $OptLocale", 1); CheckSetting($Settings, "LocaleName", $OptLocale, "for --locale $OptLocale"); } -if ($KeyboardIds) -{ - CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); -} -if ($OptMUI) -{ - CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); -} if ($OptCountry) { CheckSetting($Settings, "Country", $CountryId, "for --country $OptCountry"); @@ -910,8 +902,15 @@ if ($OptUTF8) CheckSetting($Settings, $VName, "65001", "for --utf8"); } } -exit(1) if (!$Success); - +if ($OptMUI) +{ + CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); +} +if ($KeyboardIds) +{ + CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); +} +exit(1) if (!$Success); Debug(Elapsed($Start), " All done!\n"); exit(0); -- 2.30.2

Jan. 25, 2022

[tools] testbot/SetWinLocale: Explicitly set ResetAllSettings=true for <gs:Locale>.

by Francois Gouget

The ResetAllSettings default value is probably true but that is not documented. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 83cb581883..911aa452d9 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -768,7 +768,8 @@ if ($KeyboardIds) if ($OptLocale) { push @Config, " <gs:UserLocale>", - " <gs:Locale Name='$OptLocale' SetAsCurrent='true'/>", + " <gs:Locale Name='$OptLocale' SetAsCurrent='true' ResetAllSettings='true'>", + " </gs:Locale>", " </gs:UserLocale>"; } push @Config, "</gs:GlobalizationServices>"; -- 2.30.2

Jan. 25, 2022