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

Timestamp:

May 28, 2000, 6:45:14 PM (25 years ago)

Author:

sandervl

Message:

resource handling changes

File:

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

trunk/src/kernel32/cvticongrp.cpp

@@ -1 @@
-/* $Id: cvticongrp.cpp,v 1.6 2000-02-16 14:25:37 sandervl Exp $ */
+/* $Id: cvticongrp.cpp,v 1.7 2000-05-28 16:45:12 sandervl Exp $ */
 
 /*
@@ -23 +23 @@
 #include <string.h>
 #include <win32type.h>
+#include <win32api.h>
+#include <winconst.h>
 #include <winicon.h>
-#include <winres.h>
 #include <misc.h>
 #include "cvtresource.h"
+#include <winres.h>
 
 #define DBG_LOCALLOG    DBG_cvticongrp
 #include "dbglocal.h"
-
-HRSRC WIN32API FindResourceA(HINSTANCE hModule, LPCSTR lpszName, LPCSTR lpszType);
 
 //******************************************************************************
@@ -41 +41 @@
  BITMAPARRAYFILEHEADER2 *bafh, *orgbafh;
  WINBITMAPINFOHEADER    *iconhdr;
- Win32Resource          *winres;
  void                   *os2icon;
+ HRSRC                   hRes;
 
   dprintf(("Icon Group type :%d", ihdr->wType));
@@ -53 +53 @@
         dprintf2(("Bits    : %d", rdir->wBitCount));
         dprintf2(("ResBytes: %d", rdir->lBytesInRes));
-        winres     = (Win32Resource *)FindResourceA(module->getInstanceHandle(), 
-                                                   (LPCSTR)rdir->wNameOrdinal, 
-                                                   (LPSTR)NTRT_ICON);
-        groupsize += winres->getOS2Size();
+        hRes = FindResourceA(module->getInstanceHandle(), 
+                             (LPCSTR)rdir->wNameOrdinal, (LPSTR)NTRT_ICON);
+
+        groupsize += QueryConvertedResourceSize(module->getInstanceHandle(), (char *)NTRT_ICON, hRes);
         rdir++;
   }
@@ -68 +68 @@
         bafh->cxDisplay = 0;
         bafh->cyDisplay = 0;
-        winres          = (Win32Resource *)FindResourceA(module->getInstanceHandle(), 
-                                                         (LPCSTR)rdir->wNameOrdinal, 
-                                                         (LPSTR)NTRT_ICON);
-        if(winres == NULL) {
+        hRes = FindResourceA(module->getInstanceHandle(), 
+                             (LPCSTR)rdir->wNameOrdinal, (LPSTR)NTRT_ICON);
+
+        if(hRes == NULL) {
                 dprintf(("Can't find icon!"));
                 rdir++;
@@ -77 +77 @@
         }
 
-        iconhdr = (WINBITMAPINFOHEADER *)winres->lockResource();
-        os2icon = ConvertIcon(iconhdr, winres->getSize(), &os2iconsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER2));
+        iconhdr = (WINBITMAPINFOHEADER *)LockResource(LoadResource(module->getInstanceHandle(), hRes));
+        os2icon = ConvertIcon(iconhdr, SizeofResource(module->getInstanceHandle(), hRes), &os2iconsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER2));
 
         if(os2icon == NULL) {
                 dprintf(("Can't convert icon!"));
-                delete winres;
                 rdir++;
                 continue;
@@ -96 +95 @@
 
         bafh = (BITMAPARRAYFILEHEADER2 *)((int)&bafh->bfh2 + os2iconsize);
-        delete winres;
 
         rdir++;