From: Brandon Turner <turnerb7@msu.edu>
Date: Sat, 7 Jan 2006 01:06:48 +0000 (+0000)
Subject: Remove NtGdiDeleteDC
X-Git-Tag: backups/expat-rbuild@40467~520
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=1b52cd809d58f0b139842d371927e24610c8590c

Remove NtGdiDeleteDC

svn path=/trunk/; revision=20635
---

diff --git a/reactos/include/win32k/ntgdibad.h b/reactos/include/win32k/ntgdibad.h
index bfb29415e69..edc23be94b5 100644
--- a/reactos/include/win32k/ntgdibad.h
+++ b/reactos/include/win32k/ntgdibad.h
@@ -348,9 +348,6 @@ NtGdiDPtoLP (
 	int	Count
 	);
 
-/* Use NtGdiDeleteObjectApp. */
-BOOL STDCALL  NtGdiDeleteDC(HDC  hDC);
-
 /* Meta are user-mode. */
 BOOL
 STDCALL
diff --git a/reactos/lib/gdi32/gdi32.def b/reactos/lib/gdi32/gdi32.def
index 195e6e393f3..bf6d97d9923 100644
--- a/reactos/lib/gdi32/gdi32.def
+++ b/reactos/lib/gdi32/gdi32.def
@@ -91,7 +91,7 @@ CreateScalableFontResourceW@16
 CreateSolidBrush@4
 DPtoLP@12=NtGdiDPtoLP@12
 DeleteColorSpace@4
-DeleteDC@4=NtGdiDeleteDC@4
+DeleteDC@4=NtGdiDeleteObjectApp@4
 DeleteEnhMetaFile@4
 DeleteMetaFile@4
 DeleteObject@4
diff --git a/reactos/lib/gdi32/misc/gdientry.c b/reactos/lib/gdi32/misc/gdientry.c
index 78c75b84a74..1a2400587d4 100644
--- a/reactos/lib/gdi32/misc/gdientry.c
+++ b/reactos/lib/gdi32/misc/gdientry.c
@@ -83,7 +83,7 @@ DdCreateDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal,
   if ((ULONG_PTR)newHdc != pDirectDrawGlobalInternal->hDD)
   {
     pDirectDrawGlobalInternal->hDD = (ULONG_PTR) NtGdiDdCreateDirectDrawObject(newHdc);
-    NtGdiDeleteDC(newHdc);
+    NtGdiDeleteObjectApp(newHdc);
   }
 
    /* pDirectDrawGlobal->hDD = pDirectDrawGlobalInternal->hDD; ? */
diff --git a/reactos/subsys/system/usetup/bootsup.c b/reactos/subsys/system/usetup/bootsup.c
index 22ce2164c57..fa739fc22c7 100644
--- a/reactos/subsys/system/usetup/bootsup.c
+++ b/reactos/subsys/system/usetup/bootsup.c
@@ -245,7 +245,7 @@ CreateFreeLoaderIniForDos(PWCHAR IniPath,
 		    NULL,
 		    INSERT_LAST,
 		    L"Options",
-		    L"/DEBUGPORT=SCREEN /NOGUIBOOT");
+		    L"/DEBUGPORT=COM1 /NOGUIBOOT");
 
   /* Create "DOS" section */
   IniSection = IniCacheAppendSection(IniCache,
@@ -356,7 +356,7 @@ CreateFreeLoaderIniForReactos(PWCHAR IniPath,
 		    NULL,
 		    INSERT_LAST,
 		    L"Options",
-		    L"/DEBUGPORT=SCREEN /NOGUIBOOT");
+		    L"/DEBUGPORT=COM1 /NOGUIBOOT");
 
   /* Save the ini file */
   IniCacheSave(IniCache, IniPath);
diff --git a/reactos/subsys/win32k/ntuser/cursoricon.c b/reactos/subsys/win32k/ntuser/cursoricon.c
index f061296be05..475510d9273 100644
--- a/reactos/subsys/win32k/ntuser/cursoricon.c
+++ b/reactos/subsys/win32k/ntuser/cursoricon.c
@@ -1312,7 +1312,7 @@ DoStretchBlt(HDC DcDest, int XDest, int YDest, int WidthDest, int HeightDest,
       }
       if (NULL == BitmapStretched)
       {
-         NtGdiDeleteDC(DcStretched);
+         NtGdiDeleteObjectApp(DcStretched);
          DPRINT1("Failed to create temporary bitmap\n");
          return;
       }
@@ -1320,7 +1320,7 @@ DoStretchBlt(HDC DcDest, int XDest, int YDest, int WidthDest, int HeightDest,
       if (NULL == OldBitmap)
       {
          NtGdiDeleteObject(BitmapStretched);
-         NtGdiDeleteDC(DcStretched);
+         NtGdiDeleteObjectApp(DcStretched);
          DPRINT1("Failed to create temporary bitmap\n");
          return;
       }
@@ -1334,7 +1334,7 @@ DoStretchBlt(HDC DcDest, int XDest, int YDest, int WidthDest, int HeightDest,
       }
       NtGdiSelectObject(DcStretched, OldBitmap);
       NtGdiDeleteObject(BitmapStretched);
-      NtGdiDeleteDC(DcStretched);
+      NtGdiDeleteObjectApp(DcStretched);
    }
 }
 #else
@@ -1439,7 +1439,7 @@ NtUserDrawIconEx(
       hbmOff = NtGdiCreateCompatibleBitmap(hdc, cxWidth, cyHeight);
       if(!hbmOff)
       {
-         NtGdiDeleteDC(hdcOff);
+         NtGdiDeleteObjectApp(hdcOff);
          goto done;
       }
       hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw);
@@ -1511,10 +1511,10 @@ cleanup:
       NtGdiSelectObject(hdcOff, hOldOffBmp);
       NtGdiSelectObject(hdcOff, hOldOffBrush);
       NtGdiDeleteObject(hbmOff);
-      NtGdiDeleteDC(hdcOff);
+      NtGdiDeleteObjectApp(hdcOff);
    }
    if(hdcMem)
-      NtGdiDeleteDC(hdcMem);
+      NtGdiDeleteObjectApp(hdcMem);
 
 done:
    ObDereferenceObject(WinSta);
diff --git a/reactos/subsys/win32k/ntuser/desktop.c b/reactos/subsys/win32k/ntuser/desktop.c
index fd993c21d64..b7449711e79 100644
--- a/reactos/subsys/win32k/ntuser/desktop.c
+++ b/reactos/subsys/win32k/ntuser/desktop.c
@@ -1320,7 +1320,7 @@ NtUserPaintDesktop(HDC hDC)
                             0);
             } 
             NtGdiSelectObject(hWallpaperDC, hOldBitmap); 
-            NtGdiDeleteDC(hWallpaperDC);
+            NtGdiDeleteObjectApp(hWallpaperDC);
          }
       }
    }
diff --git a/reactos/subsys/win32k/ntuser/metric.c b/reactos/subsys/win32k/ntuser/metric.c
index 8e28af6f7b3..9e9d3da8650 100644
--- a/reactos/subsys/win32k/ntuser/metric.c
+++ b/reactos/subsys/win32k/ntuser/metric.c
@@ -171,7 +171,7 @@ UserGetSystemMetrics(ULONG Index)
                   Height = ScreenDC->GDIInfo->ulVertRes;
                   DC_UnlockDc(ScreenDC);
                }
-               NtGdiDeleteDC(ScreenDCHandle);
+               NtGdiDeleteObjectApp(ScreenDCHandle);
             }
             return SM_CXSCREEN == Index ? Width : Height;
          }
diff --git a/reactos/subsys/win32k/ntuser/windc.c b/reactos/subsys/win32k/ntuser/windc.c
index e7500f7434a..7d37f0ed384 100644
--- a/reactos/subsys/win32k/ntuser/windc.c
+++ b/reactos/subsys/win32k/ntuser/windc.c
@@ -647,7 +647,7 @@ DceFreeDCE(PDCE dce, BOOLEAN Force)
       DC_SetOwnership(dce->hDC, PsGetCurrentProcess());
    }
 
-   NtGdiDeleteDC(dce->hDC);
+   NtGdiDeleteObjectApp(dce->hDC);
    if (dce->hClipRgn && ! (dce->DCXFlags & DCX_KEEPCLIPRGN))
    {
       NtGdiDeleteObject(dce->hClipRgn);
diff --git a/reactos/subsys/win32k/ntuser/winsta.c b/reactos/subsys/win32k/ntuser/winsta.c
index 6f61932cd20..f258f0308bc 100644
--- a/reactos/subsys/win32k/ntuser/winsta.c
+++ b/reactos/subsys/win32k/ntuser/winsta.c
@@ -371,7 +371,7 @@ IntEndDesktopGraphics(VOID)
    if (NULL != ScreenDeviceContext)
    {
       DC_SetOwnership(ScreenDeviceContext, PsGetCurrentProcess());
-      NtGdiDeleteDC(ScreenDeviceContext);
+      NtGdiDeleteObjectApp(ScreenDeviceContext);
       ScreenDeviceContext = NULL;
    }
    IntHideDesktop(IntGetActiveDesktop());
diff --git a/reactos/subsys/win32k/objects/bitmaps.c b/reactos/subsys/win32k/objects/bitmaps.c
index 1800c5f5939..78441a48aa6 100644
--- a/reactos/subsys/win32k/objects/bitmaps.c
+++ b/reactos/subsys/win32k/objects/bitmaps.c
@@ -729,7 +729,7 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
 				}
 				NtGdiDeleteObject ( hBmpTmp );
 			}
-			NtGdiDeleteDC ( hDCTmp );
+			NtGdiDeleteObjectApp ( hDCTmp );
 		}
 	}
 
@@ -941,9 +941,9 @@ NtGdiMaskBlt (
 	NtGdiDeleteObject(hBitmap2);
 	NtGdiDeleteObject(hBitmap3);
 
-	NtGdiDeleteDC(hDC1);
-	NtGdiDeleteDC(hDC2);
-	NtGdiDeleteDC(hDCMask);
+	NtGdiDeleteObjectApp(hDC1);
+	NtGdiDeleteObjectApp(hDC2);
+	NtGdiDeleteObjectApp(hDCMask);
 
 	return TRUE;
 }
diff --git a/reactos/subsys/win32k/objects/dc.c b/reactos/subsys/win32k/objects/dc.c
index 6dd08f62d8d..639fb37ff83 100644
--- a/reactos/subsys/win32k/objects/dc.c
+++ b/reactos/subsys/win32k/objects/dc.c
@@ -165,7 +165,7 @@ NtGdiCreateCompatibleDC(HDC hDC)
     {
       if (NULL != DisplayDC)
         {
-          NtGdiDeleteDC(DisplayDC);
+          NtGdiDeleteObjectApp(DisplayDC);
         }
       return NULL;
     }
@@ -176,7 +176,7 @@ NtGdiCreateCompatibleDC(HDC hDC)
       DC_UnlockDc(OrigDC);
       if (NULL != DisplayDC)
         {
-          NtGdiDeleteDC(DisplayDC);
+          NtGdiDeleteObjectApp(DisplayDC);
         }
       return  NULL;
     }
@@ -213,7 +213,7 @@ NtGdiCreateCompatibleDC(HDC hDC)
       DC_FreeDC( hNewDC );
       if (NULL != DisplayDC)
         {
-          NtGdiDeleteDC(DisplayDC);
+          NtGdiDeleteObjectApp(DisplayDC);
         }
       return NULL;
     }
@@ -233,7 +233,7 @@ NtGdiCreateCompatibleDC(HDC hDC)
   DC_UnlockDc(OrigDC);
   if (NULL != DisplayDC)
     {
-      NtGdiDeleteDC(DisplayDC);
+      NtGdiDeleteObjectApp(DisplayDC);
     }
 
   hVisRgn = NtGdiCreateRectRgn(0, 0, 1, 1);
@@ -1060,7 +1060,7 @@ NtGdiCreateIC(PUNICODE_STRING Driver,
 }
 
 BOOL STDCALL
-NtGdiDeleteDC(HDC  DCHandle)
+NtGdiDeleteObjectApp(HANDLE  DCHandle)
 {
   PDC  DCToDelete;
 
@@ -1092,7 +1092,7 @@ NtGdiDeleteDC(HDC  DCHandle)
     DC_SetNextDC (DCToDelete, DC_GetNextDC (savedDC));
     DCToDelete->saveLevel--;
     DC_UnlockDc( savedDC );
-    NtGdiDeleteDC (savedHDC);
+    NtGdiDeleteObjectApp (savedHDC);
   }
 
   /*  Free GDI resources allocated to this DC  */
@@ -1991,7 +1991,7 @@ NtGdiRestoreDC(HDC  hDC, INT  SaveLevel)
       {
       DC_UnlockDc( dcs );
       }
-    NtGdiDeleteDC (hdcs);
+    NtGdiDeleteObjectApp (hdcs);
   }
   DC_UnlockDc( dc );
   return  success;
@@ -2034,7 +2034,7 @@ NtGdiSaveDC(HDC  hDC)
      */
   if (!PATH_AssignGdiPath (&dcs->w.path, &dc->w.path))
   {
-    NtGdiDeleteDC (hdcs);
+    NtGdiDeleteObjectApp (hdcs);
     return 0;
   }
 #endif
diff --git a/reactos/subsys/win32k/objects/dib.c b/reactos/subsys/win32k/objects/dib.c
index 4f1947189a4..77959e6bab6 100644
--- a/reactos/subsys/win32k/objects/dib.c
+++ b/reactos/subsys/win32k/objects/dib.c
@@ -579,7 +579,7 @@ INT STDCALL NtGdiStretchDIBits(HDC  hDC,
                       SrcWidth, SrcHeight, ROP, 0);
 
    NtGdiSelectObject(hdcMem, hOldBitmap);
-   NtGdiDeleteDC(hdcMem);
+   NtGdiDeleteObjectApp(hdcMem);
    NtGdiDeleteObject(hBitmap);
 
    return SrcHeight;
@@ -799,7 +799,7 @@ HBITMAP STDCALL NtGdiCreateDIBSection(HDC hDC,
   }
 
   if (bDesktopDC)
-    NtGdiDeleteDC(hDC);
+    NtGdiDeleteObjectApp(hDC);
 
   return hbitmap;
 }
diff --git a/reactos/tools/nci/w32ksvc.db b/reactos/tools/nci/w32ksvc.db
index 06b1be2caaa..25fd8712ba9 100644
--- a/reactos/tools/nci/w32ksvc.db
+++ b/reactos/tools/nci/w32ksvc.db
@@ -52,7 +52,7 @@ NtGdiCreateScalableFontResource		4
 NtGdiCreateSolidBrush			2
 NtGdiDPtoLP				3
 NtGdiDeleteColorSpace			1
-NtGdiDeleteDC				1
+NtGdiDeleteObjectApp			1
 NtGdiDeleteEnhMetaFile			1
 NtGdiDeleteMetaFile			1
 NtGdiDeleteObject			1