wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Zebediah Figura : kernelbase: Return E_INVALIDARG when requesting URL_PART_USERNAME and there is no username.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 68323afa08056c61c5aa1731c0884c8119b04af5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68323afa08056c61c5aa1731… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:52:12 2022 -0600 kernelbase: Return E_INVALIDARG when requesting URL_PART_USERNAME and there is no username. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 ++ dlls/shlwapi/tests/url.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index be487e71a3a..ad823cae547 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4321,6 +4321,8 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_USERNAME: + if (!pl.username) + return E_INVALIDARG; if (!pl.username_len) { *out = '\0'; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 3bfd8961c8f..5d982467cea 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -621,13 +621,13 @@ static void test_UrlGetPart(void) {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_PORT, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:21"}, {"http://foo:bar@localhost:21/internal.php?query=x&return=y", URL_PART_QUERY, URL_PARTFLAG_KEEPSCHEME, S_OK, "query=x&return=y"}, - {"http://localhost/", URL_PART_USERNAME, 0, E_INVALIDARG, .todo_hr = TRUE}, + {"http://localhost/", URL_PART_USERNAME, 0, E_INVALIDARG}, {"http://localhost/", URL_PART_PASSWORD, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost/", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://localhost/", URL_PART_PORT, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost/", URL_PART_QUERY, 0, S_FALSE, ""}, - {"http://localhost:port/", URL_PART_USERNAME, 0, E_INVALIDARG, .todo_hr = TRUE}, + {"http://localhost:port/", URL_PART_USERNAME, 0, E_INVALIDARG}, {"http://localhost:port/", URL_PART_PASSWORD, 0, E_INVALIDARG, .todo_hr = TRUE}, {"http://localhost:port/", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://localhost:port/", URL_PART_PORT, 0, S_OK, "port"},

1 0

Zebediah Figura : kernelbase: Return void from parse_url().
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: a3d67465d8976b4a11fc929c7797e653acb6a90e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3d67465d8976b4a11fc929c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:52:11 2022 -0600 kernelbase: Return void from parse_url(). If we cannot parse a scheme, the entire parsed_url structure will be zero, in which case we will always return S_FALSE from UrlGetPartW(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 35cce74ab24..be487e71a3a 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4191,16 +4191,16 @@ static const WCHAR *parse_url_element( const WCHAR *url, const WCHAR *separators return url + wcslen( url ); } -static LONG parse_url(const WCHAR *url, struct parsed_url *pl) +static void parse_url( const WCHAR *url, struct parsed_url *pl ) { const WCHAR *work; memset(pl, 0, sizeof(*pl)); pl->scheme = url; work = scan_url(pl->scheme, &pl->scheme_len, SCHEME); - if (!*work || (*work != ':')) goto ErrorExit; + if (!*work || (*work != ':')) return; work++; - if ((*work != '/') || (*(work+1) != '/')) goto SuccessExit; + if ((*work != '/') || (*(work+1) != '/')) return; pl->username = work + 2; work = parse_url_element( pl->username, L":@/\\?#" ); @@ -4249,17 +4249,6 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) ++pl->query; pl->query_len = lstrlenW(pl->query); } - - SuccessExit: - TRACE("parse successful: scheme=%p(%ld), user=%p(%ld), pass=%p(%ld), host=%p(%ld), port=%p(%ld), query=%p(%ld)\n", - pl->scheme, pl->scheme_len, pl->username, pl->username_len, pl->password, pl->password_len, pl->hostname, - pl->hostname_len, pl->port, pl->port_len, pl->query, pl->query_len); - - return S_OK; - - ErrorExit: - FIXME("failed to parse %s\n", debugstr_w(url)); - return E_INVALIDARG; } HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD part, DWORD flags) @@ -4267,7 +4256,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p DWORD scheme, size, schsize; LPCWSTR addr, schaddr; struct parsed_url pl; - HRESULT hr; TRACE("%s, %p, %p(%ld), %#lx, %#lx\n", wine_dbgstr_w(url), out, out_len, *out_len, part, flags); @@ -4280,7 +4268,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p else scheme = get_scheme_code(url, addr - url); - hr = parse_url(url, &pl); + parse_url(url, &pl); switch (scheme) { @@ -4411,7 +4399,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p } TRACE("len=%ld %s\n", *out_len, wine_dbgstr_w(out)); - return hr; + return S_OK; } BOOL WINAPI UrlIsA(const char *url, URLIS Urlis)

1 0

Zebediah Figura : kernelbase: Parse query strings even without a slash after the host in UrlGetPart().
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 77ac962dedb920407e0591a3d0a62afdbd839ea7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77ac962dedb920407e0591a3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:52:10 2022 -0600 kernelbase: Parse query strings even without a slash after the host in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 12 +++++------- dlls/shlwapi/tests/url.c | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index d14316f05ee..35cce74ab24 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4243,15 +4243,13 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) work = parse_url_element( pl->port, L"/\\?#" ); pl->port_len = work - pl->port; } - if (*work == '/') + + if ((pl->query = wcschr( work, '?' ))) { - /* see if query string */ - if ((pl->query = wcschr( work, '?' ))) - { - ++pl->query; - pl->query_len = lstrlenW(pl->query); - } + ++pl->query; + pl->query_len = lstrlenW(pl->query); } + SuccessExit: TRACE("parse successful: scheme=%p(%ld), user=%p(%ld), pass=%p(%ld), host=%p(%ld), port=%p(%ld), query=%p(%ld)\n", pl->scheme, pl->scheme_len, pl->username, pl->username_len, pl->password, pl->password_len, pl->hostname, diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 1b26204a94f..3bfd8961c8f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -669,7 +669,7 @@ static void test_UrlGetPart(void) {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, {"http://host?a:b@c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, - {"http://host?a:b@c:d", URL_PART_QUERY, 0, S_OK, "a:b@c:d", .todo_hr = TRUE}, + {"http://host?a:b@c:d", URL_PART_QUERY, 0, S_OK, "a:b@c:d"}, {"http://host#a:b@c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host#a:b@c:d", URL_PART_QUERY, 0, S_FALSE, ""},

1 0

Daniel Lehman : msxml3/tests: Fix some double-frees of BSTRs.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 562c16f4215a4ede1295b03df956b49693abc02b URL: https://source.winehq.org/git/wine.git/?a=commit;h=562c16f4215a4ede1295b03d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Feb 15 11:59:31 2022 -0800 msxml3/tests: Fix some double-frees of BSTRs. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ad4d255abe7..f7929cd3a23 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5281,7 +5281,6 @@ static void test_cloneNode(void ) V_VT(&v) = VT_BSTR; hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), v); ok(hr == S_OK, "got 0x%08x\n", hr); - VariantClear(&v); /* clone document node */ hr = IXMLDOMDocument2_cloneNode(doc, VARIANT_TRUE, &node); @@ -8847,7 +8846,6 @@ static void test_put_nodeTypedValue(void) V_BSTR(&value) = _bstr_("1"); hr = IXMLDOMElement_put_nodeTypedValue(elem, value); EXPECT_HR(hr, S_OK); - VariantClear(&value); V_VT(&value) = VT_EMPTY; hr = IXMLDOMElement_get_nodeTypedValue(elem, &value);

1 0

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

16 Feb '22

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

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

16 Feb '22

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: Add support for UTF-8 and Unicode-only locales.
by Alexandre Julliard 16 Feb '22

16 Feb '22

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/LibvirtTool: Reorganize the snapshot creation.
by Alexandre Julliard 16 Feb '22

16 Feb '22

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

Huw Davies : winealsa: Move get_endpoints_id to the unixlib.
by Alexandre Julliard 15 Feb '22

15 Feb '22

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

15 Feb '22

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022