reg: Clean-up and inform the user if RegDeleteValueW fails when deleting all values in a registry key.

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

po/ar.po

@@ -11884,6 +11884,12 @@ msgstr "هل أنت متأكد من رغبتك في حذف '%1' ؟"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "ال&سجل"

po/bg.po

@@ -11500,6 +11500,12 @@ msgstr "Наистина ли искате да изтриете '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Регистър"

po/ca.po

@@ -11763,6 +11763,12 @@ msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 "desinstal·lador: Una GUID d'aplicació ha de seguir l'opció '--remove'\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registre"

po/cs.po

@@ -11571,6 +11571,12 @@ msgstr "Opravdu chcete odstranit „%1“?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registr"

po/da.po

@@ -11837,6 +11837,12 @@ msgstr "Er du sikker på du vil slette '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Register"

po/de.po

@@ -11741,6 +11741,12 @@ msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 "Uninstaller: Auf die Option '--remove' muss eine Anwendungs-GUID folgen\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registrierung"

po/el.po

@@ -11286,6 +11286,12 @@ msgstr ""
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/en.po

@@ -11631,6 +11631,14 @@ msgstr "Are you sure you want to delete the registry key '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr "reg: The option [/d] must be followed by a valid string\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registry"

po/en_US.po

@@ -11631,6 +11631,14 @@ msgstr "Are you sure you want to delete the registry key '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr "reg: The option [/d] must be followed by a valid string\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registry"

po/eo.po

@@ -11190,6 +11190,12 @@ msgstr "Ĉu vi estas certa pri forigo de '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registrejo"

po/es.po

@@ -11916,6 +11916,12 @@ msgstr "¿Seguro que desea eliminar '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registro"

po/fa.po

@@ -11280,6 +11280,12 @@ msgstr ""
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/fi.po

@@ -11610,6 +11610,12 @@ msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr "reg: Valitsinta [/d] täytyy seurata kelpo merkkijono\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Rekisteri"

po/fr.po

@@ -11772,6 +11772,12 @@ msgstr "Voulez-vous réellement supprimer la clé de registre « %1 » ?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr "reg : l'option [/d] doit être suivie d'un entier valide\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registre"

po/he.po

@@ -11661,6 +11661,12 @@ msgstr "האם אכן ברצונך למחוק את '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&רישום המערכת"

po/hi.po

@@ -11087,6 +11087,12 @@ msgstr ""
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/hr.po

@@ -11394,6 +11394,12 @@ msgstr "Sigurno želite izbrisati '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registar"

po/hu.po

@@ -11831,6 +11831,12 @@ msgstr "Biztos hogy törölni szeretné ezt: '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Fájl"

po/it.po

@@ -11917,6 +11917,12 @@ msgstr "Sei sicuro di voler cancellare '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registro"

po/ja.po

@@ -11617,6 +11617,12 @@ msgstr "本当にレジストリ キー '%1' を削除しますか?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr "reg: /d オプションのあとに正しい整数値を指定してください\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "レジストリ(&R)"

po/ko.po

@@ -11906,6 +11906,12 @@ msgstr "당신은  '%1'을 지우기를 바랍니까?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "레지스트리(&R)"

po/lt.po

@@ -11638,6 +11638,12 @@ msgstr "Ar tikrai norite pašalinti registro raktą „%1“?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr "reg: Už parametro [/d] privalo būti tinkama eilutė\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "R&egistras"

po/ml.po

@@ -11087,6 +11087,12 @@ msgstr ""
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/nb_NO.po

@@ -11742,6 +11742,12 @@ msgstr "Vil du virkelig slette «%1»?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Register"

po/nl.po

@@ -11883,6 +11883,12 @@ msgstr "Weet u zeker dat u '%1' wilt verwijderen?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registerbestand"

po/or.po

@@ -11087,6 +11087,12 @@ msgstr ""
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/pa.po

@@ -11087,6 +11087,12 @@ msgstr ""
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/pl.po

@@ -11719,6 +11719,12 @@ msgstr "Czy jesteś pewien, że chcesz usunąć '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr "usuwanie programów: Po opcji '--remove' należy podać GUID aplikacji\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Rejestr"

po/pt_BR.po

@@ -11726,6 +11726,12 @@ msgstr "Você tem certeza que deseja excluir '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registro"

po/pt_PT.po

@@ -11708,6 +11708,12 @@ msgstr "Tem certeza que deseja excluir '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registo"

po/rm.po

@@ -11165,6 +11165,12 @@ msgstr ""
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/ro.po

@@ -11927,6 +11927,12 @@ msgstr "Sunteți sigur că vreți să ștergeți '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registru"

po/ru.po

@@ -11634,6 +11634,12 @@ msgstr "Вы точно хотите удалить ключ реестра «%1
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr "reg: за опцией [/d] должна следовать строка\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Реестр"

po/sk.po

@@ -11359,6 +11359,12 @@ msgstr "Ste si istý že chcete zmazať tieto hodnoty?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Registry"

po/sl.po

@@ -11860,6 +11860,12 @@ msgstr "Ali ste prepričani, da želite izbrisati predmet '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Register"

po/sr_RS@cyrillic.po

@@ -11752,6 +11752,12 @@ msgstr "Желите ли да избришете „%1“?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/sr_RS@latin.po

@@ -11891,6 +11891,12 @@ msgstr "Želite li da izbrišete „%1“?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/sv.po

@@ -11532,6 +11532,12 @@ msgstr "Vill du verkligen ta bort registernyckeln '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Register"

po/te.po

@@ -11087,6 +11087,12 @@ msgstr ""
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/th.po

@@ -11318,6 +11318,12 @@ msgstr ""
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/tr.po

@@ -11688,6 +11688,12 @@ msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 "uninstaller: --remove seçeneğinden sonra bir uygulama GUID'i girilmelidir\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Kayıt"

po/uk.po

@@ -11750,6 +11750,12 @@ msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 "uninstaller: Для параметра '--remove' повинен бути вказаний GUID застосунка\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "&Реєстр"

po/wa.po

@@ -11226,6 +11226,12 @@ msgstr ""
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/wine.pot

@@ -11023,6 +11023,12 @@ msgstr ""
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr ""

po/zh_CN.po

@@ -11191,6 +11191,12 @@ msgstr "真的删除 '%1'?"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr "uninstaller: 选项 '--remove' 必须后接一个应用程序 GUID\n"
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "注册表(&R)"

po/zh_TW.po

@@ -11791,6 +11791,12 @@ msgstr "確定要刪除 %1？"
 msgid "reg: The option [/d] must be followed by a valid string\n"
 msgstr ""
 
+#: reg.rc:53
+msgid ""
+"reg: Unable to delete all registry values in '%1'. An unexpected error "
+"occurred.\n"
+msgstr ""
+
 #: regedit.rc:34
 msgid "&Registry"
 msgstr "註冊表(&R)"

programs/reg/reg.c

@@ -512,14 +512,15 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
             {
                 rc = RegDeleteValueW(subkey, szValue);
                 if (rc != ERROR_SUCCESS)
-                    break;
+                {
+                    HeapFree(GetProcessHeap(), 0, szValue);
+                    RegCloseKey(subkey);
+                    output_message(STRING_VALUEALL_FAILED, key_name);
+                    return 1;
+                }
             }
             else break;
         }
-        if (rc != ERROR_SUCCESS)
-        {
-            /* FIXME  delete failed */
-        }
     }
     else if (value_name || value_empty)
     {

programs/reg/reg.h

@@ -44,3 +44,4 @@
 #define STRING_DELETE_VALUEALL  121
 #define STRING_DELETE_SUBKEY    122
 #define STRING_INVALID_STRING   123
+#define STRING_VALUEALL_FAILED  124

programs/reg/reg.rc

@@ -49,4 +49,5 @@ STRINGTABLE
     STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?"
     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"
 }