Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 06:45:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC]: reg is now in sync with wine-staging wine-6.23

Browse source 
Used winesync.py script, commits which needed obious adjustments have explicit
note in commit message, that it is manually adjusted. Internationalization is
skipped while automated sync and done in last manual step.

Additonal manual adjustments to compile in ros are in this commit:
- wcsupr -> _wcsupr
- only 3 arguments for swprintf, instead of 4 in wine
- disable tests for "/reg:32" and "/reg:64", because they fail on w2k3

Manually addjusted base/applications/cmdutils/reg/lang/zh-CN.rc while rebase to
actuall master (4a66cbb224) on 19.06.2022
This commit is contained in:
Thomas Csovcsity 2022-01-17 18:47:50 +01:00
parent 958d4a884a
commit 1a6f523e01
41 changed files with 3687 additions and 476 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/rostests/winetests/reg/CMakeLists.txt
View file

@ -1,5 +1,5 @@
add_executable(reg_winetest reg.c testlist.c)
add_executable(reg_winetest add.c copy.c delete.c export.c import.c query.c testlist.c)
set_module_type(reg_winetest win32cui)
add_importlibs(reg_winetest advapi32 msvcrt kernel32)
add_rostests_file(TARGET reg_winetest)

5
modules/rostests/winetests/reg/add.c
View file

@ -863,6 +863,7 @@ static void test_reg_multi_sz(void)
delete_key(HKEY_CURRENT_USER, KEY_BASE, 0);
}
#if 0
static void test_registry_view_win32(void)
{
HKEY hkey;
@ -969,6 +970,7 @@ static void test_registry_view_wow64(void)
verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY);
}
#endif
START_TEST(add)
{
@ -998,7 +1000,10 @@ START_TEST(add)
return;
}
#if 0
test_registry_view_win32();
test_registry_view_win64();
test_registry_view_wow64();
#endif
}

5
modules/rostests/winetests/reg/copy.c
View file

@ -588,6 +588,7 @@ static void test_copy_overwrite(void)
delete_key(HKEY_CURRENT_USER, KEY_BASE, 0);
}
#if 0
static void create_test_key(REGSAM sam)
{
HKEY hkey, subkey;
@ -747,6 +748,7 @@ static void test_registry_view_wow64(void)
delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_64KEY);
delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY);
}
#endif
START_TEST(copy)
{
@ -778,7 +780,10 @@ START_TEST(copy)
return;
}
#if 0
test_registry_view_win32();
test_registry_view_win64();
test_registry_view_wow64();
#endif
}

5
modules/rostests/winetests/reg/delete.c
View file

@ -149,6 +149,7 @@ static void test_delete(void)
ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
}
#if 0
static void create_test_key(REGSAM sam)
{
HKEY hkey, subkey;
@ -394,6 +395,7 @@ static void test_registry_view_wow64(void)
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY);
}
#endif
START_TEST(delete)
{
@ -415,7 +417,10 @@ START_TEST(delete)
return;
}
#if 0
test_registry_view_win32();
test_registry_view_win64();
test_registry_view_wow64();
#endif
}

5
modules/rostests/winetests/reg/export.c
View file

@ -455,6 +455,7 @@ static void test_export(void)
delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0);
}
#if 0
static void create_test_key(REGSAM sam)
{
HKEY hkey, subkey;
@ -589,6 +590,7 @@ static void test_registry_view_wow64(void)
delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY);
}
#endif
START_TEST(export)
{
@ -610,7 +612,10 @@ START_TEST(export)
return;
}
#if 0
test_registry_view_win32();
test_registry_view_win64();
test_registry_view_wow64();
#endif
}

5
modules/rostests/winetests/reg/import.c
View file

@ -3623,6 +3623,7 @@ static void test_import_win31(void)
delete_key(HKEY_CLASSES_ROOT, KEY_BASE, 0);
}
#if 0
static BOOL write_test_files(void)
{
const char *test1, *test2;
@ -3848,6 +3849,7 @@ static void test_registry_view_wow64(void)
delete_file("reg4.reg");
delete_file("reg5.reg");
}
#endif
START_TEST(import)
{
@ -3873,7 +3875,10 @@ START_TEST(import)
return;
}
#if 0
test_registry_view_win32();
test_registry_view_win64();
test_registry_view_wow64();
#endif
}

5
modules/rostests/winetests/reg/query.c
View file

@ -305,6 +305,7 @@ static void test_query(void)
delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0);
}
#if 0
static const char *test9a = "\r\n"
"HKEY_LOCAL_MACHINE\\" KEY_BASE "\r\n"
" Test1 REG_SZ Hello, World\r\n"
@ -493,6 +494,7 @@ static void test_registry_view_wow64(void)
delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY);
}
#endif
START_TEST(query)
{
@ -514,7 +516,10 @@ START_TEST(query)
return;
}
#if 0
test_registry_view_win32();
test_registry_view_win64();
test_registry_view_wow64();
#endif
}

14
modules/rostests/winetests/reg/testlist.c
View file

@ -3,10 +3,20 @@
#define STANDALONE
#include <wine/test.h>
extern void func_reg(void);
extern void func_add(void);
extern void func_copy(void);
extern void func_delete(void);
extern void func_export(void);
extern void func_import(void);
extern void func_query(void);
const struct test winetest_testlist[] =
{
{ "reg", func_reg },
{ "add", func_add },
{ "copy", func_copy },
{ "delete", func_delete },
{ "export", func_export },
{ "import", func_import },
{ "query", func_query },
{ 0, 0 }
};