[PATCH] comdlg32: Dump parameter in PageSetupDlg

[Detlef Riekenberg]

---
 dlls/comdlg32/printdlg.c |   73 ++++++++++++++++++++++++++--------------------
 1 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
index 517aedc..91ee309 100644
--- a/dlls/comdlg32/printdlg.c
+++ b/dlls/comdlg32/printdlg.c
@@ -3420,26 +3420,31 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLG
     PageSetupDataA	*pda;
     PRINTDLGA		pdlg;
 
+    TRACE("(%p)\n", setupdlg);
     if (setupdlg == NULL) {
-	   COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION);
-	   return FALSE;
+       COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION);
+       return FALSE;
     }
 
-    /* TRACE */
     if(TRACE_ON(commdlg)) {
-        char flagstr[1000] = "";
-	const struct pd_flags *pflag = psd_flags;
-	for( ; pflag->name; pflag++) {
-	    if(setupdlg->Flags & pflag->flag) {
-	        strcat(flagstr, pflag->name);
-	        strcat(flagstr, "|");
-	    }
-	}
-	TRACE("(%p): hwndOwner = %p, hDevMode = %p, hDevNames = %p\n"
-              "hinst %p, flags %08x (%s)\n",
-	      setupdlg, setupdlg->hwndOwner, setupdlg->hDevMode,
-	      setupdlg->hDevNames,
-	      setupdlg->hInstance, setupdlg->Flags, flagstr);
+        char flagstr[1000];
+
+        flags_to_string(setupdlg->Flags, psd_flags, flagstr);
+        TRACE("hwndOwner = %p, hDevMode = %p, hDevNames = %p\n",
+              setupdlg->hwndOwner, setupdlg->hDevMode, setupdlg->hDevNames);
+        TRACE("flags 0x%x (%s)\n", setupdlg->Flags, flagstr);
+        TRACE("PaperSize: %dx%d, MinMargin: %dx%d - %dx%d, Margin: %dx%d - %dx%d\n",
+              setupdlg->ptPaperSize.x, setupdlg->ptPaperSize.y,
+              setupdlg->rtMinMargin.left, setupdlg->rtMinMargin.top,
+              setupdlg->rtMinMargin.right, setupdlg->rtMinMargin.bottom,
+              setupdlg->rtMargin.left, setupdlg->rtMargin.top,
+              setupdlg->rtMargin.right, setupdlg->rtMargin.bottom);
+        TRACE("hinst: %p, CustData: 0x%lx, PageSetupHook: %p, PagePaintHook: %p\n",
+              setupdlg->hInstance, setupdlg->lCustData, setupdlg->lpfnPageSetupHook,
+              setupdlg->lpfnPagePaintHook);
+        TRACE("TemplateName: %p %s, Template: %p\n", setupdlg->lpPageSetupTemplateName,
+              (setupdlg->Flags & PSD_ENABLEPAGESETUPTEMPLATE) ? debugstr_a(setupdlg->lpPageSetupTemplateName) : "",
+              setupdlg->hPageSetupTemplate);
     }
 
     /* Checking setupdlg structure */
@@ -3528,25 +3533,31 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLG
 
     FIXME("Unicode implementation is not done yet\n");
 
+    TRACE("(%p)\n", setupdlg);
     if (setupdlg == NULL) {
-	   COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION);
-	   return FALSE;
+       COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION);
+       return FALSE;
     }
 
     if(TRACE_ON(commdlg)) {
-        char flagstr[1000] = "";
-	const struct pd_flags *pflag = psd_flags;
-	for( ; pflag->name; pflag++) {
-	    if(setupdlg->Flags & pflag->flag) {
-	        strcat(flagstr, pflag->name);
-	        strcat(flagstr, "|");
-	    }
-	}
-	TRACE("(%p): hwndOwner = %p, hDevMode = %p, hDevNames = %p\n"
-              "hinst %p, flags %08x (%s)\n",
-	      setupdlg, setupdlg->hwndOwner, setupdlg->hDevMode,
-	      setupdlg->hDevNames,
-	      setupdlg->hInstance, setupdlg->Flags, flagstr);
+        char flagstr[1000];
+
+        flags_to_string(setupdlg->Flags, psd_flags, flagstr);
+        TRACE("hwndOwner = %p, hDevMode = %p, hDevNames = %p\n",
+              setupdlg->hwndOwner, setupdlg->hDevMode, setupdlg->hDevNames);
+        TRACE("flags 0x%x (%s)\n", setupdlg->Flags, flagstr);
+        TRACE("PaperSize: %dx%d, MinMargin: %dx%d - %dx%d, Margin: %dx%d - %dx%d\n",
+              setupdlg->ptPaperSize.x, setupdlg->ptPaperSize.y,
+              setupdlg->rtMinMargin.left, setupdlg->rtMinMargin.top,
+              setupdlg->rtMinMargin.right, setupdlg->rtMinMargin.bottom,
+              setupdlg->rtMargin.left, setupdlg->rtMargin.top,
+              setupdlg->rtMargin.right, setupdlg->rtMargin.bottom);
+        TRACE("hinst: %p, CustData: 0x%lx, PageSetupHook: %p, PagePaintHook: %p\n",
+              setupdlg->hInstance, setupdlg->lCustData, setupdlg->lpfnPageSetupHook,
+              setupdlg->lpfnPagePaintHook);
+        TRACE("TemplateName: %p %s, Template: %p\n", setupdlg->lpPageSetupTemplateName,
+              (setupdlg->Flags & PSD_ENABLEPAGESETUPTEMPLATE) ? debugstr_w(setupdlg->lpPageSetupTemplateName) : "",
+              setupdlg->hPageSetupTemplate);
     }
 
     /* Initialize default printer struct. If no printer device info is specified
-- 
1.4.1


--=-2noG34TJxV9owRAd4Zjk--