msi/tests: Accept one more estimated size.
This commit is contained in:
parent
257beae1fd
commit
e6e454ab16
|
@ -2417,23 +2417,6 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin
|
||||||
ok_(__FILE__, line)(val == expected, "Expected %d, got %d\n", expected, val);
|
ok_(__FILE__, line)(val == expected, "Expected %d, got %d\n", expected, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void check_reg_dword2(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD line)
|
|
||||||
{
|
|
||||||
DWORD val, size, type;
|
|
||||||
LONG res;
|
|
||||||
|
|
||||||
size = sizeof(DWORD);
|
|
||||||
res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)&val, &size);
|
|
||||||
|
|
||||||
if (res != ERROR_SUCCESS || type != REG_DWORD)
|
|
||||||
{
|
|
||||||
ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ok_(__FILE__, line)(val == expected1 || val == expected2, "Expected %d or %d, got %d\n", expected1, expected2, val);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, DWORD line)
|
static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, DWORD line)
|
||||||
{
|
{
|
||||||
DWORD val, size, type;
|
DWORD val, size, type;
|
||||||
|
@ -2452,6 +2435,25 @@ static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e
|
||||||
"Expected %d, %d or %d, got %d\n", expected1, expected2, expected3, val);
|
"Expected %d, %d or %d, got %d\n", expected1, expected2, expected3, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3,
|
||||||
|
DWORD expected4, DWORD line)
|
||||||
|
{
|
||||||
|
DWORD val, size, type;
|
||||||
|
LONG res;
|
||||||
|
|
||||||
|
size = sizeof(DWORD);
|
||||||
|
res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)&val, &size);
|
||||||
|
|
||||||
|
if (res != ERROR_SUCCESS || type != REG_DWORD)
|
||||||
|
{
|
||||||
|
ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4,
|
||||||
|
"Expected %d, %d or %d or %d, got %d\n", expected1, expected2, expected3, expected4, val);
|
||||||
|
}
|
||||||
|
|
||||||
#define CHECK_REG_STR(prodkey, name, expected) \
|
#define CHECK_REG_STR(prodkey, name, expected) \
|
||||||
check_reg_str(prodkey, name, expected, TRUE, __LINE__);
|
check_reg_str(prodkey, name, expected, TRUE, __LINE__);
|
||||||
|
|
||||||
|
@ -2487,6 +2489,10 @@ static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e
|
||||||
check_reg_dword3(prodkey, name, expected1, expected2, expected3, __LINE__); \
|
check_reg_dword3(prodkey, name, expected1, expected2, expected3, __LINE__); \
|
||||||
RegDeleteValueA(prodkey, name);
|
RegDeleteValueA(prodkey, name);
|
||||||
|
|
||||||
|
#define CHECK_DEL_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \
|
||||||
|
check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); \
|
||||||
|
RegDeleteValueA(prodkey, name);
|
||||||
|
|
||||||
static void get_date_str(LPSTR date)
|
static void get_date_str(LPSTR date)
|
||||||
{
|
{
|
||||||
SYSTEMTIME systime;
|
SYSTEMTIME systime;
|
||||||
|
@ -2590,7 +2596,7 @@ static void test_register_product(void)
|
||||||
CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1);
|
CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1);
|
||||||
todo_wine
|
todo_wine
|
||||||
{
|
{
|
||||||
CHECK_DEL_REG_DWORD3(hkey, "EstimatedSize", 12, -12, 4);
|
CHECK_DEL_REG_DWORD4(hkey, "EstimatedSize", 12, -12, 4, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
delete_key(hkey, "", access);
|
delete_key(hkey, "", access);
|
||||||
|
@ -2628,7 +2634,7 @@ static void test_register_product(void)
|
||||||
CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1);
|
CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1);
|
||||||
todo_wine
|
todo_wine
|
||||||
{
|
{
|
||||||
CHECK_DEL_REG_DWORD3(props, "EstimatedSize", 12, -12, 4);
|
CHECK_DEL_REG_DWORD4(props, "EstimatedSize", 12, -12, 4, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
delete_key(props, "", access);
|
delete_key(props, "", access);
|
||||||
|
@ -2697,7 +2703,7 @@ static void test_register_product(void)
|
||||||
CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1);
|
CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1);
|
||||||
todo_wine
|
todo_wine
|
||||||
{
|
{
|
||||||
CHECK_DEL_REG_DWORD3(hkey, "EstimatedSize", 12, -12, 4);
|
CHECK_DEL_REG_DWORD4(hkey, "EstimatedSize", 12, -12, 4, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
delete_key(hkey, "", access);
|
delete_key(hkey, "", access);
|
||||||
|
@ -2735,7 +2741,7 @@ static void test_register_product(void)
|
||||||
CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1);
|
CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1);
|
||||||
todo_wine
|
todo_wine
|
||||||
{
|
{
|
||||||
CHECK_DEL_REG_DWORD3(props, "EstimatedSize", 12, -12, 4);
|
CHECK_DEL_REG_DWORD4(props, "EstimatedSize", 12, -12, 4, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
delete_key(props, "", access);
|
delete_key(props, "", access);
|
||||||
|
@ -3578,7 +3584,7 @@ static void test_publish(void)
|
||||||
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
|
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
|
||||||
todo_wine
|
todo_wine
|
||||||
{
|
{
|
||||||
CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12);
|
CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
RegCloseKey(prodkey);
|
RegCloseKey(prodkey);
|
||||||
|
@ -3660,7 +3666,7 @@ static void test_publish(void)
|
||||||
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
|
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
|
||||||
todo_wine
|
todo_wine
|
||||||
{
|
{
|
||||||
CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12);
|
CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
RegCloseKey(prodkey);
|
RegCloseKey(prodkey);
|
||||||
|
@ -3743,7 +3749,7 @@ static void test_publish(void)
|
||||||
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
|
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
|
||||||
todo_wine
|
todo_wine
|
||||||
{
|
{
|
||||||
CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12);
|
CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
RegCloseKey(prodkey);
|
RegCloseKey(prodkey);
|
||||||
|
@ -3803,7 +3809,7 @@ static void test_publish(void)
|
||||||
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
|
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
|
||||||
todo_wine
|
todo_wine
|
||||||
{
|
{
|
||||||
CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12);
|
CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
RegCloseKey(prodkey);
|
RegCloseKey(prodkey);
|
||||||
|
@ -3863,7 +3869,7 @@ static void test_publish(void)
|
||||||
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
|
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
|
||||||
todo_wine
|
todo_wine
|
||||||
{
|
{
|
||||||
CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -20);
|
CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -20, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
RegCloseKey(prodkey);
|
RegCloseKey(prodkey);
|
||||||
|
@ -3946,7 +3952,7 @@ static void test_publish(void)
|
||||||
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
|
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
|
||||||
todo_wine
|
todo_wine
|
||||||
{
|
{
|
||||||
CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12);
|
CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
RegCloseKey(prodkey);
|
RegCloseKey(prodkey);
|
||||||
|
|
Loading…
Reference in New Issue