msi: Fix a failure with merging existing tables.
This commit is contained in:
parent
6aad5cb307
commit
a3214c978d
|
@ -1335,6 +1335,8 @@ static UINT merge_diff_row(MSIRECORD *rec, LPVOID param)
|
||||||
}
|
}
|
||||||
else if (r != ERROR_NO_MORE_ITEMS)
|
else if (r != ERROR_NO_MORE_ITEMS)
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
|
r = ERROR_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
mergerow = msi_alloc(sizeof(MERGEROW));
|
mergerow = msi_alloc(sizeof(MERGEROW));
|
||||||
|
|
|
@ -7598,15 +7598,15 @@ static void test_dbmerge(void)
|
||||||
MsiCloseHandle(hrec);
|
MsiCloseHandle(hrec);
|
||||||
|
|
||||||
r = MsiViewFetch(hview, &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);
|
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;
|
size = MAX_PATH;
|
||||||
r = MsiRecordGetStringA(hrec, 2, buf, &size);
|
r = MsiRecordGetStringA(hrec, 2, buf, &size);
|
||||||
todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
|
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
|
||||||
todo_wine ok(!lstrcmpA(buf, "bar"), "Expected \"bar\", got \"%s\"\n", buf);
|
ok(!lstrcmpA(buf, "bar"), "Expected \"bar\", got \"%s\"\n", buf);
|
||||||
|
|
||||||
MsiCloseHandle(hrec);
|
MsiCloseHandle(hrec);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue