25 Mar
2018
25 Mar
'18
11:50 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80c45b1f0692500976b5c…
commit 80c45b1f0692500976b5cb96df20ee05f8c2bec1
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun Mar 25 12:50:15 2018 +0100
Commit: Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun Mar 25 12:50:15 2018 +0100
[REG] Sync with Wine Staging 3.3. CORE-14434
---
base/applications/cmdutils/reg/export.c | 5 ++---
base/applications/cmdutils/reg/import.c | 7 ++++---
base/applications/cmdutils/reg/lang/bg-BG.rc | 2 +-
base/applications/cmdutils/reg/lang/cs-CZ.rc | 2 +-
base/applications/cmdutils/reg/lang/da-DK.rc | 2 +-
base/applications/cmdutils/reg/lang/de-DE.rc | 2 +-
base/applications/cmdutils/reg/lang/en-US.rc | 2 +-
base/applications/cmdutils/reg/lang/es-ES.rc | 2 +-
base/applications/cmdutils/reg/lang/fr-FR.rc | 2 +-
base/applications/cmdutils/reg/lang/it-IT.rc | 2 +-
base/applications/cmdutils/reg/lang/ja-JP.rc | 2 +-
base/applications/cmdutils/reg/lang/ko-KR.rc | 2 +-
base/applications/cmdutils/reg/lang/lt-LT.rc | 2 +-
base/applications/cmdutils/reg/lang/nl-NL.rc | 2 +-
base/applications/cmdutils/reg/lang/no-NO.rc | 2 +-
base/applications/cmdutils/reg/lang/pl-PL.rc | 2 +-
base/applications/cmdutils/reg/lang/pt-PT.rc | 2 +-
base/applications/cmdutils/reg/lang/ro-RO.rc | 2 +-
base/applications/cmdutils/reg/lang/ru-RU.rc | 2 +-
base/applications/cmdutils/reg/lang/sl-SI.rc | 2 +-
base/applications/cmdutils/reg/lang/sq-AL.rc | 2 +-
base/applications/cmdutils/reg/lang/sv-SE.rc | 2 +-
base/applications/cmdutils/reg/lang/tr-TR.rc | 2 +-
base/applications/cmdutils/reg/lang/uk-UA.rc | 2 +-
base/applications/cmdutils/reg/lang/zh-CN.rc | 2 +-
base/applications/cmdutils/reg/lang/zh-TW.rc | 2 +-
base/applications/cmdutils/reg/reg.c | 25 ++++++-------------------
base/applications/cmdutils/reg/reg.h | 1 -
base/applications/cmdutils/reg/resource.h | 2 +-
media/doc/README.WINE | 2 +-
30 files changed, 38 insertions(+), 52 deletions(-)
diff --git a/base/applications/cmdutils/reg/export.c
b/base/applications/cmdutils/reg/export.c
index 24b9dc8374..622e7ca8d9 100644
--- a/base/applications/cmdutils/reg/export.c
+++ b/base/applications/cmdutils/reg/export.c
@@ -16,12 +16,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
+#include <windows.h>
#include <stdlib.h>
#include <wine/unicode.h>
+#include <wine/heap.h>
#include "reg.h"
diff --git a/base/applications/cmdutils/reg/import.c
b/base/applications/cmdutils/reg/import.c
index c4c988d7d1..f2ce80e7cb 100644
--- a/base/applications/cmdutils/reg/import.c
+++ b/base/applications/cmdutils/reg/import.c
@@ -16,13 +16,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
+#include <windows.h>
+#include <errno.h>
#include <stdio.h>
+#include <stdlib.h>
#include <wine/unicode.h>
#include <wine/debug.h>
+#include <wine/heap.h>
#include "reg.h"
diff --git a/base/applications/cmdutils/reg/lang/bg-BG.rc
b/base/applications/cmdutils/reg/lang/bg-BG.rc
index 23fbfb0255..51303d004c 100644
--- a/base/applications/cmdutils/reg/lang/bg-BG.rc
+++ b/base/applications/cmdutils/reg/lang/bg-BG.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE
{
- STRING_USAGE, "Синтаксисът на командата е:\n\nREG [ ADD | DELETE | QUERY ]\nREG
команда /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD ключ_име [/v стойност_име | /ve] [/t вид] [/s
разделител] [/d данни] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE ключ_име [/v стойност_име | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY ключ_име [/v стойност_име | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/cs-CZ.rc
b/base/applications/cmdutils/reg/lang/cs-CZ.rc
index ab9bfde01e..3b5e7a1754 100644
--- a/base/applications/cmdutils/reg/lang/cs-CZ.rc
+++ b/base/applications/cmdutils/reg/lang/cs-CZ.rc
@@ -7,7 +7,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
STRINGTABLE
{
- STRING_USAGE, "Syntaxe tohoto příkazu:\n\nREG [ ADD | DELETE | QUERY ]\nREG
operace /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD název_klíče [/v název_hodnoty | /ve] [/t type] [/s
oddělovač] [/d data] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE název_klíče [/v název_hodnoty | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY název_klíče [/v název_hodnoty | /ve]
[/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/da-DK.rc
b/base/applications/cmdutils/reg/lang/da-DK.rc
index 6c8338ca0f..b4c3468684 100644
--- a/base/applications/cmdutils/reg/lang/da-DK.rc
+++ b/base/applications/cmdutils/reg/lang/da-DK.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE
{
- STRING_USAGE, "Syntaksen for dette kommando er:\n\nREG [ ADD | DELETE | QUERY
]\nREG kommando /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD nøgle_navn [/v værdi | /ve] [/t type] [/s separator]
[/d data] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE nøgle_navn [/v værdi | /ve | /va] [/f]\n"
STRING_QUERY_USAGE, "REG QUERY nøgle_navn [/v værdi | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/de-DE.rc
b/base/applications/cmdutils/reg/lang/de-DE.rc
index ec0cd460ed..927e7ba48c 100644
--- a/base/applications/cmdutils/reg/lang/de-DE.rc
+++ b/base/applications/cmdutils/reg/lang/de-DE.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE
{
- STRING_USAGE, "Syntax:\n\nREG [ ADD | DELETE | QUERY ]\nREG Befehl /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD Schlüssel [/v Wert | /ve] [/t Typ] [/s Trenner] [/d
Daten] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE Schlüssel [/v Wert | /ve | /va] [/f]\n"
STRING_QUERY_USAGE, "REG QUERY Schlüssel [/v Wert | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/en-US.rc
b/base/applications/cmdutils/reg/lang/en-US.rc
index 9c9bef54ed..26ce1697f0 100644
--- a/base/applications/cmdutils/reg/lang/en-US.rc
+++ b/base/applications/cmdutils/reg/lang/en-US.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE
{
- STRING_USAGE, "The syntax of this command is:\n\nREG [ ADD | DELETE | QUERY
]\nREG command /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s
separator] [/d data] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/es-ES.rc
b/base/applications/cmdutils/reg/lang/es-ES.rc
index 60bb78af8e..ad2b984e41 100644
--- a/base/applications/cmdutils/reg/lang/es-ES.rc
+++ b/base/applications/cmdutils/reg/lang/es-ES.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
{
- STRING_USAGE, "La sintaxis de este comando es:\n\nREG [ ADD | DELETE | QUERY
]\nREG comando /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD nombre_clave [/v nombre_valor | /ve] [/t tipo] [/s
separador] [/d datos] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE nombre_clave [/v nombre_valor | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY nombre_clave [/v nombre_valor | /ve]
[/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/fr-FR.rc
b/base/applications/cmdutils/reg/lang/fr-FR.rc
index 89aceb9079..757169f163 100644
--- a/base/applications/cmdutils/reg/lang/fr-FR.rc
+++ b/base/applications/cmdutils/reg/lang/fr-FR.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE
{
- STRING_USAGE, "La syntaxe de cette commande est :\n\nREG [ ADD | DELETE | QUERY
]\nREG commande /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD nom_de_clé [/v nom_de_valeur | /ve] [/t type] [/s
séparateur] [/d données] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE nom_de_clé [/v nom_de_valeur | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY nom_de_clé [/v nom_de_valeur | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/it-IT.rc
b/base/applications/cmdutils/reg/lang/it-IT.rc
index c2ad7f34e5..ed268d3698 100644
--- a/base/applications/cmdutils/reg/lang/it-IT.rc
+++ b/base/applications/cmdutils/reg/lang/it-IT.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE
{
- STRING_USAGE, "La sintassi di questo comando è:\n\nREG [ ADD | DELETE | QUERY
]\nREG comando /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD nome_della_chiave [/v nome_del_valore | /ve] [/t
tipo] [/s separatore] [/d dati] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE nome_della_chiave [/v nome_del_valore | /ve |
/va] [/f]\n"
STRING_QUERY_USAGE, "REG QUERY nome_della_chiave [/v nome_del_valore | /ve]
[/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/ja-JP.rc
b/base/applications/cmdutils/reg/lang/ja-JP.rc
index 07e7fd73bf..3dc044cf0d 100644
--- a/base/applications/cmdutils/reg/lang/ja-JP.rc
+++ b/base/applications/cmdutils/reg/lang/ja-JP.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE
{
- STRING_USAGE, "このコマンドの構文は次のとおりです:\n\nREG [ ADD | DELETE | QUERY ]\nREG コマンド
/?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD キー名 [/v 値名 | /ve] [/t type] [/s セパレータ] [/d データ]
[/f]\n"
STRING_DELETE_USAGE, "REG DELETE キー名 [/v 値名 | /ve | /va] [/f]\n"
STRING_QUERY_USAGE, "REG QUERY キー名 [/v 値名 | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/ko-KR.rc
b/base/applications/cmdutils/reg/lang/ko-KR.rc
index ba9af4b55a..552a031c9c 100644
--- a/base/applications/cmdutils/reg/lang/ko-KR.rc
+++ b/base/applications/cmdutils/reg/lang/ko-KR.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE
{
- STRING_USAGE, "명령어 형식:\n\nREG [ ADD | DELETE | QUERY ]\nREG 명령어 /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD 값 [/v 값 | /ve] [/t 형식] [/s 분리기호] [/d 데이타]
[/f]\n"
STRING_DELETE_USAGE, "REG DELETE 키 이름 [/v 값 | /ve | /va] [/f]\n"
STRING_QUERY_USAGE, "REG QUERY 키 이름 [/v 값| /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/lt-LT.rc
b/base/applications/cmdutils/reg/lang/lt-LT.rc
index c8feef0d97..70f2786b67 100644
--- a/base/applications/cmdutils/reg/lang/lt-LT.rc
+++ b/base/applications/cmdutils/reg/lang/lt-LT.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
STRINGTABLE
{
- STRING_USAGE, "Šios komandos sintaksė yra:\n\nREG [ ADD | DELETE | QUERY ]\nREG
komanda /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD rakto_vardas [/v reikšmės_vardas | /ve] [/t tipas]
[/s skirtukas] [/d duomenys] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE rakto_vardas [/v reikšmės_vardas | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY rakto_vardas [/v reikšmės_vardas | /ve]
[/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/nl-NL.rc
b/base/applications/cmdutils/reg/lang/nl-NL.rc
index a62f1780fa..a24806ef3e 100644
--- a/base/applications/cmdutils/reg/lang/nl-NL.rc
+++ b/base/applications/cmdutils/reg/lang/nl-NL.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE
{
- STRING_USAGE, "Gebruik van dit commando is:\n\nREG [ ADD | DELETE | QUERY ]\nREG
commando /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD sleutel_naam [/v waarde_naam | /ve] [/t type] [/s
scheidingsteken] [/d data] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE sleutel_naam [/v waarde_naam | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY sleutel_naam [/v waarde_naam | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/no-NO.rc
b/base/applications/cmdutils/reg/lang/no-NO.rc
index b9c269e1c3..cfef4d4323 100644
--- a/base/applications/cmdutils/reg/lang/no-NO.rc
+++ b/base/applications/cmdutils/reg/lang/no-NO.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE
{
- STRING_USAGE, "Programmer kjøres som følger:\n\nREG [ ADD | DELETE | QUERY
]\nREG kommando /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD nøkkelnavn [/v verdi | /ve] [/t type] [/s separator]
[/d data] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE nøkkelnavn [/v verdi | /ve | /va] [/f]\n"
STRING_QUERY_USAGE, "REG QUERY nøkkelnavn [/v verdi | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/pl-PL.rc
b/base/applications/cmdutils/reg/lang/pl-PL.rc
index 92f98dccae..117d50ce4b 100644
--- a/base/applications/cmdutils/reg/lang/pl-PL.rc
+++ b/base/applications/cmdutils/reg/lang/pl-PL.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE
{
- STRING_USAGE, "Składnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG
polecenie /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartości | /ve] [/t typ] [/s
separator] [/d dane] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartości | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartości | /ve]
[/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/pt-PT.rc
b/base/applications/cmdutils/reg/lang/pt-PT.rc
index dd39615452..5e3d477e33 100644
--- a/base/applications/cmdutils/reg/lang/pt-PT.rc
+++ b/base/applications/cmdutils/reg/lang/pt-PT.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
STRINGTABLE
{
- STRING_USAGE, "A sintaxe deste comando é:\n\nREG [ ADD | DELETE | QUERY ]\nREG
comando /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD nome_chave [/v nome_valor | /ve] [/t tipo] [/s
separador] [/d dados] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE nome_chave [/v nome_valor | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY nome_chave [/v nome_valor | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/ro-RO.rc
b/base/applications/cmdutils/reg/lang/ro-RO.rc
index 5c613624d9..7b4691c31e 100644
--- a/base/applications/cmdutils/reg/lang/ro-RO.rc
+++ b/base/applications/cmdutils/reg/lang/ro-RO.rc
@@ -8,7 +8,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
{
- STRING_USAGE, "Sintaxa acestei comenzi este:\n\nREG [ ADD | DELETE | QUERY
]\nREG comandă /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD nume_cheie [/v nume_valoare | /ve] [/t tip] [/s
separator] [/d date] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE nume_cheie [/v nume_valoare | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY nume_cheie [/v nume_valoare | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/ru-RU.rc
b/base/applications/cmdutils/reg/lang/ru-RU.rc
index f8d3d8afbe..e75ad5c0a7 100644
--- a/base/applications/cmdutils/reg/lang/ru-RU.rc
+++ b/base/applications/cmdutils/reg/lang/ru-RU.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
{
- STRING_USAGE, "Использование:\n\nREG [ ADD | DELETE | QUERY ]\nREG
<команда> /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD <имя_раздела> [/v <имя_параметра> | /ve]
[/t <тип>] [/s <разделитель>] [/d <данные>] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE <имя_раздела> [/v <имя_параметра> |
/ve | /va] [/f]\n"
STRING_QUERY_USAGE, "REG QUERY <имя_раздела> [/v [имя_параметра] | /ve]
[/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/sl-SI.rc
b/base/applications/cmdutils/reg/lang/sl-SI.rc
index cd22ffe74c..134a398ec0 100644
--- a/base/applications/cmdutils/reg/lang/sl-SI.rc
+++ b/base/applications/cmdutils/reg/lang/sl-SI.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE
{
- STRING_USAGE, "Sintaksa ukaza:\n\nREG [ ADD | DELETE | QUERY ]\nREG ukaz
/?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD ime_ključa [/v ime_vrednosti | /ve] [/t vrsta] [/s
ločilo] [/d podatki] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE ime_ključa [/v ime_vrednosti | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY ime_ključa [/v ime_vrednosti | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/sq-AL.rc
b/base/applications/cmdutils/reg/lang/sq-AL.rc
index 2c4d2f5f4c..ed63303e4c 100644
--- a/base/applications/cmdutils/reg/lang/sq-AL.rc
+++ b/base/applications/cmdutils/reg/lang/sq-AL.rc
@@ -6,7 +6,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
STRINGTABLE
{
- STRING_USAGE, "Sintaksa e kësaj komande është:\n\nREG [ ADD | DELETE | QUERY
]\nREG Komandë /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD emri_çelsit [/v value_name | /ve] [/t tipi] [/s
ndares] [/d data] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE emri_çelsit [/v value_name | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY emri_çelsit [/v value_name | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/sv-SE.rc
b/base/applications/cmdutils/reg/lang/sv-SE.rc
index 978e704c6a..70b59a2775 100644
--- a/base/applications/cmdutils/reg/lang/sv-SE.rc
+++ b/base/applications/cmdutils/reg/lang/sv-SE.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
STRINGTABLE
{
- STRING_USAGE, "Syntax för detta kommando är:\n\nREG [ ADD | DELETE | QUERY
]\nREG kommando /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD nyckelnamn [/v värdenamn | /ve] [/t typ] [/s
separator] [/d data] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE nyckelnamn [/v värdenamn | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY nyckelnamn [/v värdenamn | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/tr-TR.rc
b/base/applications/cmdutils/reg/lang/tr-TR.rc
index e46733002c..742923183b 100644
--- a/base/applications/cmdutils/reg/lang/tr-TR.rc
+++ b/base/applications/cmdutils/reg/lang/tr-TR.rc
@@ -4,7 +4,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
STRINGTABLE
{
- STRING_USAGE, "Bu komutun yazımı:\n\nREG [ ADD | DELETE | QUERY ]\nREG komut
/?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD dizin adı [/v değer adı | /ve] [/t tür] [/s ayırıcı]
[/d veri] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE dizin adı [/v değer adı | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY dizin adı [/v değer adı | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/uk-UA.rc
b/base/applications/cmdutils/reg/lang/uk-UA.rc
index 7ca1cff6a5..a2c2b6a373 100644
--- a/base/applications/cmdutils/reg/lang/uk-UA.rc
+++ b/base/applications/cmdutils/reg/lang/uk-UA.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE
{
- STRING_USAGE, "Синтаксис цієї команди наступний:\n\nREG [ ADD | DELETE | QUERY
]\nREG <команда> /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD <ключ> [/v <параметр> | /ve] [/t
<тип>] [/s <розділювач>] [/d дані] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE <ключ> [/v <параметр> | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY <ключ> [/v <параметр> | /ve]
[/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/zh-CN.rc
b/base/applications/cmdutils/reg/lang/zh-CN.rc
index 617bed503a..4c65c03424 100644
--- a/base/applications/cmdutils/reg/lang/zh-CN.rc
+++ b/base/applications/cmdutils/reg/lang/zh-CN.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
{
- STRING_USAGE, "本命令的语法是:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s
separator] [/d data] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va]
[/f]\n"
STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/lang/zh-TW.rc
b/base/applications/cmdutils/reg/lang/zh-TW.rc
index b9cff9a283..1ff58c1a08 100644
--- a/base/applications/cmdutils/reg/lang/zh-TW.rc
+++ b/base/applications/cmdutils/reg/lang/zh-TW.rc
@@ -4,7 +4,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
STRINGTABLE
{
- STRING_USAGE, "此命令的語法是:\n\nREG [ ADD | DELETE | QUERY ]\nREG 命令 /?\n"
+ STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n
ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG
[operation] /?\n\n"
STRING_ADD_USAGE, "REG ADD 金鑰名稱 [/v 值名稱 | /ve] [/t 類型] [/s 分隔符] [/d 資料]
[/f]\n"
STRING_DELETE_USAGE, "REG DELETE 金鑰名稱 [/v 值名稱 | /ve | /va] [/f]\n"
STRING_QUERY_USAGE, "REG QUERY 金鑰名稱 [/v 值名稱 | /ve] [/s]\n"
diff --git a/base/applications/cmdutils/reg/reg.c b/base/applications/cmdutils/reg/reg.c
index b9db08e787..455d3dd96a 100644
--- a/base/applications/cmdutils/reg/reg.c
+++ b/base/applications/cmdutils/reg/reg.c
@@ -16,15 +16,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
-#include <wincon.h>
-#include <shlwapi.h>
+#include <windows.h>
+#include <errno.h>
+#include <stdlib.h>
#include <wine/unicode.h>
#include <wine/debug.h>
+#include <wine/heap.h>
#include "reg.h"
WINE_DEFAULT_DEBUG_CHANNEL(reg);
@@ -85,7 +82,7 @@ static const WCHAR newlineW[] = {'\n',0};
void *heap_xalloc(size_t size)
{
- void *buf = HeapAlloc(GetProcessHeap(), 0, size);
+ void *buf = heap_alloc(size);
if (!buf)
{
ERR("Out of memory!\n");
@@ -96,12 +93,7 @@ void *heap_xalloc(size_t size)
void *heap_xrealloc(void *buf, size_t size)
{
- void *new_buf;
-
- if (buf)
- new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size);
- else
- new_buf = HeapAlloc(GetProcessHeap(), 0, size);
+ void *new_buf = heap_realloc(buf, size);
if (!new_buf)
{
@@ -112,11 +104,6 @@ void *heap_xrealloc(void *buf, size_t size)
return new_buf;
}
-BOOL heap_free(void *buf)
-{
- return HeapFree(GetProcessHeap(), 0, buf);
-}
-
void output_writeconsole(const WCHAR *str, DWORD wlen)
{
DWORD count, ret;
diff --git a/base/applications/cmdutils/reg/reg.h b/base/applications/cmdutils/reg/reg.h
index eb792bbf88..dbce738ecd 100644
--- a/base/applications/cmdutils/reg/reg.h
+++ b/base/applications/cmdutils/reg/reg.h
@@ -27,7 +27,6 @@
/* reg.c */
void *heap_xalloc(size_t size);
void *heap_xrealloc(void *buf, size_t size);
-BOOL heap_free(void *buf);
void output_writeconsole(const WCHAR *str, DWORD wlen);
void WINAPIV output_message(unsigned int id, ...);
BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info);
diff --git a/base/applications/cmdutils/reg/resource.h
b/base/applications/cmdutils/reg/resource.h
index 84cbe906b9..3658adc155 100644
--- a/base/applications/cmdutils/reg/resource.h
+++ b/base/applications/cmdutils/reg/resource.h
@@ -20,7 +20,7 @@
#pragma once
-//#include <windef.h>
+#include <windef.h>
/* Translation IDs. */
#define STRING_USAGE 101
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 533d838867..b032812382 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -227,7 +227,7 @@ reactos/win32ss/printing/monitors/localmon/ui/ # Synced to
WineStaging-3.3 (kno
ReactOS shares the following programs with Winehq.
reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.3
-reactos/base/applications/cmdutils/reg # Synced to Wine-3.0
+reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.3
reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-2.9
reactos/base/applications/cmdutils/taskkill # Synced to Wine-3.0
reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.9
2468
days inactive
2468
days old
0 comments
1 participants
participants (1)
-
Amine Khaldi