[2/2] msi/tests: Accept one more estimated size.

[Hans Leidekker]

---
 dlls/msi/tests/action.c |   43 +++++++++++++++++++++++++++++++++----------
 1 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c
index 4ab5df6..bcf5b90 100644
--- a/dlls/msi/tests/action.c
+++ b/dlls/msi/tests/action.c
@@ -2452,6 +2452,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);
 }
 
+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) \
     check_reg_str(prodkey, name, expected, TRUE, __LINE__);
 
@@ -2487,6 +2506,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 +2613,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 +2651,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 +2720,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 +2758,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 +3601,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 +3683,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 +3766,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 +3826,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 +3886,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 +3969,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);
-- 
1.7.1