Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/17: [ROSCTRLS.H] Add CListView::SetItemText and CListView::SetCheckState
by Giannis Adamopoulos 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94112698411c873d1d45b… commit 94112698411c873d1d45bd36a0cb2dd86f2f37c2 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Apr 28 15:55:12 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 00:43:37 2019 +0200 [ROSCTRLS.H] Add CListView::SetItemText and CListView::SetCheckState --- sdk/include/reactos/rosctrls.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sdk/include/reactos/rosctrls.h b/sdk/include/reactos/rosctrls.h index e81a0c4cfbb..6dd4ba9fa39 100644 --- a/sdk/include/reactos/rosctrls.h +++ b/sdk/include/reactos/rosctrls.h @@ -183,6 +183,19 @@ public: SendMessage(LVM_SETITEMSTATE, i, reinterpret_cast<LPARAM>(&item)); } + BOOL SetItemText(int i, int subItem, LPCWSTR text) + { + LVITEMW item; + item.iSubItem = subItem; + item.pszText = (LPWSTR)text; + return SendMessage(LVM_SETITEMTEXT, i, (LPARAM)&item); + } + + void SetCheckState(int i, BOOL check) + { + SetItemState(i, INDEXTOSTATEIMAGEMASK((check)?2:1), LVIS_STATEIMAGEMASK); + } + int HitTest(LV_HITTESTINFO * phtInfo) { return (int)SendMessage(LVM_HITTEST, 0, reinterpret_cast<LPARAM>(phtInfo));

1 0

[reactos] 01/01: [USB] Enable *_new usb stack
by Victor Perevertkin 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88cf5b0a3c429437d8ddd… commit 88cf5b0a3c429437d8dddb2f2759812b99683087 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Tue Aug 20 01:34:58 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Aug 20 01:34:58 2019 +0300 [USB] Enable *_new usb stack --- boot/bootdata/txtsetup.sif | 1 + drivers/usb/CMakeLists.txt | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 22d0b045a41..f3f6ba6185f 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -112,6 +112,7 @@ hidusb.sys = 1,,,,,,,4,,,,1,4 usbccgp.sys = 1,,,,,,x,4,,,,1,4 usbd.sys = 1,,,,,,x,4,,,,1,4 usbhub.sys = 1,,,,,,x,4,,,,1,4 +usbport.sys = 1,,,,,,x,4,,,,1,4 usbuhci.sys = 1,,,,,,x,4,,,,1,4 usbohci.sys = 1,,,,,,x,4,,,,1,4 usbehci.sys = 1,,,,,,x,4,,,,1,4 diff --git a/drivers/usb/CMakeLists.txt b/drivers/usb/CMakeLists.txt index ec555bbedb5..1315f1a571e 100644 --- a/drivers/usb/CMakeLists.txt +++ b/drivers/usb/CMakeLists.txt @@ -1,13 +1,13 @@ add_subdirectory(usbccgp) add_subdirectory(usbd) -add_subdirectory(usbehci) -#add_subdirectory(usbehci_new) -add_subdirectory(usbhub) -#add_subdirectory(usbhub_new) -add_subdirectory(usbohci) -#add_subdirectory(usbohci_new) +#add_subdirectory(usbehci) +add_subdirectory(usbehci_new) +#add_subdirectory(usbhub) +add_subdirectory(usbhub_new) +#add_subdirectory(usbohci) +add_subdirectory(usbohci_new) add_subdirectory(usbport) add_subdirectory(usbstor) #add_subdirectory(usbstor_new) -add_subdirectory(usbuhci) -#add_subdirectory(usbuhci_new) +#add_subdirectory(usbuhci) +add_subdirectory(usbuhci_new)

1 0

[reactos] 01/01: [USBPORT] Fix endless loop, occasionally happened on real hardware
by Victor Perevertkin 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc14c095f58d7d9174913… commit fc14c095f58d7d917491367e12af514743753c7f Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Thu Aug 1 21:17:44 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Aug 20 01:30:52 2019 +0300 [USBPORT] Fix endless loop, occasionally happened on real hardware --- drivers/usb/usbport/queue.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/usb/usbport/queue.c b/drivers/usb/usbport/queue.c index 9635de1ef8f..df70e5f0286 100644 --- a/drivers/usb/usbport/queue.c +++ b/drivers/usb/usbport/queue.c @@ -1261,7 +1261,7 @@ USBPORT_FlushController(IN PDEVICE_OBJECT FdoDevice) PUSBPORT_DEVICE_EXTENSION FdoExtension; PLIST_ENTRY Entry; PUSBPORT_ENDPOINT Endpoint; - ULONG KilledTransfers = 0; + ULONG KilledTransfers; PLIST_ENTRY EndpointList; KIRQL OldIrql; LIST_ENTRY FlushList; @@ -1301,6 +1301,7 @@ USBPORT_FlushController(IN PDEVICE_OBJECT FdoDevice) KeReleaseSpinLock(&FdoExtension->EndpointListSpinLock, OldIrql); + KilledTransfers = 0; while (!IsListEmpty(&FlushList)) { Endpoint = CONTAINING_RECORD(FlushList.Flink, @@ -1355,7 +1356,7 @@ USBPORT_AbortEndpoint(IN PDEVICE_OBJECT FdoDevice, IN PIRP Irp) { PLIST_ENTRY PendingList; - PUSBPORT_TRANSFER PendingTransfer; + PUSBPORT_TRANSFER PendingTransfer; PLIST_ENTRY ActiveList; PUSBPORT_TRANSFER ActiveTransfer;

1 0

[reactos] 01/01: Add support for save and restore reg.exe subcommands (#1565)
by William Kent 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9daaed32569901d53e78… commit d9daaed32569901d53e78390f8b595468670eb51 Author: William Kent <wjk011(a)gmail.com> AuthorDate: Mon Aug 19 18:29:58 2019 -0400 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Aug 20 00:29:58 2019 +0200 Add support for save and restore reg.exe subcommands (#1565) * [REG] Add save and restore help strings * [REG] Implement REG SAVE * [REG] Assert the BACKUP privilege With this change applied, reg.exe correctly saves a key on Windows 10. * [REG] Use RegSaveKeyEx() * [REG] Implement REG RESTORE * [REG] Close the process token * [REG] Remove duplicate string * [REG] Add missing comma * [REG] Copy new strings into translation files * [REG] Update STRING_USAGE translations "Should be submitted to wine" (tm) --- base/applications/cmdutils/reg/lang/bg-BG.rc | 4 +- base/applications/cmdutils/reg/lang/cs-CZ.rc | 4 +- base/applications/cmdutils/reg/lang/da-DK.rc | 4 +- base/applications/cmdutils/reg/lang/de-DE.rc | 4 +- base/applications/cmdutils/reg/lang/en-US.rc | 4 +- base/applications/cmdutils/reg/lang/es-ES.rc | 4 +- base/applications/cmdutils/reg/lang/fr-FR.rc | 4 +- base/applications/cmdutils/reg/lang/it-IT.rc | 4 +- base/applications/cmdutils/reg/lang/ja-JP.rc | 4 +- base/applications/cmdutils/reg/lang/ko-KR.rc | 4 +- base/applications/cmdutils/reg/lang/lt-LT.rc | 4 +- base/applications/cmdutils/reg/lang/nl-NL.rc | 4 +- base/applications/cmdutils/reg/lang/no-NO.rc | 4 +- base/applications/cmdutils/reg/lang/pl-PL.rc | 4 +- base/applications/cmdutils/reg/lang/pt-PT.rc | 4 +- base/applications/cmdutils/reg/lang/ro-RO.rc | 4 +- base/applications/cmdutils/reg/lang/ru-RU.rc | 4 +- base/applications/cmdutils/reg/lang/sl-SI.rc | 4 +- base/applications/cmdutils/reg/lang/sq-AL.rc | 4 +- base/applications/cmdutils/reg/lang/sv-SE.rc | 4 +- base/applications/cmdutils/reg/lang/tr-TR.rc | 4 +- base/applications/cmdutils/reg/lang/uk-UA.rc | 4 +- base/applications/cmdutils/reg/lang/zh-CN.rc | 4 +- base/applications/cmdutils/reg/lang/zh-TW.rc | 4 +- base/applications/cmdutils/reg/reg.c | 164 +++++++++++++++++++++++++++ base/applications/cmdutils/reg/resource.h | 2 + 26 files changed, 238 insertions(+), 24 deletions(-) diff --git a/base/applications/cmdutils/reg/lang/bg-BG.rc b/base/applications/cmdutils/reg/lang/bg-BG.rc index 51303d004cb..0ea098c3a44 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/cs-CZ.rc b/base/applications/cmdutils/reg/lang/cs-CZ.rc index 3b5e7a17548..e4413cbce02 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -45,4 +45,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/da-DK.rc b/base/applications/cmdutils/reg/lang/da-DK.rc index b4c34686842..a7bf9e9361a 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/de-DE.rc b/base/applications/cmdutils/reg/lang/de-DE.rc index 927e7ba48c8..dba7ed54791 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/en-US.rc b/base/applications/cmdutils/reg/lang/en-US.rc index 26ce1697f08..65c37f1a803 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/es-ES.rc b/base/applications/cmdutils/reg/lang/es-ES.rc index ad2b984e411..5e6d9ed4cd5 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/fr-FR.rc b/base/applications/cmdutils/reg/lang/fr-FR.rc index 757169f1636..0419d350e80 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/it-IT.rc b/base/applications/cmdutils/reg/lang/it-IT.rc index ed268d36989..84417873ed1 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/ja-JP.rc b/base/applications/cmdutils/reg/lang/ja-JP.rc index 3dc044cf0d2..cbaeb46f7fd 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/ko-KR.rc b/base/applications/cmdutils/reg/lang/ko-KR.rc index 552a031c9ce..1ba6c381f31 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/lt-LT.rc b/base/applications/cmdutils/reg/lang/lt-LT.rc index 70f2786b67b..48e96d23c97 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/nl-NL.rc b/base/applications/cmdutils/reg/lang/nl-NL.rc index a24806ef3ec..1cf44949866 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/no-NO.rc b/base/applications/cmdutils/reg/lang/no-NO.rc index cfef4d43233..2046fad5278 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/pl-PL.rc b/base/applications/cmdutils/reg/lang/pl-PL.rc index 3f587fc57c6..c8d9768df0b 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, "Sposób użycia:\n REG [operacja] [parametry]\n\nWspierane operacje:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nAby uzyskać pomoc dotyczącą określonej operacji, wpisz:\n REG [operacja] /?\n\n" + STRING_USAGE, "Sposób użycia:\n REG [operacja] [parametry]\n\nWspierane operacje:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\n\nAby uzyskać pomoc dotyczącą określonej operacji, wpisz:\n REG [operacja] /?\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT nazwa_klucza plik.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Nieprawidłowy klucz systemowy [%1]\n" STRING_OVERWRITE_FILE, "Plik '%1' już istnieje. Czy chcesz go zastąpić?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/pt-PT.rc b/base/applications/cmdutils/reg/lang/pt-PT.rc index 5e3d477e334..58e8752324e 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/ro-RO.rc b/base/applications/cmdutils/reg/lang/ro-RO.rc index d2405ab2ea5..3ee1f903895 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 comenzii:\n REG [operație] [parametri]\n\nOperații disponibile:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nPentru informații despre o anume operație, tastați:\n REG [operație] /?\n\n" + STRING_USAGE, "Sintaxa comenzii:\n REG [operație] [parametri]\n\nOperații disponibile:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\n\nPentru informații despre o anume operație, tastați:\n REG [operație] /?\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" @@ -46,4 +46,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT nume_cheie fișier.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Cheia de sistem [%1] nu este una validă.\n" STRING_OVERWRITE_FILE, "Fișierul «%1» deja există. Doriți suprascrierea lui?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/ru-RU.rc b/base/applications/cmdutils/reg/lang/ru-RU.rc index e75ad5c0a79..757926b9b68 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/sl-SI.rc b/base/applications/cmdutils/reg/lang/sl-SI.rc index 134a398ec04..d0f4b37e82c 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/sq-AL.rc b/base/applications/cmdutils/reg/lang/sq-AL.rc index ed63303e4cd..a94677b8c6c 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -44,4 +44,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/sv-SE.rc b/base/applications/cmdutils/reg/lang/sv-SE.rc index 70b59a2775f..c015bd9d6f9 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/tr-TR.rc b/base/applications/cmdutils/reg/lang/tr-TR.rc index 742923183b2..47abfc54bf8 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -42,4 +42,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/uk-UA.rc b/base/applications/cmdutils/reg/lang/uk-UA.rc index a2c2b6a3736..f2fff4f5e67 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/zh-CN.rc b/base/applications/cmdutils/reg/lang/zh-CN.rc index 4c65c03424f..08f92516977 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -40,4 +40,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: 无效的系统键 [%1]\n" STRING_OVERWRITE_FILE, "文件 '%1' 已经存在。您是否要覆盖它？" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/lang/zh-TW.rc b/base/applications/cmdutils/reg/lang/zh-TW.rc index 1dbd4d0f349..7771b9ea401 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, "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_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY | SAVE | RESTORE\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" @@ -42,4 +42,6 @@ STRINGTABLE STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_SAVE_USAGE, "REG SAVE key_name file_name [/y]" + STRING_RESTORE_USAGE, "REG RESTORE key_name file_name" } diff --git a/base/applications/cmdutils/reg/reg.c b/base/applications/cmdutils/reg/reg.c index 455d3dd96a4..5e65aee269b 100644 --- a/base/applications/cmdutils/reg/reg.c +++ b/base/applications/cmdutils/reg/reg.c @@ -144,6 +144,23 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) LocalFree(str); } +static void output_error(LSTATUS status) +{ + WCHAR* str; + DWORD len; + + SetLastError(NO_ERROR); + len = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, status, 0, (WCHAR*)&str, 0, NULL); + if (len == 0 && GetLastError() != NO_ERROR) + { + WINE_FIXME("Could not format error code: le=%u, error=%u", GetLastError(), status); + return; + } + + output_writeconsole(str, len); + LocalFree(str); +} + void WINAPIV output_message(unsigned int id, ...) { WCHAR fmt[1024]; @@ -892,6 +909,141 @@ static BOOL is_switch(const WCHAR *s, const WCHAR c) return FALSE; } +static BOOL set_privilege(LPCWSTR privilegeName, BOOL enabled) +{ + HANDLE hToken = INVALID_HANDLE_VALUE; + TOKEN_PRIVILEGES tp; + DWORD error = ERROR_SUCCESS; + + if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) + { + tp.PrivilegeCount = 1; + tp.Privileges[0].Attributes = (enabled ? SE_PRIVILEGE_ENABLED : 0); + + if (LookupPrivilegeValueW(NULL, privilegeName, &tp.Privileges[0].Luid)) + { + if (AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL)) + { + if (GetLastError() == ERROR_NOT_ALL_ASSIGNED) + { + error = ERROR_NOT_ALL_ASSIGNED; + goto fail; + } + } + else + { + error = GetLastError(); + goto fail; + } + } + else + { + error = GetLastError(); + goto fail; + } + } + else + { + error = GetLastError(); + goto fail; + } + + CloseHandle(hToken); + return TRUE; + +fail: + // Don't allow a success error to be printed, as that would confuse the user. + // "Access denied" seems like a reasonable default. + if (error == ERROR_SUCCESS) error = ERROR_ACCESS_DENIED; + if (hToken != INVALID_HANDLE_VALUE) CloseHandle(hToken); + + output_error(error); + return FALSE; +} + +static int reg_save(int argc, WCHAR* argv[]) { + HKEY root, hkey; + LSTATUS status; + WCHAR* path, *long_key; + + if (argc < 4 || argc > 5) goto error; + + if (!parse_registry_key(argv[2], &root, &path, &long_key)) + return 1; + + if (GetFileAttributes(argv[3]) != INVALID_FILE_ATTRIBUTES) + { + if (argc == 5 && !strcmpiW(argv[4], L"/y")) + { + DeleteFile(argv[3]); + } + else + { + if (ask_confirm(STRING_OVERWRITE_FILE, argv[3])) + DeleteFile(argv[3]); + } + } + + if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) + { + output_message(STRING_INVALID_KEY); + return 1; + } + + if (!set_privilege(SE_BACKUP_NAME, TRUE)) return 1; + + status = RegSaveKeyExW(hkey, argv[3], NULL, REG_LATEST_FORMAT); + RegCloseKey(hkey); + + if (status != ERROR_SUCCESS) { + output_error(status); + return 1; + } + + return 0; + +error: + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, struprW(argv[1])); + return 1; +} + +static int reg_restore(int argc, WCHAR* argv[]) +{ + HKEY root, hkey; + LSTATUS status; + WCHAR* path, * long_key; + + if (argc != 4) goto error; + + if (!parse_registry_key(argv[2], &root, &path, &long_key)) + return 1; + + if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) + { + output_message(STRING_INVALID_KEY); + return 1; + } + + if (!set_privilege(SE_BACKUP_NAME, TRUE)) return 1; + if (!set_privilege(SE_RESTORE_NAME, TRUE)) return 1; + + status = RegRestoreKeyW(hkey, argv[3], 0); + RegCloseKey(hkey); + + if (status != ERROR_SUCCESS) { + output_error(status); + return 1; + } + + return 0; + +error: + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, struprW(argv[1])); + return 1; +} + static BOOL is_help_switch(const WCHAR *s) { if (is_switch(s, '?') || is_switch(s, 'h')) @@ -906,6 +1058,8 @@ enum operations { REG_IMPORT, REG_EXPORT, REG_QUERY, + REG_SAVE, + REG_RESTORE, REG_INVALID }; @@ -918,6 +1072,8 @@ static enum operations get_operation(const WCHAR *str, int *op_help) static const WCHAR import[] = {'i','m','p','o','r','t',0}; static const WCHAR export[] = {'e','x','p','o','r','t',0}; static const WCHAR query[] = {'q','u','e','r','y',0}; + static const WCHAR save[] = L"save"; + static const WCHAR restore[] = L"restore"; static const struct op_info op_array[] = { @@ -926,6 +1082,8 @@ static enum operations get_operation(const WCHAR *str, int *op_help) { import, REG_IMPORT, STRING_IMPORT_USAGE }, { export, REG_EXPORT, STRING_EXPORT_USAGE }, { query, REG_QUERY, STRING_QUERY_USAGE }, + { save, REG_SAVE, STRING_SAVE_USAGE }, + { restore, REG_RESTORE, STRING_RESTORE_USAGE }, { NULL, -1, 0 } }; @@ -996,6 +1154,12 @@ int wmain(int argc, WCHAR *argvW[]) if (op == REG_EXPORT) return reg_export(argc, argvW); + if (op == REG_SAVE) + return reg_save(argc, argvW); + + if (op == REG_RESTORE) + return reg_restore(argc, argvW); + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; diff --git a/base/applications/cmdutils/reg/resource.h b/base/applications/cmdutils/reg/resource.h index 3658adc1556..06848ca4eca 100644 --- a/base/applications/cmdutils/reg/resource.h +++ b/base/applications/cmdutils/reg/resource.h @@ -61,3 +61,5 @@ #define STRING_EXPORT_USAGE 136 #define STRING_INVALID_SYSTEM_KEY 137 #define STRING_OVERWRITE_FILE 138 +#define STRING_SAVE_USAGE 139 +#define STRING_RESTORE_USAGE 140

1 0

[reactos] 01/01: [UTILMAN] Add Romanian and Italian translations
by Bișoc George 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e3a7a63fd1e70ab8b94b… commit 3e3a7a63fd1e70ab8b94b3bf4f8155b0826c342b Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Aug 19 20:38:46 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 19 21:29:56 2019 +0200 [UTILMAN] Add Romanian and Italian translations --- base/applications/utilman/lang/it-IT.rc | 55 +++++++++++++++++++++++++++++++++ base/applications/utilman/lang/ro-RO.rc | 55 +++++++++++++++++++++++++++++++++ base/applications/utilman/utilman.rc | 6 ++++ 3 files changed, 116 insertions(+) diff --git a/base/applications/utilman/lang/it-IT.rc b/base/applications/utilman/lang/it-IT.rc new file mode 100644 index 00000000000..b8ba8000e24 --- /dev/null +++ b/base/applications/utilman/lang/it-IT.rc @@ -0,0 +1,55 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Italian (Italy) translation resource + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_MAIN_DIALOG DIALOGEX 0, 0, 284, 183 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Accessibilità Utility Manager" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 + CONTROL "Avvia", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 + CONTROL "Arresta", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 + CONTROL "Avvia automaticamente all'accesso", IDC_START_LOG_IN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 101, 206, 14 + CONTROL "Avvia automaticamente quando il desktop viene bloccato", IDC_START_DESKTOP, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 118, 212, 14 + CONTROL "Avvia automaticamente quando Utility Manager viene avviato", IDC_START_UTILMAN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 134, 212, 13 + CONTROL "&OK", IDC_OK, "Button", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 161, 50, 14 + CONTROL "&Annulla", IDC_CANCEL, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 221, 161, 50, 14 + CONTROL "?", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 +CAPTION "Informazioni su Accessibilità Utility Manager" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Accessibilità Utility Manager\nCopyright (C) 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "Copyright (C) 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + PUSHBUTTON "Chiudi", IDOK, 75, 47, 44, 15 +END + +STRINGTABLE +BEGIN + IDS_OSK "Tastiera su schermo" + IDS_MAGNIFIER "Magnifier" +END + +STRINGTABLE +BEGIN + IDS_NOTRUNNING "%s non è in esecuzione" + IDS_RUNNING "%s è in esecuzione" + IDS_GROUPBOX_OPTIONS_TITLE "Opzioni di %s" +END + +STRINGTABLE +BEGIN + IDM_ABOUT "Informazioni su Accessibilità Utility Manager..." +END diff --git a/base/applications/utilman/lang/ro-RO.rc b/base/applications/utilman/lang/ro-RO.rc new file mode 100644 index 00000000000..20dfac27335 --- /dev/null +++ b/base/applications/utilman/lang/ro-RO.rc @@ -0,0 +1,55 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Romanian (Romania) translation resource + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_MAIN_DIALOG DIALOGEX 0, 0, 284, 183 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Manager utilitare" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 + CONTROL "Start", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 + CONTROL "Oprire", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 + CONTROL "Pornire automată la Log in", IDC_START_LOG_IN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 101, 206, 14 + CONTROL "Pornire automată la blocarea spațiului de lucru", IDC_START_DESKTOP, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 118, 212, 14 + CONTROL "Pornire automată la pornirea Managerului utilități", IDC_START_UTILMAN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 134, 212, 13 + CONTROL "&OK", IDC_OK, "Button", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 161, 50, 14 + CONTROL "&Revocare", IDC_CANCEL, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 221, 161, 50, 14 + CONTROL "&Ajutor", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 +CAPTION "Despre Managerul utilitare" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Manager utilitare\nDrept de autor (C) 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "Drept de autor (C) 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + PUSHBUTTON "Închide", IDOK, 75, 47, 44, 15 +END + +STRINGTABLE +BEGIN + IDS_OSK "Tastatură virtuală" + IDS_MAGNIFIER "Lupă" +END + +STRINGTABLE +BEGIN + IDS_NOTRUNNING "%s nu este în curs de execuție" + IDS_RUNNING "%s în curs de execuție" + IDS_GROUPBOX_OPTIONS_TITLE "Opțiuni pentru %s" +END + +STRINGTABLE +BEGIN + IDM_ABOUT "Despre Managerul utilitare..." +END diff --git a/base/applications/utilman/utilman.rc b/base/applications/utilman/utilman.rc index 02fa4614aa7..ab561caeef4 100644 --- a/base/applications/utilman/utilman.rc +++ b/base/applications/utilman/utilman.rc @@ -31,5 +31,11 @@ IDI_ICON_UTILMAN ICON "res/utilman.ico" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif /* EOF */

1 0

[reactos] 01/01: [COMCTL32] imagelist: Invalidate the cookie of a destroyed imagelist CORE-16316 CORE-16275
by Mark Jansen 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2b9f94234ccaa6b3bc39… commit c2b9f94234ccaa6b3bc3921c3560f6c18dfcdb59 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Aug 17 01:42:29 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 19 21:25:07 2019 +0200 [COMCTL32] imagelist: Invalidate the cookie of a destroyed imagelist CORE-16316 CORE-16275 --- dll/win32/comctl32/imagelist.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dll/win32/comctl32/imagelist.c b/dll/win32/comctl32/imagelist.c index 4b4b0647642..b97adaa90d7 100644 --- a/dll/win32/comctl32/imagelist.c +++ b/dll/win32/comctl32/imagelist.c @@ -115,6 +115,9 @@ struct _IMAGELIST }; #define IMAGELIST_MAGIC 0x53414D58 +#ifdef __REACTOS__ +#define IMAGELIST_MAGIC_DESTROYED 0x44454144 +#endif /* Header used by ImageList_Read() and ImageList_Write() */ #include "pshpack2.h" @@ -3494,6 +3497,9 @@ static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface) if (This->hbrBlend25) DeleteObject (This->hbrBlend25); if (This->hbrBlend50) DeleteObject (This->hbrBlend50); +#ifdef __REACTOS__ + This->usMagic = IMAGELIST_MAGIC_DESTROYED; +#endif This->IImageList2_iface.lpVtbl = NULL; heap_free(This->has_alpha); heap_free(This); @@ -3996,6 +4002,10 @@ static BOOL is_valid(HIMAGELIST himl) { #ifdef __REACTOS__ valid = himl && himl->usMagic == IMAGELIST_MAGIC; + if (!valid && himl && himl->usMagic == IMAGELIST_MAGIC_DESTROYED) + { + ERR("Imagelist no longer valid: 0x%p\n", himl); + } #else valid = himl && himl->IImageList2_iface.lpVtbl == &ImageListImpl_Vtbl; #endif @@ -4098,6 +4108,11 @@ BOOL is_valid2(HIMAGELIST himl) valid = himl && himl->IImageList2_iface.lpVtbl == &ImageListImpl_Vtbl && himl->usMagic == IMAGELIST_MAGIC; + if (!valid && himl && + himl->usMagic == IMAGELIST_MAGIC_DESTROYED) + { + ERR("Imagelist no longer valid: 0x%p\n", himl); + } } __EXCEPT_PAGE_FAULT {

1 0

[reactos] 01/01: [DNSAPI][DNSAPI_APITEST] Fix DnsQuery_UTF8 function and add tests
by Konstantin Motylkov 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab2c90f1b9f40751d0b39… commit ab2c90f1b9f40751d0b399595c4c2dd6250fb8c0 Author: Konstantin Motylkov <mkonst.reut(a)mail.ru> AuthorDate: Mon Aug 19 00:56:27 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 19 20:01:23 2019 +0200 [DNSAPI][DNSAPI_APITEST] Fix DnsQuery_UTF8 function and add tests CORE-11634 --- dll/win32/dnsapi/dnsapi/query.c | 198 +++++++++++++++++----- modules/rostests/apitests/dnsapi/DnsQuery.c | 249 +++++++++++++++++++++++++++- 2 files changed, 405 insertions(+), 42 deletions(-) diff --git a/dll/win32/dnsapi/dnsapi/query.c b/dll/win32/dnsapi/dnsapi/query.c index a57f0e65a59..7b40b09a867 100644 --- a/dll/win32/dnsapi/dnsapi/query.c +++ b/dll/win32/dnsapi/dnsapi/query.c @@ -77,8 +77,7 @@ DnsCToW(const CHAR *NarrowString) 0); if (WideLen == 0) return NULL; - WideLen *= sizeof(WCHAR); - WideString = RtlAllocateHeap(RtlGetProcessHeap(), 0, WideLen); + WideString = RtlAllocateHeap(RtlGetProcessHeap(), 0, WideLen * sizeof(WCHAR)); if (WideString == NULL) { return NULL; @@ -93,8 +92,67 @@ DnsCToW(const CHAR *NarrowString) return WideString; } +static PCHAR +DnsWToUTF8(const WCHAR *WideString) +{ + PCHAR AnsiString; + int AnsiLen = WideCharToMultiByte(CP_UTF8, + 0, + WideString, + -1, + NULL, + 0, + NULL, + 0); + if (AnsiLen == 0) + return NULL; + AnsiString = RtlAllocateHeap(RtlGetProcessHeap(), 0, AnsiLen); + if (AnsiString == NULL) + { + return NULL; + } + WideCharToMultiByte(CP_UTF8, + 0, + WideString, + -1, + AnsiString, + AnsiLen, + NULL, + 0); + + return AnsiString; +} + +static PWCHAR +DnsUTF8ToW(const CHAR *NarrowString) +{ + PWCHAR WideString; + int WideLen = MultiByteToWideChar(CP_UTF8, + 0, + NarrowString, + -1, + NULL, + 0); + if (WideLen == 0) + return NULL; + WideString = RtlAllocateHeap(RtlGetProcessHeap(), 0, WideLen * sizeof(WCHAR)); + if (WideString == NULL) + { + return NULL; + } + MultiByteToWideChar(CP_UTF8, + 0, + NarrowString, + -1, + WideString, + WideLen); + + return WideString; +} + DNS_STATUS WINAPI -DnsQuery_A(LPCSTR Name, +DnsQuery_CodePage(UINT CodePage, + LPCSTR Name, WORD Type, DWORD Options, PIP4_ARRAY Servers, @@ -112,7 +170,19 @@ DnsQuery_A(LPCSTR Name, if (QueryResultSet == NULL) return ERROR_INVALID_PARAMETER; - Buffer = DnsCToW(Name); + switch (CodePage) + { + case CP_ACP: + Buffer = DnsCToW(Name); + break; + + case CP_UTF8: + Buffer = DnsUTF8ToW(Name); + break; + + default: + return ERROR_INVALID_PARAMETER; + } Status = DnsQuery_W(Buffer, Type, Options, Servers, &QueryResultWide, Reserved); @@ -122,9 +192,46 @@ DnsQuery_A(LPCSTR Name, { case DNS_TYPE_A: case DNS_TYPE_WKS: + case DNS_TYPE_CNAME: + case DNS_TYPE_PTR: + case DNS_TYPE_NS: + case DNS_TYPE_MB: + case DNS_TYPE_MD: + case DNS_TYPE_MF: + case DNS_TYPE_MG: + case DNS_TYPE_MR: ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + break; + + case DNS_TYPE_MINFO: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_TXT_DATA) + QueryResultWide->Data.TXT.dwStringCount); + break; + + case DNS_TYPE_NULL: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_NULL_DATA) + QueryResultWide->Data.Null.dwByteCount); + break; + } + if (ConvertedRecord == NULL) + { + /* The name */ + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + /* The result*/ + DnsIntFreeRecordList(QueryResultWide); + QueryResultSet = NULL; + return ERROR_OUTOFMEMORY; + } + + if (CodePage == CP_ACP) ConvertedRecord->pName = DnsWToC((PWCHAR)QueryResultWide->pName); - ConvertedRecord->wType = QueryResultWide->wType; + else + ConvertedRecord->pName = DnsWToUTF8((PWCHAR)QueryResultWide->pName); + + ConvertedRecord->wType = QueryResultWide->wType; + + switch (QueryResultWide->wType) + { + case DNS_TYPE_A: + case DNS_TYPE_WKS: ConvertedRecord->wDataLength = QueryResultWide->wDataLength; memcpy(&ConvertedRecord->Data, &QueryResultWide->Data, QueryResultWide->wDataLength); break; @@ -137,47 +244,50 @@ DnsQuery_A(LPCSTR Name, case DNS_TYPE_MF: case DNS_TYPE_MG: case DNS_TYPE_MR: - ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); - ConvertedRecord->pName = DnsWToC((PWCHAR)QueryResultWide->pName); - ConvertedRecord->wType = QueryResultWide->wType; ConvertedRecord->wDataLength = sizeof(DNS_PTR_DATA); - ConvertedRecord->Data.PTR.pNameHost = DnsWToC((PWCHAR)QueryResultWide->Data.PTR.pNameHost); + if (CodePage == CP_ACP) + ConvertedRecord->Data.PTR.pNameHost = DnsWToC((PWCHAR)QueryResultWide->Data.PTR.pNameHost); + else + ConvertedRecord->Data.PTR.pNameHost = DnsWToUTF8((PWCHAR)QueryResultWide->Data.PTR.pNameHost); break; case DNS_TYPE_MINFO: - ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); - ConvertedRecord->pName = DnsWToC((PWCHAR)QueryResultWide->pName); - ConvertedRecord->wType = QueryResultWide->wType; ConvertedRecord->wDataLength = sizeof(DNS_MINFO_DATA); - ConvertedRecord->Data.MINFO.pNameMailbox = DnsWToC((PWCHAR)QueryResultWide->Data.MINFO.pNameMailbox); - ConvertedRecord->Data.MINFO.pNameErrorsMailbox = DnsWToC((PWCHAR)QueryResultWide->Data.MINFO.pNameErrorsMailbox); + if (CodePage == CP_ACP) + { + ConvertedRecord->Data.MINFO.pNameMailbox = DnsWToC((PWCHAR)QueryResultWide->Data.MINFO.pNameMailbox); + ConvertedRecord->Data.MINFO.pNameErrorsMailbox = DnsWToC((PWCHAR)QueryResultWide->Data.MINFO.pNameErrorsMailbox); + } + else + { + ConvertedRecord->Data.MINFO.pNameMailbox = DnsWToUTF8((PWCHAR)QueryResultWide->Data.MINFO.pNameMailbox); + ConvertedRecord->Data.MINFO.pNameErrorsMailbox = DnsWToUTF8((PWCHAR)QueryResultWide->Data.MINFO.pNameErrorsMailbox); + } break; case DNS_TYPE_MX: - ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); - ConvertedRecord->pName = DnsWToC((PWCHAR)QueryResultWide->pName); - ConvertedRecord->wType = QueryResultWide->wType; ConvertedRecord->wDataLength = sizeof(DNS_MX_DATA); - ConvertedRecord->Data.MX.pNameExchange = DnsWToC((PWCHAR)QueryResultWide->Data.MX.pNameExchange); + if (CodePage == CP_ACP) + ConvertedRecord->Data.MX.pNameExchange = DnsWToC((PWCHAR)QueryResultWide->Data.MX.pNameExchange); + else + ConvertedRecord->Data.MX.pNameExchange = DnsWToUTF8((PWCHAR)QueryResultWide->Data.MX.pNameExchange); ConvertedRecord->Data.MX.wPreference = QueryResultWide->Data.MX.wPreference; break; case DNS_TYPE_HINFO: - ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_TXT_DATA) + QueryResultWide->Data.TXT.dwStringCount); - ConvertedRecord->pName = DnsWToC((PWCHAR)QueryResultWide->pName); - ConvertedRecord->wType = QueryResultWide->wType; ConvertedRecord->wDataLength = sizeof(DNS_TXT_DATA) + (sizeof(PCHAR) * QueryResultWide->Data.TXT.dwStringCount); ConvertedRecord->Data.TXT.dwStringCount = QueryResultWide->Data.TXT.dwStringCount; - for (i = 0; i < ConvertedRecord->Data.TXT.dwStringCount; i++) - ConvertedRecord->Data.TXT.pStringArray[i] = DnsWToC((PWCHAR)QueryResultWide->Data.TXT.pStringArray[i]); + if (CodePage == CP_ACP) + for (i = 0; i < ConvertedRecord->Data.TXT.dwStringCount; i++) + ConvertedRecord->Data.TXT.pStringArray[i] = DnsWToC((PWCHAR)QueryResultWide->Data.TXT.pStringArray[i]); + else + for (i = 0; i < ConvertedRecord->Data.TXT.dwStringCount; i++) + ConvertedRecord->Data.TXT.pStringArray[i] = DnsWToUTF8((PWCHAR)QueryResultWide->Data.TXT.pStringArray[i]); break; case DNS_TYPE_NULL: - ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_NULL_DATA) + QueryResultWide->Data.Null.dwByteCount); - ConvertedRecord->pName = DnsWToC((PWCHAR)QueryResultWide->pName); - ConvertedRecord->wType = QueryResultWide->wType; ConvertedRecord->wDataLength = sizeof(DNS_NULL_DATA) + QueryResultWide->Data.Null.dwByteCount; ConvertedRecord->Data.Null.dwByteCount = QueryResultWide->Data.Null.dwByteCount; memcpy(&ConvertedRecord->Data.Null.Data, &QueryResultWide->Data.Null.Data, QueryResultWide->Data.Null.dwByteCount); @@ -208,6 +318,28 @@ DnsQuery_A(LPCSTR Name, return Status; } +DNS_STATUS WINAPI +DnsQuery_A(LPCSTR Name, + WORD Type, + DWORD Options, + PIP4_ARRAY Servers, + PDNS_RECORD *QueryResultSet, + PVOID *Reserved) +{ + return DnsQuery_CodePage(CP_ACP, Name, Type, Options, Servers, QueryResultSet, Reserved); +} + +DNS_STATUS WINAPI +DnsQuery_UTF8(LPCSTR Name, + WORD Type, + DWORD Options, + PIP4_ARRAY Servers, + PDNS_RECORD *QueryResultSet, + PVOID *Reserved) +{ + return DnsQuery_CodePage(CP_UTF8, Name, Type, Options, Servers, QueryResultSet, Reserved); +} + WCHAR *xstrsave(const WCHAR *str) { @@ -687,7 +819,7 @@ DnsQuery_W(LPCWSTR Name, AnsiName[i] == '-' || AnsiName[i] == '_' || AnsiName[i] == '.')) { RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); - return ERROR_INVALID_NAME; + return DNS_ERROR_INVALID_NAME_CHAR; } i++; } @@ -898,18 +1030,6 @@ DnsQuery_W(LPCWSTR Name, } } -DNS_STATUS WINAPI -DnsQuery_UTF8(LPCSTR Name, - WORD Type, - DWORD Options, - PIP4_ARRAY Servers, - PDNS_RECORD *QueryResultSet, - PVOID *Reserved) -{ - UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; -} - void DnsIntFreeRecordList(PDNS_RECORD ToDelete) { diff --git a/modules/rostests/apitests/dnsapi/DnsQuery.c b/modules/rostests/apitests/dnsapi/DnsQuery.c index a659154389f..c4873474a1f 100644 --- a/modules/rostests/apitests/dnsapi/DnsQuery.c +++ b/modules/rostests/apitests/dnsapi/DnsQuery.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Test for DnsQuery_A + * PURPOSE: Test for DnsQuery_A, DnsQuery_UTF8 * PROGRAMMER: Victor Martinez Calvo <victor.martinez(a)reactos.org> */ @@ -19,6 +19,8 @@ void TestHostName(void) DNS_STATUS dns_status; char host_name[255]; char test_name[255]; + char host_nameUTF8[255]; + char test_nameUTF8[255]; PDNS_RECORD dp; WCHAR host_nameW[255]; WCHAR test_nameW[255]; @@ -51,6 +53,7 @@ void TestHostName(void) } HeapFree(GetProcessHeap(), 0, network_info); mbstowcs(host_nameW, host_name, 255); + wcstombs(host_nameUTF8, host_nameW, 255); } //DnsQuery_A: @@ -266,6 +269,246 @@ void TestHostName(void) ok(dp == InvalidPointer || broken(dp == NULL), "dp = %p\n", dp); if (dp != InvalidPointer && dns_status == NO_ERROR) DnsRecordListFree(dp, DnsFreeRecordList); + //DnsQuery_UTF8: + //NULL + dp = InvalidPointer; + dns_status = DnsQuery_UTF8(NULL, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == ERROR_INVALID_PARAMETER, "DnsQuery_UTF8 failed with error %lu\n", dns_status); + ok(dp == InvalidPointer, "dp = %p\n", dp); + + //NULL dp + dns_status = DnsQuery_UTF8(host_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, NULL, 0); + ok(dns_status == ERROR_INVALID_PARAMETER, "DnsQuery_UTF8 failed with error %lu\n", dns_status); + + //Testing HostName + dp = InvalidPointer; + dns_status = DnsQuery_UTF8(host_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); + if (dp != InvalidPointer) + { + ok(strcmp(dp->pName, host_name) == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, host_name); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + } + ok(dp != InvalidPointer && dp != NULL, "dp = %p\n", dp); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); + + //127.0.0.1 + dp = InvalidPointer; + wcscpy(test_nameW, L"127.0.0.1"); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); + if (dp != InvalidPointer) + { + ok(strcmp(dp->pName, "127.0.0.1") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "127.0.0.1"); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + ok(dp->Data.A.IpAddress == ntohl(INADDR_LOOPBACK), "DnsQuery_UTF8 returned wrong data %ld expected %ld\n", dp->Data.A.IpAddress, ntohl(INADDR_LOOPBACK)); + } + ok(dp != InvalidPointer && dp != NULL, "dp = %p\n", dp); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); + + //Localhost strings + dp = InvalidPointer; + wcscpy(test_nameW, L"LocalHost"); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); + if (dp != InvalidPointer) + { + /* On Windows 7 is unchanged on XP is lowercased */ + ok(strcmp(dp->pName, "localhost") == 0 || broken(strcmp(dp->pName, "LocalHost") == 0), "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + ok(dp->Data.A.IpAddress == ntohl(INADDR_LOOPBACK), "DnsQuery_UTF8 returned wrong data %ld expected %ld\n", dp->Data.A.IpAddress, ntohl(INADDR_LOOPBACK)); + } + ok(dp != InvalidPointer && dp != NULL, "dp = %p\n", dp); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); + + dp = InvalidPointer; + wcscpy(test_nameW, L"Localhost"); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); + if (dp != InvalidPointer) + { + /* On Windows 7 is unchanged on XP is lowercased */ + ok(strcmp(dp->pName, "localhost") == 0 || broken(strcmp(dp->pName, "Localhost") == 0), "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + ok(dp->Data.A.IpAddress == ntohl(INADDR_LOOPBACK), "DnsQuery_UTF8 returned wrong data %ld expected %ld\n", dp->Data.A.IpAddress, ntohl(INADDR_LOOPBACK)); + } + ok(dp != InvalidPointer && dp != NULL, "dp = %p\n", dp); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); + + dp = InvalidPointer; + wcscpy(test_nameW, L"localhost"); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); + if (dp != InvalidPointer) + { + ok(strcmp(dp->pName, "localhost") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + ok(dp->Data.A.IpAddress == ntohl(INADDR_LOOPBACK), "DnsQuery_UTF8 returned wrong data %ld expected %ld\n", dp->Data.A.IpAddress, ntohl(INADDR_LOOPBACK)); + } + ok(dp != InvalidPointer && dp != NULL, "dp = %p\n", dp); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); + + dp = InvalidPointer; + wcscpy(test_nameW, L""); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); + if (dp != InvalidPointer) + { + /* On Windows 7 is the host on XP is dot ??? */ + ok(strcmp(dp->pName, ".") == 0 || broken(strcmp(dp->pName, host_name) == 0), "DnsQuery_UTF8 returned wrong answer '%s' expected '%s' or '.'\n", dp->pName, host_name); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + } + ok(dp != InvalidPointer && dp != NULL, "dp = %p\n", dp); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); + + dp = InvalidPointer; + wcscpy(test_nameW, L" "); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + /* On Windows 7 is DNS_ERROR_INVALID_NAME_CHAR on XP is ERROR_TIMEOUT on Win 2k3 is ERROR_INVALID_NAME*/ + ok(dns_status == ERROR_INVALID_NAME || broken(dns_status == ERROR_TIMEOUT) || broken(dns_status == DNS_ERROR_INVALID_NAME_CHAR), "DnsQuery_UTF8 failed with error %lu expected %u or %u or %u\n", dns_status, ERROR_INVALID_NAME, ERROR_TIMEOUT, DNS_ERROR_INVALID_NAME_CHAR); + if (dp != InvalidPointer && dns_status == NO_ERROR) + { + ok(strcmp(dp->pName, host_name) == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, host_name); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + } + ok(dp == InvalidPointer || broken(dp == NULL), "dp = %p\n", dp); + if (dp != InvalidPointer && dns_status == NO_ERROR) DnsRecordListFree(dp, DnsFreeRecordList); + + dp = InvalidPointer; + wcscpy(test_nameW, L"0.0.0.0"); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_UTF8 failed with error %lu\n", dns_status); + if (dp != InvalidPointer) + { + ok(strcmp(dp->pName, "0.0.0.0") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "0.0.0.0"); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + ok(dp->Data.A.IpAddress == ntohl(INADDR_ANY), "DnsQuery_UTF8 returned wrong data %ld expected %ld\n", dp->Data.A.IpAddress, ntohl(INADDR_ANY)); + } + ok(dp != InvalidPointer && dp != NULL, "dp = %p\n", dp); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); + + dp = InvalidPointer; + wcscpy(test_nameW, L"0.0.0.0 "); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + /* On windows 7 fails with DNS_ERROR_INVALID_NAME_CHAR on XP no error */ + ok(dns_status == NO_ERROR || broken(dns_status == DNS_ERROR_INVALID_NAME_CHAR), "DnsQuery_UTF8 wrong status %lu expected %u or %u\n", dns_status, NO_ERROR, DNS_ERROR_INVALID_NAME_CHAR); + if (dp != InvalidPointer && dns_status == NO_ERROR) + { + ok(strcmp(dp->pName, "0.0.0.0") == 0 || broken(strcmp(dp->pName, "0.0.0.0 ") == 0), "DnsQuery_UTF8 returned wrong answer '%s' expected '%s' or '%s'\n", dp->pName, "0.0.0.0", "0.0.0.0 "); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + ok(dp->Data.A.IpAddress == ntohl(INADDR_ANY), "DnsQuery_UTF8 returned wrong data %ld expected %ld\n", dp->Data.A.IpAddress, ntohl(INADDR_ANY)); + } + ok(dp != InvalidPointer || broken(dp == InvalidPointer) || broken(dp == NULL), "dp = %p\n", dp); + if (dp != InvalidPointer && dns_status == NO_ERROR) DnsRecordListFree(dp, DnsFreeRecordList); + + dp = InvalidPointer; + wcscpy(test_nameW, L"127.0.0.1 "); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + /* On windows 7 fails with DNS_ERROR_INVALID_NAME_CHAR on XP no error */ + ok(dns_status == NO_ERROR || broken(dns_status == DNS_ERROR_INVALID_NAME_CHAR), "DnsQuery_UTF8 wrong status %lu expected %u or %u\n", dns_status, NO_ERROR, DNS_ERROR_INVALID_NAME_CHAR); + if (dp != InvalidPointer && dns_status == NO_ERROR) + { + ok(strcmp(dp->pName, "127.0.0.1") == 0 || strcmp(dp->pName, "127.0.0.1 ") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s' or '%s'\n", dp->pName, "127.0.0.1", "127.0.0.1 "); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + ok(dp->Data.A.IpAddress == ntohl(INADDR_LOOPBACK), "DnsQuery_UTF8 returned wrong data %ld expected %ld\n", dp->Data.A.IpAddress, ntohl(INADDR_LOOPBACK)); + } + ok(dp != InvalidPointer || broken(dp == InvalidPointer) || broken(dp == NULL), "dp = %p\n", dp); + if (dp != InvalidPointer && dns_status == NO_ERROR) DnsRecordListFree(dp, DnsFreeRecordList); + + dp = InvalidPointer; + wcscpy(test_nameW, L" 127.0.0.1 "); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == DNS_ERROR_RCODE_NAME_ERROR || broken(dns_status == DNS_ERROR_INVALID_NAME_CHAR), "DnsQuery_UTF8 wrong status %lu expected %u or %u\n", dns_status, DNS_ERROR_RCODE_NAME_ERROR, DNS_ERROR_INVALID_NAME_CHAR); + if (dp != InvalidPointer && dns_status == NO_ERROR) + { + ok(strcmp(dp->pName, "127.0.0.1") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "127.0.0.1"); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + ok(dp->Data.A.IpAddress == ntohl(INADDR_LOOPBACK), "DnsQuery_UTF8 returned wrong data %ld expected %ld\n", dp->Data.A.IpAddress, ntohl(INADDR_LOOPBACK)); + } + ok(dp == InvalidPointer || broken(dp == NULL), "dp = %p\n", dp); + if (dp != InvalidPointer && dns_status == NO_ERROR) DnsRecordListFree(dp, DnsFreeRecordList); + + dp = InvalidPointer; + wcscpy(test_nameW, L" 127.0. 0.1 "); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == DNS_ERROR_RCODE_NAME_ERROR || broken(dns_status == DNS_ERROR_INVALID_NAME_CHAR), "DnsQuery_UTF8 wrong status %lu expected %u or %u\n", dns_status, DNS_ERROR_RCODE_NAME_ERROR, DNS_ERROR_INVALID_NAME_CHAR); + if (dp == InvalidPointer && dns_status == NO_ERROR) + { + ok(strcmp(dp->pName, "127.0.0.1") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "127.0.0.1"); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + ok(dp->Data.A.IpAddress == ntohl(INADDR_LOOPBACK), "DnsQuery_UTF8 returned wrong data %ld expected %ld\n", dp->Data.A.IpAddress, ntohl(INADDR_LOOPBACK)); + } + ok(dp == InvalidPointer || broken(dp == NULL), "dp = %p\n", dp); + if (dp != InvalidPointer && dns_status == NO_ERROR) DnsRecordListFree(dp, DnsFreeRecordList); + + dp = InvalidPointer; + wcscpy(test_nameW, L"localhost "); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == ERROR_INVALID_NAME || broken(dns_status == ERROR_TIMEOUT) || broken(dns_status == DNS_ERROR_INVALID_NAME_CHAR), "DnsQuery_UTF8 wrong status %lu expected %u or %u or %u\n", dns_status, ERROR_INVALID_NAME, ERROR_TIMEOUT, DNS_ERROR_INVALID_NAME_CHAR); + if (dp != InvalidPointer && dns_status == NO_ERROR) + { + ok(strcmp(dp->pName, "localhost") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + ok(dp->Data.A.IpAddress == ntohl(INADDR_LOOPBACK), "DnsQuery_UTF8 returned wrong data %ld expected %ld\n", dp->Data.A.IpAddress, ntohl(INADDR_LOOPBACK)); + } + ok(dp == InvalidPointer || broken(dp == NULL), "dp = %p\n", dp); + if (dp != InvalidPointer && dns_status == NO_ERROR) DnsRecordListFree(dp, DnsFreeRecordList); + + dp = InvalidPointer; + wcscpy(test_nameW, L" localhost"); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == ERROR_INVALID_NAME || broken(dns_status == ERROR_TIMEOUT) || broken(dns_status == DNS_ERROR_INVALID_NAME_CHAR), "DnsQuery_UTF8 wrong status %lu expected %u or %u or %u\n", dns_status, ERROR_INVALID_NAME, ERROR_TIMEOUT, DNS_ERROR_INVALID_NAME_CHAR); + if (dp != InvalidPointer && dns_status == NO_ERROR) + { + ok(strcmp(dp->pName, "localhost") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + ok(dp->Data.A.IpAddress == ntohl(INADDR_LOOPBACK), "DnsQuery_UTF8 returned wrong data %ld expected %ld\n", dp->Data.A.IpAddress, ntohl(INADDR_LOOPBACK)); + } + ok(dp == InvalidPointer || broken(dp == NULL), "dp = %p\n", dp); + if (dp != InvalidPointer && dns_status == NO_ERROR) DnsRecordListFree(dp, DnsFreeRecordList); + + dp = InvalidPointer; + wcscpy(test_nameW, L" local host "); + wcstombs(test_nameUTF8, test_nameW, 255); + dns_status = DnsQuery_UTF8(test_nameUTF8, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == ERROR_INVALID_NAME || broken(dns_status == ERROR_TIMEOUT) || broken(dns_status == DNS_ERROR_INVALID_NAME_CHAR), "DnsQuery_UTF8 wrong status %lu expected %u or %u or %u\n", dns_status, ERROR_INVALID_NAME, ERROR_TIMEOUT, DNS_ERROR_INVALID_NAME_CHAR); + if (dp != InvalidPointer && dns_status == NO_ERROR) + { + ok(strcmp(dp->pName, "localhost") == 0, "DnsQuery_UTF8 returned wrong answer '%s' expected '%s'\n", dp->pName, "localhost"); + ok(dp->wType == DNS_TYPE_A, "DnsQuery_UTF8 returned wrong type %d expected %d\n", dp->wType, DNS_TYPE_A); + ok(dp->wDataLength == sizeof(IP4_ADDRESS), "DnsQuery_UTF8 returned wrong data size %d\n", dp->wDataLength); + ok(dp->Data.A.IpAddress == ntohl(INADDR_LOOPBACK), "DnsQuery_UTF8 returned wrong data %ld expected %ld\n", dp->Data.A.IpAddress, ntohl(INADDR_LOOPBACK)); + } + ok(dp == InvalidPointer || broken(dp == NULL), "dp = %p\n", dp); + if (dp != InvalidPointer && dns_status == NO_ERROR) DnsRecordListFree(dp, DnsFreeRecordList); + //DnsQuery_W: //NULL dp = InvalidPointer; @@ -288,7 +531,7 @@ void TestHostName(void) dns_status = DnsQuery_W(host_nameW, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, NULL, 0); ok(dns_status == ERROR_INVALID_PARAMETER, "DnsQuery_W failed with error %lu\n", dns_status); - //Testing HostName + //Testing HostName dns_status = DnsQuery_W(host_nameW, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); if (dp != InvalidPointer) @@ -299,7 +542,7 @@ void TestHostName(void) } ok(dp != InvalidPointer && dp != NULL, "dp = %p\n", dp); if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); - + //127.0.0.1 dns_status = DnsQuery_W(L"127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status);

1 0

[reactos] 01/01: [UTILMAN] Meh
by Pierre Schweitzer 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db4b34a046ee0dd23e497… commit db4b34a046ee0dd23e497fd0a47ec5ce771e870b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 19 19:46:08 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 19 19:46:08 2019 +0200 [UTILMAN] Meh --- base/applications/utilman/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/utilman/lang/fr-FR.rc b/base/applications/utilman/lang/fr-FR.rc index 6f17a5c83ee..f5c79a3f98d 100644 --- a/base/applications/utilman/lang/fr-FR.rc +++ b/base/applications/utilman/lang/fr-FR.rc @@ -18,7 +18,7 @@ BEGIN CONTROL "Démarrer", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Arrêter", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 CONTROL "Démarrer automatiquement quand je me connecte", IDC_START_LOG_IN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 101, 206, 14 - CONTROL "Démarrer automatiquement quand je suis sur le bureau", IDC_START_DESKTOP, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 118, 212, 14 + CONTROL "Démarrer automatiquement quand je verrouille mon bureau", IDC_START_DESKTOP, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 118, 212, 14 CONTROL "Démarrer automatiquement quand le gestionnaire démarre", IDC_START_UTILMAN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 134, 212, 13 CONTROL "&OK", IDC_OK, "Button", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 161, 50, 14 CONTROL "&Annuler", IDC_CANCEL, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 221, 161, 50, 14

1 0

[reactos] 01/01: [UTILMAN] Fix Small typo in one of the checkboxes
by Shy Zedaka 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff7938095ed994e25fd97… commit ff7938095ed994e25fd974b95abb3ac3db23eef9 Author: Shy Zedaka <shaytzedaka(a)outlook.com> AuthorDate: Mon Aug 19 20:13:55 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 19 19:42:01 2019 +0200 [UTILMAN] Fix Small typo in one of the checkboxes --- base/applications/utilman/lang/en-US.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/utilman/lang/en-US.rc b/base/applications/utilman/lang/en-US.rc index eff32a39511..01f77285d09 100644 --- a/base/applications/utilman/lang/en-US.rc +++ b/base/applications/utilman/lang/en-US.rc @@ -18,7 +18,7 @@ BEGIN CONTROL "Start", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 CONTROL "Stop", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 CONTROL "Start automatically when I log in", IDC_START_LOG_IN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 101, 206, 14 - CONTROL "Start automatically when I look my desktop", IDC_START_DESKTOP, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 118, 212, 14 + CONTROL "Start automatically when I lock my desktop", IDC_START_DESKTOP, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 118, 212, 14 CONTROL "Start automatically when Utility Manager starts", IDC_START_UTILMAN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 134, 212, 13 CONTROL "&OK", IDC_OK, "Button", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 161, 50, 14 CONTROL "&Cancel", IDC_CANCEL, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 221, 161, 50, 14

1 0

[reactos] 01/01: [UTILMAN] Fix the build for msvc
by Mark Jansen 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=012413813d7fac815b0ee… commit 012413813d7fac815b0eeb353d7cc81ba12718d2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Aug 19 14:13:43 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 19 14:13:43 2019 +0200 [UTILMAN] Fix the build for msvc --- base/applications/utilman/lang/en-US.rc | 3 ++- base/applications/utilman/lang/fr-FR.rc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/base/applications/utilman/lang/en-US.rc b/base/applications/utilman/lang/en-US.rc index 582c69b57c3..eff32a39511 100644 --- a/base/applications/utilman/lang/en-US.rc +++ b/base/applications/utilman/lang/en-US.rc @@ -5,11 +5,12 @@ * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) */ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + IDD_MAIN_DIALOG DIALOGEX 0, 0, 284, 183 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Accessibility Utility Manager" -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER diff --git a/base/applications/utilman/lang/fr-FR.rc b/base/applications/utilman/lang/fr-FR.rc index 78c95eb9315..6f17a5c83ee 100644 --- a/base/applications/utilman/lang/fr-FR.rc +++ b/base/applications/utilman/lang/fr-FR.rc @@ -5,11 +5,12 @@ * COPYRIGHT: Copyright 2019 Pierre Schweitzer (pierre(a)reactos.org) */ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + IDD_MAIN_DIALOG DIALOGEX 0, 0, 284, 183 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Gestionnaire d'utilitaires d'accessibilité" -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs