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 Windows format prompts not being suppressed

Browse source
This commit is contained in:
Pete Batard 2019-07-08 19:21:40 +01:00
parent 1bbb053f70
commit 3e1d0b309f
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog.txt
View file

@ -8,6 +8,7 @@ o Version 3.6 (2019.07.??)
Fix download script not running when the username contains a space Fix download script not running when the username contains a space
Fix translated messages potentially being truncated (e.g. Thai) Fix translated messages potentially being truncated (e.g. Thai)
Fix progress bar report for screen readers (Accessibility) Fix progress bar report for screen readers (Accessibility)
Fix a regression where Windows format prompts would not be suppressed
Improve(?) Windows To Go support by following Microsoft recommended partition order Improve(?) Windows To Go support by following Microsoft recommended partition order
Disable ISO mode when Manjaro ISOHybrids are being used Disable ISO mode when Manjaro ISOHybrids are being used
Update embedded GRUB to version 2.04 Update embedded GRUB to version 2.04

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.6.1547" CAPTION "Rufus 3.6.1548"
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
@ -394,8 +394,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,6,1547,0 FILEVERSION 3,6,1548,0
PRODUCTVERSION 3,6,1547,0 PRODUCTVERSION 3,6,1548,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -413,13 +413,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.6.1547" VALUE "FileVersion", "3.6.1548"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2019 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.6.exe" VALUE "OriginalFilename", "rufus-3.6.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.6.1547" VALUE "ProductVersion", "3.6.1548"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

5
src/stdlg.c
View file

@ -1998,7 +1998,8 @@ void SetAlertPromptMessages(void)
char mui_path[MAX_PATH]; char mui_path[MAX_PATH];
// Fetch the localized strings in the relevant MUI // Fetch the localized strings in the relevant MUI
static_sprintf(mui_path, "%s\\%s\\shell32.dll.mui", system_dir, GetCurrentMUI()); // Must use sysnative_dir rather than system_dir as we may not find the MUI's otherwise
static_sprintf(mui_path, "%s\\%s\\shell32.dll.mui", sysnative_dir, GetCurrentMUI());
mui_lib = LoadLibraryU(mui_path); mui_lib = LoadLibraryU(mui_path);
if (mui_lib != NULL) { if (mui_lib != NULL) {
// 4097 = "You need to format the disk in drive %c: before you can use it." (dialog text) // 4097 = "You need to format the disk in drive %c: before you can use it." (dialog text)
@ -2014,7 +2015,7 @@ void SetAlertPromptMessages(void)
} }
FreeLibrary(mui_lib); FreeLibrary(mui_lib);
} }
static_sprintf(mui_path, "%s\\%s\\urlmon.dll.mui", system_dir, GetCurrentMUI()); static_sprintf(mui_path, "%s\\%s\\urlmon.dll.mui", sysnative_dir, GetCurrentMUI());
mui_lib = LoadLibraryU(mui_path); mui_lib = LoadLibraryU(mui_path);
if (mui_lib != NULL) { if (mui_lib != NULL) {
// 2070 = "Windows Security Warning" (yes, that's what MS uses for a stupid cookie!) // 2070 = "Windows Security Warning" (yes, that's what MS uses for a stupid cookie!)