Nicolas Le Cam : msi/tests: Fix a failing test on all platforms up to and including win2k.

[Alexandre Julliard]

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

Author: Nicolas Le Cam <niko.lecam(a)gmail.com>
Date:   Mon Oct 27 14:16:33 2008 +0100

msi/tests: Fix a failing test on all platforms up to and including win2k.

---

 dlls/msi/tests/db.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index 961aa5a..3561eeb 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -6860,15 +6860,13 @@ static void test_dbmerge(void)
     r = run_query(hdb, 0, query);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
 
-    create_file_data("codepage.idt", "\r\n\r\n28603\t_ForceCodepage\r\n", 0);
+    create_file_data("codepage.idt", "\r\n\r\n850\t_ForceCodepage\r\n", 0);
 
     GetCurrentDirectoryA(MAX_PATH, buf);
     r = MsiDatabaseImportA(hdb, buf, "codepage.idt");
     todo_wine
     {
-        ok(r == ERROR_SUCCESS ||
-           broken(r == ERROR_FUNCTION_FAILED), /* win9x */
-           "Expected ERROR_SUCCESS, got %d\n", r);
+        ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
     }
 
     query = "DROP TABLE `One`";