regedit: Re-implement processSetValue().

po/ar.po

@@ -12358,6 +12358,12 @@ msgstr "خطأ : فشل النظام في العثور على المفتاح أ
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "خطأ : تعذر إضافة المفاتيح للجهاز البعيد\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "لم يتم تحديد أي أمر."
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "إنهاء محرر السجل"

po/bg.po

@@ -11956,6 +11956,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Наистина ли искате да изтриете стойността '%s'?"
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Излиза от редактора на системния регистър"

po/ca.po

@@ -12220,6 +12220,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: No s'ha pogut suprimir la classe de registre '%1'.\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: No s'ha reconegut la línia '%1'.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Tanca l'editor de registre"

po/cs.po

@@ -12047,6 +12047,12 @@ msgstr "Chyba: Systém nemohl najít specifikovaný klíč registru nebo hodnotu
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Chyba: Nepodařilo se přidat klíče na vzdálený stroj\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "Nebyl zadán žádný příkaz."
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Ukončí editor registru"

po/da.po

@@ -12317,6 +12317,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "Der blev ikke specificeret nogen kommando."
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Afslutter Registreringsdatabase editor"

po/de.po

@@ -12184,6 +12184,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: Die Registrierungsklasse '%1' konnte nicht gelöscht werden.\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: Zeile '%1' wurde nicht erkannt.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Beendet den Registrierungs-Editor"

po/el.po

@@ -11724,6 +11724,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr ""
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/en.po

@@ -12102,6 +12102,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: Unable to delete the registry class '%1'.\n"
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: The line contains invalid syntax.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Quits the registry editor"

po/en_US.po

@@ -12102,6 +12102,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: Unable to delete the registry class '%1'.\n"
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: The line contains invalid syntax.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Quits the registry editor"

po/eo.po

@@ -11643,6 +11643,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Ĉu vi certas pri forigo de ĉi tiuj valoroj?"
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Eliras la registrejan redaktilon"

po/es.po

@@ -12396,6 +12396,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Error: No se puede agregar claves al equipo remoto\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "No se ha especificado un comando."
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Sale del editor de registro"

po/fa.po

@@ -11724,6 +11724,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr ""
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/fi.po

@@ -12077,6 +12077,12 @@ msgstr "regedit: Ei voida viedä kohdetta '%1'. Rekisteriavainta ei löydy.\n"
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: Rekisteriluokkaa '%1' ei voida poistaa.\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: Riviä '%1' ei tunnisteta.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Sulkee rekisterieditorin"

po/fr.po

@@ -12268,6 +12268,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit : impossible d'effacer la classe de registre « %1 ».\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit : la ligne « %1 » n'a pas été reconnue.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Quitte l'éditeur du registre"

po/he.po

@@ -12128,6 +12128,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Error: Unable to add keys to remote machine\n"
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "יציאה מעורך רישום המערכת"

po/hi.po

@@ -11514,6 +11514,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr ""
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/hr.po

@@ -11866,6 +11866,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Datoteka se ne može otvoriti."
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/hu.po

@@ -12312,6 +12312,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Hiba: nem lehet kulcsokat hozzáadni a távoli gépnél\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "Nem volt parancs meghatározva."
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Kilép a Regisztrációs adatbázis szerkesztőből"

po/it.po

@@ -12397,6 +12397,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Errore: impossibile aggiungere chiavi alla macchina remota\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "Non è stato specificato nessun comando."
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Esce dall'editor di registro"

po/ja.po

@@ -12103,6 +12103,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: レジストリ クラス '%1' を削除できません。\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: '%1' は認識できない行です。\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "レジストリ エディタを終了"

po/ko.po

@@ -12380,6 +12380,12 @@ msgstr "오류: 이 시스템에서 지정된 레지스트리 키나 값을 찾
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "오류: 원격 머신에  키를 더하는 것은 가능하지 않습니다\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "어떤 명령도 정의되지 않았습니다."
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "레지스트리 편집기 나가기"

po/lt.po

@@ -12106,6 +12106,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: Nepavyko pašalinti registro klasės „%1“.\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: Eilutė „%1“ neatpažinta.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Išeina iš registro tvarkytuvės"

po/ml.po

@@ -11514,6 +11514,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr ""
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/nb_NO.po

@@ -12100,6 +12100,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: Kan ikke slette registerklassen \"%1\".\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: Linjen \"%1\" ble ikke gjenkjent.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Avslutter Registerredigering"

po/nl.po

@@ -12362,6 +12362,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "Er was geen opdracht opgegeven."
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "De Register-editor afsluiten"

po/or.po

@@ -11514,6 +11514,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr ""
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/pa.po

@@ -11514,6 +11514,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr ""
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/pl.po

@@ -12149,6 +12149,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: Nie udało się usunąć klasy rejestru '%1'.\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: Nie rozpoznano linii '%1'.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Kończy działanie edytora rejestru"

po/pt_BR.po

@@ -12181,6 +12181,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: Não foi possível remover a classe de registro '%1'.\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: A linha '%1' não foi reconhecida.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Encerra o Editor do Registro"

po/pt_PT.po

@@ -12192,6 +12192,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Erro: Incapaz de adicionar chaves à máquina remota\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "Nenhum comando indicado."
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Encerra o Editor de Registo"

po/rm.po

@@ -11609,6 +11609,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr ""
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/ro.po

@@ -12105,6 +12105,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: Nu s-a putut șterge clasa de registru „%1”.\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: Linia „%1” nu a fost recunoscută.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Închide editorul de registru"

po/ru.po

@@ -12100,6 +12100,12 @@ msgstr "regedit: не удалось экспортировать «%1». Ука
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: не удалось удалить класс «%1».\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: строка «%1» не распознана.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Выход из редактора реестра"

po/sk.po

@@ -11826,6 +11826,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Chyba: Nemožno ukončiť proces \"%1\".\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "Nebol špecifikovaný žiadny príkaz."
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Ukončí editor registrov"

po/sl.po

@@ -12334,6 +12334,12 @@ msgstr "Napaka: sistem ni našel navedenega ključa ali vrednosti registra\n"
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Napaka: ni mogoče dodati ključa na oddaljen računalnik\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "Ukaz ni bil naveden."
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Konča urejevalnik registra"

po/sr_RS@cyrillic.po

@@ -12226,6 +12226,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Желите ли да избришете ових %1 ставки?"
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/sr_RS@latin.po

@@ -12377,6 +12377,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "Želite li da izbrišete ovih %1 stavki?"
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/sv.po

@@ -12009,6 +12009,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "reg: Kan inte få tillgång till fjärrmaskin\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "Inget kommando angavs."
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Avslutar Registereditorn"

po/te.po

@@ -11514,6 +11514,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr ""
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/th.po

@@ -11764,6 +11764,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr ""
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/tr.po

@@ -12122,6 +12122,12 @@ msgstr "regedit: '%1' verilemiyor. Belirtilen kayıt anahtarı bulunamadı.\n"
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: '%1' kayıt sınıfı silinemiyor.\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: '%1' satırı bilinmiyor.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Kayıt düzenleyicisinden çıkar"

po/uk.po

@@ -12197,6 +12197,12 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit: Неможливо видалити клас реєстру '%1'.\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: Рядок '%1' не був розпізнаний.\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "Виходить з редактора реєстру"

po/wa.po

@@ -11672,6 +11672,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr ""
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/wine.pot

@@ -11449,6 +11449,10 @@ msgstr ""
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr ""
 
+#: regedit.rc:398
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr ""
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr ""

po/zh_CN.po

@@ -11899,6 +11899,12 @@ msgstr "regedit: 无法导出 '%1'。未找到指定的注册表键。\n"
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "regedit：无法删除注册表类“%1”。\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "regedit: The line '%1' was not recognized.\n"
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "regedit: 行 '%1' 无法被识别。\n"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "退出注册表编辑器"

po/zh_TW.po

@@ -12265,6 +12265,12 @@ msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n"
 msgid "regedit: Unable to delete the registry class '%1'.\n"
 msgstr "錯誤：無法加入索引鍵到遠端機器\n"
 
+#: regedit.rc:398
+#, fuzzy
+#| msgid "No command was specified."
+msgid "regedit: The line contains invalid syntax.\n"
+msgstr "沒有任何命令被指定。"
+
 #: regedit.rc:163
 msgid "Quits the registry editor"
 msgstr "結束註冊表編輯器"

programs/regedit/regedit.rc

@@ -394,6 +394,7 @@ STRINGTABLE
     STRING_REG_KEY_NOT_FOUND, "regedit: Unable to export '%1'. The specified registry key was not found.\n"
     STRING_DELETE_REG_CLASS_FAILED, "regedit: Unable to delete the registry class '%1'.\n"
     STRING_UNKNOWN_TYPE, "Unknown Type"
+    STRING_INVALID_LINE_SYNTAX, "regedit: The line contains invalid syntax.\n"
 }
 
 /* define language neutral resources */

programs/regedit/regproc.c

@@ -531,63 +531,37 @@ static void closeKey(void)
  */
 static void processSetValue(WCHAR* line, BOOL is_unicode)
 {
-    WCHAR* val_name;                   /* registry value name   */
-    WCHAR* val_data;                   /* registry value data   */
-    WCHAR* p;
-    int line_idx = 0;                 /* current character under analysis */
+    WCHAR *val_name;
+    int len = 0;
     LONG res;
 
     /* get value name */
-    while ( isspaceW(line[line_idx]) ) line_idx++;
-    if (line[line_idx] == '@' && line[line_idx + 1] == '=') {
-        line[line_idx] = '\0';
     val_name = line;
-        line_idx++;
-    } else if (line[line_idx] == '\"') {
-        line_idx++;
-        val_name = line + line_idx;
-        while (line[line_idx]) {
-            if (line[line_idx] == '\\')   /* skip escaped character */
-            {
-                line_idx += 2;
-            } else {
-                if (line[line_idx] == '\"') {
-                    line[line_idx] = '\0';
-                    line_idx++;
-                    break;
-                } else {
-                    line_idx++;
-                }
-            }
-        }
-        while ( isspaceW(line[line_idx]) ) line_idx++;
-        if (!line[line_idx]) {
-            output_message(STRING_UNEXPECTED_EOL, line);
-            return;
-        }
-        if (line[line_idx] != '=') {
-            line[line_idx] = '\"';
-            output_message(STRING_UNRECOGNIZED_LINE, line);
-            return;
-        }
 
-    } else {
-        output_message(STRING_UNRECOGNIZED_LINE, line);
-        return;
-    }
-    line_idx++;                   /* skip the '=' character */
+    if (*line == '@')
+        *line++ = 0;
+    else if (!REGPROC_unescape_string(++val_name, &line))
+        goto error;
+
+    while (*line == ' ' || *line == '\t') line++;
+    if (*line != '=')
+        goto error;
+    line++;
+    while (*line == ' ' || *line == '\t') line++;
 
-    while ( isspaceW(line[line_idx]) ) line_idx++;
-    val_data = line + line_idx;
     /* trim trailing blanks */
-    line_idx = strlenW(val_data);
-    while (line_idx > 0 && isspaceW(val_data[line_idx-1])) line_idx--;
-    val_data[line_idx] = '\0';
+    len = strlenW(line);
+    while (len > 0 && (line[len - 1] == ' ' || line[len - 1] == '\t')) len--;
+    line[len] = 0;
 
-    REGPROC_unescape_string(val_name, &p);
-    res = setValue(val_name, val_data, is_unicode);
+    res = setValue(val_name, line, is_unicode);
     if ( res != ERROR_SUCCESS )
         output_message(STRING_SETVALUE_FAILED, val_name, currentKeyName);
+    return;
+
+error:
+    output_message(STRING_SETVALUE_FAILED, val_name, currentKeyName);
+    output_message(STRING_INVALID_LINE_SYNTAX);
 }
 
 /******************************************************************************

programs/regedit/resource.h

@@ -195,3 +195,4 @@
 #define STRING_REG_KEY_NOT_FOUND        3021
 #define STRING_DELETE_REG_CLASS_FAILED  3022
 #define STRING_UNKNOWN_TYPE             3023
+#define STRING_INVALID_LINE_SYNTAX      3024

programs/regedit/tests/regedit.c

@@ -859,12 +859,12 @@ static void test_import_with_whitespace(void)
     exec_import_str("REGEDIT4\n\n"
                     "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
                     "@  =  \"Test Value\"\n\n");
-    todo_wine verify_reg(hkey, "", REG_SZ, "Test Value", 11, 0);
+    verify_reg(hkey, "", REG_SZ, "Test Value", 11, 0);
 
     exec_import_str("REGEDIT4\n\n"
                     "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
                     "\t@\t=\tdword:\t00000008\t\n\n");
-    todo_wine verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0);
+    verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0);
 
     lr = RegCloseKey(hkey);
     ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);