Module: wine Branch: master Commit: 0dec906d6160d0faa05006c1a439f5091a18e23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dec906d6160d0faa05006c1a4...
Author: Hans Leidekker hans@codeweavers.com Date: Wed Aug 24 10:22:00 2011 +0200
msi/tests: Accept one more estimated size.
---
dlls/msi/tests/action.c | 48 ++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 3e06db7..aac601f 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2402,7 +2402,8 @@ 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_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; @@ -2416,12 +2417,12 @@ 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, %d or %d, got %d\n", expected1, expected2, expected3, expected4, val); }
-static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, - DWORD expected4, DWORD line) +static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, + DWORD expected4, DWORD expected5, DWORD line) { DWORD val, size, type; LONG res; @@ -2435,8 +2436,9 @@ static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e 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); + ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4 || + val == expected5, + "Expected %d, %d, %d, %d or %d, got %d\n", expected1, expected2, expected3, expected4, expected5, val); }
#define CHECK_REG_STR(prodkey, name, expected) \ @@ -2467,15 +2469,11 @@ static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ RegDeleteValueA(prodkey, name);
-#define CHECK_REG_DWORD3(prodkey, name, expected1, expected2, expected3) \ - check_reg_dword3(prodkey, name, expected1, expected2, expected3, __LINE__); - -#define CHECK_DEL_REG_DWORD3(prodkey, name, expected1, expected2, expected3) \ - check_reg_dword3(prodkey, name, expected1, expected2, expected3, __LINE__); \ - RegDeleteValueA(prodkey, name); +#define CHECK_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ + check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__);
-#define CHECK_DEL_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ - check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); \ +#define CHECK_DEL_REG_DWORD5(prodkey, name, expected1, expected2, expected3, expected4 ,expected5) \ + check_reg_dword5(prodkey, name, expected1, expected2, expected3, expected4, expected5, __LINE__); \ RegDeleteValueA(prodkey, name);
static void get_date_str(LPSTR date) @@ -2579,7 +2577,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD4(hkey, "EstimatedSize", 12, -12, 4, 10); + CHECK_DEL_REG_DWORD5(hkey, "EstimatedSize", 12, -12, 4, 10, 24); }
delete_key(hkey, "", access); @@ -2621,7 +2619,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD4(props, "EstimatedSize", 12, -12, 4, 10); + CHECK_DEL_REG_DWORD5(props, "EstimatedSize", 12, -12, 4, 10, 24); }
delete_key(props, "", access); @@ -2690,7 +2688,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD4(hkey, "EstimatedSize", 12, -12, 4, 10); + CHECK_DEL_REG_DWORD5(hkey, "EstimatedSize", 12, -12, 4, 10, 24); }
delete_key(hkey, "", access); @@ -2732,7 +2730,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD4(props, "EstimatedSize", 12, -12, 4, 10); + CHECK_DEL_REG_DWORD5(props, "EstimatedSize", 12, -12, 4, 10, 24); }
delete_key(props, "", access); @@ -3575,7 +3573,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); + CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); }
RegCloseKey(prodkey); @@ -3657,7 +3655,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); + CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); }
RegCloseKey(prodkey); @@ -3740,7 +3738,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); + CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); }
RegCloseKey(prodkey); @@ -3800,7 +3798,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); + CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); }
RegCloseKey(prodkey); @@ -3860,7 +3858,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -20, 10); + CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -20, 10, 24); }
RegCloseKey(prodkey); @@ -3943,7 +3941,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD3(prodkey, "EstimatedSize", 12, -12, 10); + CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); }
RegCloseKey(prodkey);
-
Alexandre Julliard