aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Devices] [Windows] Fix USB field sizes for 64-bit systems.

Browse Source
This commit is contained in:
Natalia Portillo
2024-04-26 03:20:18 +01:00
parent 5aa21b65b8
commit 19d8dac885
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aaru.Devices/Windows/Usb.cs
View File

@@ -88,7 +88,7 @@ static partial class Usb
// build a Device Interface Detail Data structure // build a Device Interface Detail Data structure
var didd = new SpDeviceInterfaceDetailData var didd = new SpDeviceInterfaceDetailData
{ {
cbSize = 4 + Marshal.SystemDefaultCharSize cbSize = IntPtr.Size == 8 ? 8 : 4 + Marshal.SystemDefaultCharSize
}; };
// trust me :) // trust me :)
@@ -915,7 +915,7 @@ static partial class Usb
{ {
internal int cbSize; internal int cbSize;
internal readonly Guid ClassGuid; internal readonly Guid ClassGuid;
internal readonly IntPtr DevInst; internal readonly uint DevInst;
internal readonly IntPtr Reserved; internal readonly IntPtr Reserved;
} }

10
Aaru.Devices/Windows/UsbFunctions.cs
View File

@@ -173,10 +173,10 @@ static partial class Usb
} }
[DllImport("setupapi.dll")] [DllImport("setupapi.dll")]
static extern int CM_Get_Parent(out IntPtr pdnDevInst, IntPtr dnDevInst, int ulFlags); static extern int CM_Get_Parent(out uint pdnDevInst, uint dnDevInst, int ulFlags);
[DllImport("setupapi.dll", CharSet = CharSet.Auto)] [DllImport("setupapi.dll", CharSet = CharSet.Auto)]
static extern int CM_Get_Device_ID(IntPtr dnDevInst, IntPtr buffer, int bufferLen, int ulFlags); static extern int CM_Get_Device_ID(uint dnDevInst, IntPtr buffer, int bufferLen, int ulFlags);
/// <summary>Find a device based upon a Drive Letter</summary> /// <summary>Find a device based upon a Drive Letter</summary>
/// <param name="driveLetter">Drive letter</param> /// <param name="driveLetter">Drive letter</param>
@@ -244,8 +244,8 @@ static partial class Usb
// build a Device Interface Detail Data structure // build a Device Interface Detail Data structure
var didd = new SpDeviceInterfaceDetailData var didd = new SpDeviceInterfaceDetailData
{ {
cbSize = 4 + Marshal.SystemDefaultCharSize cbSize = IntPtr.Size == 8 ? 8 : 4 + Marshal.SystemDefaultCharSize
}; // trust me :) };
// now we can get some more detailed information // now we can get some more detailed information
var nRequiredSize = 0; var nRequiredSize = 0;
@@ -256,7 +256,7 @@ static partial class Usb
{ {
// current InstanceID is at the "USBSTOR" level, so we // current InstanceID is at the "USBSTOR" level, so we
// need up "move up" one level to get to the "USB" level // need up "move up" one level to get to the "USB" level
CM_Get_Parent(out IntPtr ptrPrevious, da.DevInst, 0); CM_Get_Parent(out uint ptrPrevious, da.DevInst, 0);
// Now we get the InstanceID of the USB level device // Now we get the InstanceID of the USB level device
nint ptrInstanceBuf = Marshal.AllocHGlobal(BUFFER_SIZE); nint ptrInstanceBuf = Marshal.AllocHGlobal(BUFFER_SIZE);