Paul Vriens : winspool.drv/tests: Fix test failures on XP+ with long printer names.

Alexandre Julliard julliard at winehq.org
Tue Dec 8 11:10:38 CST 2009


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Dec  8 10:25:18 2009 +0100

winspool.drv/tests: Fix test failures on XP+ with long printer names.

---

 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);




More information about the wine-cvs mailing list