Revert changes accidently commited along with last patch.
Modified: trunk/reactos/subsys/win32k/objects/text.c
_____
Modified: trunk/reactos/subsys/win32k/objects/text.c
--- trunk/reactos/subsys/win32k/objects/text.c 2005-08-02 21:46:42 UTC
(rev 16982)
+++ trunk/reactos/subsys/win32k/objects/text.c 2005-08-02 22:04:02 UTC
(rev 16983)
@@ -1527,7 +1527,7 @@
}
}
- BitmapObj = BITMAPOBJ_LockBitmap(DC_BITMAP(dc));
+ BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
if ( !BitmapObj )
{
goto fail;
@@ -1542,7 +1542,7 @@
YStart = Start.y + dc->w.DCOrgY;
/* Create the brushes */
- PalDestGDI = PALETTE_LockPalette(DC_PALETTE(dc));
+ PalDestGDI = PALETTE_LockPalette(dc->w.hPalette);
if ( !PalDestGDI )
Mode = PAL_RGB;
else
@@ -1550,7 +1550,7 @@
Mode = PalDestGDI->Mode;
PALETTE_UnlockPalette(PalDestGDI);
}
- XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB,
DC_PALETTE(dc), NULL);
+ XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB,
dc->w.hPalette, NULL);
if ( !XlateObj )
{
goto fail;
@@ -1580,7 +1580,7 @@
}
IntGdiInitBrushInstance(&BrushBgInst, BrushBg, NULL);
}
- XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL,
DC_PALETTE(dc));
+ XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL,
dc->w.hPalette);
if ( !XlateObj2 )
{
goto fail;
Show replies by date