Huw Davies : wineps: Always update the default devmode.

Alexandre Julliard julliard at winehq.org
Thu Jun 21 15:03:41 CDT 2012


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

Author: Huw Davies <huw at codeweavers.com>
Date:   Thu Jun 21 12:59:01 2012 +0100

wineps: Always update the default devmode.

---

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

diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index 4beb45a..07d52d2 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -630,8 +630,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name)
 	    dm.dmPublic.u1.s1.dmPaperSize = papersize;
 	    PSDRV_MergeDevmodes(pi->Devmode, &dm, pi);
 	}
-
-        set_devmode( hPrinter, pi->Devmode );
     }
 
     if(pi->ppd->DefaultPageSize) { /* We'll let the ppd override the devmode */
@@ -672,6 +670,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name)
             pi->Devmode->dmPublic.dmDuplex = DMDUP_SIMPLEX;
     }
 
+    set_devmode( hPrinter, pi->Devmode );
+
     pi->FontSubTable = load_font_sub_table( hPrinter, &pi->FontSubTableSize );
 
     LIST_FOR_EACH_ENTRY( font, &pi->ppd->InstalledFonts, FONTNAME, entry )




More information about the wine-cvs mailing list