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

Do not assume pointers are 32-bit in several Windows device calls.

Browse Source
This commit is contained in:
Natalia Portillo
2018-06-20 18:52:54 +01:00
parent e92b6c6715
commit dc1884f5d8
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DiscImageChef.Devices/Windows/UsbFunctions.cs
View File

@@ -209,7 +209,7 @@ namespace DiscImageChef.Devices.Windows
// We start at the "root" of the device tree and look for all
// devices that match the interface GUID of a disk
IntPtr h = SetupDiGetClassDevs(ref diskGuid, 0, IntPtr.Zero, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
if(h.ToInt32() != INVALID_HANDLE_VALUE)
if(h != INVALID_HANDLE_VALUE)
{
bool success;
int i = 0;
@@ -274,7 +274,7 @@ namespace DiscImageChef.Devices.Windows
int ans = -1;
IntPtr h = CreateFile(devicePath.TrimEnd('\\'), 0, 0, IntPtr.Zero, OPEN_EXISTING, 0, IntPtr.Zero);
if(h.ToInt32() == INVALID_HANDLE_VALUE) return ans;
if(h == INVALID_HANDLE_VALUE) return ans;
StorageDeviceNumber sdn = new StorageDeviceNumber();
int nBytes = Marshal.SizeOf(sdn);