Commit 31f0d952 authored by Hugh McMaster's avatar Hugh McMaster Committed by Alexandre Julliard

reg: Clean-up and inform the user if RegDeleteValueW fails when deleting all…

reg: Clean-up and inform the user if RegDeleteValueW fails when deleting all values in a registry key. Signed-off-by: 's avatarHugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6415947e
......@@ -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 "ال&سجل"
......
......@@ -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 "&Регистър"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 ""
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 ""
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 "&רישום המערכת"
......
......@@ -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 ""
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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)"
......
......@@ -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)"
......
......@@ -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"
......
......@@ -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 ""
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 ""
......
......@@ -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 ""
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 ""
......
......@@ -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"
......
......@@ -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 "&Реестр"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 ""
......
......@@ -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 ""
......
......@@ -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"
......
......@@ -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 ""
......
......@@ -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 ""
......
......@@ -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"
......
......@@ -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 "&Реєстр"
......
......@@ -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 ""
......
......@@ -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 ""
......
......@@ -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)"
......
......@@ -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)"
......
......@@ -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)
{
......
......@@ -44,3 +44,4 @@
#define STRING_DELETE_VALUEALL 121
#define STRING_DELETE_SUBKEY 122
#define STRING_INVALID_STRING 123
#define STRING_VALUEALL_FAILED 124
......@@ -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"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment