Alexandre Julliard : winspool/tests: Allow a different way of specifying the paper size capabilities.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Mon Oct 31 20:00:26 2011 +0100

winspool/tests: Allow a different way of specifying the paper size capabilities.

---

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 462f6ef..3f26693 100644
--- a/dlls/winspool.drv/tests/info.c
+++ b/dlls/winspool.drv/tests/info.c
@@ -2841,8 +2841,9 @@ static void test_DeviceCapabilities(void)
     ok(fields != (DWORD)-1, "DeviceCapabilities DC_FIELDS failed\n");
     todo_wine
     ok(fields == (dm->dmFields | DM_FORMNAME) ||
+       fields == ((dm->dmFields | DM_FORMNAME | DM_PAPERSIZE) & ~(DM_PAPERLENGTH|DM_PAPERWIDTH)) ||
         broken(fields == dm->dmFields), /* Win9x/WinMe */
-        "fields %x != (dm->dmFields | DM_FORMNAME) %lx\n", fields, (dm->dmFields | DM_FORMNAME));
+        "fields %x, dm->dmFields %x\n", fields, dm->dmFields);

GlobalUnlock(prn_dlg.hDevMode);
     GlobalFree(prn_dlg.hDevMode);