Changeset 25340 in vbox

Timestamp:

Dec 11, 2009 10:45:46 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

55934

Message:

ldrPE.cpp: Dropped VERR_LDRPE_SECURITY.

Location:

trunk

Files:

• include/iprt/err.h (modified) (1 diff)
• src/VBox/Runtime/common/ldr/ldrPE.cpp (modified) (4 diffs)

trunk/include/iprt/err.h

@@ -1026 +1026 @@
 /** The PE loader encountered delayed imports, a feature which hasn't been implemented yet. */
 #define VERR_LDRPE_DELAY_IMPORT                 (-620)
-/** The PE loader doesn't have a clue what the security data directory entry is all about. */
-#define VERR_LDRPE_SECURITY                     (-621)
+
 /** The PE loader doesn't know how to deal with the global pointer data directory entry yet. */
 #define VERR_LDRPE_GLOBALPTR                    (-622)

trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

@@ -44 +44 @@
 #include "internal/ldrPE.h"
 #include "internal/ldr.h"
-
 
 
@@ -1010 +1009 @@
 {
     const uint16_t CorrectMagic = pFileHdr->SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER32)
-             ? IMAGE_NT_OPTIONAL_HDR32_MAGIC : IMAGE_NT_OPTIONAL_HDR64_MAGIC;
+                                ? IMAGE_NT_OPTIONAL_HDR32_MAGIC : IMAGE_NT_OPTIONAL_HDR64_MAGIC;
     if (pOptHdr->Magic != CorrectMagic)
     {
@@ -1114 +1113 @@
                 return VERR_LDRPE_DELAY_IMPORT;
 
-            /* The security directory seems to be some kind of hack, and the rva is a fileoffset or something. */
             case IMAGE_DIRECTORY_ENTRY_SECURITY:      // 4
+                /* The VirtualAddress is a PointerToRawData. */
                 cb = (size_t)cbRawImage; Assert((RTFOFF)cb == cbRawImage);
                 Log(("rtldrPEOpen: %s: dir no. %d (SECURITY) VirtualAddress=%#x Size=%#x is not supported!!!\n",
                      pszLogName, i, pDir->VirtualAddress, pDir->Size));
-#if 0 /** @todo correctly validate this! Ignoring it for the present. */
-                return VERR_LDRPE_SECURITY;
-#else
                 break;
-#endif
 
             case IMAGE_DIRECTORY_ENTRY_GLOBALPTR:     // 8   /* (MIPS GP) */
@@ -1135 +1130 @@
                 return VERR_LDRPE_TLS;
 
-            case IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR: // 14
+            case IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR:// 14
                 Log(("rtldrPEOpen: %s: dir no. %d (COM_DESCRIPTOR) VirtualAddress=%#x Size=%#x is not supported!!!\n",
                      pszLogName, i, pDir->VirtualAddress, pDir->Size));