Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-08 02:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some bugs

Browse source 
svn path=/trunk/; revision=30914
This commit is contained in:
Timo Kreuzer 2007-11-30 04:12:23 +00:00
parent 5455b61b46
commit 33a99e26d8
1 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
reactos/subsystems/win32/win32k/objects/dc.c
View file

@ -2055,6 +2055,9 @@ NtGdiSelectBitmap(
PBITMAPOBJ pBmp;
HRGN hVisRgn;
BOOLEAN bFailed;
PGDIBRUSHOBJ pBrush;
if (hDC == NULL || hBmp == NULL) return NULL;
pDC = DC_LockDc(hDC);
if (!pDC)
@ -2096,11 +2099,27 @@ NtGdiSelectBitmap(
}
/* Regenerate the XLATEOBJs. */
EngDeleteXlate(pDC->XlateBrush);
pDC->XlateBrush = IntGdiCreateBrushXlate(pDC, pDc_Attr->hbrush, &bFailed);
pBrush = BRUSHOBJ_LockBrush(pDc_Attr->hbrush);
if (pBrush)
{
if (pDC->XlateBrush)
{
EngDeleteXlate(pDC->XlateBrush);
}
pDC->XlateBrush = IntGdiCreateBrushXlate(pDC, pBrush, &bFailed);
BRUSHOBJ_UnlockBrush(pBrush);
}
EngDeleteXlate(pDC->XlatePen);
pDC->XlatePen = IntGdiCreateBrushXlate(pDC, pDc_Attr->hpen, &bFailed);
pBrush = PENOBJ_LockPen(pDc_Attr->hpen);
if (pBrush)
{
if (pDC->XlatePen)
{
EngDeleteXlate(pDC->XlatePen);
}
pDC->XlatePen = IntGdiCreateBrushXlate(pDC, pBrush, &bFailed);
PENOBJ_UnlockPen(pBrush);
}
DC_UnlockDc(pDC);
@ -2128,6 +2147,8 @@ NtGdiSelectBrush(
XLATEOBJ *XlateObj;
BOOLEAN bFailed;
if (hDC == NULL || hBrush == NULL) return NULL;
pDC = DC_LockDc(hDC);
if (!pDC)
{
@ -2176,6 +2197,8 @@ NtGdiSelectFont(
PDC_ATTR pDc_Attr;
HFONT hOrgFont = NULL;
if (hDC == NULL || hFont == NULL) return NULL;
pDC = DC_LockDc(hDC);
if (!pDC)
{
@ -2213,6 +2236,8 @@ NtGdiSelectPen(
XLATEOBJ *XlateObj;
BOOLEAN bFailed;
if (hDC == NULL || hPen == NULL) return NULL;
pDC = DC_LockDc(hDC);
if (!pDC)
{