diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-10-17 16:36:50 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-10-17 18:17:51 +0200 |
| commit | 49f5d91fed9199cbcb92136d229cfa2563230b01 (patch) | |
| tree | 754693d9366e99e55ad7bc951b9be1670d5f48ac | |
| parent | 983e8daf4c898417b63ae0fdcef9571f6d8d9993 (diff) | |
| download | VeraCrypt-DCS-49f5d91fed9199cbcb92136d229cfa2563230b01.tar.gz VeraCrypt-DCS-49f5d91fed9199cbcb92136d229cfa2563230b01.zip | |
Windows: Support 32-bit Windows in Rescue Disk.VeraCrypt_1.19
| -rw-r--r-- | DcsRe/DcsRe.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/DcsRe/DcsRe.c b/DcsRe/DcsRe.c index 5ccb1b2..1278eea 100644 --- a/DcsRe/DcsRe.c +++ b/DcsRe/DcsRe.c @@ -102,7 +102,11 @@ SelectEfiVolume() for (i = 0; i < gFSCount; ++i) {
res = FileOpenRoot(gFSHandles[i], &file);
if(EFI_ERROR(res)) continue;
+#ifdef _M_X64
if (!EFI_ERROR(FileExist(file, L"EFI\\Boot\\bootx64.efi"))) {
+#else
+ if (!EFI_ERROR(FileExist(file, L"EFI\\Boot\\bootia32.efi"))) {
+#endif
efiVolumesCount++;
efiVolumes[i] = file;
if (gFSHandles[i] != startHandle) {
@@ -141,7 +145,11 @@ SelectEfiVolume() //////////////////////////////////////////////////////////////////////////
EFI_STATUS
ActionBootWinPE() {
+#ifdef _M_X64
return EfiExec(NULL, L"EFI\\Boot\\WinPE_bootx64.efi");
+#else
+ return EfiExec(NULL, L"EFI\\Boot\\WinPE_bootia32.efi");
+#endif
}
EFI_STATUS
@@ -151,9 +159,9 @@ ActionShell() { EFI_STATUS
ActionDcsBoot() {
- SelectEfiVolume(); - if (EfiBootVolume == NULL) return EFI_NOT_READY; - return EfiExec(gFSHandles[EfiBootVolumeIndex], L"EFI\\VeraCrypt\\DcsBoot.efi"); + SelectEfiVolume();
+ if (EfiBootVolume == NULL) return EFI_NOT_READY;
+ return EfiExec(gFSHandles[EfiBootVolumeIndex], L"EFI\\VeraCrypt\\DcsBoot.efi");
}
CHAR16* DcsBootBins[] = {
@@ -298,7 +306,11 @@ DcsReMain( item = AppendMenu(item, L"Boot VeraCrypt loader from rescue disk", 'v', ActionDcsBoot);
}
+#ifdef _M_X64
if (!EFI_ERROR(FileExist(NULL, L"EFI\\Boot\\WinPE_bootx64.efi"))) {
+#else
+ if (!EFI_ERROR(FileExist(NULL, L"EFI\\Boot\\WinPE_bootia32.efi"))) {
+#endif
item = AppendMenu(item, L"Boot Windows PE from rescue disk", 'w', ActionBootWinPE);
}
|