Skip to content

Commit a84bc89

Browse files
pallavitpallavit
committed
Incorporated CR comments.
1. Updated the Interop.Libraries to use pascal casing. 2. Added new line at the EOF.
1 parent aae2782 commit a84bc89

16 files changed

+26
-27
lines changed

‎src/Common/src/Interop/Windows/Interop.Libraries.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ private static class Libraries
88
internal const string Debug = "api-ms-win-core-debug-l1-1-0.dll";
99
internal const string Handle = "api-ms-win-core-handle-l1-1-0.dll";
1010
internal const string Localization = "api-ms-win-core-localization-l1-2-0.dll";
11-
internal const string PROCESSENVIRONMENT_L1_APISET = "api-ms-win-core-processenvironment-l1-1-0.dll";
12-
internal const string REGISTRY_L1_APISET = "api-ms-win-core-registry-l1-1-0.dll";
13-
internal const string REGISTRY_L2_APISET = "api-ms-win-core-registry-l2-1-0.dll";
11+
internal const string Registry_L1 = "api-ms-win-core-registry-l1-1-0.dll";
12+
internal const string Registry_L2 = "api-ms-win-core-registry-l2-1-0.dll";
1413
internal const string User32 = "user32.dll";
1514
}
1615
}

‎src/Common/src/Interop/Windows/mincore/Interop.Errors.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ internal partial class Errors
1717
internal const int ERROR_BAD_IMPERSONATION_LEVEL = 0x542;
1818
}
1919
}
20-
}
20+
}

‎src/Common/src/Interop/Windows/mincore/Interop.RegCloseKey.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ internal partial class Interop
99
{
1010
internal partial class mincore
1111
{
12-
[DllImport(Libraries.REGISTRY_L1_APISET)]
12+
[DllImport(Libraries.Registry_L1)]
1313
internal extern static int RegCloseKey(IntPtr hKey);
1414
}
1515
}

‎src/Common/src/Interop/Windows/mincore/Interop.RegConnectRegistry.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ internal partial class Interop
99
{
1010
internal partial class mincore
1111
{
12-
[DllImport(Libraries.REGISTRY_L2_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegConnectRegistryW")]
12+
[DllImport(Libraries.Registry_L2, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegConnectRegistryW")]
1313
internal static extern int RegConnectRegistry(String machineName, SafeRegistryHandle key, out SafeRegistryHandle result);
1414
}
1515
}

‎src/Common/src/Interop/Windows/mincore/Interop.RegCreateKeyEx.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ internal partial class mincore
1111
{
1212
// Note: RegCreateKeyEx won't set the last error on failure - it returns
1313
// an error code if it fails.
14-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegCreateKeyExW")]
14+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegCreateKeyExW")]
1515
internal static extern int RegCreateKeyEx(
1616
SafeRegistryHandle hKey,
1717
String lpSubKey,

‎src/Common/src/Interop/Windows/mincore/Interop.RegDeleteKeyEx.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ internal partial class Interop
99
{
1010
internal partial class mincore
1111
{
12-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegDeleteKeyExW")]
12+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegDeleteKeyExW")]
1313
internal static extern int RegDeleteKeyEx(SafeRegistryHandle hKey, String lpSubKey, int samDesired, int Reserved);
1414
}
1515
}

‎src/Common/src/Interop/Windows/mincore/Interop.RegDeleteValue.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ internal partial class Interop
99
{
1010
internal partial class mincore
1111
{
12-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegDeleteValueW")]
12+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegDeleteValueW")]
1313
internal static extern int RegDeleteValue(SafeRegistryHandle hKey, String lpValueName);
1414
}
1515
}

‎src/Common/src/Interop/Windows/mincore/Interop.RegEnumKeyEx.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal partial class Interop
1010
{
1111
internal partial class mincore
1212
{
13-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegEnumKeyExW")]
13+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegEnumKeyExW")]
1414
internal unsafe static extern int RegEnumKeyEx(
1515
SafeRegistryHandle hKey,
1616
int dwIndex,

‎src/Common/src/Interop/Windows/mincore/Interop.RegEnumValue.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ internal partial class Interop
99
{
1010
internal partial class mincore
1111
{
12-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegEnumValueW")]
12+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegEnumValueW")]
1313
internal unsafe static extern int RegEnumValue(
1414
SafeRegistryHandle hKey,
1515
int dwIndex,

‎src/Common/src/Interop/Windows/mincore/Interop.RegFlushKey.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ internal partial class Interop
88
{
99
internal partial class mincore
1010
{
11-
[DllImport(Libraries.REGISTRY_L1_APISET)]
11+
[DllImport(Libraries.Registry_L1)]
1212
internal static extern int RegFlushKey(SafeRegistryHandle hKey);
1313
}
1414
}

‎src/Common/src/Interop/Windows/mincore/Interop.RegOpenKeyEx.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ internal partial class Interop
99
{
1010
internal partial class mincore
1111
{
12-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegOpenKeyExW")]
12+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegOpenKeyExW")]
1313
internal static extern int RegOpenKeyEx(
1414
SafeRegistryHandle hKey,
1515
string lpSubKey,
@@ -18,7 +18,7 @@ internal static extern int RegOpenKeyEx(
1818
out SafeRegistryHandle hkResult);
1919

2020

21-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegOpenKeyExW")]
21+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegOpenKeyExW")]
2222
internal static extern int RegOpenKeyEx(
2323
IntPtr hKey,
2424
string lpSubKey,

‎src/Common/src/Interop/Windows/mincore/Interop.RegQueryInfoKey.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal partial class Interop
1010
{
1111
internal partial class mincore
1212
{
13-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryInfoKeyW")]
13+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryInfoKeyW")]
1414
internal static extern int RegQueryInfoKey(
1515
SafeRegistryHandle hKey,
1616
[Out]StringBuilder lpClass,

‎src/Common/src/Interop/Windows/mincore/Interop.RegQueryValueEx.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal partial class Interop
1010
{
1111
internal partial class mincore
1212
{
13-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
13+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
1414
internal static extern int RegQueryValueEx(
1515
SafeRegistryHandle hKey,
1616
string lpValueName,
@@ -19,7 +19,7 @@ internal static extern int RegQueryValueEx(
1919
[Out] byte[] lpData,
2020
ref int lpcbData);
2121

22-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
22+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
2323
internal static extern int RegQueryValueEx(
2424
SafeRegistryHandle hKey,
2525
string lpValueName,
@@ -28,7 +28,7 @@ internal static extern int RegQueryValueEx(
2828
ref int lpData,
2929
ref int lpcbData);
3030

31-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
31+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
3232
internal static extern int RegQueryValueEx(
3333
SafeRegistryHandle hKey,
3434
String lpValueName,
@@ -37,7 +37,7 @@ internal static extern int RegQueryValueEx(
3737
ref long lpData,
3838
ref int lpcbData);
3939

40-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
40+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
4141
internal static extern int RegQueryValueEx(
4242
SafeRegistryHandle hKey,
4343
String lpValueName,
@@ -46,7 +46,7 @@ internal static extern int RegQueryValueEx(
4646
[Out] char[] lpData,
4747
ref int lpcbData);
4848

49-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
49+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegQueryValueExW")]
5050
internal static extern int RegQueryValueEx(
5151
SafeRegistryHandle hKey,
5252
String lpValueName,

‎src/Common/src/Interop/Windows/mincore/Interop.RegSetValueEx.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal partial class Interop
1010
{
1111
internal partial class mincore
1212
{
13-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegSetValueExW")]
13+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegSetValueExW")]
1414
internal static extern int RegSetValueEx(
1515
SafeRegistryHandle hKey,
1616
String lpValueName,
@@ -19,7 +19,7 @@ internal static extern int RegSetValueEx(
1919
byte[] lpData,
2020
int cbData);
2121

22-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegSetValueExW")]
22+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegSetValueExW")]
2323
internal static extern int RegSetValueEx(
2424
SafeRegistryHandle hKey,
2525
String lpValueName,
@@ -28,7 +28,7 @@ internal static extern int RegSetValueEx(
2828
char[] lpData,
2929
int cbData);
3030

31-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegSetValueExW")]
31+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegSetValueExW")]
3232
internal static extern int RegSetValueEx(
3333
SafeRegistryHandle hKey,
3434
String lpValueName,
@@ -37,7 +37,7 @@ internal static extern int RegSetValueEx(
3737
ref int lpData,
3838
int cbData);
3939

40-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegSetValueExW")]
40+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegSetValueExW")]
4141
internal static extern int RegSetValueEx(
4242
SafeRegistryHandle hKey,
4343
String lpValueName,
@@ -46,7 +46,7 @@ internal static extern int RegSetValueEx(
4646
ref long lpData,
4747
int cbData);
4848

49-
[DllImport(Libraries.REGISTRY_L1_APISET, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegSetValueExW")]
49+
[DllImport(Libraries.Registry_L1, CharSet = CharSet.Unicode, BestFitMapping = false, EntryPoint = "RegSetValueExW")]
5050
internal static extern int RegSetValueEx(
5151
SafeRegistryHandle hKey,
5252
String lpValueName,

‎src/Common/src/Interop/Windows/mincore/Interop.RegistryOptions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ internal partial class RegistryValues
6161
internal const int REG_QWORD = 11; // 64-bit number
6262
}
6363
}
64-
}
64+
}

‎src/Microsoft.Win32.Registry/src/System/Security/AccessControl/RegistryRights.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ public enum RegistryRights
3333
TakeOwnership = 0x80000,
3434
FullControl = 0xF003F | Interop.mincore.RegistryOperations.STANDARD_RIGHTS_READ | Interop.mincore.RegistryOperations.STANDARD_RIGHTS_WRITE
3535
}
36-
}
36+
}

0 commit comments

Comments
 (0)