Detlef Riekenberg : comdlg32: Return defaults for hDevMode and hDevNames.

[Alexandre Julliard]

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

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Thu Aug  9 19:10:02 2007 +0200

comdlg32: Return defaults for hDevMode and hDevNames.

---

 dlls/comdlg32/printdlg.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
index a1ad355..8491aa7 100644
--- a/dlls/comdlg32/printdlg.c
+++ b/dlls/comdlg32/printdlg.c
@@ -3398,14 +3398,16 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
 
     /* short cut exit, just return default values */
     if (setupdlg->Flags & PSD_RETURNDEFAULT) {
-	DEVMODEA *dm;
-	
-	dm = GlobalLock(pdlg.hDevMode);
-    	PRINTDLG_PaperSizeA(&pdlg, dm->u1.s1.dmPaperSize, &setupdlg->ptPaperSize);
-	GlobalUnlock(pdlg.hDevMode);
-	setupdlg->ptPaperSize.x=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.x);
-	setupdlg->ptPaperSize.y=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.y);
-	return TRUE;
+        DEVMODEA *dm;
+
+	setupdlg->hDevMode = pdlg.hDevMode;
+	setupdlg->hDevNames = pdlg.hDevNames;
+        dm = GlobalLock(pdlg.hDevMode);
+        PRINTDLG_PaperSizeA(&pdlg, dm->u1.s1.dmPaperSize, &setupdlg->ptPaperSize);
+        GlobalUnlock(pdlg.hDevMode);
+        setupdlg->ptPaperSize.x=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.x);
+        setupdlg->ptPaperSize.y=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.y);
+        return TRUE;
     }
 
     /* get dialog template */