Using shared copy of registryvalueKind (#31922)

Anipik · danmoseley · commit 39c4ddf1cbc0 · 2018-08-26T21:03:12.000-07:00
* using local copy of registryvaluekind and advapi32

* Moving complete file to shared

* name changed
diff --git a/src/Common/src/CoreLib/Interop/Windows/Advapi32/Interop.RegistryConstants.cs b/src/Common/src/CoreLib/Interop/Windows/Advapi32/Interop.RegistryConstants.cs
@@ -6,21 +6,21 @@ internal partial class Interop
 {
     internal partial class Advapi32
     {
-        internal partial class RegistryOptions
+        internal static class RegistryOptions
         {
             internal const int REG_OPTION_NON_VOLATILE = 0x0000;     // (default) keys are persisted beyond reboot/unload
             internal const int REG_OPTION_VOLATILE = 0x0001;        // All keys created by the function are volatile
             internal const int REG_OPTION_CREATE_LINK = 0x0002;     // They key is a symbolic link
-            internal const int REG_OPTION_BACKUP_RESTORE = 0x0004;  // Use SE_BACKUP_NAME process special privileges
+            internal const int REG_OPTION_BACKUP_RESTORE = 0x0004;  // Use SE_BACKUP_NAME process special privileges         
         }
 
-        internal partial class RegistryView
+        internal static class RegistryView
         {
             internal const int KEY_WOW64_64KEY = 0x0100;
             internal const int KEY_WOW64_32KEY = 0x0200;
         }
 
-        internal partial class RegistryOperations
+        internal static class RegistryOperations
         {
             internal const int KEY_QUERY_VALUE = 0x0001;
             internal const int KEY_SET_VALUE = 0x0002;
@@ -47,7 +47,7 @@ internal partial class RegistryOperations
             internal const int STANDARD_RIGHTS_WRITE = READ_CONTROL;
         }
 
-        internal partial class RegistryValues
+        internal static class RegistryValues
         {
             internal const int REG_NONE = 0;                // No value type
             internal const int REG_SZ = 1;                  // Unicode nul terminated string
@@ -62,4 +62,4 @@ internal partial class RegistryValues
             internal const int REG_QWORD = 11;             // 64-bit number
         }
     }
-}
+}
diff --git a/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.RegistryValues.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.RegistryValues.cs
diff --git a/src/Common/src/CoreLib/Microsoft/Win32/RegistryValueKind.cs b/src/Common/src/CoreLib/Microsoft/Win32/RegistryValueKind.cs
@@ -11,12 +11,12 @@ namespace Microsoft.Win32
 #endif
     enum RegistryValueKind
     {
-        String = Interop.Kernel32.RegistryValues.REG_SZ,
-        ExpandString = Interop.Kernel32.RegistryValues.REG_EXPAND_SZ,
-        Binary = Interop.Kernel32.RegistryValues.REG_BINARY,
-        DWord = Interop.Kernel32.RegistryValues.REG_DWORD,
-        MultiString = Interop.Kernel32.RegistryValues.REG_MULTI_SZ,
-        QWord = Interop.Kernel32.RegistryValues.REG_QWORD,
+        String = Interop.Advapi32.RegistryValues.REG_SZ,
+        ExpandString = Interop.Advapi32.RegistryValues.REG_EXPAND_SZ,
+        Binary = Interop.Advapi32.RegistryValues.REG_BINARY,
+        DWord = Interop.Advapi32.RegistryValues.REG_DWORD,
+        MultiString = Interop.Advapi32.RegistryValues.REG_MULTI_SZ,
+        QWord = Interop.Advapi32.RegistryValues.REG_QWORD,
         Unknown = 0,                          // REG_NONE is defined as zero but BCL
         None = unchecked((int)0xFFFFFFFF), //  mistakenly overrode this value.  
     }   // Now instead of using Interop.Kernel32.RegistryValues.REG_NONE we use "-1".
diff --git a/src/Common/src/CoreLib/System.Private.CoreLib.Shared.projitems b/src/Common/src/CoreLib/System.Private.CoreLib.Shared.projitems
@@ -761,7 +761,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.OutputDebugString.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_NativeOverlapped.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.RegistryValues.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.RegistryView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.SecurityOptions.cs" />
@@ -806,6 +805,7 @@
   </ItemGroup>
   <ItemGroup Condition="$(TargetsWindows) and '$(EnableWinRT)' != 'true'">
     <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\NtDll\NtQueryInformationFile.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Advapi32\Interop.RegistryConstants.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStream.Win32.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\TimeZoneInfo.Win32.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Microsoft\Win32\Registry.cs" />
diff --git a/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
@@ -15,22 +15,24 @@
     <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard-Unix-Debug;netstandard-Unix-Release;netstandard-Windows_NT-Debug;netstandard-Windows_NT-Release</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true' AND '$(OSGroup)' != 'AnyOS'">
-    <Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RegistryOptions.cs">
-      <Link>Common\Interop\Windows\Interop.RegistryOptions.cs</Link>
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Advapi32\Interop.RegistryConstants.cs">
+      <Link>Common\CoreLib\Interop\Windows\Advapi32\Interop.RegistryConstants.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Microsoft\Win32\Registry.cs">
       <Link>Common\CoreLib\Microsoft\Win32\Registry.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Microsoft\Win32\RegistryHive.cs">
       <Link>Common\CoreLib\Microsoft\Win32\RegistryHive.cs</Link>
     </Compile>
+    <Compile Include="$(CommonPath)\CoreLib\Microsoft\Win32\RegistryValueKind.cs">
+      <Link>Common\CoreLib\Microsoft\Win32\RegistryValueKind.cs"</Link>
+    </Compile>
     <Compile Include="$(CommonPath)\CoreLib\Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs">
       <Link>Common\CoreLib\Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs</Link>
     </Compile>
     <Compile Include="Microsoft\Win32\RegistryKey.cs" />
     <Compile Include="Microsoft\Win32\RegistryKeyPermissionCheck.cs" />
     <Compile Include="Microsoft\Win32\RegistryOptions.cs" />
-    <Compile Include="Microsoft\Win32\RegistryValueKind.cs" />
     <Compile Include="Microsoft\Win32\RegistryValueOptions.cs" />
     <Compile Include="Microsoft\Win32\RegistryView.cs" />
     <Compile Include="Microsoft\Win32\ThrowHelper.cs" />
diff --git a/src/Microsoft.Win32.Registry/src/Microsoft/Win32/RegistryValueKind.cs b/src/Microsoft.Win32.Registry/src/Microsoft/Win32/RegistryValueKind.cs

Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,21 @@ internal partial class Interop`
`6`	`6`	`{`
`7`	`7`	`internal partial class Advapi32`
`8`	`8`	`{`
`9`		`- internal partial class RegistryOptions`
	`9`	`+ internal static class RegistryOptions`
`10`	`10`	`{`
`11`	`11`	`internal const int REG_OPTION_NON_VOLATILE = 0x0000; // (default) keys are persisted beyond reboot/unload`
`12`	`12`	`internal const int REG_OPTION_VOLATILE = 0x0001; // All keys created by the function are volatile`
`13`	`13`	`internal const int REG_OPTION_CREATE_LINK = 0x0002; // They key is a symbolic link`
`14`		`- internal const int REG_OPTION_BACKUP_RESTORE = 0x0004; // Use SE_BACKUP_NAME process special privileges`
	`14`	`+ internal const int REG_OPTION_BACKUP_RESTORE = 0x0004; // Use SE_BACKUP_NAME process special privileges`
`15`	`15`	`}`
`16`	`16`
`17`		`- internal partial class RegistryView`
	`17`	`+ internal static class RegistryView`
`18`	`18`	`{`
`19`	`19`	`internal const int KEY_WOW64_64KEY = 0x0100;`
`20`	`20`	`internal const int KEY_WOW64_32KEY = 0x0200;`
`21`	`21`	`}`
`22`	`22`
`23`		`- internal partial class RegistryOperations`
	`23`	`+ internal static class RegistryOperations`
`24`	`24`	`{`
`25`	`25`	`internal const int KEY_QUERY_VALUE = 0x0001;`
`26`	`26`	`internal const int KEY_SET_VALUE = 0x0002;`
`@@ -47,7 +47,7 @@ internal partial class RegistryOperations`
`47`	`47`	`internal const int STANDARD_RIGHTS_WRITE = READ_CONTROL;`
`48`	`48`	`}`
`49`	`49`
`50`		`- internal partial class RegistryValues`
	`50`	`+ internal static class RegistryValues`
`51`	`51`	`{`
`52`	`52`	`internal const int REG_NONE = 0; // No value type`
`53`	`53`	`internal const int REG_SZ = 1; // Unicode nul terminated string`
`@@ -62,4 +62,4 @@ internal partial class RegistryValues`
`62`	`62`	`internal const int REG_QWORD = 11; // 64-bit number`
`63`	`63`	`}`
`64`	`64`	`}`
`65`		`-}`
	`65`	`+}`