From 24392b2fb63da9b318816048e5dd99f8666051e1 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 27 Feb 2014 21:40:12 +0000 Subject: [PATCH] v1.4.5 [TAKE TWO] (build 428) * Fix a missing CloseHandle * Closes #293 --- res/localization/rufus.loc | 60 -------------------------------------- src/drive.c | 6 ++-- src/rufus.rc | 12 ++++---- 3 files changed, 10 insertions(+), 68 deletions(-) diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc index fee13767..50017082 100644 --- a/res/localization/rufus.loc +++ b/res/localization/rufus.loc @@ -436,66 +436,6 @@ t MSG_261 "Writing image: %0.1f%% completed" ############################# TRANSLATOR END COPY ############################## ################################################################################ -l "ar-AR" "Arabic (العربية)" 0x0401 -a "ra" -v 1.0.8 -b "en-US" - -g IDD_DIALOG -t IDS_DEVICE_TXT "جهاز" -t IDS_PARTITION_TYPE_TXT "نوع مخطط التقسيم وهدف النظام" -t IDS_FILESYSTEM_TXT "نظام الملفات" -t IDS_CLUSTERSIZE_TXT "حجم الكتلة" -t IDS_LABEL_TXT "تسمية وحدة التخزين الجديدة" -t IDS_FORMAT_OPTIONS_GRP "خيارات تنسيق " -m IDC_ADVANCED -8,0 -t IDC_BADBLOCKS "تحقق الجهاز لكتل سيئة:" -t IDC_QUICKFORMAT "تهيئة سريعة" -t IDC_BOOT "إنشاء قرص تمهيد باستخدام:" -t IDC_SET_ICON "إنشاء التسمية ورمز ملفات موسعة" -t IDC_ABOUT "حول ..." -t IDC_LOG "ثقيل" -t IDCANCEL "قريب" -t IDC_START "إقلاع" -t IDS_ADVANCED_OPTIONS_GRP "خيارات متقدمة" -t IDC_ENABLE_FIXED_DISKS "محركات الأقراص الصلبة USB قائمة" -t IDC_EXTRA_PARTITION "إصلاحات BIOS القديمة" -t IDC_RUFUS_MBR "استخدام روفوس MBR مع BIOS ID:" - -# About dialog -g IDD_ABOUTBOX -t IDD_ABOUTBOX "Rufus حول" -t IDC_ABOUT_LICENSE "ترخيص" -t IDC_ABOUT_UPDATES "تحديثات" -t IDOK "حسنا" - -t MSG_003 "تحذير: كل البيانات على الجهاز '%s' سيتم تدمير. \n" - "الاستمرار في هذه العملية، انقر فوق موافق. لإنهاء انقر فوق إلغاء الأمر." -t MSG_026 "بايت" -t MSG_027 "كيلو بايت" -t MSG_028 "ميغابايت" - -t MSG_030 "%s (الافتراضي)" -t MSG_034 "%d يمر" -t MSG_035 "%d تمريرات" -t MSG_109 "0x%02X (أسطوانة %d)" -# NOTE: In the line below, there are (potentially) invisible Right-To-Left marks -# (UTF-8: 0xE2 0x80 0x8f) After "USB" and after "Rufus". -t MSG_174 "Rufus‏ - وموثوق USB‏ تنسيق المساعدة" -# This one's a massive empirical fest of RTL marks and nonsensical parenthesis, to -# make the output look about right... If you edit this, all I can say is: GOOD LUCK!!! -t MSG_175 "الإصدار‏ ‏ %d.%d.%d‏)بناء‏ ‏%d‏(" -# NOTE: RTL mark after the ':' -t MSG_176 "ترجمة:‏ هارون الرشيد " -t MSG_177 "البق تقرير أو طلب تعزيزات في:" -t MSG_178 "حقوق الطبع والنشر إضافية:" - -t MSG_208 "%d جهاز تم العثور عليه" -t MSG_209 "%d الأجهزة الموجودة" -t MSG_210 "منجز" -t MSG_211 "ألغي" -t MSG_212 "فشل" - ################################################################################ l "zh-CN" "Chinese Simplified (简体中文)" 0x0804, 0x1004 v 1.0.10 diff --git a/src/drive.c b/src/drive.c index 117c60e2..3e7aa4cf 100644 --- a/src/drive.c +++ b/src/drive.c @@ -306,7 +306,7 @@ static BOOL _GetDriveLettersAndType(DWORD DriveIndex, char* drive_letters, UINT* BOOL r = FALSE; HANDLE hDrive = INVALID_HANDLE_VALUE; UINT _drive_type; - int i = 0; + int i = 0, drive_number; char *drive, drives[26*4]; /* "D:\", "E:\", etc. */ char logical_drive[] = "\\\\.\\#:"; @@ -351,7 +351,9 @@ static BOOL _GetDriveLettersAndType(DWORD DriveIndex, char* drive_letters, UINT* continue; } - if (GetDriveNumber(hDrive, logical_drive) == DriveIndex) { + drive_number = GetDriveNumber(hDrive, logical_drive); + safe_closehandle(hDrive); + if (drive_number == DriveIndex) { r = TRUE; if (drive_letters != NULL) drive_letters[i++] = *drive; diff --git a/src/rufus.rc b/src/rufus.rc index 0b7b23e9..0b11eb95 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 1.4.5.427" +CAPTION "Rufus 1.4.5.428" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 @@ -165,7 +165,7 @@ END RTL_IDD_DIALOG DIALOGEX 12, 12, 206, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 1.4.5.427" +CAPTION "Rufus 1.4.5.428" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 @@ -427,8 +427,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,4,5,427 - PRODUCTVERSION 1,4,5,427 + FILEVERSION 1,4,5,428 + PRODUCTVERSION 1,4,5,428 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -445,13 +445,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.4.5.427" + VALUE "FileVersion", "1.4.5.428" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", " 2011-2014 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.4.5.427" + VALUE "ProductVersion", "1.4.5.428" END END BLOCK "VarFileInfo"