[wue] filter out '&' characters as part of a username

* Closes #2991.
* Also factorize the list of characters we filter between wue.c and stdlg.c.

Author: pbatard

src/rufus.h

@@ -150,6 +150,11 @@
 #endif
 #define SYMBOL_SERVER_USER_AGENT    "Microsoft-Symbol-Server/10.0.22621.755"
 #define DEFAULT_ESP_MOUNT_POINT     "S:\\"
+// Per https://learn.microsoft.com/en-us/windows-hardware/customize/desktop/unattend/microsoft-windows-shell-setup-useraccounts-localaccounts-localaccount-name
+// and https://learn.microsoft.com/en-us/previous-versions/cc722458(v=technet.10)#user-name-policies
+// Add '.' to the list because some folks also reported an issue with local accounts that have dots.
+// Also add '&', even as it could be escaped, as it's just not worth the trouble...
+#define USERNAME_INVALID_CHARS      "/\\[]:;|=.,+*?<>%@&\""
 #define IS_POWER_OF_2(x)            ((x != 0) && (((x) & ((x) - 1)) == 0))
 #define IGNORE_RETVAL(expr)         do { (void)(expr); } while(0)
 #ifndef ARRAYSIZE

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 4.15.2383"
+CAPTION "Rufus 4.15.2384"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -409,8 +409,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,15,2383,0
- PRODUCTVERSION 4,15,2383,0
+ FILEVERSION 4,15,2384,0
+ PRODUCTVERSION 4,15,2384,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -428,13 +428,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "4.15.2383"
+            VALUE "FileVersion", "4.15.2384"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "� 2011-2026 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-4.15.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "4.15.2383"
+            VALUE "ProductVersion", "4.15.2384"
         END
     END
     BLOCK "VarFileInfo"

src/stdlg.c

@@ -845,8 +845,7 @@ static INT_PTR CALLBACK SelectionCallback(HWND hDlg, UINT message, WPARAM wParam
 {
 	// This "Mooo" is designed to give us enough space for a regular username length
 	static const char* base_username = "MOOOOOOOOOOO";	// 🐮
-	// https://learn.microsoft.com/en-us/previous-versions/cc722458(v=technet.10)#user-name-policies
-	static const char* username_invalid_chars = "/\\[]:;|=,+*?<>\"";
+	static const char* username_invalid_chars = USERNAME_INVALID_CHARS;
 	// Prevent resizing
 	static const LRESULT disabled[9] = { HTLEFT, HTRIGHT, HTTOP, HTBOTTOM, HTSIZE,
 		HTTOPLEFT, HTTOPRIGHT, HTBOTTOMLEFT, HTBOTTOMRIGHT };

src/wue.c

@@ -347,9 +347,7 @@ char* CreateUnattendXml(int arch, int flags)
 					uprintf("WARNING: '%s' is not allowed as local account name - Option ignored", unattend_username);
 				} else if (unattend_username[0] != 0) {
 					char* org_username = safe_strdup(unattend_username);
-					// Per https://learn.microsoft.com/en-us/windows-hardware/customize/desktop/unattend/microsoft-windows-shell-setup-useraccounts-localaccounts-localaccount-name
-					// Add '.' to the list because some folks also reported an issue with local accounts that have dots...
-					filter_chars(unattend_username, "/\\[]:|<>+=;,?*%@.", '_');
+					filter_chars(unattend_username, USERNAME_INVALID_CHARS, '_');
 					uprintf("• Use '%s' for local account name", unattend_username);
 					if (strcmp(org_username, unattend_username) != 0)
 						uprintf("WARNING: Local account name contained unallowed characters and has been sanitized");