Changeset 107375 in vbox

Timestamp:

Dec 19, 2024 1:21:50 AM (6 weeks ago)

Author:

vboxsync

Message:

VBoxDumpImage.exe: Added a quick and dirty icon file structure dumper alongside the executable image dumpers.

Location:

trunk

Files:

• include/iprt/formats/bmp.h (modified) (2 diffs)
• src/VBox/Debugger/DBGCDumpImage.cpp (modified) (11 diffs)

trunk/include/iprt/formats/bmp.h

@@ -56 +56 @@
 #define BMP_HDR_SIZE_OS22      64
 #define BMP_HDR_SIZE_WIN3X     40
+#define BMP_HDR_SIZE_NT4       108
+#define BMP_HDR_SIZE_W2K       124
 /** @} */
 
@@ -178 +180 @@
 typedef BMPWIN3XINFOHDR *PBMPWIN3XINFOHDR;
 
+typedef struct BMPWINCIEXYZ
+{
+    int32_t     x, y, z;
+} BMPWINCIEXYZ;
+AssertCompileSize(BMPWINCIEXYZ, 12);
+
+typedef struct BMPWINCIEXYZTRIPLE
+{
+    BMPWINCIEXYZ Red, Green, Blue;
+} BMPWINCIEXYZTRIPLE;
+AssertCompileSize(BMPWINCIEXYZTRIPLE, 36);
+
+typedef struct BMPWINV4INFOHDR
+{
+    uint32_t    cbSize;
+    int32_t     cx;
+    int32_t     cy;
+    uint16_t    cPlanes;
+    uint16_t    cBits;
+    uint32_t    enmCompression; /**< Differs from BMPWIN3XINFOHDR::enmCompression? */
+    uint32_t    cbImage;
+    int32_t     cXPelsPerMeter;
+    int32_t     cYPelsPerMeter;
+    uint32_t    cColorsUsed;
+    uint32_t    cColorsImportant;
+    /* New v4 fields: */
+    uint32_t    fRedMask;
+    uint32_t    fGreenMask;
+    uint32_t    fBlueMask;
+    uint32_t    fAlphaMask;
+    uint32_t    enmCSType;
+    BMPWINCIEXYZTRIPLE Endpoints;
+    uint32_t    uGammaRed;
+    uint32_t    uGammaGreen;
+    uint32_t    uGammaBlue;
+} BMPWINV4INFOHDR;
+AssertCompileSize(BMPWINV4INFOHDR, BMP_HDR_SIZE_NT4);
+
+typedef struct BMPWINV5INFOHDR
+{
+    uint32_t    cbSize;
+    int32_t     cx;
+    int32_t     cy;
+    uint16_t    cPlanes;
+    uint16_t    cBits;
+    uint32_t    enmCompression; /**< Differs from BMPWIN3XINFOHDR::enmCompression? */
+    uint32_t    cbImage;
+    int32_t     cXPelsPerMeter;
+    int32_t     cYPelsPerMeter;
+    uint32_t    cColorsUsed;
+    uint32_t    cColorsImportant;
+    /* New v4 fields: */
+    uint32_t    fRedMask;
+    uint32_t    fGreenMask;
+    uint32_t    fBlueMask;
+    uint32_t    fAlphaMask;
+    uint32_t    enmCSType;
+    BMPWINCIEXYZTRIPLE Endpoints;
+    uint32_t    uGammaRed;
+    uint32_t    uGammaGreen;
+    uint32_t    uGammaBlue;
+    /* New v5 fields: */
+    uint32_t    fIntent;
+    uint32_t    offProfileData;
+    uint32_t    cbProfileData;
+    uint32_t    uReserved;
+} BMPWINV5INFOHDR;
+AssertCompileSize(BMPWINV5INFOHDR, BMP_HDR_SIZE_W2K);
+
 
 
 /** @name BMP compression types.
  * @{  */
-#define BMP_COMPRESSION_TYPE_NONE  0
-#define BMP_COMPRESSION_TYPE_RLE8  1
-#define BMP_COMPRESSION_TYPE_RLE4  2
+#define BMP_COMPRESSION_TYPE_NONE               0
+#define BMP_COMPRESSION_TYPE_RLE8               1
+#define BMP_COMPRESSION_TYPE_RLE4               2
+#define BMP_COMPRESSION_TYPE_BITFIELDS          3
+#define BMP_COMPRESSION_TYPE_JPEG               4
+#define BMP_COMPRESSION_TYPE_PNG                5
+#define BMP_COMPRESSION_TYPE_ALPHABITFIELDS     6
+#define BMP_COMPRESSION_TYPE_CMYK               11
+#define BMP_COMPRESSION_TYPE_CMYKRLE8           12
+#define BMP_COMPRESSION_TYPE_CMYKRLE4           13
 /** @} */
 

trunk/src/VBox/Debugger/DBGCDumpImage.cpp

@@ -56 +56 @@
 # include <iprt/vfs.h>
 #endif
+#include <iprt/formats/bmp.h>
 #include <iprt/formats/mz.h>
 #include <iprt/formats/pecoff.h>
@@ -91 +92 @@
 #define FLENT(a_Define) { a_Define, #a_Define }
 
+
+/** @todo move to some formats header   */
+typedef struct WIN_ICON_DIR_T
+{
+    /** Must be zero. */
+    uint16_t    uZero;
+    /** 1 or 2.   */
+    uint16_t    idType;
+    /** Number of icons. */
+    uint16_t    cEntries;
+} WIN_ICON_DIR_T;
+
+/** @todo move to some formats header   */
+typedef struct WIN_ICON_ENTRY_T
+{
+    uint8_t     cx;
+    uint8_t     cy;
+    uint8_t     cColors;
+    uint8_t     bReserved;
+    uint16_t    cPlanes;
+    uint16_t    cBits;
+    uint32_t    cbData;
+    uint32_t    offData;
+} WIN_ICON_ENTRY_T;
 
 
@@ -194 +219 @@
     /** What to dump (DUMPIMAGE_SELECT_XXX). */
     uint64_t            m_fSelection;
+    enum { kType_ExeImage = 0, kType_Icon }
+                        m_enmType;
 
 private:
@@ -212 +239 @@
 #endif
         , m_fSelection(DUMPIMAGE_SELECT_DEFAULT)
+        , m_enmType(kType_ExeImage)
     {
     }
@@ -428 +456 @@
         return rc;
 
+    }
+
+    int optType(const char *pszImageType) RT_NOEXCEPT
+    {
+        if (   strcmp(pszImageType, "icon") == 0
+            || strcmp(pszImageType, "ico") == 0
+            || strcmp(pszImageType, "cursor") == 0
+            || strcmp(pszImageType, "cur") == 0)
+            m_enmType = kType_Icon;
+        else if (   strcmp(pszImageType, "exe") == 0
+                 || strcmp(pszImageType, "dll") == 0
+                 || strcmp(pszImageType, "sys") == 0
+                 || strcmp(pszImageType, "image") == 0)
+            m_enmType = kType_ExeImage;
+        else
+        {
+            mySyntax("Unknown image type '%s'", pszImageType);
+            return VERR_INVALID_PARAMETER;
+        }
+        return VINF_SUCCESS;
     }
 
@@ -1946 +1994 @@
 
 
+static int dbgcDumpImageIcon(DumpImageCmd *pCmd, WIN_ICON_DIR_T const *pIconDir)
+{
+    RT_NOREF_PV(pCmd);
+
+    /*
+     * The directory.
+     */
+    pCmd->myPrintf("%s: %s with %#x entries\n",
+                   pCmd->m_pszName, pIconDir->idType == 1 ? "Icon" : pIconDir->idType == 2 ? "Cursor" : "!unknown!",
+                   pIconDir->cEntries);
+
+    /* Read the directory. */
+    uint32_t const    cbEntries = pIconDir->cEntries * sizeof(WIN_ICON_ENTRY_T);
+    WIN_ICON_ENTRY_T *paEntries = (WIN_ICON_ENTRY_T *)RTMemTmpAllocZ(cbEntries);
+    if (!paEntries)
+        return VERR_NO_TMP_MEMORY;
+    int rc = pCmd->readAt(sizeof(*pIconDir), paEntries, cbEntries, NULL);
+    if (RT_SUCCESS(rc))
+    {
+        /* Go thru the entries. */
+        for (uint32_t i = 0; i < pIconDir->cEntries; i++)
+        {
+            pCmd->myPrintf("%s: #%#x: %#08RX32 LB %#08RX32 - %ux%u, %u bbp, %u planes, %u colors\n", pCmd->m_pszName, i,
+                           paEntries[i].offData, paEntries[i].cbData,
+                           paEntries[i].cx ? paEntries[i].cx : 256,
+                           paEntries[i].cy ? paEntries[i].cy : 256,
+                           paEntries[i].cBits, paEntries[i].cPlanes, paEntries[i].cPlanes);
+            union
+            {
+                uint8_t         ab[_1K];
+                BMPWIN3XINFOHDR v3;
+                BMPWINV4INFOHDR v4;
+                BMPWINV5INFOHDR v5;
+            } Data = {{0}};
+            uint32_t const cbData = RT_MIN(sizeof(Data), paEntries[i].cbData);
+            int rc2 = pCmd->readAt(paEntries[i].offData, &Data, cbData, NULL);
+            if (RT_SUCCESS(rc2))
+            {
+                if (   Data.v3.cbSize == sizeof(Data.v3)
+                    || Data.v3.cbSize == sizeof(Data.v4)
+                    || Data.v3.cbSize == sizeof(Data.v5))
+                {
+                    pCmd->myPrintf("BMP%s - %dx%d, %u bbp, %u planes, %u colors used, %u important, %dx%d ppm, compression %u\n",
+                                   Data.v3.cbSize == sizeof(Data.v3) ? "v3"
+                                   : Data.v3.cbSize == sizeof(Data.v4) ? "v4" : "v5",
+                                   Data.v4.cx,
+                                   Data.v4.cy,
+                                   Data.v4.cBits,
+                                   Data.v4.cPlanes,
+                                   Data.v4.cColorsUsed,
+                                   Data.v4.cColorsImportant,
+                                   Data.v4.cXPelsPerMeter,
+                                   Data.v4.cYPelsPerMeter,
+                                   Data.v4.enmCompression);
+                }
+                else if (   Data.ab[0] == 0x89
+                         || Data.ab[1] == 'P'
+                         || Data.ab[2] == 'N'
+                         || Data.ab[3] == 'G'
+                         || Data.ab[4] == '\r'
+                         || Data.ab[5] == '\n')
+                {
+                    pCmd->myPrintf("PNG!\n");
+                }
+                else
+                    pCmd->myPrintf("Unknown!\n");
+
+
+                pCmd->myPrintf("%#.*Rhxd\n", RT_MIN(cbData, 128), &Data);
+            }
+            else
+            {
+                pCmd->myPrintf("%s: #%#x: Error reading data: %Rrc\n",
+                               pCmd->m_pszName, i, paEntries[i].offData, paEntries[i].cbData, rc2);
+                rc = rc2;
+            }
+        }
+    }
+    RTMemTmpFree(paEntries);
+    return rc;
+}
+
+
 /**
  * Common worker for the dumpimage command and the VBoxDumpImage tool.
@@ -1958 +2089 @@
     {
         uint8_t             ab[0x10];
+        uint16_t            au16[8];
         IMAGE_DOS_HEADER    DosHdr;
         struct
@@ -1965 +2097 @@
         } Nt;
         mach_header_64_t    MachO64;
+        WIN_ICON_DIR_T       IconDir;
     } uBuf;
     int rc = readAt(0, &uBuf.DosHdr, sizeof(uBuf.DosHdr), NULL);
@@ -2003 +2136 @@
             rc = dbgcDumpImageMachO(this, &uBuf.MachO64);
         /*
-         * Dunno.
+         * Use the type.
+         */
+        else if (   m_enmType == kType_Icon
+                 && uBuf.IconDir.uZero == 0
+                 && (   uBuf.IconDir.idType == 1 /*icon*/
+                     || uBuf.IconDir.idType == 2 /*cursor*/)
+                 && uBuf.IconDir.cEntries > 0
+                 && uBuf.IconDir.cEntries < 4096 /* thin-air-sanity */)
+            rc = dbgcDumpImageIcon(this, &uBuf.IconDir);
+        /*
+         * Unknown.
          */
         else
@@ -2062 +2205 @@
         { "--skip",       's', RTGETOPT_REQ_STRING },
         { "--skip",       'S', RTGETOPT_REQ_STRING },
+        { "--type",       't', RTGETOPT_REQ_STRING },
     };
 
@@ -2097 +2241 @@
             case 'S':
                 rc = Cmd.optSelectionSkip(ValueUnion.psz);
+                if (RT_FAILURE(rc))
+                    return RTEXITCODE_SYNTAX;
+                break;
+
+            case 't':
+                rc = Cmd.optType(ValueUnion.psz);
                 if (RT_FAILURE(rc))
                     return RTEXITCODE_SYNTAX;