Changeset 3526 for trunk/kProfile/dbgModPE-generic.cpp

Timestamp:

Aug 20, 2007, 12:46:14 AM (18 years ago)

Author:

bird

Message:

made it build again.

File:

• trunk/kProfile/dbgModPE-generic.cpp (modified) (4 diffs)

trunk/kProfile/dbgModPE-generic.cpp

@@ -37 +37 @@
 #include <iprt/thread.h>
 #include <iprt/alloca.h>
+#include "kDbgBase.h"
 #include "DBGInternal.h"
-#include "internal/ldrPE.h"
+#include "kLdrModPE.h"
 
 
@@ -276 +277 @@
      */
     IMAGE_FILE_HEADER FHdr;
-    int rc = RTFileReadAt(File, offHdr + OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr), NULL);
+    int rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr), NULL);
     AssertRCReturn(rc, rc);
 
     uint32_t cbImage;
     if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER32))
-        rc = RTFileReadAt(File, offHdr + OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
+        rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
                           &cbImage, sizeof(cbImage), NULL);
     else if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER64))
-        rc = RTFileReadAt(File, offHdr + OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
+        rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
                           &cbImage, sizeof(cbImage), NULL);
     else
@@ -293 +294 @@
      * Allocate the module and read/construct the section headers.
      */
-    PRTDBGMODPE pModPe = (PRTDBGMODPE)RTMemAlloc(OFFSETOF(RTDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
+    PRTDBGMODPE pModPe = (PRTDBGMODPE)RTMemAlloc(KDBG_OFFSETOF(RTDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
     AssertReturn(pModPe, VERR_NO_MEMORY);
     pModPe->Core.u32Magic   = RTDBGMOD_MAGIC;
@@ -300 +301 @@
     pModPe->cbImage         = cbImage;
     pModPe->cSections       = 1 + FHdr.NumberOfSections;
-    rc = RTFileReadAt(File, offHdr + OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
+    rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
                       &pModPe->aSections[1], sizeof(pModPe->aSections[0]) * FHdr.NumberOfSections, NULL);
     if (RT_SUCCESS(rc))