Changeset 816 for trunk/src/kernel32/cvticongrp.cpp

Timestamp:

Sep 4, 1999, 2:42:10 PM (26 years ago)

Author:

sandervl

Message:

icongroup & cursorgroup fixes

File:

• trunk/src/kernel32/cvticongrp.cpp (modified) (5 diffs)

trunk/src/kernel32/cvticongrp.cpp

@@ -1 @@
-/* $Id: cvticongrp.cpp,v 1.1 1999-08-19 19:50:40 sandervl Exp $ */
+/* $Id: cvticongrp.cpp,v 1.2 1999-09-04 12:41:46 sandervl Exp $ */
 
 /*
@@ -35 +35 @@
 {
  ResourceDirectory *rdir = (ResourceDirectory *)(ihdr + 1);
- int i, groupsize = 0;
+ int i, groupsize = 0, os2iconsize;
  BITMAPARRAYFILEHEADER2 *bafh, *orgbafh;
  WINBITMAPINFOHEADER    *iconhdr;
@@ -50 +50 @@
         dprintf(("Bits    : %d", rdir->wBitCount));
         dprintf(("ResBytes: %d", rdir->lBytesInRes));
-        groupsize += module->getResourceSizeA((LPSTR)rdir->wNameOrdinal, (LPSTR)NTRT_ICON);
+        winres     = (Win32Resource *)FindResourceA(module->getInstanceHandle(), 
+                                                   (LPCSTR)rdir->wNameOrdinal, 
+                                                   (LPSTR)NTRT_ICON);
+        groupsize += winres->getOS2Size();
         rdir++;
   }
@@ -76 +79 @@
 
         iconhdr = (WINBITMAPINFOHEADER *)winres->lockResource();
-        os2icon = ConvertIcon(iconhdr, winres->getSize(), (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER2));
+        os2icon = ConvertIcon(iconhdr, winres->getSize(), &os2iconsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER2));
 
         if(os2icon == NULL) {
@@ -85 +88 @@
         }
 
-        memcpy((char *)&bafh->bfh2, os2icon, winres->getSize());
+        memcpy((char *)&bafh->bfh2, os2icon, os2iconsize);
         free(os2icon);
 
-        bafh = (BITMAPARRAYFILEHEADER2 *)((int)&bafh->bfh2 + winres->getSize());
+        bafh = (BITMAPARRAYFILEHEADER2 *)((int)&bafh->bfh2 + os2iconsize);
         delete winres;