Re: msi: Implement MSIMODIFY_MERGE function in TABLE_modify.

[Marvin]

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
http://testbot.winehq.org/JobDetails.pl?Key=17479

Your paranoid android.

=== WNT4WSSP6 (32 bit db) ===
db.c:1079: Test failed: MsiViewModify failed

=== W2KPROSP4 (32 bit db) ===
db.c:1079: Test failed: MsiViewModify failed

=== WXPPROSP3 (32 bit db) ===
db.c:1079: Test failed: MsiViewModify failed

=== W2K3R2SESP2 (32 bit db) ===
db.c:1079: Test failed: MsiViewModify failed

=== WVISTAADM (32 bit db) ===
db.c:1079: Test failed: MsiViewModify failed

=== W2K8SE (32 bit db) ===
db.c:1079: Test failed: MsiViewModify failed

=== W7PRO (32 bit db) ===
db.c:1079: Test failed: MsiViewModify failed

=== W7PROX64 (32 bit db) ===
db.c:1079: Test failed: MsiViewModify failed

=== TEST64_W7SP1 (32 bit db) ===
db.c:1079: Test failed: MsiViewModify failed

=== W7PROX64 (64 bit db) ===
db.c:1079: Test failed: MsiViewModify failed

=== TEST64_W7SP1 (64 bit db) ===
db.c:1079: Test failed: MsiViewModify failed

msi: Implement MSIMODIFY_MERGE function in TABLE_modify.

[Andoni Morales]

El 26 de marzo de 2012 13:38, Marvin  escribió:
> 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
> http://testbot.winehq.org/JobDetails.pl?Key=17479
>
> Your paranoid android.
>
> === WNT4WSSP6 (32 bit db) ===
> db.c:1079: Test failed: MsiViewModify failed
>
> === W2KPROSP4 (32 bit db) ===
> db.c:1079: Test failed: MsiViewModify failed
>
> === WXPPROSP3 (32 bit db) ===
> db.c:1079: Test failed: MsiViewModify failed
>
> === W2K3R2SESP2 (32 bit db) ===
> db.c:1079: Test failed: MsiViewModify failed
>
> === WVISTAADM (32 bit db) ===
> db.c:1079: Test failed: MsiViewModify failed
>
> === W2K8SE (32 bit db) ===
> db.c:1079: Test failed: MsiViewModify failed
>
> === W7PRO (32 bit db) ===
> db.c:1079: Test failed: MsiViewModify failed
>
> === W7PROX64 (32 bit db) ===
> db.c:1079: Test failed: MsiViewModify failed
>
> === TEST64_W7SP1 (32 bit db) ===
> db.c:1079: Test failed: MsiViewModify failed
>
> === W7PROX64 (64 bit db) ===
> db.c:1079: Test failed: MsiViewModify failed
>
> === TEST64_W7SP1 (64 bit db) ===
> db.c:1079: Test failed: MsiViewModify failed

In my checkout there was several errors before applying the path and I
didn't noticed this one. The primary key 2 is used later in the test and
changing it to a value that's not used later is enough. The diff with the
respect of the previous patch is:

diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index f5a3c1e..4c91bd8 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -935,7 +935,7 @@ static void test_viewmodify(void)
     /* try merging a new record */
     hrec = MsiCreateRecord(3);

-    r = MsiRecordSetInteger(hrec, 1, 2);
+    r = MsiRecordSetInteger(hrec, 1, 10);
     ok(r == ERROR_SUCCESS, "failed to set integer\n");
     r = MsiRecordSetString(hrec, 2, "pepe");
     ok(r == ERROR_SUCCESS, "failed to set string\n");