Changeset 1434 for trunk/src

Timestamp:

Oct 25, 1999, 1:17:30 AM (26 years ago)

Author:

hugh

Message:

Fixed Bug in colorconversion, didn't iterate
ddex1.exe from the DX samples now works,
but bitmap is still mirrored up/down

Location:

trunk/src/ddraw

Files:

• OS2DDRAW.CPP (modified) (1 diff)
• OS2PALETTE.CPP (modified) (1 diff)
• OS2SURFACE.CPP (modified) (8 diffs)
• OS2SURFACE.H (modified) (1 diff)

trunk/src/ddraw/OS2DDRAW.CPP

@@ -446 +446 @@
   if(newsurf == NULL)
   {
-    rc =DDERR_OUTOFMEMORY;
+    rc = DDERR_OUTOFMEMORY;
   }
   else

trunk/src/ddraw/OS2PALETTE.CPP

@@ -225 +225 @@
   {
     if(NULL!=((OS2IDirectDraw*)me->lpDraw)->pPrimSurf)
-      ((OS2IDirectDrawSurface*)((OS2IDirectDraw*)me->lpDraw)->pPrimSurf)->ColorConversion(NULL);;
+      ((OS2IDirectDrawSurface*)((OS2IDirectDraw*)me->lpDraw)->pPrimSurf)->ColorConversion(NULL);
   }
   return(DD_OK);

trunk/src/ddraw/OS2SURFACE.CPP

@@ -532 +532 @@
 
   lpVtbl                     = &Vtbl;
+  lpVtbl2                    = &Vtbl;
+  dwUnknownData              = 0xDEADDEAD;
   Vtbl.AddRef                = SurfAddRef;
   Vtbl.Release               = SurfRelease;
@@ -818 +820 @@
 
           BackBuffer = new OS2IDirectDrawSurface(lpDraw, &ComplexSurfaceDesc, TRUE, TRUE);
+          BackBuffer->Vtbl.AddRef((IDirectDrawSurface *)BackBuffer);
 
           if (BackBuffer->GetLastError()==DD_OK)
@@ -1140 +1143 @@
 
           BackBuffer = new OS2IDirectDrawSurface(lpDraw, &ComplexSurfaceDesc, TRUE, Mainchain);
+          BackBuffer->Vtbl.AddRef((IDirectDrawSurface *)BackBuffer);
+
           if (BackBuffer->GetLastError()==DD_OK)
           {
@@ -1172 +1177 @@
 
             MipMapSurface = new OS2IDirectDrawSurface(lpDraw, &ComplexSurfaceDesc, TRUE);
+            MipMapSurface->Vtbl.AddRef((IDirectDrawSurface *)MipMapSurface);
 
             DPA_InsertPtr( DPA_SurfaceMipMaps,
@@ -1584 +1590 @@
           for(x=0;x<width;x++)
           {
-            *((WORD*)pDLine) = pPal16[pSLine[x]];
+            *(((WORD*)pDLine)+x) = pPal16[pSLine[x]];
+
           }
           pSLine += dwPitchFB;
@@ -4473 +4480 @@
   memset(&BitmapInfo,0, sizeof(BitmapInfo));
   BitmapInfo.bmiHead.biSize     = sizeof(BITMAPINFOHEADER);
+  /*
   BitmapInfo.bmiHead.biWidth    = me->DDSurfaceDesc.lPitch/ (me->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount>>3);
   BitmapInfo.bmiHead.biHeight   = me->DDSurfaceDesc.dwHeight;
   BitmapInfo.bmiHead.biPlanes   = 1;
   BitmapInfo.bmiHead.biBitCount = 0; // me->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount;
-
+  */
   switch(me->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount)
   {
@@ -4485 +4493 @@
       BitmapInfo.bmiHead.biCompression = BI_RGB;
       //GetSystemPaletteEntries(me->hdcImage,0,255,(PPALETTEENTRY)&BitmapInfo.bmiCols[0]);
-      rc = GetDIBits(hdc, me->hbmImage, 0, me->DDSurfaceDesc.dwHeight,
-                NULL,(PBITMAPINFO)&BitmapInfo,DIB_PAL_COLORS);
+      rc = GetDIBits( hdc,
+                      me->hbmImage,
+                      0,
+                      me->DDSurfaceDesc.dwHeight,
+                      NULL,
+                      (PBITMAPINFO)&BitmapInfo,
+                      DIB_RGB_COLORS);
       WriteLog( "GetDIBits rc=%d\n Size   :%d\n Width  :%d\n Height :%d\n"
-                " Planes :%d\n BitCount :%d\nLastEror = %d\n",
+                " Planes :%d\n BitCount :%d\nLastEror = %d\nPixel[0,0] = 0x%02X\n",
                 rc,
                 BitmapInfo.bmiHead.biSize,
@@ -4495 +4508 @@
                 BitmapInfo.bmiHead.biPlanes,
                 BitmapInfo.bmiHead.biBitCount,
-                GetLastError());
+                GetLastError(),
+                ((char*)me->DDSurfaceDesc.lpSurface)[0]);
       rc = GetDIBits( hdc,
-                      me->hbmImage, 0,
+                      me->hbmImage,
+                      0,
                       me->DDSurfaceDesc.dwHeight,
                       me->DDSurfaceDesc.lpSurface,
                       (PBITMAPINFO)&BitmapInfo,
-                      DIB_PAL_COLORS);
-      WriteLog( "GetDIBits rc=%d\n LastEror = %d\n",
+                      DIB_RGB_COLORS);
+      WriteLog( "GetDIBits rc=%d\n LastEror = %d\nPixel[0,0] = 0x%02X\n",
                 rc,
-                GetLastError());
+                GetLastError(),
+                ((char*)me->DDSurfaceDesc.lpSurface)[0]);
       break;
     case 16:

trunk/src/ddraw/OS2SURFACE.H

@@ -30 +30 @@
   //this one has to go first!
   IDirectDrawSurface4Vtbl *lpVtbl;
+  IDirectDrawSurface4Vtbl *lpVtbl2;         // 2nd Vtable pointer An other MS assumtion see below
+  DWORD                    dwUnknownData;   // Pointer to unknown data set to DEADDEAD to indicate that we can't handle this
   IDirectDrawSurface2Vtbl  Vtbl2;
   IDirectDrawSurface3Vtbl  Vtbl3;