Changeset 1040

Timestamp:

Sep 25, 1999, 4:11:31 PM (26 years ago)

Author:

sandervl

Message:

Cursor(group) fixes

Location:

trunk/src/kernel32

Files:

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

trunk/src/kernel32/cvtcursor.cpp

@@ -1 @@
-/* $Id: cvtcursor.cpp,v 1.4 1999-09-24 22:47:00 sandervl Exp $ */
+/* $Id: cvtcursor.cpp,v 1.5 1999-09-25 14:11:30 sandervl Exp $ */
 
 /*
@@ -62 +62 @@
 
   /* @@@PH y-hotspot is upside down ! */
-  cursorhdr->yHotspot      = (bhdr->biHeight >> 1) - 1       /* height div 2 */
+  cursorhdr->yHotspot      = (bhdr->biHeight >> 1)       /* height div 2 */
                              - curHdr->yHotspot;         /* subtract hot.y */
 
@@ -118 +118 @@
   else    bwsize = bhdr->biSizeImage;
 
-  //write XOR and AND mask
-  memcpy((char *)os2rgb, (char *)rgb, bwsize);
+  //write XOR and AND mask in reversed order (Win32 XOR-AND, PM AND-XOR)
+  memcpy((char *)os2rgb, (char *)rgb+bwsize/2, bwsize/2);
+  memcpy((char *)os2rgb+bwsize/2, (char *)rgb, bwsize/2);
 
   *os2size = cursorsize;

trunk/src/kernel32/cvtcursorgrp.cpp

@@ -1 @@
-/* $Id: cvtcursorgrp.cpp,v 1.5 1999-09-24 22:47:00 sandervl Exp $ */
+/* $Id: cvtcursorgrp.cpp,v 1.6 1999-09-25 14:11:31 sandervl Exp $ */
 
 /*
@@ -75 +75 @@
 
         cursorhdr = (CursorComponent *)winres->lockResource();
-        os2cursor = ConvertCursor(cursorhdr, winres->getSize(), &os2cursorsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER));
+        os2cursor = ConvertCursor(cursorhdr, winres->getSize(), &os2cursorsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER2));
 
         if(os2cursor == NULL) {