Changeset 6901 for trunk/src/ddraw/OS2SURFACE.CPP

Timestamp:

Oct 1, 2001, 12:23:46 AM (24 years ago)

Author:

sandervl

Message:

clipper updates

File:

• trunk/src/ddraw/OS2SURFACE.CPP (modified) (5 diffs)

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.32 2001-04-04 09:02:14 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.33 2001-09-30 22:23:44 sandervl Exp $ */
 
 /*
@@ -4516 +4516 @@
   dprintf(("DDRAW: SurfLock %d %08X %d %d\n", (int)lpRect, (int)lpSurfaceDesc, dwFlags, hEvent));
 
-  if((NULL==lpSurfaceDesc)|| ((dwFlags & DDLOCK_EVENT) && NULL != hEvent))
+  if((NULL==lpSurfaceDesc)|| ((dwFlags & DDLOCK_EVENT) && NULL != hEvent)) {
+    dprintf(("Invalid parameters"));
     return DDERR_INVALIDPARAMS;
-
-  if(lpSurfaceDesc->dwSize != sizeof(DDSURFACEDESC) && lpSurfaceDesc->dwSize != sizeof(DDSURFACEDESC2))
+  }
+
+  if(lpSurfaceDesc->dwSize != sizeof(DDSURFACEDESC) && lpSurfaceDesc->dwSize != sizeof(DDSURFACEDESC2)) {
+    dprintf(("Invalid parameters"));
     return DDERR_INVALIDPARAMS;
+  }
 
   SurfaceDesc4.dwSize = sizeof(DDSURFACEDESC2);
@@ -4570 +4574 @@
 
   if (NULL!=lpRect)
-    pIRectNew = new DDRectangle( lpRect->left, lpRect->top, lpRect->bottom, lpRect->right );
+    pIRectNew = new DDRectangle( lpRect->left, lpRect->top, lpRect->right, lpRect->bottom );
   else
-    pIRectNew = new DDRectangle( 0, 0, me->height, me->width);
+    pIRectNew = new DDRectangle( 0, 0, me->width, me->height);
 
   // ToDo : the lockchecking should be done in a critcal seq.
   dprintf( ("Lock Rectangle (%d/%d) x (%d/%d)\n",
+            pIRectNew->Left(),
             pIRectNew->Top(),
-            pIRectNew->Left(),
-            pIRectNew->Bottom(),
-            pIRectNew->Right() ));
+            pIRectNew->Right(),
+            pIRectNew->Bottom()));
 
   rc = DD_OK;
@@ -4991 +4995 @@
     dprintf(("DDRAW: Rectangle compare"));
 
+#if 1
+    i = 0;
+    pIRectEnum = (DDRectangle*)DPA_FastGetPtr(me->DPA_LockedRects,0);
+    Found = (pIRectEnum != NULL);
+#else
     pIRectUnlock = new DDRectangle( 0, 0, me->height, me->width);
 
@@ -5016 +5025 @@
     }
     delete pIRectUnlock;
+#endif
   }