Akihiro Sagawa : msi/tests: Add non-existence value tests for mixed package.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5b76cd199a2a617aa7bce9325b15d289f989d149
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5b76cd199a2a617aa7bce9325b15d289f989d149

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Mon Jul 21 21:48:15 2014 +0900

msi/tests: Add non-existence value tests for mixed package.

---

 dlls/msi/tests/install.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 2a9af85..bda3744 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -5701,15 +5701,19 @@ static void test_mixed_package(void)
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
 
     res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey);
-    ok(!res, "can't open 32-bit component key\n");
+    ok(!res, "can't open 32-bit component key, got %d\n", res);
     res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL);
-    ok(!res, "value test1 not found\n");
+    ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res);
+    res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL);
+    ok(res, "expected RegQueryValueEx to fail, got %d\n", res);
     RegCloseKey(hkey);
 
     res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey);
-    ok(!res, "can't open 64-bit component key\n");
+    ok(!res, "can't open 64-bit component key, got %d\n", res);
+    res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL);
+    ok(res, "expected RegQueryValueEx to fail, got %d\n", res);
     res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL);
-    ok(!res, "value test2 not found\n");
+    ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res);
     RegCloseKey(hkey);
 
     r = MsiInstallProductA(msifile, "REMOVE=ALL");
@@ -5728,15 +5732,19 @@ static void test_mixed_package(void)
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
 
     res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey);
-    ok(!res, "can't open 32-bit component key\n");
+    ok(!res, "can't open 32-bit component key, got %d\n", res);
     res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL);
-    ok(!res, "value test1 not found\n");
+    ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res);
+    res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL);
+    ok(res, "expected RegQueryValueEx to fail, got %d\n", res);
     RegCloseKey(hkey);
 
     res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey);
-    ok(!res, "can't open 64-bit component key\n");
+    ok(!res, "can't open 64-bit component key, got %d\n", res);
+    res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL);
+    ok(res, "expected RegQueryValueEx to fail, got %d\n", res);
     res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL);
-    ok(!res, "value test2 not found\n");
+    ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res);
     RegCloseKey(hkey);
 
     r = MsiInstallProductA(msifile, "REMOVE=ALL");