James Hawkins : winspool.drv: Disable a test for capabilities not available on all printer drivers.

Alexandre Julliard julliard at winehq.org
Fri Apr 25 08:10:57 CDT 2008


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

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Fri Apr 25 01:10:02 2008 -0500

winspool.drv: Disable a test for capabilities not available on all printer drivers.

---

 dlls/winspool.drv/tests/info.c |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c
index cd93f16..f0f4754 100644
--- a/dlls/winspool.drv/tests/info.c
+++ b/dlls/winspool.drv/tests/info.c
@@ -2345,15 +2345,19 @@ static void test_DeviceCapabilities(void)
     ok(n_copies > 0, "DeviceCapabilities DC_COPIES failed\n");
     trace("n_copies = %d\n", n_copies);
 
-    ret = DeviceCapabilities(device, port, DC_MAXEXTENT, NULL, NULL);
-    ok(ret != -1, "DeviceCapabilities DC_MAXEXTENT failed\n");
-    ext = MAKEPOINTS(ret);
-    trace("max ext = %d x %d\n", ext.x, ext.y);
-
-    ret = DeviceCapabilities(device, port, DC_MINEXTENT, NULL, NULL);
-    ok(ret != -1, "DeviceCapabilities DC_MINEXTENT failed\n");
-    ext = MAKEPOINTS(ret);
-    trace("min ext = %d x %d\n", ext.x, ext.y);
+    /* these capabilities not available on all printer drivers */
+    if (0)
+    {
+        ret = DeviceCapabilities(device, port, DC_MAXEXTENT, NULL, NULL);
+        ok(ret != -1, "DeviceCapabilities DC_MAXEXTENT failed\n");
+        ext = MAKEPOINTS(ret);
+        trace("max ext = %d x %d\n", ext.x, ext.y);
+
+        ret = DeviceCapabilities(device, port, DC_MINEXTENT, NULL, NULL);
+        ok(ret != -1, "DeviceCapabilities DC_MINEXTENT failed\n");
+        ext = MAKEPOINTS(ret);
+        trace("min ext = %d x %d\n", ext.x, ext.y);
+    }
 
     fields = DeviceCapabilities(device, port, DC_FIELDS, NULL, NULL);
     ok(fields != (DWORD)-1, "DeviceCapabilities DC_FIELDS failed\n");




More information about the wine-cvs mailing list