[ros-diffs] [akhaldi] 70119: [REG] Sync with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Thu Nov 26 22:37:06 2015
New Revision: 70119

URL: http://svn.reactos.org/svn/reactos?rev=70119&view=rev
Log:
[REG] Sync with Wine Staging 1.7.55. CORE-10536

Modified:
    trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt
    trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc
    trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc
    trunk/reactos/base/applications/cmdutils/reg/reg.c
    trunk/reactos/base/applications/cmdutils/reg/reg.h
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -1,6 +1,9 @@
+
+remove_definitions(-D_WIN32_WINNT=0x502)
+add_definitions(-D_WIN32_WINNT=0x600)
 
 add_executable(reg reg.c reg.rc)
 set_module_type(reg win32cui UNICODE)
 target_link_libraries(reg wine)
-add_importlibs(reg advapi32 user32 shlwapi msvcrt kernel32 ntdll)
+add_importlibs(reg advapi32 advapi32_vista user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Грешка: Неправилни параметри
на командия ред\n"
     STRING_NO_REMOTE, "Грешка: Неуспешно добавяне на
ключове в отдалечената машина\n"
     STRING_CANNOT_FIND, "Грешка: Уредбата не откри
указания регистърен ключ или стойност\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -16,7 +16,5 @@
     STRING_INVALID_CMDLINE, "Chyba: Neplatné parametry příkazové
řádky\n"
     STRING_NO_REMOTE, "Chyba: Nelze přidat klíče na vzdálený stroj\n"
     STRING_CANNOT_FIND, "Chyba: Systém nenalezl zadaný klíč nebo hodnotu
registru\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Fejl: Ugyldige kommando linje parametre\n"
     STRING_NO_REMOTE, "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n"
     STRING_CANNOT_FIND, "Fejl: Systemet kunne ikke finde, den angivet registrerings
nøgle eller værdi\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Fehler: Ungültige Befehlszeilenargumente\n"
     STRING_NO_REMOTE, "Fehler: Konnte Schlüssel nicht zum entfernten Rechner
hinzufügen\n"
     STRING_CANNOT_FIND, "Fehler: Der angegebene Schlüssel oder Wert konnte nicht
gefunden werden\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Error: Invalid command line parameters\n"
     STRING_NO_REMOTE, "Error: Unable to access remote machine\n"
     STRING_CANNOT_FIND, "Error: The system was unable to find the specified registry
key or value\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Error: parámetros en línea de comandos no
válidos\n"
     STRING_NO_REMOTE, "Error: No se pueden agregar las claves al equipo
remoto\n"
     STRING_CANNOT_FIND, "Error: El sistema no pudo encontrar la clave o el valor del
Registro especificado\n"
-    STRING_ERROR, "Error inesperado: "
     STRING_UNSUPPORTED_TYPE, "Error: Tipo no soportado\n"
-    STRING_INVALID_DWORD, "Error: /d debe de ser un número positivo\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Erreur : paramètre de ligne de commande non
valable\n"
     STRING_NO_REMOTE, "Erreur : impossible d'ajouter des clés à une machine
distante\n"
     STRING_CANNOT_FIND, "Erreur : le système n'a pas pu trouver la clé ou la
valeur de registre spécifiée\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Errore: parametri della linea di comando non
validi\n"
     STRING_NO_REMOTE, "Errore: impossibile aggiungere chiavi alla macchina
remota\n"
     STRING_CANNOT_FIND, "Errore: il sistema non è riuscito a trovare la chiave di
registro o il valore specificati\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "エラー: コマンド
ライン引数が無効です\n"
     STRING_NO_REMOTE, "エラー: リモート
ãƒžã‚·ãƒ³ã«ã‚­ãƒ¼ã‚’è¿½åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸ\n"
     STRING_CANNOT_FIND, "エラー:
システムは指定されたキーまたは値を見つけられませんでした\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "에러:올바르지 않은 ëª…ë ¹ë¼ì¸ 매개변수\n"
     STRING_NO_REMOTE, "에러: 원격 ë¨¸ì‹ ì—  키를 더하는 것은
가능하지 않습니다\n"
     STRING_CANNOT_FIND, "에러: 이 시스템에서 ì§€ì •ëœ ë ˆì§€ìŠ¤íŠ¸ë¦¬ 키나 값을 찾을수 없습니다\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Klaida: Netinkami komandos eilutės parametrai\n"
     STRING_NO_REMOTE, "Klaida: Negalima pridėti raktų nuotoliniame
kompiuteryje\n"
     STRING_CANNOT_FIND, "Klaida: Sistemai nepavyko rasti nurodyto registro rakto ar
reikšmės\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Fout: Foutieve commandoregel-parameters\n"
     STRING_NO_REMOTE, "Fout: Sleutels konden niet toegevoegd worden aan de remote
machine\n"
     STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registersleutel of
waarde niet vinden\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Feil: Ugyldige parametere på kommandolinjen\n"
     STRING_NO_REMOTE, "Feil: Kan ikke legge til nøkler på ekstern maskin\n"
     STRING_CANNOT_FIND, "Feil: Systemet klarte ikke finne den angitte
registernøkkelen eller -verdien\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Błąd: Niewłaściwe parametry wiersza poleceń\n"
     STRING_NO_REMOTE, "Błąd: Nie można dodać kluczy do zdalnej maszyny\n"
     STRING_CANNOT_FIND, "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Erro: Parâmetros da linha de comandos
inválidos\n"
     STRING_NO_REMOTE, "Erro: Incapaz de adicionar chaves à máquina remota\n"
     STRING_CANNOT_FIND, "Erro: O sistema foi incapaz de encontrar a chave de registo
ou valor especificado\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -17,7 +17,5 @@
     STRING_INVALID_CMDLINE, "Eroare: Parametri nevalizi pentru linia de
comandă\n"
     STRING_NO_REMOTE, "Eroare: Nu se pot adăuga chei pe calculatorul de la
distanță\n"
     STRING_CANNOT_FIND, "Eroare: Sistemul nu a putut găsi cheia sau valoarea de
registru specificată\n"
-    STRING_ERROR, "Eroare neașteptată: "
     STRING_UNSUPPORTED_TYPE, "Eroare: Tip nerecunoscut\n"
-    STRING_INVALID_DWORD, "Eroare: /d trebuie să fie număr pozitiv\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Ошибка: Неправильные
параметры командной строки\n"
     STRING_NO_REMOTE, "Ошибка: Невозможно добавить
ключи на удаленной машине\n"
     STRING_CANNOT_FIND, "Ошибка: Не удалось найти
указанный ключ реестра или значение\n"
-    STRING_ERROR, "Непредвиденная ошибка: "
     STRING_UNSUPPORTED_TYPE, "Ошибка: Неподдерживаемый
тип\n"
-    STRING_INVALID_DWORD, "Ошибка: /d должно быть
положительным числом\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Napaka: Napačen parameter v ukazni vrstici\n"
     STRING_NO_REMOTE, "Napaka: Na morem dodati ključa na oddaljen
računalnik\n"
     STRING_CANNOT_FIND, "Napaka: Sistem ni našel zahtevanega ključa ali
vrednosti\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -15,7 +15,5 @@
     STRING_INVALID_CMDLINE, "Error: Parametrat e pavlefshme ne vijën
komanduse\n"
     STRING_NO_REMOTE, "Error: Në pamundësi për të shtuar çelësat në makinë
në distancë\n"
     STRING_CANNOT_FIND, "Error: Sistemi nuk ishte në gjendje për të gjetur
çelësat të caktuar të regjistrit ose vlerës\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Fel: ogiltiga kommandoradsparametrar\n"
     STRING_NO_REMOTE, "Fel: Kan inte lägga till nycklar till fjärrmaskin\n"
     STRING_CANNOT_FIND, "Fel: Systemet kunde inte hitta angiven nyckel eller värde
i registret\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -13,7 +13,5 @@
     STRING_INVALID_CMDLINE, "Yanlışlık: Geçersiz komut yatacı
değişkenleri\n"
     STRING_NO_REMOTE, "Yanlışlık: Uzak makineye erişilemez\n"
     STRING_CANNOT_FIND, "Yanlışlık: Dizge belirtilen değer defteri dizinini ya
da değerini bulamadı\n"
-    STRING_ERROR, "Beklenmeyen yanlışlık: "
     STRING_UNSUPPORTED_TYPE, "Yanlışlık: Desteklenmeyen tür\n"
-    STRING_INVALID_DWORD, "Yanlışlık: /d artı sayı olmalı\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc	[iso-8859-1] Thu Nov 26
22:37:06 2015
@@ -11,7 +11,5 @@
     STRING_INVALID_CMDLINE, "Помилка: неправильні
параметри командного рядка\n"
     STRING_NO_REMOTE, "Помилка: неможливо додати ключі
на віддаленій машині\n"
     STRING_CANNOT_FIND, "Помилка: не вдалось знайти
вказаний ключ реєстру чи значення\n"
-    STRING_ERROR, "Unexpected error: "
     STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n"
-    STRING_INVALID_DWORD, "Error: /d must be positive number\n"
 }

Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/reg.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/reg.c	[iso-8859-1] Thu Nov 26 22:37:06
2015
@@ -29,13 +29,6 @@
 
 #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A))
 
-#define ERROR_NO_REMOTE         20000
-#define ERROR_INVALID_DWORD     20001
-
-WINE_DEFAULT_DEBUG_CHANNEL(reg);
-
-static const WCHAR empty_wstr[] = {0};
-
 static const WCHAR short_hklm[] = {'H','K','L','M',0};
 static const WCHAR short_hkcu[] = {'H','K','C','U',0};
 static const WCHAR short_hkcr[] = {'H','K','C','R',0};
@@ -135,45 +128,6 @@
     return reg_printfW(formatW, msg_buffer);
 }
 
-static void reg_print_error(LSTATUS error_code)
-{
-    switch (error_code)
-    {
-        case ERROR_SUCCESS:
-            return;
-        case ERROR_BAD_COMMAND:
-            reg_message(STRING_INVALID_CMDLINE);
-            return;
-        case ERROR_INVALID_HANDLE:
-            reg_message(STRING_INVALID_KEY);
-            return;
-        case ERROR_NO_REMOTE:
-            reg_message(STRING_NO_REMOTE);
-            return;
-        case ERROR_FILE_NOT_FOUND:
-            reg_message(STRING_CANNOT_FIND);
-            return;
-        case ERROR_UNSUPPORTED_TYPE:
-            reg_message(STRING_UNSUPPORTED_TYPE);
-            return;
-        case ERROR_INVALID_DWORD:
-            reg_message(STRING_INVALID_DWORD);
-            return;
-        default:
-        {
-            static const WCHAR error_string[] =
{'%','0','5','d',':','
','%','s',0};
-            WCHAR *message = NULL;
-            FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER,
NULL,
-                error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (WCHAR
*)&message, 0, NULL);
-
-            reg_message(STRING_ERROR);
-            reg_printfW(error_string, error_code, message);
-            LocalFree(message);
-            return;
-        }
-    }
-}
-
 static inline BOOL path_rootname_cmp(const WCHAR *input_path, const WCHAR *rootkey_name)
 {
     DWORD length = strlenW(rootkey_name);
@@ -196,20 +150,6 @@
     return NULL;
 }
 
-static LSTATUS path_open(const WCHAR *path, HKEY *out, BOOL create)
-{
-    *out = path_get_rootkey(path);
-
-    path = strchrW(path, '\\');
-    if (path)
-        path++;
-
-    if (create)
-        return RegCreateKeyW(*out, path, out);
-    else
-        return RegOpenKeyW(*out, path, out);
-}
-
 static DWORD wchar_get_type(const WCHAR *type_name)
 {
     DWORD i;
@@ -226,316 +166,292 @@
     return ~0u;
 }
 
-static LSTATUS wchar_get_data(const WCHAR *input, const DWORD type, const WCHAR
separator,
-    DWORD *size_out, BYTE **out)
-{
-    DWORD i;
-
-    if (!input)
-        input = empty_wstr;
-
-    switch (type)
-    {
-        case REG_NONE:
+/* hexchar_to_byte from programs/regedit/hexedit.c */
+static inline BYTE hexchar_to_byte(WCHAR ch)
+{
+    if (ch >= '0' && ch <= '9')
+        return ch - '0';
+    else if (ch >= 'a' && ch <= 'f')
+        return ch - 'a' + 10;
+    else if (ch >= 'A' && ch <= 'F')
+        return ch - 'A' + 10;
+    else
+        return -1;
+}
+
+static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD
*reg_count)
+{
+    LPBYTE out_data = NULL;
+    *reg_count = 0;
+
+    switch (reg_type)
+    {
         case REG_SZ:
-        case REG_EXPAND_SZ:
-        {
-            i = (strlenW(input) + 1) * sizeof(WCHAR);
-            *out = HeapAlloc(GetProcessHeap(), 0, i);
-            memcpy(*out, input, i);
-            *size_out = i;
-            return ERROR_SUCCESS;
+        {
+            *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR);
+            out_data = HeapAlloc(GetProcessHeap(),0,*reg_count);
+            lstrcpyW((LPWSTR)out_data,data);
+            break;
         }
         case REG_DWORD:
-        case REG_DWORD_BIG_ENDIAN:
-        {
-            WCHAR *temp;
-
-            if (input[0] == '0' && (input[1] == 'x' || input[1]
== 'X'))
-                i = strtoulW(input, &temp, 16);
-            else
-                i = strtoulW(input, &temp, 10);
-
-            if (input[0] == '-' || temp[0] || temp == input)
-                return ERROR_INVALID_DWORD;
-
-            if (i == 0xffffffff)
-                WINE_FIXME("Check for integer overflow.\n");
-
-            *out = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD));
-            **(DWORD **) out = i;
-            *size_out = sizeof(DWORD);
-            return ERROR_SUCCESS;
-        }
-        case REG_MULTI_SZ:
-        {
-            WCHAR *temp = HeapAlloc(GetProcessHeap(), 0, (strlenW(input) + 1) *
sizeof(WCHAR));
-            DWORD p;
-
-            for (i = 0, p = 0; i <= strlenW(input); i++, p++)
+        {
+            LPWSTR rest;
+            DWORD val;
+            val = strtolW(data, &rest, 0);
+            if (rest == data) {
+                static const WCHAR nonnumber[] =
{'E','r','r','o','r',':','
','/','d','
','r','e','q','u','i','r','e','s','
','n','u','m','b','e','r','.','\n',0};
+                reg_printfW(nonnumber);
+                break;
+            }
+            *reg_count = sizeof(DWORD);
+            out_data = HeapAlloc(GetProcessHeap(),0,*reg_count);
+            ((LPDWORD)out_data)[0] = val;
+            break;
+        }
+        case REG_BINARY:
+        {
+            static const WCHAR nohex[] =
{'E','r','r','o','r',':','
','/','d','
','r','e','q','u','i','r','e','s','
','h','e','x','
','d','a','t','a','.','\n',0};
+            BYTE hex0, hex1;
+            int i = 0, destByteIndex = 0, datalen = lstrlenW(data);
+            *reg_count = ((datalen + datalen % 2) / 2) * sizeof(BYTE);
+            out_data = HeapAlloc(GetProcessHeap(), 0, *reg_count);
+            if(datalen % 2)
             {
-                /* If this character is the separator, or no separator has been given and
these
-                 * characters are "\\0", then add a 0 indicating the end of
this string */
-                if ( (separator && input[i] == separator) ||
-                     (!separator && input[i] == '\\' && input[i +
1] == '0') )
-                {
-                    /* If it's the first character or the previous one was a
separator */
-                    if (!p || temp[p - 1] == 0)
-                    {
-                        HeapFree(GetProcessHeap(), 0, temp);
-                        return ERROR_INVALID_DATA;
-                    }
-                    temp[p] = 0;
-
-                    if (!separator)
-                        i++;
-                }
-                else
-                    temp[p] = input[i];
+                hex1 = hexchar_to_byte(data[i++]);
+                if(hex1 == 0xFF)
+                    goto no_hex_data;
+                out_data[destByteIndex++] = hex1;
             }
-
-            /* Add a 0 to the end if the string wasn't "", and it
wasn't
-             * double-0-terminated already (In the case of a trailing separator) */
-            if (p > 1 && temp[p - 2])
-                temp[p++] = 0;
-
-            *size_out = p * sizeof(WCHAR);
-            *out = (BYTE *) temp;
-            return ERROR_SUCCESS;
-        }
-        case REG_BINARY:
-        {
-            BYTE *temp = HeapAlloc(GetProcessHeap(), 0, strlenW(input));
-            DWORD p, odd;
-
-            for (i = 0, p = 0; i < strlenW(input); i++, p++)
+            for(;i + 1 < datalen;i += 2)
             {
-                if (input[i] >= '0' && input[i] <= '9')
-                    temp[p] = input[i] - '0';
-                else if (input[i] >= 'a' && input[i] <=
'f')
-                    temp[p] = input[i] - 'a' + 10;
-                else if (input[i] >= 'A' && input[i] <=
'F')
-                    temp[p] = input[i] - 'A' + 10;
-                else
-                {
-                    HeapFree(GetProcessHeap(), 0, temp);
-                    return ERROR_INVALID_DATA;
-                }
+                hex0 = hexchar_to_byte(data[i]);
+                hex1 = hexchar_to_byte(data[i + 1]);
+                if(hex0 == 0xFF || hex1 == 0xFF)
+                    goto no_hex_data;
+                out_data[destByteIndex++] = (hex0 << 4) | hex1;
             }
-
-            *out = temp;
-            odd = p & 1;
-            temp += odd;
-            p >>= 1;
-
-            for (i = 0; i < p; i++)
-                temp[i] = (temp[i * 2] << 4) | temp[i * 2 + 1];
-
-            *size_out = p + odd;
-            return ERROR_SUCCESS;
+            break;
+            no_hex_data:
+            /* cleanup, print error */
+            HeapFree(GetProcessHeap(), 0, out_data);
+            reg_printfW(nohex);
+            out_data = NULL;
+            break;
         }
         default:
         {
-            WINE_FIXME("Add support for registry type: %u\n", type);
-            return ERROR_UNSUPPORTED_TYPE;
-        }
-    }
-}
-
-static LSTATUS sane_path(const WCHAR *key)
-{
-    int i = strlenW(key);
+            static const WCHAR unhandled[] =
{'U','n','h','a','n','d','l','e','d','
','T','y','p','e','
','0','x','%','x',' ','
','d','a','t','a','
','%','s','\n',0};
+            reg_printfW(unhandled, reg_type,data);
+        }
+    }
+
+    return out_data;
+}
+
+static BOOL sane_path(const WCHAR *key)
+{
+    unsigned int i = strlenW(key);
 
     if (i < 3 || (key[i - 1] == '\\' && key[i - 2] == '\\'))
-        return ERROR_INVALID_HANDLE;
+    {
+        reg_message(STRING_INVALID_KEY);
+        return FALSE;
+    }
 
     if (key[0] == '\\' && key[1] == '\\' && key[2] !=
'\\')
-        return ERROR_NO_REMOTE;
-
-    return ERROR_SUCCESS;
-}
-
-static int reg_add( const WCHAR *key_name,  const WCHAR *value_name,    const BOOL
value_empty,
-                    const WCHAR *type,      const WCHAR separator,      const WCHAR
*data,
-                    const BOOL force)
-{
-    HKEY key = NULL;
-    LONG err = sane_path(key_name);
-    if (err != ERROR_SUCCESS)
-        goto error;
-
-    if (value_name && value_empty)
-    {
-        err = ERROR_BAD_COMMAND;
-        goto error;
-    }
-
-    err = path_open(key_name, &key, TRUE);
-    if (err != ERROR_SUCCESS)
-        goto error;
+    {
+        reg_message(STRING_NO_REMOTE);
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
+    WCHAR *type, WCHAR separator, WCHAR *data, BOOL force)
+{
+    static const WCHAR stubW[] = {'A','D','D','
','-',' ','%','s',
+        ' ','%','s',' ','%','d','
','%','s',' ','%','s','
','%','d','\n',0};
+    LPWSTR p;
+    HKEY root,subkey;
+
+    reg_printfW(stubW, key_name, value_name, value_empty, type, data, force);
+
+    if (!sane_path(key_name))
+        return 1;
+
+    p = strchrW(key_name,'\\');
+    if (!p)
+    {
+        reg_message(STRING_INVALID_KEY);
+        return 1;
+    }
+    p++;
+
+    root = path_get_rootkey(key_name);
+    if (!root)
+    {
+        reg_message(STRING_INVALID_KEY);
+        return 1;
+    }
+
+    if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS)
+    {
+        reg_message(STRING_INVALID_KEY);
+        return 1;
+    }
 
     if (value_name || data)
     {
-        DWORD size, reg_type;
-        BYTE *data_out;
-
-        if (value_name && !value_name[0])
-            value_name = NULL;
-
-        if (type && !type[0])
-        {
-            data = NULL;
-            type = NULL;
-        }
-
-        if (!force && RegQueryValueExW(key, value_name, NULL, NULL, NULL, NULL)
== ERROR_SUCCESS)
-        {
-            WINE_FIXME("Prompt for overwrite\n");
+        DWORD reg_type;
+        DWORD reg_count = 0;
+        BYTE* reg_data = NULL;
+
+        if (!force)
+        {
+            if (RegQueryValueW(subkey,value_name,NULL,NULL)==ERROR_SUCCESS)
+            {
+                /* FIXME:  Prompt for overwrite */
+            }
         }
 
         reg_type = wchar_get_type(type);
         if (reg_type == ~0u)
         {
-            err = ERROR_INVALID_DATATYPE;
-            goto error;
-        }
-
-        err = wchar_get_data(data, reg_type, separator, &size, &data_out);
-        if (err != ERROR_SUCCESS)
-            goto error;
-
-        err = RegSetValueExW(key, value_name, 0, reg_type, data_out, size);
-        HeapFree(GetProcessHeap(), 0, data_out);
-        if (err != ERROR_SUCCESS)
-            goto error;
-    }
-
-    RegCloseKey(key);
+            RegCloseKey(subkey);
+            reg_message(STRING_UNSUPPORTED_TYPE);
+            return 1;
+        }
+
+        if (data)
+            reg_data = get_regdata(data,reg_type,separator,&reg_count);
+
+        RegSetValueExW(subkey,value_name,0,reg_type,reg_data,reg_count);
+        HeapFree(GetProcessHeap(),0,reg_data);
+    }
+
+    RegCloseKey(subkey);
+    reg_message(STRING_SUCCESS);
+
+    return 0;
+}
+
+static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
+    BOOL value_all, BOOL force)
+{
+    LPWSTR p;
+    HKEY root,subkey;
+
+    static const WCHAR stubW[] =
{'D','E','L','E','T','E',
+        ' ','-',' ','%','s','
','%','s',' ','%','d','
','%','d',' ','%','d','\n'
+        ,0};
+    reg_printfW(stubW, key_name, value_name, value_empty, value_all, force);
+
+    if (!sane_path(key_name))
+        return 1;
+
+    p = strchrW(key_name,'\\');
+    if (!p)
+    {
+        reg_message(STRING_INVALID_KEY);
+        return 1;
+    }
+    p++;
+
+    root = path_get_rootkey(key_name);
+    if (!root)
+    {
+        reg_message(STRING_INVALID_KEY);
+        return 1;
+    }
+
+    if (value_name && value_empty)
+    {
+        reg_message(STRING_INVALID_CMDLINE);
+        return 1;
+    }
+
+    if (value_empty && value_all)
+    {
+        reg_message(STRING_INVALID_CMDLINE);
+        return 1;
+    }
+
+    if (!force)
+    {
+        /* FIXME:  Prompt for delete */
+    }
+
+    /* Delete subtree only if no /v* option is given */
+    if (!value_name && !value_empty && !value_all)
+    {
+        if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS)
+        {
+            reg_message(STRING_CANNOT_FIND);
+            return 1;
+        }
+        reg_message(STRING_SUCCESS);
+        return 0;
+    }
+
+    if(RegOpenKeyW(root,p,&subkey)!=ERROR_SUCCESS)
+    {
+        reg_message(STRING_CANNOT_FIND);
+        return 1;
+    }
+
+    if (value_all)
+    {
+        LPWSTR szValue;
+        DWORD maxValue;
+        DWORD count;
+        LONG rc;
+
+        rc = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+            &maxValue, NULL, NULL, NULL);
+        if (rc != ERROR_SUCCESS)
+        {
+            /* FIXME: failure */
+            RegCloseKey(subkey);
+            return 1;
+        }
+        maxValue++;
+        szValue = HeapAlloc(GetProcessHeap(),0,maxValue*sizeof(WCHAR));
+
+        while (1)
+        {
+            count = maxValue;
+            rc = RegEnumValueW(subkey, 0, szValue, &count, NULL, NULL, NULL, NULL);
+            if (rc == ERROR_SUCCESS)
+            {
+                rc = RegDeleteValueW(subkey, szValue);
+                if (rc != ERROR_SUCCESS)
+                    break;
+            }
+            else break;
+        }
+        if (rc != ERROR_SUCCESS)
+        {
+            /* FIXME  delete failed */
+        }
+    }
+    else if (value_name)
+    {
+        if (RegDeleteValueW(subkey,value_name) != ERROR_SUCCESS)
+        {
+            RegCloseKey(subkey);
+            reg_message(STRING_CANNOT_FIND);
+            return 1;
+        }
+    }
+    else if (value_empty)
+    {
+        RegSetValueExW(subkey,NULL,0,REG_SZ,NULL,0);
+    }
+
+    RegCloseKey(subkey);
     reg_message(STRING_SUCCESS);
     return 0;
-
-error:
-    RegCloseKey(key);
-    reg_print_error(err);
-    return 1;
-}
-
-static int reg_delete(const WCHAR *key_name,    const WCHAR *value_name,  const BOOL
value_empty,
-                      const BOOL value_all,     const BOOL force)
-{
-    HKEY key = NULL;
-    LONG err = sane_path(key_name);
-    if (err != ERROR_SUCCESS)
-    {
-        reg_print_error(err);
-        return 1;
-    }
-
-    err = path_open(key_name, &key, FALSE);
-    if (err != ERROR_SUCCESS)
-        goto error;
-
-    /* Mutually exclusive options */
-    if ((!!value_name + !!value_empty + !!value_all) > 1)
-    {
-        err = ERROR_BAD_COMMAND;
-        goto error;
-    }
-
-    if (!force)
-    {
-        WINE_FIXME("Prompt for delete\n");
-    }
-
-    if (value_empty || value_name)
-    {
-        if (value_name && value_name[0])
-            err = RegDeleteValueW(key, value_name);
-        else
-            err = RegDeleteValueW(key, NULL);
-
-        if (err != ERROR_SUCCESS)
-            goto error;
-    }
-    else if (value_all)
-    {
-        WCHAR *enum_v_name;
-        DWORD count, max_size, this_size, i = 0;
-        BOOL incomplete = FALSE;
-
-        err = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, NULL,
-                &count, &max_size, NULL, NULL, NULL);
-        if (err != ERROR_SUCCESS)
-            goto error;
-
-        max_size++;
-        enum_v_name = HeapAlloc(GetProcessHeap(), 0, max_size * sizeof(WCHAR));
-        if (!enum_v_name)
-        {
-            err = ERROR_NOT_ENOUGH_MEMORY;
-            goto error;
-        }
-
-        while (i < count)
-        {
-            this_size = max_size;
-
-            err = RegEnumValueW(key, i, enum_v_name, &this_size, NULL, NULL, NULL,
NULL);
-            if (err != ERROR_SUCCESS)
-            {
-                reg_print_error(err);
-                incomplete = TRUE;
-                i++;
-                continue;
-            }
-
-            err = RegDeleteValueW(key, enum_v_name);
-            if (err != ERROR_SUCCESS)
-            {
-                reg_print_error(err);
-                incomplete = TRUE;
-                i++;
-                continue;
-            }
-
-            count--;
-        }
-
-        HeapFree(GetProcessHeap(), 0, enum_v_name);
-
-        if (incomplete)
-        {
-            RegCloseKey(key);
-            return 1;
-        }
-    }
-    /* Delete subtree only if no /v* option is given */
-    else
-    {
-        if (key == path_get_rootkey(key_name))
-        {
-            /* "This works well enough on native to make you regret you pressed
enter" - stefand */
-            WINE_FIXME("Deleting a root key is not implemented.\n");
-            RegCloseKey(key);
-            return 1;
-        }
-
-        err = SHDeleteKey(key, NULL);
-        if (err != ERROR_SUCCESS)
-            goto error;
-        err = RegDeleteKeyW(key, empty_wstr);
-        if (err != ERROR_SUCCESS)
-            goto error;
-    }
-
-    RegCloseKey(key);
-    reg_message(STRING_SUCCESS);
-    return 0;
-
-error:
-    RegCloseKey(key);
-    reg_print_error(err);
-    return 1;
 }
 
 static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
@@ -579,7 +495,7 @@
 
         if (argc < 3)
         {
-            reg_print_error(ERROR_BAD_COMMAND);
+            reg_message(STRING_INVALID_CMDLINE);
             return 1;
         }
         else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) ||
@@ -599,14 +515,7 @@
             else if (!lstrcmpiW(argvW[i], slashTW))
                 type = argvW[++i];
             else if (!lstrcmpiW(argvW[i], slashSW))
-            {
-                if (!argvW[++i][0] || argvW[i][1])
-                {
-                    reg_print_error(ERROR_BAD_COMMAND);
-                    return 1;
-                }
-                separator = argvW[i][0];
-            }
+                separator = argvW[++i][0];
             else if (!lstrcmpiW(argvW[i], slashDW))
                 data = argvW[++i];
             else if (!lstrcmpiW(argvW[i], slashFW))
@@ -622,7 +531,7 @@
 
         if (argc < 3)
         {
-            reg_print_error(ERROR_BAD_COMMAND);
+            reg_message(STRING_INVALID_CMDLINE);
             return 1;
         }
         else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) ||
@@ -653,7 +562,7 @@
 
         if (argc < 3)
         {
-            reg_print_error(ERROR_BAD_COMMAND);
+            reg_message(STRING_INVALID_CMDLINE);
             return 1;
         }
         else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) ||
@@ -677,7 +586,7 @@
     }
     else
     {
-        reg_print_error(ERROR_BAD_COMMAND);
-        return 1;
-    }
-}
+        reg_message(STRING_INVALID_CMDLINE);
+        return 1;
+    }
+}

Modified: trunk/reactos/base/applications/cmdutils/reg/reg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…
==============================================================================
--- trunk/reactos/base/applications/cmdutils/reg/reg.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/reg/reg.h	[iso-8859-1] Thu Nov 26 22:37:06
2015
@@ -32,6 +32,4 @@
 #define STRING_INVALID_CMDLINE  107
 #define STRING_NO_REMOTE        108
 #define STRING_CANNOT_FIND      109
-#define STRING_ERROR            110
-#define STRING_UNSUPPORTED_TYPE 111
-#define STRING_INVALID_DWORD    112
+#define STRING_UNSUPPORTED_TYPE 110

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Thu Nov 26 22:37:06 2015
@@ -229,7 +229,7 @@
 ReactOS shares the following programs with Winehq.
 
 reactos/base/applications/cmdutils/cscript  # Synced to WineStaging-1.7.47
-reactos/base/applications/cmdutils/reg      # Synced to WineStaging-1.7.37
+reactos/base/applications/cmdutils/reg      # Synced to WineStaging-1.7.55
 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.7.47
 reactos/base/applications/cmdutils/wmic     # Synced to WineStaging-1.7.47
 reactos/base/applications/cmdutils/wscript  # Synced to WineStaging-1.7.37