[ros-diffs] [zguo] 58772: Merge in r58759 due to minimal risk of regressions and increased application compatibility.

Author: zguo
Date: Mon Apr 15 20:51:25 2013
New Revision: 58772

URL: http://svn.reactos.org/svn/reactos?rev=58772&view=rev
Log:
Merge in r58759 due to minimal risk of regressions and increased application
compatibility.

Modified:
    branches/ReactOS-0.3.15/   (props changed)
    branches/ReactOS-0.3.15/win32ss/gdi/eng/pdevobj.c

Propchange: branches/ReactOS-0.3.15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 15 20:51:25 2013
@@ -13,4 +13,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:58534,58553,58561,58614,58627-58628,58633
+/trunk/reactos:58534,58553,58561,58614,58627-58628,58633,58759

Modified: branches/ReactOS-0.3.15/win32ss/gdi/eng/pdevobj.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/win32ss/gdi/eng/…
==============================================================================
--- branches/ReactOS-0.3.15/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original)
+++ branches/ReactOS-0.3.15/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Mon Apr 15 20:51:25
2013
@@ -162,6 +162,15 @@
 
     if (ppdev->gdiinfo.ulLogPixelsY == 0)
         ppdev->gdiinfo.ulLogPixelsY = 96;
+
+    /* Set raster caps */
+    ppdev->gdiinfo.flRaster = RC_OP_DX_OUTPUT | RC_GDI20_OUTPUT | RC_BIGFONT;
+    if ((ppdev->gdiinfo.ulTechnology != DT_PLOTTER) &&
(ppdev->gdiinfo.ulTechnology != DT_CHARSTREAM))
+        ppdev->gdiinfo.flRaster |= RC_STRETCHDIB | RC_STRETCHBLT | RC_DIBTODEV |
RC_DI_BITMAP | RC_BITMAP64 | RC_BITBLT;
+    if (ppdev->gdiinfo.ulTechnology == DT_RASDISPLAY)
+        ppdev->gdiinfo.flRaster |= RC_FLOODFILL;
+    if (ppdev->devinfo.flGraphicsCaps & GCAPS_PALMANAGED)
+        ppdev->gdiinfo.flRaster |= RC_PALETTE;
 
     /* Setup Palette */
     ppdev->ppalSurf = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault);