Merge pull request #595 from dorssel/bump_cswin32

Bump Microsoft.Windows.CsWin32 from 0.2.206-beta to 0.2.229-beta
dorssel · May 12, 2023 · 89d4b32 · 89d4b32
2 parents 71fa303 + 2af52a2
commit 89d4b32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -12,7 +12,7 @@ SPDX-License-Identifier: GPL-3.0-only
  <!-- Usbipd -->
  <PackageVersion Include="Microsoft.Extensions.Configuration.Ini" Version="7.0.0" />
  <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
- <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.206-beta" />
+ <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.229-beta" />
  <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
 
  <!-- UsbIds -->

diff --git a/Usbipd/NewDev.cs b/Usbipd/NewDev.cs
@@ -70,8 +70,7 @@ public static bool ForceVBoxDriver(string originalInstanceId)
  };
  PInvoke.SetupDiEnumDriverInfo(deviceInfoSet, deviceInfoData, (uint)SETUP_DI_BUILD_DRIVER_DRIVER_TYPE.SPDIT_CLASSDRIVER, 0, ref driverInfoData).ThrowOnError(nameof(PInvoke.SetupDiEnumDriverInfo));
  BOOL tmpReboot;
- // NOTE: Workaround for https://github.com/microsoft/win32metadata/issues/903
- PInvoke.DiInstallDevice(default, (HDEVINFO)deviceInfoSet.DangerousGetHandle(), &deviceInfoData, (SP_DRVINFO_DATA_V2_A*)&driverInfoData, 0, &tmpReboot).ThrowOnError(nameof(PInvoke.DiInstallDevice));
+ PInvoke.DiInstallDevice(default, deviceInfoSet, deviceInfoData, driverInfoData, 0, &tmpReboot).ThrowOnError(nameof(PInvoke.DiInstallDevice));
  if (tmpReboot)
  {
  reboot = true;