Dmitry Timoshkov : wineps.drv: Don't clear DM_PAPERWIDTH | DM_PAPERLENGTH flags.
Alexandre Julliard
julliard at winehq.org
Wed Oct 16 16:59:29 CDT 2019
Module: wine
Branch: master
Commit: 8d6183c832478d392ea5e9102539f76a05562cd5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d6183c832478d392ea5e9102539f76a05562cd5
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Thu Oct 10 17:01:31 2019 +0800
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 at baikal.ru>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 );
More information about the wine-cvs
mailing list