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

trunk/src/ddraw/ddraw.CPP

@@ -2 +2 @@
 
 #include <builtin.h>
+#include <odincrt.h>
 #define INITGUID
 #include "os2ddraw.h"
@@ -18 +19 @@
   HRESULT         rc;
 
+  ODIN_FS_BEGIN
+
   WriteLog("DirectDrawCreate %X %X %X\n", lpGUID, lplpDD, pUnkOuter);
+
   newdraw = new OS2IDirectDraw(lpGUID);
 
   if(newdraw == NULL)
-    return(DDERR_NODIRECTDRAWHW);
-
-//  newdraw->Vtbl.AddRef((IDirectDraw *)newdraw);
-  rc = newdraw->GetLastError();
-  if(rc != DD_OK)
   {
-    *lplpDD = NULL;
-    delete newdraw;
+    rc = DDERR_NODIRECTDRAWHW;
   }
   else
-    *lplpDD = (LPDIRECTDRAW)newdraw;
+  {
+    //  newdraw->Vtbl.AddRef((IDirectDraw *)newdraw);
+    rc = newdraw->GetLastError();
+    if(rc != DD_OK)
+    {
+      *lplpDD = NULL;
+
+      delete newdraw;
+    }
+    else
+      *lplpDD = (LPDIRECTDRAW)newdraw;
+  }
+  ODIN_FS_END
 
   return(rc);
@@ -45 +55 @@
   //call it twice for the DirectDraw & Direct3D classes
  if(lpCallback(NULL, "DIVE DirectDraw for OS/2",
-                "DirectDraw/2 v0.1", lpContext) == DDENUMRET_CANCEL)
+                "DirectDraw/2 v0.2", lpContext) == DDENUMRET_CANCEL)
   {
     WriteLog("Cancel Callback\n");
@@ -54 +64 @@
     WriteLog("Callback for 3Dfx Voodoo");
     if(lpCallback((GUID *)&IID_IDirect3D, "3Dfx Voodoo Direct3D/2",
-      "Direct3D/2 v0.1", lpContext) == DDENUMRET_CANCEL)
+      "Direct3D/2 v0.2", lpContext) == DDENUMRET_CANCEL)
     {
       WriteLog("Cancel Callback\n");
@@ -64 +74 @@
   return(DD_OK);
 }
+
 //******************************************************************************
 typedef struct