Changeset 3595 for trunk/src

Timestamp:

May 23, 2000, 8:47:23 PM (25 years ago)

Author:

sandervl

Message:

HEL GetDevCaps fix

File:

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

trunk/src/ddraw/OS2DDRAW.CPP

@@ -1 @@
-/* $Id: OS2DDRAW.CPP,v 1.20 2000-03-03 19:21:23 hugh Exp $ */
+/* $Id: OS2DDRAW.CPP,v 1.21 2000-05-23 18:47:23 sandervl Exp $ */
 
 /*
@@ -1052 +1052 @@
     dprintf(("DDRAW:  HEL\n"));
 
+#if 1
+//SvL: PowerDVD uses size 316
+    if( (sizeof(DDCAPS)     != lpDDHELCaps->dwSize) &&
+        (sizeof(DDCAPS_DX5) != lpDDHELCaps->dwSize) &&
+        (sizeof(DDCAPS_DX3) != lpDDHELCaps->dwSize) )
+    {
+      dprintf( ("Size %d Not supported ",
+                lpDDHELCaps->dwSize));
+      return(DDERR_INVALIDPARAMS);
+    }
+#else
     if(sizeof(DDCAPS)!=lpDDHELCaps->dwSize)
     {
@@ -1057 +1068 @@
       return(DDERR_INVALIDPARAMS);
     }
+#endif
     // Clear structure so we only have to set the supported flags
 
-
-    memset(lpDDHELCaps,0,sizeof(DDCAPS));
+    dwSize = lpDDDriverCaps->dwSize;
+    memset( lpDDDriverCaps,
+            0,
+            lpDDDriverCaps->dwSize);
 
 
     // Reset the size
-    lpDDHELCaps->dwSize = sizeof(DDCAPS);
+    lpDDHELCaps->dwSize = dwSize;
 
     // Now report the CAPs back which we support
@@ -1114 +1128 @@
     lpDDHELCaps->dwSSBFXCaps;            //  .
     lpDDHELCaps->dwSSBRops[DD_ROP_SPACE]; //  .
-    lpDDHELCaps->dwSVBCaps2 = DDCAPS2_CANRENDERWINDOWED | // Better check for Voodoo ?!
-                                 DDCAPS2_COPYFOURCC |        // yepp memcpy will do this
-                                 DDCAPS2_WIDESURFACES;       // Any size you want!
-    lpDDHELCaps->dwNLVBCaps = DDCAPS_BLT |              // We do blitting
-                                 DDCAPS_BLTCOLORFILL |     // We do colorfills
-                                 DDCAPS_COLORKEY |         // We support Colorkeying
-                                 DDCAPS_COLORKEYHWASSIST;
-    lpDDHELCaps->dwNLVBCaps2 = DDCAPS2_CANRENDERWINDOWED | // Better check for Voodoo ?!
-                                  DDCAPS2_COPYFOURCC |        // yepp memcpy will do this
-                                  DDCAPS2_WIDESURFACES;       // Any size you want!
-    lpDDHELCaps->dwNLVBCKeyCaps = DDCKEYCAPS_SRCBLT;      // Only source transparent blitting
-    lpDDHELCaps->dwNLVBFXCaps;            //  .
-    lpDDHELCaps->dwNLVBRops[DD_ROP_SPACE];//  .
+    // These are ony in >DX5
+    if(dwSize>sizeof(DDCAPS_DX3))
+    {
+        lpDDHELCaps->dwSVBCaps2 = DDCAPS2_CANRENDERWINDOWED | // Better check for Voodoo ?!
+                                  DDCAPS2_COPYFOURCC |        // yepp memcpy will do this
+                                  DDCAPS2_WIDESURFACES;       // Any size you want!
+        lpDDHELCaps->dwNLVBCaps = DDCAPS_BLT |              // We do blitting
+                                  DDCAPS_BLTCOLORFILL |     // We do colorfills
+                                  DDCAPS_COLORKEY |         // We support Colorkeying
+                                  DDCAPS_COLORKEYHWASSIST;
+        lpDDHELCaps->dwNLVBCaps2 = DDCAPS2_CANRENDERWINDOWED | // Better check for Voodoo ?!
+                                   DDCAPS2_COPYFOURCC |        // yepp memcpy will do this
+                                   DDCAPS2_WIDESURFACES;       // Any size you want!
+        lpDDHELCaps->dwNLVBCKeyCaps = DDCKEYCAPS_SRCBLT;      // Only source transparent blitting
+        lpDDHELCaps->dwNLVBFXCaps;            //  .
+        lpDDHELCaps->dwNLVBRops[DD_ROP_SPACE];//  .
+    }
 
   }