From a3214c978dc5689a4df359208444c6f446b745a7 Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Tue, 20 Oct 2009 14:24:57 +0200 Subject: [PATCH] msi: Fix a failure with merging existing tables. --- dlls/msi/database.c | 2 ++ dlls/msi/tests/db.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index a75b8a8204e..85d71c28b1d 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1335,6 +1335,8 @@ static UINT merge_diff_row(MSIRECORD *rec, LPVOID param) } else if (r != ERROR_NO_MORE_ITEMS) goto done; + + r = ERROR_SUCCESS; } mergerow = msi_alloc(sizeof(MERGEROW)); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 3551c9c42f5..ea07ae6c8e9 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -7598,15 +7598,15 @@ static void test_dbmerge(void) MsiCloseHandle(hrec); r = MsiViewFetch(hview, &hrec); - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiRecordGetInteger(hrec, 1); - todo_wine ok(r == 2, "Expected 2, got %d\n", r); + ok(r == 2, "Expected 2, got %d\n", r); size = MAX_PATH; r = MsiRecordGetStringA(hrec, 2, buf, &size); - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(buf, "bar"), "Expected \"bar\", got \"%s\"\n", buf); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "bar"), "Expected \"bar\", got \"%s\"\n", buf); MsiCloseHandle(hrec);