[misc] set rufus-next to 1.3.2

* Also fixed a couple Clang, MSVC Analyzer and MinGW64 warnings

src/dos.c

@@ -419,7 +419,7 @@ BOOL ExtractFreeDOS(const char* path)
 		res_data = (BYTE*)LockResource(res_handle);
 		res_size = SizeofResource(NULL, res);
 
-		safe_strcpy(filename, sizeof(filename), (i<2)?path:locale_path);
+		safe_strcpy(filename, sizeof(filename), ((i<2)?path:locale_path));
 		safe_strcat(filename, sizeof(filename), "\\");
 		safe_strcat(filename, sizeof(filename), res_name[i]);
 

src/rufus.c

@@ -1496,7 +1496,7 @@ void InitDialog(HWND hDlg)
 {
 	HINSTANCE hDllInst;
 	HDC hDC;
-	int i, i16, s16, s32;
+	int i, i16, s16;
 	char tmp[128], *token;
 
 #ifdef RUFUS_TEST
@@ -1524,7 +1524,6 @@ void InitDialog(HWND hDlg)
 	ReleaseDC(hDlg, hDC);
 	// Adjust icon size lookup
 	s16 = i16;
-	s32 = (int)(32.0f*fScale);
 	if (s16 >= 54)
 		s16 = 64;
 	else if (s16 >= 40)
@@ -1533,14 +1532,6 @@ void InitDialog(HWND hDlg)
 		s16 = 32;
 	else if (s16 >= 20)
 		s16 = 24;
-	if (s32 >= 54)
-		s32 = 64;
-	else if (s32 >= 40)
-		s32 = 48;
-	else if (s32 >= 28)
-		s32 = 32;
-	else if (s32 >= 20)
-		s32 = 24;
 
 	// Create the title bar icon
 	SetTitleBarIcon(hDlg);

src/rufus.rc

@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 206, 316
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
-CAPTION "Rufus v1.3.1.225"
+CAPTION "Rufus v1.3.2.226"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,94,278,50,14
@@ -274,8 +274,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,1,225
- PRODUCTVERSION 1,3,1,225
+ FILEVERSION 1,3,2,226
+ PRODUCTVERSION 1,3,2,226
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -292,13 +292,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "1.3.1.225"
+            VALUE "FileVersion", "1.3.2.226"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "(c) 2011-2012 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "1.3.1.225"
+            VALUE "ProductVersion", "1.3.2.226"
         END
     END
     BLOCK "VarFileInfo"

src/stdlg.c

@@ -550,6 +550,8 @@ fallback:
 	// Set the file extension filters
 	ext_strlen = safe_strlen(ext_desc) + 2*safe_strlen(ext) + sizeof(" (*.)\0*.\0All Files (*.*)\0*.*\0\0");
 	ext_string = (char*)malloc(ext_strlen);
+	if (ext_string == NULL)
+		return NULL;
 	safe_sprintf(ext_string, ext_strlen, "%s (*.%s)\r*.%s\rAll Files (*.*)\r*.*\r\0", ext_desc, ext, ext);
 	// Microsoft could really have picked a better delimiter!
 	for (i=0; i<ext_strlen; i++) {

src/syslinux.c

@@ -175,6 +175,8 @@ BOOL InstallSyslinux(DWORD num, const char* drive_name)
 	/* Map the file (is there a better way to do this?) */
 	ldlinux_sectors = (syslinux_ldlinux_len + 2 * ADV_SIZE + SECTOR_SIZE - 1) >> SECTOR_SHIFT;
 	sectors = (libfat_sector_t*) calloc(ldlinux_sectors, sizeof *sectors);
+	if (sectors == NULL)
+		goto out;
 	fs = libfat_open(libfat_readfile, (intptr_t) d_handle);
 	ldlinux_cluster = libfat_searchdir(fs, 0, "LDLINUX SYS", NULL);
 	secp = sectors;

src/vhd.c

@@ -210,6 +210,8 @@ BOOL WimExtractFile(const char* image, int index, const char* src, const char* d
 {
 	if ((!has_wimgapi) && (!has_7z) && (!WimExtractCheck()))
 		return FALSE;
+	if ((image == NULL) || (src == NULL) || (dst == NULL))
+		return FALSE;
 
 	// Prefer 7-Zip as, unsurprisingly, it's faster than the Microsoft way,
 	// but allow fallback if 7-Zip doesn't succeed