James Hawkins : msi: Fix a few failing tests on win9x.

[Alexandre Julliard]

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

Author: James Hawkins 
Date:   Thu Mar 20 00:06:54 2008 -0700

msi: Fix a few failing tests on win9x.

---

dlls/msi/tests/package.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 0857d1b..232b75e 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -5334,7 +5334,8 @@ static void test_complocator(void)

lstrcpyA(expected, CURR_DIR);
     lstrcatA(expected, "\abelisaurus");
-    ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop);
+    ok(!lstrcmpA(prop, expected) || !lstrcmpA(prop, ""),
+       "Expected %s or empty string, got %s\n", expected, prop);

size = MAX_PATH;
     r = MsiGetPropertyA(hpkg, "BACTROSAURUS", prop, &size);
@@ -5357,7 +5358,8 @@ static void test_complocator(void)

lstrcpyA(expected, CURR_DIR);
     lstrcatA(expected, "\");
-    ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop);
+    ok(!lstrcmpA(prop, expected) || !lstrcmpA(prop, ""),
+       "Expected %s or empty string, got %s\n", expected, prop);

size = MAX_PATH;
     r = MsiGetPropertyA(hpkg, "FALCARIUS", prop, &size);
@@ -5400,7 +5402,8 @@ static void test_complocator(void)

lstrcpyA(expected, CURR_DIR);
     lstrcatA(expected, "\");
-    ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop);
+    ok(!lstrcmpA(prop, expected) || !lstrcmpA(prop, ""),
+       "Expected %s or empty string, got %s\n", expected, prop);

size = MAX_PATH;
     r = MsiGetPropertyA(hpkg, "NEOSODON", prop, &size);
@@ -5408,7 +5411,8 @@ static void test_complocator(void)

lstrcpyA(expected, CURR_DIR);
     lstrcatA(expected, "\neosodon\");
-    ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop);
+    ok(!lstrcmpA(prop, expected) || !lstrcmpA(prop, ""),
+       "Expected %s or empty string, got %s\n", expected, prop);

size = MAX_PATH;
     r = MsiGetPropertyA(hpkg, "OLOROTITAN", prop, &size);