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

Dmitry Timoshkov dmitry at baikal.ru
Thu Oct 10 04:01:31 CDT 2019


dmFields should indicate that DEVMODE has dmPaperWidth and dmPaperLength set.

Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
---
 dlls/wineps.drv/driver.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c
index 173f6db7bd..c3d22cec1a 100644
--- 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;
+	    dm1->dmPublic.dmFields |= DM_PAPERSIZE | DM_PAPERWIDTH | DM_PAPERLENGTH;
 	    TRACE("Changing page to %s %d x %d\n", page->FullName,
 		  dm1->dmPublic.u1.s1.dmPaperWidth,
 		  dm1->dmPublic.u1.s1.dmPaperLength );
-- 
2.20.1




More information about the wine-devel mailing list