Zebediah Figura : oleaut32/tests: Avoid testing that GDI objects are invalid.

Alexandre Julliard julliard at winehq.org
Thu Dec 26 15:44:39 CST 2019


Module: wine
Branch: master
Commit: c7fa6e8e2d2cb85cabe1461cf59738fd2ada9e3c
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c7fa6e8e2d2cb85cabe1461cf59738fd2ada9e3c

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Thu Dec 26 10:49:32 2019 -0600

oleaut32/tests: Avoid testing that GDI objects are invalid.

This is not consistent across Windows versions.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/oleaut32/tests/olefont.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c
index 10e2a4cf2f..9c8d255af1 100644
--- a/dlls/oleaut32/tests/olefont.c
+++ b/dlls/oleaut32/tests/olefont.c
@@ -1033,9 +1033,6 @@ static void test_hfont_lifetime(void)
 
         hr = IFont_get_hFont(font, &hfont);
         EXPECT_HR(hr, S_OK);
-
-        obj_type = GetObjectType(last_hfont);
-        ok(obj_type == 0, "%d: got obj type %d\n", i, obj_type);
     }
 
     /* now show that if we take a reference on the hfont, it persists
@@ -1063,9 +1060,6 @@ static void test_hfont_lifetime(void)
 
     IFont_Release(font);
 
-    obj_type = GetObjectType(first_hfont);
-    ok(obj_type == 0, "got obj type %d\n", obj_type);
-
     /* An AddRefHfont followed by a ReleaseHfont means the font doesn't not persist
        through re-realization */
 
@@ -1099,9 +1093,6 @@ static void test_hfont_lifetime(void)
 
         hr = IFont_ReleaseHfont(font, hfont);
         EXPECT_HR(hr, S_OK);
-
-        obj_type = GetObjectType(last_hfont);
-        ok(obj_type == 0, "%d: got obj type %d\n", i, obj_type);
     }
 
     /* Interestingly if we release a nonexistent reference on the hfont,
@@ -1130,9 +1121,6 @@ static void test_hfont_lifetime(void)
 
     IFont_Release(font);
 
-    obj_type = GetObjectType(first_hfont);
-    ok(obj_type == 0, "got obj type %d\n", obj_type);
-
     /* If we take two internal references on a hfont then we can release
        it twice.  So it looks like there's a total reference count
        that includes internal and external references */
@@ -1165,9 +1153,6 @@ todo_wine
     ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type);
 
     IFont_Release(font2);
-
-    obj_type = GetObjectType(hfont);
-    ok(obj_type == 0, "got obj type %d\n", obj_type);
 }
 
 static void test_realization(void)




More information about the wine-cvs mailing list