Skip to content

W
wine-winehq
Commit e6e454ab authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

msi/tests: Accept one more estimated size.

parent 257beae1
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 15 deletions
dlls/msi/tests/action.c
View file @ e6e454ab
......@@ -2417,7 +2417,7 @@ 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);
}
static void check_reg_dword2(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD line)
static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, DWORD line)
{
DWORD val, size, type;
LONG res;
......@@ -2431,10 +2431,12 @@ static void check_reg_dword2(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e
return;
}
ok_(__FILE__, line)(val == expected1 || val == expected2, "Expected %d or %d, got %d\n", expected1, expected2, val);
ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3,
"Expected %d, %d or %d, got %d\n", expected1, expected2, expected3, val);
}
static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, DWORD line)
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;
......@@ -2448,8 +2450,8 @@ static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e
return;
}
ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3,
"Expected %d, %d or %d, got %d\n", expected1, expected2, expected3, val);
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) \
......@@ -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__); \
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)
{
SYSTEMTIME systime;
......@@ -2590,7 +2596,7 @@ static void test_register_product(void)
CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1);
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);
......@@ -2628,7 +2634,7 @@ static void test_register_product(void)
CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1);
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);
......@@ -2697,7 +2703,7 @@ static void test_register_product(void)
CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1);
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);
......@@ -2735,7 +2741,7 @@ static void test_register_product(void)
CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1);
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);
......@@ -3578,7 +3584,7 @@ static void test_publish(void)
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
todo_wine
{
CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12);
CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10);
}
RegCloseKey(prodkey);
......@@ -3660,7 +3666,7 @@ static void test_publish(void)
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
todo_wine
{
CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12);
CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10);
}
RegCloseKey(prodkey);
......@@ -3743,7 +3749,7 @@ static void test_publish(void)
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
todo_wine
{
CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12);
CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10);
}
RegCloseKey(prodkey);
......@@ -3803,7 +3809,7 @@ static void test_publish(void)
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
todo_wine
{
CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12);
CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10);
}
RegCloseKey(prodkey);
......@@ -3863,7 +3869,7 @@ static void test_publish(void)
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
todo_wine
{
CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -20);
CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -20, 10);
}
RegCloseKey(prodkey);
......@@ -3946,7 +3952,7 @@ static void test_publish(void)
CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1);
todo_wine
{
CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12);
CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10);
}
RegCloseKey(prodkey);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment