[PATCH 3/3] Fix test failures on XP+ with long printer names

Paul Vriens Paul.Vriens.Wine at gmail.com
Tue Dec 8 03:25:18 CST 2009


---
 dlls/winspool.drv/tests/info.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c
index ef726f4..1f876b3 100644
--- a/dlls/winspool.drv/tests/info.c
+++ b/dlls/winspool.drv/tests/info.c
@@ -2412,7 +2412,8 @@ static void test_DEVMODE(const DEVMODE *dm, LONG dmSize, LPCSTR exp_prn_name)
        We skip the Tests on this Platform */
     if (dm->dmSpecVersion || dm->dmDriverVersion || dm->dmDriverExtra) {
     /* The 0-terminated Printername can be larger (MAX_PATH) than CCHDEVICENAME */
-        ok(!strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME -1),
+        ok(!strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME -1) ||
+           !strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME -2), /* XP+ */
             "expected '%s', got '%s'\n", exp_prn_name, dm->dmDeviceName);
         ok(dm->dmSize + dm->dmDriverExtra == dmSize,
             "%u != %d\n", dm->dmSize + dm->dmDriverExtra, dmSize);
-- 
1.6.2.5


--------------080404080208030100070101--



More information about the wine-patches mailing list