Changeset 997 for trunk/src

Timestamp:

Sep 21, 1999, 10:24:53 AM (26 years ago)

Author:

sandervl

Message:

Fixes for icon(group) + cursorgroup conversion

Location:

trunk/src/kernel32

Files:

• cvtcursorgrp.cpp (modified) (3 diffs)
• cvticon.cpp (modified) (4 diffs)
• cvticongrp.cpp (modified) (3 diffs)

trunk/src/kernel32/cvtcursorgrp.cpp

@@ -1 @@
-/* $Id: cvtcursorgrp.cpp,v 1.3 1999-09-15 23:38:00 sandervl Exp $ */
+/* $Id: cvtcursorgrp.cpp,v 1.4 1999-09-21 08:24:53 sandervl Exp $ */
 
 /*
@@ -74 +74 @@
         }
 
-        if(i != chdr->cwCount -1) {
-                bafh->offNext = (int)&bafh->bfh - (int)orgbafh + winres->getSize();
-        }
-        else    bafh->offNext = 0;
-
         cursorhdr = (CursorComponent *)winres->lockResource();
         os2cursor = ConvertCursor(cursorhdr, winres->getSize(), &os2cursorsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER)-sizeof(BITMAPFILEHEADER));
@@ -88 +83 @@
                 continue;
         }
+
+        if(i != chdr->cwCount -1) {
+                bafh->offNext = (int)&bafh->bfh - (int)orgbafh + os2cursorsize;
+        }
+        else    bafh->offNext = 0;
 
         memcpy((char *)&bafh->bfh, os2cursor, os2cursorsize);

trunk/src/kernel32/cvticon.cpp

@@ -1 @@
-/* $Id: cvticon.cpp,v 1.3 1999-09-04 12:41:46 sandervl Exp $ */
+/* $Id: cvticon.cpp,v 1.4 1999-09-21 08:24:53 sandervl Exp $ */
 
 /*
@@ -131 +131 @@
   iconsize = 2*sizeof(BITMAPFILEHEADER2) + 2*sizeof(RGB2) +
              rgbsize + 2*bwsize + bmpHdr->biSizeImage;
-#if 0
-  //SvL: Not necessary anymore
-  //There are icons without an XOR mask, so check for it
-  if(bmpHdr->biSizeImage == colorsize) {
-        iconsize += bwsize;
-  }
-#endif
+
   iconhdr  = (BITMAPFILEHEADER2 *)malloc(iconsize);
   memset(iconhdr, 0, iconsize);
@@ -182 +176 @@
   }
   //write 2*mono pixels + color pixels
-  //There are icons without an XOR mask, so check for it
+  //There are icons without an AND mask, so check for it
   if(bmpHdr->biSizeImage == colorsize) 
   {
@@ -190 +184 @@
   }
   else {
-        memcpy((char *)os2rgb, (char *)rgb+colorsize, bwsize);
-        memcpy((char *)os2rgb+bwsize, (char *)rgb+colorsize, bwsize);
-        memcpy((char *)os2rgb+2*bwsize, (char *)rgb, colorsize);
+        memset((char *)os2rgb, 0, bwsize); // windows has no xor mask
+        memcpy((char *)os2rgb+bwsize, (char *)rgb+colorsize, bwsize); // and-mask
+        memcpy((char *)os2rgb+2*bwsize, (char *)rgb, colorsize); // color(xor-mask)
+
+//        memcpy((char *)os2rgb, (char *)rgb+colorsize, bwsize);
+//        memcpy((char *)os2rgb+bwsize, (char *)rgb+colorsize, bwsize);
+//        memcpy((char *)os2rgb+2*bwsize, (char *)rgb, colorsize);
   }
   *os2size = iconsize;

trunk/src/kernel32/cvticongrp.cpp

@@ -1 @@
-/* $Id: cvticongrp.cpp,v 1.3 1999-09-15 23:38:01 sandervl Exp $ */
+/* $Id: cvticongrp.cpp,v 1.4 1999-09-21 08:24:53 sandervl Exp $ */
 
 /*
@@ -73 +73 @@
                 continue;
         }
-        if(i != ihdr->wCount -1) {
-                bafh->offNext = (int)&bafh->bfh2 - (int)orgbafh + winres->getSize();
-        }
-        else    bafh->offNext = 0;
 
         iconhdr = (WINBITMAPINFOHEADER *)winres->lockResource();
@@ -87 +83 @@
                 continue;
         }
+
+        if(i != ihdr->wCount -1) {
+                bafh->offNext = (int)&bafh->bfh2 - (int)orgbafh + os2iconsize;
+        }
+        else    bafh->offNext = 0;
 
         memcpy((char *)&bafh->bfh2, os2icon, os2iconsize);