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

Timestamp:

Aug 7, 2001, 11:34:16 PM (24 years ago)

Author:

sandervl

Message:

put back icon (group) conversion code

File:

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

trunk/src/kernel32/cvticongrp.cpp

@@ -1 @@
-/* $Id: cvticongrp.cpp,v 1.7 2000-05-28 16:45:12 sandervl Exp $ */
+/* $Id: cvticongrp.cpp,v 1.8 2001-08-07 21:34:16 sandervl Exp $ */
 
 /*
@@ -35 +35 @@
 //******************************************************************************
 //******************************************************************************
-void *ConvertIconGroup(IconHeader *ihdr, int size, Win32ImageBase *module)
+void * WIN32API ConvertIconGroup(void *hdr, HINSTANCE hInstance, DWORD *ressize)
 {
+ IconHeader *ihdr = (IconHeader *)hdr;
  ResourceDirectory *rdir = (ResourceDirectory *)(ihdr + 1);
  int i, groupsize = 0, os2iconsize;
@@ -53 +54 @@
         dprintf2(("Bits    : %d", rdir->wBitCount));
         dprintf2(("ResBytes: %d", rdir->lBytesInRes));
-        hRes = FindResourceA(module->getInstanceHandle(), 
+        hRes = FindResourceA(hInstance, 
                              (LPCSTR)rdir->wNameOrdinal, (LPSTR)NTRT_ICON);
 
-        groupsize += QueryConvertedResourceSize(module->getInstanceHandle(), (char *)NTRT_ICON, hRes);
+        groupsize += QueryConvertedResourceSize(hInstance, (char *)NTRT_ICON, hRes);
         rdir++;
   }
-  bafh    = (BITMAPARRAYFILEHEADER2 *)malloc(groupsize+ihdr->wCount*sizeof(BITMAPARRAYFILEHEADER2));
+  groupsize = groupsize+ihdr->wCount*sizeof(BITMAPARRAYFILEHEADER2);
+  bafh    = (BITMAPARRAYFILEHEADER2 *)malloc(groupsize);
   orgbafh = bafh;
 
@@ -68 +70 @@
         bafh->cxDisplay = 0;
         bafh->cyDisplay = 0;
-        hRes = FindResourceA(module->getInstanceHandle(), 
+        hRes = FindResourceA(hInstance, 
                              (LPCSTR)rdir->wNameOrdinal, (LPSTR)NTRT_ICON);
 
@@ -77 +79 @@
         }
 
-        iconhdr = (WINBITMAPINFOHEADER *)LockResource(LoadResource(module->getInstanceHandle(), hRes));
-        os2icon = ConvertIcon(iconhdr, SizeofResource(module->getInstanceHandle(), hRes), &os2iconsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER2));
+        iconhdr = (WINBITMAPINFOHEADER *)LockResource(LoadResource(hInstance, hRes));
+        os2icon = ConvertIcon(iconhdr, SizeofResource(hInstance, hRes), &os2iconsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER2));
 
         if(os2icon == NULL) {
@@ -98 +100 @@
         rdir++;
   }
+  *ressize = groupsize;
   return (void *)orgbafh;
 }