Changeset 634 for trunk/src/kernel32/cvtcursor.cpp

Timestamp:

Aug 23, 1999, 12:11:23 AM (26 years ago)

Author:

sandervl

Message:

Bugfixes + def files changes

File:

• trunk/src/kernel32/cvtcursor.cpp (modified) (4 diffs)

trunk/src/kernel32/cvtcursor.cpp

@@ -1 @@
-/* $Id: cvtcursor.cpp,v 1.1 1999-08-19 19:50:40 sandervl Exp $ */
+/* $Id: cvtcursor.cpp,v 1.2 1999-08-22 22:11:21 sandervl Exp $ */
 
 /*
@@ -34 +34 @@
 {
  RGBQUAD   *rgb;
- RGB       *os2rgb;
+ RGB2      *os2rgb;
  WINBITMAPINFOHEADER *bhdr = (WINBITMAPINFOHEADER *)(curHdr+1);
- BITMAPFILEHEADER    *cursorhdr;
+ BITMAPFILEHEADER2   *cursorhdr;
  int        i, bwsize, bmpsize, cursorsize;
 
   dprintf(("ConvertCursor: Cursor size %d", size));
   bmpsize = size - sizeof(CursorComponent) - (1<<bhdr->biBitCount)*sizeof(RGBQUAD);
-  cursorsize = sizeof(BITMAPFILEHEADER) + bmpsize + (1<<bhdr->biBitCount)*sizeof(RGB);
+  cursorsize = sizeof(BITMAPFILEHEADER2) + bmpsize + (1<<bhdr->biBitCount)*sizeof(RGB2);
 
-  cursorhdr  = (BITMAPFILEHEADER *)malloc(cursorsize);
+  cursorhdr  = (BITMAPFILEHEADER2 *)malloc(cursorsize);
   cursorhdr->usType        = BFT_POINTER;
-  cursorhdr->cbSize        = sizeof(BITMAPFILEHEADER);
+  cursorhdr->cbSize        = sizeof(BITMAPFILEHEADER2);
   cursorhdr->xHotspot      = curHdr->xHotspot;
 
@@ -55 +55 @@
   dprintf(("Cursor Hot.y   : %d", curHdr->yHotspot));
 
-  cursorhdr->offBits       = sizeof(BITMAPFILEHEADER) + 2*sizeof(RGB) + offsetBits;
-  cursorhdr->bmp.cbFix     = sizeof(BITMAPINFOHEADER);
-  cursorhdr->bmp.cx        = (USHORT)bhdr->biWidth;
-  cursorhdr->bmp.cy        = (USHORT)(bhdr->biHeight);
-  cursorhdr->bmp.cPlanes   = bhdr->biPlanes;
-  cursorhdr->bmp.cBitCount = bhdr->biBitCount;
+  cursorhdr->offBits       = sizeof(BITMAPFILEHEADER2) + 2*sizeof(RGB2) + offsetBits;
+  cursorhdr->bmp2.cbFix     = sizeof(BITMAPINFOHEADER);
+  cursorhdr->bmp2.cx        = (USHORT)bhdr->biWidth;
+  cursorhdr->bmp2.cy        = (USHORT)(bhdr->biHeight);
+  cursorhdr->bmp2.cPlanes   = bhdr->biPlanes;
+  cursorhdr->bmp2.cBitCount = bhdr->biBitCount;
   dprintf(("Cursor size    : %d", bhdr->biSizeImage));
   dprintf(("Cursor Width   : %d", bhdr->biWidth));
@@ -68 +68 @@
   dprintf(("Cursor Compress: %d", bhdr->biCompression));
 
-  os2rgb                   = (RGB *)(cursorhdr+1);
+  os2rgb                   = (RGB2 *)(cursorhdr+1);
   rgb                      = (RGBQUAD *)(bhdr+1);
   for(i=0;i<(1<<bhdr->biBitCount);i++) {