From 01f04141d984ffe99b525ef9783855cc2c3a7997 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Sat, 22 Nov 2008 18:26:32 +0000 Subject: [PATCH] - Add tag for path objects. Set DC handle when selecting bitmap. svn path=/trunk/; revision=37562 --- reactos/subsystems/win32/win32k/include/tags.h | 1 + reactos/subsystems/win32/win32k/objects/dc.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/reactos/subsystems/win32/win32k/include/tags.h b/reactos/subsystems/win32/win32k/include/tags.h index bea0c0333e8..df3547dea58 100644 --- a/reactos/subsystems/win32/win32k/include/tags.h +++ b/reactos/subsystems/win32/win32k/include/tags.h @@ -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 */ diff --git a/reactos/subsystems/win32/win32k/objects/dc.c b/reactos/subsystems/win32/win32k/objects/dc.c index 245ab547745..5c6960e29d0 100644 --- a/reactos/subsystems/win32/win32k/objects/dc.c +++ b/reactos/subsystems/win32/win32k/objects/dc.c @@ -2099,6 +2099,10 @@ NtGdiSelectBitmap( /* 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) {