Fix the bug when F2 browse and boot VHD/VHDX files in an extend logic partition.

diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_vhd.c b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_vhd.c
index 84468704acb2c93dfb754ddaea1814174d547f07..41452b9f77f5d1118623167afcabbe4b275ea720 100644 (file)
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_vhd.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_vhd.c
@@ -148,9 +148,10 @@ static int ventoy_vhd_patch_path(char *vhdpath, ventoy_patch_vhd *patch1, ventoy
     return 0;
 }
 
     return 0;
 }
 

-static int ventoy_vhd_read_parttbl(const char *filename, ventoy_gpt_info *gpt, int *index)
+static int ventoy_vhd_read_parttbl(const char *filename, ventoy_gpt_info *gpt, int *index, grub_uint64_t *poffset)

 {
     int i;
 {
     int i;

+    int find = 0;

     int ret = 1;
     grub_uint64_t start;
     grub_file_t file = NULL;
     int ret = 1;
     grub_uint64_t start;
     grub_file_t file = NULL;


@@ -183,6 +184,7 @@ static int ventoy_vhd_read_parttbl(const char *filename, ventoy_gpt_info *gpt, i
                 if (start == gpt->PartTbl[i].StartLBA)
                 {
                     *index = i;
                 if (start == gpt->PartTbl[i].StartLBA)
                 {
                     *index = i;

+                    find = 1;

                     break;
                 }
             }
                     break;
                 }
             }


@@ -196,11 +198,22 @@ static int ventoy_vhd_read_parttbl(const char *filename, ventoy_gpt_info *gpt, i
             if ((grub_uint32_t)start == gpt->MBR.PartTbl[i].StartSectorId)
             {
                 *index = i;
             if ((grub_uint32_t)start == gpt->MBR.PartTbl[i].StartSectorId)
             {
                 *index = i;

+                find = 1;

                 break;
             }
         }
     }    
 
                 break;
             }
         }
     }    
 

+    if (find == 0) // MBR Logical partition
+    {
+        if (file->device->disk->partition->number > 0)
+        {
+            *index = file->device->disk->partition->number;
+            debug("Fall back part number: %d\n", *index);
+        }
+    }
+
+    *poffset = start;

     ret = 0;
 
 end:
     ret = 0;
 
 end:


@@ -226,7 +239,7 @@ static int ventoy_vhd_patch_disk(const char *vhdpath, ventoy_patch_vhd *patch1,
     else
     {
         gpt = grub_zalloc(sizeof(ventoy_gpt_info));
     else
     {
         gpt = grub_zalloc(sizeof(ventoy_gpt_info));

-        ventoy_vhd_read_parttbl(vhdpath, gpt, &partIndex);
+        ventoy_vhd_read_parttbl(vhdpath, gpt, &partIndex, &offset);

         debug("This is HDD partIndex %d %s\n", partIndex, vhdpath);
     }
 
         debug("This is HDD partIndex %d %s\n", partIndex, vhdpath);
     }
 


@@ -249,9 +262,7 @@ static int ventoy_vhd_patch_disk(const char *vhdpath, ventoy_patch_vhd *patch1,
     }
     else
     {
     }
     else
     {

-        offset = gpt->MBR.PartTbl[partIndex].StartSectorId;

         offset *= 512;
         offset *= 512;

-    

         debug("MBR disk signature: %02x%02x%02x%02x Part(%d) offset:%llu\n",
             gpt->MBR.BootCode[0x1b8 + 0], gpt->MBR.BootCode[0x1b8 + 1],
             gpt->MBR.BootCode[0x1b8 + 2], gpt->MBR.BootCode[0x1b8 + 3],
         debug("MBR disk signature: %02x%02x%02x%02x Part(%d) offset:%llu\n",
             gpt->MBR.BootCode[0x1b8 + 0], gpt->MBR.BootCode[0x1b8 + 1],
             gpt->MBR.BootCode[0x1b8 + 2], gpt->MBR.BootCode[0x1b8 + 3],