Revert an unnecessary breaking API change

dotnet · Jul 8, 2020 · e82bb5a · e82bb5a
1 parent 6efe8ab
commit e82bb5a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/SetupApi.Tests/SP_DEVINFO_DATAFacts.cs b/src/SetupApi.Tests/SP_DEVINFO_DATAFacts.cs
@@ -14,11 +14,11 @@ public void Size_Test()
 
         if (Environment.Is64BitProcess)
         {
-            Assert.Equal(0x20, value.cbSize);
+            Assert.Equal(0x20, value.Size);
         }
         else
         {
-            Assert.Equal(0x1c, value.cbSize);
+            Assert.Equal(0x1c, value.Size);
         }
     }
 }
diff --git a/src/SetupApi/PublicAPI.Shipped.txt b/src/SetupApi/PublicAPI.Shipped.txt
@@ -24,6 +24,7 @@ PInvoke.SetupApi.SP_DEVINFO_DATA.ClassGuid -> System.Guid
 PInvoke.SetupApi.SP_DEVINFO_DATA.DevInst -> uint
 PInvoke.SetupApi.SP_DEVINFO_DATA.Reserved -> System.IntPtr
 PInvoke.SetupApi.SP_DEVINFO_DATA.SP_DEVINFO_DATA() -> void
+PInvoke.SetupApi.SP_DEVINFO_DATA.Size -> int
 PInvoke.SetupApi.SafeDeviceInfoSetHandle
 PInvoke.SetupApi.SafeDeviceInfoSetHandle.SafeDeviceInfoSetHandle() -> void
 PInvoke.SetupApi.SafeDeviceInfoSetHandle.SafeDeviceInfoSetHandle(System.IntPtr preexistingHandle, bool ownsHandle = true) -> void

diff --git a/src/SetupApi/PublicAPI.Unshipped.txt b/src/SetupApi/PublicAPI.Unshipped.txt
@@ -45,7 +45,6 @@ PInvoke.SetupApi.DriverType
 PInvoke.SetupApi.DriverType.SPDIT_CLASSDRIVER = 1 -> PInvoke.SetupApi.DriverType
 PInvoke.SetupApi.DriverType.SPDIT_COMPATDRIVER = 2 -> PInvoke.SetupApi.DriverType
 PInvoke.SetupApi.DriverType.SPDIT_NODRIVER = 0 -> PInvoke.SetupApi.DriverType
-PInvoke.SetupApi.SP_DEVINFO_DATA.cbSize -> int
 PInvoke.SetupApi.SP_DEVINSTALL_PARAMS
 PInvoke.SetupApi.SP_DEVINSTALL_PARAMS.ClassInstallReserved -> System.IntPtr
 PInvoke.SetupApi.SP_DEVINSTALL_PARAMS.DriverPath -> char*

diff --git a/src/SetupApi/SetupApi+SP_DEVINFO_DATA.cs b/src/SetupApi/SetupApi+SP_DEVINFO_DATA.cs
@@ -26,7 +26,7 @@ public struct SP_DEVINFO_DATA
             /// The size, in bytes, of the <see cref="SP_DEVINFO_DATA" /> structure. The constructor set this value automatically
             /// to the correct size.
             /// </summary>
-            public int cbSize;
+            public int Size;
 
             /// <summary>
             /// The GUID of the device's setup class.
@@ -50,10 +50,10 @@ public struct SP_DEVINFO_DATA
 
             /// <summary>
             /// Initializes a new instance of the <see cref="SP_DEVINFO_DATA" /> struct
-            /// with <see cref="cbSize" /> set to the correct value.
+            /// with <see cref="Size" /> set to the correct value.
             /// </summary>
             /// <returns>An instance of <see cref="SP_DEVINFO_DATA"/>.</returns>
-            public static unsafe SP_DEVINFO_DATA Create() => new SP_DEVINFO_DATA { cbSize = sizeof(SP_DEVINFO_DATA) };
+            public static unsafe SP_DEVINFO_DATA Create() => new SP_DEVINFO_DATA { Size = sizeof(SP_DEVINFO_DATA) };
         }
     }
 }
diff --git a/src/SetupApi/SetupApi.cs b/src/SetupApi/SetupApi.cs
@@ -146,7 +146,7 @@ public static partial class SetupApi
         /// </param>
         /// <param name="deviceInfoData">
         /// A pointer to a buffer that receives information about the device that supports the requested interface. The caller
-        /// must set <see cref="SP_DEVINFO_DATA.cbSize" /> before calling this function.
+        /// must set <see cref="SP_DEVINFO_DATA.Size" /> before calling this function.
         /// <para>This parameter is optional and can be <see langword="null" />.</para>
         /// </param>
         /// <returns>
@@ -175,7 +175,7 @@ public static partial class SetupApi
         /// <param name="memberIndex">A zero-based index of the device information element to retrieve.</param>
         /// <param name="deviceInfoData">
         /// A pointer to an <see cref="SP_DEVINFO_DATA"/> structure to receive information about an enumerated
-        /// device information element. The caller must set <see cref="SP_DEVINFO_DATA.cbSize" /> before calling this function.
+        /// device information element. The caller must set <see cref="SP_DEVINFO_DATA.Size" /> before calling this function.
         /// </param>
         /// <returns>
         /// Returns <see langword="true" /> if the function completed without error. If the function completed with an
@@ -271,7 +271,7 @@ public static partial class SetupApi
         /// </param>
         /// <param name="deviceInfoData">
         /// A pointer to a caller-supplied <see cref="SP_DEVINFO_DATA"/> structure that receives information about the device information
-        /// element for the device instance that is specified by <paramref name="deviceInstanceId"/>. The caller must set <see cref="SP_DEVINFO_DATA.cbSize"/>.
+        /// element for the device instance that is specified by <paramref name="deviceInstanceId"/>. The caller must set <see cref="SP_DEVINFO_DATA.Size"/>.
         /// This parameter is optional and can be <see langword="null"/>.
         /// </param>
         /// <returns>