[NtGDI]

- Remove DC information checking for non-BLT functions. WIP and part of CORE-12888.

svn path=/trunk/; revision=75243

diff --git a/reactos/win32ss/gdi/ntgdi/arc.c b/reactos/win32ss/gdi/ntgdi/arc.c
index cb35adc..0170263 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/arc.c
+++ b/reactos/win32ss/gdi/ntgdi/arc.c
@@ -318,12 +318,6 @@ NtGdiAngleArc(
     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 @@ NtGdiArcInternal(
     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);

diff --git a/reactos/win32ss/gdi/ntgdi/fillshap.c b/reactos/win32ss/gdi/ntgdi/fillshap.c
index 5c00347..15d743a 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/fillshap.c
+++ b/reactos/win32ss/gdi/ntgdi/fillshap.c
@@ -220,12 +220,6 @@ NtGdiEllipse(
        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))
     {
@@ -493,14 +487,6 @@ NtGdiPolyPolyDraw( IN HDC hDC,
         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);
 
     if (dc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
@@ -698,12 +684,6 @@ NtGdiRectangle(HDC  hDC,
         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 @@ NtGdiRoundRect(
         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 );
@@ -947,13 +921,6 @@ GreGradientFill(
         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)
     {
         /* Memory DC with no surface selected */
@@ -1115,12 +1082,6 @@ NtGdiExtFloodFill(
         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)
     {

diff --git a/reactos/win32ss/gdi/ntgdi/freetype.c b/reactos/win32ss/gdi/ntgdi/freetype.c
index 5fd51cd..87227c0 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/freetype.c
+++ b/reactos/win32ss/gdi/ntgdi/freetype.c
@@ -5116,12 +5116,6 @@ GreExtTextOutW(
         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;
 

diff --git a/reactos/win32ss/gdi/ntgdi/line.c b/reactos/win32ss/gdi/ntgdi/line.c
index ce642d8..ce9b3bd 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/line.c
+++ b/reactos/win32ss/gdi/ntgdi/line.c
@@ -440,12 +440,6 @@ NtGdiLineTo(HDC  hDC,
         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;
     rcLockRect.top = dc->pdcattr->ptlCurrent.y;

diff --git a/reactos/win32ss/gdi/ntgdi/print.c b/reactos/win32ss/gdi/ntgdi/print.c
index f322602..5139eaa 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/print.c
+++ b/reactos/win32ss/gdi/ntgdi/print.c
@@ -141,11 +141,6 @@ NtGdiExtEscape(
       EngSetLastError(ERROR_INVALID_HANDLE);
       return -1;
    }
-   if ( pDC->dctype == DC_TYPE_INFO)
-   {
-      DC_UnlockDc(pDC);
-      return 0;
-   }
 
    if ( InSize && UnsafeInData )
    {