[misc] fix XP support... again

* Also add a close button to log dialog
* Also improve README.md
This commit is contained in:
Pete Batard 2015-10-23 22:31:23 +01:00
parent 764b20b6b0
commit fb95409114
3 changed files with 20 additions and 20 deletions

View File

@ -6,15 +6,15 @@ Rufus: The Reliable USB Formatting Utility
Features Features
-------- --------
* Formats USB and Virtual HD drives to FAT/FAT32/NTFS/UDF/exFAT/ReFS * Format USB and Virtual HD drives to FAT/FAT32/NTFS/UDF/exFAT/ReFS
* Creates DOS bootable USB drives, using [FreeDOS](http://www.freedos.org/) or MS-DOS * Create DOS bootable USB drives, using [FreeDOS](http://www.freedos.org/) or MS-DOS
* Creates BIOS or UEFI bootable drives, including UEFI bootable NTFS * Create BIOS or UEFI bootable drives, including [UEFI bootable NTFS](https://github.com/pbatard/uefi-ntfs)
* Creates bootable drives from bootable ISOs (Windows, Linux, etc.) * Create bootable drives from bootable ISOs (Windows, Linux, etc.)
* Creates bootable drives from bootable disk images, including compressed ones * Create bootable drives from bootable disk images, including compressed ones
* Creates [Windows To Go](https://en.wikipedia.org/wiki/Windows_To_Go) drives * Create [Windows To Go](https://en.wikipedia.org/wiki/Windows_To_Go) drives
* Twice as fast as Microsoft's USB/DVD tool or UNetbootin, on ISO -> USB creation (1) * Twice as fast as Microsoft's USB/DVD tool or UNetbootin, on ISO -> USB creation (1)
* Performs bad blocks checks, including detection of "fake" flash drives * Perform bad blocks checks, including detection of "fake" flash drives
* Modern and familiar UI, with more than [30 languages natively supported](http://rufus.akeo.ie/translations) * Modern and familiar UI, with more than [35 languages natively supported](https://rufus.akeo.ie/translations)
* Small footprint. No installation required. * Small footprint. No installation required.
* Portable * Portable
* 100% [Free Software](http://www.gnu.org/philosophy/free-sw.en.html) (GPL v3) * 100% [Free Software](http://www.gnu.org/philosophy/free-sw.en.html) (GPL v3)
@ -39,8 +39,8 @@ Additional information
Rufus provides extensive information about what it is doing, either through Rufus provides extensive information about what it is doing, either through
its easily accessible log, or through the Windows debug facility. its easily accessible log, or through the Windows debug facility.
* Website: http://rufus.akeo.ie * Website: https://rufus.akeo.ie
* FAQ: http://rufus.akeo.ie/FAQ * FAQ: https://rufus.akeo.ie/FAQ
Enhancements/Bugs Enhancements/Bugs
----------------- -----------------

View File

@ -617,12 +617,12 @@ WORD get_language_id(loc_cmd* lcmd)
found_lang = FALSE; found_lang = FALSE;
for (i = 0; (i<lcmd->unum_size); i++) { for (i = 0; (i<lcmd->unum_size); i++) {
// Always uppercase // Always uppercase
swprintf_s(wlang, ARRAYSIZE(wlang), L"%04X", lcmd->unum[i]); _snwprintf(wlang, ARRAYSIZE(wlang), L"%04X", lcmd->unum[i]);
// This callback enumeration from Microsoft is retarded. Now we need a global // This callback enumeration from Microsoft is retarded. Now we need a global
// boolean to tell us that we found what we were after. // boolean to tell us that we found what we were after.
EnumUILanguages(EnumUILanguagesProc, 0x4, (LONG_PTR)wlang); // 0x04 = MUI_LANGUAGE_ID EnumUILanguages(EnumUILanguagesProc, 0x4, (LONG_PTR)wlang); // 0x04 = MUI_LANGUAGE_ID
if (found_lang) { if (found_lang) {
uprintf("localization: will use installed language pack for 0x%04X", lcmd->unum[i]); uprintf("localization: detected installed language pack for 0x%04X", lcmd->unum[i]);
return MAKELANGID(lcmd->unum[i], SUBLANG_DEFAULT); return MAKELANGID(lcmd->unum[i], SUBLANG_DEFAULT);
} }
} }

View File

@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376 IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Rufus 2.5.794" CAPTION "Rufus 2.5.795"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -79,8 +79,8 @@ CAPTION "About Rufus"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20
CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",0x884,45,7,268,107 CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY,45,7,268,107
CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x804,46,115,267,91,WS_EX_STATICEDGE CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_TABSTOP,46,115,267,91,WS_EX_STATICEDGE
PUSHBUTTON "License",IDC_ABOUT_LICENSE,46,215,50,14,WS_GROUP PUSHBUTTON "License",IDC_ABOUT_LICENSE,46,215,50,14,WS_GROUP
PUSHBUTTON "Updates",IDC_ABOUT_UPDATES,100,215,50,14,NOT WS_VISIBLE | WS_GROUP PUSHBUTTON "Updates",IDC_ABOUT_UPDATES,100,215,50,14,NOT WS_VISIBLE | WS_GROUP
DEFPUSHBUTTON "OK",IDOK,251,215,50,14,WS_GROUP DEFPUSHBUTTON "OK",IDOK,251,215,50,14,WS_GROUP
@ -110,7 +110,7 @@ BEGIN
END END
IDD_LOG DIALOGEX 0, 0, 366, 376 IDD_LOG DIALOGEX 0, 0, 366, 376
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Log" CAPTION "Log"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
@ -319,8 +319,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,5,794,0 FILEVERSION 2,5,795,0
PRODUCTVERSION 2,5,794,0 PRODUCTVERSION 2,5,795,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -337,13 +337,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", "2.5.794" VALUE "FileVersion", "2.5.795"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2015 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", "2.5.794" VALUE "ProductVersion", "2.5.795"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"