mirror of
https://github.com/reactos/reactos.git
synced 2025-02-22 16:36:33 +00:00
[REGEDIT_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409
svn path=/trunk/; revision=73315
This commit is contained in:
Amine Khaldi
parent
bcbf704a5d
commit
a16217bd9d
1 changed files with 108 additions and 159 deletions
|
|
@ -98,56 +98,46 @@ static BOOL r_exec_import_wstr(unsigned line, const WCHAR *file_contents)
|
|||
return (dr != WAIT_TIMEOUT);
|
||||
}
|
||||
|
||||
#define verify_reg_sz(k,s,n,e) r_verify_reg_sz(__LINE__,k,s,n,e)
|
||||
static void r_verify_reg_sz(unsigned line, HKEY key, const char *subkey,
|
||||
const char *value_name, const char *exp_value)
|
||||
#define TODO_REG_TYPE (0x0001u)
|
||||
#define TODO_REG_SIZE (0x0002u)
|
||||
#define TODO_REG_DATA (0x0004u)
|
||||
|
||||
/* verify_reg() adapted from programs/reg/tests/reg.c */
|
||||
#define verify_reg(k,v,t,d,s,todo) verify_reg_(__LINE__,k,v,t,d,s,todo)
|
||||
static void verify_reg_(unsigned line, HKEY hkey, const char *value,
|
||||
DWORD exp_type, const void *exp_data, DWORD exp_size, DWORD todo)
|
||||
{
|
||||
LONG lr;
|
||||
DWORD fnd_type, fnd_len;
|
||||
char fnd_value[1024];
|
||||
HKEY fnd_key;
|
||||
DWORD type, size;
|
||||
BYTE data[256];
|
||||
LONG err;
|
||||
|
||||
lr = RegOpenKeyExA(key, subkey, 0, KEY_READ, &fnd_key);
|
||||
lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr);
|
||||
if(lr != ERROR_SUCCESS)
|
||||
size = sizeof(data);
|
||||
memset(data, 0xdd, size);
|
||||
err = RegQueryValueExA(hkey, value, NULL, &type, data, &size);
|
||||
lok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err);
|
||||
if (err != ERROR_SUCCESS)
|
||||
return;
|
||||
|
||||
fnd_len = sizeof(fnd_value);
|
||||
lr = RegQueryValueExA(fnd_key, value_name, NULL, &fnd_type,
|
||||
(BYTE*)fnd_value, &fnd_len);
|
||||
RegCloseKey(fnd_key);
|
||||
lok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr);
|
||||
if(lr != ERROR_SUCCESS)
|
||||
return;
|
||||
|
||||
lok(fnd_type == REG_SZ, "Got wrong type: %d\n", fnd_type);
|
||||
if(fnd_type != REG_SZ)
|
||||
return;
|
||||
lok(!strcmp(exp_value, fnd_value),
|
||||
"Strings differ: expected %s, got %s\n", exp_value, fnd_value);
|
||||
todo_wine_if (todo & TODO_REG_TYPE)
|
||||
lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type);
|
||||
todo_wine_if (todo & TODO_REG_SIZE)
|
||||
lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size);
|
||||
todo_wine_if (todo & TODO_REG_DATA)
|
||||
lok(memcmp(data, exp_data, size) == 0, "got wrong data\n");
|
||||
}
|
||||
|
||||
#define verify_reg_wsz(k,s,n,e) r_verify_reg_wsz(__LINE__,k,s,n,e)
|
||||
static void r_verify_reg_wsz(unsigned line, HKEY key, const char *subkey,
|
||||
const char *value_name, const WCHAR *exp_value)
|
||||
#define verify_reg_wsz(k,n,e) r_verify_reg_wsz(__LINE__,k,n,e)
|
||||
static void r_verify_reg_wsz(unsigned line, HKEY key, const char *value_name, const WCHAR *exp_value)
|
||||
{
|
||||
LONG lr;
|
||||
DWORD fnd_type, fnd_len;
|
||||
WCHAR fnd_value[1024], value_nameW[1024];
|
||||
HKEY fnd_key;
|
||||
|
||||
lr = RegOpenKeyExA(key, subkey, 0, KEY_READ, &fnd_key);
|
||||
lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr);
|
||||
if(lr != ERROR_SUCCESS)
|
||||
return;
|
||||
|
||||
MultiByteToWideChar(CP_ACP, 0, value_name, -1, value_nameW,
|
||||
sizeof(value_nameW)/sizeof(value_nameW[0]));
|
||||
|
||||
fnd_len = sizeof(fnd_value);
|
||||
lr = RegQueryValueExW(fnd_key, value_nameW, NULL, &fnd_type,
|
||||
(BYTE*)fnd_value, &fnd_len);
|
||||
RegCloseKey(fnd_key);
|
||||
lr = RegQueryValueExW(key, value_nameW, NULL, &fnd_type, (BYTE*)fnd_value, &fnd_len);
|
||||
lok(lr == ERROR_SUCCESS, "RegQueryValueExW failed: %d\n", lr);
|
||||
if(lr != ERROR_SUCCESS)
|
||||
return;
|
||||
|
|
@ -160,89 +150,25 @@ static void r_verify_reg_wsz(unsigned line, HKEY key, const char *subkey,
|
|||
wine_dbgstr_w(exp_value), wine_dbgstr_w(fnd_value));
|
||||
}
|
||||
|
||||
#define verify_reg_dword(k,s,n,e) r_verify_reg_dword(__LINE__,k,s,n,e)
|
||||
static void r_verify_reg_dword(unsigned line, HKEY key, const char *subkey,
|
||||
const char *value_name, DWORD exp_value)
|
||||
{
|
||||
LONG lr;
|
||||
DWORD fnd_type, fnd_len, fnd_value;
|
||||
HKEY fnd_key;
|
||||
|
||||
lr = RegOpenKeyExA(key, subkey, 0, KEY_READ, &fnd_key);
|
||||
lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr);
|
||||
if(lr != ERROR_SUCCESS)
|
||||
return;
|
||||
|
||||
fnd_len = sizeof(fnd_value);
|
||||
lr = RegQueryValueExA(fnd_key, value_name, NULL, &fnd_type,
|
||||
(BYTE *)&fnd_value, &fnd_len);
|
||||
RegCloseKey(fnd_key);
|
||||
lok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr);
|
||||
if(lr != ERROR_SUCCESS)
|
||||
return;
|
||||
|
||||
lok(fnd_type == REG_DWORD, "Got wrong type: %d\n", fnd_type);
|
||||
if(fnd_type != REG_DWORD)
|
||||
return;
|
||||
lok(fnd_value == exp_value, "Values differ: expected: 0x%x, got: 0x%x\n",
|
||||
exp_value, fnd_value);
|
||||
}
|
||||
|
||||
#define verify_reg_binary(k,s,n,e,z) r_verify_reg_binary(__LINE__,k,s,n,e,z)
|
||||
static void r_verify_reg_binary(unsigned line, HKEY key, const char *subkey,
|
||||
const char *value_name, const char *exp_value, int exp_len)
|
||||
{
|
||||
LONG lr;
|
||||
DWORD fnd_type, fnd_len;
|
||||
char fnd_value[1024];
|
||||
HKEY fnd_key;
|
||||
|
||||
lr = RegOpenKeyExA(key, subkey, 0, KEY_READ, &fnd_key);
|
||||
lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr);
|
||||
if(lr != ERROR_SUCCESS)
|
||||
return;
|
||||
|
||||
fnd_len = sizeof(fnd_value);
|
||||
lr = RegQueryValueExA(fnd_key, value_name, NULL, &fnd_type,
|
||||
(BYTE*)fnd_value, &fnd_len);
|
||||
RegCloseKey(fnd_key);
|
||||
lok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr);
|
||||
if(lr != ERROR_SUCCESS)
|
||||
return;
|
||||
|
||||
lok(fnd_type == REG_BINARY, "Got wrong type: %d\n", fnd_type);
|
||||
if(fnd_type != REG_BINARY)
|
||||
return;
|
||||
lok(fnd_len == exp_len,
|
||||
"Lengths differ: expected %d, got %d\n", exp_len, fnd_len);
|
||||
lok(!memcmp(exp_value, fnd_value, exp_len),
|
||||
"Data differs\n");
|
||||
}
|
||||
|
||||
#define verify_reg_nonexist(k,s,n) r_verify_reg_nonexist(__LINE__,k,s,n)
|
||||
static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *subkey,
|
||||
const char *value_name)
|
||||
#define verify_reg_nonexist(k,n) r_verify_reg_nonexist(__LINE__,k,n)
|
||||
static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_name)
|
||||
{
|
||||
LONG lr;
|
||||
DWORD fnd_type, fnd_len;
|
||||
char fnd_value[32];
|
||||
HKEY fnd_key;
|
||||
|
||||
lr = RegOpenKeyExA(key, subkey, 0, KEY_READ, &fnd_key);
|
||||
lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr);
|
||||
if(lr != ERROR_SUCCESS)
|
||||
return;
|
||||
|
||||
fnd_len = sizeof(fnd_value);
|
||||
lr = RegQueryValueExA(fnd_key, value_name, NULL, &fnd_type,
|
||||
(BYTE*)fnd_value, &fnd_len);
|
||||
RegCloseKey(fnd_key);
|
||||
lr = RegQueryValueExA(key, value_name, NULL, &fnd_type, (BYTE*)fnd_value, &fnd_len);
|
||||
lok(lr == ERROR_FILE_NOT_FOUND, "Reg value shouldn't exist: %s\n",
|
||||
value_name);
|
||||
}
|
||||
|
||||
#define KEY_BASE "Software\\Wine\\regedit_test"
|
||||
|
||||
static void test_basic_import(void)
|
||||
{
|
||||
HKEY hkey;
|
||||
DWORD dword = 0x17;
|
||||
char exp_binary[] = {0xAA,0xBB,0xCC,0x11};
|
||||
WCHAR wide_test[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g',
|
||||
'i','s','t','r','y',' ','E','d','i','t','o','r',' ','V','e','r','s',
|
||||
|
|
@ -263,114 +189,137 @@ static void test_basic_import(void)
|
|||
WCHAR wide_exp[] = {0x3041,'V','a','l','u','e',0};
|
||||
LONG lr;
|
||||
|
||||
lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test");
|
||||
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
|
||||
ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND,
|
||||
"RegDeleteKeyA failed: %d\n", lr);
|
||||
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"\"TestValue\"=\"AValue\"\n");
|
||||
verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"TestValue", "AValue");
|
||||
lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey);
|
||||
ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr);
|
||||
verify_reg(hkey, "TestValue", REG_SZ, "AValue", 7, 0);
|
||||
|
||||
exec_import_str("REGEDIT4\r\n\r\n"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\r\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n"
|
||||
"\"TestValue2\"=\"BValue\"\r\n");
|
||||
verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"TestValue2", "BValue");
|
||||
verify_reg(hkey, "TestValue2", REG_SZ, "BValue", 7, 0);
|
||||
|
||||
if(supports_wchar){
|
||||
if (supports_wchar)
|
||||
{
|
||||
exec_import_wstr(wide_test);
|
||||
verify_reg_wsz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"TestValue3", wide_exp);
|
||||
verify_reg_wsz(hkey, "TestValue3", wide_exp);
|
||||
|
||||
exec_import_wstr(wide_test_r);
|
||||
verify_reg_wsz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"TestValue5", wide_exp);
|
||||
}else
|
||||
verify_reg_wsz(hkey, "TestValue5", wide_exp);
|
||||
}
|
||||
else
|
||||
win_skip("Some WCHAR tests skipped\n");
|
||||
|
||||
exec_import_str("REGEDIT4\r\r"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\r"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\r"
|
||||
"\"TestValue4\"=\"DValue\"\r");
|
||||
verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"TestValue4", "DValue");
|
||||
verify_reg(hkey, "TestValue4", REG_SZ, "DValue", 7, 0);
|
||||
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"\"TestDword\"=dword:00000017\n");
|
||||
verify_reg_dword(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"TestDword", 0x17);
|
||||
verify_reg(hkey, "TestDword", REG_DWORD, &dword, sizeof(dword), 0);
|
||||
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"\"TestBinary\"=hex:aa,bb,cc,11\n");
|
||||
verify_reg_binary(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"TestBinary", exp_binary, sizeof(exp_binary));
|
||||
verify_reg(hkey, "TestBinary", REG_BINARY, exp_binary, sizeof(exp_binary), 0);
|
||||
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"\"With=Equals\"=\"asdf\"\n");
|
||||
verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"With=Equals", "asdf");
|
||||
verify_reg(hkey, "With=Equals", REG_SZ, "asdf", 5, 0);
|
||||
|
||||
lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test");
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"\"Line1\"=\"Value1\"\n\n"
|
||||
"\"Line2\"=\"Value2\"\n\n\n"
|
||||
"\"Line3\"=\"Value3\"\n\n\n\n"
|
||||
"\"Line4\"=\"Value4\"\n\n");
|
||||
verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, 0);
|
||||
verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, 0);
|
||||
verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, 0);
|
||||
verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, 0);
|
||||
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"\"Wine1\"=dword:00000782\n\n"
|
||||
"\"Wine2\"=\"Test Value\"\n"
|
||||
"\"Wine3\"=hex(7):4c,69,6e,65,20,\
|
||||
63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n"
|
||||
"#comment\n"
|
||||
"@=\"Test\"\n"
|
||||
";comment\n\n"
|
||||
"\"Wine4\"=dword:12345678\n\n");
|
||||
dword = 0x782;
|
||||
verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0);
|
||||
verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0);
|
||||
verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0);
|
||||
verify_reg(hkey, "", REG_SZ, "Test", 5, 0);
|
||||
dword = 0x12345678;
|
||||
verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), 0);
|
||||
|
||||
RegCloseKey(hkey);
|
||||
|
||||
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
|
||||
ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr);
|
||||
}
|
||||
|
||||
static void test_invalid_import(void)
|
||||
{
|
||||
LONG lr;
|
||||
HKEY hkey;
|
||||
|
||||
lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test");
|
||||
ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND,
|
||||
"RegDeleteKeyA failed: %d\n", lr);
|
||||
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
|
||||
ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr);
|
||||
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"\"TestNoEndQuote\"=\"Asdffdsa\n");
|
||||
verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"TestNoEndQuote");
|
||||
lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey);
|
||||
ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr);
|
||||
verify_reg_nonexist(hkey, "TestNoEndQuote");
|
||||
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"\"TestNoBeginQuote\"=Asdffdsa\"\n");
|
||||
verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"TestNoBeginQuote");
|
||||
verify_reg_nonexist(hkey, "TestNoBeginQuote");
|
||||
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"\"TestNoQuotes\"=Asdffdsa\n");
|
||||
verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"TestNoQuotes");
|
||||
verify_reg_nonexist(hkey, "TestNoQuotes");
|
||||
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"\"NameNoEndQuote=\"Asdffdsa\"\n");
|
||||
verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"NameNoEndQuote");
|
||||
verify_reg_nonexist(hkey, "NameNoEndQuote");
|
||||
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"NameNoBeginQuote\"=\"Asdffdsa\"\n");
|
||||
verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"NameNoBeginQuote");
|
||||
verify_reg_nonexist(hkey, "NameNoBeginQuote");
|
||||
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"NameNoQuotes=\"Asdffdsa\"\n");
|
||||
verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"NameNoQuotes");
|
||||
verify_reg_nonexist(hkey, "NameNoQuotes");
|
||||
|
||||
exec_import_str("REGEDIT4\n\n"
|
||||
"[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n"
|
||||
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
|
||||
"\"MixedQuotes=Asdffdsa\"\n");
|
||||
verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"MixedQuotes");
|
||||
verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test",
|
||||
"MixedQuotes=Asdffdsa");
|
||||
verify_reg_nonexist(hkey, "MixedQuotes");
|
||||
verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa");
|
||||
|
||||
lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test");
|
||||
RegCloseKey(hkey);
|
||||
|
||||
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
|
||||
ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue