Remove NtGdiDeleteDC Modified: trunk/reactos/include/win32k/ntgdibad.h Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/lib/gdi32/misc/gdientry.c Modified: trunk/reactos/subsys/system/usetup/bootsup.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/metric.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/dib.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____
Modified: trunk/reactos/include/win32k/ntgdibad.h --- trunk/reactos/include/win32k/ntgdibad.h 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/include/win32k/ntgdibad.h 2006-01-07 01:06:48 UTC (rev 20635) @@ -348,9 +348,6 @@
int Count );
-/* Use NtGdiDeleteObjectApp. */ -BOOL STDCALL NtGdiDeleteDC(HDC hDC); - /* Meta are user-mode. */ BOOL STDCALL _____
Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/lib/gdi32/gdi32.def 2006-01-07 01:06:48 UTC (rev 20635) @@ -91,7 +91,7 @@
CreateSolidBrush@4 DPtoLP@12=NtGdiDPtoLP@12 DeleteColorSpace@4 -DeleteDC@4=NtGdiDeleteDC@4 +DeleteDC@4=NtGdiDeleteObjectApp@4 DeleteEnhMetaFile@4 DeleteMetaFile@4 DeleteObject@4 _____
Modified: trunk/reactos/lib/gdi32/misc/gdientry.c --- trunk/reactos/lib/gdi32/misc/gdientry.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/lib/gdi32/misc/gdientry.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -83,7 +83,7 @@
if ((ULONG_PTR)newHdc != pDirectDrawGlobalInternal->hDD) { pDirectDrawGlobalInternal->hDD = (ULONG_PTR) NtGdiDdCreateDirectDrawObject(newHdc); - NtGdiDeleteDC(newHdc); + NtGdiDeleteObjectApp(newHdc); }
/* pDirectDrawGlobal->hDD = pDirectDrawGlobalInternal->hDD; ? */ _____
Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -245,7 +245,7 @@
NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=SCREEN /NOGUIBOOT"); + L"/DEBUGPORT=COM1 /NOGUIBOOT");
/* Create "DOS" section */ IniSection = IniCacheAppendSection(IniCache, @@ -356,7 +356,7 @@ NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=SCREEN /NOGUIBOOT"); + L"/DEBUGPORT=COM1 /NOGUIBOOT");
/* Save the ini file */ IniCacheSave(IniCache, IniPath); _____
Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -1312,7 +1312,7 @@
} if (NULL == BitmapStretched) { - NtGdiDeleteDC(DcStretched); + NtGdiDeleteObjectApp(DcStretched); DPRINT1("Failed to create temporary bitmap\n"); return; } @@ -1320,7 +1320,7 @@ if (NULL == OldBitmap) { NtGdiDeleteObject(BitmapStretched); - NtGdiDeleteDC(DcStretched); + NtGdiDeleteObjectApp(DcStretched); DPRINT1("Failed to create temporary bitmap\n"); return; } @@ -1334,7 +1334,7 @@ } NtGdiSelectObject(DcStretched, OldBitmap); NtGdiDeleteObject(BitmapStretched); - NtGdiDeleteDC(DcStretched); + NtGdiDeleteObjectApp(DcStretched); } } #else @@ -1439,7 +1439,7 @@ hbmOff = NtGdiCreateCompatibleBitmap(hdc, cxWidth, cyHeight); if(!hbmOff) { - NtGdiDeleteDC(hdcOff); + NtGdiDeleteObjectApp(hdcOff); goto done; } hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw); @@ -1511,10 +1511,10 @@ NtGdiSelectObject(hdcOff, hOldOffBmp); NtGdiSelectObject(hdcOff, hOldOffBrush); NtGdiDeleteObject(hbmOff); - NtGdiDeleteDC(hdcOff); + NtGdiDeleteObjectApp(hdcOff); } if(hdcMem) - NtGdiDeleteDC(hdcMem); + NtGdiDeleteObjectApp(hdcMem);
done: ObDereferenceObject(WinSta); _____
Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -1320,7 +1320,7 @@
0); } NtGdiSelectObject(hWallpaperDC, hOldBitmap); - NtGdiDeleteDC(hWallpaperDC); + NtGdiDeleteObjectApp(hWallpaperDC); } } } _____
Modified: trunk/reactos/subsys/win32k/ntuser/metric.c --- trunk/reactos/subsys/win32k/ntuser/metric.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/metric.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -171,7 +171,7 @@
Height = ScreenDC->GDIInfo->ulVertRes; DC_UnlockDc(ScreenDC); } - NtGdiDeleteDC(ScreenDCHandle); + NtGdiDeleteObjectApp(ScreenDCHandle); } return SM_CXSCREEN == Index ? Width : Height; } _____
Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -647,7 +647,7 @@
DC_SetOwnership(dce->hDC, PsGetCurrentProcess()); }
- NtGdiDeleteDC(dce->hDC); + NtGdiDeleteObjectApp(dce->hDC); if (dce->hClipRgn && ! (dce->DCXFlags & DCX_KEEPCLIPRGN)) { NtGdiDeleteObject(dce->hClipRgn); _____
Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -371,7 +371,7 @@
if (NULL != ScreenDeviceContext) { DC_SetOwnership(ScreenDeviceContext, PsGetCurrentProcess()); - NtGdiDeleteDC(ScreenDeviceContext); + NtGdiDeleteObjectApp(ScreenDeviceContext); ScreenDeviceContext = NULL; } IntHideDesktop(IntGetActiveDesktop()); _____
Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -729,7 +729,7 @@
} NtGdiDeleteObject ( hBmpTmp ); } - NtGdiDeleteDC ( hDCTmp ); + NtGdiDeleteObjectApp ( hDCTmp ); } }
@@ -941,9 +941,9 @@ NtGdiDeleteObject(hBitmap2); NtGdiDeleteObject(hBitmap3);
- NtGdiDeleteDC(hDC1); - NtGdiDeleteDC(hDC2); - NtGdiDeleteDC(hDCMask); + NtGdiDeleteObjectApp(hDC1); + NtGdiDeleteObjectApp(hDC2); + NtGdiDeleteObjectApp(hDCMask);
return TRUE; } _____
Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/objects/dc.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -165,7 +165,7 @@
{ if (NULL != DisplayDC) { - NtGdiDeleteDC(DisplayDC); + NtGdiDeleteObjectApp(DisplayDC); } return NULL; } @@ -176,7 +176,7 @@ DC_UnlockDc(OrigDC); if (NULL != DisplayDC) { - NtGdiDeleteDC(DisplayDC); + NtGdiDeleteObjectApp(DisplayDC); } return NULL; } @@ -213,7 +213,7 @@ DC_FreeDC( hNewDC ); if (NULL != DisplayDC) { - NtGdiDeleteDC(DisplayDC); + NtGdiDeleteObjectApp(DisplayDC); } return NULL; } @@ -233,7 +233,7 @@ DC_UnlockDc(OrigDC); if (NULL != DisplayDC) { - NtGdiDeleteDC(DisplayDC); + NtGdiDeleteObjectApp(DisplayDC); }
hVisRgn = NtGdiCreateRectRgn(0, 0, 1, 1); @@ -1060,7 +1060,7 @@ }
BOOL STDCALL -NtGdiDeleteDC(HDC DCHandle) +NtGdiDeleteObjectApp(HANDLE DCHandle) { PDC DCToDelete;
@@ -1092,7 +1092,7 @@ 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 @@ { DC_UnlockDc( dcs ); } - NtGdiDeleteDC (hdcs); + NtGdiDeleteObjectApp (hdcs); } DC_UnlockDc( dc ); return success; @@ -2034,7 +2034,7 @@ */ if (!PATH_AssignGdiPath (&dcs->w.path, &dc->w.path)) { - NtGdiDeleteDC (hdcs); + NtGdiDeleteObjectApp (hdcs); return 0; } #endif _____
Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/objects/dib.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -579,7 +579,7 @@
SrcWidth, SrcHeight, ROP, 0);
NtGdiSelectObject(hdcMem, hOldBitmap); - NtGdiDeleteDC(hdcMem); + NtGdiDeleteObjectApp(hdcMem); NtGdiDeleteObject(hBitmap);
return SrcHeight; @@ -799,7 +799,7 @@ }
if (bDesktopDC) - NtGdiDeleteDC(hDC); + NtGdiDeleteObjectApp(hDC);
return hbitmap; } _____
Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/tools/nci/w32ksvc.db 2006-01-07 01:06:48 UTC (rev 20635) @@ -52,7 +52,7 @@
NtGdiCreateSolidBrush 2 NtGdiDPtoLP 3 NtGdiDeleteColorSpace 1 -NtGdiDeleteDC 1 +NtGdiDeleteObjectApp 1 NtGdiDeleteEnhMetaFile 1 NtGdiDeleteMetaFile 1 NtGdiDeleteObject 1