From: longpanda <admin@ventoy.net>
Date: Sun, 13 Nov 2022 11:29:49 +0000 (+0800)
Subject: Fix the disk display error when pCloud virtual disk is installed in Windows OS.
X-Git-Tag: v1.0.82~8
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/commitdiff_plain/678a2abdf10322981bbe399141f381ba96c4df1d?ds=sidebyside

Fix the disk display error when pCloud virtual disk is installed in Windows OS.
---

diff --git a/INSTALL/Ventoy2Disk.exe b/INSTALL/Ventoy2Disk.exe
index 616aea3..752803a 100644
Binary files a/INSTALL/Ventoy2Disk.exe and b/INSTALL/Ventoy2Disk.exe differ
diff --git a/INSTALL/Ventoy2Disk_ARM.exe b/INSTALL/Ventoy2Disk_ARM.exe
index f72d179..3997837 100644
Binary files a/INSTALL/Ventoy2Disk_ARM.exe and b/INSTALL/Ventoy2Disk_ARM.exe differ
diff --git a/INSTALL/Ventoy2Disk_ARM64.exe b/INSTALL/Ventoy2Disk_ARM64.exe
index d920a7f..2bbf0ae 100644
Binary files a/INSTALL/Ventoy2Disk_ARM64.exe and b/INSTALL/Ventoy2Disk_ARM64.exe differ
diff --git a/INSTALL/Ventoy2Disk_X64.exe b/INSTALL/Ventoy2Disk_X64.exe
index b1119fc..abdd455 100644
Binary files a/INSTALL/Ventoy2Disk_X64.exe and b/INSTALL/Ventoy2Disk_X64.exe differ
diff --git a/Ventoy2Disk/Ventoy2Disk/PhyDrive.c b/Ventoy2Disk/Ventoy2Disk/PhyDrive.c
index 3df7c7e..485d9ff 100644
--- a/Ventoy2Disk/Ventoy2Disk/PhyDrive.c
+++ b/Ventoy2Disk/Ventoy2Disk/PhyDrive.c
@@ -290,9 +290,9 @@ End:
 
 int GetPhyDriveByLogicalDrive(int DriveLetter, UINT64 *Offset)
 {
-    BOOL Ret;
-    DWORD dwSize;
-    HANDLE Handle;
+    BOOL Ret = FALSE;
+    DWORD dwSize = 0;
+    HANDLE Handle = INVALID_HANDLE_VALUE;
     VOLUME_DISK_EXTENTS DiskExtents;
     CHAR PhyPath[128];
 
@@ -305,6 +305,7 @@ int GetPhyDriveByLogicalDrive(int DriveLetter, UINT64 *Offset)
         return -1;
     }
 
+    memset(&DiskExtents, 0, sizeof(DiskExtents));
     Ret = DeviceIoControl(Handle,
         IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS,
         NULL,
@@ -322,9 +323,10 @@ int GetPhyDriveByLogicalDrive(int DriveLetter, UINT64 *Offset)
     }
     CHECK_CLOSE_HANDLE(Handle);
 
-    Log("LogicalDrive:%s PhyDrive:%d Offset:%llu ExtentLength:%llu",
+    Log("LogicalDrive:%s PhyDrive:%d Num:%d Offset:%llu ExtentLength:%llu",
         PhyPath,
         DiskExtents.Extents[0].DiskNumber,
+        DiskExtents.NumberOfDiskExtents,
         DiskExtents.Extents[0].StartingOffset.QuadPart,
         DiskExtents.Extents[0].ExtentLength.QuadPart
         );