Huw Davies : comdlg32: Add an is_metric() helper function.

Alexandre Julliard julliard at winehq.org
Fri Jan 16 07:42:02 CST 2009


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

Author: Huw Davies <huw at codeweavers.com>
Date:   Fri Jan 16 12:08:18 2009 +0000

comdlg32: Add an is_metric() helper function.

---

 dlls/comdlg32/printdlg.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
index c9988a6..47c3b34 100644
--- a/dlls/comdlg32/printdlg.c
+++ b/dlls/comdlg32/printdlg.c
@@ -2393,6 +2393,11 @@ static HGLOBAL PRINTDLG_GetPGSTemplateW(const PAGESETUPDLGW *lppd)
     return hDlgTmpl;
 }
 
+static inline BOOL is_metric(const PageSetupDataA *pda)
+{
+    return pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS;
+}
+
 static DWORD
 _c_10mm2size(PAGESETUPDLGA *dlga,DWORD size) {
     if (dlga->Flags & PSD_INTHOUSANDTHSOFINCHES)
@@ -2414,7 +2419,7 @@ static void size2str(const PageSetupDataA *pda, DWORD size, LPWSTR strout)
     static const WCHAR metric_format[] = {'%','d',0};
     static const WCHAR imperial_format[] = {'%','d','i','n',0};
 
-    if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS)
+    if (is_metric(pda))
 	wsprintfW(strout, metric_format, size / 100);
     else
 	wsprintfW(strout, imperial_format, size / 1000);




More information about the wine-cvs mailing list