Mirrors/Ventoy
1
0
Fork 0
mirror of https://github.com/ventoy/Ventoy.git synced 2025-12-18 17:46:17 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix a Windows boot issue in F2 mode.
Some checks failed
Ventoy CI / build (push) Has been cancelled
Details
Mirror GitHub to Gitee / Sync-GitHub-to-Gitee (push) Has been cancelled
Details

Browse Source
This commit is contained in:
longpanda
2025-12-17 22:51:58 +08:00
parent af34df278f
commit c42abd33c2
3 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
INSTALL/ventoy/vtoyjump32.exe
View File

Binary file not shown.

BIN
INSTALL/ventoy/vtoyjump64.exe
View File

Binary file not shown.

59
vtoyjump/vtoyjump/vtoyjump.c
View File

@@ -2214,6 +2214,10 @@ static int Windows11Bypass(const char *isofile, const char MntLetter, UINT8 Chec
goto End; goto End;
} }
//bugfix: change VTOYEFI partition attribute
//Now we really need to bypass windows 11 check. create registry //Now we really need to bypass windows 11 check. create registry
if (Check) if (Check)
@@ -2390,6 +2394,45 @@ static int MountVTLRI(CHAR *ImgPath, DWORD PhyDrive)
return 0; return 0;
} }
static BOOL FindVentoyDiskBySig(UINT32 VtoySig, DWORD* pDiskNum)
{
HANDLE Handle;
DWORD dwSize = 0;
CHAR PhyPath[128];
UINT8 SectorBuf[512];
Log("Find Ventoy Disk by Sig %08x ...", VtoySig);
for (int DiskNum = 0; DiskNum < 32; DiskNum++)
{
sprintf_s(PhyPath, sizeof(PhyPath), "\\\\.\\PhysicalDrive%d", DiskNum);
Handle = CreateFileA(PhyPath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0);
if (Handle == INVALID_HANDLE_VALUE)
{
Log("Could not open the disk<%s>, error:%u", PhyPath, GetLastError());
continue;
}
if (!ReadFile(Handle, SectorBuf, sizeof(SectorBuf), &dwSize, NULL))
{
Log("ReadFile failed, dwSize:%u error:%u", dwSize, GetLastError());
CloseHandle(Handle);
continue;
}
CloseHandle(Handle);
if (*(UINT32*)(SectorBuf + 0x1B8) == VtoySig)
{
Log("%s sig match ...", PhyPath);
*pDiskNum = DiskNum;
return TRUE;
}
}
return FALSE;
}
static int VentoyHook(ventoy_os_param *param) static int VentoyHook(ventoy_os_param *param)
{ {
int i; int i;
@@ -2476,11 +2519,11 @@ static int VentoyHook(ventoy_os_param *param)
if (g_os_param_reserved[6] == 1) if (g_os_param_reserved[6] == 1)
{ {
memcpy(&VtoySig, g_os_param_reserved + 7, 4); memcpy(&VtoySig, g_os_param_reserved + 7, 4);
for (i = 0; i < 5; i++) for (i = 0; i < 3; i++)
{ {
VtoyLetter = 'A'; VtoyLetter = 'A';
Drives = GetLogicalDrives(); Drives = GetLogicalDrives();
Log("Logic Drives: 0x%x VentoySig:%08X", Drives, VtoySig); Log("[%d] Logic Drives: 0x%x VentoySig:%08X", i, Drives, VtoySig);
while (Drives) while (Drives)
{ {
@@ -2489,12 +2532,13 @@ static int VentoyHook(ventoy_os_param *param)
memset(UUID, 0, sizeof(UUID)); memset(UUID, 0, sizeof(UUID));
memset(&VtoyDiskExtent, 0, sizeof(VtoyDiskExtent)); memset(&VtoyDiskExtent, 0, sizeof(VtoyDiskExtent));
DiskSig = 0; DiskSig = 0;
if (GetPhyDiskUUID(VtoyLetter, UUID, &DiskSig, &VtoyDiskExtent) == 0) if (GetPhyDiskUUID(VtoyLetter, UUID, &DiskSig, &VtoyDiskExtent) == 0)
{ {
Log("DiskSig=%08X PartStart=%lld", DiskSig, VtoyDiskExtent.StartingOffset.QuadPart); Log("[%d] DiskSig=%08X PartStart=%lld", i, DiskSig, VtoyDiskExtent.StartingOffset.QuadPart);
if (DiskSig == VtoySig && VtoyDiskExtent.StartingOffset.QuadPart == SIZE_1MB) if (DiskSig == VtoySig && VtoyDiskExtent.StartingOffset.QuadPart == SIZE_1MB)
{ {
Log("Ventoy Disk Sig match"); Log("Ventoy Disk Sig and offset match");
vtoyfind = TRUE; vtoyfind = TRUE;
break; break;
} }
@@ -2517,6 +2561,13 @@ static int VentoyHook(ventoy_os_param *param)
} }
} }
if (vtoyfind == FALSE) // vlnk mode Ventoy partition has no letter
{
Log("Warning: Ventoy partition has no drive letter, assume C: and find by sig");
VtoyLetter = 'C';
vtoyfind = FindVentoyDiskBySig(VtoySig, &VtoyDiskExtent.DiskNumber);
}
if (vtoyfind == FALSE) if (vtoyfind == FALSE)
{ {
Log("Failed to find ventoy disk"); Log("Failed to find ventoy disk");