reg: Exit with an error message if RegQueryInfoKeyW fails.

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

reg: Exit with an error message if RegQueryInfoKeyW fails.
dad56c7d · Hugh McMaster · Alexandre Julliard · b76ee0c7 · dad56c7d · dad56c7d
Commit dad56c7d authored Apr 06, 2016 by Hugh McMaster Committed by Alexandre Julliard Apr 07, 2016
49 changed files
--- a/po/ar.po
+++ b/po/ar.po
@@ -11890,6 +11890,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "ال&سجل"

--- a/po/bg.po
+++ b/po/bg.po
@@ -11506,6 +11506,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Регистър"

--- a/po/ca.po
+++ b/po/ca.po
@@ -11769,6 +11769,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registre"

--- a/po/cs.po
+++ b/po/cs.po
@@ -11577,6 +11577,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registr"

--- a/po/da.po
+++ b/po/da.po
@@ -11843,6 +11843,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Register"

--- a/po/de.po
+++ b/po/de.po
@@ -11747,6 +11747,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registrierung"

--- a/po/el.po
+++ b/po/el.po
@@ -11292,6 +11292,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/en.po
+++ b/po/en.po
@@ -11639,6 +11639,14 @@ msgstr ""
 "reg: Unable to delete all registry values in '%1'. An unexpected error "
 "occurred.\n"

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registry"

--- a/po/en_US.po
+++ b/po/en_US.po
@@ -11639,6 +11639,14 @@ msgstr ""
 "reg: Unable to delete all registry values in '%1'. An unexpected error "
 "occurred.\n"

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registry"

--- a/po/eo.po
+++ b/po/eo.po
@@ -11196,6 +11196,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registrejo"

--- a/po/es.po
+++ b/po/es.po
@@ -11922,6 +11922,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registro"

--- a/po/fa.po
+++ b/po/fa.po
@@ -11286,6 +11286,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/fi.po
+++ b/po/fi.po
@@ -11616,6 +11616,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Rekisteri"

--- a/po/fr.po
+++ b/po/fr.po
@@ -11778,6 +11778,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registre"

--- a/po/he.po
+++ b/po/he.po
@@ -11667,6 +11667,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&רישום המערכת"

--- a/po/hi.po
+++ b/po/hi.po
@@ -11093,6 +11093,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/hr.po
+++ b/po/hr.po
@@ -11400,6 +11400,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registar"

--- a/po/hu.po
+++ b/po/hu.po
@@ -11837,6 +11837,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Fájl"

--- a/po/it.po
+++ b/po/it.po
@@ -11923,6 +11923,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registro"

--- a/po/ja.po
+++ b/po/ja.po
@@ -11623,6 +11623,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "レジストリ(&R)"

--- a/po/ko.po
+++ b/po/ko.po
@@ -11912,6 +11912,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "레지스트리(&R)"

--- a/po/lt.po
+++ b/po/lt.po
@@ -11645,6 +11645,17 @@ msgid ""
 msgstr ""
 "reg: Nepavyko pašalinti visų „%1“ registro reikšmių. Įvyko netikėta klaida.\n"

+#: reg.rc:54
+#, fuzzy
+#| msgid ""
+#| "reg: Unable to delete all registry values in '%1'. An unexpected error "
+#| "occurred.\n"
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+"reg: Nepavyko pašalinti visų „%1“ registro reikšmių. Įvyko netikėta klaida.\n"
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "R&egistras"

--- a/po/ml.po
+++ b/po/ml.po
@@ -11093,6 +11093,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -11748,6 +11748,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Register"

--- a/po/nl.po
+++ b/po/nl.po
@@ -11889,6 +11889,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registerbestand"

--- a/po/or.po
+++ b/po/or.po
@@ -11093,6 +11093,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/pa.po
+++ b/po/pa.po
@@ -11093,6 +11093,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/pl.po
+++ b/po/pl.po
@@ -11725,6 +11725,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Rejestr"

--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11732,6 +11732,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registro"

--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -11714,6 +11714,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registo"

--- a/po/rm.po
+++ b/po/rm.po
@@ -11171,6 +11171,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/ro.po
+++ b/po/ro.po
@@ -11933,6 +11933,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registru"

--- a/po/ru.po
+++ b/po/ru.po
@@ -11642,6 +11642,18 @@ msgstr ""
 "reg: не удалось удалить все значения в «%1». Произошла непредвиденная "
 "ошибка.\n"

+#: reg.rc:54
+#, fuzzy
+#| msgid ""
+#| "reg: Unable to delete all registry values in '%1'. An unexpected error "
+#| "occurred.\n"
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+"reg: не удалось удалить все значения в «%1». Произошла непредвиденная "
+"ошибка.\n"
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Реестр"

--- a/po/sk.po
+++ b/po/sk.po
@@ -11365,6 +11365,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registry"

--- a/po/sl.po
+++ b/po/sl.po
@@ -11866,6 +11866,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Register"

--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -11758,6 +11758,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -11897,6 +11897,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/sv.po
+++ b/po/sv.po
@@ -11538,6 +11538,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Register"

--- a/po/te.po
+++ b/po/te.po
@@ -11093,6 +11093,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/th.po
+++ b/po/th.po
@@ -11324,6 +11324,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/tr.po
+++ b/po/tr.po
@@ -11694,6 +11694,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Kayıt"

--- a/po/uk.po
+++ b/po/uk.po
@@ -11756,6 +11756,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Реєстр"

--- a/po/wa.po
+++ b/po/wa.po
@@ -11232,6 +11232,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/wine.pot
+++ b/po/wine.pot
@@ -11029,6 +11029,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11197,6 +11197,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "注册表(&R)"

--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11797,6 +11797,12 @@ msgid ""
 "occurred.\n"
 msgstr ""

+#: reg.rc:54
+msgid ""
+"reg: Unable to complete the specified operation. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "註冊表(&R)"

--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -497,8 +497,8 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
            &maxValue, NULL, NULL, NULL);
        if (rc != ERROR_SUCCESS)
        {
-            /* FIXME: failure */
            RegCloseKey(subkey);
+            output_message(STRING_GENERAL_FAILURE);
            return 1;
        }
        maxValue++;

--- a/programs/reg/reg.h
+++ b/programs/reg/reg.h
@@ -45,3 +45,4 @@
 #define STRING_DELETE_SUBKEY    122
 #define STRING_INVALID_STRING   123
 #define STRING_VALUEALL_FAILED  124
+#define STRING_GENERAL_FAILURE  125
--- a/programs/reg/reg.rc
+++ b/programs/reg/reg.rc
@@ -50,4 +50,5 @@ STRINGTABLE
    STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?"
    STRING_INVALID_STRING, "reg: The option [/d] must be followed by a valid string\n"
    STRING_VALUEALL_FAILED, "reg: Unable to delete all registry values in '%1'. An unexpected error occurred.\n"
+    STRING_GENERAL_FAILURE, "reg: Unable to complete the specified operation. An unexpected error occurred.\n"
 }