February 2022 - Wine-Commits

Eric Pouech : ndis.sys: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 34d365c19049229cf5550551198e7c939b0b79ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=34d365c19049229cf5550551… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:10:58 2022 +0100 ndis.sys: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/Makefile.in | 1 - dlls/ndis.sys/main.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index 5d1d7973155..baeae05d5c4 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ndis.sys IMPORTS = advapi32 ntoskrnl iphlpapi diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index a0d2581aaa9..b5ce2fd8f5b 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -88,7 +88,7 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) } default: - FIXME( "Unsupported OID %x\n", oid ); + FIXME( "Unsupported OID %lx\n", oid ); irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; break; } @@ -100,7 +100,7 @@ static NTSTATUS WINAPI ndis_ioctl(DEVICE_OBJECT *device, IRP *irp) MIB_IF_ROW2 *netdev = device->DeviceExtension; NTSTATUS status; - TRACE( "ioctl %x insize %u outsize %u\n", + TRACE( "ioctl %lx insize %lu outsize %lu\n", irpsp->Parameters.DeviceIoControl.IoControlCode, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); @@ -111,7 +111,7 @@ static NTSTATUS WINAPI ndis_ioctl(DEVICE_OBJECT *device, IRP *irp) query_global_stats(irp, netdev); break; default: - FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + FIXME( "ioctl %lx not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; break; } @@ -153,7 +153,7 @@ static int add_device(DRIVER_OBJECT *driver, const WCHAR *guidstrW, MIB_IF_ROW2 status = IoCreateSymbolicLink( &link, &name ); if (status) { - FIXME( "failed to create device error %x\n", status ); + FIXME( "failed to create device error %lx\n", status ); return 0; } @@ -200,7 +200,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **address, UINT length, ULONG tag) { - FIXME("(%p, %u, %u): stub\n", address, length, tag); + FIXME("(%p, %u, %lu): stub\n", address, length, tag); return NDIS_STATUS_FAILURE; }

1 0

Eric Pouech : gdiplus/tests: Get rid of some GCC11 warnings (-Warray-bounds).
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: aa9d1bd130fb8d30522e2a5b82d325d00b06d77a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa9d1bd130fb8d30522e2a5b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 14 10:28:12 2022 +0100 gdiplus/tests: Get rid of some GCC11 warnings (-Warray-bounds). don't pretend using a BITMAPINFO when only a BITMAPINFOHEADER is used Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 690efa8ac1e..c8c31ce258b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1313,21 +1313,20 @@ static void test_GdipDrawImagePointsRect(void) GpGraphics *graphics = NULL; GpPointF ptf[4]; GpBitmap *bm = NULL; - BYTE rbmi[sizeof(BITMAPINFOHEADER)]; BYTE buff[400]; - BITMAPINFO *bmi = (BITMAPINFO*)rbmi; + BITMAPINFOHEADER bmihdr; HDC hdc = GetDC( hwnd ); if (!hdc) return; - memset(rbmi, 0, sizeof(rbmi)); - bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bmi->bmiHeader.biWidth = 10; - bmi->bmiHeader.biHeight = 10; - bmi->bmiHeader.biPlanes = 1; - bmi->bmiHeader.biBitCount = 32; - bmi->bmiHeader.biCompression = BI_RGB; - status = GdipCreateBitmapFromGdiDib(bmi, buff, &bm); + memset(&bmihdr, 0, sizeof(bmihdr)); + bmihdr.biSize = sizeof(BITMAPINFOHEADER); + bmihdr.biWidth = 10; + bmihdr.biHeight = 10; + bmihdr.biPlanes = 1; + bmihdr.biBitCount = 32; + bmihdr.biCompression = BI_RGB; + status = GdipCreateBitmapFromGdiDib((BITMAPINFO*)&bmihdr, buff, &bm); expect(Ok, status); ok(NULL != bm, "Expected bitmap to be initialized\n"); status = GdipCreateFromHDC(hdc, &graphics);

1 0

Eric Pouech : netapi32: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 29b016da959f4c0d5cb4d9e032dae5e9f13e70fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=29b016da959f4c0d5cb4d9e0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:04 2022 +0100 netapi32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/Makefile.in | 2 +- dlls/netapi32/nbt.c | 2 +- dlls/netapi32/netapi32.c | 140 +++++++++++++++++++++++----------------------- dlls/netapi32/netbios.c | 10 ++-- 4 files changed, 77 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29b016da959f4c0d5cb4…

1 0

Eric Pouech : netcfgx: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 4f308b2b0453e07068051e1d34585e94268bd20e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f308b2b0453e07068051e1d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 16 08:11:10 2022 +0100 netcfgx: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netcfgx/Makefile.in | 1 - dlls/netcfgx/main.c | 2 +- dlls/netcfgx/netcfg.c | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/netcfgx/Makefile.in b/dlls/netcfgx/Makefile.in index 127110f8b05..7d4b3b5a203 100644 --- a/dlls/netcfgx/Makefile.in +++ b/dlls/netcfgx/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = netcfgx.dll IMPORTS = uuid diff --git a/dlls/netcfgx/main.c b/dlls/netcfgx/main.c index f8ca2b9c594..d3dcf4a73e3 100644 --- a/dlls/netcfgx/main.c +++ b/dlls/netcfgx/main.c @@ -98,7 +98,7 @@ static HRESULT WINAPI netcfgcf_CreateInstance(IClassFactory *iface,LPUNKNOWN pOu } else { - WARN("Cannot create an instance object. 0x%08x\n", hr); + WARN("Cannot create an instance object. 0x%08lx\n", hr); } return hr; } diff --git a/dlls/netcfgx/netcfg.c b/dlls/netcfgx/netcfg.c index 90bfe750d68..c64c248609f 100644 --- a/dlls/netcfgx/netcfg.c +++ b/dlls/netcfgx/netcfg.c @@ -75,7 +75,7 @@ static ULONG WINAPI netcfg_AddRef(INetCfg *iface) NetConfiguration *This = impl_from_INetCfg(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("%p ref=%u\n", This, ref); + TRACE("%p ref=%lu\n", This, ref); return ref; } @@ -85,7 +85,7 @@ static ULONG WINAPI netcfg_Release(INetCfg *iface) NetConfiguration *This = impl_from_INetCfg(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("%p ref=%u\n", This, ref); + TRACE("%p ref=%lu\n", This, ref); if (ref == 0) { @@ -190,7 +190,7 @@ static HRESULT WINAPI netcfglock_AcquireWriteLock(INetCfgLock *iface, DWORD cmsT LPCWSTR pszwClientDescription, LPWSTR *ppszwClientDescription) { NetConfiguration *This = impl_from_INetCfgLock(iface); - FIXME("%p %d %s %p\n", This, cmsTimeout, debugstr_w(pszwClientDescription), ppszwClientDescription); + FIXME("%p %ld %s %p\n", This, cmsTimeout, debugstr_w(pszwClientDescription), ppszwClientDescription); return S_OK; }

1 0

Francois Gouget : testbot/SetWinLocale: Add an 'info LOCALE' action to the Powershell script.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: tools Branch: master Commit: 7d57e9617f113529cc7b55313f0d7252391869f2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7d57e9617f113529cc7b553… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 20:15:40 2022 +0100 testbot/SetWinLocale: Add an 'info LOCALE' action to the Powershell script. It returns Windows' 'canonical' locale identifier as well as the default keyboard layout. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale.ps1 | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 index ed8fa29..26bd03f 100644 --- a/testbot/bin/SetWinLocale.ps1 +++ b/testbot/bin/SetWinLocale.ps1 @@ -103,6 +103,52 @@ function ShowSettings() exit 0 } +function GetLocaleInfo($Locale) +{ + $LInfo= New-WinUserLanguageList $Locale + $LInfo = $LInfo[0] + + # Window synthesizes an Autonym for unknown/uninstalled locales (e.g. fr-DE), + # but cannot recommend a keyboard layout. + # Note also that installing a locale (e.g. fr-FR) typically also installs + # (at least the core functionality of) related locales (e.g. fr-BE), even + # though those are not shown as installed in the GUI. + if ($LInfo.InputMethodTips[0] -eq $null) + { + return $null + } + + # 'Canonicalize' the LanguageTag by picking the matching entry from the + # installed languages list. + $List = Get-WinUserLanguageList + foreach ($L in $List) + { + if ($LInfo.Autonym -eq $L.Autonym) + { + return $L + } + } + return $LInfo +} + + +function ShowLocaleInfo($Argv) +{ + $Locale = $Argv[1] +GetLocaleInfo($Locale) + $LInfo = GetLocaleInfo($Locale) + if ($LInfo -eq $null) + { + echo "$Name0:error: unknown locale $Locale. Is it installed?" + exit 1 + } + + Write-Output "LanguageTag=$($LInfo.LanguageTag)" + Write-Output "Autonym=$($LInfo.Autonym)" + Write-Output "LocalizedName=$($LInfo.LocalizedName)" + Write-Output "InputMethodTips=$($LInfo.InputMethodTips)" + exit 0 +} # # Modify the Windows locales settings through intl.cpl @@ -309,6 +355,7 @@ function SetLocales($Argv) function ShowUsage() { Write-Output "Usage: $Name0 settings" + Write-Output "or $Name0 info LOCALE" 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 USEINTLCPL" Write-Output "or $Name0 -?" @@ -317,6 +364,8 @@ function ShowUsage() Write-Output "" Write-Output "Where:" Write-Output " settings Show the current Windows locale settings." + Write-Output " info Show information about the specified locale. In particular it" + Write-Output " shows Windows' 'canonical' locale identifier." Write-Output " intlconfig Generates an XML configuration file for intl.cpl." Write-Output " locales Modifies the locales either through the Powershell APIs or" Write-Output " intl.cpl." @@ -341,6 +390,7 @@ function ShowUsage() $Action = $args[0] if ($Action -eq "settings") { ShowSettings } +if ($Action -eq "info") { ShowLocaleInfo $args } if ($Action -eq "intlconfig") { ShowIntlConfig $args } if ($Action -eq "locales") { SetLocales $args } $Rc = 0

1 0

Francois Gouget : testbot/LibvirtTool: Reorganize the snapshot creation.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: tools Branch: master Commit: 588a9e088c5bb6a591f15cb867bf3588e1a20e15 URL: https://source.winehq.org/git/tools.git/?a=commit;h=588a9e088c5bb6a591f15cb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 20:10:44 2022 +0100 testbot/LibvirtTool: Reorganize the snapshot creation. WaitForBoot() is responsible for establishing the first connection after the VM boots, which can take longer than usual. PrepareVM() replaces SetupTestAgentd() and performs all the tasks needed to make the VM ready for the tests. CreateSnapshot() now also configures the VM before creating the Libvirt snapshot. And CheckBootCount() verifies that the VM did not crash at some point during the process. It is now systematically called before creating snapshots or declaring the VM fit for duty. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 228 +++++++++++++++++++++++++++------------------ 1 file changed, 135 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=588a9e088c5bb6a591f…

1 0

Francois Gouget : testbot/LibvirtTool: Add support for UTF-8 and Unicode-only locales.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: tools Branch: master Commit: da9dbcdb9d6017eb0d3cbf80f00c344b0b7e23fd URL: https://source.winehq.org/git/tools.git/?a=commit;h=da9dbcdb9d6017eb0d3cbf8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 20:11:27 2022 +0100 testbot/LibvirtTool: Add support for UTF-8 and Unicode-only locales. Adding '-u8' to a snapshot name sets the code pages to UTF-8 and allows using a Unicode-only locale as the Windows system locale. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 481d0bd..10af2f8 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -560,7 +560,7 @@ sub GetSnapshotConfig($) { $Config->{locale} ||= $1; # take only the last match } - elsif ($Config->{base} =~ s/-(live)$//) + elsif ($Config->{base} =~ s/-(live|u8)$//) { $Config->{$1} = 1; } @@ -614,20 +614,28 @@ sub CreateSnapshot($$$$) # A side effect is that it will force TestAgentd.exe.old to stay around. } - if ($Config->{locale}) + my @Locale; + push @Locale, $Config->{locale} if ($Config->{locale}); + push @Locale, $Config->{u8} if ($Config->{u8}); + if (@Locale) { - Debug(Elapsed($Start), " Setting up the $Config->{locale} locale on $VMKey\n"); - # SetWinLocale --default performs a reboot and WaitForBoot() - ResetBootCount($TA); + Debug(Elapsed($Start), " Setting up the @Locale locale on $VMKey\n"); + my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname); + if ($Config->{locale}) + { + push @Cmd, "--default", $Config->{locale}; + # SetWinLocale --default performs a reboot and WaitForBoot() + ResetBootCount($TA); + $Booting = 1; + } + push @Cmd, "--utf8" if ($Config->{u8}); + push @Cmd, "--debug" if ($Debug); $TA->Disconnect(); - $Booting = 1; - my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $Config->{locale}); - push @Cmd, "--debug" if ($Debug); - Debug("Running: ", join(" ", @Cmd), "\n"); + Debug("Running: @Cmd\n"); if (system(@Cmd)) { - FatalError("Could not set the $VMKey locale to $Config->{locale}\n"); + FatalError("Could not set the $VMKey locale to @Locale\n"); } }

1 0

Francois Gouget : testbot/SetWinLocale: Use the Powershell script to get keyboard layouts.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: tools Branch: master Commit: ee5abd8508e7168c613f112b0cd311a8c4445e28 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ee5abd8508e7168c613f112… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 20:15:55 2022 +0100 testbot/SetWinLocale: Use the Powershell script to get keyboard layouts. The Powershell API can provide information about locales related to the ones that have been installed which the registry does not. For instance after installing fr_FR one can also get the LCID and keyboard layout for fr_BE, fr_CH, etc. Add GetWinProperties() to standardize retrieving information from the SetWinLocale.ps1 script. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 29b57b3..73c774e 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -43,7 +43,6 @@ use WineTestBot::Utils; my $HKCU_INTERNATIONAL = "HKCU\\Control Panel\\International"; my $HKCU_GEO = "HKCU\\Control Panel\\International\\Geo"; -my $HKCU_USER_PROFILE = "HKCU\\Control Panel\\International\\User Profile"; # @@ -679,10 +678,11 @@ else FatalError("could not open '$0.ps1' for reading: $!\n"); } -sub GetWinSettings() +sub GetWinProperties($) { - my $Cmd = ["powershell.exe", "-ExecutionPolicy", "ByPass", "-File", - "$name0.ps1", "settings"]; + my ($Cmd) = @_; + + Debug(Elapsed($Start), " Running: @$Cmd\n"); my $Ret = $TA->RunAndWait($Cmd, 0, 30, undef, "$name0.out", "$name0.out"); FatalError("failed to run @$Cmd: ", $TA->GetLastError(), "\n") if ($Ret < 0); my $Out = $TA->GetFileToString("$name0.out") if (!$Ret); @@ -705,6 +705,12 @@ sub GetWinSettings() return $Settings; } +sub GetWinSettings() +{ + return GetWinProperties(["powershell.exe", "-ExecutionPolicy", "ByPass", + "-File", "$name0.ps1", "settings"]); +} + sub Value2Str($) { my ($Value) = @_; @@ -774,28 +780,10 @@ sub GetWinKeyboardIds($) { my ($Locale) = @_; - # The locale information is sometimes stored in a key with a non-standard - # name, despite the standard locale name being used everywhere else! - my $Key = $LocaleInfoKeys{$Locale} || $Locale; - my $Values = RegGetValues("$HKCU_USER_PROFILE\\$Key", "*:*"); - if (!%$Values) - { - $Key =~ s/-.*$//; - $Values = RegGetValues("$HKCU_USER_PROFILE\\$Key", "*:*"); - } - - # Look for the locale's keyboard id(s). - my %WinLayouts; - foreach my $VName (keys %$Values) - { - # The value is the keyboard layout's preference order - $WinLayouts{hex($Values->{$VName})} = $VName if ($VName =~ /^[0-9A-F]{4}:/); - } - $WinKeyboardIds{$Locale} = %WinLayouts ? [] : $Keyboards{$Locale}; - foreach my $Index (sort { $a cmp $b } keys %WinLayouts) - { - push @{$WinKeyboardIds{$Locale}}, $WinLayouts{$Index}; - } + my $Info = GetWinProperties(["powershell.exe", "-ExecutionPolicy", "ByPass", + "-File", "$name0.ps1", "info", $Locale]); + $WinKeyboardIds{$Locale} = $Info->{InputMethodTips} ? [$Info->{InputMethodTips}] : $Keyboards{$Locale}; + Debug("WinKeyboardIds=", Value2Str($WinKeyboardIds{$Locale}), "\n"); if (!$WinKeyboardIds{$Locale}) { FatalError("could not find the $Locale LCID and keyboard ids. Maybe the locale is not installed?\n");

1 0

Huw Davies : winealsa: Move get_endpoints_id to the unixlib.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 781277de62822c2bac23dc892a99665cdb140a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=781277de62822c2bac23dc89… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 15 13:09:53 2022 +0000 winealsa: Move get_endpoints_id to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/Makefile.in | 2 + dlls/winealsa.drv/alsa.c | 458 ++++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 458 ++++++------------------------------------ dlls/winealsa.drv/unixlib.h | 42 ++++ 4 files changed, 560 insertions(+), 400 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=781277de62822c2bac23…

1 0

Huw Davies : winealsa: Rewrite get_reg_devices() using the Nt registry api.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 60d6eb4df74bf2a7eb7b9802e1176ee55509a364 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60d6eb4df74bf2a7eb7b9802… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 15 13:09:52 2022 +0000 winealsa: Rewrite get_reg_devices() using the Nt registry api. This code will move to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 96 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 82 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a6ca3827e5f..9a8f80a7beb 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -166,7 +166,7 @@ static const char defname[] = "default"; static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','a','l','s','a','.','d','r','v',0}; + 'w','i','n','e','a','l','s','a','.','d','r','v'}; static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v','\\','d','e','v','i','c','e','s',0}; @@ -351,6 +351,73 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } +static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +{ + while (len--) *dst++ = (unsigned char)*src++; +} + +static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; + return ret; +} + +static HKEY open_hkcu(void) +{ + char buffer[256]; + WCHAR bufferW[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + + if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) + return 0; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + ascii_to_unicode( bufferW, buffer, len + 1 ); + + return reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); +} + +static HKEY reg_open_hkcu_key( const WCHAR *name, ULONG name_len ) +{ + HKEY hkcu = open_hkcu(), key; + + key = reg_open_key( hkcu, name, name_len ); + NtClose( hkcu ); + + return key; +} + +ULONG reg_query_value( HKEY hkey, const WCHAR *name, + KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +{ + unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + info, size, &size )) + return 0; + + return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); +} + static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) { return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; @@ -496,27 +563,28 @@ static void get_reg_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *nu { static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; + char buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *key_info = (void *)buffer; HKEY key; - WCHAR reg_devices[256]; - DWORD size = sizeof(reg_devices), type; + DWORD size; const WCHAR *value_name = (flow == eRender) ? ALSAOutputDevices : ALSAInputDevices; /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ - if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ - if(RegQueryValueExW(key, value_name, 0, &type, - (BYTE*)reg_devices, &size) == ERROR_SUCCESS){ - WCHAR *p = reg_devices; + if((key = reg_open_hkcu_key(drv_keyW, sizeof(drv_keyW)))){ + if((size = reg_query_value(key, value_name, key_info, sizeof(buffer)))){ + WCHAR *p = (WCHAR *)key_info->Data; - if(type != REG_MULTI_SZ){ + if(key_info->Type != REG_MULTI_SZ){ ERR("Registry ALSA device list value type must be REG_MULTI_SZ\n"); - RegCloseKey(key); + NtClose(key); return; } while(*p){ - char devname[64]; + int len = lstrlenW(p); + char *devname = malloc(len * 3 + 1); - WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, sizeof(devname), NULL, NULL); + WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, len * 3 + 1, NULL, NULL); if(alsa_try_open(devname, flow)){ if(*num){ @@ -530,12 +598,12 @@ static void get_reg_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *nu get_device_guid(flow, devname, &(*guids)[*num]); ++*num; } - - p += lstrlenW(p) + 1; + free(devname); + p += len + 1; } } - RegCloseKey(key); + NtClose(key); } }

1 0