Dmitry Timoshkov : wineps.drv: Update dmFormName when merging DEVMODE structures.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0f7ed96fda2e9c97f1b3b087a54d1a88fed13e05
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0f7ed96fda2e9c97f1b3b087a5...

Author: Dmitry Timoshkov 
Date:   Mon Dec 24 14:56:30 2012 +0800

wineps.drv: Update dmFormName when merging DEVMODE structures.

---

dlls/wineps.drv/driver.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c
index 8cc1b1c..c1e49d7 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);