nerd
/
rufus
mirror of https://github.com/pbatard/rufus.git
1
1
Fork 0
Code Issues 1 Projects Releases Wiki Activity

[misc] fix WDK warnings

This commit is contained in:
Pete Batard 2016-02-05 22:24:47 +00:00
parent 9de7d0db84
commit e1499c4db0
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog.txt
View File

@ -1,3 +1,13 @@
o Version 2.7 (2016.02.??)
Add Thai translation, courtesy of Sippapas Wangsri
Add Drag and Drop support, courtesy of SeymourApps
Add a retry for most write operations
Update UEFI:NTFS, ms-sys and Grub4DOS to latest
Dual sign Rufus with both SHA-1 and SHA-256
Fix 2nd line of SHA-256 being hidden on some platforms
Fix shutdown prevention issues
Additional small fixes
o Version 2.6 (2015.12.22)
Add Serbian (Latin) translation, courtesy of Ivan Strugar
Add a cheat mode to zero a device (Alt-Z)

4
src/rufus.c
View File

@ -654,7 +654,7 @@ static void SetTargetSystem(void)
static void SetProposedLabel(int ComboIndex)
{
const char no_label[] = STR_NO_LABEL;
const char no_label[] = STR_NO_LABEL, empty[] = "";
int bt = (int)ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType));
app_changed_label = TRUE;
@ -680,7 +680,7 @@ static void SetProposedLabel(int ComboIndex)
}
// Else if no existing label is available, propose one according to the size (eg: "256MB", "8GB")
if ((safe_stricmp(no_label, DriveLabel.String[ComboIndex]) == 0) || (safe_stricmp(no_label, "") == 0)
if ((safe_stricmp(no_label, DriveLabel.String[ComboIndex]) == 0) || (safe_stricmp(no_label, empty) == 0)
|| (safe_stricmp(lmprintf(MSG_207), DriveLabel.String[ComboIndex]) == 0)) {
SetWindowTextU(hLabel, SelectedDrive.proposed_label);
} else {

10
src/rufus.rc
View File

@ -33,7 +33,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
EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 2.7.847"
CAPTION "Rufus 2.7.848"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -320,8 +320,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,7,847,0
PRODUCTVERSION 2,7,847,0
FILEVERSION 2,7,848,0
PRODUCTVERSION 2,7,848,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -338,13 +338,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.7.847"
VALUE "FileVersion", "2.7.848"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.7.847"
VALUE "ProductVersion", "2.7.848"
END
END
BLOCK "VarFileInfo"

3
src/stdlg.c
View File

@ -1648,6 +1648,7 @@ out:
LPCDLGTEMPLATE GetDialogTemplate(int Dialog_ID)
{
int i;
const char thai_id[] = "th-TH";
size_t len;
DWORD size;
DWORD* dwBuf;
@ -1672,7 +1673,7 @@ LPCDLGTEMPLATE GetDialogTemplate(int Dialog_ID)
// If 'Segoe UI Symbol' is available, and we are using Thai, we're done here
if (IsFontAvailable("Segoe UI Symbol") && (selected_locale != NULL)
&& (safe_strcmp(selected_locale->txt[0], "th-TH") == 0))
&& (safe_strcmp(selected_locale->txt[0], thai_id) == 0))
return rcTemplate;
// 'Segoe UI Symbol' cannot be used => Fall back to the best we have