Changeset 7897 for trunk/src

Timestamp:

Feb 13, 2002, 4:23:10 PM (24 years ago)

Author:

sandervl

Message:

minor updates

Location:

trunk/src/ddraw

Files:

• OS2CLIPPER.CPP (modified) (2 diffs)
• OS2SURFACE.CPP (modified) (3 diffs)

trunk/src/ddraw/OS2CLIPPER.CPP

@@ -1 @@
-/* $Id: OS2CLIPPER.CPP,v 1.16 2001-10-18 07:49:37 sandervl Exp $ */
+/* $Id: OS2CLIPPER.CPP,v 1.17 2002-02-13 15:23:10 sandervl Exp $ */
 
 /*
@@ -324 +324 @@
   WinSetVisibleRgnNotifyProc(hwnd, ClipVisRgnCallback, (DWORD)me);
 
-#if 1
   me->lpRgnData = OSLibQueryVisibleRegion(hwnd, (me->lpDraw) ? me->lpDraw->GetScreenHeight() : 0);
   me->fClipListChanged    = TRUE;
   me->fClipListChangedInt = TRUE; //internal flag
-#else
-  me->lpRgnData = (LPRGNDATA)malloc(sizeof(RGNDATAHEADER) + sizeof(RECT));
-  me->lpRgnData->rdh.dwSize = sizeof(RGNDATAHEADER);
-  me->lpRgnData->rdh.iType  = RDH_RECTANGLES;
-  me->lpRgnData->rdh.nCount = 1;
-  me->lpRgnData->rdh.nRgnSize = sizeof(RECT);
-  //TODO: Do we need to return the window rectangle or the client
-  //      rectangle converted to screen coordinates??????
-  GetWindowRect(me->clipWindow, &me->lpRgnData->rdh.rcBound);
-  RECT *rect = (RECT *)&me->lpRgnData->Buffer;
-  *rect = me->lpRgnData->rdh.rcBound;
-#endif
-
-  return(DD_OK);
-}
-//******************************************************************************
-//******************************************************************************
+
+  return(DD_OK);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.38 2001-10-17 08:08:52 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.39 2002-02-13 15:23:10 sandervl Exp $ */
 
 /*
@@ -546 +546 @@
 static void _dump_pixelformat(LPDDPIXELFORMAT pf) {
   _dump_DDPIXELFORMAT(pf->dwFlags);
-  dprintf(("DDRAW: dwFourCC : %ld\n", pf->dwFourCC));
-  dprintf(("DDRAW: RBG bit count : %ld\n", pf->dwRGBBitCount));
+  dprintf(("DDRAW: dwFourCC : %4s", &pf->dwFourCC));
+  dprintf(("DDRAW: RBG bit count : %ld", pf->dwRGBBitCount));
   dprintf(("DDRAW: Masks : R %08lx  G %08lx  B %08lx  A %08lx\n",
        pf->dwRBitMask, pf->dwGBitMask, pf->dwBBitMask, pf->dwRGBAlphaBitMask));
@@ -907 +907 @@
   if( DDSurfaceDesc.dwFlags & DDSD_CAPS )
   {
+#if 0
+//TODO: Docs say this is done, but does it really happen in windows?
+    // check for invalid flag combinations
+    switch(lpDDSurfaceDesc->ddsCaps.dwCaps2 & (DDSCAPS2_OPAQUE|DDSCAPS2_HINTDYNAMIC|DDSCAPS2_HINTSTATIC)) 
+    {
+    case 0:
+    case DDSCAPS2_OPAQUE:
+    case DDSCAPS2_HINTDYNAMIC:
+    case DDSCAPS2_HINTSTATIC:
+       break;
+
+    default:
+       dprintf(("DDRAW: Internal : illegal ddscaps2 flag combination (static/dynamic/opaque)"));
+       lastError = DDERR_INVALIDCAPS ;
+       return;
+    }
+#endif
+
     // First check if we want to create a primary surface while the ddraw object already has one
     surfaceType = DDSurfaceDesc.ddsCaps.dwCaps;