[ros-diffs] [jimtabor] 28733: - Removed NtGdiPoly/Bezier/To and lineTo/Polyline/line. Updated w32ksvc.db and ntgdibad.h. - Update gdi32.def.

Author: jimtabor
Date: Sat Sep  1 08:23:08 2007
New Revision: 28733

URL: http://svn.reactos.org/svn/reactos?rev=28733&view=rev
Log:
- Removed NtGdiPoly/Bezier/To and lineTo/Polyline/line. Updated w32ksvc.db and
ntgdibad.h.
- Update gdi32.def.

Modified:
    trunk/reactos/dll/win32/gdi32/gdi32.def
    trunk/reactos/include/reactos/win32k/ntgdibad.h
    trunk/reactos/subsystems/win32/win32k/objects/line.c
    trunk/reactos/subsystems/win32/win32k/w32ksvc.db

Modified: trunk/reactos/dll/win32/gdi32/gdi32.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.def (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Sep  1 08:23:08 2007
@@ -492,16 +492,16 @@
 PlayMetaFile@8
 PlayMetaFileRecord@16
 PlgBlt@40
-PolyBezier@12=NtGdiPolyBezier@12
-PolyBezierTo@12=NtGdiPolyBezierTo@12
-PolyDraw@16=NtGdiPolyDraw@16
+PolyBezier@12
+PolyBezierTo@12
+PolyDraw@16
 PolyPolygon@16
-PolyPolyline@16=NtGdiPolyPolyline@16
+PolyPolyline@16
 PolyTextOutA@12
 PolyTextOutW@12
 Polygon@12
-Polyline@12=NtGdiPolyline@12
-PolylineTo@12=NtGdiPolylineTo@12
+Polyline@12
+PolylineTo@12
 PtInRegion@12=NtGdiPtInRegion@12
 PtVisible@12=NtGdiPtVisible@12
 QueryFontAssocStatus@0

Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdibad.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdibad.h Sat Sep  1 08:23:08 2007
@@ -447,42 +447,6 @@
 	UINT			Handles
 	);
 
-/* Use NtGdiPolyPolyDraw with GdiPolyBezier. */
-BOOL
-STDCALL
-NtGdiPolyBezier(HDC  hDC,
-                     CONST LPPOINT  pt,
-                     DWORD  Count);
-
-/* Use NtGdiPolyPolyDraw with GdiPolyBezierTo. */
-BOOL
-STDCALL
-NtGdiPolyBezierTo(HDC  hDC,
-                       CONST LPPOINT  pt,
-                       DWORD  Count);
-
-/* Use NtGdiPolyPolyDraw with GdiPolyPolyLine. */
-BOOL
-STDCALL
-NtGdiPolyline(HDC  hDC,
-                   CONST LPPOINT  pt,
-                   int  Count);
-
-/* Use NtGdiPolyPolyDraw with GdiPolyLineTo. */
-BOOL
-STDCALL
-NtGdiPolylineTo(HDC  hDC,
-                     CONST LPPOINT  pt,
-                     DWORD  Count);
-
-/* Use NtGdiPolyPolyDraw with GdiPolyPolyLine. */
-BOOL
-STDCALL
-NtGdiPolyPolyline(HDC  hDC,
-                       CONST LPPOINT  pt,
-                       CONST LPDWORD  PolyPoints,
-                       DWORD  Count);
-
 /* Use NtGdiPolyTextOutW with 0 at the end. */
 BOOL
 STDCALL

Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/line.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/line.c Sat Sep  1 08:23:08 2007
@@ -404,181 +404,6 @@
   return Ret;
 }
 
-BOOL
-STDCALL
-NtGdiPolyBezier(HDC           hDC,
-               CONST LPPOINT  pt,
-               DWORD          Count)
-{
-  DC *dc;
-  LPPOINT Safept;
-  NTSTATUS Status = STATUS_SUCCESS;
-  BOOL Ret;
-
-  dc = DC_LockDc(hDC);
-  if(!dc)
-  {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
-    return FALSE;
-  }
-  if (dc->IsIC)
-  {
-    DC_UnlockDc(dc);
-    /* Yes, Windows really returns TRUE in this case */
-    return TRUE;
-  }
-
-  if(Count > 0)
-  {
-    _SEH_TRY
-    {
-      ProbeForRead(pt,
-                   Count * sizeof(POINT),
-                   1);
-    }
-    _SEH_HANDLE
-    {
-      Status = _SEH_GetExceptionCode();
-    }
-    _SEH_END;
-    
-    if (!NT_SUCCESS(Status))
-    {
-      DC_UnlockDc(dc);
-      SetLastNtError(Status);
-      return FALSE;
-    }
-    
-    Safept = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * Count, TAG_BEZIER);
-    if(!Safept)
-    {
-      DC_UnlockDc(dc);
-      SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
-      return FALSE;
-    }
-
-    _SEH_TRY
-    {
-      /* pointers were already probed */
-      RtlCopyMemory(Safept,
-                    pt,
-                    Count * sizeof(POINT));
-    }
-    _SEH_HANDLE
-    {
-      Status = _SEH_GetExceptionCode();
-    }
-    _SEH_END;
-
-    if(!NT_SUCCESS(Status))
-    {
-      DC_UnlockDc(dc);
-      SetLastNtError(Status);
-      return FALSE;
-    }
-  }
-  else
-  {
-    DC_UnlockDc(dc);
-    SetLastWin32Error(ERROR_INVALID_PARAMETER);
-    return FALSE;
-  }
-
-  Ret = IntGdiPolyBezier(dc, Safept, Count);
-
-  ExFreePool(Safept);
-  DC_UnlockDc(dc);
-
-  return Ret;
-}
-
-BOOL
-STDCALL
-NtGdiPolyBezierTo(HDC  hDC,
-                 CONST LPPOINT  pt,
-                 DWORD  Count)
-{
-  DC *dc;
-  LPPOINT Safept;
-  NTSTATUS Status = STATUS_SUCCESS;
-  BOOL Ret;
-
-  dc = DC_LockDc(hDC);
-  if(!dc)
-  {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
-    return FALSE;
-  }
-  if (dc->IsIC)
-  {
-    DC_UnlockDc(dc);
-    /* Yes, Windows really returns TRUE in this case */
-    return TRUE;
-  }
-
-  if(Count > 0)
-  {
-    _SEH_TRY
-    {
-      ProbeForRead(pt,
-                   Count * sizeof(POINT),
-                   1);
-    }
-    _SEH_HANDLE
-    {
-      Status = _SEH_GetExceptionCode();
-    }
-    _SEH_END;
-
-    if (!NT_SUCCESS(Status))
-    {
-      DC_UnlockDc(dc);
-      SetLastNtError(Status);
-      return FALSE;
-    }
-    
-    Safept = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * Count, TAG_BEZIER);
-    if(!Safept)
-    {
-      DC_UnlockDc(dc);
-      SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
-      return FALSE;
-    }
-
-    _SEH_TRY
-    {
-      /* pointers were already probed */
-      RtlCopyMemory(Safept,
-                    pt,
-                    Count * sizeof(POINT));
-    }
-    _SEH_HANDLE
-    {
-      Status = _SEH_GetExceptionCode();
-    }
-    _SEH_END;
-
-    if(!NT_SUCCESS(Status))
-    {
-      DC_UnlockDc(dc);
-      SetLastNtError(Status);
-      return FALSE;
-    }
-  }
-  else
-  {
-    DC_UnlockDc(dc);
-    SetLastWin32Error(ERROR_INVALID_PARAMETER);
-    return FALSE;
-  }
-
-  Ret = IntGdiPolyBezierTo(dc, Safept, Count);
-
-  ExFreePool(Safept);
-  DC_UnlockDc(dc);
-
-  return Ret;
-}
 
 BOOL
 APIENTRY
@@ -656,279 +481,5 @@
     return result;
 }
 
-BOOL
-STDCALL
-NtGdiPolyline(HDC            hDC,
-             CONST LPPOINT  pt,
-             int            Count)
-{
-  DC *dc;
-  LPPOINT Safept;
-  NTSTATUS Status = STATUS_SUCCESS;
-  BOOL Ret;
-
-  dc = DC_LockDc(hDC);
-  if(!dc)
-  {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
-    return FALSE;
-  }
-  if (dc->IsIC)
-  {
-    DC_UnlockDc(dc);
-    /* Yes, Windows really returns TRUE in this case */
-    return TRUE;
-  }
-
-  if(Count >= 2)
-  {
-    _SEH_TRY
-    {
-      ProbeForRead(pt,
-                   Count * sizeof(POINT),
-                   1);
-    }
-    _SEH_HANDLE
-    {
-      Status = _SEH_GetExceptionCode();
-    }
-    _SEH_END;
-
-    if (!NT_SUCCESS(Status))
-    {
-      DC_UnlockDc(dc);
-      SetLastNtError(Status);
-      return FALSE;
-    }
-    
-    Safept = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * Count, TAG_SHAPE);
-    if(!Safept)
-    {
-      DC_UnlockDc(dc);
-      SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
-      return FALSE;
-    }
-
-    _SEH_TRY
-    {
-      /* pointers were already probed */
-      RtlCopyMemory(Safept,
-                    pt,
-                    Count * sizeof(POINT));
-    }
-    _SEH_HANDLE
-    {
-      Status = _SEH_GetExceptionCode();
-    }
-    _SEH_END;
-
-    if(!NT_SUCCESS(Status))
-    {
-      DC_UnlockDc(dc);
-      SetLastNtError(Status);
-      return FALSE;
-    }
-  }
-  else
-  {
-    DC_UnlockDc(dc);
-    SetLastWin32Error(ERROR_INVALID_PARAMETER);
-    return FALSE;
-  }
-
-  Ret = IntGdiPolyline(dc, Safept, Count);
-
-  ExFreePool(Safept);
-  DC_UnlockDc(dc);
-
-  return Ret;
-}
-
-BOOL
-STDCALL
-NtGdiPolylineTo(HDC            hDC,
-               CONST LPPOINT  pt,
-               DWORD          Count)
-{
-  DC *dc;
-  LPPOINT Safept;
-  NTSTATUS Status = STATUS_SUCCESS;
-  BOOL Ret;
-
-  dc = DC_LockDc(hDC);
-  if(!dc)
-  {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
-    return FALSE;
-  }
-  if (dc->IsIC)
-  {
-    DC_UnlockDc(dc);
-    /* Yes, Windows really returns TRUE in this case */
-    return TRUE;
-  }
-
-  if(Count > 0)
-  {
-    _SEH_TRY
-    {
-      ProbeForRead(pt,
-                   Count * sizeof(POINT),
-                   1);
-    }
-    _SEH_HANDLE
-    {
-      Status = _SEH_GetExceptionCode();
-    }
-    _SEH_END;
-
-    if (!NT_SUCCESS(Status))
-    {
-      DC_UnlockDc(dc);
-      SetLastNtError(Status);
-      return FALSE;
-    }
-    
-    Safept = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * Count, TAG_SHAPE);
-    if(!Safept)
-    {
-      DC_UnlockDc(dc);
-      SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
-      return FALSE;
-    }
-
-    _SEH_TRY
-    {
-      /* pointers were already probed */
-      RtlCopyMemory(Safept,
-                    pt,
-                    Count * sizeof(POINT));
-    }
-    _SEH_HANDLE
-    {
-      Status = _SEH_GetExceptionCode();
-    }
-    _SEH_END;
-
-    if(!NT_SUCCESS(Status))
-    {
-      DC_UnlockDc(dc);
-      SetLastNtError(Status);
-      return FALSE;
-    }
-  }
-  else
-  {
-    DC_UnlockDc(dc);
-    SetLastWin32Error(ERROR_INVALID_PARAMETER);
-    return FALSE;
-  }
-
-  Ret = IntGdiPolylineTo(dc, Safept, Count);
-
-  ExFreePool(Safept);
-  DC_UnlockDc(dc);
-
-  return Ret;
-}
-
-BOOL
-STDCALL
-NtGdiPolyPolyline(HDC            hDC,
-                 CONST LPPOINT  pt,
-                 CONST LPDWORD  PolyPoints,
-                 DWORD          Count)
-{
-  DC *dc;
-  LPPOINT Safept;
-  LPDWORD SafePolyPoints;
-  NTSTATUS Status = STATUS_SUCCESS;
-  BOOL Ret;
-
-  dc = DC_LockDc(hDC);
-  if(!dc)
-  {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
-    return FALSE;
-  }
-  if (dc->IsIC)
-  {
-    DC_UnlockDc(dc);
-    /* Yes, Windows really returns TRUE in this case */
-    return TRUE;
-  }
-
-  if(Count > 0)
-  {
-    _SEH_TRY
-    {
-      ProbeForRead(pt,
-                   Count * sizeof(POINT),
-                   1);
-      ProbeForRead(PolyPoints,
-                   Count * sizeof(DWORD),
-                   1);
-    }
-    _SEH_HANDLE
-    {
-      Status = _SEH_GetExceptionCode();
-    }
-    _SEH_END;
-
-    if (!NT_SUCCESS(Status))
-    {
-      DC_UnlockDc(dc);
-      SetLastNtError(Status);
-      return FALSE;
-    }
-    
-    Safept = ExAllocatePoolWithTag(PagedPool, (sizeof(POINT) + sizeof(DWORD)) * Count,
TAG_SHAPE);
-    if(!Safept)
-    {
-      DC_UnlockDc(dc);
-      SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
-      return FALSE;
-    }
-
-    SafePolyPoints = (LPDWORD)&Safept[Count];
-    
-    _SEH_TRY
-    {
-      /* pointers were already probed */
-      RtlCopyMemory(Safept,
-                    pt,
-                    Count * sizeof(POINT));
-      RtlCopyMemory(SafePolyPoints,
-                    PolyPoints,
-                    Count * sizeof(DWORD));
-    }
-    _SEH_HANDLE
-    {
-      Status = _SEH_GetExceptionCode();
-    }
-    _SEH_END;
-
-    if(!NT_SUCCESS(Status))
-    {
-      DC_UnlockDc(dc);
-      ExFreePool(Safept);
-      SetLastNtError(Status);
-      return FALSE;
-    }
-  }
-  else
-  {
-    DC_UnlockDc(dc);
-    SetLastWin32Error(ERROR_INVALID_PARAMETER);
-    return FALSE;
-  }
-
-  Ret = IntGdiPolyPolyline(dc, Safept, SafePolyPoints, Count);
-
-  ExFreePool(Safept);
-  DC_UnlockDc(dc);
-
-  return Ret;
-}
 
 /* EOF */

Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Sep  1 08:23:08 2007
@@ -795,11 +795,6 @@
 NtGdiOffsetWindowOrgEx                  4
 NtGdiPlayEnhMetaFile                    3
 NtGdiPlayEnhMetaFileRecord              4
-NtGdiPolyBezier                         3
-NtGdiPolyBezierTo                       3
-NtGdiPolyline                           3
-NtGdiPolylineTo                         3
-NtGdiPolyPolyline                       4
 NtGdiPolyTextOut                        3
 NtGdiRealizePalette                     1
 NtGdiRemoveFontResource                 1