[ros-diffs] [tkreuzer] 48555: [WIN32K] - Remove IntEngExtEscape stub. This function is completely useless. If the driver doesn't provide a DrvEscape, the function should simply fail and must return 0, not -1. - If a NULL surface is passed, pass on NULL pso to the driver function See issue #4563 for more details.

Author: tkreuzer
Date: Mon Aug 16 01:29:13 2010
New Revision: 48555

URL: http://svn.reactos.org/svn/reactos?rev=48555&view=rev
Log:
[WIN32K]
- Remove IntEngExtEscape stub. This function is completely useless. If the driver
doesn't provide a DrvEscape, the function should simply fail and must return 0, not
-1.
- If a NULL surface is passed, pass on NULL pso to the driver function

See issue #4563 for more details.

Modified:
    trunk/reactos/subsystems/win32/win32k/objects/print.c

Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] Mon Aug 16 01:29:13
2010
@@ -89,23 +89,6 @@
 
 INT
 APIENTRY
-IntEngExtEscape(
-   SURFOBJ *Surface,
-   INT      Escape,
-   INT      InSize,
-   LPVOID   InData,
-   INT      OutSize,
-   LPVOID   OutData)
-{
-   if (Escape == QUERYESCSUPPORT)
-      return FALSE;
-
-   DPRINT1("IntEngExtEscape is unimplemented. - Keep going and have a nice
day\n");
-   return -1;
-}
-
-INT
-APIENTRY
 IntGdiExtEscape(
    PDC    dc,
    INT    Escape,
@@ -117,22 +100,14 @@
    SURFACE *psurf = dc->dclevel.pSurface;
    INT Result;
 
-   /* FIXME - Handle psurf == NULL !!!!!! */
-
-   if ( NULL == dc->ppdev->DriverFunctions.Escape )
-   {
-      Result = IntEngExtEscape(
-         &psurf->SurfObj,
-         Escape,
-         InSize,
-         (PVOID)((ULONG_PTR)InData),
-         OutSize,
-         (PVOID)OutData);
+   if (!dc->ppdev->DriverFunctions.Escape)
+   {
+      Result = 0;
    }
    else
    {
       Result = dc->ppdev->DriverFunctions.Escape(
-         &psurf->SurfObj,
+         psurf ? &psurf->SurfObj : NULL,
          Escape,
          InSize,
          (PVOID)InData,