comdlg32: Return defaults for hDevMode and hDevNames

[Detlef Riekenberg]

Thanks to Anastasius Focht for find the reason.

PrintSetupDlgW has the missing code..





-- 
 
By by ... Detlef

-------------- next part --------------
>From f89931b07f21469a3381f6628aea774a837b14b7 Mon Sep 17 00:00:00 2001
From: Detlef Riekenberg <wine.dev at web.de>
Date: Thu, 9 Aug 2007 19:10:02 +0200
Subject: [PATCH] comdlg32: Return defaults for hDevMode and hDevNames
---
 dlls/comdlg32/printdlg.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
index a1ad355..c9ad147 100644
--- a/dlls/comdlg32/printdlg.c
+++ b/dlls/comdlg32/printdlg.c
@@ -3398,14 +3398,16 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLG
 
     /* short cut exit, just return default values */
     if (setupdlg->Flags & PSD_RETURNDEFAULT) {
-	DEVMODEA *dm;
+        DEVMODEA *dm;
 	
-	dm = GlobalLock(pdlg.hDevMode);
+    	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;
+        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 */
-- 
1.4.1