[5/5] wineps.drv: Update dmFormName when merging DEVMODE structures.
Dmitry Timoshkov
dmitry at baikal.ru
Mon Dec 24 00:56:30 CST 2012
---
dlls/wineps.drv/driver.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c
index 37e31b6..d943771 100644
--- a/dlls/wineps.drv/driver.c
+++ b/dlls/wineps.drv/driver.c
@@ -117,6 +117,12 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *p
TRACE("Changing page to %s %d x %d\n", page->FullName,
dm1->dmPublic.u1.s1.dmPaperWidth,
dm1->dmPublic.u1.s1.dmPaperLength );
+
+ if (dm1->dmPublic.dmSize >= FIELD_OFFSET(DEVMODEW, dmFormName) + CCHFORMNAME * sizeof(WCHAR))
+ {
+ MultiByteToWideChar(CP_ACP, 0, page->FullName, -1, dm1->dmPublic.dmFormName, CCHFORMNAME);
+ dm1->dmPublic.dmFields |= DM_FORMNAME;
+ }
}
else
TRACE("Trying to change to unsupported pagesize %d\n", dm2->dmPublic.u1.s1.dmPaperSize);
--
1.8.0.2
More information about the wine-patches
mailing list