wineps.drv: Don't clear DM_PAPERWIDTH | DM_PAPERLENGTH flags.

dmFields should indicate that DEVMODE has dmPaperWidth and dmPaperLength set. Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wineps.drv: Don't clear DM_PAPERWIDTH | DM_PAPERLENGTH flags.
8d6183c8 · Dmitry Timoshkov · Alexandre Julliard · 6a976801 · 8d6183c8
Commit 8d6183c8 authored Oct 10, 2019 by Dmitry Timoshkov Committed by Alexandre Julliard Oct 16, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

driver.c dlls/wineps.drv/driver.c +1 -2

No files found.
--- a/dlls/wineps.drv/driver.c
+++ b/dlls/wineps.drv/driver.c
@@ -110,8 +110,7 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, const PSDRV_DEVMODE *dm2, PRINTERI
 	    dm1->dmPublic.u1.s1.dmPaperSize = dm2->dmPublic.u1.s1.dmPaperSize;
 	    dm1->dmPublic.u1.s1.dmPaperWidth  = paper_size_from_points( page->PaperDimension->x );
 	    dm1->dmPublic.u1.s1.dmPaperLength = paper_size_from_points( page->PaperDimension->y );
-	    dm1->dmPublic.dmFields &= ~(DM_PAPERLENGTH | DM_PAPERWIDTH);
+	    dm1->dmPublic.dmFields |= DM_PAPERSIZE | DM_PAPERWIDTH | DM_PAPERLENGTH;
-	    dm1->dmPublic.dmFields |= DM_PAPERSIZE;
 	    TRACE("Changing page to %s %d x %d\n", page->FullName,
 		  dm1->dmPublic.u1.s1.dmPaperWidth,
 		  dm1->dmPublic.u1.s1.dmPaperLength );