[PATCH 1/4] programs/regsvr32: Convert codebase to Unicode (try 4)
Hugh McMaster
hugh.mcmaster at outlook.com
Tue Jun 23 06:27:22 CDT 2015
Fixes bug https://bugs.winehq.org/show_bug.cgi?id=38638 ["Bad text encoding output in regsvr32 console output"]
---
po/ar.po | 2 +-
po/bg.po | 2 +-
po/ca.po | 4 ++--
po/cs.po | 2 +-
po/da.po | 2 +-
po/de.po | 4 ++--
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 | 4 ++--
po/fr.po | 4 ++--
po/he.po | 2 +-
po/hi.po | 2 +-
po/hr.po | 2 +-
po/hu.po | 2 +-
po/it.po | 2 +-
po/ja.po | 4 ++--
po/ko.po | 2 +-
po/lt.po | 4 ++--
po/ml.po | 2 +-
po/nb_NO.po | 2 +-
po/nl.po | 2 +-
po/or.po | 2 +-
po/pa.po | 2 +-
po/pl.po | 4 ++--
po/pt_BR.po | 4 ++--
po/pt_PT.po | 2 +-
po/rm.po | 2 +-
po/ro.po | 2 +-
po/ru.po | 4 ++--
po/sk.po | 2 +-
po/sl.po | 2 +-
po/sr_RS at cyrillic.po | 2 +-
po/sr_RS at latin.po | 2 +-
po/sv.po | 2 +-
po/te.po | 2 +-
po/th.po | 2 +-
po/tr.po | 2 +-
po/uk.po | 2 +-
po/wa.po | 2 +-
po/wine.pot | 2 +-
po/zh_CN.po | 2 +-
po/zh_TW.po | 2 +-
programs/regsvr32/Makefile.in | 2 +-
programs/regsvr32/regsvr32.c | 48 +++++++++++++++++++------------------------
programs/regsvr32/regsvr32.rc | 2 +-
49 files changed, 80 insertions(+), 86 deletions(-)
diff --git a/po/ar.po b/po/ar.po
index 4a7c7cc..f1b7fcf 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11957,7 +11957,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "فشل فتح '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/bg.po b/po/bg.po
index 93f317a..634a5f1 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11784,7 +11784,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/ca.po b/po/ca.po
index 129d953..a4513cf 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12047,8 +12047,8 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "regsvr32: S'ha fallat en obrir el DLL '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
-msgstr "regsvr32: %1 no està implementat en el DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
+msgstr "regsvr32: '%1!S!' no està implementat en el DLL '%2'\n"
#: regsvr32.rc:44
msgid "regsvr32: Failed to register DLL '%1'\n"
diff --git a/po/cs.po b/po/cs.po
index 89970c6..11796a8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11833,7 +11833,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Otevření „%1“ se nezdařilo\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/da.po b/po/da.po
index 041d2ae..e42e234 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12094,7 +12094,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Kunne ikke åbne «%1»\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/de.po b/po/de.po
index 8f6a548..0486929 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12011,8 +12011,8 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "regsvr32: DLL '%1' konnte nicht geladen werden\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
-msgstr "regsvr32: %1 nicht in DLL '%2' implementiert\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
+msgstr "regsvr32: '%1!S!' nicht in DLL '%2' implementiert\n"
#: regsvr32.rc:44
msgid "regsvr32: Failed to register DLL '%1'\n"
diff --git a/po/el.po b/po/el.po
index 6f2e9fe..9466487 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11569,7 +11569,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/en.po b/po/en.po
index 0dc0c13..10522b7 100644
--- a/po/en.po
+++ b/po/en.po
@@ -11933,8 +11933,8 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "regsvr32: Failed to load DLL '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
-msgstr "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
+msgstr "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
#: regsvr32.rc:44
msgid "regsvr32: Failed to register DLL '%1'\n"
diff --git a/po/en_US.po b/po/en_US.po
index a932ea6..f91ee3f 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -11933,8 +11933,8 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "regsvr32: Failed to load DLL '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
-msgstr "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
+msgstr "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
#: regsvr32.rc:44
msgid "regsvr32: Failed to register DLL '%1'\n"
diff --git a/po/eo.po b/po/eo.po
index b14e9b9..4be0c6b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -11459,7 +11459,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/es.po b/po/es.po
index 158c775..8722a2e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12176,7 +12176,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "No se pudo abrir '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/fa.po b/po/fa.po
index d695500..9b24792 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -11568,7 +11568,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/fi.po b/po/fi.po
index 3d4d03e..605692d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11913,8 +11913,8 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "regsvr32: DLL:n '%1' lataaminen epäonnistui\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
-msgstr "regsvr32: %1-toteutusta ei ole DLL:ssä '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
+msgstr "regsvr32: '%1!S!'-toteutusta ei ole DLL:ssä '%2'\n"
#: regsvr32.rc:44
msgid "regsvr32: Failed to register DLL '%1'\n"
diff --git a/po/fr.po b/po/fr.po
index 5ac389e..82a750c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12092,8 +12092,8 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "regsvr32 : Impossible de charger la DLL « %1 »\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
-msgstr "regsvr32 : %1 non implémentée dans la DLL « %2 »\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
+msgstr "regsvr32 : « %1!S! » non implémentée dans la DLL « %2 »\n"
#: regsvr32.rc:44
msgid "regsvr32: Failed to register DLL '%1'\n"
diff --git a/po/he.po b/po/he.po
index ab4b196..f02b441 100644
--- a/po/he.po
+++ b/po/he.po
@@ -12148,7 +12148,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Failed to open '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/hi.po b/po/hi.po
index 0e62608..3614e49 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -11371,7 +11371,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/hr.po b/po/hr.po
index c995319..ab5028a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -11648,7 +11648,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Neuspjelo otvaranje '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/hu.po b/po/hu.po
index b7a882a..02fc5d8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12100,7 +12100,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "'%1' megnyitása sikertelen\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/it.po b/po/it.po
index 94a9b6a..fed8f6e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12176,7 +12176,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Impossibile aprire '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/ja.po b/po/ja.po
index aa54d47..042f443 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11936,8 +11936,8 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "regsvr32: '%1' を読み込めませんでした\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
-msgstr "regsvr32: %1はDLL '%2'内で実装されていません\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
+msgstr "regsvr32: '%1!S!'はDLL '%2'内で実装されていません\n"
#: regsvr32.rc:44
msgid "regsvr32: Failed to register DLL '%1'\n"
diff --git a/po/ko.po b/po/ko.po
index 23d54e8..bf2d206 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11981,7 +11981,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "'%1' 열기 실패\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/lt.po b/po/lt.po
index f18df3e..5689d18 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -11939,8 +11939,8 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "regsvr32: Nepavyko įkelti DLL bibliotekos „%1“\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
-msgstr "regsvr32: %1 neįgyvendinta DLL bibliotekoje „%2“\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
+msgstr "regsvr32: „%1!S!“ neįgyvendinta DLL bibliotekoje „%2“\n"
#: regsvr32.rc:44
msgid "regsvr32: Failed to register DLL '%1'\n"
diff --git a/po/ml.po b/po/ml.po
index 3d97142..51191ad 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -11371,7 +11371,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 0113717..e871e48 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -11999,7 +11999,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Klarte ikke åpne «%1»\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/nl.po b/po/nl.po
index a4d5c93..49eac7f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12142,7 +12142,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Openen van '%1' is mislukt\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/or.po b/po/or.po
index e391570..bd20472 100644
--- a/po/or.po
+++ b/po/or.po
@@ -11371,7 +11371,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/pa.po b/po/pa.po
index 44e3e48..7b18a10 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -11371,7 +11371,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/pl.po b/po/pl.po
index f0adc01..7a54d0b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12005,8 +12005,8 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "regsvr32: Nieudane wczytywanie biblioteki DLL '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
-msgstr "regsvr32: %1 nie jest zaimplementowana w bibliotece DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
+msgstr "regsvr32: '%1!S!' nie jest zaimplementowana w bibliotece DLL '%2'\n"
#: regsvr32.rc:44
msgid "regsvr32: Failed to register DLL '%1'\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e1f7796..010744e3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12015,8 +12015,8 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "regsvr32: Falha ao carregar a DLL '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
-msgstr "regsvr32: %1 não implementado na DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
+msgstr "regsvr32: '%1!S!' não implementado na DLL '%2'\n"
#: regsvr32.rc:44
msgid "regsvr32: Failed to register DLL '%1'\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index afdfee8..bbb0a5d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -11974,7 +11974,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Falhou ao abrir '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/rm.po b/po/rm.po
index 019d1f5..09f217e 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -11457,7 +11457,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/ro.po b/po/ro.po
index e37f976..e3ecc50 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -12182,7 +12182,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Deschiderea „%1” a eșuat\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/ru.po b/po/ru.po
index 08b2479..69c1fc3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11939,8 +11939,8 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "regsvr32: не удалось загрузить DLL «%1»\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
-msgstr "regsvr32: %1 не реализован в DLL «%2»\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
+msgstr "regsvr32: «%1!S!» не реализован в DLL «%2»\n"
#: regsvr32.rc:44
msgid "regsvr32: Failed to register DLL '%1'\n"
diff --git a/po/sk.po b/po/sk.po
index dcaade3..4c01713 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11614,7 +11614,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/sl.po b/po/sl.po
index ef225ec..166c7db 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -12122,7 +12122,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Odpiranje '%1' je spodletelo\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/sr_RS at cyrillic.po b/po/sr_RS at cyrillic.po
index 800414c..7cfb4f4 100644
--- a/po/sr_RS at cyrillic.po
+++ b/po/sr_RS at cyrillic.po
@@ -12039,7 +12039,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Отварање „%s“ датотеке није успело\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/sr_RS at latin.po b/po/sr_RS at latin.po
index 80d1085..1dff0b9 100644
--- a/po/sr_RS at latin.po
+++ b/po/sr_RS at latin.po
@@ -12186,7 +12186,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Otvaranje „%s“ datoteke nije uspelo\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/sv.po b/po/sv.po
index d378c72..731f820 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11889,7 +11889,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "Misslyckades med att öppna '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/te.po b/po/te.po
index 06fcbbd..1fd687f 100644
--- a/po/te.po
+++ b/po/te.po
@@ -11371,7 +11371,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/th.po b/po/th.po
index af1f8af..9a5c635 100644
--- a/po/th.po
+++ b/po/th.po
@@ -11612,7 +11612,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/tr.po b/po/tr.po
index 7d4ad9b..ed5e489 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11948,7 +11948,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "'%1' açılamadı\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/uk.po b/po/uk.po
index 0c2b8ad..acedb58 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12031,7 +12031,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "regsvr32: Не вдалося завантажити DLL '%1'\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr "regsvr32: %1 не реалізовано у DLL '%2'\n"
#: regsvr32.rc:44
diff --git a/po/wa.po b/po/wa.po
index 299fa2e..d279712 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -11517,7 +11517,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/wine.pot b/po/wine.pot
index b81ea04..4012976 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -11307,7 +11307,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d9fd781..9c7eec3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11473,7 +11473,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr ""
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9ff7bec..408679e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11866,7 +11866,7 @@ msgid "regsvr32: Failed to load DLL '%1'\n"
msgstr "開啟 %1 失敗\n"
#: regsvr32.rc:43
-msgid "regsvr32: %1 not implemented in DLL '%2'\n"
+msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
msgstr ""
#: regsvr32.rc:44
diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in
index db567ea..b99db28 100644
--- a/programs/regsvr32/Makefile.in
+++ b/programs/regsvr32/Makefile.in
@@ -1,5 +1,5 @@
MODULE = regsvr32.exe
-APPMODE = -mconsole
+APPMODE = -mconsole -municode
IMPORTS = ole32 user32
C_SRCS = \
diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c
index 8aa567c..cdf64ae 100644
--- a/programs/regsvr32/regsvr32.c
+++ b/programs/regsvr32/regsvr32.c
@@ -52,10 +52,10 @@
#include "wine/port.h"
#include <string.h>
-#include <ctype.h>
#include <windows.h>
#include <ole2.h>
#include "regsvr32.h"
+#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(regsvr32);
@@ -68,14 +68,14 @@ static BOOL Silent = FALSE;
static void __cdecl output_write(UINT id, ...)
{
- char fmt[1024];
+ WCHAR fmt[1024];
__ms_va_list va_args;
- char *str;
+ WCHAR *str;
DWORD len, nOut, ret;
if (Silent) return;
- if (!LoadStringA(GetModuleHandleA(NULL), id, fmt, sizeof(fmt)/sizeof(fmt[0])))
+ if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, sizeof(fmt)/sizeof(fmt[0])))
{
WINE_FIXME("LoadString failed with %d\n", GetLastError());
return;
@@ -83,19 +83,19 @@ static void __cdecl output_write(UINT id, ...)
__ms_va_start(va_args, id);
SetLastError(NO_ERROR);
- len = FormatMessageA(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER,
- fmt, 0, 0, (LPSTR)&str, 0, &va_args);
+ len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER,
+ fmt, 0, 0, (LPWSTR)&str, 0, &va_args);
__ms_va_end(va_args);
if (len == 0 && GetLastError() != NO_ERROR)
{
- WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_a(fmt));
+ WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt));
return;
}
- ret = WriteConsoleA(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &nOut, NULL);
+ ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &nOut, NULL);
if (!ret)
- WINE_WARN("regsvr32: WriteConsoleA() failed.\n");
+ WINE_WARN("regsvr32: WriteConsoleW() failed.\n");
LocalFree(str);
}
@@ -108,11 +108,11 @@ static void __cdecl output_write(UINT id, ...)
* procName - name of the procedure to load from dll
* pDllHanlde - output variable receives handle of the loaded dll.
*/
-static VOID *LoadProc(const char* strDll, const char* procName, HMODULE* DllHandle)
+static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHandle)
{
VOID* (*proc)(void);
- *DllHandle = LoadLibraryExA(strDll, 0, LOAD_WITH_ALTERED_SEARCH_PATH);
+ *DllHandle = LoadLibraryExW(strDll, 0, LOAD_WITH_ALTERED_SEARCH_PATH);
if(!*DllHandle)
{
output_write(STRING_DLL_LOAD_FAILED, strDll);
@@ -128,7 +128,7 @@ static VOID *LoadProc(const char* strDll, const char* procName, HMODULE* DllHand
return proc;
}
-static int RegisterDll(const char* strDll)
+static int RegisterDll(const WCHAR* strDll)
{
HRESULT hr;
DLLREGISTER pfRegister;
@@ -151,7 +151,7 @@ static int RegisterDll(const char* strDll)
return 0;
}
-static int UnregisterDll(char* strDll)
+static int UnregisterDll(WCHAR* strDll)
{
HRESULT hr;
DLLUNREGISTER pfUnregister;
@@ -174,7 +174,7 @@ static int UnregisterDll(char* strDll)
return 0;
}
-static int InstallDll(BOOL install, char *strDll, WCHAR *command_line)
+static int InstallDll(BOOL install, WCHAR *strDll, WCHAR *command_line)
{
HRESULT hr;
DLLINSTALL pfInstall;
@@ -203,13 +203,11 @@ static int InstallDll(BOOL install, char *strDll, WCHAR *command_line)
return 0;
}
-static WCHAR *parse_command_line(char *command_line)
+static WCHAR *parse_command_line(WCHAR *command_line)
{
- WCHAR *ret = NULL;
-
if (command_line[0] == ':' && command_line[1])
{
- int len = strlen(command_line);
+ int len = strlenW(command_line);
command_line++;
len--;
@@ -225,16 +223,12 @@ static WCHAR *parse_command_line(char *command_line)
}
}
if (command_line[0])
- {
- len = MultiByteToWideChar(CP_ACP, 0, command_line, -1, NULL, 0);
- ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
- if (ret) MultiByteToWideChar(CP_ACP, 0, command_line, -1, ret, len);
- }
+ return command_line;
}
- return ret;
+ return NULL;
}
-int main(int argc, char* argv[])
+int wmain(int argc, WCHAR* argv[])
{
int i;
BOOL CallRegister = TRUE;
@@ -255,7 +249,7 @@ int main(int argc, char* argv[])
{
if ((argv[i][0] == '/' || argv[i][0] == '-') && (!argv[i][2] || argv[i][2] == ':'))
{
- switch (tolower(argv[i][1]))
+ switch (tolowerW(argv[i][1]))
{
case 'u':
Unregister = TRUE;
@@ -283,7 +277,7 @@ int main(int argc, char* argv[])
}
else
{
- char *DllName = argv[i];
+ WCHAR *DllName = argv[i];
int res = 0;
DllFound = TRUE;
diff --git a/programs/regsvr32/regsvr32.rc b/programs/regsvr32/regsvr32.rc
index 88ba364..3169b71 100644
--- a/programs/regsvr32/regsvr32.rc
+++ b/programs/regsvr32/regsvr32.rc
@@ -39,7 +39,7 @@ Options:\n\
\ [/n] Do not call DllRegisterServer. This option must be used with [/i].\n\n"
STRING_UNRECOGNIZED_SWITCH, "regsvr32: Invalid or unrecognized switch [%1]\n\n"
STRING_DLL_LOAD_FAILED, "regsvr32: Failed to load DLL '%1'\n"
- STRING_PROC_NOT_IMPLEMENTED, "regsvr32: %1 not implemented in DLL '%2'\n"
+ STRING_PROC_NOT_IMPLEMENTED, "regsvr32: '%1!S!' not implemented in DLL '%2'\n"
STRING_REGISTER_FAILED, "regsvr32: Failed to register DLL '%1'\n"
STRING_REGISTER_SUCCESSFUL, "regsvr32: Successfully registered DLL '%1'\n"
STRING_UNREGISTER_FAILED, "regsvr32: Failed to unregister DLL '%1'\n"
--
1.9.1
More information about the wine-patches
mailing list