Ros-diffs June 2022

ros-diffs@reactos.org

17 participants
236 discussions

[reactos] 08/158: [WINESYNC] reg/tests: Verify registry export after each empty key test.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b511b56d787ced695bc4… commit 3b511b56d787ced695bc428248af0a578939222e Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Jan 16 14:51:45 2022 +0100 Commit: Thomas Csovcsity <thc.fr13nd(a)gmail.com> CommitDate: Sun Jun 19 13:06:27 2022 +0200 [WINESYNC] reg/tests: Verify registry export after each empty key test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 5cacd496a14b8f83c8e0209bb00bf2ea4ce90e01 by Hugh McMaster <hugh.mcmaster(a)outlook.com> --- modules/rostests/winetests/reg/reg.c | 2 +- sdk/tools/winesync/reg.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/winetests/reg/reg.c b/modules/rostests/winetests/reg/reg.c index 2afa5eb01fa..9dd3a2afe81 100644 --- a/modules/rostests/winetests/reg/reg.c +++ b/modules/rostests/winetests/reg/reg.c @@ -4493,6 +4493,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); run_reg_exe("reg export /y HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -4503,7 +4504,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE), /* winxp */ "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); /* Test registry export with a simple data structure */ diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index e1dfdaf54ed..2aaad5127fa 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: b51b969a011c3efbddbbf29a312e49d0b5877faf + wine: 5cacd496a14b8f83c8e0209bb00bf2ea4ce90e01

2 years, 3 months

[reactos] 07/158: [WINESYNC] reg/tests: Always overwrite export test file during 'export' sequence.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70f06b31a910751fce31d… commit 70f06b31a910751fce31d838ada3a4ac345a10f5 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Jan 16 14:51:45 2022 +0100 Commit: Thomas Csovcsity <thc.fr13nd(a)gmail.com> CommitDate: Sun Jun 19 13:06:27 2022 +0200 [WINESYNC] reg/tests: Always overwrite export test file during 'export' sequence. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id b51b969a011c3efbddbbf29a312e49d0b5877faf by Hugh McMaster <hugh.mcmaster(a)outlook.com> --- modules/rostests/winetests/reg/reg.c | 16 ++++++++-------- sdk/tools/winesync/reg.cfg | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/rostests/winetests/reg/reg.c b/modules/rostests/winetests/reg/reg.c index 429de8164e6..2afa5eb01fa 100644 --- a/modules/rostests/winetests/reg/reg.c +++ b/modules/rostests/winetests/reg/reg.c @@ -4511,7 +4511,7 @@ static void test_export(void) add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); add_value(hkey, "String", REG_SZ, "Your text here...", 18); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); @@ -4549,7 +4549,7 @@ static void test_export(void) RegCloseKey(hkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); @@ -4563,7 +4563,7 @@ static void test_export(void) add_key(hkey, "Subkey1", &subkey); RegCloseKey(subkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); @@ -4578,7 +4578,7 @@ static void test_export(void) RegCloseKey(hkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); @@ -4596,7 +4596,7 @@ static void test_export(void) add_value(hkey, "Wine1h", 0xabcd, NULL, 0); RegCloseKey(hkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); @@ -4614,7 +4614,7 @@ static void test_export(void) verify_reg(hkey, "Wine2c", REG_DWORD, NULL, 0, 0); RegCloseKey(hkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); @@ -4633,7 +4633,7 @@ static void test_export(void) verify_reg(hkey, "Wine3c", REG_DWORD, &dword, sizeof(dword), 0); RegCloseKey(hkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); @@ -4671,7 +4671,7 @@ static void test_export(void) verify_reg(hkey, "Wine4h", REG_SZ, "abc\0def", 8, 0); RegCloseKey(hkey); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index 24654675142..e1dfdaf54ed 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: 597a12420be2bee4e69b9400a075ae4393863573 + wine: b51b969a011c3efbddbbf29a312e49d0b5877faf

2 years, 3 months

[reactos] 06/158: [WINESYNC] reg/tests: Check for key non-existence with verify_key_nonexist().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b42e659cef066a312687… commit 5b42e659cef066a3126872ff905b288a21e2f505 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Jan 16 14:51:45 2022 +0100 Commit: Thomas Csovcsity <thc.fr13nd(a)gmail.com> CommitDate: Sun Jun 19 13:06:27 2022 +0200 [WINESYNC] reg/tests: Check for key non-existence with verify_key_nonexist(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 597a12420be2bee4e69b9400a075ae4393863573 by Hugh McMaster <hugh.mcmaster(a)outlook.com> --- modules/rostests/winetests/reg/reg.c | 6 ++---- sdk/tools/winesync/reg.cfg | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/rostests/winetests/reg/reg.c b/modules/rostests/winetests/reg/reg.c index 489989f12a8..429de8164e6 100644 --- a/modules/rostests/winetests/reg/reg.c +++ b/modules/rostests/winetests/reg/reg.c @@ -249,13 +249,11 @@ static void test_add(void) /* Test input key formats */ run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest0"); - ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", err); + verify_key_nonexist(hkey, "keytest0"); run_reg_exe("reg add \\\\HKCU\\" KEY_BASE "\\keytest1 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest1"); - ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", err); + verify_key_nonexist(hkey, "keytest1"); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index 6be9ff46c07..24654675142 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: e6e227f21de08c7ddfe3e48b3ceb2fef01b6c0a6 + wine: 597a12420be2bee4e69b9400a075ae4393863573

2 years, 3 months

[reactos] 05/158: [WINESYNC] reg/tests: Move /v* syntax tests to the 'add' and 'delete' test sequences.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4dbcf50583f85e7804659… commit 4dbcf50583f85e7804659cc3dc577be45316cc24 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Jan 16 14:51:45 2022 +0100 Commit: Thomas Csovcsity <thc.fr13nd(a)gmail.com> CommitDate: Sun Jun 19 13:06:27 2022 +0200 [WINESYNC] reg/tests: Move /v* syntax tests to the 'add' and 'delete' test sequences. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id e6e227f21de08c7ddfe3e48b3ceb2fef01b6c0a6 by Hugh McMaster <hugh.mcmaster(a)outlook.com> --- modules/rostests/winetests/reg/reg.c | 73 +++++++++++++++++------------------- sdk/tools/winesync/reg.cfg | 2 +- 2 files changed, 36 insertions(+), 39 deletions(-) diff --git a/modules/rostests/winetests/reg/reg.c b/modules/rostests/winetests/reg/reg.c index e11e4e9227e..489989f12a8 100644 --- a/modules/rostests/winetests/reg/reg.c +++ b/modules/rostests/winetests/reg/reg.c @@ -574,6 +574,9 @@ static void test_add(void) RegCloseKey(hkey); /* Test duplicate switches */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /t REG_DWORD /d 0x1 /v Test /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dup1 /t REG_DWORD /d 123 /f /t REG_SZ", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); @@ -581,6 +584,17 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dup2 /t REG_DWORD /d 123 /f /d 456", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + /* Multiple /v* switches */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* No /v argument */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /d Test /f /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* Test invalid switches */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid1 /a", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); @@ -618,6 +632,27 @@ static void test_delete(void) run_reg_exe("reg delete -H", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + /* Multiple /v* switches */ + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /v Test /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* No /v argument */ + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); add_value(hkey, "foo", REG_DWORD, &deadbeef, sizeof(deadbeef)); add_value(hkey, "bar", REG_DWORD, &deadbeef, sizeof(deadbeef)); @@ -757,43 +792,6 @@ static void test_query(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } -static void test_v_flags(void) -{ - DWORD r; - - run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /ve", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /ve", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /va", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - /* No /v argument */ - run_reg_exe("reg add HKCU\\" KEY_BASE " /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg add HKCU\\" KEY_BASE " /d Test /f /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - /* Multiple /v switches */ - run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /t REG_DWORD /d 0x1 /v Test /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /v Test /f", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); -} - static BOOL write_file(const void *str, DWORD size) { HANDLE file; @@ -4772,7 +4770,6 @@ START_TEST(reg) test_add(); test_delete(); test_query(); - test_v_flags(); test_import(); test_unicode_import(); test_import_with_whitespace(); diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index 08fb675aadd..6be9ff46c07 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: 405853adb53695c0fd3f7d38ac733dd6900a48dd + wine: e6e227f21de08c7ddfe3e48b3ceb2fef01b6c0a6

2 years, 3 months

[reactos] 04/158: [WINESYNC] reg/tests: Ensure test key is fully removed before each sequence begins.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=855cf07c706e304e148d2… commit 855cf07c706e304e148d2356ae2ca64a043abbea Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Jan 16 14:51:45 2022 +0100 Commit: Thomas Csovcsity <thc.fr13nd(a)gmail.com> CommitDate: Sun Jun 19 13:06:27 2022 +0200 [WINESYNC] reg/tests: Ensure test key is fully removed before each sequence begins. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 405853adb53695c0fd3f7d38ac733dd6900a48dd by Hugh McMaster <hugh.mcmaster(a)outlook.com> --- modules/rostests/winetests/reg/reg.c | 40 ++++++++++++++++++------------------ sdk/tools/winesync/reg.cfg | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/rostests/winetests/reg/reg.c b/modules/rostests/winetests/reg/reg.c index 4be9e635ed7..e11e4e9227e 100644 --- a/modules/rostests/winetests/reg/reg.c +++ b/modules/rostests/winetests/reg/reg.c @@ -222,6 +222,9 @@ static void test_add(void) DWORD r, dword, type, size; char buffer[22]; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + run_reg_exe("reg add", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -234,11 +237,6 @@ static void test_add(void) run_reg_exe("reg add -H", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); - - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); - run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -602,12 +600,11 @@ static void test_add(void) static void test_delete(void) { HKEY hkey, hsubkey; - LONG err; DWORD r; const DWORD deadbeef = 0xdeadbeef; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg delete", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -664,8 +661,8 @@ static void test_query(void) const DWORD dword1 = 0x123; const DWORD dword2 = 0xabc; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg query", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -858,8 +855,8 @@ static void test_import(void) LONG err; BYTE hex[8]; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg import", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -2387,8 +2384,8 @@ static void test_unicode_import(void) char buffer[24]; BYTE hex[8]; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); test_import_wstr("REGEDIT\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, @@ -3910,8 +3907,8 @@ static void test_import_with_whitespace(void) DWORD r, dword; LONG err; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); test_import_str(" REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); @@ -4058,8 +4055,8 @@ static void test_unicode_import_with_whitespace(void) DWORD r, dword; LONG err; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); @@ -4453,8 +4450,8 @@ static void test_export(void) "\"Wine4g\"=\"Value2\"\r\n" "\"Wine4h\"=\"abc\"\r\n\r\n"; - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg export", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -4691,6 +4688,9 @@ static void test_copy(void) { DWORD r; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + run_reg_exe("reg copy", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index 46149d5af82..08fb675aadd 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: add814af3eb7368961fe5b37a66c616e4bd97e4b + wine: 405853adb53695c0fd3f7d38ac733dd6900a48dd

2 years, 3 months

[reactos] 03/158: [WINESYNC] reg/tests: Check for elevated privileges before cleaning up the Windows 3.1 test key and running unit tests.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e163213a0f88733307936… commit e163213a0f887333079364eafe4635fbc835531a Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Jan 16 14:51:44 2022 +0100 Commit: Thomas Csovcsity <thc.fr13nd(a)gmail.com> CommitDate: Sun Jun 19 13:06:27 2022 +0200 [WINESYNC] reg/tests: Check for elevated privileges before cleaning up the Windows 3.1 test key and running unit tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id add814af3eb7368961fe5b37a66c616e4bd97e4b by Hugh McMaster <hugh.mcmaster(a)outlook.com> --- modules/rostests/winetests/reg/reg.c | 10 +++++----- sdk/tools/winesync/reg.cfg | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/reg/reg.c b/modules/rostests/winetests/reg/reg.c index afba8424c1a..4be9e635ed7 100644 --- a/modules/rostests/winetests/reg/reg.c +++ b/modules/rostests/winetests/reg/reg.c @@ -4204,14 +4204,11 @@ static void test_import_31(void) { LONG err; HKEY hkey; - DWORD r; - - err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", err); + DWORD dispos, r; /* Check if reg.exe is running with elevated privileges */ err = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_SET_VALUE, NULL, &hkey, NULL); + KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos); if (err == ERROR_ACCESS_DENIED) { win_skip("reg.exe is not running with elevated privileges; " @@ -4219,6 +4216,9 @@ static void test_import_31(void) return; } + if (dispos == REG_OPENED_EXISTING_KEY) + delete_value(hkey, NULL); + /* Test simple value */ test_import_str("REGEDIT\r\n" "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n", &r); diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index 3b785ba86af..46149d5af82 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: 6cf0e7fe85ba2f9348cec4d4d555c5dac42033de + wine: add814af3eb7368961fe5b37a66c616e4bd97e4b

2 years, 3 months

[reactos] 02/158: [WINESYNC] reg/tests: Add initial syntax tests for 'reg copy'.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee54c258719705b0b3a92… commit ee54c258719705b0b3a92ef5ecf69b7591da9e6d Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Jan 16 14:51:44 2022 +0100 Commit: Thomas Csovcsity <thc.fr13nd(a)gmail.com> CommitDate: Sun Jun 19 13:06:27 2022 +0200 [WINESYNC] reg/tests: Add initial syntax tests for 'reg copy'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 6cf0e7fe85ba2f9348cec4d4d555c5dac42033de by Hugh McMaster <hugh.mcmaster(a)outlook.com> --- modules/rostests/winetests/reg/reg.c | 80 +++++++++++++++++++++++++++++++++++- sdk/tools/winesync/reg.cfg | 2 +- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/modules/rostests/winetests/reg/reg.c b/modules/rostests/winetests/reg/reg.c index ea4e128da5a..afba8424c1a 100644 --- a/modules/rostests/winetests/reg/reg.c +++ b/modules/rostests/winetests/reg/reg.c @@ -21,7 +21,8 @@ #include "wine/test.h" #define lok ok_(__FILE__,line) -#define KEY_BASE "Software\\Wine\\reg_test" +#define KEY_WINE "Software\\Wine" +#define KEY_BASE KEY_WINE "\\reg_test" #define REG_EXIT_SUCCESS 0 #define REG_EXIT_FAILURE 1 #define TODO_REG_TYPE (0x0001u) @@ -4684,6 +4685,82 @@ static void test_export(void) delete_key(HKEY_CURRENT_USER, KEY_BASE); } +#define COPY_DEST KEY_WINE "\\reg_copy" + +static void test_copy(void) +{ + DWORD r; + + run_reg_exe("reg copy", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /?", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy /h", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy -H", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy /? /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /h /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /? /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /h /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " foo /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE" /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /s HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" COPY_DEST " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" COPY_DEST " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST "/a", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST "/f /a", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + START_TEST(reg) { DWORD r; @@ -4702,4 +4779,5 @@ START_TEST(reg) test_unicode_import_with_whitespace(); test_import_31(); test_export(); + test_copy(); } diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index 006dabe76f1..3b785ba86af 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: f81d15beb690c5e08c5995b90aec8015218bee55 + wine: 6cf0e7fe85ba2f9348cec4d4d555c5dac42033de

2 years, 3 months

[reactos] 01/158: [WINESYNC] reg: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b9269fc8ed77ec42e326… commit 7b9269fc8ed77ec42e32695a5e184adff41557ac Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Jan 16 14:51:29 2022 +0100 Commit: Thomas Csovcsity <thc.fr13nd(a)gmail.com> CommitDate: Sun Jun 19 13:06:27 2022 +0200 [WINESYNC] reg: FormatMessage() now reports ERROR_NO_WORK_DONE error for empty string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id f81d15beb690c5e08c5995b90aec8015218bee55 by Alexandre Julliard <julliard(a)winehq.org> --- base/applications/cmdutils/reg/reg.c | 3 +-- sdk/tools/winesync/reg.cfg | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/base/applications/cmdutils/reg/reg.c b/base/applications/cmdutils/reg/reg.c index 21a08615531..22e54c069c1 100644 --- a/base/applications/cmdutils/reg/reg.c +++ b/base/applications/cmdutils/reg/reg.c @@ -132,10 +132,9 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) WCHAR *str; DWORD len; - SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, fmt, 0, 0, (WCHAR *)&str, 0, &va_args); - if (len == 0 && GetLastError() != NO_ERROR) + if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return; diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg new file mode 100644 index 00000000000..006dabe76f1 --- /dev/null +++ b/sdk/tools/winesync/reg.cfg @@ -0,0 +1,7 @@ +directories: + programs/reg: base/applications/cmdutils/reg + programs/reg/tests: modules/rostests/winetests/reg +files: + programs/reg/resource.h: base/applications/cmdutils/reg/resource.h +tags: + wine: f81d15beb690c5e08c5995b90aec8015218bee55

2 years, 3 months

[reactos] 01/01: [DISKPART] Add help text for the FORMAT command

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a66cbb224804317cb4be… commit 4a66cbb224804317cb4bea32c10838f43a820a70 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jun 19 08:28:53 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jun 19 08:28:53 2022 +0200 [DISKPART] Add help text for the FORMAT command --- base/system/diskpart/diskpart_msg.mc | 667 ++++++++++++++++++++++++++++++++++- 1 file changed, 648 insertions(+), 19 deletions(-) diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index 07c71702791..45282e2de7d 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -3723,34 +3723,663 @@ SymbolicName=MSG_COMMAND_FORMAT Severity=Informational Facility=System Language=English -<Add FORMAT command help text here> + Formats the specified volume for use with ReactOS. + +Syntax: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] + [UNIT=<N>] [QUICK] [COMPRESS] [OVERRIDE] [DUPLICATE] [NOWAIT] + [NOERR] + + FS=<FS> Specifies the type of file system. If no file system is given, + the default file system displayed by the FILESYSTEMS command is + used. + + REVISION=<X.XX> + + Specifies the file system revision (if applicable). + + RECOMMENDED If specified, use the recommended file system and revision + instead of the default if a recommendation exists. The + recommended file system (if one exists) is displayed by the + FILESYSTEMS command. + + LABEL=<"label"> + + Specifies the volume label. + + UNIT=<N> Overrides the default allocation unit size. Default settings + are strongly recommended for general use. The default + allocation unit size for a particular file system is displayed + by the FILESYSTEMS command. + + NTFS compression is not supported for allocation unit sizes + above 4096. + + QUICK Performs a quick format. + + COMPRESS NTFS only: Files created on the new volume will be compressed + by default. + + OVERRIDE Forces the file system to dismount first if necessary. All + opened handles to the volume would no longer be valid. + + DUPLICATE UDF Only: This flag applies to UDF format, version 2.5 or + higher. + This flag instructs the format operation to duplicate the file + system meta-data to a second set of sectors on the disk. The + duplicate meta-data is used by applications, for example repair + or recovery applications. If the primary meta-data sectors are + found to be corrupted, the file system meta-data will be read + from the duplicate sectors. + + NOWAIT Forces the command to return immediately while the format + process is still in progress. If NOWAIT is not specified, + DiskPart will display format progress in percentage. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A volume must be selected for this operation to succeed. + +Examples: + + FORMAT FS=NTFS LABEL="New Volume" QUICK COMPRESS + FORMAT RECOMMENDED OVERRIDE . Language=German -<Add FORMAT command help text here> + Formatiert das angegebene Volume für die Verwendung mit ReactOS. + +Syntax: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] + [UNIT=<N>] [QUICK] [COMPRESS] [OVERRIDE] [DUPLICATE] [NOWAIT] + [NOERR] + + FS=<FS> Gibt den Typ des Dateisystems an. Falls kein Dateisystem + angegeben wurde, wird das durch den Befehl + "FILESYSTEMS" angezeigte Standarddateisystem + verwendet. + + REVISION=<X.XX> + + Gibt die Dateisystemversion an (sofern zutreffend). + + RECOMMENDED Sofern angegeben, werden anstelle der Standardein- + stellung das empfohlene Dateisystem und die Version verwendet, + falls eine Empfehlung vorhanden ist. Das empfohlene Dateisystem + (sofern vorhanden) wird durch den Befehl "FILESYSTEMS" + angezeigt. + + LABEL=<"label"> + Gibt die Volumebezeichnung an. + + UNIT=<N> Überschreibt die standardmäßige Größe der + Zuteilungseinheit. Für die allgemeine Verwendung + werden dringend die Standardeinstellungen + empfohlen. + Die standardmäßige Größe der Zuteilungseinheit + für ein bestimmtes Dateisystem wird durch den + Befehl "FILESYSTEMS" angezeigt. + + NTFS-Komprimierung wird für Zuteilungseinheitsgrößen + über 4096 nicht unterstützt. + + QUICK Führt eine Schnellformatierung aus. + + COMPRESS nur NTFS: Auf dem neuen Volume erstellte Dateien + werden standardmäßig komprimiert. + + OVERRIDE Erzwingt ggf. die Aufhebung der Bereitstellung des + Dateisystems als ersten Schritt. Alle geöffneten Handles für + das Volume besäßen keine Gültigkeit mehr. + + DUPLICATE nur UDF: Dieses Kennzeichen gilt für das UDF-Format, + Version 2.5 oder höher. Durch dieses Kennzeichen wird der + Formatvorgang angewiesen, die Dateisystem-Metadaten + auf einem zweiten Sektorensatz auf dem Datenträger zu + duplizieren. Die duplizierten Metadaten werden von + Anwendungen verwendet, beispielsweise für Reparatur- + oder Wiederherstellungsanwendungen. + Wird festgestellt, dass primäre Metadatensektoren beschädigt + sind, werden die Dateisystem-Metadaten aus den doppelten + Sektoren gelesen. + + NOWAIT Erzwingt die sofortige Rückgabe des Befehls, während der + Formatierungsprozess noch stattfindet. Falls "NOWAIT" nicht + angegeben wurde, wird der Fortschritt des Formatierungs- + vorgangs von DiskPart in Prozent angezeigt. + + NOERR Nur für Skripting. Wird ein Fehler festgestellt, werden + Befehle weiterhin so verarbeitet, als wäre der Fehler + nicht aufgetreten. Ohne den Parameter "NOERR" + wird DiskPart aufgrund eines Fehlers mit einem + Fehlercode beendet. + + Damit dieser Vorgang erfolgreich ist, muss ein Volume ausgewählt werden. + +Beispiele: + + FORMAT FS=NTFS LABEL="Neues Volume" QUICK COMPRESS + FORMAT RECOMMENDED OVERRIDE . Language=Polish -<Add FORMAT command help text here> + Formats the specified volume for use with ReactOS. + +Syntax: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] + [UNIT=<N>] [QUICK] [COMPRESS] [OVERRIDE] [DUPLICATE] [NOWAIT] + [NOERR] + + FS=<FS> Specifies the type of file system. If no file system is given, + the default file system displayed by the FILESYSTEMS command is + used. + + REVISION=<X.XX> + + Specifies the file system revision (if applicable). + + RECOMMENDED If specified, use the recommended file system and revision + instead of the default if a recommendation exists. The + recommended file system (if one exists) is displayed by the + FILESYSTEMS command. + + LABEL=<"label"> + + Specifies the volume label. + + UNIT=<N> Overrides the default allocation unit size. Default settings + are strongly recommended for general use. The default + allocation unit size for a particular file system is displayed + by the FILESYSTEMS command. + + NTFS compression is not supported for allocation unit sizes + above 4096. + + QUICK Performs a quick format. + + COMPRESS NTFS only: Files created on the new volume will be compressed + by default. + + OVERRIDE Forces the file system to dismount first if necessary. All + opened handles to the volume would no longer be valid. + + DUPLICATE UDF Only: This flag applies to UDF format, version 2.5 or + higher. + This flag instructs the format operation to duplicate the file + system meta-data to a second set of sectors on the disk. The + duplicate meta-data is used by applications, for example repair + or recovery applications. If the primary meta-data sectors are + found to be corrupted, the file system meta-data will be read + from the duplicate sectors. + + NOWAIT Forces the command to return immediately while the format + process is still in progress. If NOWAIT is not specified, + DiskPart will display format progress in percentage. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A volume must be selected for this operation to succeed. + +Examples: + + FORMAT FS=NTFS LABEL="New Volume" QUICK COMPRESS + FORMAT RECOMMENDED OVERRIDE . Language=Portugese -<Add FORMAT command help text here> + Formats the specified volume for use with ReactOS. + +Syntax: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] + [UNIT=<N>] [QUICK] [COMPRESS] [OVERRIDE] [DUPLICATE] [NOWAIT] + [NOERR] + + FS=<FS> Specifies the type of file system. If no file system is given, + the default file system displayed by the FILESYSTEMS command is + used. + + REVISION=<X.XX> + + Specifies the file system revision (if applicable). + + RECOMMENDED If specified, use the recommended file system and revision + instead of the default if a recommendation exists. The + recommended file system (if one exists) is displayed by the + FILESYSTEMS command. + + LABEL=<"label"> + + Specifies the volume label. + + UNIT=<N> Overrides the default allocation unit size. Default settings + are strongly recommended for general use. The default + allocation unit size for a particular file system is displayed + by the FILESYSTEMS command. + + NTFS compression is not supported for allocation unit sizes + above 4096. + + QUICK Performs a quick format. + + COMPRESS NTFS only: Files created on the new volume will be compressed + by default. + + OVERRIDE Forces the file system to dismount first if necessary. All + opened handles to the volume would no longer be valid. + + DUPLICATE UDF Only: This flag applies to UDF format, version 2.5 or + higher. + This flag instructs the format operation to duplicate the file + system meta-data to a second set of sectors on the disk. The + duplicate meta-data is used by applications, for example repair + or recovery applications. If the primary meta-data sectors are + found to be corrupted, the file system meta-data will be read + from the duplicate sectors. + + NOWAIT Forces the command to return immediately while the format + process is still in progress. If NOWAIT is not specified, + DiskPart will display format progress in percentage. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A volume must be selected for this operation to succeed. + +Examples: + + FORMAT FS=NTFS LABEL="New Volume" QUICK COMPRESS + FORMAT RECOMMENDED OVERRIDE . Language=Romanian -<Add FORMAT command help text here> + Formats the specified volume for use with ReactOS. + +Syntax: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] + [UNIT=<N>] [QUICK] [COMPRESS] [OVERRIDE] [DUPLICATE] [NOWAIT] + [NOERR] + + FS=<FS> Specifies the type of file system. If no file system is given, + the default file system displayed by the FILESYSTEMS command is + used. + + REVISION=<X.XX> + + Specifies the file system revision (if applicable). + + RECOMMENDED If specified, use the recommended file system and revision + instead of the default if a recommendation exists. The + recommended file system (if one exists) is displayed by the + FILESYSTEMS command. + + LABEL=<"label"> + + Specifies the volume label. + + UNIT=<N> Overrides the default allocation unit size. Default settings + are strongly recommended for general use. The default + allocation unit size for a particular file system is displayed + by the FILESYSTEMS command. + + NTFS compression is not supported for allocation unit sizes + above 4096. + + QUICK Performs a quick format. + + COMPRESS NTFS only: Files created on the new volume will be compressed + by default. + + OVERRIDE Forces the file system to dismount first if necessary. All + opened handles to the volume would no longer be valid. + + DUPLICATE UDF Only: This flag applies to UDF format, version 2.5 or + higher. + This flag instructs the format operation to duplicate the file + system meta-data to a second set of sectors on the disk. The + duplicate meta-data is used by applications, for example repair + or recovery applications. If the primary meta-data sectors are + found to be corrupted, the file system meta-data will be read + from the duplicate sectors. + + NOWAIT Forces the command to return immediately while the format + process is still in progress. If NOWAIT is not specified, + DiskPart will display format progress in percentage. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A volume must be selected for this operation to succeed. + +Examples: + + FORMAT FS=NTFS LABEL="New Volume" QUICK COMPRESS + FORMAT RECOMMENDED OVERRIDE . Language=Russian -<Add FORMAT command help text here> + Formats the specified volume for use with ReactOS. + +Syntax: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] + [UNIT=<N>] [QUICK] [COMPRESS] [OVERRIDE] [DUPLICATE] [NOWAIT] + [NOERR] + + FS=<FS> Specifies the type of file system. If no file system is given, + the default file system displayed by the FILESYSTEMS command is + used. + + REVISION=<X.XX> + + Specifies the file system revision (if applicable). + + RECOMMENDED If specified, use the recommended file system and revision + instead of the default if a recommendation exists. The + recommended file system (if one exists) is displayed by the + FILESYSTEMS command. + + LABEL=<"label"> + + Specifies the volume label. + + UNIT=<N> Overrides the default allocation unit size. Default settings + are strongly recommended for general use. The default + allocation unit size for a particular file system is displayed + by the FILESYSTEMS command. + + NTFS compression is not supported for allocation unit sizes + above 4096. + + QUICK Performs a quick format. + + COMPRESS NTFS only: Files created on the new volume will be compressed + by default. + + OVERRIDE Forces the file system to dismount first if necessary. All + opened handles to the volume would no longer be valid. + + DUPLICATE UDF Only: This flag applies to UDF format, version 2.5 or + higher. + This flag instructs the format operation to duplicate the file + system meta-data to a second set of sectors on the disk. The + duplicate meta-data is used by applications, for example repair + or recovery applications. If the primary meta-data sectors are + found to be corrupted, the file system meta-data will be read + from the duplicate sectors. + + NOWAIT Forces the command to return immediately while the format + process is still in progress. If NOWAIT is not specified, + DiskPart will display format progress in percentage. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A volume must be selected for this operation to succeed. + +Examples: + + FORMAT FS=NTFS LABEL="New Volume" QUICK COMPRESS + FORMAT RECOMMENDED OVERRIDE . Language=Albanian -<Add FORMAT command help text here> + Formats the specified volume for use with ReactOS. + +Syntax: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] + [UNIT=<N>] [QUICK] [COMPRESS] [OVERRIDE] [DUPLICATE] [NOWAIT] + [NOERR] + + FS=<FS> Specifies the type of file system. If no file system is given, + the default file system displayed by the FILESYSTEMS command is + used. + + REVISION=<X.XX> + + Specifies the file system revision (if applicable). + + RECOMMENDED If specified, use the recommended file system and revision + instead of the default if a recommendation exists. The + recommended file system (if one exists) is displayed by the + FILESYSTEMS command. + + LABEL=<"label"> + + Specifies the volume label. + + UNIT=<N> Overrides the default allocation unit size. Default settings + are strongly recommended for general use. The default + allocation unit size for a particular file system is displayed + by the FILESYSTEMS command. + + NTFS compression is not supported for allocation unit sizes + above 4096. + + QUICK Performs a quick format. + + COMPRESS NTFS only: Files created on the new volume will be compressed + by default. + + OVERRIDE Forces the file system to dismount first if necessary. All + opened handles to the volume would no longer be valid. + + DUPLICATE UDF Only: This flag applies to UDF format, version 2.5 or + higher. + This flag instructs the format operation to duplicate the file + system meta-data to a second set of sectors on the disk. The + duplicate meta-data is used by applications, for example repair + or recovery applications. If the primary meta-data sectors are + found to be corrupted, the file system meta-data will be read + from the duplicate sectors. + + NOWAIT Forces the command to return immediately while the format + process is still in progress. If NOWAIT is not specified, + DiskPart will display format progress in percentage. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A volume must be selected for this operation to succeed. + +Examples: + + FORMAT FS=NTFS LABEL="New Volume" QUICK COMPRESS + FORMAT RECOMMENDED OVERRIDE . Language=Turkish -<Add FORMAT command help text here> + Formats the specified volume for use with ReactOS. + +Syntax: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] + [UNIT=<N>] [QUICK] [COMPRESS] [OVERRIDE] [DUPLICATE] [NOWAIT] + [NOERR] + + FS=<FS> Specifies the type of file system. If no file system is given, + the default file system displayed by the FILESYSTEMS command is + used. + + REVISION=<X.XX> + + Specifies the file system revision (if applicable). + + RECOMMENDED If specified, use the recommended file system and revision + instead of the default if a recommendation exists. The + recommended file system (if one exists) is displayed by the + FILESYSTEMS command. + + LABEL=<"label"> + + Specifies the volume label. + + UNIT=<N> Overrides the default allocation unit size. Default settings + are strongly recommended for general use. The default + allocation unit size for a particular file system is displayed + by the FILESYSTEMS command. + + NTFS compression is not supported for allocation unit sizes + above 4096. + + QUICK Performs a quick format. + + COMPRESS NTFS only: Files created on the new volume will be compressed + by default. + + OVERRIDE Forces the file system to dismount first if necessary. All + opened handles to the volume would no longer be valid. + + DUPLICATE UDF Only: This flag applies to UDF format, version 2.5 or + higher. + This flag instructs the format operation to duplicate the file + system meta-data to a second set of sectors on the disk. The + duplicate meta-data is used by applications, for example repair + or recovery applications. If the primary meta-data sectors are + found to be corrupted, the file system meta-data will be read + from the duplicate sectors. + + NOWAIT Forces the command to return immediately while the format + process is still in progress. If NOWAIT is not specified, + DiskPart will display format progress in percentage. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A volume must be selected for this operation to succeed. + +Examples: + + FORMAT FS=NTFS LABEL="New Volume" QUICK COMPRESS + FORMAT RECOMMENDED OVERRIDE . Language=Chinese -<Add FORMAT command help text here> + Formats the specified volume for use with ReactOS. + +Syntax: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] + [UNIT=<N>] [QUICK] [COMPRESS] [OVERRIDE] [DUPLICATE] [NOWAIT] + [NOERR] + + FS=<FS> Specifies the type of file system. If no file system is given, + the default file system displayed by the FILESYSTEMS command is + used. + + REVISION=<X.XX> + + Specifies the file system revision (if applicable). + + RECOMMENDED If specified, use the recommended file system and revision + instead of the default if a recommendation exists. The + recommended file system (if one exists) is displayed by the + FILESYSTEMS command. + + LABEL=<"label"> + + Specifies the volume label. + + UNIT=<N> Overrides the default allocation unit size. Default settings + are strongly recommended for general use. The default + allocation unit size for a particular file system is displayed + by the FILESYSTEMS command. + + NTFS compression is not supported for allocation unit sizes + above 4096. + + QUICK Performs a quick format. + + COMPRESS NTFS only: Files created on the new volume will be compressed + by default. + + OVERRIDE Forces the file system to dismount first if necessary. All + opened handles to the volume would no longer be valid. + + DUPLICATE UDF Only: This flag applies to UDF format, version 2.5 or + higher. + This flag instructs the format operation to duplicate the file + system meta-data to a second set of sectors on the disk. The + duplicate meta-data is used by applications, for example repair + or recovery applications. If the primary meta-data sectors are + found to be corrupted, the file system meta-data will be read + from the duplicate sectors. + + NOWAIT Forces the command to return immediately while the format + process is still in progress. If NOWAIT is not specified, + DiskPart will display format progress in percentage. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A volume must be selected for this operation to succeed. + +Examples: + + FORMAT FS=NTFS LABEL="New Volume" QUICK COMPRESS + FORMAT RECOMMENDED OVERRIDE . Language=Taiwanese -<Add FORMAT command help text here> + Formats the specified volume for use with ReactOS. + +Syntax: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] + [UNIT=<N>] [QUICK] [COMPRESS] [OVERRIDE] [DUPLICATE] [NOWAIT] + [NOERR] + + FS=<FS> Specifies the type of file system. If no file system is given, + the default file system displayed by the FILESYSTEMS command is + used. + + REVISION=<X.XX> + + Specifies the file system revision (if applicable). + + RECOMMENDED If specified, use the recommended file system and revision + instead of the default if a recommendation exists. The + recommended file system (if one exists) is displayed by the + FILESYSTEMS command. + + LABEL=<"label"> + + Specifies the volume label. + + UNIT=<N> Overrides the default allocation unit size. Default settings + are strongly recommended for general use. The default + allocation unit size for a particular file system is displayed + by the FILESYSTEMS command. + + NTFS compression is not supported for allocation unit sizes + above 4096. + + QUICK Performs a quick format. + + COMPRESS NTFS only: Files created on the new volume will be compressed + by default. + + OVERRIDE Forces the file system to dismount first if necessary. All + opened handles to the volume would no longer be valid. + + DUPLICATE UDF Only: This flag applies to UDF format, version 2.5 or + higher. + This flag instructs the format operation to duplicate the file + system meta-data to a second set of sectors on the disk. The + duplicate meta-data is used by applications, for example repair + or recovery applications. If the primary meta-data sectors are + found to be corrupted, the file system meta-data will be read + from the duplicate sectors. + + NOWAIT Forces the command to return immediately while the format + process is still in progress. If NOWAIT is not specified, + DiskPart will display format progress in percentage. + + NOERR For scripting only. When an error is encountered, DiskPart + continues to process commands as if the error did not occur. + Without the NOERR parameter, an error causes DiskPart to exit + with an error code. + + A volume must be selected for this operation to succeed. + +Examples: + + FORMAT FS=NTFS LABEL="New Volume" QUICK COMPRESS + FORMAT RECOMMENDED OVERRIDE . @@ -4005,7 +4634,7 @@ Syntax: INACTIVE Your computer might not start without an active partition. Do not mark a system or boot partition as inactive unless you are an experienced - user with a thorough understanding of Windows storage management. + user with a thorough understanding of ReactOS storage management. Example: @@ -4054,7 +4683,7 @@ Syntax: INACTIVE Your computer might not start without an active partition. Do not mark a system or boot partition as inactive unless you are an experienced - user with a thorough understanding of Windows storage management. + user with a thorough understanding of ReactOS storage management. Example: @@ -4077,7 +4706,7 @@ Syntax: INACTIVE Your computer might not start without an active partition. Do not mark a system or boot partition as inactive unless you are an experienced - user with a thorough understanding of Windows storage management. + user with a thorough understanding of ReactOS storage management. Example: @@ -4100,7 +4729,7 @@ Syntax: INACTIVE Your computer might not start without an active partition. Do not mark a system or boot partition as inactive unless you are an experienced - user with a thorough understanding of Windows storage management. + user with a thorough understanding of ReactOS storage management. Example: @@ -4123,7 +4752,7 @@ Syntax: INACTIVE Your computer might not start without an active partition. Do not mark a system or boot partition as inactive unless you are an experienced - user with a thorough understanding of Windows storage management. + user with a thorough understanding of ReactOS storage management. Example: @@ -4146,7 +4775,7 @@ Syntax: INACTIVE Your computer might not start without an active partition. Do not mark a system or boot partition as inactive unless you are an experienced - user with a thorough understanding of Windows storage management. + user with a thorough understanding of ReactOS storage management. Example: @@ -4169,7 +4798,7 @@ Syntax: INACTIVE Your computer might not start without an active partition. Do not mark a system or boot partition as inactive unless you are an experienced - user with a thorough understanding of Windows storage management. + user with a thorough understanding of ReactOS storage management. Example: @@ -4192,7 +4821,7 @@ Syntax: INACTIVE Your computer might not start without an active partition. Do not mark a system or boot partition as inactive unless you are an experienced - user with a thorough understanding of Windows storage management. + user with a thorough understanding of ReactOS storage management. Example: @@ -4215,7 +4844,7 @@ Syntax: INACTIVE Your computer might not start without an active partition. Do not mark a system or boot partition as inactive unless you are an experienced - user with a thorough understanding of Windows storage management. + user with a thorough understanding of ReactOS storage management. Example:

2 years, 3 months

[reactos] 01/01: [DISKPART] Support quoted options in commands

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ca37d6eafc76ad1b675f… commit 3ca37d6eafc76ad1b675ffb99b7b7f2efe4e2569 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 18 13:27:56 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 18 13:27:56 2022 +0200 [DISKPART] Support quoted options in commands --- base/system/diskpart/diskpart.h | 8 +++++ base/system/diskpart/interpreter.c | 9 +++-- base/system/diskpart/misc.c | 68 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 2 deletions(-) diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index 99f468f9916..aa0e557e4e3 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -394,6 +394,14 @@ RoundingDivide( _In_ ULONGLONG Dividend, _In_ ULONGLONG Divisor); +PWSTR +DuplicateQuotedString( + _In_ PWSTR pszInString); + +PWSTR +DuplicateString( + _In_ PWSTR pszInString); + /* offline.c */ BOOL offline_main(INT argc, LPWSTR *argv); diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c index 34fdd034d68..7ba17480605 100644 --- a/base/system/diskpart/interpreter.c +++ b/base/system/diskpart/interpreter.c @@ -229,6 +229,7 @@ InterpretMain(VOID) LPWSTR args_vector[MAX_ARGS_COUNT]; INT args_count = 0; BOOL bWhiteSpace = TRUE; + BOOL bQuote = FALSE; BOOL bRun = TRUE; LPWSTR ptr; @@ -243,17 +244,21 @@ InterpretMain(VOID) /* Get input from the user. */ fgetws(input_line, MAX_STRING_SIZE, stdin); + bQuote = FALSE; ptr = input_line; while (*ptr != 0) { - if (iswspace(*ptr) || *ptr == L'\n') + if (*ptr == L'"') + bQuote = !bQuote; + + if ((iswspace(*ptr) && (bQuote == FALSE))|| *ptr == L'\n') { *ptr = 0; bWhiteSpace = TRUE; } else { - if ((bWhiteSpace != FALSE) && (args_count < MAX_ARGS_COUNT)) + if ((bWhiteSpace != FALSE) && (bQuote == FALSE) && (args_count < MAX_ARGS_COUNT)) { args_vector[args_count] = ptr; args_count++; diff --git a/base/system/diskpart/misc.c b/base/system/diskpart/misc.c index b46651b670b..a4819d4751b 100644 --- a/base/system/diskpart/misc.c +++ b/base/system/diskpart/misc.c @@ -78,3 +78,71 @@ RoundingDivide( { return (Dividend + Divisor / 2) / Divisor; } + + +PWSTR +DuplicateQuotedString( + _In_ PWSTR pszInString) +{ + PWSTR pszOutString = NULL; + PWSTR pStart, pEnd; + INT nLength; + + if ((pszInString == NULL) || (pszInString[0] == UNICODE_NULL)) + return NULL; + + if (pszInString[0] == L'"') + { + if (pszInString[1] == UNICODE_NULL) + return NULL; + + pStart = &pszInString[1]; + pEnd = wcschr(pStart, '"'); + if (pEnd == NULL) + { + nLength = wcslen(pStart); + } + else + { + nLength = (pEnd - pStart); + } + } + else + { + pStart = pszInString; + nLength = wcslen(pStart); + } + + pszOutString = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + (nLength + 1) * sizeof(WCHAR)); + if (pszOutString == NULL) + return NULL; + + wcsncpy(pszOutString, pStart, nLength); + + return pszOutString; +} + + +PWSTR +DuplicateString( + _In_ PWSTR pszInString) +{ + PWSTR pszOutString = NULL; + INT nLength; + + if ((pszInString == NULL) || (pszInString[0] == UNICODE_NULL)) + return NULL; + + nLength = wcslen(pszInString); + pszOutString = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + (nLength + 1) * sizeof(WCHAR)); + if (pszOutString == NULL) + return NULL; + + wcscpy(pszOutString, pszInString); + + return pszOutString; +}

2 years, 3 months

← Newer
1
...
16
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2022