Dylan Smith : wordpad: Fixed quick print so that it doesn' t print blank pages.

Alexandre Julliard julliard at winehq.org
Wed Feb 10 10:44:51 CST 2010


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

Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date:   Wed Feb 10 02:38:40 2010 -0500

wordpad: Fixed quick print so that it doesn't print blank pages.

---

 programs/wordpad/print.c   |    3 ++-
 programs/wordpad/wordpad.c |    2 +-
 programs/wordpad/wordpad.h |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c
index 79b43a6..e43b4b9 100644
--- a/programs/wordpad/print.c
+++ b/programs/wordpad/print.c
@@ -403,11 +403,12 @@ void get_default_printer_opts(void)
     devNames = pd.hDevNames;
 }
 
-void print_quick(LPWSTR wszFileName)
+void print_quick(HWND hMainWnd, LPWSTR wszFileName)
 {
     PRINTDLGW pd;
 
     ZeroMemory(&pd, sizeof(pd));
+    pd.hwndOwner = hMainWnd;
     pd.hDC = make_dc();
 
     print(&pd, wszFileName);
diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index 0bbe360..bdaee2e 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -2098,7 +2098,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
         break;
 
     case ID_PRINT_QUICK:
-        print_quick(wszFileName);
+        print_quick(hMainWnd, wszFileName);
         target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]);
         break;
 
diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h
index 26aa41a..269f3a2 100644
--- a/programs/wordpad/wordpad.h
+++ b/programs/wordpad/wordpad.h
@@ -217,7 +217,7 @@ LPWSTR file_basename(LPWSTR);
 void dialog_printsetup(HWND);
 void dialog_print(HWND, LPWSTR);
 void target_device(HWND, DWORD);
-void print_quick(LPWSTR);
+void print_quick(HWND, LPWSTR);
 LRESULT preview_command(HWND, WPARAM);
 void init_preview(HWND, LPWSTR);
 void close_preview(HWND);




More information about the wine-cvs mailing list