Changeset 503 for trunk/src/ddraw/OS2PALETTE.CPP

Timestamp:

Aug 16, 1999, 2:40:48 AM (26 years ago)

Author:

hugh

Message:

Changed to use ODINCRT macros to preserve FS, but still does crash

File:

• trunk/src/ddraw/OS2PALETTE.CPP (modified) (4 diffs)

trunk/src/ddraw/OS2PALETTE.CPP

@@ -10 +10 @@
 #include "os2palset.h"
 #include <winerror.h>
+#include <odincrt.h>
 
 //******************************************************************************
@@ -96 +97 @@
     if(me->Referenced == 0)
     {
-      delete me;
+      ODIN_delete(me);
       return(0);
     }
@@ -141 +142 @@
     return(DDERR_INVALIDPARAMS);
 
+  ODIN_FS_BEGIN
+
   memcpy( (char *)lpEntries,
           (char *)(me->os2pal + dwBase),
           dwNumEntries*sizeof(PALETTEENTRY));
+
+  ODIN_FS_END
+
   return(DD_OK);
 }
@@ -169 +175 @@
   if( (NULL== lpNewEntries) ||(0!=dwFlags) ||(dwBase<0) ||((dwBase + dwNumEntries)>me->dwSize) )
     return(DDERR_INVALIDPARAMS);
+
+  ODIN_FS_BEGIN
+
   memcpy((char *)(me->os2pal + dwBase),
          (char *)lpNewEntries,
          dwNumEntries*sizeof(PALETTEENTRY));
+
+  ODIN_FS_END
 
   if(me->fAttachedToPrimary)