Author: jimtabor
Date: Sat Nov 22 12:26:32 2008
New Revision: 37562
URL:
http://svn.reactos.org/svn/reactos?rev=37562&view=rev
Log:
- Add tag for path objects. Set DC handle when selecting bitmap.
Modified:
trunk/reactos/subsystems/win32/win32k/include/tags.h
trunk/reactos/subsystems/win32/win32k/objects/dc.c
Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Sat Nov 22 12:26:32
2008
@@ -77,6 +77,7 @@
#define TAG_CLIPOBJ TAG('C', 'L', 'P', 'O') /* clip
object */
#define TAG_DRIVEROBJ TAG('D', 'R', 'V', 'O') /* driver
object */
#define TAG_DFSM TAG('D', 'f', 's', 'm') /* Eng
event allocation */
+#define TAG_EPATH TAG('G', 'p', 'a', 't') /* path
object */
#define TAG_FONT TAG('F', 'N', 'T', 'E') /* font
entry */
#define TAG_FONTOBJ TAG('G', 'f', 'n', 't') /* font
object */
#define TAG_WNDOBJ TAG('W', 'N', 'D', 'O') /* window
object */
Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sat Nov 22 12:26:32
2008
@@ -2099,6 +2099,10 @@
/* Release the old bitmap, lock the new one and convert it to a SURF */
pDC->w.hBitmap = hBmp;
+ // If Info DC this is zero and pSurface is moved to DC->pSurfInfo.
+ pDC->DcLevel.pSurface = pBmp;
+ pBmp->hDC = hDC;
+
// if we're working with a DIB, get the palette [fixme: only create if the
selected palette is null]
if(pBmp->dib)
{