[appstore] don't exit on unhandled parameters

* Looks like executables installed from the Windows Store launch with a "/InvokerPRAID"
  added parameter, which of course BREAKS apps that have a defined set of parameters
  and don't except that Microsoft would gingerly add random unwanted stuff there...
* The provision of this extra parameter also appears to be tied to using one of:
  - <TargetDeviceFamily Name="Windows.Universal" ...>
  - <uap:SplashScreen ...>
  - <Application EntryPoint="$targetentrypoint$" ...>
  in the appxmanifest.
* This resulted in our argument processing loop to cause early exit on account that an
  unexpected option was provided.
* Fix this by adding an explicit check for /InvokerPRAID and not exiting on unhandled
  params and removing or altering the 3 appxmanifest options listed above.
* Also set an explicit Windows.FullTrustApplication and remove splash screen.
* Also update _pre-commit.sh to update appstore build number automatically.
* Also remove splash screen images, add store listing CSV and toggle App builds to manual.
* Closes #1690

_pre-commit.sh

@@ -38,7 +38,9 @@ _EOF
 sed -i -e "s/@@BUILD@@/$BUILD/g" cmd.sed
 # Run sed to update the nano version
 sed -b -i -f cmd.sed src/rufus.rc
+sed -b -i -f cmd.sed res/appstore/Package.appxmanifest
 # NB: we need to run git add else the modified files may be ignored
 git add src/rufus.rc
+git add res/appstore/Package.appxmanifest
 
 rm cmd.sed

res/appstore/Package.appxmanifest

@@ -10,7 +10,7 @@
   <Identity
     Name="19453.net.Rufus"
     Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
-    Version="3.13.1730.0" />
+    Version="3.13.1738.0" />
 
   <Properties>
     <DisplayName>Rufus</DisplayName>
@@ -19,7 +19,6 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
     <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.19042.572" />
   </Dependencies>
 
@@ -30,7 +29,7 @@
   <Applications>
     <Application Id="Rufus"
       Executable="rufus\rufus.exe"
-      EntryPoint="$targetentrypoint$">
+      EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
         DisplayName="Rufus"
         Description="Rufus"
@@ -38,7 +37,6 @@
         Square150x150Logo="Images\Square150x150Logo.png"
         Square44x44Logo="Images\Square44x44Logo.png">
         <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png"/>
-        <uap:SplashScreen Image="Images\SplashScreen.png" />
       </uap:VisualElements>
     </Application>
   </Applications>

res/appstore/appstore.listing.csv

@@ -0,0 +1,205 @@
+Field,ID,Type (Type),default,en-us
+Description,2,Text,,"Rufus is a utility that helps format and create bootable USB flash drives.
+
+IMPORTANT: This is an EXPERIMENTAL App Store version. If you have issues, please download Rufus from the official web site.
+
+Official Web site: https://rufus.ie
+Source Code: https://github.com/pbatard/rufus/"
+ReleaseNotes,3,Text,,Release notes: https://github.com/pbatard/rufus/releases
+Title,4,Text,,Rufus
+ShortTitle,5,Text,,
+SortTitle,6,Text,,
+VoiceTitle,7,Text,,
+ShortDescription,8,Text,,
+DevStudio,9,Text,,
+CopyrightTrademarkInformation,12,Text,,© 2011-2021 Pete Batard/Akeo Consulting
+AdditionalLicenseTerms,13,Text,,
+DesktopScreenshot1,100,Relative path (or URL to file in Partner Center),,https://developer.microsoft.com/en-us/dashboard/apps/9PC3H3V7Q9CH/submissions/1152921505693093840/listings/1152922700005959199/listingassets/2000000000082289093
+DesktopScreenshot2,101,Relative path (or URL to file in Partner Center),,
+DesktopScreenshot3,102,Relative path (or URL to file in Partner Center),,
+DesktopScreenshot4,103,Relative path (or URL to file in Partner Center),,
+DesktopScreenshot5,104,Relative path (or URL to file in Partner Center),,
+DesktopScreenshot6,105,Relative path (or URL to file in Partner Center),,
+DesktopScreenshot7,106,Relative path (or URL to file in Partner Center),,
+DesktopScreenshot8,107,Relative path (or URL to file in Partner Center),,
+DesktopScreenshot9,108,Relative path (or URL to file in Partner Center),,
+DesktopScreenshot10,109,Relative path (or URL to file in Partner Center),,
+DesktopScreenshotCaption1,150,Text,,
+DesktopScreenshotCaption2,151,Text,,
+DesktopScreenshotCaption3,152,Text,,
+DesktopScreenshotCaption4,153,Text,,
+DesktopScreenshotCaption5,154,Text,,
+DesktopScreenshotCaption6,155,Text,,
+DesktopScreenshotCaption7,156,Text,,
+DesktopScreenshotCaption8,157,Text,,
+DesktopScreenshotCaption9,158,Text,,
+DesktopScreenshotCaption10,159,Text,,
+MobileScreenshot1,200,Relative path (or URL to file in Partner Center),,
+MobileScreenshot2,201,Relative path (or URL to file in Partner Center),,
+MobileScreenshot3,202,Relative path (or URL to file in Partner Center),,
+MobileScreenshot4,203,Relative path (or URL to file in Partner Center),,
+MobileScreenshot5,204,Relative path (or URL to file in Partner Center),,
+MobileScreenshot6,205,Relative path (or URL to file in Partner Center),,
+MobileScreenshot7,206,Relative path (or URL to file in Partner Center),,
+MobileScreenshot8,207,Relative path (or URL to file in Partner Center),,
+MobileScreenshot9,208,Relative path (or URL to file in Partner Center),,
+MobileScreenshot10,209,Relative path (or URL to file in Partner Center),,
+MobileScreenshotCaption1,250,Text,,
+MobileScreenshotCaption2,251,Text,,
+MobileScreenshotCaption3,252,Text,,
+MobileScreenshotCaption4,253,Text,,
+MobileScreenshotCaption5,254,Text,,
+MobileScreenshotCaption6,255,Text,,
+MobileScreenshotCaption7,256,Text,,
+MobileScreenshotCaption8,257,Text,,
+MobileScreenshotCaption9,258,Text,,
+MobileScreenshotCaption10,259,Text,,
+XboxScreenshot1,300,Relative path (or URL to file in Partner Center),,
+XboxScreenshot2,301,Relative path (or URL to file in Partner Center),,
+XboxScreenshot3,302,Relative path (or URL to file in Partner Center),,
+XboxScreenshot4,303,Relative path (or URL to file in Partner Center),,
+XboxScreenshot5,304,Relative path (or URL to file in Partner Center),,
+XboxScreenshot6,305,Relative path (or URL to file in Partner Center),,
+XboxScreenshot7,306,Relative path (or URL to file in Partner Center),,
+XboxScreenshot8,307,Relative path (or URL to file in Partner Center),,
+XboxScreenshot9,308,Relative path (or URL to file in Partner Center),,
+XboxScreenshot10,309,Relative path (or URL to file in Partner Center),,
+XboxScreenshotCaption1,350,Text,,
+XboxScreenshotCaption2,351,Text,,
+XboxScreenshotCaption3,352,Text,,
+XboxScreenshotCaption4,353,Text,,
+XboxScreenshotCaption5,354,Text,,
+XboxScreenshotCaption6,355,Text,,
+XboxScreenshotCaption7,356,Text,,
+XboxScreenshotCaption8,357,Text,,
+XboxScreenshotCaption9,358,Text,,
+XboxScreenshotCaption10,359,Text,,
+HolographicScreenshot1,400,Relative path (or URL to file in Partner Center),,
+HolographicScreenshot2,401,Relative path (or URL to file in Partner Center),,
+HolographicScreenshot3,402,Relative path (or URL to file in Partner Center),,
+HolographicScreenshot4,403,Relative path (or URL to file in Partner Center),,
+HolographicScreenshot5,404,Relative path (or URL to file in Partner Center),,
+HolographicScreenshot6,405,Relative path (or URL to file in Partner Center),,
+HolographicScreenshot7,406,Relative path (or URL to file in Partner Center),,
+HolographicScreenshot8,407,Relative path (or URL to file in Partner Center),,
+HolographicScreenshot9,408,Relative path (or URL to file in Partner Center),,
+HolographicScreenshot10,409,Relative path (or URL to file in Partner Center),,
+HolographicScreenshotCaption1,450,Text,,
+HolographicScreenshotCaption2,451,Text,,
+HolographicScreenshotCaption3,452,Text,,
+HolographicScreenshotCaption4,453,Text,,
+HolographicScreenshotCaption5,454,Text,,
+HolographicScreenshotCaption6,455,Text,,
+HolographicScreenshotCaption7,456,Text,,
+HolographicScreenshotCaption8,457,Text,,
+HolographicScreenshotCaption9,458,Text,,
+HolographicScreenshotCaption10,459,Text,,
+StoreLogo720x1080,600,Relative path (or URL to file in Partner Center),,
+StoreLogo1080x1080,601,Relative path (or URL to file in Partner Center),,
+StoreLogo300x300,602,Relative path (or URL to file in Partner Center),,https://developer.microsoft.com/en-us/dashboard/apps/9PC3H3V7Q9CH/submissions/1152921505693093840/listings/1152922700005959199/listingassets/2000000000082758754
+OverrideLogosForWin10,603,True/False,,False
+StoreLogoOverride150x150,604,Relative path (or URL to file in Partner Center),,
+StoreLogoOverride71x71,605,Relative path (or URL to file in Partner Center),,
+PromoImage1920x1080,606,Relative path (or URL to file in Partner Center),,
+PromoImage2400x1200,607,Relative path (or URL to file in Partner Center),,
+XboxBrandedKeyArt584x800,608,Relative path (or URL to file in Partner Center),,
+XboxTitledHero1920x1080,609,Relative path (or URL to file in Partner Center),,
+XboxFeaturedPromo1080x1080,610,Relative path (or URL to file in Partner Center),,
+OptionalPromo358x358,611,Relative path (or URL to file in Partner Center),,
+OptionalPromo1000x800,612,Relative path (or URL to file in Partner Center),,
+OptionalPromo414x180,613,Relative path (or URL to file in Partner Center),,
+Feature1,700,Text,,"Format USB, flash card and virtual drives to FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3"
+Feature2,701,Text,,"Create DOS bootable USB drives, using FreeDOS or MS-DOS (Windows 8.1 or earlier)"
+Feature3,702,Text,,"Create BIOS or UEFI bootable drives, including UEFI bootable NTFS"
+Feature4,703,Text,,"Create bootable drives from bootable ISOs (Windows, Linux, etc.)"
+Feature5,704,Text,,"Create bootable drives from bootable disk images, including compressed ones"
+Feature6,705,Text,,Create Windows To Go drives
+Feature7,706,Text,,Create persistent Linux partitions
+Feature8,707,Text,,Download official Microsoft Windows 8 or Windows 10 retail ISOs
+Feature9,708,Text,,"Compute MD5, SHA-1 and SHA-256 checksums of the selected image"
+Feature10,709,Text,,"Twice as fast as Microsoft's USB/DVD tool or UNetbootin, on ISO → USB creation"
+Feature11,710,Text,,"Perform bad blocks checks, including detection of ""fake"" flash drives"
+Feature12,711,Text,,
+Feature13,712,Text,,
+Feature14,713,Text,,
+Feature15,714,Text,,
+Feature16,715,Text,,
+Feature17,716,Text,,
+Feature18,717,Text,,
+Feature19,718,Text,,
+Feature20,719,Text,,
+MinimumHardwareReq1,800,Text,,
+MinimumHardwareReq2,801,Text,,
+MinimumHardwareReq3,802,Text,,
+MinimumHardwareReq4,803,Text,,
+MinimumHardwareReq5,804,Text,,
+MinimumHardwareReq6,805,Text,,
+MinimumHardwareReq7,806,Text,,
+MinimumHardwareReq8,807,Text,,
+MinimumHardwareReq9,808,Text,,
+MinimumHardwareReq10,809,Text,,
+MinimumHardwareReq11,810,Text,,
+RecommendedHardwareReq1,850,Text,,
+RecommendedHardwareReq2,851,Text,,
+RecommendedHardwareReq3,852,Text,,
+RecommendedHardwareReq4,853,Text,,
+RecommendedHardwareReq5,854,Text,,
+RecommendedHardwareReq6,855,Text,,
+RecommendedHardwareReq7,856,Text,,
+RecommendedHardwareReq8,857,Text,,
+RecommendedHardwareReq9,858,Text,,
+RecommendedHardwareReq10,859,Text,,
+RecommendedHardwareReq11,860,Text,,
+SearchTerm1,900,Text,,rufus
+SearchTerm2,901,Text,,iso
+SearchTerm3,902,Text,,bootable
+SearchTerm4,903,Text,,usb
+SearchTerm5,904,Text,,format
+SearchTerm6,905,Text,,flash drive
+SearchTerm7,906,Text,,
+TrailerToPlayAtTopOfListing,999,Relative path (or URL to file in Partner Center),,
+Trailer1,1000,Relative path (or URL to file in Partner Center),,
+Trailer2,1001,Relative path (or URL to file in Partner Center),,
+Trailer3,1002,Relative path (or URL to file in Partner Center),,
+Trailer4,1003,Relative path (or URL to file in Partner Center),,
+Trailer5,1004,Relative path (or URL to file in Partner Center),,
+Trailer6,1005,Relative path (or URL to file in Partner Center),,
+Trailer7,1006,Relative path (or URL to file in Partner Center),,
+Trailer8,1007,Relative path (or URL to file in Partner Center),,
+Trailer9,1008,Relative path (or URL to file in Partner Center),,
+Trailer10,1009,Relative path (or URL to file in Partner Center),,
+Trailer11,1010,Relative path (or URL to file in Partner Center),,
+Trailer12,1011,Relative path (or URL to file in Partner Center),,
+Trailer13,1012,Relative path (or URL to file in Partner Center),,
+Trailer14,1013,Relative path (or URL to file in Partner Center),,
+Trailer15,1014,Relative path (or URL to file in Partner Center),,
+TrailerTitle1,1020,Text,,
+TrailerTitle2,1021,Text,,
+TrailerTitle3,1022,Text,,
+TrailerTitle4,1023,Text,,
+TrailerTitle5,1024,Text,,
+TrailerTitle6,1025,Text,,
+TrailerTitle7,1026,Text,,
+TrailerTitle8,1027,Text,,
+TrailerTitle9,1028,Text,,
+TrailerTitle10,1029,Text,,
+TrailerTitle11,1030,Text,,
+TrailerTitle12,1031,Text,,
+TrailerTitle13,1032,Text,,
+TrailerTitle14,1033,Text,,
+TrailerTitle15,1034,Text,,
+TrailerThumbnail1,1040,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail2,1041,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail3,1042,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail4,1043,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail5,1044,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail6,1045,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail7,1046,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail8,1047,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail9,1048,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail10,1049,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail11,1050,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail12,1051,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail13,1052,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail14,1053,Relative path (or URL to file in Partner Center),,
+TrailerThumbnail15,1054,Relative path (or URL to file in Partner Center),,

res/appstore/appstore.wapproj

@@ -98,6 +98,7 @@
     </AppxManifest>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="appstore.listing.csv" />
     <Content Include="Images\LargeTile.scale-100.png" />
     <Content Include="Images\LargeTile.scale-125.png" />
     <Content Include="Images\LargeTile.scale-150.png" />
@@ -108,11 +109,6 @@
     <Content Include="Images\SmallTile.scale-150.png" />
     <Content Include="Images\SmallTile.scale-200.png" />
     <Content Include="Images\SmallTile.scale-400.png" />
-    <Content Include="Images\SplashScreen.scale-100.png" />
-    <Content Include="Images\SplashScreen.scale-125.png" />
-    <Content Include="Images\SplashScreen.scale-150.png" />
-    <Content Include="Images\SplashScreen.scale-200.png" />
-    <Content Include="Images\SplashScreen.scale-400.png" />
     <Content Include="Images\Square150x150Logo.scale-100.png" />
     <Content Include="Images\Square150x150Logo.scale-125.png" />
     <Content Include="Images\Square150x150Logo.scale-150.png" />

rufus.sln

@@ -215,29 +215,13 @@ Global
 		{B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|x86.ActiveCfg = Release|Win32
 		{B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|x86.Build.0 = Release|Win32
 		{9440518F-38FE-43D9-9151-A26618E8C978}.Debug|arm.ActiveCfg = Debug|ARM
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Debug|arm.Build.0 = Debug|ARM
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Debug|arm.Deploy.0 = Debug|ARM
 		{9440518F-38FE-43D9-9151-A26618E8C978}.Debug|arm64.ActiveCfg = Debug|ARM64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Debug|arm64.Build.0 = Debug|ARM64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Debug|arm64.Deploy.0 = Debug|ARM64
 		{9440518F-38FE-43D9-9151-A26618E8C978}.Debug|x64.ActiveCfg = Debug|x64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Debug|x64.Build.0 = Debug|x64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Debug|x64.Deploy.0 = Debug|x64
 		{9440518F-38FE-43D9-9151-A26618E8C978}.Debug|x86.ActiveCfg = Debug|x86
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Debug|x86.Build.0 = Debug|x86
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Debug|x86.Deploy.0 = Debug|x86
 		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|arm.ActiveCfg = Release|ARM
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|arm.Build.0 = Release|ARM
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|arm.Deploy.0 = Release|ARM
 		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|arm64.ActiveCfg = Release|ARM64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|arm64.Build.0 = Release|ARM64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|arm64.Deploy.0 = Release|ARM64
 		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|x64.ActiveCfg = Release|x64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|x64.Build.0 = Release|x64
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|x64.Deploy.0 = Release|x64
 		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|x86.ActiveCfg = Release|x86
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|x86.Build.0 = Release|x86
-		{9440518F-38FE-43D9-9151-A26618E8C978}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/rufus.c

@@ -120,7 +120,7 @@ BOOL advanced_mode_device, advanced_mode_format, allow_dual_uefi_bios, detect_fa
 BOOL use_fake_units, preserve_timestamps = FALSE, fast_zeroing = FALSE, app_changed_size = FALSE;
 BOOL zero_drive = FALSE, list_non_usb_removable_drives = FALSE, enable_file_indexing, large_drive = FALSE;
 BOOL write_as_image = FALSE, write_as_esp = FALSE, installed_uefi_ntfs = FALSE, use_vds = FALSE, ignore_boot_marker = FALSE;
-BOOL windows_to_go_selected = FALSE;
+BOOL windows_to_go_selected = FALSE, appstore_version = FALSE;
 float fScale = 1.0f;
 int dialog_showing = 0, selection_default = BT_IMAGE, persistence_unit_selection = -1;
 int default_fs, fs_type, boot_type, partition_type, target_type; // file system, boot type, partition type, target type
@@ -3101,6 +3101,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	HDC hDC;
 	MSG msg;
 	struct option long_options[] = {
+		{"appstore",   no_argument,       NULL, 'a'},
 		{"extra-devs", no_argument,       NULL, 'x'},
 		{"gui",        no_argument,       NULL, 'g'},
 		{"help",       no_argument,       NULL, 'h'},
@@ -3145,13 +3146,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	// We have to process the arguments before we acquire the lock and process the locale
 	PF_INIT(__wgetmainargs, Msvcrt);
 	if (pf__wgetmainargs != NULL) {
+		BOOL list_params = TRUE; // TODO: Remove this once we've seen more from AppStore
 		pf__wgetmainargs(&argc, &wargv, &wenv, 1, &si);
 		argv = (char**)calloc(argc, sizeof(char*));
 		if (argv != NULL) {
 			// Non getopt parameter check
 			for (i = 0; i < argc; i++) {
 				argv[i] = wchar_to_utf8(wargv[i]);
-				// Check for " /W" (wait for mutex release for pre 1.3.3 versions)
+				// Check for "/W" (wait for mutex release for pre 1.3.3 versions)
 				if (strcmp(argv[i], "/W") == 0)
 					wait_for_mutex = 150;	// Try to acquire the mutex for 15 seconds
 				// We need to find if we need to disable the hogger BEFORE we start
@@ -3159,6 +3161,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 				// on the commandline then, which the hogger makes more intuitive.
 				if ((strcmp(argv[i], "-g") == 0) || (strcmp(argv[i], "--gui") == 0))
 					disable_hogger = TRUE;
+				// Check for "/InvokerPRAID", which is *STUPIDLY* added by Microsoft
+				// when starting an app that was installed from the Windows store...
+				if ((stricmp(argv[i], "/InvokerPRAID") == 0) || (strcmp(argv[i], "-a") == 0) ||
+					(strcmp(argv[i], "--appstore") == 0)) {
+					uprintf("AppStore version detected");
+					appstore_version = TRUE;
+					goto skip_args_processing;
+				}
 			}
 			// If our application name contains a 'p' (for "portable") create a 'rufus.ini'
 			// NB: argv[0] is populated in the previous loop
@@ -3173,6 +3183,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 			if (!disable_hogger) {
 				// Reattach the console, if we were started from commandline
 				if (AttachConsole(ATTACH_PARENT_PROCESS) != 0) {
+					uprintf("Enabling console line hogger");
 					attached_console = TRUE;
 					IGNORE_RETVAL(freopen("CONIN$", "r", stdin));
 					IGNORE_RETVAL(freopen("CONOUT$", "w", stdout));
@@ -3182,11 +3193,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 				}
 			}
 
-			while ((opt = getopt_long(argc, argv, "?xghf:i:w:l:", long_options, &option_index)) != EOF) {
+			while ((opt = getopt_long(argc, argv, "xghf:i:w:l:", long_options, &option_index)) != EOF) {
 				switch (opt) {
 				case 'x':
 					enable_HDDs = TRUE;
 					break;
+				case 'a':
 				case 'g':
 					// No need to reprocess that option
 					break;
@@ -3227,18 +3239,26 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 				case 'w':
 					wait_for_mutex = atoi(optarg);
 					break;
-				case '?':
 				case 'h':
-				default:
 					PrintUsage(argv[0]);
 					goto out;
+				// getopt_long returns '?' for any option it doesn't recognize
+				default:
+					list_params = TRUE;
+					break;
 				}
 			}
+			if (list_params) {
+				uprintf("Command line arguments:");
+				for (i = 1; i < argc; i++)
+					uprintf(argv[i]);
+			}
 		}
 	} else {
 		uprintf("Could not access UTF-16 args");
 	}
 
+skip_args_processing:
 	// Retrieve various app & system directories
 	if (GetCurrentDirectoryU(sizeof(app_dir), app_dir) == 0) {
 		uprintf("Could not get current directory: %s", WindowsErrorString());
@@ -3379,14 +3399,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		Sleep(100);
 		mutex = CreateMutexA(NULL, TRUE, "Global/" APPLICATION_NAME);
 	}
-	//if ((mutex == NULL) || (GetLastError() == ERROR_ALREADY_EXISTS)) {
+	if ((mutex == NULL) || (GetLastError() == ERROR_ALREADY_EXISTS)) {
-	//	// Load the translation before we print the error
+		// Load the translation before we print the error
-	//	get_loc_data_file(loc_file, selected_locale);
+		get_loc_data_file(loc_file, selected_locale);
-	//	right_to_left_mode = ((selected_locale->ctrl_id) & LOC_RIGHT_TO_LEFT);
+		right_to_left_mode = ((selected_locale->ctrl_id) & LOC_RIGHT_TO_LEFT);
-	//	// Set MB_SYSTEMMODAL to prevent Far Manager from stealing focus...
+		// Set MB_SYSTEMMODAL to prevent Far Manager from stealing focus...
-	//	MessageBoxExU(NULL, lmprintf(MSG_002), lmprintf(MSG_001), MB_ICONSTOP|MB_IS_RTL|MB_SYSTEMMODAL, selected_langid);
+		MessageBoxExU(NULL, lmprintf(MSG_002), lmprintf(MSG_001), MB_ICONSTOP|MB_IS_RTL|MB_SYSTEMMODAL, selected_langid);
-	//	goto out;
+		goto out;
-	//}
+	}
 
 	// Save instance of the application for further reference
 	hMainInstance = hInstance;

src/rufus.rc

@@ -1,7 +1,5 @@
 // Microsoft Visual C++ generated resource script.
 //
-#pragma code_page(65001)
-
 #include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -35,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.14.1737"
+CAPTION "Rufus 3.14.1738"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -397,8 +395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,14,1737,0
+ FILEVERSION 3,14,1738,0
- PRODUCTVERSION 3,14,1737,0
+ PRODUCTVERSION 3,14,1738,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -416,13 +414,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.14.1737"
+            VALUE "FileVersion", "3.14.1738"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.14.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.14.1737"
+            VALUE "ProductVersion", "3.14.1738"
         END
     END
     BLOCK "VarFileInfo"