Signed-off-by: Dmitry Timoshkov dmitry@baikal.ru --- dlls/msi/tests/custom.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index c6e9f1eb52..1694e93fde 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -281,7 +281,7 @@ static void test_db(MSIHANDLE hinst) VT_EMPTY, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_I4, VT_I4, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY }; - MSIHANDLE hdb, view, rec, rec2, suminfo; + MSIHANDLE hdb, hdb2, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; UINT r, count, type, i; @@ -312,6 +312,17 @@ static void test_db(MSIHANDLE hinst) ok(hinst, sz == strlen(buffer), "got size %u\n", sz); ok(hinst, !strcmp(buffer, "Name"), "got '%s'\n", buffer);
+ /* Test MsiGetActiveDatabase + MsiDatabaseIsTablePersistent once again */ + hdb2 = MsiGetActiveDatabase(hinst); + ok(hinst, hdb2, "MsiGetActiveDatabase failed\n"); + ok(hinst, hdb2 != hdb, "db handles should be different\n"); + + r = MsiDatabaseIsTablePersistentA(hdb2, "Test"); + ok(hinst, r == MSICONDITION_TRUE, "got %u\n", r); + + r = MsiCloseHandle(hdb2); + ok(hinst, !r, "got %u\n", r); + r = MsiCloseHandle(rec2); ok(hinst, !r, "got %u\n", r);
Hi,
While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=42226
Your paranoid android.
=== w7u (32 bit Windows report) ===
msi: action: Timeout
=== wxppro (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w2003std (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== wvistau64 (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== wvistau64_zh_CN (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== wvistau64_fr (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== wvistau64_he (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w2008s64 (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w7u (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87 install: Timeout
Report errors: msi:install contains a misplaced failure message for custom
=== w7pro64 (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w8 (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w8adm (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w864 (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w1064 (32 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== wvistau64 (64 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w2008s64 (64 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w7pro64 (64 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w864 (64 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w1064 (64 bit Windows report) ===
msi: custom.c:528: Test failed: 2: got 87 custom.c:528: Test failed: 7: got 87 custom.c:528: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w7u (32 bit Windows report) ===
msi: msi: Timeout