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

Timestamp:

Mar 9, 2001, 11:48:48 PM (24 years ago)

Author:

mike

Message:

Updates/cleanup for Watcom (not complete)

File:

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

trunk/src/ddraw/OS2PALETTE.CPP

@@ -1 @@
-/* $Id: OS2PALETTE.CPP,v 1.12 1999-12-21 01:28:16 hugh Exp $ */
+/* $Id: OS2PALETTE.CPP,v 1.13 2001-03-09 22:48:46 mike Exp $ */
 
 /*
@@ -91 +91 @@
 HRESULT __stdcall PalQueryInterface(THIS This, REFIID riid, LPVOID FAR * ppvObj)
 {
-  #ifdef DEBUG
-    dprintf(("DDRAW: OS2IDirectDrawPalette::PalQueryInterface\n"));
-  #endif
+  dprintf(("DDRAW: OS2IDirectDrawPalette::PalQueryInterface\n"));
 
   *ppvObj = NULL;
@@ -112 +110 @@
   OS2IDirectDrawPalette *me = (OS2IDirectDrawPalette *)This;
 
-  #ifdef DEBUG
-    dprintf(("DDRAW: OS2IDirectDrawPalette::PalAddRef %d\n", me->Referenced+1));
-  #endif
+  dprintf(("DDRAW: OS2IDirectDrawPalette::PalAddRef %d\n", me->Referenced+1));
 
   return (++me->Referenced);
@@ -171 +167 @@
  OS2IDirectDrawPalette *me = (OS2IDirectDrawPalette *)This;
 
-  #ifdef DEBUG
-    dprintf(("DDRAW: OS2IDirectDrawPalette::PalGetEntries\n"));
-  #endif
-
-  if( (NULL== lpEntries) ||(0!=dwFlags) ||(dwBase<0) ||((dwBase + dwNumEntries)>me->dwSize) )
+  dprintf(("DDRAW: OS2IDirectDrawPalette::PalGetEntries\n"));
+
+  if ((NULL == lpEntries) || (0 != dwFlags) || (dwBase > 65536)
+      || ((dwBase + dwNumEntries) > me->dwSize))
     return(DDERR_INVALIDPARAMS);
 
@@ -188 +183 @@
 HRESULT __stdcall PalInitialize(THIS, LPDIRECTDRAW, DWORD, LPPALETTEENTRY)
 {
-  #ifdef DEBUG
-    dprintf(("DDRAW: OS2IDirectDrawPalette::PalInitialize\n"));
-  #endif
+  dprintf(("DDRAW: OS2IDirectDrawPalette::PalInitialize\n"));
   return(DDERR_ALREADYINITIALIZED);
 }
@@ -202 +195 @@
  OS2IDirectDrawPalette *me = (OS2IDirectDrawPalette *)This;
 
-  #ifdef DEBUG
-    dprintf(("DDRAW: OS2IDirectDrawPalette::PalSetEntries\n"));
-  #endif
-  if( (NULL== lpNewEntries) ||(0!=dwFlags) ||(dwBase<0) ||((dwBase + dwNumEntries)>me->dwSize) )
+  dprintf(("DDRAW: OS2IDirectDrawPalette::PalSetEntries\n"));
+
+  if ((NULL== lpNewEntries) || (0 != dwFlags) || (dwBase > 65536)
+      || ((dwBase + dwNumEntries) > me->dwSize))
     return(DDERR_INVALIDPARAMS);