From 18b267c80a185ef7b8f07a7da75104ebc0e9a280 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Fri, 13 Feb 2015 00:37:21 +0000 Subject: [PATCH] [ui] add compressed format to DD image listing * Also add a reference to BusyBox/Bled in additional copyrights --- src/license.h | 5 +++++ src/rufus.c | 8 ++------ src/rufus.rc | 16 ++++++++-------- src/stdlg.c | 14 +++++++------- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/license.h b/src/license.h index 9797796d..5e47f71f 100644 --- a/src/license.h +++ b/src/license.h @@ -76,6 +76,11 @@ const char* additional_copyrights = "http://www.codeguru.com/forum/showthread.php?p=1951973\\line\n" "Public Domain\\line\n" "\\line\n" +"Decompression support from BusyBox/Bled:\\line\n" +"http://www.busybox.net/\\line\n" +"https://github.com/pbatard/bled\\line\n" +"GNU General Public License (GPL) v2 or later\\line\n" +"\\line\n" "USB vs HDD and additional functions calls derived from smartmontools:\\line\n" "https://sourceforge.net/projects/smartmontools\\line\n" "GNU General Public License (GPL) v2 or later\\line\n" diff --git a/src/rufus.c b/src/rufus.c index 249b0d69..58503839 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -1841,8 +1841,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA int nDeviceIndex, fs, bt, i, nWidth, nHeight, nb_devices, selected_language, offset; char tmp[128]; loc_cmd* lcmd = NULL; - // TODO: Add "*.img;*.vhd" / "All Supported Images" to the list below and use a generic "%s Image" in the .loc - EXT_DECL(img_ext, NULL, __VA_GROUP__("*.img", "*.vhd"), __VA_GROUP__(lmprintf(MSG_095), "VHD Image")); + EXT_DECL(img_ext, NULL, __VA_GROUP__("*.img;*.vhd;*.gz;*.bzip2;*.xz;*.lzma;*.Z"), __VA_GROUP__(lmprintf(MSG_095))); EXT_DECL(iso_ext, NULL, __VA_GROUP__("*.iso"), __VA_GROUP__(lmprintf(MSG_036))); switch (message) { @@ -2206,10 +2205,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA iso_provided = FALSE; // One off thing... } else { safe_free(image_path); - if (selection_default == DT_IMG) - image_path = FileDialog(FALSE, NULL, &img_ext, 0); - else - image_path = FileDialog(FALSE, NULL, &iso_ext, 0); + image_path = FileDialog(FALSE, NULL, (selection_default == DT_IMG)?&img_ext:&iso_ext, 0); if (image_path == NULL) { CreateTooltip(hSelectISO, lmprintf(MSG_173), -1); PrintStatus(0, MSG_086); diff --git a/src/rufus.rc b/src/rufus.rc index dcee6ed3..dd0a4608 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -32,7 +32,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 -CAPTION "Rufus 2.0.618" +CAPTION "Rufus 2.0.619" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -157,7 +157,7 @@ END IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.0.618" +CAPTION "Rufus 2.0.619" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -283,7 +283,7 @@ END IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.0.618" +CAPTION "Rufus 2.0.619" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -415,7 +415,7 @@ END IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.0.618" +CAPTION "Rufus 2.0.619" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -671,8 +671,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,618,0 - PRODUCTVERSION 2,0,618,0 + FILEVERSION 2,0,619,0 + PRODUCTVERSION 2,0,619,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -689,13 +689,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.0.618" + VALUE "FileVersion", "2.0.619" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.0.618" + VALUE "ProductVersion", "2.0.619" END END BLOCK "VarFileInfo" diff --git a/src/stdlg.c b/src/stdlg.c index bb7cc534..6845d008 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -42,7 +42,7 @@ #include "license.h" #include "localization.h" -#if (_WIN32_WINNT >= 0x0600) +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) PF_TYPE_DECL(WINAPI, HRESULT, SHCreateItemFromParsingName, (PCWSTR, IBindCtx*, REFIID, void **)); #endif PF_TYPE_DECL(WINAPI, LPITEMIDLIST, SHSimpleIDListFromPath, (PCWSTR pszPath)); @@ -130,7 +130,7 @@ void BrowseForFolder(void) { BROWSEINFOW bi; LPITEMIDLIST pidl; -#if (_WIN32_WINNT >= 0x0600) // Vista and later +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) WCHAR *wpath; size_t i; HRESULT hr; @@ -248,7 +248,7 @@ char* FileDialog(BOOL save, char* path, const ext_t* ext, DWORD options) BOOL r; char* filepath = NULL; -#if (_WIN32_WINNT >= 0x0600) // Vista and later +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) HRESULT hr = FALSE; IFileDialog *pfd = NULL; IShellItem *psiResult; @@ -261,7 +261,7 @@ char* FileDialog(BOOL save, char* path, const ext_t* ext, DWORD options) return NULL; dialog_showing++; -#if (_WIN32_WINNT >= 0x0600) // Vista and later +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) INIT_VISTA_SHELL32; filter_spec = (COMDLG_FILTERSPEC*)calloc(ext->count + 1, sizeof(COMDLG_FILTERSPEC)); if ((IS_VISTA_SHELL32_AVAILABLE) && (filter_spec != NULL)) { @@ -295,7 +295,7 @@ char* FileDialog(BOOL save, char* path, const ext_t* ext, DWORD options) safe_free(wpath); // Set the default filename - wfilename = utf8_to_wchar((ext->filename == NULL)?ext->extension[0]:ext->filename); + wfilename = utf8_to_wchar((ext->filename == NULL)?"":ext->filename); if (wfilename != NULL) { pfd->lpVtbl->SetFileName(pfd, wfilename); } @@ -347,7 +347,7 @@ fallback: ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hMainDialog; // Selected File name - static_sprintf(selected_name, "%s", (ext->filename == NULL)?ext->extension[0]:ext->filename); + static_sprintf(selected_name, "%s", (ext->filename == NULL)?"":ext->filename); ofn.lpstrFile = selected_name; ofn.nMaxFile = MAX_PATH; // Set the file extension filters @@ -602,7 +602,7 @@ INT_PTR CALLBACK NotificationCallback(HWND hDlg, UINT message, WPARAM wParam, LP ncm.cbSize = sizeof(ncm); // If we're compiling with the Vista SDK or later, the NONCLIENTMETRICS struct // will be the wrong size for previous versions, so we need to adjust it. - #if defined(_MSC_VER) && (_MSC_VER >= 1500) && (WINVER >= 0x0600) + #if defined(_MSC_VER) && (_MSC_VER >= 1500) && (_WIN32_WINNT >= _WIN32_WINNT_VISTA) if (nWindowsVersion >= WINDOWS_VISTA) { // In versions of Windows prior to Vista, the iPaddedBorderWidth member // is not present, so we need to subtract its size from cbSize.