Changeset 860 in kBuild

Timestamp:

Mar 30, 2007 1:48:58 AM (18 years ago)

Author:

bird

Message:

PDB70 fixes.

File:

• trunk/src/kDepIDB/kDepIDB.c (modified) (10 diffs)

trunk/src/kDepIDB/kDepIDB.c

@@ -31 +31 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <errno.h>
@@ -45 +46 @@
 #define OFFSETOF(type, member)  ( (int)(size_t)(void *)&( ((type *)(void *)0)->member) )
 
-/*#define DEBUG*/
+#define DEBUG
 #ifdef DEBUG
-#define dprintf(a)              printf a
-#define dump(pb, cb, offBase)   hexdump(pb,cb,offBase)
+# define dprintf(a)             printf a
+# define dump(pb, cb, offBase)  hexdump(pb,cb,offBase)
 #else
-#define dprintf(a)              do {} while (0)
-#define dump(pb, cb, offBase)   do {} while (0)
+# define dprintf(a)             do {} while (0)
+# define dump(pb, cb, offBase)  do {} while (0)
 #endif
 
@@ -238 +239 @@
 } PDB70ROOT, *PPDB70ROOT;
 
+/**
+ * The PDB 7.0 name stream (#1) header.
+ */
+typedef struct PDB70NAMES
+{
+    /** The structure version. */
+    uint32_t        Version;
+    /** Timestamp.  */
+    uint32_t        TimeStamp;
+    /** Unknown. */
+    uint32_t        Unknown1;
+    /** GUID. */
+    uint32_t        u32Guid[4];
+    /** The size of the following name table. */
+    uint32_t        cbNames;
+    /** The name table. */
+    char            szzNames[1];
+} PDB70NAMES, *PPDB70NAMES;
+
+/** The version / magic of the names structure. */
+#define PDB70NAMES_VERSION  20000404
 
 
@@ -291 +313 @@
                 off *= cbPage;
                 memcpy(pbBuf + iPage * cbPage, (uint8_t *)pHdr + off, cbPage);
-                dump(pbBuf + iPage * cbPage, cbPage, off);
+                dump(pbBuf + iPage * cbPage, iPage + 1 < cPages ? cbPage : cb % cbPage, off);
             }
             else
@@ -312 +334 @@
 {
     /*
-     * The tricky bit here is to find the right length.
-     * (Todo: Check if we can just use the stream size..)
+     * The tricky bit here is to find the right length. Really?
+     * (Todo: Check if we can just use the stream #0 size..)
      */
     PPDB70PAGE piPageMap = (uint32_t *)((uint8_t *)pHdr + pHdr->iRootPages * pHdr->cbPage);
@@ -319 +341 @@
     if (pRoot)
     {
+#if 1
         /* This stuff is probably unnecessary: */
         /* size = stream header + array of stream. */
@@ -339 +362 @@
             }
         }
+#else
+        /* validate? */
+        return pRoot;
+#endif 
     }
     return NULL;
@@ -345 +372 @@
 static void *Pdb70AllocAndReadStream(PPDB70HDR pHdr, PPDB70ROOT pRoot, unsigned iStream, size_t *pcbStream)
 {
-    size_t      cbStream = pRoot->aStreams[iStream].cbStream;
-    PPDB70PAGE  paiPageMap;
+    const size_t    cbStream = pRoot->aStreams[iStream].cbStream;
+    PPDB70PAGE      paiPageMap;
     if (    iStream >= pRoot->cStreams
         ||  cbStream == ~(uint32_t)0)
@@ -368 +395 @@
     PPDB70HDR   pHdr = (PPDB70HDR)pbFile;
     PPDB70ROOT  pRoot;
+    PPDB70NAMES pNames;
+    size_t      cbStream;
+    unsigned    fDone = 0;
     unsigned    iStream;
     int         rc = 0;
@@ -382 +412 @@
 
     /*
-     * Iterate the streams in the root and scan their content for
-     * dependencies.
-     */
-    rc = 0;
-    for (iStream = 0; iStream < pRoot->cStreams && !rc; iStream++)
-    {
-        const size_t cbStream = Pdb70Align(pHdr, pRoot->aStreams[iStream].cbStream);
-        uint8_t     *pbStream;
-        if (    pRoot->aStreams[iStream].cbStream == ~(uint32_t)0
-            ||  !pRoot->aStreams[iStream].cbStream)
-            continue;
-        dprintf(("Stream #%d: %#x bytes (%#x aligned)\n", iStream, pRoot->aStreams[iStream].cbStream, cbStream));
-        pbStream = (uint8_t *)Pdb70AllocAndReadStream(pHdr, pRoot, iStream, NULL);
-        if (pbStream)
-        {
-            rc = ScanStream(pbStream, cbStream, "/mr/inversedeps/", sizeof("/mr/inversedeps/") - 1);
-            free(pbStream);
+     * The names we want are usually all found in the 'Names' stream, that is #1.
+     */
+    dprintf(("Reading the names stream....\n"));
+    pNames = Pdb70AllocAndReadStream(pHdr, pRoot, 1, &cbStream);
+    if (pNames)
+    {
+        dprintf(("Names: Version=%u cbNames=%u (%#x)\n", pNames->Version, pNames->cbNames, pNames->cbNames));
+        if (    pNames->Version == PDB70NAMES_VERSION
+            &&  pNames->cbNames > 32
+            &&  pNames->cbNames + offsetof(PDB70NAMES, szzNames) <= pRoot->aStreams[1].cbStream)
+        {
+            /*
+             * Iterate the names and add the /mr/inversedeps/ ones to the dependency list.
+             */
+            const char *psz = &pNames->szzNames[0];
+            size_t cb = pNames->cbNames;
+            size_t off = 0;
+            dprintf(("0x0000 #0: %6d bytes  [root / toc]\n", pRoot->aStreams[0].cbStream));
+            for (iStream = 1; cb > 0; iStream++)
+            {
+                int fAdded = 0;
+                size_t cch = strlen(psz);
+                if (   cch >= sizeof("/mr/inversedeps/")
+                    && !memcmp(psz, "/mr/inversedeps/", sizeof("/mr/inversedeps/") - 1))
+                {
+                    depAdd(psz + sizeof("/mr/inversedeps/") - 1, cch - (sizeof("/mr/inversedeps/") - 1));
+                    fAdded = 1;
+                }
+                dprintf(("%#06x #%d: %6d bytes  %s%s\n", off, iStream, 
+                         iStream < pRoot->cStreams ? pRoot->aStreams[iStream].cbStream : -1, 
+                         psz, fAdded ? "  [dep]" : "")); 
+                (void)fAdded;
+
+                /* next */
+                if (cch >= cb)
+                {
+                    dprintf(("warning! cch=%d cb=%d\n", cch, cb));
+                    cch = cb - 1;
+                }
+                cb  -= cch + 1;
+                psz += cch + 1;
+                off += cch + 1;
+            }
+            rc = 0;
+            fDone = 1;
         }
         else
-            rc = 1;
+            dprintf(("Unknown version or bad size: Version=%u cbNames=%d cbStream=%d\n", 
+                     pNames->Version, pNames->cbNames, cbStream));
+        free(pNames);
+    }
+
+    if (!fDone)
+    {
+        /*
+         * Iterate the streams in the root and scan their content for
+         * dependencies.
+         */
+        rc = 0;
+        for (iStream = 0; iStream < pRoot->cStreams && !rc; iStream++)
+        {
+            uint8_t *pbStream;
+            if (    pRoot->aStreams[iStream].cbStream == ~(uint32_t)0
+                ||  !pRoot->aStreams[iStream].cbStream)
+                continue;
+            dprintf(("Stream #%d: %#x bytes (%#x aligned)\n", iStream, pRoot->aStreams[iStream].cbStream, 
+                     Pdb70Align(pHdr, pRoot->aStreams[iStream].cbStream)));
+            pbStream = (uint8_t *)Pdb70AllocAndReadStream(pHdr, pRoot, iStream, &cbStream);
+            if (pbStream)
+            {
+                rc = ScanStream(pbStream, cbStream, "/mr/inversedeps/", sizeof("/mr/inversedeps/") - 1);
+                free(pbStream);
+            }
+            else
+                rc = 1;
+        }
     }