Changeset 4137 for trunk/src

Timestamp:

Aug 31, 2000, 10:51:57 PM (25 years ago)

Author:

sandervl

Message:

DirectDrawCreate change/fix

File:

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

trunk/src/ddraw/ddraw.CPP

@@ -1 @@
-/* $Id: ddraw.CPP,v 1.13 2000-08-31 12:48:42 sandervl Exp $ */
+/* $Id: ddraw.CPP,v 1.14 2000-08-31 20:51:57 sandervl Exp $ */
 
 /*
@@ -6 +6 @@
  * Copyright 1998 Sander va Leeuwen
  * Copyright 1999 Markus Montkowski
+ *
+ * WARNING: DirectDrawCreate defaults to ddraw v4 if lpGUID == NULL!!
+ *
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -45 +48 @@
   else
   {
-    newdraw->Vtbl.AddRef((IDirectDraw2 *)newdraw);
+    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);
+
     rc = newdraw->GetLastError();
     if(rc != DD_OK)
@@ -53 +61 @@
       delete newdraw;
     }
-    else
-      *lplpDD = (LPDIRECTDRAW)newdraw;
   }
   return(rc);