nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[misc] Fix various issues

Browse source 
* Attempt to remount the drive in case of failure (Closes #270)
* Minor fixes to localization
* Fix errors not being properly reported in DownloadFile()
* Also update ChangeLog.txt for beta
This commit is contained in:
Pete Batard 2014-01-05 19:54:19 +00:00
parent 573ea45640
commit d828500af7
5 changed files with 40 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog.txt
View file

@ -1,3 +1,17 @@
o Version 1.4.2 (2014.01.??)
Add ReactOS support
Add EFI/NTFS boot support, for targets that support it
Add card hotplug detection for USB memory card readers
Add retry when writing ISO files... again
Add Malay translation, courtesy of Muhammad Aman
Speed up boot record cleanup, for slow drives
Improve initial locale detection
Save user selected locale between sessions
Always use English locale in the log, where possible
Fix detection of SanDisk, Kingston and Toshiba drives
Fix an issue with drive letter assignation
Many other minor fixes and improvements
o Version 1.4.1 (2013.12.05) [BUGFIX RELEASE] o Version 1.4.1 (2013.12.05) [BUGFIX RELEASE]
Fix broken Syslinux support (reported by ank91) Fix broken Syslinux support (reported by ank91)
Add Slovenian support, courtesy of Matej Horvat Add Slovenian support, courtesy of Matej Horvat

21
res/localization/rufus.loc
View file

@ -353,9 +353,9 @@ t MSG_207 "New Volume"
# Same message, once for singular and plural ("1 device found", "2 devices found") # Same message, once for singular and plural ("1 device found", "2 devices found")
t MSG_208 "%d device found" t MSG_208 "%d device found"
t MSG_209 "%d devices found" t MSG_209 "%d devices found"
t MSG_210 "DONE." t MSG_210 "DONE"
t MSG_211 "Cancelled." t MSG_211 "Cancelled"
t MSG_212 "FAILED." t MSG_212 "FAILED"
# Used when a new update has been downloaded and launched # Used when a new update has been downloaded and launched
t MSG_213 "Launching new application..." t MSG_213 "Launching new application..."
t MSG_214 "Failed to launch new application" t MSG_214 "Failed to launch new application"
@ -1521,9 +1521,9 @@ t MSG_206 "Fichier %s manquant"
t MSG_207 "Nouveau volume" t MSG_207 "Nouveau volume"
t MSG_208 "%d périphérique détecté" t MSG_208 "%d périphérique détecté"
t MSG_209 "%d périphériques détectés" t MSG_209 "%d périphériques détectés"
t MSG_210 "Opération terminée." t MSG_210 "Opération terminée"
t MSG_211 "Opération annulée." t MSG_211 "Opération annulée"
t MSG_212 "ECHEC." t MSG_212 "ECHEC"
t MSG_213 "Lancement de la nouvelle application..." t MSG_213 "Lancement de la nouvelle application..."
t MSG_214 "Echec de lancement de l'application" t MSG_214 "Echec de lancement de l'application"
t MSG_215 "%s ouvert" t MSG_215 "%s ouvert"
@ -1712,7 +1712,7 @@ t MSG_028 "Megabyte"
t MSG_029 "Standard" t MSG_029 "Standard"
# The following gets appended to the file system, cluster size, etc. # The following gets appended to the file system, cluster size, etc.
t MSG_030 "%s (Standard)" t MSG_030 "%s (Standard)"
t MSG_031 "%s Partitionierungsschema für BIOS oder UEFI Computers" t MSG_031 "%s Partitionierungsschema für BIOS oder UEFI Computer"
t MSG_032 "%s Partitionierungsschema für BIOS Computer" t MSG_032 "%s Partitionierungsschema für BIOS Computer"
t MSG_033 "%s Partitionierungsschema für UEFI Computer" t MSG_033 "%s Partitionierungsschema für UEFI Computer"
# Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes)
@ -1788,8 +1788,8 @@ t MSG_087 "Wählen Sie ein startfähiges ISO-Abbild aus "
t MSG_088 "ISO-Abbild ist zu groß" t MSG_088 "ISO-Abbild ist zu groß"
t MSG_089 "Dieses ISO-Abbild ist zu groß für das gewählte Ziel." t MSG_089 "Dieses ISO-Abbild ist zu groß für das gewählte Ziel."
t MSG_090 "ISO-Abbild nicht unterstützt" t MSG_090 "ISO-Abbild nicht unterstützt"
t MSG_091 "When using UEFI Target Type, only EFI bootable ISO images are supported. " t MSG_091 "Wenn UEFI als Typ des Zielsystems gewählt ist, sind nur EFI-bootfähige ISO-Abbilder unterstützt."
"Please select an EFI bootable ISO or set the Target Type to BIOS." "Bitte wählen Sie ein EFI-bootfähiges ISO-Abbild oder ändern Sie den Typ des Zielsystems zu BIOS."
t MSG_092 "Nicht unterstütztes Dateisystem" t MSG_092 "Nicht unterstütztes Dateisystem"
t MSG_096 "Nur FAT/FAT32 sind unterstützt für diesen Typ des ISO-Abbilds. Bitte wählen Sie FAT/FAT32 als Dateisystem." t MSG_096 "Nur FAT/FAT32 sind unterstützt für diesen Typ des ISO-Abbilds. Bitte wählen Sie FAT/FAT32 als Dateisystem."
t MSG_097 "Nur 'bootmgr' oder 'WinPE' basierende ISO-Abbilder können derzeit mit NTFS verwendet werden." t MSG_097 "Nur 'bootmgr' oder 'WinPE' basierende ISO-Abbilder können derzeit mit NTFS verwendet werden."
@ -3844,7 +3844,7 @@ t MSG_259 "Priversti naujintis"
################################################################################ ################################################################################
l "ms-MY" "Malay (Bahasa Malaysia)" 0x043e, 0x083e l "ms-MY" "Malay (Bahasa Malaysia)" 0x043e, 0x083e
v 1.0.6 v 1.0.7
b "en-US" b "en-US"
# Main dialog # Main dialog
@ -4081,6 +4081,7 @@ t MSG_089 "Imej ISO ini terlalu besar untuk sasaran yang dipilih."
t MSG_090 "ISO tidak disokong" t MSG_090 "ISO tidak disokong"
t MSG_091 "Apabila menggunakan jenis sasaran UEFI , hanya imej boleh boot jenis EFI sahaja disokong. " t MSG_091 "Apabila menggunakan jenis sasaran UEFI , hanya imej boleh boot jenis EFI sahaja disokong. "
"Tolong pilih ISO boleh boot jenis EFI atau tukarkan jenis sasaran kepada BIOS." "Tolong pilih ISO boleh boot jenis EFI atau tukarkan jenis sasaran kepada BIOS."
t MSG_092 "Sistem fail tidak disokong"
t MSG_096 "Hanya FAT/FAT32 diskong untuk ISO ini. Tolong pilih FAT/FAT32 sebagai fail sistem." t MSG_096 "Hanya FAT/FAT32 diskong untuk ISO ini. Tolong pilih FAT/FAT32 sebagai fail sistem."
t MSG_097 "Hanya imej ISO yang berdasarkan 'bootmgr' atau 'WinPE' boleh digunakan dengan NTFS." t MSG_097 "Hanya imej ISO yang berdasarkan 'bootmgr' atau 'WinPE' boleh digunakan dengan NTFS."
t MSG_098 "FAT/FAT32 hanya boleh digunakan untuk imej ISO yang berdasarkan isolinux atau apabila jenis sasaran adalah UEFI." t MSG_098 "FAT/FAT32 hanya boleh digunakan untuk imej ISO yang berdasarkan isolinux atau apabila jenis sasaran adalah UEFI."

8
src/format.c
View file

@ -1482,6 +1482,14 @@ out:
SendMessage(hISOProgressDlg, UM_ISO_EXIT, 0, 0); SendMessage(hISOProgressDlg, UM_ISO_EXIT, 0, 0);
safe_unlockclose(hLogicalVolume); safe_unlockclose(hLogicalVolume);
safe_unlockclose(hPhysicalDrive); // This can take a while safe_unlockclose(hPhysicalDrive); // This can take a while
if (IS_ERROR(FormatStatus)) {
guid_volume = GetLogicalName(DriveIndex, TRUE, FALSE);
if (guid_volume != NULL) {
if (MountVolume(drive_name, guid_volume))
uprintf("Re-mounted volume as '%c:' after error\n", drive_name[0]);
free(guid_volume);
}
}
PostMessage(hMainDialog, UM_FORMAT_COMPLETED, 0, 0); PostMessage(hMainDialog, UM_FORMAT_COMPLETED, 0, 0);
ExitThread(0); ExitThread(0);
} }

4
src/net.c
View file

@ -268,7 +268,7 @@ BOOL DownloadFile(const char* url, const char* file, HWND hProgressDialog)
uprintf("Downloading %s from %s\n", file, url); uprintf("Downloading %s from %s\n", file, url);
if (!InternetCrackUrlA(url, (DWORD)safe_strlen(url), 0, &UrlParts)) { if (!InternetCrackUrlA(url, (DWORD)safe_strlen(url), 0, &UrlParts)) {
uprintf("Unable to decode URL: %s\n", WindowsErrorString()); uprintf("Unable to decode URL: %s\n", WinInetErrorString());
goto out; goto out;
} }
hostname[sizeof(hostname)-1] = 0; hostname[sizeof(hostname)-1] = 0;
@ -300,7 +300,7 @@ BOOL DownloadFile(const char* url, const char* file, HWND hProgressDialog)
INTERNET_FLAG_HYPERLINK|INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP|INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS|INTERNET_FLAG_NO_COOKIES| INTERNET_FLAG_HYPERLINK|INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP|INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS|INTERNET_FLAG_NO_COOKIES|
INTERNET_FLAG_NO_UI|INTERNET_FLAG_NO_CACHE_WRITE, (DWORD_PTR)NULL); INTERNET_FLAG_NO_UI|INTERNET_FLAG_NO_CACHE_WRITE, (DWORD_PTR)NULL);
if (hRequest == NULL) { if (hRequest == NULL) {
uprintf("Could not open url %s: %s\n", url, WindowsErrorString()); uprintf("Could not open url %s: %s\n", url, WinInetErrorString());
goto out; goto out;
} }

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 329 IDD_DIALOG DIALOGEX 12, 12, 206, 329
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW EXSTYLE WS_EX_APPWINDOW
CAPTION "Rufus v1.4.2.371" CAPTION "Rufus v1.4.2.372"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
@ -288,8 +288,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,2,371 FILEVERSION 1,4,2,372
PRODUCTVERSION 1,4,2,371 PRODUCTVERSION 1,4,2,372
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -306,13 +306,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "1.4.2.371" VALUE "FileVersion", "1.4.2.372"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "1.4.2.371" VALUE "ProductVersion", "1.4.2.372"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"