Changeset 2245 for trunk/src

Timestamp:

Dec 29, 1999, 1:39:09 PM (26 years ago)

Author:

sandervl

Message:

dprintf2's for cursor/icon conversion

Location:

trunk/src/kernel32

Files:

• cvtcursor.cpp (modified) (3 diffs)
• cvtcursorgrp.cpp (modified) (2 diffs)
• cvticon.cpp (modified) (2 diffs)
• cvticongrp.cpp (modified) (2 diffs)
• winimagepeldr.cpp (modified) (2 diffs)

trunk/src/kernel32/cvtcursor.cpp

@@ -1 @@
-/* $Id: cvtcursor.cpp,v 1.8 1999-10-27 10:35:41 sandervl Exp $ */
+/* $Id: cvtcursor.cpp,v 1.9 1999-12-29 12:39:09 sandervl Exp $ */
 
 /*
@@ -148 +148 @@
                              - curHdr->yHotspot;         /* subtract hot.y */
 
-  dprintf(("Cursor Hot.x   : %d", curHdr->xHotspot));
-  dprintf(("Cursor Hot.y   : %d", curHdr->yHotspot));
+  dprintf2(("Cursor Hot.x   : %d", curHdr->xHotspot));
+  dprintf2(("Cursor Hot.y   : %d", curHdr->yHotspot));
 
   if(bmpHdr->biBitCount == 1) {
@@ -167 +167 @@
   cursorhdr->bmp2.ulCompression   = BCA_UNCOMP;
   cursorhdr->bmp2.ulColorEncoding = BCE_RGB;
-  dprintf(("Cursor size    : %d", bmpHdr->biSizeImage));
-  dprintf(("Cursor Width   : %d", bmpHdr->biWidth));
+  dprintf2(("Cursor size    : %d", bmpHdr->biSizeImage));
+  dprintf2(("Cursor Width   : %d", bmpHdr->biWidth));
   //height for both the XOR and AND bitmap (color & BW)
-  dprintf(("Height         : %d", bmpHdr->biHeight));
-  dprintf(("Cursor Bitcount: %d", bmpHdr->biBitCount));
-  dprintf(("Cursor Compress: %d", bmpHdr->biCompression));
+  dprintf2(("Height         : %d", bmpHdr->biHeight));
+  dprintf2(("Cursor Bitcount: %d", bmpHdr->biBitCount));
+  dprintf2(("Cursor Compress: %d", bmpHdr->biCompression));
 
   os2rgb                   = (RGB2 *)(cursorhdr+1);

trunk/src/kernel32/cvtcursorgrp.cpp

@@ -1 @@
-/* $Id: cvtcursorgrp.cpp,v 1.6 1999-09-25 14:11:31 sandervl Exp $ */
+/* $Id: cvtcursorgrp.cpp,v 1.7 1999-12-29 12:39:09 sandervl Exp $ */
 
 /*
@@ -45 +45 @@
   dprintf(("Cursor Group count: %d", chdr->cwCount));
   for(i=0;i<chdr->cwCount;i++) {
-        dprintf(("Cursor  : %d", rdir->wNameOrdinal));
-        dprintf(("Width   : %d", (int)rdir->wWidth));
-        dprintf(("Height  : %d", (int)rdir->wHeight));
-        dprintf(("Bits    : %d", rdir->wBitCount));
-        dprintf(("ResBytes: %d", rdir->lBytesInRes));
+        dprintf2(("Cursor  : %d", rdir->wNameOrdinal));
+        dprintf2(("Width   : %d", (int)rdir->wWidth));
+        dprintf2(("Height  : %d", (int)rdir->wHeight));
+        dprintf2(("Bits    : %d", rdir->wBitCount));
+        dprintf2(("ResBytes: %d", rdir->lBytesInRes));
         winres     = (Win32Resource *)FindResourceA(module->getInstanceHandle(), 
                                                     (LPCSTR)rdir->wNameOrdinal, 

trunk/src/kernel32/cvticon.cpp

@@ -1 @@
-/* $Id: cvticon.cpp,v 1.6 1999-10-27 10:35:41 sandervl Exp $ */
+/* $Id: cvticon.cpp,v 1.7 1999-12-29 12:39:09 sandervl Exp $ */
 
 /*
@@ -116 +116 @@
         bmpHdr->biSizeImage = bwsize + colorsize;
   }
-  dprintf(("Icon size    : %d", bmpHdr->biSizeImage));
-  dprintf(("Icon Width   : %d", bmpHdr->biWidth));
+  dprintf2(("Icon size    : %d", bmpHdr->biSizeImage));
+  dprintf2(("Icon Width   : %d", bmpHdr->biWidth));
   //height for both the XOR and AND bitmap (color & BW)
-  dprintf(("Height       : %d", bmpHdr->biHeight));
-  dprintf(("Icon Bitcount: %d", bmpHdr->biBitCount));
-  dprintf(("Icon Compress: %d", bmpHdr->biCompression));
+  dprintf2(("Height       : %d", bmpHdr->biHeight));
+  dprintf2(("Icon Bitcount: %d", bmpHdr->biBitCount));
+  dprintf2(("Icon Compress: %d", bmpHdr->biCompression));
 
   //SvL: 28-09-'98: cllngenu.dll has an incorrect size in the header

trunk/src/kernel32/cvticongrp.cpp

@@ -1 @@
-/* $Id: cvticongrp.cpp,v 1.4 1999-09-21 08:24:53 sandervl Exp $ */
+/* $Id: cvticongrp.cpp,v 1.5 1999-12-29 12:39:09 sandervl Exp $ */
 
 /*
@@ -44 +44 @@
   dprintf(("Icon Group count:%d", ihdr->wCount));
   for(i=0;i<ihdr->wCount;i++) {
-        dprintf(("Icon    : %d", rdir->wNameOrdinal));
-        dprintf(("Width   : %d", (int)rdir->bWidth));
-        dprintf(("Height  : %d", (int)rdir->bHeight));
-        dprintf(("Colors  : %d", (int)rdir->bColorCount));
-        dprintf(("Bits    : %d", rdir->wBitCount));
-        dprintf(("ResBytes: %d", rdir->lBytesInRes));
+        dprintf2(("Icon    : %d", rdir->wNameOrdinal));
+        dprintf2(("Width   : %d", (int)rdir->bWidth));
+        dprintf2(("Height  : %d", (int)rdir->bHeight));
+        dprintf2(("Colors  : %d", (int)rdir->bColorCount));
+        dprintf2(("Bits    : %d", rdir->wBitCount));
+        dprintf2(("ResBytes: %d", rdir->lBytesInRes));
         winres     = (Win32Resource *)FindResourceA(module->getInstanceHandle(), 
                                                    (LPCSTR)rdir->wNameOrdinal, 

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.26 1999-12-27 21:20:48 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.27 1999-12-29 12:39:09 sandervl Exp $ */
 
 /*
@@ -628 +628 @@
         }
         if(ulRead != size) {
-                dprintf((LOG, "Win32PeLdrImage::commitPage: DosRead failed to read %x (%x) bytes for 0x%x!", size, ulRead, virtAddress));
+                dprintf((LOG, "Win32PeLdrImage::commitPage: DosRead failed to read %x (%x) bytes at %x for 0x%x!", size, ulRead, fileoffset, virtAddress));
                 return FALSE;
         }