v3.0 (build 1303)

* Fix a 64-bit compilation warning
* Fix appx generation

ChangeLog.txt

@@ -1,4 +1,4 @@
-o Version 3.0 (2018.??.??)
+o Version 3.0 (2018.05.29)
     UI redesign to follow the flow of user operations (with thanks to Fahad Al-Riyami for the concept)
     Drop XP and Vista platform support
     Switch all downloads to SSL and use https://rufus.ie as the new base URL

res/appstore/AppxManifest.xml

@@ -8,9 +8,9 @@
        for an interesting struggle, when you also happen to have a comma in one of the fields... -->
   <Identity
    Name="Rufus"
-   Version="3.0.1213.0"
+   Version="3.0.1303.0"
    ProcessorArchitecture="x86"
-   Publisher='CN=Akeo Consulting, O=Akeo Consulting, STREET="24, Grey Rock", L=Milford, S=Co Donegal, PostalCode=Co Donegal, C=IE' />
+   Publisher='CN=Akeo Consulting, O=Akeo Consulting, STREET=24 Grey Rock, L=Milford, S=Co. Donegal, PostalCode=F92 D667, C=IE' />
     <Properties>
       <DisplayName>Rufus</DisplayName>
       <PublisherDisplayName>Akeo Consulting</PublisherDisplayName>

res/appstore/packme.cmd

@@ -8,10 +8,10 @@ del /q *.appx >NUL 2>&1
 rem As per the link below, you need "altform-unplated" icons and run MakePri to get transparent icons:
 rem https://social.msdn.microsoft.com/Forums/windowsapps/en-US/dc505f68-d120-43e3-a9e1-d7c77746d588/uwpdesktop-bridgeunplated-taskbar-icons-in-desktop-bridge-apps
 mkdir Assets >NUL 2>&1
-copy "..\icon-set\rufus-44.png"  "Assets\Square44x44Logo.png"
+copy "..\icons\rufus-44.png"  "Assets\Square44x44Logo.png"
-copy "..\icon-set\rufus-48.png"  "Assets\Square44x44Logo.targetsize-48.png"
+copy "..\icons\rufus-48.png"  "Assets\Square44x44Logo.targetsize-48.png"
-copy "..\icon-set\rufus-48.png"  "Assets\Square44x44Logo.targetsize-48_altform-unplated.png"
+copy "..\icons\rufus-48.png"  "Assets\Square44x44Logo.targetsize-48_altform-unplated.png"
-copy "..\icon-set\rufus-150.png" "Assets\Square150x150Logo.png"
+copy "..\icons\rufus-150.png" "Assets\Square150x150Logo.png"
 copy "..\..\rufus-%VERSION%.exe" "rufus.exe"
 "C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\MakePri" createconfig /o /dq en-US /cf priconfig.xml
 "C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\MakePri" new /o /pr . /cf priconfig.xml

res/localization/rufus.loc

@@ -3210,7 +3210,7 @@ t MSG_297 "Otkrivena skraćena ISO datoteka"
 t MSG_298 "ISO datoteka koju ste odabrali ne odgovara deklariranoj veličini: %s podataka nedostaje!\n\n"
 	"Ako ste ovu datoteku preuzeli na internetu, pokušajte preuzeti novu kopiju i proverite da su MD5 ili SHA "
 	"kontrolni zbrojevi identični kao u originalu.\n\nRufus može provjeriti MD5 ili SHA pritiskom na (✓) tipku."
-t MSG_299 "Pogreška kod potvrđivanja vremenske oznake" 
+t MSG_299 "Pogreška kod potvrđivanja vremenske oznake"
 t MSG_300 "Rufus nije mogao potvrditi da je vremenska oznaka preuzetog ažuriranja novija od iste oznake "
 	"u trenutnoj verziji.\n\nS ciljem sprječavanja mogućih eksploatacija sustava, postupak ažuriranja je obustavljen "
 	"te se preuzeta datoteka uklanja. Više informacija možete pronaći u zapisniku."
@@ -3690,7 +3690,7 @@ t IDS_DRIVE_PROPERTIES_TXT "Drev Indstillinger"
 t IDS_DEVICE_TXT "Enhed"
 t IDS_BOOT_SELECTION_TXT "Opstartstype"
 t IDC_SELECT "Valg"
-t IDS_IMAGE_OPTION_TXT "Billedevalg" 
+t IDS_IMAGE_OPTION_TXT "Billedevalg"
 t IDS_PARTITION_TYPE_TXT "Partitionsordning"
 t IDS_TARGET_SYSTEM_TXT "Målsystem"
 t IDS_FILE_SYSTEM_TXT "Filsystem"
@@ -4123,13 +4123,13 @@ b "en-US"
 
 # Main dialog
 g IDD_DIALOG
-t IDS_DRIVE_PROPERTIES_TXT "Drive Eigenschappen" 
+t IDS_DRIVE_PROPERTIES_TXT "Drive Eigenschappen"
 t IDS_DEVICE_TXT "Apparaat"
 t IDS_BOOT_SELECTION_TXT "Opstart type"
 t IDC_SELECT "Selecteer"
 t IDS_IMAGE_OPTION_TXT "Image Optie"
 t IDS_PARTITION_TYPE_TXT "Partitie-indeling en type doelsysteem"
-t IDS_TARGET_SYSTEM_TXT "Doel systeem" 
+t IDS_TARGET_SYSTEM_TXT "Doel systeem"
 t IDS_FILE_SYSTEM_TXT "Bestandssysteem"
 t IDS_CLUSTER_SIZE_TXT "Clustergrootte"
 t IDS_LABEL_TXT "Nieuw volumelabel"
@@ -4376,7 +4376,7 @@ t MSG_159 "Gebruik dit veld om de drive naam in te stellen.\nInternationale teke
 t MSG_160 "Wissel naar geavanceerde opties"
 t MSG_161 "Controleer het apparaat op slechte blokken tijdens een testpatroon"
 t MSG_162 "Uitvinken om een \"langzamere\" formatteer methode te gebruiken"
-t MSG_163 "Methode die wordt gebruikt om partities te maken" 
+t MSG_163 "Methode die wordt gebruikt om partities te maken"
 t MSG_164 "Gebruikte methode om de drive opstartbaar te maken"
 t MSG_165 "Klik om een image te selecteren..."
 t MSG_166 "Vink aan om internationale labels te zien en een apparaat\n"
@@ -6098,7 +6098,7 @@ t MSG_122 "Απόκρυψη %s"
 
 # Tooltips
 t MSG_150 "Επιλέξτε τον τύπο του υπολογιστή που θα χρησιμοποιήσετε μετά, για την εγκατάσταση του περιεχομένου του δίσκου με δυνατότητα εκκίνησης. "
-	"Είναι δική σας αρμοδιότητα να γνωρίζετε άν θέλετε να προβείτε σε εγκατάσταση σε BIOS ή UEFI. " 
+	"Είναι δική σας αρμοδιότητα να γνωρίζετε άν θέλετε να προβείτε σε εγκατάσταση σε BIOS ή UEFI. "
 	"Μια λάθος επιλογή μπορεί να κάνει την συσκευή να μη λειτουργεί στο συγκεκριμένο σύστημα."
 t MSG_151 "Άν επιλέξετε 'UEFI-CSM' η συσκευή θα μιμηθεί την εκκίνηση για BIOS εντός UEFI (όχι native)"
 t MSG_152 "Άν επιλέξετε 'εκτός από CSM' η συσκευή θα τρέχει μόνο σε UEFI συστήματα (native)"
@@ -8789,7 +8789,7 @@ t MSG_100 "이 ISO 이미지는 FAT 또는 FAT32 파일 시스템에 허용되
 	"더 큰 파일이 포함되어 있습니다."
 t MSG_101 "WIM 이미지 지원 안 함"
 t MSG_102 "이 플랫폼은 WIM 아카이브에서 파일을 추출 할 수 없습니다. WIM에서 추출하려면 "
-	"EFI 부팅 가능한 Windows 7 및 Windows Vista의 USB 드라이브를 생성해야합니다.\n" 
+	"EFI 부팅 가능한 Windows 7 및 Windows Vista의 USB 드라이브를 생성해야합니다.\n"
 	"최신 버전의 7-Zip으로 이 문제를 해결할 수 있습니다.\n지금 7-ZIP을 다운로드 하시겠습니까?"
 t MSG_103 "%s 다운로드?"
 t MSG_104 "%s과 그 이후의 버전의 설치에는 '%s' 파일이 필요합니다.\n"
@@ -9736,7 +9736,7 @@ t MSG_117 "Standartinė Windows įdiegtis"
 t MSG_119 "išsamias disko ypatybes"
 t MSG_120 "išsamias formatavimo parinktis"
 t MSG_121 "Rodyti %s"
-t MSG_122 "Slėpti %s"	
+t MSG_122 "Slėpti %s"
 # Tooltips
 # Partition Scheme and Target Type
 t MSG_150 "Paprastai saugiausias pasirinkimas. Bet jei turite UEFI kompiuterį ir norite įdiegti "
@@ -12672,7 +12672,7 @@ t MSG_275 "A imagem selecionada é uma imagem 'ISOHybrid'. Isto significa que po
 	"Selecione o modo que realmente pretende para escrever esta imagem:"
 t MSG_276 "Escrever no modo %s (Recomendado)"
 t MSG_277 "Escrever no modo %s"
-t MSG_278 "A verificar processos em conflito..." 
+t MSG_278 "A verificar processos em conflito..."
 t MSG_279 "Não inicializável"
 t MSG_280 "Disco ou imagem ISO"
 t MSG_281 "%s (Por favor, selecione)"
@@ -15351,7 +15351,7 @@ t MSG_302 "Mostrar información de la aplicación"
 t MSG_303 "Mostrar el registro"
 t MSG_304 "Crear una imagen de disco del dispositivo seleccionado"
 t MSG_305 "Use esta opción para indicar si desea usar este dispositivo para instalar Windows en otro disco, "
-	"o si quiere ejecutar Windows directamente desde esta unidad (Windows To Go)." 
+	"o si quiere ejecutar Windows directamente desde esta unidad (Windows To Go)."
 
 ################################################################################
 l "sv-SE" "Swedish (Svenska)" 0x041d, 0x081d

src/rufus.c

@@ -2381,7 +2381,7 @@ static void PositionControls(HWND hDlg)
 	SendMessage(hSaveToolbar, TB_GETIDEALSIZE, (WPARAM)FALSE, (LPARAM)&sz);
 	SendMessage(hSaveToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(sz.cx, ddbh));
 	// Microsoft, how I loathe thee!!!
-	padding = SendMessage(hSaveToolbar, TB_GETPADDING, 0, 0);
+	padding = (DWORD) SendMessage(hSaveToolbar, TB_GETPADDING, 0, 0);
 	sz.cx = padding & 0xFFFF;
 	sz.cy = padding >> 16;
 	SendMessage(hSaveToolbar, TB_SETPADDING, 0, MAKELPARAM(sz.cx + 3, sz.cy + 2));
@@ -2393,7 +2393,7 @@ static void PositionControls(HWND hDlg)
 	MapWindowPoints(NULL, hDlg, (POINT*)&rc, 2);
 	SendMessage(hHashToolbar, TB_GETIDEALSIZE, (WPARAM)FALSE, (LPARAM)&sz);
 	SendMessage(hHashToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(sz.cx, ddbh));
-	padding = SendMessage(hHashToolbar, TB_GETPADDING, 0, 0);
+	padding = (DWORD) SendMessage(hHashToolbar, TB_GETPADDING, 0, 0);
 	sz.cx = padding & 0xFFFF;
 	sz.cy = padding >> 16;
 	SendMessage(hHashToolbar, TB_SETPADDING, 0, MAKELPARAM(sz.cx + 3, sz.cy + 2));

src/rufus.rc

@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.0.1302"
+CAPTION "Rufus 3.0.1303"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -389,8 +389,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,1302,0
+ FILEVERSION 3,0,1303,0
- PRODUCTVERSION 3,0,1302,0
+ PRODUCTVERSION 3,0,1303,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -407,13 +407,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.0.1302"
+            VALUE "FileVersion", "3.0.1303"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.0.1302"
+            VALUE "ProductVersion", "3.0.1303"
         END
     END
     BLOCK "VarFileInfo"