setupapi: Fix a string resource so its format placeholders can be reordered.

dlls/setupapi/dialog.c

@@ -51,9 +51,6 @@ struct promptdisk_params {
 */
 static void promptdisk_init(HWND hwnd, struct promptdisk_params *params)
 {
-    WCHAR format[256];
-    WCHAR message[256];
-
     SetWindowLongPtrW(hwnd, DWLP_USER, (LONG_PTR)params);
 
     if(params->DialogTitle)
@@ -63,20 +60,25 @@ static void promptdisk_init(HWND hwnd, struct promptdisk_params *params)
 
     if(!(params->DiskPromptStyle & IDF_OEMDISK))
     {
+        WCHAR message[256+2*MAX_PATH];
+        WCHAR format[256];
+        WCHAR unknown[256];
+        DWORD_PTR args[2];
         LoadStringW(SETUPAPI_hInstance, IDS_PROMPTDISK, format,
             sizeof(format)/sizeof(format[0]));
 
+        args[0] = (DWORD_PTR)params->FileSought;
         if(params->DiskName)
-            snprintfW(message, sizeof(message)/sizeof(message[0]), format,
-                params->FileSought, params->DiskName);
+            args[1] = (DWORD_PTR)params->DiskName;
         else
         {
-            WCHAR unknown[256];
             LoadStringW(SETUPAPI_hInstance, IDS_UNKNOWN, unknown,
                 sizeof(unknown)/sizeof(unknown[0]));
-            snprintfW(message, sizeof(message)/sizeof(message[0]), format,
-                params->FileSought, unknown);
+            args[1] = (DWORD_PTR)unknown;
         }
+        FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
+                       format, 0, 0, message, sizeof(message)/sizeof(*message),
+                       (__ms_va_list*)args);
         SetDlgItemTextW(hwnd, IDC_FILENEEDED, message);
 
         LoadStringW(SETUPAPI_hInstance, IDS_INFO, message,

dlls/setupapi/setupapi.rc

@@ -25,7 +25,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-        IDS_PROMPTDISK   "The file '%s' on %s is needed"
+        IDS_PROMPTDISK   "The file '%1' on %2 is needed"
         IDS_UNKNOWN      "Unknown"
         IDS_COPYFROM     "Copy files from:"
         IDS_INFO         "Type the path where the file is located, and then click OK."

po/ar.po

@@ -6045,7 +6045,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/bg.po

@@ -6168,7 +6168,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/ca.po

@@ -6114,7 +6114,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Cal el fitxer '%s' en %s"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/cs.po

@@ -6258,7 +6258,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/da.po

@@ -6245,7 +6245,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Filen '%s' fra %s mangler"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/de.po

@@ -6107,7 +6107,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Die Datei '%s' von %s wird benötigt."
 
 #: setupapi.rc:29 ipconfig.rc:31

po/el.po

@@ -6094,7 +6094,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/en.po

@@ -6006,7 +6006,7 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/en_US.po

@@ -6100,8 +6100,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
-msgstr "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
+msgstr "The file '%1' on %2 is needed"
 
 #: setupapi.rc:29 ipconfig.rc:31
 msgid "Unknown"

po/eo.po

@@ -6164,7 +6164,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/es.po

@@ -6425,7 +6425,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "El archivo '%s' en %s es necesario"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/fa.po

@@ -6045,7 +6045,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/fi.po

@@ -6253,7 +6253,7 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/fr.po

@@ -6121,7 +6121,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Le fichier « %s » sur %s est requis"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/he.po

@@ -6313,7 +6313,8 @@ msgid "us"
 msgstr "מ״ש"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "הקובץ '%s' שב־%s דרוש"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/hi.po

@@ -5986,7 +5986,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/hu.po

@@ -6439,7 +6439,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "A(z) '%s' fájl szükséges ezen: %s"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/it.po

@@ -6111,7 +6111,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Il file '%s' su %s è necessario"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/ja.po

@@ -6096,7 +6096,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "ファイル '%s' (%s 上) が必要です。"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/ko.po

@@ -6091,7 +6091,8 @@ msgid "us"
 msgstr "마이크로초"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "이 파일 '%s' 은 %s에서 필요로 합니다"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/lt.po

@@ -6109,7 +6109,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Reikalingas failas „%s“ esantis %s"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/ml.po

@@ -5986,7 +5986,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/nb_NO.po

@@ -6332,7 +6332,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Programmet trenger filen «%s» på %s"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/nl.po

@@ -6212,7 +6212,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Het bestand '%s' op %s is benodigd"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/or.po

@@ -5986,7 +5986,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/pa.po

@@ -5986,7 +5986,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/pl.po

@@ -6114,7 +6114,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Potrzebny plik o nazwie '%s' znajdujący się  na %s"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/pt_BR.po

@@ -6321,7 +6321,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "O arquivo '%s' em %s é necessário"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/pt_PT.po

@@ -6344,7 +6344,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "O ficheiro '%s' em %s é necessário"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/rm.po

@@ -6016,7 +6016,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/ro.po

@@ -6564,7 +6564,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Fișierul '%s' de pe %s este necesitat"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/ru.po

@@ -6102,7 +6102,8 @@ msgid "us"
 msgstr "мкс"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Файл '%s' на %s необходим"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/sk.po

@@ -6084,7 +6084,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/sl.po

@@ -6134,7 +6134,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Zahtevana je datoteka '%s' na %s"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/sr_RS@cyrillic.po

@@ -6352,7 +6352,8 @@ msgid "us"
 msgstr "µс"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "„%s“ датотека на %s је неопходна"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/sr_RS@latin.po

@@ -6387,7 +6387,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "„%s“ datoteka na %s je neophodna"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/sv.po

@@ -6097,7 +6097,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Filen '%s' på %s behövs"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/te.po

@@ -5986,7 +5986,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/th.po

@@ -6089,7 +6089,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/tr.po

@@ -6349,7 +6349,7 @@ msgid "us"
 msgstr "Meşgul"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/uk.po

@@ -6099,7 +6099,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "Файл '%s' на %s потрібний"
 
 #: setupapi.rc:29 ipconfig.rc:31

po/wa.po

@@ -6032,7 +6032,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/wine.pot

@@ -5968,7 +5968,7 @@ msgid "us"
 msgstr ""
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/zh_CN.po

@@ -6301,7 +6301,7 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+msgid "The file '%1' on %2 is needed"
 msgstr ""
 
 #: setupapi.rc:29 ipconfig.rc:31

po/zh_TW.po

@@ -6292,7 +6292,8 @@ msgid "us"
 msgstr "µs"
 
 #: setupapi.rc:28
-msgid "The file '%s' on %s is needed"
+#, fuzzy
+msgid "The file '%1' on %2 is needed"
 msgstr "需要檔案 '%s' 存於 %s"
 
 #: setupapi.rc:29 ipconfig.rc:31