Dmitry Timoshkov : wineps.drv: Properly handle dmFormName in unicode DEVMODE structure.

Alexandre Julliard julliard at winehq.org
Mon Dec 24 14:03:03 CST 2012


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

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Mon Dec 24 14:56:23 2012 +0800

wineps.drv: Properly handle dmFormName in unicode DEVMODE structure.

---

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

diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c
index 2ad8925..8cc1b1c 100644
--- a/dlls/wineps.drv/driver.c
+++ b/dlls/wineps.drv/driver.c
@@ -178,7 +178,7 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *p
    if (dm2->dmPublic.dmFields & DM_COLLATE )
        dm1->dmPublic.dmCollate = dm2->dmPublic.dmCollate;
    if (dm2->dmPublic.dmFields & DM_FORMNAME )
-       lstrcpynA((LPSTR)dm1->dmPublic.dmFormName, (LPCSTR)dm2->dmPublic.dmFormName, CCHFORMNAME);
+       lstrcpynW(dm1->dmPublic.dmFormName, dm2->dmPublic.dmFormName, CCHFORMNAME);
    if (dm2->dmPublic.dmFields & DM_BITSPERPEL )
        dm1->dmPublic.dmBitsPerPel = dm2->dmPublic.dmBitsPerPel;
    if (dm2->dmPublic.dmFields & DM_PELSWIDTH )




More information about the wine-cvs mailing list