Merge pull request #127 from AArnott/fix76_setupapi

Fix parameter propagation in helper method
dotnet · Jan 1, 2016 · b4d14af · b4d14af
2 parents c43c1fa + 94c3f6e
commit b4d14af
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/SetupApi.Desktop/SetupApi.Helpers.cs b/src/SetupApi.Desktop/SetupApi.Helpers.cs
@@ -79,20 +79,20 @@ public static IEnumerable<DeviceInterfaceData> SetupDiEnumDeviceInterfaces(
         }
 
         public static string SetupDiGetDeviceInterfaceDetail(
-            SafeDeviceInfoSetHandle lpDeviceInfoSet,
-            DeviceInterfaceData oInterfaceData,
-            IntPtr lpDeviceInfoData)
+            SafeDeviceInfoSetHandle deviceInfoSet,
+            DeviceInterfaceData interfaceData,
+            DeviceInfoData deviceInfoData)
         {
             var requiredSize = new NullableUInt32();
 
             // First call to get the size to allocate
             SetupDiGetDeviceInterfaceDetail(
-                lpDeviceInfoSet,
-                ref oInterfaceData,
+                deviceInfoSet,
+                ref interfaceData,
                 IntPtr.Zero,
                 0,
                 requiredSize,
-                null);
+                deviceInfoData);
 
             // As we passed an empty buffer we know that the function will fail, not need to check the result.
             var lastError = GetLastError();
@@ -109,8 +109,8 @@ public static string SetupDiGetDeviceInterfaceDetail(
 
                 // Second call to get the value
                 var success = SetupDiGetDeviceInterfaceDetail(
-                    lpDeviceInfoSet,
-                    ref oInterfaceData,
+                    deviceInfoSet,
+                    ref interfaceData,
                     buffer,
                     (int)requiredSize.Value,
                     null,