[ros-diffs] [bfreisen] 68714: [MSPAINT_NEW] add (untested) printing code, fix mouse cursor bug

Author: bfreisen
Date: Sat Aug 15 10:13:28 2015
New Revision: 68714

URL: http://svn.reactos.org/svn/reactos?rev=68714&view=rev
Log:
[MSPAINT_NEW] add (untested) printing code, fix mouse cursor bug

Modified:
    trunk/reactos/base/applications/mspaint_new/miniature.cpp
    trunk/reactos/base/applications/mspaint_new/winproc.cpp

Modified: trunk/reactos/base/applications/mspaint_new/miniature.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/miniature.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/miniature.cpp	[iso-8859-1] Sat Aug 15
10:13:28 2015
@@ -35,5 +35,6 @@
 LRESULT CMiniatureWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL&
bHandled)
 {
     SetCursor(LoadCursor(NULL, IDC_ARROW));
+    bHandled = FALSE;
     return 0;
 }

Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/winproc.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/winproc.cpp	[iso-8859-1] Sat Aug 15
10:13:28 2015
@@ -294,6 +294,7 @@
 LRESULT CMainWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL&
bHandled)
 {
     SetCursor(LoadCursor(NULL, IDC_ARROW));
+    bHandled = FALSE;
     return 0;
 }
 
@@ -403,12 +404,28 @@
             PageSetupDlg(&psd);
             break;
         case IDM_FILEPRINT:
-            // DUMMY: Shows the dialog only, no functionality
+            // TODO: Test whether it actually works
             PRINTDLG pd;
             ZeroMemory(&pd, sizeof(pd));
             pd.lStructSize = sizeof(pd);
             pd.hwndOwner = m_hWnd;
-            PrintDlg(&pd);
+            pd.hDevMode = NULL;  // freed by user
+            pd.hDevNames = NULL;  // freed by user
+            pd.Flags = PD_USEDEVMODECOPIESANDCOLLATE | PD_RETURNDC;
+            pd.nCopies = 1;
+            pd.nFromPage = 0xffff;
+            pd.nToPage = 0xffff;
+            pd.nMinPage = 1;
+            pd.nMaxPage = 0xffff;
+            if (PrintDlg(&pd) == TRUE)
+            {
+                BitBlt(pd.hDC, 0, 0, imageModel.GetWidth(), imageModel.GetHeight(),
imageModel.GetDC(), 0, 0, SRCCOPY);
+                DeleteDC(pd.hDC);
+            }
+            if (pd.hDevMode)
+                GlobalFree(pd.hDevMode);
+            if (pd.hDevNames)
+                GlobalFree(pd.hDevNames);
             break;
         case IDM_FILEASWALLPAPERPLANE:
             SetWallpaper(filepathname, 1, 1);