- Wine-Devel - list.winehq.org

[PATCH] win32u: Implement NtUserBuildHwndList.
by Jacek Caban Dec. 21, 2021

Dec. 21, 2021

Fixes Quake Champions, spotted by Paul Gofman. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 82 +++++++++++++++++++++++++++++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 31 ++++++++++++ dlls/wow64win/Makefile.in | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 25 ++++++++++ dlls/wow64win/wow64win_private.h | 2 + include/ntuser.h | 2 + 9 files changed, 144 insertions(+), 4 deletions(-)

1 0

[tools] testbot/SetWinLocale: Remove the VM options.
by Francois Gouget Dec. 21, 2021

Dec. 21, 2021

The TestBot creates the the missing live snapshots itself so these options were unused. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Also they can only be used by running SetWinLocale on the TestBot server which I cannot do. --- testbot/bin/SetWinLocale | 327 +++------------------------------------ 1 file changed, 21 insertions(+), 306 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 1e803c555..d7f795bee 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -1,10 +1,9 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# Sets the locale of the specified Windows machine and, optionally, -# updates or creates a new snapshot of the TestBot VM for it. +# Sets the locale of the specified Windows machine. # -# Copyright 2018 Francois Gouget +# Copyright 2018, 2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -40,7 +39,6 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Log; use WineTestBot::TestAgent; -use WineTestBot::VMs; use WineTestBot::Utils; @@ -292,7 +290,6 @@ sub CheckLocale($$) } my ($OptHostName, $OptReboot); -my ($OptVM, $OptRefresh, $OptRefreshAll, $OptAddMissing, $OptAddLocales); my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard); while (@ARGV) { @@ -301,26 +298,6 @@ while (@ARGV) { $Usage = 0; } - elsif ($Arg eq "--vm") - { - $OptVM = CheckValue($Arg, $OptVM); - } - elsif ($Arg eq "--refresh") - { - $OptRefresh = 1; - } - elsif ($Arg eq "--refresh-all") - { - $OptRefreshAll = 1; - } - elsif ($Arg eq "--add-missing") - { - $OptAddMissing = 1; - } - elsif ($Arg eq "--add-locales") - { - $OptAddLocales = CheckValue($Arg, $OptAddLocales); - } elsif ($Arg eq "--reboot") { if (defined $OptReboot and !$OptReboot) @@ -388,101 +365,22 @@ while (@ARGV) } # Check and untaint parameters -my ($BaseVMName, $VMLocale, %AddLocales, $KeyboardIds, $CountryId); +my ($KeyboardIds, $CountryId); if (!defined $Usage) { - if (defined $OptVM) + if (!defined $OptHostName) { - if ($OptRefresh or $OptRefreshAll or $OptAddMissing or - defined $OptAddLocales) - { - if (defined $OptReboot and !$OptReboot) - { - Error("--no-reboot is incompatible with --refresh, --refresh-all, --add-missing and --add-locales\n"); - $Usage = 2; - } - if (defined $OptDefault or defined $OptLocale or defined $OptMUI or - defined $OptCountry or defined $OptKeyboard) - { - Error("--default, --locale, --mui, --country and --keyboard are incompatible with the VM snapshot options\n"); - $Usage = 2; - } - - # Always reboot Windows before updating a TestBot snapshot - $OptReboot = 1; - } - if ($OptRefresh and - ($OptRefreshAll or $OptAddMissing or defined $OptAddLocales)) - { - Error("--refresh is incompatible with --refresh--all, --add-missing and --add-locales\n"); - $Usage = 2; - } - if ($OptRefreshAll and $OptAddMissing) - { - Error("--refresh-all and --add-missing are mutually incompatible\n"); - $Usage = 2; - } - if (defined $OptAddLocales) - { - foreach my $Locale (split /:/, $OptAddLocales) - { - if ($Locale =~ /^[a-z]{2}_[A-Z]{2}$/) - { - $AddLocales{$Locale} = 1; - } - else - { - Error("'$Locale' is not a valid locale for --add-locales\n"); - $Usage = 2; - last; - } - } - if (!%AddLocales) - { - Error("'$OptAddLocales' does not contain any valid locale\n"); - $Usage = 2; - } - } - - $BaseVMName = $OptVM; - if ($BaseVMName =~ s/_([a-z]{2})_([A-Z]{2})$//) - { - if ($OptRefreshAll) - { - Error("'$OptVM' should not be a locale VM\n"); - $Usage = 2; - } - $VMLocale = "$1_$2"; # untaint - $OptDefault = $VMLocale eq "sr_RS" ? "sr-Latn-CS" : "$1-$2"; - } - elsif ($OptRefresh) - { - Error("'$OptVM' is not a locale VM\n"); - $Usage = 2; - } + Error("you must specify the Windows machine to work on\n"); + $Usage = 2; + } + elsif ($OptHostName =~ /^([a-zA-Z0-9.-]+)$/) + { + $OptHostName = $1; # untaint } else { - if ($OptRefresh or $OptRefreshAll or $OptAddMissing or - defined $OptAddLocales) - { - Error("--refresh, --refresh-all, --add-missing and --add-locales can only be used with --vm\n"); - $Usage = 2; - } - if (!defined $OptHostName) - { - Error("you must specify the Windows machine to work on\n"); - $Usage = 2; - } - elsif ($OptHostName =~ /^([a-zA-Z0-9.-]+)$/) - { - $OptHostName = $1; # untaint - } - else - { - Error("'$OptHostName' is not a valid hostname\n"); - $Usage = 2; - } + Error("'$OptHostName' is not a valid hostname\n"); + $Usage = 2; } $OptLocale ||= $OptDefault; @@ -516,9 +414,7 @@ if (!defined $Usage) } if (!defined $OptLocale and !defined $OptSystem and !defined $OptMUI and - !defined $OptKeyboard and !defined $OptCountry and - !$OptRefresh and !$OptRefreshAll and !$OptAddMissing and - !defined $OptAddLocales) + !defined $OptKeyboard and !defined $OptCountry) { Error("you must specify at least one locale to change\n"); $Usage = 2; @@ -537,21 +433,11 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [options] --vm NAME --refresh\n"; - print "or $name0 [options] --vm NAME [--refresh-all] [--add-locales LOC1:LOC2:...]\n"; - print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME|--vm NAME\n"; + print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; print "\n"; - print "Sets the locale of the specified Windows machine and, optionally, updates or creates a new snapshot ot the TestBot VM for it.\n"; + print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; - print " --vm NAME Work on the specified TestBot VM.\n"; - print " --refresh Create or update the TestBot VM's snapshot (and VM if needed).\n"; - print " --refresh-all Refresh the locale VMs derived from the specified base VM.\n"; - print " --add-missing Check the locale VMs derived from the specified base VM and\n"; - print " add any missing corresponding snapshots.\n"; - print " --add-locales LOC1:LOC2:... Create new TestBot VMs derived from the specified\n"; - print " base VM for each of the Unix locale in the colon-sperated\n"; - print " list.\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; print " --default LOC Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; @@ -573,160 +459,6 @@ if (defined $Usage) } -# -# Handle the meta options -# - -my $VMs = CreateVMs(); -my $VM = $VMs->GetItem($OptVM); -if ($VM and $VM->Role eq "deleted") -{ - FatalError("'$OptVM' is marked for deletion\n"); -} - -if ($OptRefreshAll or $OptAddMissing) -{ - FatalError("could not find the '$OptVM' virtual machine\n") if (!$VM); - - my $HasLocaleVMs; - foreach my $VM (@{$VMs->GetItems()}) - { - next if ($VM->Role eq "deleted"); - if ($VM->Name =~ /^\Q$OptVM\E_([a-z]{2})_([A-Z]{2})$/) - { - $HasLocaleVMs = 1; - if ($OptRefreshAll or !$VM->GetDomain()->HasSnapshot($VM->IdleSnapshot)) - { - $AddLocales{"$1_$2"} = 1; - } - } - } - FatalError("could not find any locale VM for '$OptVM'\n") if (!$HasLocaleVMs); - if (!%AddLocales) - { - Debug(Elapsed($Start), " Nothing to do!\n"); - exit(0); - } -} - -if (%AddLocales) -{ - my @Failed; - my @Cmd = ("$0", ($Debug ? "--debug" : ()), "--refresh", "--vm"); - foreach my $Locale (sort keys %AddLocales) - { - if (Run(@Cmd, "${OptVM}_$Locale")) - { - push @Failed, $Locale; - } - } - if (@Failed) - { - Error("failed to add/refresh the snapshots for the following locales: @Failed\n"); - exit(1); - } - exit(0); -} - - -# -# Prepare the virtual machine -# - -if ($OptRefresh) -{ - my $BaseVM = $VMs->GetItem($BaseVMName); - if (!$BaseVM) - { - FatalError("could not find the '$BaseVMName' base virtual machine\n"); - } - - if (!$VM) - { - if ($BaseVM->Status ne "maintenance") - { - FatalError("the base VM is not marked for maintenance\n"); - } - if ($DryRun) - { - Warning("'$OptVM' does not exist. Skipping for dry run.\n"); - exit(0); - } - - # Create the localized VM - $VM = $VMs->Add(); - $VM->Name($OptVM); - $VM->SortOrder($BaseVM->SortOrder + 1); - $VM->Type($BaseVM->Type); - $VM->Role("extra"); - $VM->Missions($BaseVM->Missions); - $VM->MissionCaps($BaseVM->MissionCaps); - # All we need is for one VM to be in maintenance mode to prevent the - # TestBot from using this hypervisor domain. The base VM is in maintenance - # mode so that is enough. - $VM->Status("off"); - $VM->VirtURI($BaseVM->VirtURI); - $VM->VirtDomain($BaseVM->VirtDomain); - $VM->IdleSnapshot($BaseVM->IdleSnapshot ."_$VMLocale"); - $VM->Hostname($BaseVM->Hostname); - - my $Description = $BaseVM->Description ." ". LocaleName($VMLocale); - my $PropertyDescriptor = $VMs->GetPropertyDescriptorByName("Description"); - if ($PropertyDescriptor->GetMaxLength() < length($Description)) - { - Warning("the $OptVM description is too long. Truncating it.\n"); - $Description = substr($Description, 0, $PropertyDescriptor->GetMaxLength()); - } - $VM->Description($Description); - $VM->Details($BaseVM->Details); - - my ($_ErrKey, $_ErrProperty, $ErrMessage) = $VMs->Save(); - if (defined $ErrMessage) - { - FatalError("could not create the localized VM: $ErrMessage\n"); - } - } - else - { - if ($VM->Status ne "maintenance" and $BaseVM->Status ne "maintenance") - { - FatalError("neither $OptVM nor its base VM are marked for maintenance\n"); - } - if ($VM->Status !~ /^(?:maintenance|off)$/) - { - FatalError("'$OptVM' is neither off nor marked for maintenance\n"); - } - if ($BaseVM->Status !~ /^(?:maintenance|off)$/) - { - FatalError("'$BaseVMName' is neither off nor marked for maintenance\n"); - } - - } - - my $IdleSnapshot = $VM->IdleSnapshot; - if ($VM->GetDomain()->HasSnapshot($IdleSnapshot)) - { - Debug(Elapsed($Start), " Deleting the old $IdleSnapshot snapshot\n"); - my $ErrMessage = $DryRun ? undef : $VM->GetDomain()->RemoveSnapshot(); - if (defined $ErrMessage) - { - FatalError("could not remove the $IdleSnapshot snapshot: $ErrMessage\n"); - } - } - - Debug(Elapsed($Start), " Reverting the base VM\n"); - if (Run("$::RootDir/bin/LibvirtTool.pl", "--debug", "revert", $BaseVMName)) - { - # LibvirtTool.pl will have already printed an error message - exit(1); - } -} -elsif (defined $OptVM and !$VM) -{ - FatalError("could not find the '$OptVM' virtual machine\n"); -} - - # # Generate the intl.cpl configuration # @@ -782,8 +514,7 @@ push @Config, "</gs:GlobalizationServices>"; # Change the Windows locale using intl.cpl # -$OptHostName = $VM->Hostname if ($VM); # For error messages -my $TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); +my $TA = TestAgent->new($OptHostName, $AgentPort); Debug(Elapsed($Start), " Sending the configuration file\n"); print STDERR join("\n", "locales.xml:", @Config, "") if ($DryRun or $Debug); @@ -834,6 +565,11 @@ if (!$DryRun) } } + +# +# Reboot to finalize the changes +# + if ($OptReboot) { Debug(Elapsed($Start), " Rebooting Windows\n"); @@ -847,37 +583,16 @@ if ($OptReboot) $TA->Run($Cmd, 0); # Note that we cannot wait for this command since it reboots Windows } -} - -# -# Update the virtual machine snapshot -# - -if ($OptRefresh) -{ # Wait a bit to make sure we don't reconnect before Windows has rebooted. sleep(30) if (!$DryRun); - # Allow up to 10 minutes for the shutdown plus reboot. Debug(Elapsed($Start), " Waiting for Windows to boot\n"); $TA->SetConnectTimeout(undef, undef, $WaitForBoot); if (!$DryRun and !$TA->Ping()) { FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); } - - # Then wait a good minute after the reboot to make sure all the widgets are - # up and running. - Debug(Elapsed($Start), " Letting Windows warm up\n"); - sleep(60) if (!$DryRun); - - Debug(Elapsed($Start), " Creating the ", $VM->IdleSnapshot, " snapshot\n"); - my $ErrMessage = $DryRun ? undef : $VM->GetDomain()->CreateSnapshot(); - if (defined $ErrMessage) - { - FatalError("could not create the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n"); - } } Debug(Elapsed($Start), " All done!\n"); -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Show the intl.cpl XML file in --debug mode.
by Francois Gouget Dec. 21, 2021

Dec. 21, 2021

In addition to the --dry-run mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index d9a9e0340..1e803c555 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -786,11 +786,10 @@ $OptHostName = $VM->Hostname if ($VM); # For error messages my $TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); Debug(Elapsed($Start), " Sending the configuration file\n"); -if ($DryRun) -{ - print STDERR join("\n", "locales.xml:", @Config, ""); -} -elsif (!$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) +print STDERR join("\n", "locales.xml:", @Config, "") if ($DryRun or $Debug); + +if (!$DryRun and + !$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) { FatalError("could not send the configuration file:", $TA->GetLastError(), "\n"); } -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Accept underscores in the locale names.
by Francois Gouget Dec. 21, 2021

Dec. 21, 2021

Also avoid undefined value errors if the locale value is missing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 947c1e0d1..d9a9e0340 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -279,14 +279,16 @@ sub CheckValue($$) sub CheckLocale($$) { my ($Option, $Value) = @_; + $Value = CheckValue($Option, $Value); - if ($Value !~ /^(?:[a-z]{2})-(?:Latn-)?(?:[A-Z]{2})$/) - { - Error("'$Value' is not a valid $Option locale\n"); - $Usage = 2; - return undef; - } - return $Value; + return undef if (!defined $Value); + + $Value =~ s/_/-/g; + return $Value if ($Value =~ /^(?:[a-z]{2})-(?:Latn-)?(?:[A-Z]{2})$/); + + Error("'$Value' is not a valid $Option locale\n"); + $Usage = 2; + return undef; } my ($OptHostName, $OptReboot); -- 2.30.2

1 0

[PATCH] ntdll: Fix a variable name in TRACE() message.
by Andrey Gusev Dec. 21, 2021

Dec. 21, 2021

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d11f3f0f79d..c8f3d83947f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3127,7 +3127,7 @@ NTSTATUS WINAPI LdrGetDllHandleEx( ULONG flags, LPCWSTR load_path, ULONG *dll_ch WCHAR *dllname; HANDLE mapping; - TRACE( "flag %#x, load_path %p, dll_characteristics %p, name %p, base %p.\n", + TRACE( "flags %#x, load_path %p, dll_characteristics %p, name %p, base %p.\n", flags, load_path, dll_characteristics, name, base ); if (flags & ~valid_flags) return STATUS_INVALID_PARAMETER; -- 2.33.1

1 0

[PATCH v3] winmm: Instanciate DirectInput8 class lazily using delay imported DLL.
by Rémi Bernon Dec. 21, 2021

Dec. 21, 2021

Instead of statically importing dinput8 and creating the class at load time, which causes some native hooks to fail loading. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52222 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Use lazy init and delay load instead of COM. dlls/winmm/Makefile.in | 3 ++- dlls/winmm/joystick.c | 11 ++++++++--- dlls/winmm/winemm.h | 1 - dlls/winmm/winmm.c | 2 -- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index 5439ae21678..c515a3aba2e 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,7 +1,8 @@ EXTRADEFS = -D_WINMM_ MODULE = winmm.dll IMPORTLIB = winmm -IMPORTS = uuid user32 advapi32 ole32 msacm32 dinput8 +IMPORTS = uuid user32 advapi32 ole32 msacm32 +DELAYIMPORTS = dinput8 C_SRCS = \ driver.c \ diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 5f5683e3e35..5a6e1203513 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -152,11 +152,12 @@ static BOOL CALLBACK enum_instances( const DIDEVICEINSTANCEW *instance, void *co return DIENUM_CONTINUE; } -void joystick_load( HINSTANCE instance ) +static BOOL WINAPI joystick_load_once( INIT_ONCE *once, void *param, void **context ) { - HRESULT hr = DirectInput8Create( instance, DIRECTINPUT_VERSION, &IID_IDirectInput8W, + HRESULT hr = DirectInput8Create( hWinMM32Instance, DIRECTINPUT_VERSION, &IID_IDirectInput8W, (void **)&dinput, NULL ); - if (FAILED(hr)) WARN( "could not create dinput instance, hr %#x\n", hr ); + if (FAILED(hr)) ERR( "Could not create dinput instance, hr %#x\n", hr ); + return TRUE; } void joystick_unload() @@ -177,11 +178,15 @@ void joystick_unload() static void find_joysticks(void) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + IDirectInputDevice8W *device; HANDLE event; DWORD index; HRESULT hr; + InitOnceExecuteOnce( &init_once, joystick_load_once, NULL, NULL ); + if (!dinput) return; index = 0; diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 3459c2a85ef..52cab64b1c5 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -153,7 +153,6 @@ MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) DE void WINMM_DeleteWaveform(void) DECLSPEC_HIDDEN; -void joystick_load( HMODULE instance ) DECLSPEC_HIDDEN; void joystick_unload( void ) DECLSPEC_HIDDEN; /* Global variables */ diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index aab8bfb51a9..aa2dd50c4c1 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -144,8 +144,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) if (!WINMM_CreateIData(hInstDLL)) return FALSE; - - joystick_load( hInstDLL ); break; case DLL_PROCESS_DETACH: if(fImpLoad) -- 2.34.0

2 1

[PATCH 1/2] xaudio2/tests: Check that GetDeviceDetails returns a PCM format.
by Rémi Bernon Dec. 21, 2021

Dec. 21, 2021

Far Cry 4 expects IXAudio27_GetDeviceDetails to return a PCM format GUID and refuses to create a source voice if the format is IEEE_FLOAT. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xaudio2_7/tests/xaudio2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 502b513fb6b..ea7e2ec121a 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -27,6 +27,8 @@ #include "xapo.h" #include "xapofx.h" #include "mmsystem.h" +#include "ks.h" +#include "ksmedia.h" static BOOL xaudio27; @@ -937,6 +939,10 @@ static UINT32 test_DeviceDetails(IXAudio27 *xa) ok(dd.Role == GlobalDefaultDevice, "Got wrong role for index 0: 0x%x\n", dd.Role); else ok(dd.Role == NotDefaultDevice, "Got wrong role for index %u: 0x%x\n", i, dd.Role); + + todo_wine + ok(IsEqualGUID(&dd.OutputFormat.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM), + "got format %s\n", debugstr_guid(&dd.OutputFormat.SubFormat)); } return count; -- 2.34.0

3 5

[PATCH] oledb32: Add missing parentheses to the switch statement.
by Andrey Gusev Dec. 21, 2021

Dec. 21, 2021

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/oledb32/dslocator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 95fd7687560..d35e1eb116f 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -492,7 +492,7 @@ static INT_PTR CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARA } case WM_COMMAND: { - switch LOWORD(wp) + switch (LOWORD(wp)) { case IDC_RDO_SRC_NAME: case IDC_BTN_CONNECTION: -- 2.33.1

1 0

[PATCH] schtasks: Fix a typo in FIXME() message.
by Andrey Gusev Dec. 21, 2021

Dec. 21, 2021

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- programs/schtasks/schtasks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 79f2555522f..340aeaa56fb 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -104,7 +104,7 @@ static BSTR read_file_to_bstr(const WCHAR *file_name) r = ReadFile(file, data, file_size.QuadPart, &read_size, NULL); CloseHandle(file); if (!r) { - FIXME("Read filed\n"); + FIXME("Read failed\n"); HeapFree(GetProcessHeap(), 0, data); return NULL; } -- 2.33.1

1 0

[PATCH] ntdll: Restore FP status words from MSVCRT_JUMP_BUFFER on x64.
by Paul Gofman Dec. 21, 2021

Dec. 21, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Commit d60c450c7be196c2072f74e34f7760d39e3bad32 added the FP status words to msvcrt and wine internal setjmp and longjmp but ntdll part was left behind. dlls/ntdll/signal_x86_64.c | 7 ++++++- dlls/ntdll/tests/exception.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index e0372b111fd..7e77329363c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -64,7 +64,9 @@ struct MSVCRT_JUMP_BUFFER ULONG64 R14; ULONG64 R15; ULONG64 Rip; - ULONG64 Spare; + ULONG MxCsr; + USHORT FpCsr; + USHORT Spare; M128A Xmm6; M128A Xmm7; M128A Xmm8; @@ -1218,6 +1220,9 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) context->u.s.Xmm13 = jmp->Xmm13; context->u.s.Xmm14 = jmp->Xmm14; context->u.s.Xmm15 = jmp->Xmm15; + context->MxCsr = jmp->MxCsr; + context->u.FltSave.MxCsr = jmp->MxCsr; + context->u.FltSave.ControlWord = jmp->FpCsr; } else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) { diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2bceca204be..4307016f149 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2460,6 +2460,10 @@ static void test_restore_context(void) rec.NumberParameters = 1; rec.ExceptionInformation[0] = (DWORD64)&buf; + ok(buf.MxCsr == 0x1f80, "Got unexpected MxCsr %#x.\n", buf.MxCsr); + ok(buf.FpCsr == 0x27f, "Got unexpected FpCsr %#x.\n", buf.FpCsr); + buf.FpCsr = 0x7f; + buf.MxCsr = 0x3f80; /* uses buf.Rip instead of ctx.Rip */ pRtlRestoreContext(&ctx, &rec); ok(0, "shouldn't be reached\n"); @@ -2487,6 +2491,18 @@ static void test_restore_context(void) "longjmp failed for Xmm%d, expected %lx, got %lx\n", i + 6, fltsave[i].Part[1], ctx.FltSave.XmmRegisters[i + 6].High); } + ok(ctx.FltSave.ControlWord == 0x7f, "Got unexpected float control word %#x.\n", ctx.FltSave.ControlWord); + ok(ctx.MxCsr == 0x3f80, "Got unexpected MxCsr %#x.\n", ctx.MxCsr); + ok(ctx.FltSave.MxCsr == 0x3f80, "Got unexpected MxCsr %#x.\n", ctx.FltSave.MxCsr); + buf.FpCsr = 0x27f; + buf.MxCsr = 0x1f80; + pRtlRestoreContext(&ctx, &rec); + ok(0, "shouldn't be reached\n"); + } + else if (pass == 5) + { + ok(ctx.FltSave.ControlWord == 0x27f, "Got unexpected float control word %#x.\n", ctx.FltSave.ControlWord); + ok(ctx.FltSave.MxCsr == 0x1f80, "Got unexpected MxCsr %#x.\n", ctx.MxCsr); } else ok(0, "unexpected pass %d\n", pass); -- 2.33.1

1 0