Changeset 5386 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

removed cursor(group) conversion code

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (2 diffs)
• cvtcursor.cpp (modified) (7 diffs)
• cvtcursorgrp.cpp (modified) (3 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.98 2001-03-19 19:27:13 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.99 2001-03-27 16:18:26 sandervl Exp $
 
 ;Basis is Windows95 KERNEL32
@@ -1146 +1146 @@
     CPUFeatures                                                   @2005 NONAME
     InitSystemAndRegistry__Fv                                     @2006 NONAME
-    _ConvertResourceToOS2@12                                      @2007 NONAME
-    _ConvertCursorToOS2@4                                         @2008 NONAME
-    _FreeOS2Resource@4                                            @2009 NONAME
 
     _InitializeTIB@4                                              @2010 NONAME

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)

trunk/src/kernel32/cvtcursorgrp.cpp

@@ -1 @@
-/* $Id: cvtcursorgrp.cpp,v 1.10 2000-05-28 16:45:12 sandervl Exp $ */
+/* $Id: cvtcursorgrp.cpp,v 1.11 2001-03-27 16:18:26 sandervl Exp $ */
 
 /*
@@ -26 +26 @@
 #include <winconst.h>
 #include <wincursor.h>
+#include <win\cursoricon.h>
 #include <misc.h>
 #include "cvtresource.h"
@@ -33 +34 @@
 #include "dbglocal.h"
 
+//CURSORICONFILEDIR
+
+//******************************************************************************
+//******************************************************************************
+void * WIN32API ConvertCursorGroupToOS2(LPVOID ptr)
+{
+ CURSORICONFILEDIR *chdr = (CURSORICONFILEDIR *)ptr;
+ int i, groupsize = 0, os2cursorsize;
+ BITMAPARRAYFILEHEADER2 *bafh, *orgbafh;
+ CursorComponent       *cursorhdr;
+ void                  *os2cursor;
+ HRSRC                  hRes;
+
+  dprintf(("ConvertCursorGroup"));
+  dprintf(("Cursor Group type : %d", chdr->idType));
+  dprintf(("Cursor Group count: %d", chdr->idCount));
+  for(i=0;i<chdr->idCount;i++) {
+        dprintf2(("Cursor  : %d", chdr->idEntries[i].dwDIBOffset));
+        dprintf2(("Width   : %d", (int)chdr->idEntries[i].bWidth));
+        dprintf2(("Height  : %d", (int)chdr->idEntries[i].bHeight));
+        dprintf2(("Bits    : %d", chdr->idEntries[i].bColorCount));
+        dprintf2(("ResBytes: %d", chdr->idEntries[i].dwDIBSize));
+
+        groupsize += chdr->idEntries[i].dwDIBSize;
+  }
+  bafh    = (BITMAPARRAYFILEHEADER2 *)malloc(groupsize+chdr->idCount*sizeof(BITMAPARRAYFILEHEADER2));
+  orgbafh = bafh;
+
+  rdir = (CursorResDir *)(chdr + 1);
+  for(i=0;i<chdr->idCount;i++) {
+        bafh->usType    = BFT_BITMAPARRAY;
+        bafh->cbSize    = sizeof(BITMAPARRAYFILEHEADER2);
+        bafh->cxDisplay = 0;
+        bafh->cyDisplay = 0;
+        hRes = FindResourceA(module->getInstanceHandle(), 
+                            (LPCSTR)rdir->wNameOrdinal, (LPSTR)NTRT_CURSOR);
+
+        if(hRes == NULL) {
+                dprintf(("Can't find cursor!"));
+                rdir++;
+                continue;
+        }
+
+        cursorhdr = (CursorComponent *)LockResource(LoadResource(module->getInstanceHandle(), hRes));
+        os2cursor = ConvertCursor(cursorhdr, SizeofResource(module->getInstanceHandle(), hRes), &os2cursorsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER2));
+
+        if(os2cursor == NULL) {
+                dprintf(("Can't convert cursor!"));
+                rdir++;
+                continue;
+        }
+
+        if(i != chdr->cwCount -1) {
+                bafh->offNext = (int)&bafh->bfh2 - (int)orgbafh + os2cursorsize;
+        }
+        else    bafh->offNext = 0;
+
+        memcpy((char *)&bafh->bfh2, os2cursor, os2cursorsize);
+        free(os2cursor);
+
+        bafh = (BITMAPARRAYFILEHEADER2 *)((int)&bafh->bfh2 + os2cursorsize);
+
+        rdir++;
+  }
+  return (void *)orgbafh;
+}
 //******************************************************************************
 //******************************************************************************