From 6a08b2af8507dc9eef0436b8484dea850d4c14c1 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Sat, 21 Apr 2007 22:23:19 +0000
Subject: [PATCH] Removed NtGdiGetObjectType, use GDI_HANDLE_GET_TYPE.

svn path=/trunk/; revision=26457
---
 reactos/include/reactos/win32k/ntgdibad.h     |  3 -
 .../win32/win32k/ntuser/cursoricon.c          |  2 +-
 reactos/subsystems/win32/win32k/objects/dc.c  | 65 -------------------
 reactos/tools/nci/w32ksvc.db                  |  1 -
 4 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/reactos/include/reactos/win32k/ntgdibad.h b/reactos/include/reactos/win32k/ntgdibad.h
index de828c0f70e..40d4aeb35ab 100644
--- a/reactos/include/reactos/win32k/ntgdibad.h
+++ b/reactos/include/reactos/win32k/ntgdibad.h
@@ -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
diff --git a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
index d6975d7c2e4..a384fb9dedd 100644
--- a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
+++ b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
@@ -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)
    {
diff --git a/reactos/subsystems/win32/win32k/objects/dc.c b/reactos/subsystems/win32/win32k/objects/dc.c
index 63295e3cc9d..5747dd21dae 100644
--- a/reactos/subsystems/win32/win32k/objects/dc.c
+++ b/reactos/subsystems/win32/win32k/objects/dc.c
@@ -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 )
diff --git a/reactos/tools/nci/w32ksvc.db b/reactos/tools/nci/w32ksvc.db
index 48c961618a1..2b0452ab94a 100644
--- a/reactos/tools/nci/w32ksvc.db
+++ b/reactos/tools/nci/w32ksvc.db
@@ -137,7 +137,6 @@ NtGdiGetMetaRgn				2
 NtGdiGetMiterLimit			2
 NtGdiGetNearestColor			2
 NtGdiGetNearestPaletteIndex		2
-NtGdiGetObjectType			1
 NtGdiGetOutlineTextMetrics		3
 NtGdiGetPaletteEntries			4
 NtGdiGetPath				4