From aa386af42a967ed49f435cb9a02a9200818cc73e Mon Sep 17 00:00:00 2001 From: Hugh McMaster Date: Fri, 18 Aug 2017 09:29:54 +0000 Subject: [PATCH] reg: Add initial support for the import operation. Signed-off-by: Hugh McMaster Signed-off-by: Alexandre Julliard --- po/ar.po | 6 ++++- po/bg.po | 6 ++++- po/ca.po | 17 ++++++++++++++- po/cs.po | 6 ++++- po/da.po | 6 ++++- po/de.po | 17 ++++++++++++++- po/el.po | 6 ++++- po/en.po | 8 +++++-- po/en_US.po | 8 +++++-- po/eo.po | 6 ++++- po/es.po | 6 ++++- po/fa.po | 6 ++++- po/fi.po | 17 ++++++++++++++- po/fr.po | 17 ++++++++++++++- po/he.po | 6 ++++- po/hi.po | 6 ++++- po/hr.po | 6 ++++- po/hu.po | 6 ++++- po/it.po | 6 ++++- po/ja.po | 17 ++++++++++++++- po/ko.po | 6 ++++- po/lt.po | 17 ++++++++++++++- po/ml.po | 6 ++++- po/nb_NO.po | 17 ++++++++++++++- po/nl.po | 6 ++++- po/or.po | 6 ++++- po/pa.po | 6 ++++- po/pl.po | 17 ++++++++++++++- po/pt_BR.po | 17 ++++++++++++++- po/pt_PT.po | 6 ++++- po/rm.po | 6 ++++- po/ro.po | 6 ++++- po/ru.po | 17 ++++++++++++++- po/sk.po | 6 ++++- po/sl.po | 6 ++++- po/sr_RS@cyrillic.po | 6 ++++- po/sr_RS@latin.po | 6 ++++- po/sv.po | 6 ++++- po/te.po | 6 ++++- po/th.po | 6 ++++- po/tr.po | 17 ++++++++++++++- po/uk.po | 17 ++++++++++++++- po/wa.po | 6 ++++- po/wine.pot | 6 ++++- po/zh_CN.po | 17 ++++++++++++++- po/zh_TW.po | 6 ++++- programs/reg/Makefile.in | 4 +++- programs/reg/import.c | 30 +++++++++++++++++++++++++ programs/reg/reg.c | 47 ++++++++++++++++++++++++---------------- programs/reg/reg.h | 26 ++++++++++++++++++++++ programs/reg/reg.rc | 3 ++- programs/reg/resource.h | 1 + programs/reg/tests/reg.c | 2 +- 53 files changed, 466 insertions(+), 70 deletions(-) create mode 100644 programs/reg/import.c create mode 100644 programs/reg/reg.h diff --git a/po/ar.po b/po/ar.po index ddb572e459d..b4769c5c176 100644 --- a/po/ar.po +++ b/po/ar.po @@ -12304,7 +12304,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12451,6 +12451,10 @@ msgstr "" msgid "(value not set)" msgstr "(القيمة غير مضبوطة)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "ال&سجل" diff --git a/po/bg.po b/po/bg.po index 47b5a394b9f..d2f0ebe34b3 100644 --- a/po/bg.po +++ b/po/bg.po @@ -11882,7 +11882,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12017,6 +12017,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Регистър" diff --git a/po/ca.po b/po/ca.po index 9a967b3253a..829ed8a8da7 100644 --- a/po/ca.po +++ b/po/ca.po @@ -12158,12 +12158,23 @@ msgid "Icons (*.ico)" msgstr "Icones (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12302,6 +12313,10 @@ msgstr "Teclegeu \"REG %1 /?\" per ajuda.\n" msgid "(value not set)" msgstr "(valor no definit)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registre" diff --git a/po/cs.po b/po/cs.po index dacaa787741..3de8c03e3ce 100644 --- a/po/cs.po +++ b/po/cs.po @@ -11995,7 +11995,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12140,6 +12140,10 @@ msgstr "" msgid "(value not set)" msgstr "(hodnota nenastavena)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registr" diff --git a/po/da.po b/po/da.po index 13ece10ca05..292fa24baf3 100644 --- a/po/da.po +++ b/po/da.po @@ -12258,7 +12258,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12406,6 +12406,10 @@ msgstr "" msgid "(value not set)" msgstr "(værdi ikke sat)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Register" diff --git a/po/de.po b/po/de.po index 42fe892c215..75e6e4c2b99 100644 --- a/po/de.po +++ b/po/de.po @@ -12058,12 +12058,23 @@ msgid "Icons (*.ico)" msgstr "Symbole (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12200,6 +12211,10 @@ msgstr "Geben Sie \"REG %1 /?\" ein, um Hilfe zu erhalten.\n" msgid "(value not set)" msgstr "(Wert nicht gesetzt)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registrierung" diff --git a/po/el.po b/po/el.po index 97889598115..34c35550bb6 100644 --- a/po/el.po +++ b/po/el.po @@ -11658,7 +11658,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11788,6 +11788,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/en.po b/po/en.po index ceb788e9598..d4b605f1dd7 100644 --- a/po/en.po +++ b/po/en.po @@ -11986,7 +11986,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11996,7 +11996,7 @@ msgstr "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12124,6 +12124,10 @@ msgstr "Type \"REG %1 /?\" for help.\n" msgid "(value not set)" msgstr "(value not set)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "REG IMPORT file.reg\n" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registry" diff --git a/po/en_US.po b/po/en_US.po index def4c20ea6f..f9e1e1f0e7d 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -11986,7 +11986,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11996,7 +11996,7 @@ msgstr "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12124,6 +12124,10 @@ msgstr "Type \"REG %1 /?\" for help.\n" msgid "(value not set)" msgstr "(value not set)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "REG IMPORT file.reg\n" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registry" diff --git a/po/eo.po b/po/eo.po index 4677788553b..01221ffff1a 100644 --- a/po/eo.po +++ b/po/eo.po @@ -11591,7 +11591,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11729,6 +11729,10 @@ msgstr "" msgid "(value not set)" msgstr "(valoro ne elektita)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registrejo" diff --git a/po/es.po b/po/es.po index 90197a30f44..1ae9821c4dc 100644 --- a/po/es.po +++ b/po/es.po @@ -12336,7 +12336,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12485,6 +12485,10 @@ msgstr "" msgid "(value not set)" msgstr "(valor no definido)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registro" diff --git a/po/fa.po b/po/fa.po index 0e1b0c5065d..90d7b9200bd 100644 --- a/po/fa.po +++ b/po/fa.po @@ -11647,7 +11647,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11773,6 +11773,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/fi.po b/po/fi.po index 04896ecb535..3bc496de070 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11962,12 +11962,23 @@ msgid "Icons (*.ico)" msgstr "Kuvakkeet (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12104,6 +12115,10 @@ msgstr "Komento \"REG %1 /?\" näyttää ohjeen.\n" msgid "(value not set)" msgstr "(arvoa ei asetettu)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Rekisteri" diff --git a/po/fr.po b/po/fr.po index ddfe965fffb..fef6c6e426c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -12199,12 +12199,23 @@ msgid "Icons (*.ico)" msgstr "Icônes (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12345,6 +12356,10 @@ msgstr "Tapez « REG %1 /? » pour de l'aide.\n" msgid "(value not set)" msgstr "(valeur non définie)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registre" diff --git a/po/he.po b/po/he.po index 83927b001fd..1e682c9c5c4 100644 --- a/po/he.po +++ b/po/he.po @@ -12048,7 +12048,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12197,6 +12197,10 @@ msgstr "" msgid "(value not set)" msgstr "(לא הוגדר ערך)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&רישום המערכת" diff --git a/po/hi.po b/po/hi.po index 540f36b9702..08aa50182d1 100644 --- a/po/hi.po +++ b/po/hi.po @@ -11453,7 +11453,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11575,6 +11575,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/hr.po b/po/hr.po index 40f028ca30f..684e0fd6634 100644 --- a/po/hr.po +++ b/po/hr.po @@ -11810,7 +11810,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11957,6 +11957,10 @@ msgstr "" msgid "(value not set)" msgstr "(vrijednost nije postavljena)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registar" diff --git a/po/hu.po b/po/hu.po index 74a506f0ef6..84881f4fb9c 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12252,7 +12252,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12400,6 +12400,10 @@ msgstr "" msgid "(value not set)" msgstr "(nem beállított)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Fájl" diff --git a/po/it.po b/po/it.po index efdf389e563..2b63a0442ca 100644 --- a/po/it.po +++ b/po/it.po @@ -12337,7 +12337,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12486,6 +12486,10 @@ msgstr "" msgid "(value not set)" msgstr "(valore non immesso)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registro" diff --git a/po/ja.po b/po/ja.po index fa4ec01bab3..5b0c0c55c84 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11975,12 +11975,23 @@ msgid "Icons (*.ico)" msgstr "アイコン (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12116,6 +12127,10 @@ msgstr "ヘルプは \"REG %1 /?\" と入力してください。\n" msgid "(value not set)" msgstr "(値の設定なし)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "レジストリ(&R)" diff --git a/po/ko.po b/po/ko.po index f607252697d..efbb9e63930 100644 --- a/po/ko.po +++ b/po/ko.po @@ -12330,7 +12330,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12475,6 +12475,10 @@ msgstr "" msgid "(value not set)" msgstr "(값이 정해지지 않음)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "레지스트리(&R)" diff --git a/po/lt.po b/po/lt.po index 975f275817a..6c252fefdcc 100644 --- a/po/lt.po +++ b/po/lt.po @@ -11988,12 +11988,23 @@ msgid "Icons (*.ico)" msgstr "Piktogramos (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12127,6 +12138,10 @@ msgstr "Pagalbai įrašykite „REG %1 /?“.\n" msgid "(value not set)" msgstr "(reikšmė nenustatyta)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "R&egistras" diff --git a/po/ml.po b/po/ml.po index 5190643d2d6..8714a9011f1 100644 --- a/po/ml.po +++ b/po/ml.po @@ -11453,7 +11453,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11575,6 +11575,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index 132b71cf005..a6531148e83 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11975,12 +11975,23 @@ msgid "Icons (*.ico)" msgstr "Ikoner (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12118,6 +12129,10 @@ msgstr "Skriv \"REG %1 /?\" for hjelp.\n" msgid "(value not set)" msgstr "(verdi ikke oppgitt)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Register" diff --git a/po/nl.po b/po/nl.po index a3b10c672b8..99f900135c7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -12303,7 +12303,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12452,6 +12452,10 @@ msgstr "" msgid "(value not set)" msgstr "(Geen waarde ingesteld)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registerbestand" diff --git a/po/or.po b/po/or.po index fddd611da09..5d605f72da4 100644 --- a/po/or.po +++ b/po/or.po @@ -11453,7 +11453,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11575,6 +11575,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/pa.po b/po/pa.po index 42ce667aa20..6da2a9fb997 100644 --- a/po/pa.po +++ b/po/pa.po @@ -11453,7 +11453,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11575,6 +11575,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/pl.po b/po/pl.po index 629189c94ec..d8a73d7475d 100644 --- a/po/pl.po +++ b/po/pl.po @@ -12033,12 +12033,23 @@ msgid "Icons (*.ico)" msgstr "Ikony (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12175,6 +12186,10 @@ msgstr "Wprowadź \"REG %1 /?\" aby uzyskać pomoc.\n" msgid "(value not set)" msgstr "(wartość nie ustalona)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Rejestr" diff --git a/po/pt_BR.po b/po/pt_BR.po index 9847163ee7d..ed9c5eec408 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -12119,12 +12119,23 @@ msgid "Icons (*.ico)" msgstr "Ícones (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12263,6 +12274,10 @@ msgstr "Digite \"REG %1 /?\" para ajuda.\n" msgid "(value not set)" msgstr "(valor não dado)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registro" diff --git a/po/pt_PT.po b/po/pt_PT.po index c293825ec64..c2f20a682e6 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -12128,7 +12128,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12277,6 +12277,10 @@ msgstr "" msgid "(value not set)" msgstr "(valor não dado)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registo" diff --git a/po/rm.po b/po/rm.po index 1124cda3164..4bcb7ae6a3b 100644 --- a/po/rm.po +++ b/po/rm.po @@ -11537,7 +11537,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11659,6 +11659,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/ro.po b/po/ro.po index 1e8dddcd945..e4dadc547b2 100644 --- a/po/ro.po +++ b/po/ro.po @@ -12082,7 +12082,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12211,6 +12211,10 @@ msgstr "Tastați \"REG %1 /?\" pentru ajutor.\n" msgid "(value not set)" msgstr "(valoare nestabilită)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registru" diff --git a/po/ru.po b/po/ru.po index 5f2ae5786cf..45c75a5266b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11983,12 +11983,23 @@ msgid "Icons (*.ico)" msgstr "Значки (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12124,6 +12135,10 @@ msgstr "Для справки введите «REG %1 /?».\n" msgid "(value not set)" msgstr "(значение не задано)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Реестр" diff --git a/po/sk.po b/po/sk.po index 95bc2ddb791..5c0ea89c28d 100644 --- a/po/sk.po +++ b/po/sk.po @@ -11748,7 +11748,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11892,6 +11892,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Registry" diff --git a/po/sl.po b/po/sl.po index 97b81e893d7..b2e1e6173a4 100644 --- a/po/sl.po +++ b/po/sl.po @@ -12282,7 +12282,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12429,6 +12429,10 @@ msgstr "" msgid "(value not set)" msgstr "(vrednost ni nastavljena)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Register" diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 8a25a83d2ff..e06737e9b37 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -12137,7 +12137,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12276,6 +12276,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 0b8ea45c395..6a9e8188f3d 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -12291,7 +12291,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12434,6 +12434,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/sv.po b/po/sv.po index 64d244877eb..de88f2117a7 100644 --- a/po/sv.po +++ b/po/sv.po @@ -11972,7 +11972,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12101,6 +12101,10 @@ msgstr "" msgid "(value not set)" msgstr "(värde ej angivet)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Register" diff --git a/po/te.po b/po/te.po index 9ed1ace4e7d..42f05dd96fc 100644 --- a/po/te.po +++ b/po/te.po @@ -11453,7 +11453,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11575,6 +11575,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/th.po b/po/th.po index 7f9d5bb4a62..739d87de486 100644 --- a/po/th.po +++ b/po/th.po @@ -11697,7 +11697,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11819,6 +11819,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/tr.po b/po/tr.po index 1282d7621ba..1a89068ccb4 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11998,12 +11998,23 @@ msgid "Icons (*.ico)" msgstr "Simgeler (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12142,6 +12153,10 @@ msgstr "Yardım için \"REG %1 /?\" yazın.\n" msgid "(value not set)" msgstr "(değer belirlenmemiş)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Kayıt Defteri" diff --git a/po/uk.po b/po/uk.po index 81adf8de3f2..e79d778511c 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12076,12 +12076,23 @@ msgid "Icons (*.ico)" msgstr "Значки (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12219,6 +12230,10 @@ msgstr "Введіть \"REG %1 /?\" для довідки.\n" msgid "(value not set)" msgstr "(значення не задане)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "&Реєстр" diff --git a/po/wa.po b/po/wa.po index 1afcde92902..da030dde2e4 100644 --- a/po/wa.po +++ b/po/wa.po @@ -11601,7 +11601,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11723,6 +11723,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/wine.pot b/po/wine.pot index f6dc3bfa288..49852bea930 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -11380,7 +11380,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11502,6 +11502,10 @@ msgstr "" msgid "(value not set)" msgstr "" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index e5e3c15694b..91ba3ed517b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11774,12 +11774,23 @@ msgid "Icons (*.ico)" msgstr "图标 (*.ico)" #: reg.rc:35 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " REG [operation] [parameters]\n" +#| "\n" +#| "Supported operations:\n" +#| " ADD | DELETE | QUERY\n" +#| "\n" +#| "For help on a specific operation, type:\n" +#| " REG [operation] /?\n" +#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -11910,6 +11921,10 @@ msgstr "输入“REG %1 /?”以获取帮助。\n" msgid "(value not set)" msgstr "(没有设值)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "注册表(&R)" diff --git a/po/zh_TW.po b/po/zh_TW.po index 32bb702b990..a054c1b5d41 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -12214,7 +12214,7 @@ msgid "" " REG [operation] [parameters]\n" "\n" "Supported operations:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "For help on a specific operation, type:\n" " REG [operation] /?\n" @@ -12360,6 +12360,10 @@ msgstr "" msgid "(value not set)" msgstr "(沒有設值)" +#: reg.rc:66 +msgid "REG IMPORT file.reg\n" +msgstr "" + #: regedit.rc:34 msgid "&Registry" msgstr "註冊表(&R)" diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 7a70a33a699..256bcde62b4 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -3,6 +3,8 @@ APPMODE = -mconsole -municode -mno-cygwin IMPORTS = advapi32 DELAYIMPORTS = user32 -C_SRCS = reg.c +C_SRCS = \ + import.c \ + reg.c RC_SRCS = reg.rc diff --git a/programs/reg/import.c b/programs/reg/import.c new file mode 100644 index 00000000000..734e6ae94c8 --- /dev/null +++ b/programs/reg/import.c @@ -0,0 +1,30 @@ +/* + * Copyright 2017 Hugh McMaster + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include +#include + +#include "reg.h" + +WINE_DEFAULT_DEBUG_CHANNEL(reg); + +int reg_import(const WCHAR *filename) +{ + FIXME(": operation not yet implemented\n"); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 595dcab8e72..43e5321704c 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -21,7 +21,7 @@ #include #include #include -#include "resource.h" +#include "reg.h" #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) @@ -909,32 +909,38 @@ static BOOL is_help_switch(const WCHAR *s) enum operations { REG_ADD, REG_DELETE, + REG_IMPORT, REG_QUERY, REG_INVALID }; -static const WCHAR addW[] = {'a','d','d',0}; -static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; -static const WCHAR queryW[] = {'q','u','e','r','y',0}; - static enum operations get_operation(const WCHAR *str, int *op_help) { - if (!lstrcmpiW(str, addW)) - { - *op_help = STRING_ADD_USAGE; - return REG_ADD; - } + struct op_info { const WCHAR *op; int id; int help_id; }; - if (!lstrcmpiW(str, deleteW)) - { - *op_help = STRING_DELETE_USAGE; - return REG_DELETE; - } + static const WCHAR add[] = {'a','d','d',0}; + static const WCHAR delete[] = {'d','e','l','e','t','e',0}; + static const WCHAR import[] = {'i','m','p','o','r','t',0}; + static const WCHAR query[] = {'q','u','e','r','y',0}; - if (!lstrcmpiW(str, queryW)) + static const struct op_info op_array[] = { - *op_help = STRING_QUERY_USAGE; - return REG_QUERY; + { add, REG_ADD, STRING_ADD_USAGE }, + { delete, REG_DELETE, STRING_DELETE_USAGE }, + { import, REG_IMPORT, STRING_IMPORT_USAGE }, + { query, REG_QUERY, STRING_QUERY_USAGE }, + { NULL, -1, 0 } + }; + + const struct op_info *ptr; + + for (ptr = op_array; ptr->op; ptr++) + { + if (!lstrcmpiW(str, ptr->op)) + { + *op_help = ptr->help_id; + return ptr->id; + } } return REG_INVALID; @@ -975,7 +981,7 @@ int wmain(int argc, WCHAR *argvW[]) if (argc > 2) show_op_help = is_help_switch(argvW[2]); - if (argc == 2 || (show_op_help && argc > 3)) + if (argc == 2 || ((show_op_help || op == REG_IMPORT) && argc > 3)) { output_message(STRING_INVALID_SYNTAX); output_message(STRING_FUNC_HELP, struprW(argvW[1])); @@ -987,6 +993,9 @@ int wmain(int argc, WCHAR *argvW[]) return 0; } + if (op == REG_IMPORT) + return reg_import(argvW[2]); + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; diff --git a/programs/reg/reg.h b/programs/reg/reg.h new file mode 100644 index 00000000000..1fbef7806c4 --- /dev/null +++ b/programs/reg/reg.h @@ -0,0 +1,26 @@ +/* + * Copyright 2017 Hugh McMaster + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __REG_H__ +#define __REG_H__ + +#include "resource.h" + +int reg_import(const WCHAR *filename); + +#endif /* __REG_H__ */ diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 2e0da685348..e26970916fe 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -29,7 +29,7 @@ STRINGTABLE STRING_USAGE, "Usage:\n\ \ REG [operation] [parameters]\n\n\ \Supported operations:\n\ -\ ADD | DELETE | QUERY\n\n\ +\ ADD | DELETE | IMPORT | QUERY\n\n\ \For 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" @@ -62,4 +62,5 @@ STRINGTABLE STRING_REG_HELP, "Type \"REG /?\" for help.\n" STRING_FUNC_HELP, "Type \"REG %1 /?\" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" } diff --git a/programs/reg/resource.h b/programs/reg/resource.h index 1142278a19c..31a83ee1154 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -52,3 +52,4 @@ #define STRING_REG_HELP 129 #define STRING_FUNC_HELP 130 #define STRING_VALUE_NOT_SET 131 +#define STRING_IMPORT_USAGE 132 diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index a2728cad58b..69c01c00b91 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -801,7 +801,7 @@ static void test_import(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg import /?", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg import missing.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);