Changeset 4139 for trunk/src

Timestamp:

Aug 31, 2000, 11:03:14 PM (25 years ago)

Author:

sandervl

Message:

DirectDraw3D interface fix

Location:

trunk/src/ddraw

Files:

• OS2DDRAW.CPP (modified) (2 diffs)
• ddraw.CPP (modified) (3 diffs)

trunk/src/ddraw/OS2DDRAW.CPP

@@ -1 @@
-/* $Id: OS2DDRAW.CPP,v 1.23 2000-08-31 17:57:09 sandervl Exp $ */
+/* $Id: OS2DDRAW.CPP,v 1.24 2000-08-31 21:03:14 sandervl Exp $ */
 
 /*
@@ -148 +148 @@
   if(lpGUID && *lpGUID == IID_IDirect3D)
   {
-    dprintf(("DDRAW: D3D Interface\n"));
-
-    lpVtbl = (IDirectDraw4Vtbl *)&Vtbl3D;
+    dprintf(("DDRAW: D3D Interface -> using V4 Interface"));
+
+    lpVtbl = &Vtbl4;
   }
   else

trunk/src/ddraw/ddraw.CPP

@@ -1 @@
-/* $Id: ddraw.CPP,v 1.14 2000-08-31 20:51:57 sandervl Exp $ */
+/* $Id: ddraw.CPP,v 1.15 2000-08-31 21:03:14 sandervl Exp $ */
 
 /*
@@ -48 +48 @@
   else
   {
-    if(!lpGUID) {
-         //WARNING: defaults to ddraw v4
-         newdraw->Vtbl.QueryInterface((IDirectDraw2 *)newdraw, &IID_IDirectDraw4, (LPVOID *)lplpDD);
-    }
-    else newdraw->Vtbl.QueryInterface((IDirectDraw2 *)newdraw, lpGUID, (LPVOID *)lplpDD);
+    newdraw->Vtbl.AddRef((IDirectDraw2 *)newdraw);
 
     rc = newdraw->GetLastError();
     if(rc != DD_OK)
     {
-      *lplpDD = NULL;
-
-      delete newdraw;
+         *lplpDD = NULL;
+
+         delete newdraw;
     }
+    else *lplpDD = (LPDIRECTDRAW)newdraw;
   }
   return(rc);
@@ -89 +86 @@
 //SvL: Crashes dxview.exe; expects a different vtbl when creating
 //     an IID_IDirect3D object
-#if 0
+#if 1
   else //now for Direct3D
   {