From c500afd0fa0c77e6a44b3f77e9b4b31a36ea9c8d Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 1 Oct 2017 07:53:54 +0000
Subject: [PATCH] [GDI32] Remove obsolete function GdiIsHandleValid, which is
 just a copy of GdiValidateHandle

svn path=/trunk/; revision=76011
---
 reactos/win32ss/gdi/gdi32/include/gdi32p.h   |  3 ++-
 reactos/win32ss/gdi/gdi32/misc/misc.c        | 18 ------------------
 reactos/win32ss/gdi/gdi32/objects/bitmap.c   |  2 +-
 reactos/win32ss/gdi/gdi32/objects/dc.c       |  2 +-
 reactos/win32ss/gdi/gdi32/objects/gdiobj.c   |  8 ++++----
 reactos/win32ss/gdi/gdi32/objects/painting.c |  4 ++--
 reactos/win32ss/gdi/gdi32/objects/region.c   |  2 +-
 7 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/reactos/win32ss/gdi/gdi32/include/gdi32p.h b/reactos/win32ss/gdi/gdi32/include/gdi32p.h
index 12b9b3955ae..773192df76f 100644
--- a/reactos/win32ss/gdi/gdi32/include/gdi32p.h
+++ b/reactos/win32ss/gdi/gdi32/include/gdi32p.h
@@ -202,7 +202,8 @@ FASTCALL
 DeleteRegion( HRGN );
 
 BOOL
-GdiIsHandleValid(HGDIOBJ hGdiObj);
+WINAPI
+GdiValidateHandle(HGDIOBJ);
 
 BOOL
 GdiGetHandleUserData(
diff --git a/reactos/win32ss/gdi/gdi32/misc/misc.c b/reactos/win32ss/gdi/gdi32/misc/misc.c
index 50eac9c79c9..65287d0b1d2 100644
--- a/reactos/win32ss/gdi/gdi32/misc/misc.c
+++ b/reactos/win32ss/gdi/gdi32/misc/misc.c
@@ -745,24 +745,6 @@ GdiQueryTable(VOID)
     return (PVOID)GdiHandleTable;
 }
 
-BOOL GdiIsHandleValid(HGDIOBJ hGdiObj)
-{
-    PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj);
-// We are only looking for TYPE not the rest here, and why is FullUnique filled up with CRAP!?
-// DPRINT1("FullUnique -> %x\n", Entry->FullUnique);
-    if((Entry->Type & GDI_ENTRY_BASETYPE_MASK) != 0 &&
-            ( (Entry->Type << GDI_ENTRY_UPPER_SHIFT) & GDI_HANDLE_TYPE_MASK ) ==
-            GDI_HANDLE_GET_TYPE(hGdiObj))
-    {
-        HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1);
-        if(pid == NULL || pid == CurrentProcessId)
-        {
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
 BOOL GdiGetHandleUserData(HGDIOBJ hGdiObj, DWORD ObjectType, PVOID *UserData)
 {
     PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj);
diff --git a/reactos/win32ss/gdi/gdi32/objects/bitmap.c b/reactos/win32ss/gdi/gdi32/objects/bitmap.c
index 82768f8b338..050cc031032 100644
--- a/reactos/win32ss/gdi/gdi32/objects/bitmap.c
+++ b/reactos/win32ss/gdi/gdi32/objects/bitmap.c
@@ -363,7 +363,7 @@ GetDIBits(
     UINT cjBmpScanSize;
     UINT cjInfoSize;
 
-    if (!hDC || !GdiIsHandleValid((HGDIOBJ) hDC) || !lpbmi)
+    if (!hDC || !GdiValidateHandle((HGDIOBJ) hDC) || !lpbmi)
     {
         GdiSetLastError(ERROR_INVALID_PARAMETER);
         return 0;
diff --git a/reactos/win32ss/gdi/gdi32/objects/dc.c b/reactos/win32ss/gdi/gdi32/objects/dc.c
index 72760a019ee..f6d36ec1b79 100644
--- a/reactos/win32ss/gdi/gdi32/objects/dc.c
+++ b/reactos/win32ss/gdi/gdi32/objects/dc.c
@@ -1500,7 +1500,7 @@ SelectObject(
 {
     /* Fix up 16 bit handles */
     hobj = GdiFixUpHandle(hobj);
-    if (!GdiIsHandleValid(hobj))
+    if (!GdiValidateHandle(hobj))
     {
         return NULL;
     }
diff --git a/reactos/win32ss/gdi/gdi32/objects/gdiobj.c b/reactos/win32ss/gdi/gdi32/objects/gdiobj.c
index 55f04908245..ecd5d50f5e6 100644
--- a/reactos/win32ss/gdi/gdi32/objects/gdiobj.c
+++ b/reactos/win32ss/gdi/gdi32/objects/gdiobj.c
@@ -23,7 +23,7 @@ GetStockObject(
     {
         hobj = NtGdiGetStockObject(fnObject);
 
-        if (!GdiIsHandleValid(hobj))
+        if (!GdiValidateHandle(hobj))
         {
             return NULL;
         }
@@ -45,7 +45,7 @@ GetObjectType(
 {
     DWORD Ret = 0;
 
-    if (GdiIsHandleValid(h))
+    if (GdiValidateHandle(h))
     {
         LONG Type = GDI_HANDLE_GET_TYPE(h);
         switch(Type)
@@ -249,7 +249,7 @@ GetObjectW(
     /* Handle error */
     if (cbResult == 0)
     {
-        if (!GdiIsHandleValid(hGdiObj))
+        if (!GdiValidateHandle(hGdiObj))
         {
             if ((dwType == GDI_OBJECT_TYPE_PEN) ||
                 (dwType == GDI_OBJECT_TYPE_EXTPEN) ||
@@ -316,7 +316,7 @@ DeleteObject(HGDIOBJ hObject)
 {
     /* Check if the handle is valid (FIXME: we need some special
        sauce for the stock object flag) */
-    if (!GdiIsHandleValid(hObject))
+    if (!GdiValidateHandle(hObject))
         return FALSE;
 
     /* Check if this is a stock object */
diff --git a/reactos/win32ss/gdi/gdi32/objects/painting.c b/reactos/win32ss/gdi/gdi32/objects/painting.c
index 931241f1c4b..150040cc0d6 100644
--- a/reactos/win32ss/gdi/gdi32/objects/painting.c
+++ b/reactos/win32ss/gdi/gdi32/objects/painting.c
@@ -128,7 +128,7 @@ GetPixel(
     _In_ INT y)
 {
     if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) return CLR_INVALID;
-    if (!GdiIsHandleValid((HGDIOBJ) hdc)) return CLR_INVALID;
+    if (!GdiValidateHandle((HGDIOBJ) hdc)) return CLR_INVALID;
     return NtGdiGetPixel(hdc, x, y);
 }
 
@@ -479,7 +479,7 @@ PolyPatBlt(
     if ((GDI_HANDLE_GET_TYPE(hdc) == GDILoObjType_LO_METADC16_TYPE) ||
         (GDI_HANDLE_GET_TYPE(hdc) == GDILoObjType_LO_ALTDC_TYPE))
     {
-        if (!GdiIsHandleValid(hdc))
+        if (!GdiValidateHandle(hdc))
         {
             return FALSE;
         }
diff --git a/reactos/win32ss/gdi/gdi32/objects/region.c b/reactos/win32ss/gdi/gdi32/objects/region.c
index 9c7e9715243..128d4032675 100644
--- a/reactos/win32ss/gdi/gdi32/objects/region.c
+++ b/reactos/win32ss/gdi/gdi32/objects/region.c
@@ -186,7 +186,7 @@ MirrorRgnDC(
     _In_ HRGN hrgn,
     _In_ HRGN *phrn)
 {
-    if (!GdiIsHandleValid((HGDIOBJ) hdc) ||
+    if (!GdiValidateHandle((HGDIOBJ) hdc) ||
         (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC))
         return 0;