Changeset 1036 for trunk/src/kernel32

Timestamp:

Sep 25, 1999, 12:47:00 AM (26 years ago)

Author:

sandervl

Message:

Cursor fixes

Location:

trunk/src/kernel32

Files:

• cvtcursor.cpp (modified) (3 diffs)
• cvtcursorgrp.cpp (modified) (6 diffs)

trunk/src/kernel32/cvtcursor.cpp

@@ -1 @@
-/* $Id: cvtcursor.cpp,v 1.3 1999-09-04 12:41:45 sandervl Exp $ */
+/* $Id: cvtcursor.cpp,v 1.4 1999-09-24 22:47:00 sandervl Exp $ */
 
 /*
@@ -56 +56 @@
 
   cursorhdr  = (BITMAPFILEHEADER2 *)malloc(cursorsize);
+  memset(cursorhdr, 0, cursorsize);
   cursorhdr->usType        = BFT_POINTER;
   cursorhdr->cbSize        = sizeof(BITMAPFILEHEADER2);
@@ -68 +69 @@
 
   cursorhdr->offBits       = sizeof(BITMAPFILEHEADER2) + 2*sizeof(RGB2) + offsetBits;
-  cursorhdr->bmp2.cbFix     = sizeof(BITMAPINFOHEADER);
+  cursorhdr->bmp2.cbFix     = sizeof(BITMAPINFOHEADER2);
   cursorhdr->bmp2.cx        = (USHORT)bhdr->biWidth;
   cursorhdr->bmp2.cy        = (USHORT)(bhdr->biHeight);
   cursorhdr->bmp2.cPlanes   = bhdr->biPlanes;
   cursorhdr->bmp2.cBitCount = bhdr->biBitCount;
+  cursorhdr->bmp2.ulCompression   = BCA_UNCOMP;
+  cursorhdr->bmp2.ulColorEncoding = BCE_RGB;
   dprintf(("Cursor size    : %d", bhdr->biSizeImage));
   dprintf(("Cursor Width   : %d", bhdr->biWidth));

trunk/src/kernel32/cvtcursorgrp.cpp

@@ -1 @@
-/* $Id: cvtcursorgrp.cpp,v 1.4 1999-09-21 08:24:53 sandervl Exp $ */
+/* $Id: cvtcursorgrp.cpp,v 1.5 1999-09-24 22:47:00 sandervl Exp $ */
 
 /*
@@ -36 +36 @@
  CursorResDir *rdir = (CursorResDir *)(chdr + 1);
  int i, groupsize = 0, os2cursorsize;
- BITMAPARRAYFILEHEADER *bafh, *orgbafh;
+ BITMAPARRAYFILEHEADER2 *bafh, *orgbafh;
  CursorComponent       *cursorhdr;
  Win32Resource         *winres;
@@ -56 +56 @@
         rdir++;
   }
-  bafh    = (BITMAPARRAYFILEHEADER *)malloc(groupsize+chdr->cwCount*sizeof(BITMAPARRAYFILEHEADER));
+  bafh    = (BITMAPARRAYFILEHEADER2 *)malloc(groupsize+chdr->cwCount*sizeof(BITMAPARRAYFILEHEADER2));
   orgbafh = bafh;
 
@@ -62 +62 @@
   for(i=0;i<chdr->cwCount;i++) {
         bafh->usType    = BFT_BITMAPARRAY;
-        bafh->cbSize    = sizeof(BITMAPARRAYFILEHEADER);
+        bafh->cbSize    = sizeof(BITMAPARRAYFILEHEADER2);
         bafh->cxDisplay = 0;
         bafh->cyDisplay = 0;
@@ -75 +75 @@
 
         cursorhdr = (CursorComponent *)winres->lockResource();
-        os2cursor = ConvertCursor(cursorhdr, winres->getSize(), &os2cursorsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER)-sizeof(BITMAPFILEHEADER));
+        os2cursor = ConvertCursor(cursorhdr, winres->getSize(), &os2cursorsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER));
 
         if(os2cursor == NULL) {
@@ -85 +85 @@
 
         if(i != chdr->cwCount -1) {
-                bafh->offNext = (int)&bafh->bfh - (int)orgbafh + os2cursorsize;
+                bafh->offNext = (int)&bafh->bfh2 - (int)orgbafh + os2cursorsize;
         }
         else    bafh->offNext = 0;
 
-        memcpy((char *)&bafh->bfh, os2cursor, os2cursorsize);
+        memcpy((char *)&bafh->bfh2, os2cursor, os2cursorsize);
         free(os2cursor);
 
-        bafh = (BITMAPARRAYFILEHEADER *)((int)&bafh->bfh + os2cursorsize);
+        bafh = (BITMAPARRAYFILEHEADER2 *)((int)&bafh->bfh2 + os2cursorsize);
         delete winres;