From 66b06a499d97338dc5ef0b5c4c78b107d577ced8 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sat, 19 Nov 2011 15:11:58 +0100 Subject: [PATCH] ipconfig: Fix the string resources so their format placeholders can be reordered. --- po/ar.po | 2 +- po/bg.po | 2 +- po/ca.po | 3 ++- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 3 ++- po/el.po | 2 +- po/en.po | 4 ++-- po/en_US.po | 4 ++-- po/eo.po | 2 +- po/es.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 3 ++- po/he.po | 3 ++- po/hi.po | 2 +- po/hu.po | 2 +- po/it.po | 3 ++- po/ja.po | 3 ++- po/ko.po | 3 ++- po/lt.po | 3 ++- po/ml.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 3 ++- po/or.po | 2 +- po/pa.po | 2 +- po/pl.po | 3 ++- po/pt_BR.po | 2 +- po/pt_PT.po | 2 +- po/rm.po | 2 +- po/ro.po | 2 +- po/ru.po | 3 ++- po/sk.po | 2 +- po/sl.po | 3 ++- po/sr_RS@cyrillic.po | 3 ++- po/sr_RS@latin.po | 2 +- po/sv.po | 3 ++- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/uk.po | 3 ++- po/wa.po | 2 +- po/wine.pot | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- programs/ipconfig/ipconfig.c | 27 ++++++++++++++------------- programs/ipconfig/ipconfig.rc | 2 +- 47 files changed, 77 insertions(+), 61 deletions(-) diff --git a/po/ar.po b/po/ar.po index daee0232265..02b435f78f7 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8389,7 +8389,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/bg.po b/po/bg.po index 7157400f2bf..9788cdb40d5 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8510,7 +8510,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/ca.po b/po/ca.po index f1431191a5f..8539def48a1 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8823,7 +8823,8 @@ msgstr "" "especificats\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s adaptador %s\n" #: ipconfig.rc:30 diff --git a/po/cs.po b/po/cs.po index 72edd811d0d..3647a6924b2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8891,7 +8891,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/da.po b/po/da.po index fa45f385a2f..eb5566b3679 100644 --- a/po/da.po +++ b/po/da.po @@ -8925,7 +8925,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/de.po b/po/de.po index 7691ed7246a..3df56e73a48 100644 --- a/po/de.po +++ b/po/de.po @@ -8833,7 +8833,8 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "Fehler: Unbekannte oder ungültige Kommandozeilenparameter angegeben\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s Adapter %s\n" #: ipconfig.rc:30 diff --git a/po/el.po b/po/el.po index 8a42fa0791c..5b48a1c8621 100644 --- a/po/el.po +++ b/po/el.po @@ -8414,7 +8414,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/en.po b/po/en.po index 14beab75ac7..3168e9691db 100644 --- a/po/en.po +++ b/po/en.po @@ -8604,8 +8604,8 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "Error: Unknown or invalid command line parameters specified\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" -msgstr "%s adapter %s\n" +msgid "%1 adapter %2\n" +msgstr "%1 adapter %2\n" #: ipconfig.rc:30 msgid "Ethernet" diff --git a/po/en_US.po b/po/en_US.po index 258141738d5..2132c723eca 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -8753,8 +8753,8 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "Error: Unknown or invalid command line parameters specified\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" -msgstr "%s adapter %s\n" +msgid "%1 adapter %2\n" +msgstr "%1 adapter %2\n" #: ipconfig.rc:30 msgid "Ethernet" diff --git a/po/eo.po b/po/eo.po index 7cfe14a01c5..90a13758a7d 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8523,7 +8523,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/es.po b/po/es.po index 29674f03eeb..ad5697a96e0 100644 --- a/po/es.po +++ b/po/es.po @@ -9127,7 +9127,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/fa.po b/po/fa.po index 91def36b4e0..66e5b3dc79c 100644 --- a/po/fa.po +++ b/po/fa.po @@ -8391,7 +8391,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/fi.po b/po/fi.po index 3f72921a008..080d6e06e29 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8621,7 +8621,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/fr.po b/po/fr.po index 2921b5c39eb..bf5f0801787 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8856,7 +8856,8 @@ msgstr "" "invalides\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "Adaptateur %s %s\n" #: ipconfig.rc:30 diff --git a/po/he.po b/po/he.po index f9f0ca256b2..21fbd5db12a 100644 --- a/po/he.po +++ b/po/he.po @@ -8822,7 +8822,8 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "Error: Unknown or invalid command line parameters specified\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s adapter %s\n" #: ipconfig.rc:30 diff --git a/po/hi.po b/po/hi.po index b7b134005dd..89e6369ca09 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8290,7 +8290,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/hu.po b/po/hu.po index 0634a1c50f0..b79f87cb4a9 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8817,7 +8817,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/it.po b/po/it.po index 3927290b957..d5f885e8859 100644 --- a/po/it.po +++ b/po/it.po @@ -8808,7 +8808,8 @@ msgstr "" "validi\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s adattatore %s\n" #: ipconfig.rc:30 diff --git a/po/ja.po b/po/ja.po index b748f8c7b00..30448d925dd 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8750,7 +8750,8 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "エラー: 不明または無効なコマンド ライン パラメータが指定されました\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s アダプタ %s\n" #: ipconfig.rc:30 diff --git a/po/ko.po b/po/ko.po index 0b1ae0d1bdc..9d714fc5727 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8719,7 +8719,8 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "오류: 알수 없거나 올바르지 않은 명령어 라인 매개변수가 지정됨\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s 어댑터 %s\n" #: ipconfig.rc:30 diff --git a/po/lt.po b/po/lt.po index d0a79e22173..7bae857411e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8770,7 +8770,8 @@ msgstr "" "Klaida: nurodytas nežinomas arba netinkamas komandinės eilutės parametras\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s adapteris %s\n" #: ipconfig.rc:30 diff --git a/po/ml.po b/po/ml.po index b5f200ab892..505ab208892 100644 --- a/po/ml.po +++ b/po/ml.po @@ -8290,7 +8290,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/nb_NO.po b/po/nb_NO.po index 6abe6c74481..bcadb6c82b4 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8994,7 +8994,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/nl.po b/po/nl.po index 70c611917b4..9943dce7d89 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8864,7 +8864,8 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "Fout: Onbekende of ongeldige commandoregelparameters gespecificeerd\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s adapter %s\n" #: ipconfig.rc:30 diff --git a/po/or.po b/po/or.po index 9a68f5253d4..b1a0b2b21de 100644 --- a/po/or.po +++ b/po/or.po @@ -8290,7 +8290,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/pa.po b/po/pa.po index 8ad7069e837..34514274939 100644 --- a/po/pa.po +++ b/po/pa.po @@ -8290,7 +8290,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/pl.po b/po/pl.po index cbca874ef2c..0ecd5b5f008 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8793,7 +8793,8 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "Błąd: Nierozpoznany lub niepełny wiersz polecenia\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s karta %s\n" #: ipconfig.rc:30 diff --git a/po/pt_BR.po b/po/pt_BR.po index 7efd228392f..baacfb7ebb4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -9026,7 +9026,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/pt_PT.po b/po/pt_PT.po index f4ee0f928c8..67a49bd17c3 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -9039,7 +9039,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/rm.po b/po/rm.po index a35889dc2a9..940555faf73 100644 --- a/po/rm.po +++ b/po/rm.po @@ -8332,7 +8332,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/ro.po b/po/ro.po index afb215c2f78..6fdc218e70b 100644 --- a/po/ro.po +++ b/po/ro.po @@ -9268,7 +9268,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/ru.po b/po/ru.po index aa21a61f81a..821b22d005f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8762,7 +8762,8 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "Ошибка: Указаны неизвестные или неверные параметры командной строки\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s адаптер %s\n" #: ipconfig.rc:30 diff --git a/po/sk.po b/po/sk.po index ed0b852de9e..281f6cc6895 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8421,7 +8421,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/sl.po b/po/sl.po index e9a84ef67b0..8c0f51f9640 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8769,7 +8769,8 @@ msgstr "" "Napaka: navedeni so bili nepoznani ali neveljavni parametri ukazne vrstice\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s prilagodilnik %s\n" #: ipconfig.rc:30 diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 177c6c835c1..39540dd8d2b 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -8700,7 +8700,8 @@ msgstr "" "Грешка: унесени су непознати или неисправни параметри наредбене линије\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s адаптер %s\n" #: ipconfig.rc:30 diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 5f71ad4fb18..6c667c968de 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -8741,7 +8741,7 @@ msgstr "" "Greška: uneseni su nepoznati ili neispravni parametri naredbene linije\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/sv.po b/po/sv.po index 5cf6e13c40c..676511b96d5 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8723,7 +8723,8 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "Fel: Okända eller ogiltiga kommandoradsparametrar angavs\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s-adapter %s\n" #: ipconfig.rc:30 diff --git a/po/te.po b/po/te.po index 147be06f442..610cb5313d7 100644 --- a/po/te.po +++ b/po/te.po @@ -8290,7 +8290,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/th.po b/po/th.po index ad115b76930..bd2175f917e 100644 --- a/po/th.po +++ b/po/th.po @@ -8417,7 +8417,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/tr.po b/po/tr.po index 1881f51ac22..d2b0d79fc60 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8997,7 +8997,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/uk.po b/po/uk.po index ca1e816d801..5e923954a57 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8720,7 +8720,8 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "Помилка: Вказані невідомі чи невірні параметри командного рядка\n" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +#, fuzzy +msgid "%1 adapter %2\n" msgstr "%s адаптер %s\n" #: ipconfig.rc:30 diff --git a/po/wa.po b/po/wa.po index 42d9ecd1302..0be4c397d05 100644 --- a/po/wa.po +++ b/po/wa.po @@ -8369,7 +8369,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/wine.pot b/po/wine.pot index 86f0ff20df9..8ac30f38b41 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -8264,7 +8264,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/zh_CN.po b/po/zh_CN.po index 71ef86392bc..2254c619bb2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8657,7 +8657,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/po/zh_TW.po b/po/zh_TW.po index b263d4b9fce..9a54573d8c1 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8690,7 +8690,7 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" #: ipconfig.rc:29 -msgid "%s adapter %s\n" +msgid "%1 adapter %2\n" msgstr "" #: ipconfig.rc:30 diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 37e709931e7..1f45e0e53b1 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -26,13 +26,14 @@ #include "ipconfig.h" -static int ipconfig_vprintfW(const WCHAR *msg, va_list va_args) +static int ipconfig_vprintfW(const WCHAR *msg, __ms_va_list va_args) { int wlen; DWORD count, ret; WCHAR msg_buffer[8192]; - wlen = vsprintfW(msg_buffer, msg, va_args); + wlen = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, msg_buffer, + sizeof(msg_buffer)/sizeof(*msg_buffer), &va_args); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); if (!ret) @@ -59,37 +60,37 @@ static int ipconfig_vprintfW(const WCHAR *msg, va_list va_args) return count; } -static int ipconfig_printfW(const WCHAR *msg, ...) +static int CDECL ipconfig_printfW(const WCHAR *msg, ...) { - va_list va_args; + __ms_va_list va_args; int len; - va_start(va_args, msg); + __ms_va_start(va_args, msg); len = ipconfig_vprintfW(msg, va_args); - va_end(va_args); + __ms_va_end(va_args); return len; } -static int ipconfig_message_printfW(int msg, ...) +static int CDECL ipconfig_message_printfW(int msg, ...) { - va_list va_args; + __ms_va_list va_args; WCHAR msg_buffer[8192]; int len; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, sizeof(msg_buffer)/sizeof(WCHAR)); - va_start(va_args, msg); + __ms_va_start(va_args, msg); len = ipconfig_vprintfW(msg_buffer, va_args); - va_end(va_args); + __ms_va_end(va_args); return len; } static int ipconfig_message(int msg) { - static const WCHAR formatW[] = {'%','s',0}; + static const WCHAR formatW[] = {'%','1',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, @@ -123,7 +124,7 @@ static const WCHAR *iftype_to_string(DWORD type) static void print_field(int msg, const WCHAR *value) { - static const WCHAR formatW[] = {' ',' ',' ',' ','%','s',':',' ','%','s','\n',0}; + static const WCHAR formatW[] = {' ',' ',' ',' ','%','1',':',' ','%','2','\n',0}; WCHAR field[] = {'.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.', ' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ',0}; @@ -141,7 +142,7 @@ static void print_value(const WCHAR *value) ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', - '%','s','\n',0}; + '%','1','\n',0}; ipconfig_printfW(formatW, value); } diff --git a/programs/ipconfig/ipconfig.rc b/programs/ipconfig/ipconfig.rc index b8809e1fdbf..3c1f9d1e74f 100644 --- a/programs/ipconfig/ipconfig.rc +++ b/programs/ipconfig/ipconfig.rc @@ -26,7 +26,7 @@ STRINGTABLE { STRING_USAGE, "Usage: ipconfig [ /? | /all ]\n" STRING_INVALID_CMDLINE, "Error: Unknown or invalid command line parameters specified\n" - STRING_ADAPTER_FRIENDLY, "%s adapter %s\n" + STRING_ADAPTER_FRIENDLY, "%1 adapter %2\n" STRING_ETHERNET, "Ethernet" STRING_UNKNOWN, "Unknown" STRING_CONN_DNS_SUFFIX, "Connection-specific DNS suffix"