MyFavMirrors
/
Ventoy
mirror of https://github.com/ventoy/Ventoy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimization for Ventoy2Disk.exe

This commit is contained in:
longpanda 2021-10-25 20:38:04 +08:00
parent 7e26decb31
commit e47e4484ce
2 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
INSTALL/Ventoy2Disk.exe
View File

Binary file not shown.

60
Ventoy2Disk/Ventoy2Disk/PhyDrive.c
View File

@ -1660,9 +1660,7 @@ int InstallVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int PartStyle, int TryId)
if (!VDS_DeleteAllPartitions(pPhyDrive->PhyDrive)) if (!VDS_DeleteAllPartitions(pPhyDrive->PhyDrive))
{ {
Log("Notice: Could not delete partitions: 0x%x", GetLastError()); Log("Notice: Could not delete partitions: 0x%x, but we continue.", GetLastError());
rc = 1;
goto End;
} }
Log("Deleting all partitions ......................... OK"); Log("Deleting all partitions ......................... OK");
@ -1838,6 +1836,7 @@ static BOOL BackupDataBeforeCleanDisk(int PhyDrive, UINT64 DiskSize, BYTE **pBac
BOOL ret = FALSE; BOOL ret = FALSE;
BYTE *backup = NULL; BYTE *backup = NULL;
UINT64 offset; UINT64 offset;
BYTE Buffer[512];
HANDLE hDrive = INVALID_HANDLE_VALUE; HANDLE hDrive = INVALID_HANDLE_VALUE;
LARGE_INTEGER liCurPosition; LARGE_INTEGER liCurPosition;
LARGE_INTEGER liNewPosition; LARGE_INTEGER liNewPosition;
@ -1845,6 +1844,54 @@ static BOOL BackupDataBeforeCleanDisk(int PhyDrive, UINT64 DiskSize, BYTE **pBac
Log("BackupDataBeforeCleanDisk %d", PhyDrive); Log("BackupDataBeforeCleanDisk %d", PhyDrive);
// step1: check write access
hDrive = GetPhysicalHandle(PhyDrive, TRUE, TRUE, FALSE);
if (hDrive == INVALID_HANDLE_VALUE)
{
Log("Failed to GetPhysicalHandle for write.");
goto out;
}
liCurPosition.QuadPart = 2039 * 512;
liNewPosition.QuadPart = 0;
if (0 == SetFilePointerEx(hDrive, liCurPosition, &liNewPosition, FILE_BEGIN) ||
liNewPosition.QuadPart != liCurPosition.QuadPart)
{
Log("SetFilePointer1 Failed %u", LASTERR);
goto out;
}
dwSize = 0;
ret = ReadFile(hDrive, Buffer, 512, &dwSize, NULL);
if ((!ret) || (dwSize != 512))
{
Log("Failed to read %d %u 0x%x", ret, dwSize, LASTERR);
goto out;
}
liCurPosition.QuadPart = 2039 * 512;
liNewPosition.QuadPart = 0;
if (0 == SetFilePointerEx(hDrive, liCurPosition, &liNewPosition, FILE_BEGIN) ||
liNewPosition.QuadPart != liCurPosition.QuadPart)
{
Log("SetFilePointer2 Failed %u", LASTERR);
goto out;
}
ret = WriteFile(hDrive, Buffer, 512, &dwSize, NULL);
if ((!ret) || dwSize != 512)
{
Log("Failed to write %d %u %u", ret, dwSize, LASTERR);
goto out;
}
CHECK_CLOSE_HANDLE(hDrive);
Log("Write access check success");
//step2 backup 4MB data
backup = malloc(SIZE_1MB * 4); backup = malloc(SIZE_1MB * 4);
if (!backup) if (!backup)
{ {
@ -2334,6 +2381,13 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
End: End:
if (hVolume != INVALID_HANDLE_VALUE)
{
bRet = DeviceIoControl(hVolume, FSCTL_UNLOCK_VOLUME, NULL, 0, NULL, 0, &dwSize, NULL);
Log("FSCTL_UNLOCK_VOLUME bRet:%u code:%u", bRet, LASTERR);
CHECK_CLOSE_HANDLE(hVolume);
}
if (rc == 0) if (rc == 0)
{ {
Log("OK"); Log("OK");