Changeset 313 for trunk/src

Timestamp:

Jul 15, 1999, 10:42:37 PM (26 years ago)

Author:

hugh

Message:

Changed to from IRectangel to new DDRectangle type

File:

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

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1573 +1573 @@
  OS2IDirectDrawSurface *dest = (OS2IDirectDrawSurface *)This;
  OS2IDirectDrawSurface *src  = (OS2IDirectDrawSurface *)lpDDSrcSurface;
- ISequence<IRectangle*>::Cursor *EnumCursor;
+ ISequence<DDRectangle*>::Cursor *EnumCursor;
 
  HRESULT                rc;
@@ -1584 +1584 @@
  char                   *pBltPos, *pSrcPos;
  DDSURFACEDESC2         DestSurfaceDesc, SrcSurfaceDesc;
- IRectangle             *pIRectDest,*pIRectSrc,*pIRectTest;
+ DDRectangle             *pIRectDest,*pIRectSrc,*pIRectTest;
  RECTL                  DestRect, SrcRect;
  BOOL Found;
@@ -1598 +1598 @@
   if (NULL!=lpDestRect)
   {
-    pIRectDest = new IRectangle( lpDestRect->left,
-                                 lpDestRect->bottom,
-                                 lpDestRect->right,
-                                 lpDestRect->top);
+    pIRectDest = new DDRectangle( lpDestRect->top,
+                                  lpDestRect->left,
+                                  lpDestRect->bottom,
+                                  lpDestRect->right);
     memcpy(&DestRect,lpDestRect,sizeof(RECTL) );
   }
   else
   {
-    pIRectDest = new IRectangle( 0, dest->height, dest->width, 0);
+    pIRectDest = new DDRectangle( 0, 0, dest->height, dest->width);
     DestRect.top    = 0;
     DestRect.left   = 0;
@@ -1737 +1737 @@
   if (NULL!=lpSrcRect)
   {
-    pIRectSrc = new IRectangle( lpSrcRect->left,
-                                lpSrcRect->bottom,
-                                lpSrcRect->right,
-                                lpSrcRect->top);
+    pIRectSrc = new DDRectangle( lpSrcRect->top,
+                                 lpSrcRect->left,
+                                 lpSrcRect->bottom,
+                                 lpSrcRect->right);
     memcpy(&SrcRect,lpSrcRect,sizeof(RECTL) );
   }
   else
   {
-    pIRectSrc = new IRectangle( 0, src->height, src->width, 0);
+    pIRectSrc = new DDRectangle( 0, 0, src->height, src->width);
     SrcRect.top    = 0;
     SrcRect.left   = 0;
@@ -3638 +3638 @@
 
   OS2IDirectDrawSurface *me = (OS2IDirectDrawSurface *)This;
-  ISequence<IRectangle*>::Cursor *EnumCursor;
+  ISequence<DDRectangle*>::Cursor *EnumCursor;
 
   BOOL Found;
   ULONG  nrScanLines, rc;
   char *pBuffer;
-  IRectangle *pIRectCurrent,*pIRectNew;
+  DDRectangle *pIRectCurrent,*pIRectNew;
   static int times = 0;
 
@@ -3656 +3656 @@
 
   if (NULL!=lpRect)
-    pIRectNew = new IRectangle( lpRect->left, lpRect->bottom, lpRect->right, lpRect->top);
+    pIRectNew = new DDRectangle( lpRect->left, lpRect->top, lpRect->bottom, lpRect->right );
   else
-    pIRectNew = new IRectangle( 0, me->height, me->width, 0);
+    pIRectNew = new DDRectangle( 0, 0, me->height, me->width);
 
   // ToDo : the lockchecking should be done in a critcal seq.
@@ -3967 +3967 @@
 
   OS2IDirectDrawSurface *me = (OS2IDirectDrawSurface *)This;
-  ISequence<IRectangle*>::Cursor *EnumCursor;
-  IRectangle *pIRectUnlock;
+  ISequence<DDRectangle*>::Cursor *EnumCursor;
+  DDRectangle *pIRectUnlock;
   BOOL Found = FALSE;
 
@@ -3986 +3986 @@
   {
     WriteLog("Unlock rectangle\n");
-    pIRectUnlock = new IRectangle( lpSurfaceRect->left,
+    pIRectUnlock = new DDRectangle( lpSurfaceRect->top,
+                                   lpSurfaceRect->left,
                                    lpSurfaceRect->bottom,
-                                   lpSurfaceRect->right,
-                                   lpSurfaceRect->top);
+                                   lpSurfaceRect->right);
   }
   else
   {
     WriteLog("Unlock complete surface\n");
-    pIRectUnlock = new IRectangle( 0, me->height, me->width, 0);
+    pIRectUnlock = new DDRectangle( 0, 0, me->height, me->width);
   }