Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove char[] allocations from RegistryKey #66918

Merged
merged 2 commits into from
Jul 23, 2022
Merged

Remove char[] allocations from RegistryKey #66918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47a4076
Improve performance of RegistryKey.GetValue
stephentoub Jul 22, 2022
44abbf8
Merge branch 'main' into registryalloc
stephentoub Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 5 additions & 23 deletions src/libraries/Common/src/Interop/Windows/Advapi32/Interop.RegQueryValueEx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,12 @@ internal static partial int RegQueryValueEx(
ref int lpcbData);

[LibraryImport(Libraries.Advapi32, EntryPoint = "RegQueryValueExW", StringMarshalling = StringMarshalling.Utf16)]
internal static partial int RegQueryValueEx(
SafeRegistryHandle hKey,
string? lpValueName,
int[]? lpReserved,
ref int lpType,
ref int lpData,
ref int lpcbData);

[LibraryImport(Libraries.Advapi32, EntryPoint = "RegQueryValueExW", StringMarshalling = StringMarshalling.Utf16)]
internal static partial int RegQueryValueEx(
SafeRegistryHandle hKey,
string? lpValueName,
int[]? lpReserved,
ref int lpType,
ref long lpData,
ref int lpcbData);

[LibraryImport(Libraries.Advapi32, EntryPoint = "RegQueryValueExW", StringMarshalling = StringMarshalling.Utf16)]
internal static partial int RegQueryValueEx(
internal static unsafe partial int RegQueryValueEx(
SafeRegistryHandle hKey,
string? lpValueName,
int[]? lpReserved,
ref int lpType,
[Out] char[]? lpData,
ref int lpcbData);
int* lpReserved,
int* lpType,
byte* lpData,
uint* lpcbData);
}
}
367 changes: 163 additions & 204 deletions src/libraries/Microsoft.Win32.Registry/src/Microsoft/Win32/RegistryKey.Windows.cs
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions src/libraries/Microsoft.Win32.Registry/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<root>
<?xml version="1.0" encoding="utf-8"?>
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
Expand Down Expand Up @@ -84,8 +85,8 @@
<data name="Arg_RegBadKeyKind" xml:space="preserve">
<value>The specified RegistryValueKind is an invalid value.</value>
</data>
<data name="Arg_RegGetOverflowBug" xml:space="preserve">
<value>RegistryKey.GetValue does not allow a String that has a length greater than Int32.MaxValue.</value>
<data name="Arg_RegValueTooLarge" xml:space="preserve">
<value>RegistryKey.GetValue does not support values with more than Int32.MaxValue bytes.</value>
</data>
<data name="Arg_RegSetMismatchedKind" xml:space="preserve">
<value>The type of the value object did not match the specified RegistryValueKind or the object could not be properly converted.</value>
Expand Down Expand Up @@ -135,4 +136,4 @@
<data name="UnauthorizedAccess_RegistryNoWrite" xml:space="preserve">
<value>Cannot write to the registry key.</value>
</data>
</root>
</root>
15 changes: 8 additions & 7 deletions src/libraries/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_GetValue_CorruptData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,13 @@ public void ReadRegMultiSzLackingFinalNullTerminatorCorrectly()
}

[Theory]
[InlineData(RegistryValueKind.String, new byte[] { 6, 5, 6 })]
[InlineData(RegistryValueKind.ExpandString, new byte[] { 6, 5, 6 })]
[InlineData(RegistryValueKind.MultiString, new byte[] { 6, 5, 6, 0, 0 })]
public void RegSzOddByteLength(RegistryValueKind kind, byte[] contents)
[InlineData(RegistryValueKind.String, new byte[] { 6, 5, 6 }, "\u0506")]
[InlineData(RegistryValueKind.ExpandString, new byte[] { 6, 5, 6 }, "\u0506")]
[InlineData(RegistryValueKind.MultiString, new byte[] { 6, 5, 6 }, "\u0506")]
[InlineData(RegistryValueKind.String, new byte[] { 6, 5, 6, 0, 0 }, "\u0506\u0006")]
[InlineData(RegistryValueKind.ExpandString, new byte[] { 6, 5, 6, 0, 0 }, "\u0506\u0006")]
[InlineData(RegistryValueKind.MultiString, new byte[] { 6, 5, 6, 0, 0 }, "\u0506\u0006")]
public void RegSzOddByteLength(RegistryValueKind kind, byte[] contents, string expected)
{
const string TestValueName = "CorruptData2";

Expand All @@ -73,9 +76,7 @@ public void RegSzOddByteLength(RegistryValueKind kind, byte[] contents)
s = (string)o;
}

Assert.Equal(2, s.Length);
Assert.Equal(0x506, s[0]);
Assert.Equal(0x6, s[1]);
Assert.Equal(expected, s);
}
finally
{
Expand Down
7 changes: 7 additions & 0 deletions src/libraries/Microsoft.Win32.Registry/tests/RegistryKey/RegistryKey_GetValue_str.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,12 @@ public void GetStringArrayTest()
Assert.Equal(expected, (string[])TestRegistryKey.GetValue(valueName));
TestRegistryKey.DeleteValue(valueName);
}

[Fact]
public void GetPerformanceKeyValue()
{
string[] counterNames = (string[])Registry.PerformanceData.GetValue("Counter");
Assert.NotEmpty(counterNames);
}
}
}
Loading