Changeset 2987 for trunk/src

Timestamp:

Mar 3, 2000, 8:21:26 PM (25 years ago)

Author:

hugh

Message:

Bugfixes for moorhuhn

Location:

trunk/src/ddraw

Files:

• OS2DDRAW.CPP (modified) (4 diffs)
• OS2DDRAW.H (modified) (2 diffs)
• OS2SURFACE.CPP (modified) (6 diffs)
• colorconv.cpp (modified) (2 diffs)
• ddraw.CPP (modified) (2 diffs)

trunk/src/ddraw/OS2DDRAW.CPP

@@ -1 @@
-/* $Id: OS2DDRAW.CPP,v 1.19 2000-02-04 19:31:23 hugh Exp $ */
+/* $Id: OS2DDRAW.CPP,v 1.20 2000-03-03 19:21:23 hugh Exp $ */
 
 /*
@@ -64 +64 @@
   Vtbl3D.FindDevice     = D3DFindDevice;
 
-  // old V2 Interface
+  // Org Interface
   Vtbl.AddRef                 = DrawAddRef;
   Vtbl.Release                = DrawRelease;
@@ -86 +86 @@
   Vtbl.RestoreDisplayMode     = DrawRestoreDisplayMode;
   Vtbl.SetCooperativeLevel    = DrawSetCooperativeLevel;
-  if(lpGUID && *lpGUID == IID_IDirectDraw2)
-    *(ULONG *)&Vtbl.SetDisplayMode = (ULONG)DrawSetDisplayMode2;
-  else
-    *(ULONG *)&Vtbl.SetDisplayMode = (ULONG)DrawSetDisplayMode;
+  Vtbl.SetDisplayMode         = DrawSetDisplayMode;
   Vtbl.WaitForVerticalBlank   = DrawWaitForVerticalBlank;
-  Vtbl.GetAvailableVidMem     = DrawGetAvailableVidMem;
+
+  // V2 Interface
+
+  Vtbl2.AddRef                 = DrawAddRef;
+  Vtbl2.Release                = DrawRelease;
+  Vtbl2.QueryInterface         = DrawQueryInterface;
+  Vtbl2.Compact                = DrawCompact;
+  Vtbl2.CreateClipper          = DrawCreateClipper;
+  Vtbl2.CreatePalette          = DrawCreatePalette;
+  Vtbl2.CreateSurface          = DrawCreateSurface;
+  Vtbl2.DuplicateSurface       = DrawDuplicateSurface;
+  Vtbl2.EnumDisplayModes       = DrawEnumDisplayModes;
+  Vtbl2.EnumSurfaces           = DrawEnumSurfaces;
+  Vtbl2.FlipToGDISurface       = DrawFlipToGDISurface;
+  Vtbl2.GetCaps                = DrawGetCaps;
+  Vtbl2.GetDisplayMode         = DrawGetDisplayMode;
+  Vtbl2.GetFourCCCodes         = DrawGetFourCCCodes;
+  Vtbl2.GetGDISurface          = DrawGetGDISurface;
+  Vtbl2.GetMonitorFrequency    = DrawGetMonitorFrequency;
+  Vtbl2.GetScanLine            = DrawGetScanLine;
+  Vtbl2.GetVerticalBlankStatus = DrawGetVerticalBlankStatus;
+  Vtbl2.Initialize             = DrawInitialize;
+  Vtbl2.RestoreDisplayMode     = DrawRestoreDisplayMode;
+  Vtbl2.SetCooperativeLevel    = DrawSetCooperativeLevel;
+  Vtbl2.SetDisplayMode         = DrawSetDisplayMode2;
+  Vtbl2.WaitForVerticalBlank   = DrawWaitForVerticalBlank;
+  Vtbl2.GetAvailableVidMem     = DrawGetAvailableVidMem;
 
   // New V4 interface
@@ -251 +274 @@
     else
     {
-      dprintf(("DDRAW: No IID_IDirectDraw4 Interface\n"));
-      me->lpVtbl = (IDirectDraw4Vtbl *) &me->Vtbl;
+      if(IsEqualGUID(riid, IID_IDirectDraw2))
+      {
+        dprintf(("DDRAW: IID_IDirectDraw2 Interface\n"));
+        me->lpVtbl = (IDirectDraw4Vtbl *) &me->Vtbl2;
+      }
+      else
+      {
+        dprintf(("DDRAW: IID_IDirectDraw Interface\n"));
+        me->lpVtbl = (IDirectDraw4Vtbl *) &me->Vtbl;
+      }
     }
   }

trunk/src/ddraw/OS2DDRAW.H

@@ -1 @@
-/* $Id: OS2DDRAW.H,v 1.9 1999-12-21 01:28:19 hugh Exp $ */
+/* $Id: OS2DDRAW.H,v 1.10 2000-03-03 19:21:26 hugh Exp $ */
 
 /*
@@ -40 +40 @@
                                        // ToDO :
                                        // debug into DirectDrawCreate and se what MS is doing !
-    IDirectDraw2Vtbl  Vtbl;
+    IDirectDrawVtbl  Vtbl;
+    IDirectDraw2Vtbl  Vtbl2;
     // MS did it again with direct/X 6 they changed the behavior of the directdraw component
     // So we now need 2 Virt. Tables one for the old and one for the new so we return the

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.23 2000-02-04 19:31:24 hugh Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.24 2000-03-03 19:21:24 hugh Exp $ */
 
 /*
@@ -1242 +1242 @@
           dwPitchFB = DDSurfaceDesc.dwWidth * (dwBpp<8?1:dwBpp/8);
           dwPitchFB = (dwPitchFB +7) & ~7;  // Align on QWords
+          DDSurfaceDesc.lPitch = dwPitchFB;
           #ifdef DEBUG
             if(dwBpp<8)
@@ -2191 +2192 @@
 
   #ifdef DEBUG
+    dprintf(("DDRAW: SurfBlt4 To Surf %08X, from Surf %08X\n",dest,src));
     if ( (NULL!=lpDestRect)&& (NULL!=lpSrcRect))
       dprintf(("DDRAW: SurfBlt4 to (%d,%d)(%d,%d) at %08X from (%d,%d)(%d,%d) at %08X\n", lpDestRect->left, lpDestRect->top,
@@ -3838 +3840 @@
   if(-1 != me->diveBufNr)
   {
-    dprintf(("DDRAW: DIVE Flipchain DiveBuffer #%d",FlipSurface->diveBufNr));
+    //dprintf(("DDRAW: DIVE Flipchain DiveBuffer #%d",FlipSurface->diveBufNr));
 
     // we got some DIVE surfaces
@@ -3845 +3847 @@
     // Doulebuffering should work best.
 
-    rc = DiveBlitImage(me->hDive, FlipSurface->diveBufNr, me->diveBufNr);
-
-    #ifdef DEBUG
-      dprintf(("DDRAW: DiveBlitImage rc = 0x%08X\n"));
-    #endif
+    //rc = DiveBlitImage(me->hDive, FlipSurface->diveBufNr, me->diveBufNr);
+    //dprintf(("DDRAW: DiveBlitImage rc = 0x%08X\n"));
+    SurfBltFast4( me,
+                  0,
+                  0,
+                  (LPDIRECTDRAWSURFACE4)FlipSurface,
+                  NULL,
+                  DDBLTFAST_NOCOLORKEY);
 
     if(NULL==lpDDSurf)
@@ -3855 +3860 @@
       // advance in the flipchain if no valid override surface was passed in
       // if we reached the end of the flipchain The Frontbuffer is the next to flip to
-      me->NextFlip = FlipSurface->BackBuffer!=NULL?FlipSurface->BackBuffer:me;//me->FrontBuffer;
+      me->NextFlip = FlipSurface->BackBuffer!=NULL?FlipSurface->BackBuffer:me->BackBuffer;
     }
   }

trunk/src/ddraw/colorconv.cpp

@@ -1 @@
-/* $Id: colorconv.cpp,v 1.2 1999-12-26 23:53:39 hugh Exp $ */
+/* $Id: colorconv.cpp,v 1.3 2000-03-03 19:21:21 hugh Exp $ */
 
 /*
@@ -27 +27 @@
   char *pSrcLine, *pDstLine;
 
-  dprintf(("DDRAW: Conv8to16\n"));
+  dprintf(("DDRAW: Conv8to16(%d,%d ,%d,%d)\n",dwTop,dwLeft,dwWidth,dwHeight));
 
   pSrcLine = pFB + (dwTop*dwPitchDB) + dwLeft;

trunk/src/ddraw/ddraw.CPP

@@ -1 @@
-/* $Id: ddraw.CPP,v 1.11 2000-02-04 19:31:23 hugh Exp $ */
+/* $Id: ddraw.CPP,v 1.12 2000-03-03 19:21:22 hugh Exp $ */
 
 /*
@@ -45 +45 @@
   else
   {
-    newdraw->Vtbl.AddRef((IDirectDraw *)newdraw);
+    newdraw->Vtbl.AddRef((IDirectDraw2 *)newdraw);
     rc = newdraw->GetLastError();
     if(rc != DD_OK)