Jan de Mooij : comdlg32/printdlg: If ToPages field is left empty set it to FromPages value.

Alexandre Julliard julliard at winehq.org
Fri Sep 5 06:58:05 CDT 2008


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

Author: Jan de Mooij <jandemooij at gmail.com>
Date:   Fri Sep  5 11:08:49 2008 +0200

comdlg32/printdlg: If ToPages field is left empty set it to FromPages value.

---

 dlls/comdlg32/printdlg.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
index 52ac3c6..bc49bfc 100644
--- a/dlls/comdlg32/printdlg.c
+++ b/dlls/comdlg32/printdlg.c
@@ -309,8 +309,13 @@ static BOOL PRINTDLG_UpdatePrintDlgA(HWND hDlg,
         if (IsDlgButtonChecked(hDlg, rad3) == BST_CHECKED) { /* Pages */
 	    WORD nToPage;
 	    WORD nFromPage;
+            BOOL translated;
 	    nFromPage = GetDlgItemInt(hDlg, edt1, NULL, FALSE);
-	    nToPage   = GetDlgItemInt(hDlg, edt2, NULL, FALSE);
+	    nToPage   = GetDlgItemInt(hDlg, edt2, &translated, FALSE);
+
+	    /* if no ToPage value is entered, use the FromPage value */
+	    if(!translated) nToPage = nFromPage;
+
 	    if (nFromPage < lppd->nMinPage || nFromPage > lppd->nMaxPage ||
 		nToPage < lppd->nMinPage || nToPage > lppd->nMaxPage) {
 	        WCHAR resourcestr[256];
@@ -407,8 +412,13 @@ static BOOL PRINTDLG_UpdatePrintDlgW(HWND hDlg,
         if (IsDlgButtonChecked(hDlg, rad3) == BST_CHECKED) { /* Pages */
 	    WORD nToPage;
 	    WORD nFromPage;
+            BOOL translated;
 	    nFromPage = GetDlgItemInt(hDlg, edt1, NULL, FALSE);
-	    nToPage   = GetDlgItemInt(hDlg, edt2, NULL, FALSE);
+	    nToPage   = GetDlgItemInt(hDlg, edt2, &translated, FALSE);
+
+	    /* if no ToPage value is entered, use the FromPage value */
+	    if(!translated) nToPage = nFromPage;
+
 	    if (nFromPage < lppd->nMinPage || nFromPage > lppd->nMaxPage ||
 		nToPage < lppd->nMinPage || nToPage > lppd->nMaxPage) {
 	        WCHAR resourcestr[256];




More information about the wine-cvs mailing list