Changeset 1752 for trunk/src

Timestamp:

Nov 15, 1999, 8:01:30 PM (26 years ago)

Author:

hugh

Message:

Added io_init2 function
Fixed some bugs in the ColorFillCode

Location:

trunk/src/ddraw

Files:

• OS2SURFACE.CPP (modified) (8 diffs)
• iccio1.asm (modified) (2 diffs)

trunk/src/ddraw/OS2SURFACE.CPP

@@ -1247 +1247 @@
             // Yes => No Colorconversion is needed so point to the same buffer
             pDiveBuffer  = pFrameBuffer;
+            dwPitchDB = dwPitchFB;
           }
           else
@@ -1416 +1417 @@
   if(NULL!=lpDestRect)
   {
-    #ifdef DEBUG
-      dprintf(("DDRAW: Fill only Rect(%d,%d)(%d,%d)\n", lpDestRect->left, lpDestRect->top,
-               lpDestRect->right, lpDestRect->bottom));
-    #endif
+    dprintf(("DDRAW: Fill only Rect(%d,%d)(%d,%d)\n", lpDestRect->left, lpDestRect->top,
+             lpDestRect->right, lpDestRect->bottom));
     FillWidth  = lpDestRect->right - lpDestRect->left;
     FillHeight = lpDestRect->bottom - lpDestRect->top -1;
@@ -1434 +1433 @@
   }
   dprintf(("DDRAW: 0x%08X (%d/%d) at\n", pLine,FillWidth,FillHeight));
+
+  // Better safe then sorry
+  if(FillHeight<=0)
+    return(DD_OK);
 
   if(pDiveBuffer!=pFrameBuffer)
@@ -1488 +1491 @@
       {
         if(8==lpDraw->GetScreenBpp())
-          dwFillColor = pPal16[dwFillColor];
-      }
-      dwColor = (dwFillColor<<16) + (dwFillColor);
+          dwColor = (pPal16[dwFillColor]<<16) + pPal16[dwFillColor];
+      }
+      else
+      {
+        dwColor = (dwFillColor<<16) + (dwFillColor);
+      }
       dprintf(("DDRAW: Fill with 0x%08X\n",dwColor));
       for(i=0,pColor = (DWORD*)pLine;i<(FillWidth/2);i++)
@@ -1523 +1529 @@
   } // end switch(dest->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount)
 
-
+  // First Line has been Filled so FillHeight-1 are left by one
+  FillHeight--;
   pFillPos = pLine + dwPitchDB;
-  FillWidth = FillWidth*dwBytesPPDive;;
+  FillWidth = FillWidth*dwBytesPPDive;
+
   for( y=0;y<FillHeight;y++,pFillPos+=dwPitchDB)
   {
@@ -1540 +1548 @@
   if(pDiveBuffer!=pFrameBuffer)
   {
-    dprintf(("DDRAW: CC-Mode Fill FrameBuffer\n"));
+    dprintf(("DDRAW: CC-Mode Fill FrameBuffer %08X\n",pFrameBuffer));
 
     if(NULL!=lpDestRect)
     {
+      dprintf(("DDRAW: Fill only Rect(%d,%d)(%d,%d)\n", lpDestRect->left, lpDestRect->top,
+               lpDestRect->right, lpDestRect->bottom));
       FillWidth  = lpDestRect->right - lpDestRect->left;
       FillHeight = lpDestRect->bottom - lpDestRect->top -1;
       pLine = pFrameBuffer +
               (lpDestRect->top*dwPitchFB) +
-              (lpDestRect->left*lpDraw->GetScreenBpp());
+              (lpDestRect->left*(lpDraw->GetScreenBpp()>>3));
     }
     else
     {
+      dprintf(("DDRAW: Fill all at addr "));
       FillWidth  = width;
       FillHeight = height -1;
       pLine = pFrameBuffer;
     }
+    dprintf(("DDRAW: 0x%08X width,height(%d/%d) \n", pLine,FillWidth,FillHeight));
 
     // Colorconversion mode we must also fill the other buffer
@@ -1564 +1576 @@
         dwColor = (dwFillColor<<24) + (dwFillColor<<16) +
                   (dwFillColor<<8)  + (dwFillColor);
-        dprintf(("DDRAW: Fill with 0x%08X\n",dwColor));
+        dprintf(("DDRAW: Fill with %08X => 0x%08X\n",dwFillColor,dwColor));
         for(i=0,pColor = (DWORD*)pLine;i<(FillWidth/4);i++)
           pColor[i] = dwColor;
         if(FillWidth % 4)
         {
-           pFillPos = (char*) (&pColor[i-1]);
+          pFillPos = (char*) (&pColor[i-1]);
           for(i=0;i<FillWidth % 4;i++)
              pFillPos[i] = (UCHAR) dwColor;
@@ -1600 +1612 @@
         for(i=0,pColor = (DWORD*)pLine;i<FillWidth;i++)
           pColor[i] = dwColor;
-    }
+        break;
+      default:
+        dprintf(("DDRAW: Unsupported # of Bits %d",lpDraw->GetScreenBpp()));
+    }
+
+    // First Line has been Filled so FillHeight-1 are left by one
+    FillHeight--;
 
     pFillPos = pLine + dwPitchFB;
-    FillWidth = FillWidth*lpDraw->GetScreenBpp();
+    FillWidth = FillWidth*(lpDraw->GetScreenBpp()>>3);
     for( y=0;y<FillHeight;y++,pFillPos+=dwPitchFB)
     {

trunk/src/ddraw/iccio1.asm

@@ -240 +240 @@
 io_init1 ENDP
 
+; void in_init(short)
+PUBLIC  io_init2
+  ALIGN  04H
+io_init2  PROC
+
+  MOV  gdt, AX    ; store in ioentry address selector part
+  XOR  EAX, EAX  ; EAX = 0
+  MOV  DWORD PTR [ioentry], EAX ; clear ioentry offset part
+        ; return code = 0 (in EAX)
+
+        ; now use this function to raise the IOPL
+  MOV  EBX,13    ; special function code
+  CALL  FWORD PTR [ioentry]  ; CALL intersegment indirect 16:32
+
+  XOR  EAX, EAX  ; return code = 0
+  ret
+io_init2  ENDP
+
   PUBLIC  io_exit1
   ALIGN  04H
@@ -264 +282 @@
 io_exit1  ENDP
 
+
+
 ; for diagnostic only