Alistair Leslie-Hughes : inetcomm: Correct test under w2k8.

Alexandre Julliard julliard at winehq.org
Wed Oct 29 09:39:50 CDT 2008


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

Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date:   Wed Oct 29 16:13:13 2008 +1100

inetcomm: Correct test under w2k8.

---

 dlls/inetcomm/tests/mimeintl.c |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c
index d82c191..e49567d 100644
--- a/dlls/inetcomm/tests/mimeintl.c
+++ b/dlls/inetcomm/tests/mimeintl.c
@@ -46,13 +46,26 @@ static void test_create(void)
     hr = MimeOleGetInternat(&internat2);
     ok(hr == S_OK, "ret %08x\n", hr);
 
-    /* test to show that the object is a singleton with
-       a reference held by the dll. */
-    ok(internat == internat2, "instances differ\n");
-    ref = IMimeInternational_Release(internat2);
-    ok(ref == 2, "got %d\n", ref);
+    /* Under w2k8 it's no longer a singleton */
+    if(internat == internat2)
+    {
+        /* test to show that the object is a singleton with
+           a reference held by the dll. */
+        ref = IMimeInternational_Release(internat2);
+        ok(ref == 2, "got %d\n", ref);
+
+        ref = IMimeInternational_Release(internat);
+        ok(ref == 1, "got %d\n", ref);
+    }
+    else
+    {
+        ref = IMimeInternational_Release(internat2);
+        ok(ref == 0, "got %d\n", ref);
+
+        ref = IMimeInternational_Release(internat);
+        ok(ref == 0, "got %d\n", ref);
+    }
 
-    IMimeInternational_Release(internat);
 }
 
 static inline HRESULT get_mlang(IMultiLanguage **ml)




More information about the wine-cvs mailing list