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

Removed NtGdiGetObjectType, use GDI_HANDLE_GET_TYPE.

Browse source 
svn path=/trunk/; revision=26457
This commit is contained in:
James Tabor 2007-04-21 22:23:19 +00:00
parent 09a93d1379
commit 6a08b2af85
4 changed files with 1 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/include/reactos/win32k/ntgdibad.h
View file

@ -640,9 +640,6 @@ NtGdiGetMetaRgn (
HRGN hrgn
);
/* Should be done in user-mode using shared GDI Objects. */
DWORD STDCALL NtGdiGetObjectType(HGDIOBJ hGDIObj);
/* Use NtGdiGetOutlineTextMetricsInternalW. */
UINT
STDCALL

2
reactos/subsystems/win32/win32k/ntuser/cursoricon.c
View file

@ -1417,7 +1417,7 @@ UserDrawIconEx(
UserGetSystemMetrics(SM_CYICON) : IconSize.cy);
DoFlickerFree = (hbrFlickerFreeDraw &&
(NtGdiGetObjectType(hbrFlickerFreeDraw) == OBJ_BRUSH));
(GDI_HANDLE_GET_TYPE(hbrFlickerFreeDraw) == GDI_OBJECT_TYPE_BRUSH));
if(DoFlickerFree)
{

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

@ -1874,71 +1874,6 @@ NtGdiExtGetObjectW(HANDLE handle, INT count, LPVOID buffer)
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, NtGdiGetROP2, w.ROPmode )

1
reactos/tools/nci/w32ksvc.db
View file

@ -137,7 +137,6 @@ NtGdiGetMetaRgn 2
NtGdiGetMiterLimit 2
NtGdiGetNearestColor 2
NtGdiGetNearestPaletteIndex 2
NtGdiGetObjectType 1
NtGdiGetOutlineTextMetrics 3
NtGdiGetPaletteEntries 4
NtGdiGetPath 4