[ros-diffs] [tretiakov] 24257: memcpy -> RtlCopyMemory assert -> ASSERT

Author: tretiakov
Date: Sun Sep 24 21:10:58 2006
New Revision: 24257

URL: http://svn.reactos.org/svn/reactos?rev=24257&view=rev
Log:
memcpy -> RtlCopyMemory
assert -> ASSERT

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

Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/path.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/path.c Sun Sep 24 21:10:58 2006
@@ -467,7 +467,7 @@
 FASTCALL
 PATH_InitGdiPath ( GdiPath *pPath )
 {
-  assert(pPath!=NULL);
+  ASSERT(pPath!=NULL);

pPath->state=PATH_Null;
   pPath->pPoints=NULL;
@@ -484,7 +484,7 @@
 FASTCALL
 PATH_DestroyGdiPath ( GdiPath *pPath )
 {
-  assert(pPath!=NULL);
+  ASSERT(pPath!=NULL);

ExFreePool(pPath->pPoints);
   ExFreePool(pPath->pFlags);
@@ -504,16 +504,16 @@
 FASTCALL
 PATH_AssignGdiPath ( GdiPath *pPathDest, const GdiPath *pPathSrc )
 {
-  assert(pPathDest!=NULL && pPathSrc!=NULL);
+  ASSERT(pPathDest!=NULL && pPathSrc!=NULL);

/* Make sure destination arrays are big enough */
   if ( !PATH_ReserveEntries(pPathDest, pPathSrc->numEntriesUsed) )
     return FALSE;

/* Perform the copy operation */
-  memcpy(pPathDest->pPoints, pPathSrc->pPoints,
+  RtlCopyMemory(pPathDest->pPoints, pPathSrc->pPoints,
     sizeof(POINT)*pPathSrc->numEntriesUsed);
-  memcpy(pPathDest->pFlags, pPathSrc->pFlags,
+  RtlCopyMemory(pPathDest->pFlags, pPathSrc->pFlags,
     sizeof(BYTE)*pPathSrc->numEntriesUsed);

pPathDest->state=pPathSrc->state;
@@ -748,7 +748,7 @@
     if ( angleEnd <= angleStart )
     {
       angleEnd+=2*M_PI;
-      assert(angleEnd>=angleStart);
+      ASSERT(angleEnd>=angleStart);
     }
   }
   else
@@ -756,7 +756,7 @@
     if(angleEnd>=angleStart)
     {
       angleEnd-=2*M_PI;
-      assert(angleEnd<=angleStart);
+      ASSERT(angleEnd<=angleStart);
     }
   }

@@ -1087,8 +1087,8 @@
   INT  *pNumPointsInStroke;
   HRGN hrgn = 0;

-  assert ( pPath!=NULL );
-  assert ( pHrgn!=NULL );
+  ASSERT(pPath!=NULL);
+  ASSERT(pHrgn!=NULL);

PATH_FlattenPath ( pPath );

@@ -1148,7 +1148,7 @@
 FASTCALL
 PATH_EmptyPath ( GdiPath *pPath )
 {
-  assert(pPath!=NULL);
+  ASSERT(pPath!=NULL);

pPath->state=PATH_Null;
   pPath->numEntriesUsed=0;
@@ -1164,7 +1164,7 @@
 FASTCALL
 PATH_AddEntry ( GdiPath *pPath, const POINT *pPoint, BYTE flags )
 {
-  assert(pPath!=NULL);
+  ASSERT(pPath!=NULL);

/* FIXME: If newStroke is true, perhaps we want to check that we're
    * getting a PT_MOVETO
@@ -1206,8 +1206,8 @@
   POINT *pPointsNew;
   BYTE    *pFlagsNew;

-  assert(pPath!=NULL);
-  assert(numEntries>=0);
+  ASSERT(pPath!=NULL);
+  ASSERT(numEntries>=0);

/* Do we have to allocate more memory? */
   if(numEntries > pPath->numEntriesAllocated)
@@ -1237,10 +1237,10 @@
     /* Copy old arrays to new arrays and discard old arrays */
     if(pPath->pPoints)
     {
-      assert(pPath->pFlags);
-
-      memcpy(pPointsNew, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed);
-      memcpy(pFlagsNew, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed);
+      ASSERT(pPath->pFlags);
+
+      RtlCopyMemory(pPointsNew, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed);
+      RtlCopyMemory(pFlagsNew, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed);

ExFreePool(pPath->pPoints);
       ExFreePool(pPath->pFlags);
@@ -1272,7 +1272,7 @@
   POINT point;
   int i;

-  assert(fabs(angleEnd-angleStart)<=M_PI_2);
+  ASSERT(fabs(angleEnd-angleStart)<=M_PI_2);

/* FIXME: Is there an easier way of computing this? */