Changeset 503 for trunk/src/ddraw/OS2D3D.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/OS2D3D.CPP (modified) (3 diffs)

trunk/src/ddraw/OS2D3D.CPP

@@ -11 +11 @@
 #include <winerror.h>
 #include <builtin.h>
+#include <odincrt.h>
 #undef THIS
 #define THIS VOID*
@@ -22 +23 @@
 
   if(IID_IDirect3D != (GUID &)&riid)
-  return E_NOINTERFACE;
+    return E_NOINTERFACE;
 
   *ppvObj = This;
@@ -46 +47 @@
   dprintf(("OS2IDirectDraw::Release %d\n", me->Referenced-1));
   dprintf(("OS2IDirectDraw::%X \n", me));
-  if(me->Referenced) {
-  me->Referenced--;
-  if(me->Referenced == 0) {
-    delete me;
+  if(me->Referenced)
+  {
+    me->Referenced--;
+    if(me->Referenced == 0)
+    {
+      ODIN_delete(me);
+      return(0);
+    }
+    else
+      return me->Referenced;
+  }
+  else
     return(0);
-  }
-  else    return me->Referenced;
-  }
-  else  return(0);
 }
 //******************************************************************************