Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

patch by jimtabor: add some usermode handling to SelectObject, currently if'ed out, as it doesn't properly work yet, add GDI_OBJECT_TYPE_COLORSPACE using SetColorSpace

Browse source 
svn path=/trunk/; revision=30930
This commit is contained in:
Timo Kreuzer 2007-12-01 02:14:35 +00:00
parent 8553d5ea02
commit a21e119b07
1 changed files with 55 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
reactos/dll/win32/gdi32/objects/dc.c
View file

@ -1344,6 +1344,7 @@ SelectObject(HDC hDC,
{ {
PDC_ATTR pDc_Attr; PDC_ATTR pDc_Attr;
// HGDIOBJ hOldObj = NULL; // HGDIOBJ hOldObj = NULL;
// PTEB pTeb;
if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr))
{ {
@ -1352,35 +1353,79 @@ SelectObject(HDC hDC,
} }
hGdiObj = GdiFixUpHandle(hGdiObj); hGdiObj = GdiFixUpHandle(hGdiObj);
if (!GdiIsHandleValid(hGdiObj)) if (!GdiIsHandleValid(hGdiObj))
{ {
return NULL; return NULL;
} }
UINT uType = GDI_HANDLE_GET_TYPE(hGdiObj); UINT uType = GDI_HANDLE_GET_TYPE(hGdiObj);
switch (uType) switch (uType)
{ {
case GDI_OBJECT_TYPE_PALETTE: case GDI_OBJECT_TYPE_REGION:
SetLastError(ERROR_INVALID_FUNCTION);
return NULL;
case GDI_OBJECT_TYPE_REGION:
return (HGDIOBJ)ExtSelectClipRgn(hDC, hGdiObj, RGN_COPY); return (HGDIOBJ)ExtSelectClipRgn(hDC, hGdiObj, RGN_COPY);
case GDI_OBJECT_TYPE_BITMAP: case GDI_OBJECT_TYPE_BITMAP:
return NtGdiSelectBitmap(hDC, hGdiObj); return NtGdiSelectBitmap(hDC, hGdiObj);
case GDI_OBJECT_TYPE_BRUSH: case GDI_OBJECT_TYPE_BRUSH:
#if 0 // enable this when support is ready in win32k
hOldObj = pDc_Attr->hbrush;
pDc_Attr->ulDirty_ |= DC_BRUSH_DIRTY;
pDc_Attr->hbrush = hGdiObj;
return hOldObj;
#endif
return NtGdiSelectBrush(hDC, hGdiObj); return NtGdiSelectBrush(hDC, hGdiObj);
case GDI_OBJECT_TYPE_PEN: case GDI_OBJECT_TYPE_PEN:
// case GDI_OBJECT_TYPE_EXTPEN: // case GDI_OBJECT_TYPE_EXTPEN:
#if 0 // enable this when support is ready in win32k
hOldObj = pDc_Attr->hpen;
pDc_Attr->ulDirty_ |= DC_PEN_DIRTY;
pDc_Attr->hpen = hGdiObj;
return hOldObj;
#endif
return NtGdiSelectPen(hDC, hGdiObj); return NtGdiSelectPen(hDC, hGdiObj);
case GDI_OBJECT_TYPE_FONT: case GDI_OBJECT_TYPE_FONT:
return NtGdiSelectFont(hDC, hGdiObj); #if 0
pTeb = NtCurrentTeb();
if (((pTeb->GdiTebBatch.HDC == 0) ||
(pTeb->GdiTebBatch.HDC == (ULONG)hDC)) &&
((pTeb->GdiTebBatch.Offset + sizeof(GDIBSOBJECT)) <= GDIBATCHBUFSIZE) &&
(!(pDc_Attr->ulDirty_ & DC_DIBSECTION)))
{
PGDIBSOBJECT pgO = (PGDIBSOBJECT)(&pTeb->GdiTebBatch.Buffer[0] +
pTeb->GdiTebBatch.Offset);
pgO->gbHdr.Cmd = GdiBCSelObj;
pgO->gbHdr.Size = sizeof(GDIBSOBJECT);
pgO->hgdiobj = hGdiObj;
pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT);
pTeb->GdiTebBatch.HDC = (ULONG)hDC;
pTeb->GdiBatchCount++;
if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush();
return pDc_Attr->hlfntNew;
}
#endif
// default for select object font
return NtGdiSelectFont(hDC, hGdiObj);
#if 0
case GDI_OBJECT_TYPE_METADC:
return MFDRV_SelectObject( hDC, hGdiObj);
case GDI_OBJECT_TYPE_EMF:
PLDC pLDC = GdiGetLDC(hDC);
if ( !pLDC ) return NULL;
return EMFDRV_SelectObject( hDC, hGdiObj);
#endif
case GDI_OBJECT_TYPE_COLORSPACE:
SetColorSpace(hDC, (HCOLORSPACE) hGdiObj);
return NULL;
case GDI_OBJECT_TYPE_PALETTE:
default:
SetLastError(ERROR_INVALID_FUNCTION);
return NULL;
} }
return NULL; return NULL;