Permalink
Browse files

[misc] fix extraction of non Joliet ISO9660 files

* Closes #82
  • Loading branch information...
1 parent 39fe803 commit 2b87a3778981e96108d4b9f6b2be524ebec2cba6 @pbatard committed May 16, 2012
Showing with 13 additions and 6 deletions.
  1. +7 −0 src/format.c
  2. +6 −6 src/rufus.rc
View
@@ -29,6 +29,7 @@
#include <process.h>
#include <stddef.h>
#include <ctype.h>
+#include <locale.h>
#include "msapi_utf8.h"
#include "rufus.h"
@@ -261,10 +262,16 @@ static BOOL FormatDrive(char DriveLetter)
WCHAR wFSType[32];
WCHAR wLabel[64];
size_t i;
+ char* locale;
wDriveRoot[0] = (WCHAR)DriveLetter;
PrintStatus(0, TRUE, "Formatting...");
+ // LoadLibrary("fmifs.dll") appears to changes the locale, which can lead to
+ // problems with tolower(). Make sure we restore the locale. For more details,
+ // see http://comments.gmane.org/gmane.comp.gnu.mingw.user/39300
+ locale = setlocale(LC_ALL, NULL);
PF_INIT_OR_OUT(FormatEx, fmifs);
+ setlocale(LC_ALL, locale);
GetWindowTextW(hFileSystem, wFSType, ARRAYSIZE(wFSType));
// We may have a " (Default)" trail
View
@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 289
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW
-CAPTION "Rufus v1.2.0.167"
+CAPTION "Rufus v1.2.0.168"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,248,50,14
@@ -71,7 +71,7 @@ BEGIN
DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP
CONTROL "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL,
"SysLink",WS_TABSTOP,46,47,114,9
- LTEXT "Version 1.2.0 (Build 167)",IDC_STATIC,46,19,78,8
+ LTEXT "Version 1.2.0 (Build 168)",IDC_STATIC,46,19,78,8
PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP
EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL
LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@@ -216,8 +216,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,0,167
- PRODUCTVERSION 1,2,0,167
+ FILEVERSION 1,2,0,168
+ PRODUCTVERSION 1,2,0,168
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -234,13 +234,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "akeo.ie"
VALUE "FileDescription", "Rufus"
- VALUE "FileVersion", "1.2.0.167"
+ VALUE "FileVersion", "1.2.0.168"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
- VALUE "ProductVersion", "1.2.0.167"
+ VALUE "ProductVersion", "1.2.0.168"
END
END
BLOCK "VarFileInfo"

0 comments on commit 2b87a37

Please sign in to comment.