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

Timestamp:

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

Author:

sandervl

Message:

icongroup & cursorgroup fixes

File:

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

trunk/src/kernel32/cvtcursorgrp.cpp

@@ -1 @@
-/* $Id: cvtcursorgrp.cpp,v 1.1 1999-08-19 19:51:00 sandervl Exp $ */
+/* $Id: cvtcursorgrp.cpp,v 1.2 1999-09-04 12:41:45 sandervl Exp $ */
 
 /*
@@ -35 +35 @@
 {
  CursorResDir *rdir = (CursorResDir *)(chdr + 1);
- int i, groupsize = 0;
+ int i, groupsize = 0, os2cursorsize;
  BITMAPARRAYFILEHEADER *bafh, *orgbafh;
  CursorComponent       *cursorhdr;
@@ -50 +50 @@
         dprintf(("Bits    : %d", rdir->wBitCount));
         dprintf(("ResBytes: %d", rdir->lBytesInRes));
-        groupsize += module->getResourceSizeA((LPSTR)rdir->wNameOrdinal, (LPSTR)NTRT_CURSOR);
+        winres     = (Win32Resource *)FindResourceA(module->getInstanceHandle(), 
+                                                    (LPCSTR)rdir->wNameOrdinal, 
+                                                    (LPSTR)NTRT_CURSOR);
+        groupsize += winres->getOS2Size();
         rdir++;
   }
@@ -77 +80 @@
 
         cursorhdr = (CursorComponent *)winres->lockResource();
-        os2cursor = ConvertCursor(cursorhdr, winres->getSize(), (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER)-sizeof(BITMAPFILEHEADER));
+        os2cursor = ConvertCursor(cursorhdr, winres->getSize(), &os2cursorsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER)-sizeof(BITMAPFILEHEADER));
 
         if(os2cursor == NULL) {
@@ -86 +89 @@
         }
 
-        memcpy((char *)&bafh->bfh, os2cursor, winres->getSize());
+        memcpy((char *)&bafh->bfh, os2cursor, os2cursorsize);
         free(os2cursor);
 
-        bafh = (BITMAPARRAYFILEHEADER *)((int)&bafh->bfh + winres->getSize());
+        bafh = (BITMAPARRAYFILEHEADER *)((int)&bafh->bfh + os2cursorsize);
         delete winres;