mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
[grub] update Grub4DOS to 0.4.6a
* Also fix Grub4DOS and Grub2.0 versioning issues * Also ensures that operation gets canceled on missing download * Also fix German translation and remove trailing whitespaces in .loc file * Also fix inverted display status for VMWare disk detection
This commit is contained in:
Pete Batard
parent
24b435648e
commit
1dc55596d5
8 changed files with 88 additions and 87 deletions
Binary file not shown.
|
|
@ -2,4 +2,4 @@
|
|||
* This file contains the version string of the Grub4Dos 2.x binary embedded in Rufus.
|
||||
* Should be the same as the grub4dos_version file in the source Grub4Dos was compiled from.
|
||||
*/
|
||||
#define GRUB4DOS_VERSION "0.4.5c"
|
||||
#define GRUB4DOS_VERSION "0.4.6a"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
This directory contains the Grub4DOS boot records that are used by Rufus
|
||||
|
||||
* grldr.mbr was compiled on Linux Debian 7.7.0 x64, using gcc-multilib 4.7.2, from
|
||||
https://github.com/chenall/grub4dos/commit/8549aae.
|
||||
* grldr.mbr was taken from the official 2014.02.15 release from
|
||||
http://grub4dos.chenall.net/downloads/grub4dos-0.4.6a-2015-02-15/
|
||||
|
||||
* Note that, for convenience reasons, the first 512 bytes from this grldr.mbr are
|
||||
*not* the ones that Rufus processes when writing the actual MBR (first 512 bytes).
|
||||
|
|
|
|||
|
|
@ -1078,7 +1078,7 @@ t MSG_052 "Не може да използвате тази файлова си
|
|||
t MSG_053 "Достъпът до устройството е забранен."
|
||||
t MSG_054 "Устройството е защитено против писане."
|
||||
t MSG_055 "Това устройство се използва от друг процес. "
|
||||
"Моля спрете всички процеси който използват това устройство ."
|
||||
"Моля спрете всички процеси който използват това устройство ."
|
||||
t MSG_056 "Бързият формат не може да се приложи за това устройство."
|
||||
t MSG_057 "Обемния етикет е невалиден."
|
||||
t MSG_058 "Устройственият манипулатор е невалиден."
|
||||
|
|
@ -1190,7 +1190,7 @@ t MSG_114 "Този образ използва Syslinux %s%s но тази пр
|
|||
t MSG_115 "Необходимо е изтегляне"
|
||||
t MSG_116 "Този образ използва GRUB %s Но приложението садържа само инсталацйонните файлове за GRUB %s."
|
||||
"\n\n Тъй като различните версии на GRUB може да не са съвместими една с друга.\n"
|
||||
"И е невъзможно всички те да бъдат налични.Rufus ще се опита да намери версия "
|
||||
"И е невъзможно всички те да бъдат налични.Rufus ще се опита да намери версия "
|
||||
"която съвпада с тази на вашият образ:\n"
|
||||
"- Изберете 'Yes' за да се свържете с интернет и да я изтеглите\n"
|
||||
"- Изберете 'No' за да използвате весрсията по подразбиране на Rufus\n"
|
||||
|
|
@ -1231,7 +1231,7 @@ t MSG_171 "Стартирай форматиращата операция.\nТо
|
|||
t MSG_172 "Лицензна информация и разработчици"
|
||||
t MSG_173 "Натиснете тук за да изберете..."
|
||||
# The following will appear in the about dialog
|
||||
t MSG_174 "Rufus - Надеждната USB Форматираща програма"
|
||||
t MSG_174 "Rufus - Надеждната USB Форматираща програма"
|
||||
t MSG_175 "Версия %d.%d (Build %d)"
|
||||
t MSG_176 "Български превод: Krasimir Nevenov <mailto:berzabel@yahoo.com>"
|
||||
t MSG_177 "Докладвайте за проблем или изискайте подобрения на:"
|
||||
|
|
@ -1632,7 +1632,7 @@ t MSG_202 "扫描镜像..."
|
|||
t MSG_203 "无法扫描镜像"
|
||||
# Parameter：the name of an obsolete Syslinux .c32 module.
|
||||
t MSG_204 "检测到过时的 %s"
|
||||
# Display the name of the ISO selected.
|
||||
# Display the name of the ISO selected.
|
||||
t MSG_205 "选用镜像：%s"
|
||||
# Typically "Missing ldlinux.c32 file"
|
||||
t MSG_206 "缺少 %s 文件"
|
||||
|
|
@ -1950,8 +1950,8 @@ t MSG_115 "需額外下載擴充檔案"
|
|||
t MSG_150 "一般而言最安全、最保險的選項。如果確定系統支援 UEFI 且欲在 EFI 模式下安裝 OS，則建議選擇下列其他選項"
|
||||
t MSG_151 "欲在 EFI 模式下安裝 OS 卻須使用 Windows XP 存取 USB 內容"
|
||||
t MSG_152 "欲在 EFI 模式下安裝 OS 且無須使用 Windows XP 存取 USB 內容，建議選此項目"
|
||||
t MSG_153 "測試模式: 0x%02X"
|
||||
t MSG_154 "測試模式: 0x%02X, 0x%02X"
|
||||
t MSG_153 "測試模式: 0x%02X"
|
||||
t MSG_154 "測試模式: 0x%02X, 0x%02X"
|
||||
t MSG_155 "測試模式: 0x%02X, 0x%02X, 0x%02X"
|
||||
t MSG_156 "測試模式: 0x%02X, 0x%02X, 0x%02X, 0x%02X"
|
||||
t MSG_157 "設定檔案系統類型"
|
||||
|
|
@ -2701,7 +2701,7 @@ t MSG_093 "DŮLEŽITÉ: TOTO ZAŘÍZENÍ OBSAHUJE NĚKOLIK ODDÍLŮ!!\n\n"
|
|||
"Pokud přesto chcete pokračovat, nesete odpovědnost za ztrátu veškerých dat na těchto oddílech."
|
||||
t MSG_094 "Bylo zjištěno více oddílů"
|
||||
t MSG_095 "Obraz DD"
|
||||
t MSG_096 "Souborový systém aktuálně vybraný nelze použít u tohoto typu ISO."
|
||||
t MSG_096 "Souborový systém aktuálně vybraný nelze použít u tohoto typu ISO."
|
||||
"Prosím, vyberte jiný souborový systém, nebo použijte jiné ISO."
|
||||
t MSG_097 "'Přenosný Windows' lze použít pouze v případě, že souborový systém je NTFS."
|
||||
t MSG_098 "DŮLEŽITÉ: Pokoušíte se nainstalovat 'Přenosný Windows', ale váš cílový disk "
|
||||
|
|
@ -3547,10 +3547,10 @@ t MSG_110 "MS-DOS kan niet opstarten van een apparaat met een clustergrootte van
|
|||
t MSG_111 "Incompatibel Clustergrootte"
|
||||
t MSG_112 "Het formatteren van grote UDF volumes kan een lange tijd duren..."
|
||||
t MSG_113 "Grote UDF volume"
|
||||
t MSG_114 "Deze image maakt gebruik van Syslinux %s%s maar de applicatie bevat alleen de installatiebestanden voor"
|
||||
t MSG_114 "Deze image maakt gebruik van Syslinux %s%s maar de applicatie bevat alleen de installatiebestanden voor"
|
||||
"Syslinux %s%s.\n\nOmdat oude en nieuwe versies van Syslinux niet compatibel zijn met elkaar, en het niet mogelijk is voor Rufus om alle versies te beheren,"
|
||||
"moeten twee extra bestanden gedownload worden van het internet ('ldlinux.sys' en 'ldlinux.bss'):\n"
|
||||
"- Klik op 'Ja' om via internet deze bestanden te downloaden\n"
|
||||
"- Klik op 'Ja' om via internet deze bestanden te downloaden\n"
|
||||
"- Klik op 'Nee' om de opdracht te annuleren\n\n"
|
||||
"Let op: De bestanden worden in de huidige applicatiemap opgeslagen en zullen automatisch vervangen worden als het bestand al bestaat.\n"
|
||||
t MSG_115 "Download is vereist"
|
||||
|
|
@ -3562,8 +3562,8 @@ t MSG_150 "Normaal gesproken de veiligste keuze. Als u een UEFI computer hebt ma
|
|||
t MSG_151 "Gebruik deze optie als u een besturingssysteem in EFI mode wilt installeren, maar toegang nodig hebt tot\n"
|
||||
"de USB inhoud van Windows XP"
|
||||
t MSG_152 "Aanbevolen optie om een besturingssysteem in EFI mode te installeren en wanneer USB toegang niet nodig is voor Windows XP"
|
||||
t MSG_153 "Test patroon: 0x%02X"
|
||||
t MSG_154 "Test patroon: 0x%02X, 0x%02X"
|
||||
t MSG_153 "Test patroon: 0x%02X"
|
||||
t MSG_154 "Test patroon: 0x%02X, 0x%02X"
|
||||
t MSG_155 "Test patroon: 0x%02X, 0x%02X, 0x%02X"
|
||||
t MSG_156 "Test patroon: 0x%02X, 0x%02X, 0x%02X, 0x%02X"
|
||||
t MSG_157 "Selecteer hier uw type bestandssysteem"
|
||||
|
|
@ -4693,13 +4693,13 @@ t MSG_092 "Nicht unterstütztes Dateisystem"
|
|||
t MSG_093 "ACHTUNG! DIESES LAUFWERK VERFÜGT ÜBER MEHRERE PARTITIONEN ODER VOLUMES!!\n\n"
|
||||
"Darunter sind möglicherweise Partitionen, die unter Windows nicht sicht- bzw. nutzbar sind."
|
||||
"Wenn Sie fortfahren, sind Sie selbst für den Datenverlust auf diesen Partitionen verantwortlich."
|
||||
t MSG_094 "Mehrere Partitionen erkannt"
|
||||
t MSG_094 "Mehrere Partitionen erkannt"
|
||||
t MSG_095 "DD Abbild"
|
||||
t MSG_096 "Das aktuell gewählte Dateisystem kann für dieses ISO-Abbild nicht verwendet werden. "
|
||||
"Bitte wählen Sie ein anderes Dateisystem oder ein anderes ISO-Abbild."
|
||||
t MSG_097 "Für 'Windows To Go' muss NTFS als Dateisystem verwendet werden."
|
||||
t MSG_098 "WICHTIG: Sie versuchen 'Windows To Go' zu installieren, aber das Ziel-Laufwerk hat nicht "
|
||||
"das 'FIXED'-Attribut. Deswegen wird Windows beim Systemstart höchstwahrscheinlich einfrieren, "
|
||||
"das 'FIXED'-Attribut. Deswegen wird Windows beim Systemstart höchstwahrscheinlich einfrieren, "
|
||||
"weil Microsoft nicht vorgesehen hat, Laufwerke mit dem 'REMOVABLE'-Attribut zu unterstützen.\n\n"
|
||||
"Wollen Sie den Vorgang trotzdem fortsetzen?\n\n"
|
||||
"Hinweis: Das 'FIXED/REMOVABLE'-Attribut ist eine Hardware-Eigenschaft und kann nur mit speziellen "
|
||||
|
|
@ -4737,15 +4737,14 @@ t MSG_114 "Dieses Abbild benutzt Syslinux %s%s, aber diese Anwendung verfügt nu
|
|||
"Hinweis: Die Dateien werden in das Programmverzeichnis heruntergeladen und können bei Bedarf wiederverwendet werden.\n"
|
||||
t MSG_115 "Download erforderlich"
|
||||
t MSG_116 "Dieses Abbild verwendet Grub %s, aber die Anwendung beinhaltet nur Installations-Dateien für "
|
||||
"Grub %s.\n\nWeil verschieden Versionen von Grub nicht untereinander kompatibel sind, uned es nicht " "möglich ist, alle mit Rufus auszuliefern, wird
|
||||
may not be compatible with one another, and it is "
|
||||
"not possible to include them all, Rufus will attempt to locate a version of the Grub "
|
||||
"installation file ('core.img') that matches the one from your image:\n"
|
||||
"- Select 'Yes' to connect to the Internet and attempt to download it\n"
|
||||
"- Select 'No' to use the default version from Rufus\n"
|
||||
"- Select 'Cancel' to abort the operation\n\n"
|
||||
"Note: The file will be downloaded in the current application directory and will be reused "
|
||||
"automatically if present. If no match can be found online, then the default version will be used."
|
||||
"Grub %s.\n\nWeil verschiedene Versionen von Grub nicht untereinander kompatibel sind, und es nicht "
|
||||
"möglich ist, alle mit Rufus auszuliefern, wird Rufus versuchen eine Version der Installations-Datei "
|
||||
"('core.img') von Grub zu finden, die zur Version im Abbild passt:\n"
|
||||
"- Wählen Sie 'Ja', um sich mit dem Internet zu verbinden und sie herunterzuladen\n"
|
||||
"- Wählen Sie 'Nein', um die Standardversion zu verwenden\n"
|
||||
"- Wählen Sie 'Abbrechen', um den Vorgang abzubrechen\n\n"
|
||||
"Hinweis: Die Datei wird in das Programmverzeichnis heruntergeladen und ggf. automatisch wiederverwendet. "
|
||||
"Wenn online nichts gefunden wird, wird die Standardversion verwendet."
|
||||
|
||||
t MSG_150 "Normalerweise die beste Wahl. Wenn Sie einen UEFI-Computer haben und das Betriebssystem "
|
||||
"im EFI-Modus installieren wollen, sollten sie eine der anderen Einstellungen wählen."
|
||||
|
|
@ -4808,7 +4807,7 @@ t MSG_196 "WICHTIG: DIESES LAUFWERK HAT EINE NICHT STANDARDKONFORME SEKTORGRÖSS
|
|||
"Herkömmliche Laufwerke nutzen eine 512-Byte Sektorgröße, aber dieses Laufwerk nutzt %d-Byte. "
|
||||
"Höchstwahrscheinlich können Sie von diesem Laufwerk NICHT booten.\n"
|
||||
"Rufus kann versuchen, ein bootfähiges Laufwerk zu erstellen, aber es gibt KEINE GARANTIE, dass es funktionieren wird."
|
||||
t MSG_197 "Nichtstandardkonforme Sektorgröße erkannt"
|
||||
t MSG_197 "Nichtstandardkonforme Sektorgröße erkannt"
|
||||
t MSG_198 "'Windows To Go' kann nur auf ein GPT-partitioniertes Laufwerk installiert werden, wenn das FIXED-Attribut gesetzt ist. Das aktuelle Laufwerk hat diese nicht."
|
||||
t MSG_199 "Wählen Sie dies, wenn Sie planen Windows auf eines anderes Laufwerk zu installieren."
|
||||
t MSG_200 "Wählen Sie dies, wenn Sie Windows direkt vom gewählten Laufwerk starten wollen."
|
||||
|
|
@ -5189,8 +5188,8 @@ t MSG_151 "Χρησιμοποιήστε αυτό αν θέλετε να εγκα
|
|||
"αλλά χρειάζεται να έχετε πρόσβαση στο περιεχόμενο του USB από τα Windows XP."
|
||||
t MSG_152 "Η προτιμώμενη επιλογή για να εγκαταστήσετε ένα λειτουργικό σύστημα(OS) σε "
|
||||
"λειτουργία EFI και δεν απαιτείται πρόσβαση στο USB στα Windows XP."
|
||||
t MSG_153 "Μοτίβο δοκιμής: 0x%02X"
|
||||
t MSG_154 "Μοτίβο δοκιμής: 0x%02X, 0x%02X"
|
||||
t MSG_153 "Μοτίβο δοκιμής: 0x%02X"
|
||||
t MSG_154 "Μοτίβο δοκιμής: 0x%02X, 0x%02X"
|
||||
t MSG_155 "Μοτίβο δοκιμής: 0x%02X, 0x%02X, 0x%02X"
|
||||
t MSG_156 "Μοτίβο δοκιμής: 0x%02X, 0x%02X, 0x%02X, 0x%02X"
|
||||
t MSG_157 "Ρυθμίζει το επιθυμητό σύστημα αρχείων"
|
||||
|
|
@ -7163,7 +7162,7 @@ t MSG_096 "현재 선택된 파일 시스템은 이 타입의 ISO 파일은 사
|
|||
"다른 파일 시스템을 선택하거나 다른 ISO를 사용하십시오."
|
||||
t MSG_097 "'Windows To Go'는 파일 시스템이 NTFS일 경우에만 적용할 수 있습니다."
|
||||
t MSG_098 "중요: 'Windows To Go'를 설치하려면 대상 드라이브가 'FIXED' 속성이어야만 합니다. "
|
||||
"Microsoft가 'REMOVABLE' 속성의 디스크로도 잘 작동되도록 설계를 하지 않았으므로 "
|
||||
"Microsoft가 'REMOVABLE' 속성의 디스크로도 잘 작동되도록 설계를 하지 않았으므로 "
|
||||
"부팅하는 도중에 시스템이 얼어버릴 수도 있습니다.\n\n"
|
||||
"그래도 계속 하시겠습니까?\n\n"
|
||||
"알림: '고정/이동식'속성은 드라이브 제조업체에서 사용자 정의 도구를 사용하여 "
|
||||
|
|
@ -7211,7 +7210,6 @@ t MSG_115 "다운로드가 필요합니다."
|
|||
t MSG_116 "이 이미지는 Grub %s를 사용합니다. 하지만 Rufus에서는 모든 버전의 Grub를 포함할 수 없기에, "
|
||||
"Grub %s의 설치 파일만을 포함하고 있습니다.\n\nGrub은 다른 버전들과 서로 호환되지 않을 수 있습니다. "
|
||||
"Rufus에서 이 이미지와 일치하는 Grub의 다른 버전의 설치 파일('core.img')을 검색할 합니다.\n"
|
||||
|
||||
"- '예'를 선택하면 인터넷에 연결해 검색 및 다운로드 합니다.\n"
|
||||
"- '아니오'를 선택하면 Rufus의 기본 버전을 사용합니다.\n"
|
||||
"- '취소'를 선택하면 현재 작업을 취소합니다.\n\n"
|
||||
|
|
@ -8482,7 +8480,7 @@ t MSG_114 "Imej ini menggunakan Syslinux %s%s tetapi aplikasi ini hanya mempunya
|
|||
"NOTA:Fail akan dimuat turun ke dalam direktori aplikasi ini dan akan digunakan semula"
|
||||
"secara automatik sekiranya sedia ada.\n"
|
||||
t MSG_115 "Muat turun diperlukan"
|
||||
|
||||
|
||||
# Tooltips
|
||||
# Partition Scheme and Target Type
|
||||
t MSG_150 "Selalunya pilihan ini paling selamat. Namun, jika anda ada komputer UEFI dan mahu "
|
||||
|
|
@ -12020,7 +12018,6 @@ t MSG_185 "Proceso de actualización:"
|
|||
t MSG_186 "Rufus no instala ni ejecuta ningún servicio ni tarea programada. Por tanto la búsqueda"
|
||||
" de actualizaciones sólo se realiza cuando la aplicación principal se está ejecutando.\\line\n"
|
||||
"Por supuesto, se requiere acceso a Internet."
|
||||
|
||||
t MSG_187 "Imagen ISO no válida para la opción de arranque seleccionada"
|
||||
t MSG_188 "La imagen actual no coincide con la opción de arranque elegida. Por favor use otra imagen o seleccione una opción de arranque distinta."
|
||||
t MSG_189 "Esta imagen ISO no es compatible con el sistema de archivos seleccionado"
|
||||
|
|
@ -12040,7 +12037,7 @@ t MSG_197 "Detectado tamaño de sector no estándar"
|
|||
t MSG_198 "'Windows To Go' sólo puede ser instalado en una partición GPT si tiene el atributo FIXED activo. El dispositivo"
|
||||
"actual no ha sido detectado como FIXED."
|
||||
t MSG_199 "Elija esta opción si pretende instalar Windows en otro disco, usando el dispositivo seleccionado como medio de instalación."
|
||||
t MSG_200 "Elija esta opción si desea iniciar Windows directamente desde el dispositivo seleccionado."
|
||||
t MSG_200 "Elija esta opción si desea iniciar Windows directamente desde el dispositivo seleccionado."
|
||||
|
||||
# Status messages - these messages will appear on the status bar
|
||||
t MSG_201 "Cancelando - por favor espere..."
|
||||
|
|
@ -12075,7 +12072,7 @@ t MSG_219 "Arreglos en NTFS: %d%% completo"
|
|||
# eg. "Formatting (UDF) - Estimated duration 3:21..."
|
||||
# NB: if "estimated duration" is too long, just use "estimated" or an abbreviation
|
||||
t MSG_220 "Formateando (%s) - duración estimada %d:%02d..."
|
||||
t MSG_221 "Escribiendo la etiqueta del volumen (puede tardar un rato)..."
|
||||
t MSG_221 "Escribiendo la etiqueta del volumen (puede tardar un rato)..."
|
||||
# Parameter: the file system. eg. "Formatting (NTFS)..."
|
||||
t MSG_222 "Formateando (%s)..."
|
||||
t MSG_223 "Arreglos en NTFS (Checkdisk)..."
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
#include "badblocks.h"
|
||||
#include "localization.h"
|
||||
#include "bled/bled.h"
|
||||
#include "../res/grub/grub_version.h"
|
||||
|
||||
/*
|
||||
* Globals
|
||||
|
|
@ -1827,7 +1828,7 @@ DWORD WINAPI FormatThread(void* param)
|
|||
grub4dos_dst[0] = drive_name[0];
|
||||
uprintf("Installing: %s (Grub4DOS loader)\n", grub4dos_dst);
|
||||
IGNORE_RETVAL(_chdirU(app_dir));
|
||||
if (!CopyFileU(FILES_DIR "\\grub4dos\\grldr", grub4dos_dst, FALSE))
|
||||
if (!CopyFileU(FILES_DIR "\\grub4dos-" GRUB4DOS_VERSION "\\grldr", grub4dos_dst, FALSE))
|
||||
uprintf("Failed to copy file: %s", WindowsErrorString());
|
||||
} else if ((dt == DT_ISO) && (image_path != NULL)) {
|
||||
UpdateProgress(OP_DOS, 0.0f);
|
||||
|
|
|
|||
|
|
@ -1,41 +1,40 @@
|
|||
/*
|
||||
* First 432 bytes of MBR from Grub4DOS (Converted from res/grub4dos/grldr.mbr)
|
||||
* First 416 bytes of MBR from Grub4DOS (Converted from res/grub4dos/grldr.mbr)
|
||||
*/
|
||||
unsigned char mbr_grub_0x0[] = {
|
||||
0xEB, 0x5E, 0x80, 0x00, 0x20, 0x39, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
|
||||
0xEB, 0x5E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0xFA, 0x31, 0xDB, 0x8E, 0xD3, 0xBC, 0x80, 0x05, 0xE8, 0x00, 0x00, 0x5B,
|
||||
0x81, 0xEB, 0x6B, 0x00, 0xC1, 0xEB, 0x04, 0x8C, 0xC8, 0x01, 0xC3, 0x8E,
|
||||
0xDB, 0x53, 0x6A, 0x7D, 0xCB, 0x68, 0x00, 0x20, 0x17, 0xBC, 0x00, 0x90,
|
||||
0xFB, 0x16, 0x07, 0xB9, 0x12, 0x00, 0xB8, 0x01, 0x02, 0x89, 0xCB, 0x4B,
|
||||
0xC1, 0xE3, 0x09, 0xBA, 0x80, 0x00, 0x51, 0x53, 0xE8, 0xA4, 0x00, 0x5B,
|
||||
0x59, 0x72, 0x04, 0xE2, 0xE9, 0xF6, 0xDC, 0x0E, 0x1F, 0x9C, 0x31, 0xF6,
|
||||
0x31, 0xFF, 0xB9, 0xDF, 0x00, 0xFC, 0xF3, 0xA5, 0xBB, 0xFC, 0x1F, 0x66,
|
||||
0xB8, 0x05, 0x4D, 0xCB, 0x93, 0x66, 0x39, 0x07, 0x75, 0x03, 0xE8, 0x39,
|
||||
0x1C, 0xEA, 0xC6, 0x00, 0x00, 0x20, 0x16, 0x1F, 0x66, 0x39, 0x07, 0x74,
|
||||
0x28, 0x66, 0x60, 0xBF, 0x03, 0x00, 0xB8, 0x11, 0x02, 0x99, 0xBB, 0x00,
|
||||
0x02, 0xB9, 0x02, 0x00, 0xE8, 0x80, 0x00, 0x73, 0x02, 0x75, 0xEF, 0x66,
|
||||
0x61, 0x66, 0x39, 0x07, 0x75, 0x4D, 0xC7, 0x06, 0x06, 0x00, 0x00, 0xFF,
|
||||
0x80, 0x26, 0x02, 0x00, 0xFE, 0x9D, 0x72, 0x33, 0x0E, 0x1F, 0xAD, 0x88,
|
||||
0xE6, 0xAD, 0x89, 0xC1, 0x24, 0x3F, 0x74, 0x14, 0xB0, 0x01, 0xBF, 0x03,
|
||||
0x00, 0xB4, 0x02, 0x68, 0x00, 0x0D, 0x07, 0x31, 0xDB, 0xE8, 0x4B, 0x00,
|
||||
0x73, 0x03, 0x75, 0xF1, 0xF9, 0xE8, 0x5C, 0x11, 0x0F, 0x87, 0xF3, 0x1B,
|
||||
0x83, 0xC6, 0x0C, 0x81, 0xFE, 0xFE, 0x01, 0x72, 0xCF, 0x77, 0x0C, 0xBE,
|
||||
0xB2, 0x31, 0xB0, 0x04, 0xB9, 0x01, 0x00, 0x31, 0xD2, 0xEB, 0xCF, 0xBE,
|
||||
0x91, 0x01, 0xE8, 0x4D, 0x00, 0xEB, 0xFE, 0x1E, 0x06, 0x52, 0x56, 0x57,
|
||||
0x55, 0xF9, 0xCD, 0x13, 0x5D, 0x5F, 0x5E, 0x5A, 0x07, 0x1F, 0xC3, 0xFA,
|
||||
0xB8, 0x00, 0x20, 0x8E, 0xD0, 0xBC, 0xDC, 0x8F, 0xFB, 0x66, 0x61, 0x07,
|
||||
0x1F, 0xEB, 0xC1, 0x60, 0x50, 0x53, 0x51, 0xFE, 0xC8, 0x00, 0xC1, 0xD0,
|
||||
0xE0, 0x00, 0xC7, 0xB0, 0x01, 0xE8, 0xCF, 0xFF, 0x59, 0x5B, 0x58, 0x72,
|
||||
0x04, 0xFE, 0xC8, 0x75, 0xE7, 0x61, 0x73, 0x09, 0x60, 0x31, 0xC0, 0xE8,
|
||||
0xBD, 0xFF, 0x61, 0x4F, 0xF9, 0xC3, 0xB4, 0x0E, 0xCD, 0x10, 0x2E, 0xAC,
|
||||
0x3C, 0x00, 0x75, 0xF6, 0xC3, 0x0D, 0x0A, 0x4D, 0x69, 0x73, 0x73, 0x69,
|
||||
0x6E, 0x67, 0x20, 0x4D, 0x42, 0x52, 0x2D, 0x68, 0x65, 0x6C, 0x70, 0x65,
|
||||
0x72, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x20, 0x39, 0xFF, 0xFF,
|
||||
0x31, 0xDB, 0x8E, 0xD3, 0xBC, 0x80, 0x05, 0xE8, 0x00, 0x00, 0x5B, 0x81,
|
||||
0xEB, 0x6A, 0x00, 0xC1, 0xEB, 0x04, 0x8C, 0xC8, 0x01, 0xC3, 0x53, 0x68,
|
||||
0x7B, 0x00, 0xCB, 0x68, 0x00, 0x20, 0x17, 0xBC, 0x00, 0x90, 0x80, 0xFA,
|
||||
0x00, 0x74, 0x02, 0xB2, 0x80, 0x16, 0x07, 0xB0, 0x10, 0x30, 0xF6, 0x31,
|
||||
0xDB, 0xE8, 0xBB, 0x00, 0x72, 0x29, 0x0E, 0x1F, 0x31, 0xF6, 0x31, 0xFF,
|
||||
0xB9, 0xDF, 0x00, 0xFC, 0xF3, 0xA5, 0xBB, 0xFC, 0x1F, 0x66, 0xB8, 0x47,
|
||||
0x52, 0x55, 0xAA, 0x66, 0x39, 0x07, 0x75, 0x03, 0xE8, 0x98, 0x19, 0xEA,
|
||||
0xB8, 0x00, 0x00, 0x20, 0x16, 0x1F, 0x66, 0x39, 0x07, 0x74, 0x1F, 0x80,
|
||||
0xF2, 0x80, 0x68, 0xC0, 0x07, 0x07, 0xB0, 0x10, 0x30, 0xF6, 0x31, 0xDB,
|
||||
0xE8, 0x80, 0x00, 0x72, 0x05, 0xEA, 0x00, 0x00, 0xC0, 0x07, 0xBE, 0x8B,
|
||||
0x01, 0xE8, 0xA8, 0x00, 0xEB, 0xFE, 0xBE, 0xBE, 0x01, 0xE8, 0x04, 0x10,
|
||||
0xF6, 0x06, 0x9D, 0x01, 0x80, 0x0F, 0x84, 0x6C, 0x19, 0x83, 0xC6, 0x0C,
|
||||
0x81, 0xFE, 0xFE, 0x01, 0x72, 0xEB, 0x77, 0x26, 0xF6, 0x06, 0xA0, 0x01,
|
||||
0x01, 0x0F, 0x85, 0x1E, 0x17, 0x80, 0x0E, 0xA0, 0x01, 0x01, 0xF6, 0x06,
|
||||
0xA0, 0x01, 0x02, 0x75, 0xD4, 0x68, 0x00, 0x7C, 0x07, 0xB0, 0x01, 0x30,
|
||||
0xF6, 0x31, 0xDB, 0xE8, 0x35, 0x00, 0x72, 0xBA, 0xEB, 0xC0, 0xF6, 0x06,
|
||||
0xA0, 0x01, 0x01, 0x0F, 0x85, 0xF8, 0x16, 0x80, 0x0E, 0xA0, 0x01, 0x01,
|
||||
0xE9, 0xD9, 0x16, 0x1E, 0x06, 0x52, 0x56, 0x57, 0x55, 0xF9, 0xCD, 0x13,
|
||||
0x5D, 0x5F, 0x5E, 0x5A, 0x07, 0x1F, 0xC3, 0xFA, 0xB8, 0x00, 0x20, 0x8E,
|
||||
0xD0, 0xBC, 0xDC, 0x8F, 0xFB, 0x66, 0x61, 0x07, 0x1F, 0xEB, 0x9E, 0xB4,
|
||||
0x02, 0xBF, 0x03, 0x00, 0xB9, 0x01, 0x00, 0x60, 0x50, 0x53, 0x51, 0xFE,
|
||||
0xC8, 0x00, 0xC1, 0xD0, 0xE0, 0x00, 0xC7, 0xB0, 0x01, 0xE8, 0xC7, 0xFF,
|
||||
0x59, 0x5B, 0x58, 0x72, 0x04, 0xFE, 0xC8, 0x75, 0xE7, 0x61, 0x73, 0x0B,
|
||||
0x60, 0x31, 0xC0, 0xE8, 0xB5, 0xFF, 0x61, 0x4F, 0x75, 0xD9, 0xF9, 0xC3,
|
||||
0xB4, 0x0E, 0xCD, 0x10, 0x2E, 0xAC, 0x3C, 0x00, 0x75, 0xF6, 0xC3, 0x0D,
|
||||
0x0A, 0x4D, 0x69, 0x73, 0x73, 0x69, 0x6E, 0x67, 0x20, 0x68, 0x65, 0x6C,
|
||||
0x70, 0x65, 0x72, 0x2E, 0x00, 0x00, 0x3F, 0xFF
|
||||
};
|
||||
|
|
|
|||
30
src/rufus.c
30
src/rufus.c
|
|
@ -136,8 +136,6 @@ int dialog_showing = 0;
|
|||
uint16_t rufus_version[3], embedded_sl_version[2];
|
||||
char embedded_sl_version_str[2][12] = { "?.??", "?.??" };
|
||||
char embedded_sl_version_ext[2][32];
|
||||
char embedded_grub_version[] = GRUB4DOS_VERSION;
|
||||
char embedded_grub2_version[] = GRUB2_PACKAGE_VERSION;
|
||||
RUFUS_UPDATE update = { {0,0,0}, {0,0}, NULL, NULL};
|
||||
StrArray DriveID, DriveLabel;
|
||||
extern char* szStatusMessage;
|
||||
|
|
@ -1272,7 +1270,7 @@ static BOOL BootCheck(void)
|
|||
}
|
||||
|
||||
if ((iso_report.has_grub2) && (iso_report.grub2_version[0] != 0) &&
|
||||
(strcmp(iso_report.grub2_version, embedded_grub2_version) != 0)) {
|
||||
(strcmp(iso_report.grub2_version, GRUB2_PACKAGE_VERSION) != 0)) {
|
||||
// We may have to download a different Grub2 version if we can find one
|
||||
IGNORE_RETVAL(_chdirU(app_dir));
|
||||
IGNORE_RETVAL(_mkdir(FILES_DIR));
|
||||
|
|
@ -1296,7 +1294,7 @@ static BOOL BootCheck(void)
|
|||
}
|
||||
fclose(fd);
|
||||
} else {
|
||||
r = MessageBoxU(hMainDialog, lmprintf(MSG_116, iso_report.grub2_version, embedded_grub2_version),
|
||||
r = MessageBoxU(hMainDialog, lmprintf(MSG_116, iso_report.grub2_version, GRUB2_PACKAGE_VERSION),
|
||||
lmprintf(MSG_115), MB_YESNOCANCEL|MB_ICONWARNING|MB_IS_RTL);
|
||||
if (r == IDCANCEL)
|
||||
return FALSE;
|
||||
|
|
@ -1447,7 +1445,8 @@ static BOOL BootCheck(void)
|
|||
IGNORE_RETVAL(_mkdir(tmp));
|
||||
static_sprintf(tmp, "%s/%s-%s/%s.%s", FILES_URL, syslinux, embedded_sl_version_str[1], ldlinux, ldlinux_ext[2]);
|
||||
PrintInfo(0, MSG_085, tmp);
|
||||
DownloadFile(tmp, &tmp[sizeof(FILES_URL)], hMainDialog);
|
||||
if (DownloadFile(tmp, &tmp[sizeof(FILES_URL)], hMainDialog))
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
} else if (dt == DT_WINME) {
|
||||
|
|
@ -1460,7 +1459,7 @@ static BOOL BootCheck(void)
|
|||
IGNORE_RETVAL(_chdirU(app_dir));
|
||||
IGNORE_RETVAL(_mkdir(FILES_DIR));
|
||||
IGNORE_RETVAL(_chdir(FILES_DIR));
|
||||
static_sprintf(tmp, "grub4dos/grldr");
|
||||
static_sprintf(tmp, "grub4dos-%s/grldr", GRUB4DOS_VERSION);
|
||||
fd = fopenU(tmp, "rb");
|
||||
if (fd != NULL) {
|
||||
uprintf("Will reuse './%s/%s' for Grub4DOS installation\n", FILES_DIR, tmp);
|
||||
|
|
@ -1473,10 +1472,13 @@ static BOOL BootCheck(void)
|
|||
if (r == IDCANCEL)
|
||||
return FALSE;
|
||||
if (r == IDYES) {
|
||||
IGNORE_RETVAL(_mkdir("grub4dos"));
|
||||
static_sprintf(tmp, "%s/grub4dos/grldr", FILES_URL);
|
||||
static_sprintf(tmp, "grub4dos-%s", GRUB4DOS_VERSION);
|
||||
IGNORE_RETVAL(_mkdir(tmp));
|
||||
static_sprintf(tmp, "%s/grub4dos-%s/grldr", FILES_URL, GRUB4DOS_VERSION);
|
||||
PrintInfo(0, MSG_085, tmp);
|
||||
DownloadFile(tmp, &tmp[sizeof(FILES_URL)], hMainDialog);
|
||||
uprintf("URL = %s", tmp);
|
||||
if (DownloadFile(tmp, &tmp[sizeof(FILES_URL)], hMainDialog) == 0)
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1613,7 +1615,7 @@ void InitDialog(HWND hDlg)
|
|||
uprintf("Windows version: %s", WindowsVersionStr);
|
||||
uprintf("Syslinux versions: %s%s, %s%s", embedded_sl_version_str[0], embedded_sl_version_ext[0],
|
||||
embedded_sl_version_str[1], embedded_sl_version_ext[1]);
|
||||
uprintf("Grub versions: %s, %s", embedded_grub_version, embedded_grub2_version);
|
||||
uprintf("Grub versions: %s, %s", GRUB4DOS_VERSION, GRUB2_PACKAGE_VERSION);
|
||||
uprintf("Locale ID: 0x%04X", GetUserDefaultUILanguage());
|
||||
|
||||
SetClusterSizeLabels();
|
||||
|
|
@ -1798,8 +1800,10 @@ void SetBoot(int fs, int bt)
|
|||
static_sprintf(tmp, "Syslinux %s", embedded_sl_version_str[1]);
|
||||
IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType, tmp), DT_SYSLINUX_V6));
|
||||
IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType, "ReactOS"), DT_REACTOS));
|
||||
IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType, "Grub 2.00-22"), DT_GRUB2));
|
||||
IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType, "Grub4DOS 0.4.5"), DT_GRUB4DOS));
|
||||
IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType,
|
||||
"Grub " GRUB2_PACKAGE_VERSION), DT_GRUB2));
|
||||
IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType,
|
||||
"Grub4DOS " GRUB4DOS_VERSION), DT_GRUB4DOS));
|
||||
}
|
||||
if ((!advanced_mode) && (selection_default >= DT_SYSLINUX_V4)) {
|
||||
selection_default = DT_FREEDOS;
|
||||
|
|
@ -2789,7 +2793,7 @@ relaunch:
|
|||
// Alt-W => Enable VMWare disk detection
|
||||
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'W')) {
|
||||
enable_vmdk = !enable_vmdk;
|
||||
PrintStatus2000(lmprintf(MSG_265), !enable_vmdk);
|
||||
PrintStatus2000(lmprintf(MSG_265), enable_vmdk);
|
||||
GetUSBDevices(0);
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
16
src/rufus.rc
16
src/rufus.rc
|
|
@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
|||
|
||||
IDD_DIALOG DIALOGEX 12, 12, 242, 376
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Rufus 2.0.624"
|
||||
CAPTION "Rufus 2.0.625"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,127,339,50,14
|
||||
|
|
@ -157,7 +157,7 @@ END
|
|||
|
||||
IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Rufus 2.0.624"
|
||||
CAPTION "Rufus 2.0.625"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,127,339,50,14
|
||||
|
|
@ -283,7 +283,7 @@ END
|
|||
IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Rufus 2.0.624"
|
||||
CAPTION "Rufus 2.0.625"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,127,339,50,14
|
||||
|
|
@ -415,7 +415,7 @@ END
|
|||
IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Rufus 2.0.624"
|
||||
CAPTION "Rufus 2.0.625"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,127,339,50,14
|
||||
|
|
@ -671,8 +671,8 @@ END
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 2,0,624,0
|
||||
PRODUCTVERSION 2,0,624,0
|
||||
FILEVERSION 2,0,625,0
|
||||
PRODUCTVERSION 2,0,625,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
|
@ -689,13 +689,13 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
|
||||
VALUE "FileDescription", "Rufus"
|
||||
VALUE "FileVersion", "2.0.624"
|
||||
VALUE "FileVersion", "2.0.625"
|
||||
VALUE "InternalName", "Rufus"
|
||||
VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
|
||||
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
|
||||
VALUE "OriginalFilename", "rufus.exe"
|
||||
VALUE "ProductName", "Rufus"
|
||||
VALUE "ProductVersion", "2.0.624"
|
||||
VALUE "ProductVersion", "2.0.625"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
|
|||
Loading…
Reference in a new issue