ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reg: Fail if the source and destination keys are the same when copying. 

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hugh McMaster 2021-05-31 19:45:24 +10:00 committed by Alexandre Julliard
parent 8d9a228e99
commit 0abc002a3e
53 changed files with 214 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
po/ar.po
View File

@ -15843,6 +15843,10 @@ msgstr "الملف المحدد موجود بالفعل ، هل ترغب باس
msgid "reg: Invalid command line parameters\n"
msgstr "خطأ : معاملات سطر الاوامر غير سليمة\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
#| msgid "Are you sure you want to delete these values?"

4
po/ast.po
View File

@ -14759,6 +14759,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr ""
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/bg.po
View File

@ -15033,6 +15033,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr "Невалидни знаци в пътя.\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
#| msgid "Are you sure you want to delete value '%s'?"

4
po/ca.po
View File

@ -15236,6 +15236,10 @@ msgstr "El valor de registre '%1' ja existeix. El voleu sobreescriure?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Paràmetres de línia d'ordres no vàlids\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Esteu segur que voleu suprimir el valor de registre '%1'?"

4
po/cs.po
View File

@ -15346,6 +15346,10 @@ msgstr "Hodnota registru „%1“ již existuje. Chcete ji nahradit?"
msgid "reg: Invalid command line parameters\n"
msgstr "Chyba: Neplatné parametry příkazové řádky\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Opravdu chcete odstranit hodnotu registru „%1“?"

4
po/da.po
View File

@ -15803,6 +15803,10 @@ msgstr "Filen findes allerede. Vil du erstatte den?"
msgid "reg: Invalid command line parameters\n"
msgstr "Fejl: Ugyldige kommando linje parametre\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
#| msgid "Are you sure you want to delete these values?"

4
po/de.po
View File

@ -15409,6 +15409,10 @@ msgstr "Der Wert '%1' existiert bereits. Möchten Sie ihn ersetzen?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Ungültige Befehlszeilenargumente\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Sind Sie sicher, dass Sie den Wert '%1' löschen möchten?"

4
po/el.po
View File

@ -14753,6 +14753,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/en.po
View File

@ -15172,6 +15172,10 @@ msgstr "The registry value '%1' already exists. Do you want to overwrite it?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Invalid command line parameters\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr "reg: The source and destination keys cannot be the same\n"
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Are you sure you want to delete the registry value '%1'?"

4
po/en_US.po
View File

@ -15172,6 +15172,10 @@ msgstr "The registry value '%1' already exists. Do you want to overwrite it?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Invalid command line parameters\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr "reg: The source and destination keys cannot be the same\n"
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Are you sure you want to delete the registry value '%1'?"

4
po/eo.po
View File

@ -14902,6 +14902,10 @@ msgstr "Dosiero estas jam ekzistanta. Ĉu vi volas anstataŭi ĝin?"
msgid "reg: Invalid command line parameters\n"
msgstr "Nevalida komandlinio.\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
#| msgid "Are you sure you want to delete these values?"

4
po/es.po
View File

@ -15439,6 +15439,10 @@ msgstr "El archivo ya existe. ¿Desea reemplazarlo?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Parámetros de línea de comandos inválidos\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "¿Está seguro que desea eliminar el valor de registro '%1'?"

4
po/fa.po
View File

@ -14707,6 +14707,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr ""
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/fi.po
View File

@ -15282,6 +15282,10 @@ msgstr "Rekisterin arvo '%1' on jo olemassa. Haluatko korvata sen?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Komentoriviparametrit eivät kelpaa\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Haluatko varmasti tuhota rekisteristä arvon '%1'?"

4
po/fr.po
View File

@ -15749,6 +15749,10 @@ msgstr "La valeur de registre « %1 » existe déjà. Voulez-vous la remplacer
msgid "reg: Invalid command line parameters\n"
msgstr "reg : paramètres de ligne de commande invalide\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Voulez-vous réellement supprimer la valeur de registre « %1 » ?"

4
po/he.po
View File

@ -15332,6 +15332,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr "Error: Invalid command line parameters\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
#| msgid "Are you sure you want to delete these values?"

4
po/hi.po
View File

@ -14451,6 +14451,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr ""
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/hr.po
View File

@ -15302,6 +15302,10 @@ msgid "reg: Invalid command line parameters\n"
msgstr ""
"Greška: uneseni su nepoznati ili neispravni parametri naredbene linije\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
#| msgid "Are you sure you want to delete these %1 items?"

4
po/hu.po
View File

@ -15795,6 +15795,10 @@ msgstr "A fájl már létezik. Lecseréli a fájlt?"
msgid "reg: Invalid command line parameters\n"
msgstr "Hiba: Érvénytelen parancssor paraméterek\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
#| msgid "Are you sure you want to delete these values?"

4
po/it.po
View File

@ -15884,6 +15884,10 @@ msgstr "Il file specificato esiste già. Vuoi sostituirlo?"
msgid "reg: Invalid command line parameters\n"
msgstr "Errore: parametri della linea di comando non validi\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
#| msgid "Are you sure you want to delete these values?"

4
po/ja.po
View File

@ -15295,6 +15295,10 @@ msgstr "レジストリ値 '%1' はすでに存在します。上書きします
msgid "reg: Invalid command line parameters\n"
msgstr "reg: コマンド ライン パラメーターが正しくありません\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "本当にレジストリ値 '%1' を削除しますか?"

4
po/ko.po
View File

@ -15078,6 +15078,10 @@ msgstr "레지스트리 값 '%1'(이)가 이미 존재합니다. 덮어쓰시겠
msgid "reg: Invalid command line parameters\n"
msgstr "reg: 명령줄 매개변수가 잘못되었습니다\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "레지스트리 값 '%1'을(를) 제거하시겠습니까?"

4
po/lt.po
View File

@ -15185,6 +15185,10 @@ msgstr "Registro reikšmė „%1“ jau egzistuoja. Ar norite ją perrašyti?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Netinkami komandos eilutės parametrai\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Ar tikrai norite pašalinti registro reikšmę „%1“?"

4
po/ml.po
View File

@ -14450,6 +14450,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr ""
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/nb_NO.po
View File

@ -15379,6 +15379,10 @@ msgstr "Registerverdien \"%1\" finnes fra før. Vil du erstatte den?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Ugyldige parametere på kommandolinjen\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Virkelig slette registerverdien \"%1\"?"

4
po/nl.po
View File

@ -15261,6 +15261,10 @@ msgstr "De registerwaarde '%1' bestand bestaat al. Wilt u het vervangen?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Foutieve opdrachtregel-parameters\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Weet u zeker dat u de registerwaarde '%1' wilt verwijderen?"

4
po/or.po
View File

@ -14436,6 +14436,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr ""
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/pa.po
View File

@ -14436,6 +14436,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr ""
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/pl.po
View File

@ -15364,6 +15364,10 @@ msgstr "Wartość rejestru '%1' już istnieje. Czy chcesz ją zastąpić?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Nieprawidłowe parametry wiersza poleceń\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Czy na pewno chcesz usunąć wartość rejestru '%1'?"

4
po/pt_BR.po
View File

@ -15245,6 +15245,10 @@ msgstr "O valor do registro '%1' já existe. Deseja sobrescrevê-lo?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Parâmetros da linha de comandos inválidos\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Tem certeza que deseja excluir o valor do registro '%1'?"

4
po/pt_PT.po
View File

@ -15526,6 +15526,10 @@ msgstr "O valor '%1' já existe no Registo. Deseja substituí-lo?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Parâmetros da linha de comandos inválidos\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Tem a certeza que deseja remover o valor '%1' do Registo?"

4
po/rm.po
View File

@ -14540,6 +14540,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr ""
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/ro.po
View File

@ -15588,6 +15588,10 @@ msgstr "Valoare de registru „%1” există deja. Doriți să o înlocuiți?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Parametri nevalizi pentru linia de comandă\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Sigur doriți să ștergeți valoarea de registru „%1”?"

4
po/ru.po
View File

@ -15223,6 +15223,10 @@ msgstr "Значение «%1» уже существует. Вы хотите
msgid "reg: Invalid command line parameters\n"
msgstr "reg: неверные параметры командной строки\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Вы точно хотите удалить параметр реестра «%1»?"

4
po/si.po
View File

@ -14915,6 +14915,10 @@ msgstr "රෙජිස්තරයේ අගය '%1' දැනටමත් ත
msgid "reg: Invalid command line parameters\n"
msgstr "reg: අවලංගු විධාන රේඛා පරාමිති\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/sk.po
View File

@ -15075,6 +15075,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr "Nesprávny parameter.\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
#| msgid "Are you sure you want to delete these values?"

4
po/sl.po
View File

@ -15821,6 +15821,10 @@ msgstr "Določena datoteka že obstaja. Ali jo želite zamenjati?"
msgid "reg: Invalid command line parameters\n"
msgstr "Napaka: neveljaven parameter v ukazni vrstici\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
#| msgid "Are you sure you want to delete these values?"

4
po/sr_RS@cyrillic.po
View File

@ -15361,6 +15361,10 @@ msgid "reg: Invalid command line parameters\n"
msgstr ""
"Грешка: унесени су непознати или неисправни параметри наредбене линије\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
msgid "Are you sure you want to delete the registry value '%1'?"

4
po/sr_RS@latin.po
View File

@ -15543,6 +15543,10 @@ msgid "reg: Invalid command line parameters\n"
msgstr ""
"Greška: uneseni su nepoznati ili neispravni parametri naredbene linije\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
msgid "Are you sure you want to delete the registry value '%1'?"

4
po/sv.po
View File

@ -15469,6 +15469,10 @@ msgstr "Värdet '%1' finns redan i registret. Vill du ersätta det?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Ogiltiga kommandoradsparametrar\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Vill du verkligen ta bort registervärdet '%1'?"

4
po/ta.po
View File

@ -14363,6 +14363,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr ""
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/te.po
View File

@ -14436,6 +14436,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr ""
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/th.po
View File

@ -14803,6 +14803,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr ""
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/tr.po
View File

@ -15142,6 +15142,10 @@ msgstr "Belirtilen '%1' kayıt defteri değeri zaten var. Üzerine yazılsın m
msgid "reg: Invalid command line parameters\n"
msgstr "reg: Geçersiz komut satırı parametreleri\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "'%1' kayıt defteri değerini silmek istediğinizden emin misiniz?"

4
po/uk.po
View File

@ -15207,6 +15207,10 @@ msgstr "Значення реєстру '%1' вже існує. Ви хочет
msgid "reg: Invalid command line parameters\n"
msgstr "reg: невірні параметри командного рядка\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "Ви впевнені, що хочете видалити значення реєстру '%1'?"

4
po/wa.po
View File

@ -14675,6 +14675,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr ""
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/wine.pot
View File

@ -14344,6 +14344,10 @@ msgstr ""
msgid "reg: Invalid command line parameters\n"
msgstr ""
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr ""

4
po/zh_CN.po
View File

@ -14910,6 +14910,10 @@ msgstr "注册表值 '%1' 已经存在。您想要覆盖它吗?"
msgid "reg: Invalid command line parameters\n"
msgstr "reg: 无效的命令行参数\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
msgid "Are you sure you want to delete the registry value '%1'?"
msgstr "您真的要删除注册表键值 '%1' 吗?"

4
po/zh_TW.po
View File

@ -15753,6 +15753,10 @@ msgstr "檔案已經存在。您要取代嗎？"
msgid "reg: Invalid command line parameters\n"
msgstr "錯誤：無效的命令列參數\n"
#: programs/reg/reg.rc:202
msgid "reg: The source and destination keys cannot be the same\n"
msgstr ""
#: programs/reg/reg.rc:131
#, fuzzy
#| msgid "Are you sure you want to delete these values?"

6
programs/reg/copy.c
View File

@ -163,6 +163,12 @@ int reg_copy(int argc, WCHAR *argvW[])
}
}
if (src.root == dest.root && !lstrcmpiW(src.subkey, dest.subkey))
{
output_message(STRING_COPY_SRC_DEST_SAME);
return 1;
}
return run_copy(&src, &dest, recurse, force);
invalid:

17
programs/reg/reg.c
View File

@ -206,7 +206,7 @@ WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD
WCHAR *get_long_key(HKEY root, WCHAR *path)
{
int i, len, path_len;
int i, len;
WCHAR *long_key;
for (i = 0; i < ARRAY_SIZE(root_rels); i++)
@ -224,15 +224,7 @@ WCHAR *get_long_key(HKEY root, WCHAR *path)
return long_key;
}
path_len = lstrlenW(path);
if (path[path_len - 1] == '\\')
{
path[path_len - 1] = 0;
path_len--;
}
len += path_len + 1; /* add one for the concatenating backslash */
len += lstrlenW(path) + 1; /* add one for the concatenating backslash */
long_key = malloc((len + 1) * sizeof(WCHAR));
swprintf(long_key, len + 1, L"%s\\%s", root_rels[i].long_name, path);
return long_key;
@ -240,6 +232,8 @@ WCHAR *get_long_key(HKEY root, WCHAR *path)
BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path)
{
WCHAR *p;
if (!sane_path(key))
return FALSE;
@ -263,6 +257,9 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path)
return FALSE;
}
p = *path + lstrlenW(*path) - 1;
if (*p == '\\') *p = 0;
return TRUE;
}

2
programs/reg/reg.rc
View File

@ -197,4 +197,6 @@ STRINGTABLE
\ /f\n\
\ Overwrite all registry data in <key2> without prompting for confirmation.\n\
\ This option does not modify subkeys and values that only exist in <key2>.\n\n"
STRING_COPY_SRC_DEST_SAME, "reg: The source and destination keys cannot be the same\n"
}

3
programs/reg/resource.h
View File

@ -59,6 +59,9 @@
#define STRING_OVERWRITE_VALUE 205
#define STRING_INVALID_CMDLINE 206
/* copy.c */
#define STRING_COPY_SRC_DEST_SAME 250
/* delete.c */
#define STRING_DELETE_VALUE 300
#define STRING_DELETE_VALUEALL 301