Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert changes accidently commited along with last patch.

Browse source 
svn path=/trunk/; revision=16983
This commit is contained in:
Filip Navara 2005-08-02 22:04:02 +00:00
parent 91e5ea7dfa
commit 595f9f988d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/subsys/win32k/objects/text.c
View file

@ -1527,7 +1527,7 @@ NtGdiExtTextOut(
}
}
BitmapObj = BITMAPOBJ_LockBitmap(DC_BITMAP(dc));
BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
if ( !BitmapObj )
{
goto fail;
@ -1542,7 +1542,7 @@ NtGdiExtTextOut(
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 @@ NtGdiExtTextOut(
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 @@ NtGdiExtTextOut(
}
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;