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

Timestamp:

Sep 21, 1999, 10:24:53 AM (26 years ago)

Author:

sandervl

Message:

Fixes for icon(group) + cursorgroup conversion

File:

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

trunk/src/kernel32/cvtcursorgrp.cpp

@@ -1 @@
-/* $Id: cvtcursorgrp.cpp,v 1.3 1999-09-15 23:38:00 sandervl Exp $ */
+/* $Id: cvtcursorgrp.cpp,v 1.4 1999-09-21 08:24:53 sandervl Exp $ */
 
 /*
@@ -74 +74 @@
         }
 
-        if(i != chdr->cwCount -1) {
-                bafh->offNext = (int)&bafh->bfh - (int)orgbafh + winres->getSize();
-        }
-        else    bafh->offNext = 0;
-
         cursorhdr = (CursorComponent *)winres->lockResource();
         os2cursor = ConvertCursor(cursorhdr, winres->getSize(), &os2cursorsize, (int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER)-sizeof(BITMAPFILEHEADER));
@@ -88 +83 @@
                 continue;
         }
+
+        if(i != chdr->cwCount -1) {
+                bafh->offNext = (int)&bafh->bfh - (int)orgbafh + os2cursorsize;
+        }
+        else    bafh->offNext = 0;
 
         memcpy((char *)&bafh->bfh, os2cursor, os2cursorsize);