From eb9e5ab8994179ca514de3ff2e316f82513037a7 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 22 Jan 2015 23:09:44 +0000 Subject: [PATCH] [loc] fix memory leak introduced by removal of separate progress dialog * Commit a327bb114c742c943de13ed3092508f726cd6acb * Also fix typo in French translation --- res/localization/rufus.loc | 5 ++--- src/resource.h | 24 ++++++++++++------------ src/rufus.rc | 16 ++++++++-------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc index 170f9d41..fa96a1a4 100644 --- a/res/localization/rufus.loc +++ b/res/localization/rufus.loc @@ -4046,9 +4046,8 @@ t IDCANCEL "Fermer" t IDC_START "Démarrer" m IDC_START +5,0 s IDC_START -2,0 -m ICANCEL +2,0 -s ICANCEL -2,0 -m IDC_LOG -2,0 +m IDCANCEL +2,0 +s IDCANCEL -2,0 t IDS_ADVANCED_OPTIONS_GRP "Options avancées" t IDC_ENABLE_FIXED_DISKS "Lister les disques durs USB" t IDC_EXTRA_PARTITION "Ajouter les options de compatibilité pour vieux BIOS" diff --git a/src/resource.h b/src/resource.h index 8b804f88..137789c4 100644 --- a/src/resource.h +++ b/src/resource.h @@ -6,9 +6,9 @@ #define IDD_ABOUTBOX 102 #define IDD_NOTIFICATION 103 #define IDD_LICENSE 104 -#define IDD_LOG 106 -#define IDD_UPDATE_POLICY 107 -#define IDD_NEW_VERSION 108 +#define IDD_LOG 105 +#define IDD_UPDATE_POLICY 106 +#define IDD_NEW_VERSION 107 #define IDI_ICON 110 #define IDI_UP 111 #define IDI_DOWN 112 @@ -16,23 +16,23 @@ #define IDD_ABOUTBOX_XP 152 #define IDD_NOTIFICATION_XP 153 #define IDD_LICENSE_XP 154 -#define IDD_LOG_XP 156 -#define IDD_UPDATE_POLICY_XP 157 -#define IDD_NEW_VERSION_XP 158 +#define IDD_LOG_XP 155 +#define IDD_UPDATE_POLICY_XP 156 +#define IDD_NEW_VERSION_XP 157 #define IDD_DIALOG_RTL 201 #define IDD_ABOUTBOX_RTL 202 #define IDD_NOTIFICATION_RTL 203 #define IDD_LICENSE_RTL 204 -#define IDD_LOG_RTL 206 -#define IDD_UPDATE_POLICY_RTL 207 -#define IDD_NEW_VERSION_RTL 208 +#define IDD_LOG_RTL 205 +#define IDD_UPDATE_POLICY_RTL 206 +#define IDD_NEW_VERSION_RTL 207 #define IDD_DIALOG_RTL_XP 251 #define IDD_ABOUTBOX_RTL_XP 252 #define IDD_NOTIFICATION_RTL_XP 253 #define IDD_LICENSE_RTL_XP 254 -#define IDD_LOG_RTL_XP 256 -#define IDD_UPDATE_POLICY_RTL_XP 257 -#define IDD_NEW_VERSION_RTL_XP 258 +#define IDD_LOG_RTL_XP 255 +#define IDD_UPDATE_POLICY_RTL_XP 256 +#define IDD_NEW_VERSION_RTL_XP 257 #define IDR_FD_COMMAND_COM 300 #define IDR_FD_KERNEL_SYS 301 #define IDR_FD_DISPLAY_EXE 302 diff --git a/src/rufus.rc b/src/rufus.rc index 079ba36e..6765b78f 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.0.582" +CAPTION "Rufus 2.0.0.583" 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.0.582" +CAPTION "Rufus 2.0.0.583" 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.0.582" +CAPTION "Rufus 2.0.0.583" 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.0.582" +CAPTION "Rufus 2.0.0.583" 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,0,582 - PRODUCTVERSION 2,0,0,582 + FILEVERSION 2,0,0,583 + PRODUCTVERSION 2,0,0,583 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.0.582" + VALUE "FileVersion", "2.0.0.583" 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.0.582" + VALUE "ProductVersion", "2.0.0.583" END END BLOCK "VarFileInfo"