Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-05 12:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32SS/NTGDI]

Browse source 
- return default bitmap if no surface is attached to the DC
- clean up code a bit

svn path=/trunk/; revision=56949
This commit is contained in:
Jérôme Gardou 2012-07-23 12:19:30 +00:00
parent 3ac46be1b0
commit 166dfc8238
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/win32ss/gdi/ntgdi/dclife.c
View file

@ -179,9 +179,6 @@ DC_vInitDc(
/* Non-direct DCs don't have a surface by default */
pdc->dclevel.pSurface = NULL;
// FIXME: HACK, because our code expects a surface
// pdc->dclevel.pSurface = SURFACE_ShareLockSurface(StockObjects[DEFAULT_BITMAP]);
pdc->erclBounds.left = 0;
pdc->erclBounds.top = 0;
pdc->erclBounds.right = 0;
@ -794,9 +791,6 @@ NtGdiCreateCompatibleDC(HDC hdc)
/* Allocate a dc attribute */
DC_bAllocDcAttr(pdcNew);
// HACK!
//DC_vSelectSurface(pdcNew, psurfDefaultBitmap);
DC_UnlockDc(pdcNew);
DPRINT("Leave NtGdiCreateCompatibleDC hdcNew = %p\n", hdcNew);

5
reactos/win32ss/gdi/ntgdi/dcobjs.c
View file

@ -382,9 +382,6 @@ NtGdiSelectBitmap(
/* Default bitmap is 1x1 pixel */
pdc->dclevel.sizl.cx = 1;
pdc->dclevel.sizl.cy = 1;
// HACK
//psurfNew = SURFACE_ShareLockSurface(hbmp);
}
else
{
@ -572,7 +569,7 @@ NtGdiGetDCObject(HDC hDC, INT ObjectType)
case GDI_OBJECT_TYPE_BITMAP:
{
SURFACE *psurf = pdc->dclevel.pSurface;
SelObject = psurf ? psurf->BaseObject.hHmgr : NULL;
SelObject = psurf ? psurf->BaseObject.hHmgr : StockObjects[DEFAULT_BITMAP];
break;
}