mirror of
https://github.com/reactos/reactos.git
synced 2024-08-29 22:58:34 +00:00
Removed NtGdiGetObjectType, use GDI_HANDLE_GET_TYPE.
svn path=/trunk/; revision=26457
This commit is contained in:
parent
09a93d1379
commit
6a08b2af85
|
@ -640,9 +640,6 @@ NtGdiGetMetaRgn (
|
||||||
HRGN hrgn
|
HRGN hrgn
|
||||||
);
|
);
|
||||||
|
|
||||||
/* Should be done in user-mode using shared GDI Objects. */
|
|
||||||
DWORD STDCALL NtGdiGetObjectType(HGDIOBJ hGDIObj);
|
|
||||||
|
|
||||||
/* Use NtGdiGetOutlineTextMetricsInternalW. */
|
/* Use NtGdiGetOutlineTextMetricsInternalW. */
|
||||||
UINT
|
UINT
|
||||||
STDCALL
|
STDCALL
|
||||||
|
|
|
@ -1417,7 +1417,7 @@ UserDrawIconEx(
|
||||||
UserGetSystemMetrics(SM_CYICON) : IconSize.cy);
|
UserGetSystemMetrics(SM_CYICON) : IconSize.cy);
|
||||||
|
|
||||||
DoFlickerFree = (hbrFlickerFreeDraw &&
|
DoFlickerFree = (hbrFlickerFreeDraw &&
|
||||||
(NtGdiGetObjectType(hbrFlickerFreeDraw) == OBJ_BRUSH));
|
(GDI_HANDLE_GET_TYPE(hbrFlickerFreeDraw) == GDI_OBJECT_TYPE_BRUSH));
|
||||||
|
|
||||||
if(DoFlickerFree)
|
if(DoFlickerFree)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1874,71 +1874,6 @@ NtGdiExtGetObjectW(HANDLE handle, INT count, LPVOID buffer)
|
||||||
return Ret;
|
return Ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
DWORD STDCALL
|
|
||||||
NtGdiGetObjectType(HANDLE handle)
|
|
||||||
{
|
|
||||||
GDIOBJHDR * ptr;
|
|
||||||
INT result;
|
|
||||||
DWORD objectType;
|
|
||||||
|
|
||||||
ptr = GDIOBJ_LockObj(GdiHandleTable, handle, GDI_OBJECT_TYPE_DONTCARE);
|
|
||||||
if (ptr == 0)
|
|
||||||
{
|
|
||||||
SetLastWin32Error(ERROR_INVALID_HANDLE);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
objectType = GDIOBJ_GetObjectType(handle);
|
|
||||||
switch(objectType)
|
|
||||||
{
|
|
||||||
case GDI_OBJECT_TYPE_PEN:
|
|
||||||
result = OBJ_PEN;
|
|
||||||
break;
|
|
||||||
case GDI_OBJECT_TYPE_BRUSH:
|
|
||||||
result = OBJ_BRUSH;
|
|
||||||
break;
|
|
||||||
case GDI_OBJECT_TYPE_BITMAP:
|
|
||||||
result = OBJ_BITMAP;
|
|
||||||
break;
|
|
||||||
case GDI_OBJECT_TYPE_FONT:
|
|
||||||
result = OBJ_FONT;
|
|
||||||
break;
|
|
||||||
case GDI_OBJECT_TYPE_PALETTE:
|
|
||||||
result = OBJ_PAL;
|
|
||||||
break;
|
|
||||||
case GDI_OBJECT_TYPE_REGION:
|
|
||||||
result = OBJ_REGION;
|
|
||||||
break;
|
|
||||||
case GDI_OBJECT_TYPE_DC:
|
|
||||||
result = OBJ_DC;
|
|
||||||
break;
|
|
||||||
case GDI_OBJECT_TYPE_METADC:
|
|
||||||
result = OBJ_METADC;
|
|
||||||
break;
|
|
||||||
case GDI_OBJECT_TYPE_METAFILE:
|
|
||||||
result = OBJ_METAFILE;
|
|
||||||
break;
|
|
||||||
case GDI_OBJECT_TYPE_ENHMETAFILE:
|
|
||||||
result = OBJ_ENHMETAFILE;
|
|
||||||
break;
|
|
||||||
case GDI_OBJECT_TYPE_ENHMETADC:
|
|
||||||
result = OBJ_ENHMETADC;
|
|
||||||
break;
|
|
||||||
case GDI_OBJECT_TYPE_EXTPEN:
|
|
||||||
result = OBJ_EXTPEN;
|
|
||||||
break;
|
|
||||||
case GDI_OBJECT_TYPE_MEMDC:
|
|
||||||
result = OBJ_MEMDC;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
DPRINT1("Magic 0x%08x not implemented\n", objectType);
|
|
||||||
result = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
GDIOBJ_UnlockObjByPtr(GdiHandleTable, ptr);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
DC_GET_VAL( INT, NtGdiGetRelAbs, w.relAbsMode )
|
DC_GET_VAL( INT, NtGdiGetRelAbs, w.relAbsMode )
|
||||||
DC_GET_VAL( INT, NtGdiGetROP2, w.ROPmode )
|
DC_GET_VAL( INT, NtGdiGetROP2, w.ROPmode )
|
||||||
|
|
|
@ -137,7 +137,6 @@ NtGdiGetMetaRgn 2
|
||||||
NtGdiGetMiterLimit 2
|
NtGdiGetMiterLimit 2
|
||||||
NtGdiGetNearestColor 2
|
NtGdiGetNearestColor 2
|
||||||
NtGdiGetNearestPaletteIndex 2
|
NtGdiGetNearestPaletteIndex 2
|
||||||
NtGdiGetObjectType 1
|
|
||||||
NtGdiGetOutlineTextMetrics 3
|
NtGdiGetOutlineTextMetrics 3
|
||||||
NtGdiGetPaletteEntries 4
|
NtGdiGetPaletteEntries 4
|
||||||
NtGdiGetPath 4
|
NtGdiGetPath 4
|
||||||
|
|
Loading…
Reference in a new issue