Changeset 5291 for trunk/src/ddraw/OS2SURFACE.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/OS2SURFACE.CPP (modified) (25 diffs)

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.27 2000-09-02 08:27:05 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.28 2001-03-09 22:48:47 mike Exp $ */
 
 /*
@@ -560 +560 @@
 
 {
-  ULONG rc;
-  DWORD i;
-  DIVE_CAPS dCaps;
+  DWORD rc;
   DDSURFACEDESC2 ComplexSurfaceDesc;
-  OS2IDirectDrawSurface *AttachedSurface;
   OS2IDirectDrawSurface *MipMapSurface;
 
@@ -1402 +1399 @@
 {
 
-  int i, FillWidth, FillHeight, Top, Left;
+  int  FillWidth, FillHeight, Top, Left;
   DWORD *pPal24;
   WORD  *pPal16;
@@ -1666 +1663 @@
 OS2IDirectDrawSurface::~OS2IDirectDrawSurface()
 {
-  OS2IDirectDrawSurface  *AttachedSurface;
-
 
   if(DDSurfaceDesc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
@@ -1744 +1739 @@
 
   lpDraw->Vtbl.Release(lpDraw);
-
-}
+}
+
 //******************************************************************************
 //******************************************************************************
@@ -2125 +2120 @@
  OS2IDirectDrawSurface *src  = (OS2IDirectDrawSurface *)lpDDSrcSurface;
 
- HRESULT                rc;
- ULONG                  ulColor, *pColor;
- RECTL                  cliprect;
-
- int                    x, y, i, j, BlitWidth, BlitHeight;
+ int                    x, i, BlitWidth, BlitHeight;
  PALETTEENTRY           SysPal[257];
  PLOGPALETTE            pLogPal = (PLOGPALETTE) SysPal;
@@ -2435 +2426 @@
     dprintf(("DDRAW: Blitting with scaling\n Not supported.\n"));
 
-    return DDERR_NOSTRETCHHW;
+//    return DDERR_NOSTRETCHHW;
   }
 
@@ -2678 +2669 @@
         {
           DWORD dwFx;
-          DWORD dwSrcColor, dwDestColor;
 
           dwFlags &= ~DDBLT_DDFX; // remove the handled flag
@@ -3195 +3185 @@
   RECTL SrcRect;
   char *pBltPos, *pSrcPos;
-  DWORD dwDestColor, dwSrcColor, BlitWidth, BlitHeight,x,y;
+  DWORD dwDestColor, dwSrcColor, BlitWidth, BlitHeight, x;
 
   dprintf(("DDRAW: SurfBltFast4 %08X at(%d/%d) onto %08X with flags %08X\n",src, dwX,dwY, dest, dwTrans));
 
-  if( (NULL==lpDDSrcSurface) ||
-      (dwX<0) || (dwY<0) ||
-      (dwX>dest->width) ||
-      (dwY>dest->height))
+  if( (NULL == lpDDSrcSurface) ||
+      ((LONG)dwX < 0) || ((LONG)dwY < 0) ||
+      (dwX > dest->width) ||
+      (dwY > dest->height))
   {
     dprintf(("DDRAW: Invalid Parameters %08X, %d %d", lpDDSrcSurface ,dest->width , dest->height));
@@ -3208 +3198 @@
   }
 
-  if (NULL!=lpSrcRect)
+  if (NULL != lpSrcRect)
   {
     memcpy(&SrcRect,lpSrcRect,sizeof(RECTL) );
@@ -3368 +3358 @@
         {
           case 1:
-            if(CPUHasMMX())
-              while(BlitHeight--)
+            if (CPUHasMMX())
+              while (BlitHeight--)
               {
                 BlitColorKey8MMX((PBYTE)pBltPos,(PBYTE)pSrcPos,dwSrcColor,BlitWidth);
@@ -3376 +3366 @@
               }
             else
-              while(BlitHeight--)
+              while (BlitHeight--)
               {
                 BlitColorKey8((PBYTE)pBltPos,(PBYTE)pSrcPos,dwSrcColor,BlitWidth);
@@ -3385 +3375 @@
           case 2:
 
-            if(CPUHasMMX())
+            if (CPUHasMMX())
               while(BlitHeight--)
               {
@@ -3433 +3423 @@
     else
     {
-      if(dwTrans & DDBLTFAST_DESTCOLORKEY)
+      if (dwTrans & DDBLTFAST_DESTCOLORKEY)
       {
         dprintf(("DDRAW: DestColorKey\n"));
@@ -3523 +3513 @@
   //   dest->Vtbl4->ChangeUniquenessValue(dest);
 
-  return(DD_OK);
+  return DD_OK;
 }
 //******************************************************************************
@@ -3801 +3791 @@
   LPVOID Data;
   char *pcrFB,*pcFB,*pcrDB,*pcDB;
-  ULONG rc;
 
   dprintf(("DDRAW: SurfFlip4\n"));
@@ -3849 +3838 @@
   }
 
-  if(-1 != me->diveBufNr)
+  if (-1 != me->diveBufNr)
   {
     //dprintf(("DDRAW: DIVE Flipchain DiveBuffer #%d",FlipSurface->diveBufNr));
@@ -3900 +3889 @@
     me->pDiveBuffer             = FlipSurface->pDiveBuffer;
 
-    if(NULL==lpDDSurf)
-    {
-      while(NULL!=FlipSurface->BackBuffer)
+    if (NULL==lpDDSurf)
+    {
+      while (NULL!=FlipSurface->BackBuffer)
       {
         FlipSurface->DDSurfaceDesc.lpSurface = FlipSurface->BackBuffer->DDSurfaceDesc.lpSurface;
@@ -3919 +3908 @@
   }
 
-  return(DD_OK);
-}
+  return DD_OK;
+}
+
 //******************************************************************************
 //******************************************************************************
@@ -4171 +4161 @@
     BitmapInfo.bmiHead.biHeight   = LockedSurfaceDesc.dwHeight;
     BitmapInfo.bmiHead.biPlanes   = 1;
-    BitmapInfo.bmiHead.biBitCount = LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
+    BitmapInfo.bmiHead.biBitCount = (WORD)LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
     memset(&bmihHdr, 0, sizeof(bmihHdr));
     bmihHdr.biSize     = sizeof(BITMAPINFOHEADER);
@@ -4177 +4167 @@
     bmihHdr.biHeight   = LockedSurfaceDesc.dwHeight;
     bmihHdr.biPlanes   = 1;
-    bmihHdr.biBitCount = LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
+    bmihHdr.biBitCount = (WORD)LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
     #else
     bmpSurface.bmType       = 0;
@@ -4267 +4257 @@
       BitmapInfo.bmiHead.biHeight   = LockedSurfaceDesc.dwHeight;
       BitmapInfo.bmiHead.biPlanes   = 1;
-      BitmapInfo.bmiHead.biBitCount = LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
+      BitmapInfo.bmiHead.biBitCount = (WORD)LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
 
       switch(LockedSurfaceDesc.ddpfPixelFormat.dwRGBBitCount)
@@ -4504 +4494 @@
 
   BOOL Found;
-  ULONG  nrScanLines;
-  char *pBuffer;
   DDRectangle *pIRectCurrent,*pIRectNew;
-  static int times = 0;
   HRESULT rc;
 
@@ -4619 +4606 @@
    RGBQUAD           bmiCols[256];
  } BitmapInfo;
- BITMAP bmpData;
- char szError[256];
- int i,rc;
+// BITMAP bmpData;
+ int rc;
 
   dprintf(("DDRAW: SurfReleaseDC\n"));
@@ -5778 +5764 @@
   DWORD dwTLineStart;     // # DWORD in which the first transinfo is
   DWORD dwTDWStart;       // byte in which the firs transinfo is
-  DWORD dwTrans;          // current transparentvalue
-  DWORD BlitWidth;
+
   dwTLineLen = 1 + ((pSrcDesc->dwWidth + 31) & ~31);
   pdwTLine = (DWORD*)pAlpha + (dwTLineLen* lpSrcRect->top);