Author: jimtabor
Date: Fri Jun 30 00:33:41 2017
New Revision: 75243
URL:
http://svn.reactos.org/svn/reactos?rev=75243&view=rev
Log:
[NtGDI]
- Remove DC information checking for non-BLT functions. WIP and part of CORE-12888.
Modified:
trunk/reactos/win32ss/gdi/ntgdi/arc.c
trunk/reactos/win32ss/gdi/ntgdi/fillshap.c
trunk/reactos/win32ss/gdi/ntgdi/freetype.c
trunk/reactos/win32ss/gdi/ntgdi/line.c
trunk/reactos/win32ss/gdi/ntgdi/print.c
Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/arc.c?re…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] Fri Jun 30 00:33:41 2017
@@ -318,12 +318,6 @@
EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
- if (pDC->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(pDC);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
- }
status = KeSaveFloatingPointState(&FloatSave);
if (!NT_SUCCESS(status))
@@ -373,12 +367,6 @@
EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
- if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
- }
if (arctype > GdiTypePie)
{
DC_UnlockDc(dc);
Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Fri Jun 30 00:33:41 2017
@@ -220,12 +220,6 @@
EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
- if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
- }
if (PATH_IsPathOpen(dc->dclevel))
{
@@ -491,14 +485,6 @@
EngSetLastError(ERROR_INVALID_HANDLE);
ExFreePoolWithTag(pTemp, TAG_SHAPE);
return FALSE;
- }
-
- if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- ExFreePoolWithTag(pTemp, TAG_SHAPE);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
}
DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL);
@@ -698,12 +684,6 @@
EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
- if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
- }
/* Do we rotate or shear? */
if (!(dc->pdcattr->mxWorldToDevice.flAccel & XFORM_SCALE))
@@ -877,12 +857,6 @@
DPRINT1("NtGdiRoundRect() - hDC is invalid\n");
EngSetLastError(ERROR_INVALID_HANDLE);
}
- else if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- /* Yes, Windows really returns TRUE in this case */
- ret = TRUE;
- }
else
{
ret = IntRoundRect ( dc, LeftRect, TopRect, RightRect, BottomRect, Width, Height
);
@@ -945,13 +919,6 @@
{
EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE;
- }
-
- if(pdc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(pdc);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
}
if (!pdc->dclevel.pSurface)
@@ -1115,12 +1082,6 @@
EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
- if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
- }
if (!dc->dclevel.pSurface)
{
Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri Jun 30 00:33:41 2017
@@ -5116,12 +5116,6 @@
EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
- if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
- }
pdcattr = dc->pdcattr;
Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Fri Jun 30 00:33:41 2017
@@ -439,12 +439,6 @@
{
EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE;
- }
- if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
}
rcLockRect.left = dc->pdcattr->ptlCurrent.x;
Modified: trunk/reactos/win32ss/gdi/ntgdi/print.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/print.c?…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/print.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/print.c [iso-8859-1] Fri Jun 30 00:33:41 2017
@@ -141,11 +141,6 @@
EngSetLastError(ERROR_INVALID_HANDLE);
return -1;
}
- if ( pDC->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(pDC);
- return 0;
- }
if ( InSize && UnsafeInData )
{