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

Timestamp:

Mar 27, 2001, 6:18:26 PM (24 years ago)

Author:

sandervl

Message:

removed cursor(group) conversion code

File:

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

trunk/src/kernel32/cvtcursor.cpp

@@ -1 @@
-/* $Id: cvtcursor.cpp,v 1.10 2000-02-16 14:25:37 sandervl Exp $ */
+/* $Id: cvtcursor.cpp,v 1.11 2001-03-27 16:18:26 sandervl Exp $ */
 
 /*
@@ -37 +37 @@
  WINBITMAPINFOHEADER *bmpHdr = (WINBITMAPINFOHEADER *)(curHdr+1);
  int bwsize, colorsize, rgbsize, cursorsize;
+ ULONG biSizeImage;
 
   bwsize   = (bmpHdr->biWidth*(bmpHdr->biHeight/2))/8;
@@ -65 +66 @@
   }
   if(bmpHdr->biSizeImage == 0 && bmpHdr->biCompression == 0) {
-        bmpHdr->biSizeImage = bwsize + colorsize;
-  }
+        biSizeImage = bwsize + colorsize;
+  }
+  else  biSizeImage = bmpHdr->biSizeImage;
 
   //SvL: 28-09-'98: cllngenu.dll has an incorrect size in the header
-  if(bmpHdr->biSizeImage < colorsize) {
-        bmpHdr->biSizeImage = colorsize;
-  }
+  if(biSizeImage < colorsize) {
+        biSizeImage = colorsize;
+  }
+
   if(bmpHdr->biBitCount > 1) {
         //And mask, xor mask (0) + color image
         cursorsize = 2*sizeof(BITMAPFILEHEADER2) + 2*sizeof(RGB2) +
-                     rgbsize + 2*bwsize + bmpHdr->biSizeImage;
+                     rgbsize + 2*bwsize + biSizeImage;
   }
   else {
@@ -95 +98 @@
  BITMAPFILEHEADER2   *cursorhdr, *cursorhdr2;
  int        i, bwsize, bmpsize, cursorsize, rgbsize, colorsize;
+ ULONG      biSizeImage;
 
   dprintf(("ConvertCursor: Cursor size %d", size));
@@ -124 +128 @@
   }
   if(bmpHdr->biSizeImage == 0 && bmpHdr->biCompression == 0) {
-        bmpHdr->biSizeImage = bwsize + colorsize;
-  }
+        biSizeImage = bwsize + colorsize;
+  }
+  else  biSizeImage = bmpHdr->biSizeImage;
 
   //SvL: 28-09-'98: cllngenu.dll has an incorrect size in the header
-  if(bmpHdr->biSizeImage < colorsize) {
-        bmpHdr->biSizeImage = colorsize;
-  }
+  if(biSizeImage < colorsize) {
+        biSizeImage = colorsize;
+  }
+
   if(bmpHdr->biBitCount == 1) {
         //And + xor mask 
@@ -138 +144 @@
         //And mask, xor mask (0) + color image
         cursorsize = 2*sizeof(BITMAPFILEHEADER2) + 2*sizeof(RGB2) +
-                     rgbsize + 2*bwsize + bmpHdr->biSizeImage;
+                     rgbsize + 2*bwsize + biSizeImage;
   }
 
@@ -170 +176 @@
   cursorhdr->bmp2.ulCompression   = BCA_UNCOMP;
   cursorhdr->bmp2.ulColorEncoding = BCE_RGB;
-  dprintf2(("Cursor size    : %d", bmpHdr->biSizeImage));
+  dprintf2(("Cursor size    : %d", biSizeImage));
   dprintf2(("Cursor Width   : %d", bmpHdr->biWidth));
   //height for both the XOR and AND bitmap (color & BW)