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

[ui] fix possible truncation of short image path

Browse source 
* Closes #1233
* Also fix MinGW builds due to missing PROCESSOR_ARCHITECTURE_ARM64 define
This commit is contained in:
Pete Batard 2018-10-22 22:28:20 +01:00
parent 6109d91c38
commit 7757cab3c5
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rufus.c
View file

@ -1071,7 +1071,9 @@ DWORD WINAPI ISOScanThread(LPVOID param)
} else { } else {
if (!dont_display_image_name) { if (!dont_display_image_name) {
for (i = (int)safe_strlen(image_path); (i > 0) && (image_path[i] != '\\'); i--); for (i = (int)safe_strlen(image_path); (i > 0) && (image_path[i] != '\\'); i--);
short_image_path = &image_path[i + 1]; if (i != 0)
i++;
short_image_path = &image_path[i];
PrintStatus(0, MSG_205, short_image_path); PrintStatus(0, MSG_205, short_image_path);
UpdateImage(); UpdateImage();
uprintf("Using image: %s (%s)", short_image_path, SizeToHumanReadable(img_report.image_size, FALSE, FALSE)); uprintf("Using image: %s (%s)", short_image_path, SizeToHumanReadable(img_report.image_size, FALSE, FALSE));

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
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
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.4.1412" CAPTION "Rufus 3.4.1413"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -392,8 +392,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,4,1412,0 FILEVERSION 3,4,1413,0
PRODUCTVERSION 3,4,1412,0 PRODUCTVERSION 3,4,1413,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -411,13 +411,13 @@ BEGIN
VALUE "Comments", "https://akeo.ie" VALUE "Comments", "https://akeo.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.4.1412" VALUE "FileVersion", "3.4.1413"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus-3.4.exe" VALUE "OriginalFilename", "rufus-3.4.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.4.1412" VALUE "ProductVersion", "3.4.1413"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

3
src/stdfn.c
View file

@ -239,7 +239,8 @@ int GetCpuArch(void)
return CPU_ARCH_X86_64; return CPU_ARCH_X86_64;
case PROCESSOR_ARCHITECTURE_INTEL: case PROCESSOR_ARCHITECTURE_INTEL:
return CPU_ARCH_X86_64; return CPU_ARCH_X86_64;
case PROCESSOR_ARCHITECTURE_ARM64: // TODO: Set this back to PROCESSOR_ARCHITECTURE_ARM64 when the MinGW headers have it
case 12:
return CPU_ARCH_ARM_64; return CPU_ARCH_ARM_64;
case PROCESSOR_ARCHITECTURE_ARM: case PROCESSOR_ARCHITECTURE_ARM:
return CPU_ARCH_ARM_32; return CPU_ARCH_ARM_32;