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

Timestamp:

Sep 12, 1999, 11:37:37 PM (26 years ago)

Author:

hugh

Message:

Changess in basic implementation of the IDrectDraw class
MS does assume 2 Vtables at the end and MS tools seam to use internal
knownledge of the implmentation. DDCAPS is one butn thsi does work/start now.

File:

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

trunk/src/ddraw/OS2DDRAW.CPP

@@ +1 @@
+#include <stdlib.h>
+#include <string.h>
 #include <memory.h>
 
@@ -129 +131 @@
   }
 
+  lpVtbl2 = lpVtbl;
+
+  pdwUnknownData = (DWORD*) malloc (255*sizeof(DWORD));
+  for(int i= 0 ;i<255;i++)
+    pdwUnknownData[i] = 0;
+
   rc = DiveOpen( &hDive,
                  FALSE,
@@ -154 +162 @@
   WriteLog("DiveQueryCaps rc=0x%08X\n",rc);
 
+  pdwUnknownData[235] = dCaps.ulHorizontalResolution;
+  pdwUnknownData[236] = dCaps.ulVerticalResolution;
+  pdwUnknownData[241] = dCaps.ulDepth;
 
   // Shall we run in FS mode ?
@@ -477 +488 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall DrawEnumDisplayModes(THIS This, DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc,
-                                       LPVOID lpContext, LPDDENUMMODESCALLBACK lpDDEnumModesCallback)
+HRESULT __stdcall DrawEnumDisplayModes( THIS This,
+                                        DWORD dwFlags,
+                                        LPDDSURFACEDESC lpDDSurfaceDesc,
+                                        LPVOID lpContext,
+                                        LPDDENUMMODESCALLBACK lpDDEnumModesCallback)
 {
   int iMode = 0;
@@ -515 +529 @@
     // DIVE modes
 
+    #ifdef DEBUG
+      WriteLog("EnumDisplayModes : DIVE modes\n");
+    #endif
+
     // Enumerate all modes ?
     if (NULL==lpDDSurfaceDesc)
@@ -520 +538 @@
       // Check if we shall report 320x200 mode
 
+      #ifdef DEBUG
+        WriteLog("EnumDisplayModes : ALL modes\n");
+      #endif
+
       if(dwFlags && DDEDM_STANDARDVGAMODES)
       {
+        #ifdef DEBUG
+          WriteLog("EnumDisplayModes : STANDARDVGAMODES\n");
+        #endif
         DDSurfAct.dwHeight = ModesDive[0].iYRes;
         DDSurfAct.dwWidth  = ModesDive[0].iXRes;
         DDSurfAct.ddpfPixelFormat.dwRGBBitCount = ModesDive[0].iBits;
+        DDSurfAct.ddpfPixelFormat.dwFlags |= DDPF_PALETTEINDEXED8 ;
         if(!lpDDEnumModesCallback(&DDSurfAct,lpContext))
         {
+          #ifdef DEBUG
+            WriteLog("EnumDisplayModes : Enum done\n");
+          #endif
           return (DD_OK);
         }
@@ -539 +568 @@
         // if the mode fits in the current resolution report it
         // Change this if we support Fullscreen later !!!
+
         if(ModesDive[iMode].iXRes < me->dCaps.ulHorizontalResolution)
         {
@@ -546 +576 @@
           switch(ModesDive[iMode].iBits)
           {
+            case 8:
+              DDSurfAct.ddpfPixelFormat.dwFlags |= DDPF_PALETTEINDEXED8;
+              break;
             case 16:
               // VESA uses 565 encoding in 16 bit modes
-              lpDDSurfaceDesc->ddpfPixelFormat.dwRBitMask = 0x0000F800;
-              lpDDSurfaceDesc->ddpfPixelFormat.dwGBitMask = 0x000007E0;
-              lpDDSurfaceDesc->ddpfPixelFormat.dwBBitMask = 0x0000001F;
+              DDSurfAct.ddpfPixelFormat.dwFlags &= ~DDPF_PALETTEINDEXED8;
+              DDSurfAct.ddpfPixelFormat.dwRBitMask = 0x0000F800;
+              DDSurfAct.ddpfPixelFormat.dwGBitMask = 0x000007E0;
+              DDSurfAct.ddpfPixelFormat.dwBBitMask = 0x0000001F;
               break;
             case 24:
               // VESA uses per default RGB4
-              lpDDSurfaceDesc->ddpfPixelFormat.dwRBitMask = 0x00FF0000;
-              lpDDSurfaceDesc->ddpfPixelFormat.dwGBitMask = 0x0000FF00;
-              lpDDSurfaceDesc->ddpfPixelFormat.dwBBitMask = 0x000000FF;
+              DDSurfAct.ddpfPixelFormat.dwFlags &= ~DDPF_PALETTEINDEXED8;
+              DDSurfAct.ddpfPixelFormat.dwRBitMask = 0x00FF0000;
+              DDSurfAct.ddpfPixelFormat.dwGBitMask = 0x0000FF00;
+              DDSurfAct.ddpfPixelFormat.dwBBitMask = 0x000000FF;
               break;
             default:
               break;
           }
+          #ifdef DEBUG
+            WriteLog( "EnumDisplayModes : Enum Mode %dx%d @ %d\n",
+                      DDSurfAct.dwHeight,
+                      DDSurfAct.dwWidth,
+                      DDSurfAct.ddpfPixelFormat.dwRGBBitCount);
+          #endif
           fCallAgain = lpDDEnumModesCallback(&DDSurfAct,lpContext);
+          #ifdef DEBUG
+            WriteLog( "EnumDisplayModes : Callback returned with %d\n",
+                      fCallAgain);
+          #endif
         }
         iMode++;
       }
-      while((ModesDive[iMode].iBits <= me->dCaps.ulDepth) &&
-            (iMode < NUM_MODES_DIVE) && (TRUE==fCallAgain));
+      while( (iMode < NUM_MODES_DIVE) &&
+             (ModesDive[iMode].iBits <= me->dCaps.ulDepth) &&
+             (TRUE==fCallAgain) );
     }
     else
@@ -596 +642 @@
         DDSurfAct.dwWidth  = ModesDive[0].iXRes;
         DDSurfAct.ddpfPixelFormat.dwRGBBitCount = ModesDive[0].iBits;
+        DDSurfAct.ddpfPixelFormat.dwFlags |= DDPF_PALETTEINDEXED8;
         if(!lpDDEnumModesCallback(&DDSurfAct,lpContext))
         {
@@ -627 +674 @@
           DDSurfAct.dwWidth  = ModesDive[iMode].iXRes;
           DDSurfAct.ddpfPixelFormat.dwRGBBitCount = ModesDive[iMode].iBits;
+          switch(ModesDive[iMode].iBits)
+          {
+            case 8:
+              DDSurfAct.ddpfPixelFormat.dwFlags |= DDPF_PALETTEINDEXED8;
+              break;
+            case 16:
+              // VESA uses 565 encoding in 16 bit modes
+              DDSurfAct.ddpfPixelFormat.dwFlags &= ~DDPF_PALETTEINDEXED8;
+              DDSurfAct.ddpfPixelFormat.dwRBitMask = 0x0000F800;
+              DDSurfAct.ddpfPixelFormat.dwGBitMask = 0x000007E0;
+              DDSurfAct.ddpfPixelFormat.dwBBitMask = 0x0000001F;
+              break;
+            case 24:
+              // VESA uses per default RGB4
+              DDSurfAct.ddpfPixelFormat.dwFlags &= ~DDPF_PALETTEINDEXED8;
+              DDSurfAct.ddpfPixelFormat.dwRBitMask = 0x00FF0000;
+              DDSurfAct.ddpfPixelFormat.dwGBitMask = 0x0000FF00;
+              DDSurfAct.ddpfPixelFormat.dwBBitMask = 0x000000FF;
+              break;
+            default:
+              break;
+          }
 
           fCallAgain = lpDDEnumModesCallback(&DDSurfAct,lpContext);
@@ -674 +743 @@
       iMode = 2;
       fCallAgain = TRUE;
+      // All reported mode are 16bit
+      DDSurfAct.ddpfPixelFormat.dwRBitMask = 0x0000F800;
+      DDSurfAct.ddpfPixelFormat.dwGBitMask = 0x000007E0;
+      DDSurfAct.ddpfPixelFormat.dwBBitMask = 0x0000001F;
       do
       {