ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Fix a failure with merging existing tables.

This commit is contained in:
Hib Eris 2009-10-20 14:24:57 +02:00 committed by Alexandre Julliard
parent 6aad5cb307
commit a3214c978d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msi/database.c
View File

@ -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));

8
dlls/msi/tests/db.c
View File

@ -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);