mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-09-19 19:18:51 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ui] fix unwanted persistence unit overlay

Browse source 
* Also fix a typo and make sure to quote more paths when invoking Fido.
This commit is contained in:
Pete Batard 2019-06-05 17:00:21 +01:00
parent a89ed8bc60
commit f6687e729b
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
6 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/format.c
View file

@ -2628,8 +2628,6 @@ DWORD WINAPI FormatThread(void* param)
hLogicalVolume = INVALID_HANDLE_VALUE; hLogicalVolume = INVALID_HANDLE_VALUE;
// VDS wants us to unlock the phys // VDS wants us to unlock the phys
// TODO: IVdsDiskOnline::Offline? -> NOPE, NO_GO for removable media
// TODO: IVdsService::Refresh()? IVdsHwProvider::Reenumerate()??
if (use_vds) { if (use_vds) {
safe_unlockclose(hPhysicalDrive); safe_unlockclose(hPhysicalDrive);
uprintf("Refreshing drive layout..."); uprintf("Refreshing drive layout...");

4
src/net.c
View file

@ -982,8 +982,8 @@ static DWORD WINAPI DownloadISOThread(LPVOID param)
goto out; goto out;
} }
static_sprintf(cmdline, "%s -NonInteractive -Sta -NoProfile –ExecutionPolicy Bypass " static_sprintf(cmdline, "\"%s\" -NonInteractive -Sta -NoProfile –ExecutionPolicy Bypass "
"-File \"%s\" -DisableFirstRunCustomize -PipeName %s -LocData \"%s\" -Icon %s -AppTitle \"%s\"", "-File \"%s\" -DisableFirstRunCustomize -PipeName %s -LocData \"%s\" -Icon \"%s\" -AppTitle \"%s\"",
powershell_path, script_path, &pipe[9], locale_str, icon_path, lmprintf(MSG_149)); powershell_path, script_path, &pipe[9], locale_str, icon_path, lmprintf(MSG_149));
// Signal our Windows alert hook that it should close the IE cookie prompts from Fido // Signal our Windows alert hook that it should close the IE cookie prompts from Fido
close_fido_cookie_prompts = TRUE; close_fido_cookie_prompts = TRUE;

2
src/rufus.c
View file

@ -2523,7 +2523,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
case WM_HSCROLL: case WM_HSCROLL:
lPos = (LONG)SendMessage(GetDlgItem(hMainDialog, IDC_PERSISTENCE_SLIDER), TBM_GETPOS, 0, 0); lPos = (LONG)SendMessage(GetDlgItem(hMainDialog, IDC_PERSISTENCE_SLIDER), TBM_GETPOS, 0, 0);
SetPeristencePos(lPos); SetPersistencePos(lPos);
persistence_size = lPos * MB; persistence_size = lPos * MB;
for (i = 0; i < persistence_unit_selection; i++) for (i = 0; i < persistence_unit_selection; i++)
persistence_size *= 1024; persistence_size *= 1024;

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.1537" CAPTION "Rufus 3.6.1538"
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,1537,0 FILEVERSION 3,6,1538,0
PRODUCTVERSION 3,6,1537,0 PRODUCTVERSION 3,6,1538,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.1537" VALUE "FileVersion", "3.6.1538"
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.1537" VALUE "ProductVersion", "3.6.1538"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

6
src/ui.c
View file

@ -686,11 +686,11 @@ void TogglePersistenceControls(BOOL display)
ShowWindow(hUnits, display ? SW_SHOW : SW_HIDE); ShowWindow(hUnits, display ? SW_SHOW : SW_HIDE);
} }
void SetPeristencePos(uint64_t pos) void SetPersistencePos(uint64_t pos)
{ {
char tmp[64]; char tmp[64];
if (pos != 0) { if ((boot_type == BT_IMAGE) && (pos != 0)) {
TogglePersistenceControls(TRUE); TogglePersistenceControls(TRUE);
static_sprintf(tmp, "%ld", (LONG)pos); static_sprintf(tmp, "%ld", (LONG)pos);
} else { } else {
@ -745,7 +745,7 @@ void SetPersistenceSize(void)
SendMessage(hCtrl, TBM_SETRANGEMAX, (WPARAM)TRUE, (LPARAM)max); SendMessage(hCtrl, TBM_SETRANGEMAX, (WPARAM)TRUE, (LPARAM)max);
SendMessage(hCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pos); SendMessage(hCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pos);
SetPeristencePos(pos); SetPersistencePos(pos);
} }
// Toggle the Image Option dropdown (Windows To Go or persistence settings) // Toggle the Image Option dropdown (Windows To Go or persistence settings)

2
src/ui.h
View file

@ -63,7 +63,7 @@ extern void GetFullWidth(HWND hDlg);
extern void PositionMainControls(HWND hDlg); extern void PositionMainControls(HWND hDlg);
extern void AdjustForLowDPI(HWND hDlg); extern void AdjustForLowDPI(HWND hDlg);
extern void SetSectionHeaders(HWND hDlg); extern void SetSectionHeaders(HWND hDlg);
extern void SetPeristencePos(uint64_t pos); extern void SetPersistencePos(uint64_t pos);
extern void SetPersistenceSize(void); extern void SetPersistenceSize(void);
extern void TogglePersistenceControls(BOOL display); extern void TogglePersistenceControls(BOOL display);
extern void ToggleAdvancedDeviceOptions(BOOL enable); extern void ToggleAdvancedDeviceOptions(BOOL enable);