From: longpanda Date: Tue, 5 Apr 2022 09:26:59 +0000 (+0800) Subject: 1. When click install button, if the USB stick already installed with Ventoy, then... X-Git-Tag: v1.0.73~10 X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/commitdiff_plain/04828df0283c71f8b8276096b8069a032a017215?ds=inline 1. When click install button, if the USB stick already installed with Ventoy, then popup a dialog to require a YES text input to confirm. 2. Prevent DLL search order hijacking --- diff --git a/INSTALL/Ventoy2Disk.exe b/INSTALL/Ventoy2Disk.exe index e829df7..d1f344c 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 1240a42..6728b95 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 fe3f100..eae677c 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 45e8e59..32090c6 100644 Binary files a/INSTALL/Ventoy2Disk_X64.exe and b/INSTALL/Ventoy2Disk_X64.exe differ diff --git a/INSTALL/grub/arm64-efi/moddep.lst b/INSTALL/grub/arm64-efi/moddep.lst index fad0346..e727820 100644 Binary files a/INSTALL/grub/arm64-efi/moddep.lst and b/INSTALL/grub/arm64-efi/moddep.lst differ diff --git a/INSTALL/grub/arm64-efi/mouse.mod b/INSTALL/grub/arm64-efi/mouse.mod new file mode 100644 index 0000000..a76800a Binary files /dev/null and b/INSTALL/grub/arm64-efi/mouse.mod differ diff --git a/INSTALL/grub/arm64-efi/normal.mod b/INSTALL/grub/arm64-efi/normal.mod index 04ce41a..b056d85 100644 Binary files a/INSTALL/grub/arm64-efi/normal.mod and b/INSTALL/grub/arm64-efi/normal.mod differ diff --git a/INSTALL/grub/arm64-efi/terminal.lst b/INSTALL/grub/arm64-efi/terminal.lst index b2cfb3f..0f853df 100644 Binary files a/INSTALL/grub/arm64-efi/terminal.lst and b/INSTALL/grub/arm64-efi/terminal.lst differ diff --git a/INSTALL/grub/i386-efi/gfxterm_menu.mod b/INSTALL/grub/i386-efi/gfxterm_menu.mod deleted file mode 100644 index 1988941..0000000 Binary files a/INSTALL/grub/i386-efi/gfxterm_menu.mod and /dev/null differ diff --git a/INSTALL/grub/i386-efi/moddep.lst b/INSTALL/grub/i386-efi/moddep.lst index 82ae547..d3fd2c2 100644 --- a/INSTALL/grub/i386-efi/moddep.lst +++ b/INSTALL/grub/i386-efi/moddep.lst @@ -26,7 +26,7 @@ sfs: fshelp reiserfs: fshelp part_sunpc: zstd: -gfxmenu: trig video_colors gfxterm bitmap_scale font normal video bitmap +gfxmenu: video_colors trig gfxterm bitmap_scale font normal video bitmap backtrace: jfs: help: extcmd normal @@ -226,6 +226,7 @@ gcry_sha256: crypto ls: extcmd normal usbserial_common: serial usb ntfscomp: ntfs +mouse: lzopio: crypto video_cirrus: video video_fb hello: extcmd diff --git a/INSTALL/grub/i386-efi/mouse.mod b/INSTALL/grub/i386-efi/mouse.mod new file mode 100644 index 0000000..d371e5f Binary files /dev/null and b/INSTALL/grub/i386-efi/mouse.mod differ diff --git a/INSTALL/grub/i386-efi/normal.mod b/INSTALL/grub/i386-efi/normal.mod index 467046f..c647ca6 100644 Binary files a/INSTALL/grub/i386-efi/normal.mod and b/INSTALL/grub/i386-efi/normal.mod differ diff --git a/INSTALL/grub/i386-efi/terminal.lst b/INSTALL/grub/i386-efi/terminal.lst index 3c9a5a3..9afb9bd 100644 --- a/INSTALL/grub/i386-efi/terminal.lst +++ b/INSTALL/grub/i386-efi/terminal.lst @@ -1,4 +1,5 @@ iat_keyboard: at_keyboard +imouse: mouse iserial: serial iserial_*: serial oaudio: morse diff --git a/INSTALL/grub/i386-pc/core.img b/INSTALL/grub/i386-pc/core.img index d94561e..cb8be2e 100644 Binary files a/INSTALL/grub/i386-pc/core.img and b/INSTALL/grub/i386-pc/core.img differ diff --git a/INSTALL/grub/i386-pc/moddep.lst b/INSTALL/grub/i386-pc/moddep.lst index d205b28..5e32ffa 100644 --- a/INSTALL/grub/i386-pc/moddep.lst +++ b/INSTALL/grub/i386-pc/moddep.lst @@ -26,7 +26,7 @@ sfs: fshelp reiserfs: fshelp part_sunpc: zstd: -gfxmenu: trig video_colors gfxterm bitmap_scale font normal video bitmap +gfxmenu: video_colors trig gfxterm bitmap_scale font normal video bitmap backtrace: jfs: help: extcmd normal diff --git a/INSTALL/grub/mips64el-efi/moddep.lst b/INSTALL/grub/mips64el-efi/moddep.lst index 554171b..6041b3b 100644 Binary files a/INSTALL/grub/mips64el-efi/moddep.lst and b/INSTALL/grub/mips64el-efi/moddep.lst differ diff --git a/INSTALL/grub/mips64el-efi/mouse.mod b/INSTALL/grub/mips64el-efi/mouse.mod new file mode 100644 index 0000000..bc2dda8 Binary files /dev/null and b/INSTALL/grub/mips64el-efi/mouse.mod differ diff --git a/INSTALL/grub/mips64el-efi/normal.mod b/INSTALL/grub/mips64el-efi/normal.mod index a10d308..9d625d3 100644 Binary files a/INSTALL/grub/mips64el-efi/normal.mod and b/INSTALL/grub/mips64el-efi/normal.mod differ diff --git a/INSTALL/grub/mips64el-efi/terminal.lst b/INSTALL/grub/mips64el-efi/terminal.lst index b2cfb3f..0f853df 100644 Binary files a/INSTALL/grub/mips64el-efi/terminal.lst and b/INSTALL/grub/mips64el-efi/terminal.lst differ diff --git a/INSTALL/grub/x86_64-efi/gfxterm_menu.mod b/INSTALL/grub/x86_64-efi/gfxterm_menu.mod deleted file mode 100644 index 6783e07..0000000 Binary files a/INSTALL/grub/x86_64-efi/gfxterm_menu.mod and /dev/null differ diff --git a/INSTALL/grub/x86_64-efi/moddep.lst b/INSTALL/grub/x86_64-efi/moddep.lst index 8cbceb0..24d5da7 100644 --- a/INSTALL/grub/x86_64-efi/moddep.lst +++ b/INSTALL/grub/x86_64-efi/moddep.lst @@ -26,7 +26,7 @@ sfs: fshelp reiserfs: fshelp part_sunpc: zstd: -gfxmenu: trig video_colors gfxterm bitmap_scale font normal video bitmap +gfxmenu: video_colors trig gfxterm bitmap_scale font normal video bitmap backtrace: jfs: help: extcmd normal @@ -227,6 +227,7 @@ gcry_sha256: crypto ls: extcmd normal usbserial_common: serial usb ntfscomp: ntfs +mouse: lzopio: crypto video_cirrus: video video_fb hello: extcmd diff --git a/INSTALL/grub/x86_64-efi/mouse.mod b/INSTALL/grub/x86_64-efi/mouse.mod new file mode 100644 index 0000000..18724b3 Binary files /dev/null and b/INSTALL/grub/x86_64-efi/mouse.mod differ diff --git a/INSTALL/grub/x86_64-efi/normal.mod b/INSTALL/grub/x86_64-efi/normal.mod index 5ed99b7..853d515 100644 Binary files a/INSTALL/grub/x86_64-efi/normal.mod and b/INSTALL/grub/x86_64-efi/normal.mod differ diff --git a/INSTALL/grub/x86_64-efi/terminal.lst b/INSTALL/grub/x86_64-efi/terminal.lst index 3c9a5a3..9afb9bd 100644 --- a/INSTALL/grub/x86_64-efi/terminal.lst +++ b/INSTALL/grub/x86_64-efi/terminal.lst @@ -1,4 +1,5 @@ iat_keyboard: at_keyboard +imouse: mouse iserial: serial iserial_*: serial oaudio: morse diff --git a/LANGUAGES/languages.json b/LANGUAGES/languages.json index 3de5623..1e3f385 100644 --- a/LANGUAGES/languages.json +++ b/LANGUAGES/languages.json @@ -53,6 +53,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -110,6 +112,8 @@ "STR_PART_RESIZE_SUCCESS":"Təbriklər!#@Zərərsiz Ventoy quraşdırması başa çatdı.", "STR_PART_RESIZE_FAILED":"Zərərsiz quraşdırma baş tutmadı, daha ətraflı öyrənmək üçün log.txt jurnal faylına baxın.", "STR_PART_RESIZE_UNSUPPORTED":"ZƏrərsiz Ventoy quraşdırması dayandırıldı, belə ki, bəzi şərtlər yerinə yetirilə bilməd. Daha ətraflı məlumat üçün.txt jurnal faylına baxın.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -167,6 +171,8 @@ "STR_PART_RESIZE_SUCCESS":"축하합니다!#@Ventoy 비파괴 설치가 완료되었습니다.", "STR_PART_RESIZE_FAILED":"비파괴 설치에 실패했습니다. 자세한 내용은 log.txt를 확인하십시오.", "STR_PART_RESIZE_UNSUPPORTED":"일부 조건을 충족할 수 없기 때문에 Ventoy 비파괴 설치가 중지되었습니다. 자세한 내용은 log.txt를 확인하십시오.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -224,6 +230,8 @@ "STR_PART_RESIZE_SUCCESS":"恭喜你! Ventoy 成功完成了无损安装。", "STR_PART_RESIZE_FAILED":"Ventoy 无损安装失败。详细信息请查阅 log.txt 文件。", "STR_PART_RESIZE_UNSUPPORTED":"条件不满足,无法进行无损安装。详细信息请查阅 log.txt 文件。", + "STR_INSTALL_YES_TIP1":"警告: 所有数据将会丢失!", + "STR_INSTALL_YES_TIP2":"请在下面文本框中输入 YES 以确认你是要进行安装而不是升级。", "STRXXX":"" }, @@ -281,6 +289,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -338,6 +348,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -395,6 +407,8 @@ "STR_PART_RESIZE_SUCCESS":"Gratulacje!#@Nieniszcząca instlacja Ventoy zakończyła się pomyślnie.", "STR_PART_RESIZE_FAILED":"Nieniszcząca instalacja nie powiodła się, sprawdz log.txt po szczegóły.", "STR_PART_RESIZE_UNSUPPORTED":"Nieniszcząca instalacja Ventoy została zatrzymana ponieważ niektóre wymagania nie zostały spełnione. Sprawdz log.txt po szczegóły.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -452,6 +466,8 @@ "STR_PART_RESIZE_SUCCESS":"Parabéns!#@Instalação não destrutiva do Ventoy concluída com sucesso.", "STR_PART_RESIZE_FAILED":"Falha na instalação não destrutiva, cheque o arquivo log.txt para entender.", "STR_PART_RESIZE_UNSUPPORTED":"Instalação não destrutiva do Ventoy interrompida devido fato desconhecido. Cheque o arquivo log.txt para detalhes.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -509,6 +525,8 @@ "STR_PART_RESIZE_SUCCESS":"Tebrikler!#@Ventoy Tahribatsız Kurulum, başarıyla tamamlandı.", "STR_PART_RESIZE_FAILED":"Tahribatsız kurulum başarısız oldu, ayrıntılar için log.txt dosyasını kontrol edin.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy Tahribatsız Kurulum, bazı koşullar sağlanmadığı için durduruldu. Ayrıntılı bilgi için log.txt dosyasını kontrol edin.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -566,6 +584,8 @@ "STR_PART_RESIZE_SUCCESS":"Glückwunsch!#@Die Installation von Ventoy, ohne vorherige Formatierung, wurde erfolgreich abgeschlossen.", "STR_PART_RESIZE_FAILED":"Installation ohne vorherige Formatierung fehlgeschlagen. Für Details die log.txt prüfen.", "STR_PART_RESIZE_UNSUPPORTED":"Installation ohne vorherige Formatierung wurde auf Grund einiger nicht erfüllbarer Bedingungen gestoppt. Für Details die log.txt prüfen.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -623,6 +643,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -680,6 +702,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -737,6 +761,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -794,6 +820,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -851,6 +879,8 @@ "STR_PART_RESIZE_SUCCESS":"Поздравляем!#@Неразрушающая установка Ventoy успешно завершена.", "STR_PART_RESIZE_FAILED":"Не удалось выполнить неразрушающую установку, проверьте файл log.txt для получения подробной информации.", "STR_PART_RESIZE_UNSUPPORTED":"Неразрушающая установка Ventoy остановлена, поскольку некоторые условия не могут быть выполнены. Проверьте файл log.txt для получения подробной информации.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -908,6 +938,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -965,6 +997,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1022,6 +1056,8 @@ "STR_PART_RESIZE_SUCCESS":"Gefeliciteerd!#@De niet-destructieve installatie van Ventoy is met succes voltooid.", "STR_PART_RESIZE_FAILED":"Niet-destructieve installatie mislukt. Controleer log.txt voor details.", "STR_PART_RESIZE_UNSUPPORTED":"De niet-destructieve installatie van Ventoy is gestopt omdat aan sommige voorwaarden niet kan worden voldaan. Controleer log.txt voor details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1079,6 +1115,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1136,6 +1174,8 @@ "STR_PART_RESIZE_SUCCESS":"おめでとうございます。#@Ventoyの非破壊的導入は正常に行われました。", "STR_PART_RESIZE_FAILED":"Ventoyを非破壊的に導入できませんでした。詳細な記録は log.txt にあります。", "STR_PART_RESIZE_UNSUPPORTED":"Ventoyを非破壊的に導入できませんでした。非破壊的導入にあたっての要件が満たされていません。詳細な記録は log.txt にあります。", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1193,6 +1233,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulazioni!#@Installazione non distruttiva di Ventoy completata.", "STR_PART_RESIZE_FAILED":"Installazione non distruttiva fallita.#@Per i dettagli controlla il file log.txt.", "STR_PART_RESIZE_UNSUPPORTED":"L'installazione non distruttiva di Ventoy è stata interrotta perché alcune condizioni non possono essere soddisfatte.#@Per i dettagli controlla il file log.txt.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1250,6 +1292,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1307,6 +1351,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1364,6 +1410,8 @@ "STR_PART_RESIZE_SUCCESS":"恭喜!#@Ventoy 已完成無損安裝。", "STR_PART_RESIZE_FAILED":"Ventoy 無損安裝失敗。詳細訊息請檢視 log.txt 檔案。", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy 無損安裝已中止因為未滿足部分條件。詳細訊息請檢視 log.txt 檔案。", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1421,6 +1469,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1478,6 +1528,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1535,6 +1587,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1592,6 +1646,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1649,6 +1705,8 @@ "STR_PART_RESIZE_SUCCESS":"Chúc mừng bạn!#@Thiết bị đã được cài Ventoy thành công theo cách cài đặt không phá hủy.", "STR_PART_RESIZE_FAILED":"Đã xảy ra lỗi trong quá trình cài Ventoy theo cách cài đặt không phá hủy. Xem chi tiết ở tệp log.txt.", "STR_PART_RESIZE_UNSUPPORTED":"Cài Ventoy theo cách cài đặt không phá hủy đã bị dừng lại vì chưa đúng điều kiện. Xem chi tiết ở tệp log.txt.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, { @@ -1705,6 +1763,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1762,6 +1822,8 @@ "STR_PART_RESIZE_SUCCESS":"Честитки! Недеструктивната инсталација е успешно завршена.", "STR_PART_RESIZE_FAILED":"Недеструктивната инсталација не успеа. Проверете го log.txt за детали.", "STR_PART_RESIZE_UNSUPPORTED":"Недеструктивната инсталација на Ventoy е запрена бидејќи некои услови не се исполнети. Проверете го log.txt за детали.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1819,6 +1881,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1876,6 +1940,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1933,6 +1999,8 @@ "STR_PART_RESIZE_SUCCESS":"Selamat!#@Pemasangan tanpa merusakkan Ventoy berhasil.", "STR_PART_RESIZE_FAILED":"Pemasangan tanpa merusakkan gagal, periksa berkas log.txt untuk detil.", "STR_PART_RESIZE_UNSUPPORTED":"Pemasangan tanpa merusakkan Ventoy terhenti karena beberapa kondisi yang tidak mendukung. Periksa berkas log.txt untuk detil.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -1990,6 +2058,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -2047,6 +2117,8 @@ "STR_PART_RESIZE_SUCCESS":"Вітаємо!#@Неруйнівна установка Ventoy успішно завершена.", "STR_PART_RESIZE_FAILED":"Збій неруйнівної установки, перевірте log.txt для отримання детальної інформації.", "STR_PART_RESIZE_UNSUPPORTED":"Неруйнівна установка Ventoy зупинена через неможливість виконання деяких умов. Перевірте log.txt для отримання детальної інформації.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -2104,6 +2176,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -2161,6 +2235,8 @@ "STR_PART_RESIZE_SUCCESS":"Gratulerar!#@Ventoy lyckades slutföra en icke-förstörande installation.", "STR_PART_RESIZE_FAILED":"Ventoy misslyckades slutföra en icke-förstörande installation. Mer information finns i log.txt.", "STR_PART_RESIZE_UNSUPPORTED":"Icke-förstörande installation stoppades eftersom vissa villkor inte kunde uppfyllas. Mer information finns i log.txt.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -2218,6 +2294,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -2275,6 +2353,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -2332,6 +2412,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -2389,6 +2471,8 @@ "STR_PART_RESIZE_SUCCESS":"Onnittelut!#@Ventoyn ei-tuhoisa asennus saapui päätökseen onnistuneesti.", "STR_PART_RESIZE_FAILED":"Ei-tuhoisa asennusmuoto epäonnistui, tarkista log.txt nähdäksesi yksityiskohtaiset tiedot.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoyn ei-tuhoisa asennus pysähtyi koska jotkut ehdot eivät täyttyneet. Tarkista log.txt nähdäksesi yksityiskohdat.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -2446,6 +2530,8 @@ "STR_PART_RESIZE_SUCCESS":"Parabéns!#@Instalación non destructiva do Ventoy concluida con suceso.", "STR_PART_RESIZE_FAILED":"Erro na instalación non destructiva, revisa o arquivo log.txt para ver os detalles.", "STR_PART_RESIZE_UNSUPPORTED":"Instalación non destructiva do Ventoy interrompida porque non se poden cumprir algunhas condicións. Revisa o arquivo log.txt para mais detalles.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -2503,6 +2589,8 @@ "STR_PART_RESIZE_SUCCESS":"Enhorabona!#@La instal·lació no destructiva s'ha completat de forma satisfactòria.", "STR_PART_RESIZE_FAILED":"Hi ha hagut un error durant el procés d'instal·lació no destructiva, comproveu el fitxer log.txt per a més detalls.", "STR_PART_RESIZE_UNSUPPORTED":"La instal·lació no destructiva de Ventoy no ha estat possible perquè els requeriments no es compleixen. Comproveu el fitxer log.txt per a més detalls.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" }, @@ -2561,6 +2649,8 @@ "STR_PART_RESIZE_SUCCESS":"Congratulations!#@Ventoy non-destructive installation successfully finished.", "STR_PART_RESIZE_FAILED":"Non-destructive installation failed, Check log.txt for details.", "STR_PART_RESIZE_UNSUPPORTED":"Ventoy non-destructive installation stopped because some conditions cannot be met. Check log.txt for details.", + "STR_INSTALL_YES_TIP1":"Warning: Data will be lost!", + "STR_INSTALL_YES_TIP2":"Please enter YES in the text box below to confirm that you indeed want to do a fresh install instead of upgrade.", "STRXXX":"" } diff --git a/Ventoy2Disk/Ventoy2Disk/Language.h b/Ventoy2Disk/Ventoy2Disk/Language.h index 00c4618..5b0d797 100644 --- a/Ventoy2Disk/Ventoy2Disk/Language.h +++ b/Ventoy2Disk/Ventoy2Disk/Language.h @@ -83,6 +83,9 @@ typedef enum STR_ID STR_PART_RESIZE_FAILED,//46 STR_PART_RESIZE_UNSUPPORTED,//47 + STR_INSTALL_YES_TIP1,//48 + STR_INSTALL_YES_TIP2,//49 + STR_ID_MAX }STR_ID; diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.aps b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.aps index 348d2e5..e3149f8 100644 Binary files a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.aps and b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.aps differ diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.c b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.c index 4c6f609..8767e3b 100644 --- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.c +++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.c @@ -28,6 +28,7 @@ DWORD g_PhyDriveCount = 0; static int g_FilterRemovable = 0; int g_FilterUSB = 1; int g_ForceOperation = 1; +int g_NoNeedInputYes = 0; int g_WriteImage = 0; int ParseCmdLineOption(LPSTR lpCmdLine) @@ -51,6 +52,10 @@ int ParseCmdLineOption(LPSTR lpCmdLine) { g_ForceOperation = 1; } + else if (strncmp(__argv[i], "-Y", 2) == 0 || strncmp(__argv[i], "-y", 2) == 0) + { + g_NoNeedInputYes = 1; + } } GetCurrentDirectoryA(sizeof(cfgfile), cfgfile); diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h index daf8c3c..beafaa4 100644 --- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h +++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h @@ -201,6 +201,7 @@ typedef enum PROGRESS_POINT extern PHY_DRIVE_INFO *g_PhyDriveList; extern DWORD g_PhyDriveCount; extern int g_ForceOperation; +extern int g_NoNeedInputYes; extern HWND g_ProgressBarHwnd; extern HFONT g_language_normal_font; extern HFONT g_language_bold_font; @@ -246,6 +247,9 @@ int INIT unxz(unsigned char *in, int in_size, unsigned char *out, int *in_used, void(*error)(char *x)); void disk_io_set_param(HANDLE Handle, UINT64 SectorCount); + +extern BOOL g_InputYes; +INT_PTR CALLBACK YesDialogProc(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PartDialogProc(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam); int GetReservedSpaceInMB(void); int IsPartNeed4KBAlign(void); diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc index 18c7d06..acf72c8 100644 Binary files a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc and b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc differ diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj index 45bb839..9540a36 100644 --- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj +++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj @@ -178,7 +178,8 @@ Windows true RequireAdministrator - version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + gdi32.dll;winspool.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;uuid.dll;odbc32.dll;odbccp32.dll $(ProjectDir)\Res\Ventoy2Disk32.manifest %(AdditionalManifestFiles) @@ -197,7 +198,8 @@ Windows true RequireAdministrator - version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + gdi32.dll;winspool.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;uuid.dll;odbc32.dll;odbccp32.dll $(ProjectDir)\Res\Ventoy2DiskArm.manifest %(AdditionalManifestFiles) @@ -216,7 +218,8 @@ Windows true RequireAdministrator - version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + gdi32.dll;winspool.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;uuid.dll;odbc32.dll;odbccp32.dll $(ProjectDir)\Res\Ventoy2DiskArm64.manifest %(AdditionalManifestFiles) @@ -235,7 +238,8 @@ Windows true RequireAdministrator - version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + gdi32.dll;winspool.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;uuid.dll;odbc32.dll;odbccp32.dll $(ProjectDir)\Res\Ventoy2Disk64.manifest %(AdditionalManifestFiles) @@ -258,7 +262,8 @@ true true RequireAdministrator - version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + gdi32.dll;winspool.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;uuid.dll;odbc32.dll;odbccp32.dll $(ProjectDir)\Res\Ventoy2Disk32.manifest %(AdditionalManifestFiles) @@ -281,7 +286,8 @@ true true RequireAdministrator - version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + gdi32.dll;winspool.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;uuid.dll;odbc32.dll;odbccp32.dll $(ProjectDir)\Res\Ventoy2DiskArm.manifest %(AdditionalManifestFiles) @@ -304,7 +310,8 @@ true true RequireAdministrator - version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + gdi32.dll;winspool.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;uuid.dll;odbc32.dll;odbccp32.dll $(ProjectDir)\Res\Ventoy2DiskArm64.manifest %(AdditionalManifestFiles) @@ -327,7 +334,8 @@ true true RequireAdministrator - version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + gdi32.dll;winspool.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;uuid.dll;odbc32.dll;odbccp32.dll $(ProjectDir)\Res\Ventoy2Disk64.manifest %(AdditionalManifestFiles) @@ -360,6 +368,7 @@ + diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj.filters b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj.filters index 410ec23..0ee93bc 100644 --- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj.filters +++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj.filters @@ -93,6 +93,9 @@ 源文件 + + 源文件 + diff --git a/Ventoy2Disk/Ventoy2Disk/WinDialog.c b/Ventoy2Disk/Ventoy2Disk/WinDialog.c index 86277ba..d9fe702 100644 Binary files a/Ventoy2Disk/Ventoy2Disk/WinDialog.c and b/Ventoy2Disk/Ventoy2Disk/WinDialog.c differ diff --git a/Ventoy2Disk/Ventoy2Disk/YesDialog.c b/Ventoy2Disk/Ventoy2Disk/YesDialog.c new file mode 100644 index 0000000..9157fe3 Binary files /dev/null and b/Ventoy2Disk/Ventoy2Disk/YesDialog.c differ diff --git a/Ventoy2Disk/Ventoy2Disk/resource.h b/Ventoy2Disk/Ventoy2Disk/resource.h index 5ca99e2..037e857 100644 Binary files a/Ventoy2Disk/Ventoy2Disk/resource.h and b/Ventoy2Disk/Ventoy2Disk/resource.h differ