Paul Vriens : msi/tests: Fix some test failures.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 61daa613ddc61c58ec1388fe5b5e071f6a14dd93
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=61daa613ddc61c58ec1388fe5b...

Author: Paul Vriens 
Date:   Thu Jun 19 10:32:42 2008 +0200

msi/tests: Fix some test failures.

Results on test.winehq.org show failures for at least Vista as new
DISPID's are known there.

---

dlls/msi/tests/automation.c |   38 ++++++++++++++++++--------------------
 1 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c
index f2e5c13..3a35d4a 100644
--- a/dlls/msi/tests/automation.c
+++ b/dlls/msi/tests/automation.c
@@ -554,16 +554,6 @@ static void test_dispid(void)
     }
     dispid = get_dispid(pInstaller, "RelatedProducts");
     ok(dispid == 40, "Expected 40, got %d\n", dispid);
-    dispid = get_dispid(pInstaller, "RemovePatches");
-    ok(dispid == 49 || dispid == -1, "Expected 49 or -1, got %d\n", dispid);
-    dispid = get_dispid(pInstaller, "ApplyMultiplePatches");
-    ok(dispid == 51 || dispid == -1, "Expected 51 or -1, got %d\n", dispid);
-    dispid = get_dispid(pInstaller, "ProductsEx");
-    ok(dispid == 52 || dispid == -1, "Expected 52 or -1, got %d\n", dispid);
-    dispid = get_dispid(pInstaller, "PatchesEx");
-    ok(dispid == 55 || dispid == -1, "Expected 55 or -1, got %d\n", dispid);
-    dispid = get_dispid(pInstaller, "ExtractPatchXMLData");
-    ok(dispid == 57 || dispid == -1, "Expected 57 or -1, got %d\n", dispid);
     todo_wine
     {
         dispid = get_dispid(pInstaller, "PatchInfo");
@@ -583,20 +573,28 @@ static void test_dispid(void)
         dispid = get_dispid(pInstaller, "FileSignatureInfo");
         ok(dispid == 48, "Expected 48, got %d\n", dispid);
     }
-
-    /* MSDN claims the following functions exist but IDispatch->GetIDsOfNames disagrees */
+    dispid = get_dispid(pInstaller, "RemovePatches");
+    ok(dispid == 49 || dispid == -1, "Expected 49 or -1, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "ApplyMultiplePatches");
+    ok(dispid == 51 || dispid == -1, "Expected 51 or -1, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "ProductsEx");
+    ok(dispid == 52 || dispid == -1, "Expected 52 or -1, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "PatchesEx");
+    ok(dispid == 55 || dispid == -1, "Expected 55 or -1, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "ExtractPatchXMLData");
+    ok(dispid == 57 || dispid == -1, "Expected 57 or -1, got %d\n", dispid);
     dispid = get_dispid( pInstaller, "ProductElevated" );
-    ok(dispid == -1, "Expected -1, got %d\n", dispid);
-    dispid = get_dispid( pInstaller, "ProductInfoFromScript" );
-    ok(dispid == -1, "Expected -1, got %d\n", dispid);
+    ok(dispid == 59 || dispid == -1, "Expected 59 or -1, got %d\n", dispid);
     dispid = get_dispid( pInstaller, "ProvideAssembly" );
-    ok(dispid == -1, "Expected -1, got %d\n", dispid);
-    dispid = get_dispid( pInstaller, "CreateAdvertiseScript" );
-    ok(dispid == -1, "Expected -1, got %d\n", dispid);
+    ok(dispid == 60 || dispid == -1, "Expected 60 or -1, got %d\n", dispid);
+    dispid = get_dispid( pInstaller, "ProductInfoFromScript" );
+    ok(dispid == 61 || dispid == -1, "Expected 61 or -1, got %d\n", dispid);
     dispid = get_dispid( pInstaller, "AdvertiseProduct" );
-    ok(dispid == -1, "Expected -1, got %d\n", dispid);
+    ok(dispid == 62 || dispid == -1, "Expected 62 or -1, got %d\n", dispid);
+    dispid = get_dispid( pInstaller, "CreateAdvertiseScript" );
+    ok(dispid == 63 || dispid == -1, "Expected 63 or -1, got %d\n", dispid);
     dispid = get_dispid( pInstaller, "PatchFiles" );
-    ok(dispid == -1, "Expected -1, got %d\n", dispid);
+    ok(dispid == 65 || dispid == -1, "Expected 65 or -1, got %d\n", dispid);
 }

/* Test basic IDispatch functions */