Changeset 5326 for trunk/src/ddraw/OS2PALETTE.CPP

Timestamp:

Mar 18, 2001, 10:44:46 PM (24 years ago)

Author:

mike

Message:

Merged DDRAW and DDRAW\NEW

File:

• trunk/src/ddraw/OS2PALETTE.CPP (modified) (12 diffs)

trunk/src/ddraw/OS2PALETTE.CPP

@@ -1 @@
-/* $Id: OS2PALETTE.CPP,v 1.13 2001-03-09 22:48:46 mike Exp $ */
+/* $Id: OS2PALETTE.CPP,v 1.14 2001-03-18 21:44:42 mike Exp $ */
 
 /*
@@ -24 +24 @@
 #include <misc.h>
 #include "os2palset.h"
+#include "os2fsdd.h"
 #include <winerror.h>
 
@@ -91 +92 @@
 HRESULT __stdcall PalQueryInterface(THIS This, REFIID riid, LPVOID FAR * ppvObj)
 {
-  dprintf(("DDRAW: OS2IDirectDrawPalette::PalQueryInterface\n"));
+  dprintf(("DDRAW: OS2IDirectDrawPalette::PalQueryInterface"));
 
   *ppvObj = NULL;
@@ -110 +111 @@
   OS2IDirectDrawPalette *me = (OS2IDirectDrawPalette *)This;
 
-  dprintf(("DDRAW: OS2IDirectDrawPalette::PalAddRef %d\n", me->Referenced+1));
+  dprintf(("DDRAW: OS2IDirectDrawPalette::PalAddRef %d", me->Referenced+1));
 
   return (++me->Referenced);
@@ -120 +121 @@
   OS2IDirectDrawPalette *me = (OS2IDirectDrawPalette *)This;
 
-  #ifdef DEBUG
-    dprintf(("DDRAW: OS2IDirectDrawPalette::PalRelease %d\n", me->Referenced-1));
-  #endif
+  dprintf(("DDRAW: OS2IDirectDrawPalette::PalRelease %d", me->Referenced-1));
 
   if(me->Referenced)
@@ -144 +143 @@
   OS2IDirectDrawPalette *me = (OS2IDirectDrawPalette *)This;
 
-  #ifdef DEBUG
-    dprintf(("DDRAW: OS2IDirectDrawPalette::GetCaps\n"));
-  #endif
+  dprintf(("DDRAW: OS2IDirectDrawPalette::GetCaps"));
 
   if(NULL== lpdwCaps)
@@ -158 +155 @@
   return(DD_OK);
 }
+
 //******************************************************************************
 //******************************************************************************
@@ -167 +165 @@
  OS2IDirectDrawPalette *me = (OS2IDirectDrawPalette *)This;
 
-  dprintf(("DDRAW: OS2IDirectDrawPalette::PalGetEntries\n"));
-
-  if ((NULL == lpEntries) || (0 != dwFlags) || (dwBase > 65536)
-      || ((dwBase + dwNumEntries) > me->dwSize))
-    return(DDERR_INVALIDPARAMS);
+  dprintf(("DDRAW: OS2IDirectDrawPalette::PalGetEntries"));
+
+  if ((NULL == lpEntries) || (0 != dwFlags) || (dwBase > 0xFFFF) ||
+         ((dwBase + dwNumEntries) > me->dwSize))
+        return(DDERR_INVALIDPARAMS);
 
   memcpy( (char *)lpEntries,
@@ -179 +177 @@
   return(DD_OK);
 }
+
 //******************************************************************************
 //******************************************************************************
 HRESULT __stdcall PalInitialize(THIS, LPDIRECTDRAW, DWORD, LPPALETTEENTRY)
 {
-  dprintf(("DDRAW: OS2IDirectDrawPalette::PalInitialize\n"));
+  dprintf(("DDRAW: OS2IDirectDrawPalette::PalInitialize"));
   return(DDERR_ALREADYINITIALIZED);
 }
@@ -196 +195 @@
 
   dprintf(("DDRAW: OS2IDirectDrawPalette::PalSetEntries\n"));
-
-  if ((NULL== lpNewEntries) || (0 != dwFlags) || (dwBase > 65536)
-      || ((dwBase + dwNumEntries) > me->dwSize))
+  if ((NULL == lpNewEntries) || (0 != dwFlags) || (dwBase > 0xFFFF) ||
+      ((dwBase + dwNumEntries) > me->dwSize))
     return(DDERR_INVALIDPARAMS);
 
@@ -222 +220 @@
   }
 
-  if(8==((OS2IDirectDraw*)me->lpDraw)->dCaps.ulDepth)
+  if (8==((OS2IDirectDraw*)me->lpDraw)->dCaps.ulDepth)
   {
     if(me->fAttachedToPrimary)
@@ -238 +236 @@
 void OS2IDirectDrawPalette::SetPhysPalette()
 {
-  OS2SetPhysPalette(os2pal);
+        // Run appropriate code depening on whether FS DDraw is enabled
+        if (bUseFSDD)
+                SetSVGAPalette(os2pal); 
+        else    
+                OS2SetPhysPalette(os2pal);
 }
 //******************************************************************************