Changeset 2638 for trunk/src/ddraw/OS2DDRAW.CPP

Timestamp:

Feb 4, 2000, 8:31:26 PM (26 years ago)

Author:

hugh

Message:

Bugfixes at many places

File:

• trunk/src/ddraw/OS2DDRAW.CPP (modified) (8 diffs)

trunk/src/ddraw/OS2DDRAW.CPP

@@ -1 @@
-/* $Id: OS2DDRAW.CPP,v 1.18 1999-12-21 01:28:15 hugh Exp $ */
+/* $Id: OS2DDRAW.CPP,v 1.19 2000-02-04 19:31:23 hugh Exp $ */
 
 /*
@@ -99 +99 @@
   Vtbl4.Compact                = DrawCompact;
   Vtbl4.CreateClipper          = DrawCreateClipper;
+  Vtbl4.CreatePalette          = DrawCreatePalette;
   Vtbl4.CreateSurface          = DrawCreateSurface4;//
   Vtbl4.DuplicateSurface       = DrawDuplicateSurface4;//
@@ -231 +232 @@
      !IsEqualGUID(riid, IID_IDirectDraw) &&
      !IsEqualGUID(riid, IID_IDirectDraw2) &&
-     !IsEqualGUID(riid, IID_IDirectDraw4))
+     !IsEqualGUID(riid, IID_IDirectDraw4) &&
+     !IsEqualGUID(riid, IID_IDirect3D))
 //&& !IsEqualGUID(riid, IID_IUnknown))
   return E_NOINTERFACE;
 
   // ToDo Better way of returning differnent intterfaces for same class
-
-  if(IsEqualGUID(riid, IID_IDirectDraw4))
-  {
-    dprintf(("DDRAW: IID_IDirectDraw4 Interface\n"));
-    me->lpVtbl = &me->Vtbl4;
+  if(IsEqualGUID(riid, IID_IDirect3D))
+  {
+    me->lpVtbl = (IDirectDraw4Vtbl *) &me->Vtbl3D;
   }
   else
   {
-    dprintf(("DDRAW: No IID_IDirectDraw4 Interface\n"));
-    me->lpVtbl = (IDirectDraw4Vtbl *) &me->Vtbl;
-  }
+    if(IsEqualGUID(riid, IID_IDirectDraw4))
+    {
+      dprintf(("DDRAW: IID_IDirectDraw4 Interface\n"));
+      me->lpVtbl = &me->Vtbl4;
+    }
+    else
+    {
+      dprintf(("DDRAW: No IID_IDirectDraw4 Interface\n"));
+      me->lpVtbl = (IDirectDraw4Vtbl *) &me->Vtbl;
+    }
+  }
+  me->lpVtbl2 = me->lpVtbl;
   *ppvObj = This;
   DrawAddRef(This);
@@ -1446 +1455 @@
     return(DDERR_INVALIDPARAMS);
 
-
+  #if 0
     rc = io_init1();
 
@@ -1458 +1467 @@
     return(DD_OK);
   }
-
+  #else
+    *lpbIsInVB = ! (*lpbIsInVB);
+  #endif
   return(DDERR_UNSUPPORTED);
 }
@@ -1545 +1556 @@
   rc = DiveSetupBlitter( me->hDive,
                          &sBlt);
+  dprintf(("       DiveSetupBlitter rc=%d",rc));
 
   return(DD_OK);
@@ -1557 +1569 @@
  SETUP_BLITTER sBlt;
 
-#ifdef DEBUG
   dprintf(("DDRAW: SetDisplayMode to %dx%d with %d bits colors\n", dwWidth, dwHeight, dwBPP));
-#endif
+
   me->screenwidth  = dwWidth;
   me->screenheight = dwHeight;
@@ -1587 +1598 @@
   rc = DiveSetupBlitter( me->hDive,
                          &sBlt);
+  dprintf(("       DiveSetupBlitter rc=%d",rc));
 
   return(DD_OK);