Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

base/win/pe_image.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file implements PEImage, a generic class to manipulate PE files.
 // This file was adapted from GreenBorder's Code.
 
 #include "base/win/pe_image.h"
 
 namespace base {
 namespace win {
 
 // TODO(jschuh): crbug.com/167707 Make sure this code works on 64-bit.
 
 // Structure to perform imports enumerations.
 struct EnumAllImportsStorage {
   PEImage::EnumImportsFunction callback;
   PVOID cookie;
 };
 
 namespace {
 
-  // PdbInfo Signature
-  const DWORD kPdbInfoSignature = 'SDSR';
-
   // Compare two strings byte by byte on an unsigned basis.
   //   if s1 == s2, return 0
   //   if s1 < s2, return negative
   //   if s1 > s2, return positive
   // Exception if inputs are invalid.
   int StrCmpByByte(LPCSTR s1, LPCSTR s2) {
     while (*s1 != '\0' && *s1 == *s2) {
       ++s1;
       ++s2;
     }
 
     return (*reinterpret_cast<const unsigned char*>(s1) -
             *reinterpret_cast<const unsigned char*>(s2));
   }
 
-  struct PdbInfo {
-    DWORD Signature;
-    GUID Guid;
-    DWORD Age;
-    char PdbFileName[1];
-  };
 }  // namespace
 
 // Callback used to enumerate imports. See EnumImportChunksFunction.
 bool ProcessImportChunk(const PEImage &image, LPCSTR module,
                         PIMAGE_THUNK_DATA name_table,
                         PIMAGE_THUNK_DATA iat, PVOID cookie) {
   EnumAllImportsStorage &storage = *reinterpret_cast<EnumAllImportsStorage*>(
                                        cookie);
 
   return image.EnumOneImportChunk(storage.callback, module, name_table, iat,
@@ skipping 87 matching lines @@
     if (0 == _strnicmp(reinterpret_cast<LPCSTR>(section->Name), section_name,
                        sizeof(section->Name))) {
       ret = section;
       break;
     }
   }
 
   return ret;
 }
 
-bool PEImage::GetDebugId(LPGUID guid, LPDWORD age) const {
-  if (NULL == guid || NULL == age) {
-    return false;
-  }
-
-  DWORD debug_directory_size =
-      GetImageDirectoryEntrySize(IMAGE_DIRECTORY_ENTRY_DEBUG);
-  PIMAGE_DEBUG_DIRECTORY debug_directory =
-      reinterpret_cast<PIMAGE_DEBUG_DIRECTORY>(
-      GetImageDirectoryEntryAddr(IMAGE_DIRECTORY_ENTRY_DEBUG));
-
-  size_t directory_count =
-      debug_directory_size / sizeof(IMAGE_DEBUG_DIRECTORY);
-
-  for (size_t index = 0; index < directory_count; ++index) {
-    if (debug_directory[index].Type == IMAGE_DEBUG_TYPE_CODEVIEW) {
-      PdbInfo* pdb_info = reinterpret_cast<PdbInfo*>(
-          RVAToAddr(debug_directory[index].AddressOfRawData));
-      if (pdb_info->Signature != kPdbInfoSignature) {
-        // Unsupported PdbInfo signature
-        return false;
-      }
-      *guid = pdb_info->Guid;
-      *age = pdb_info->Age;
-      return true;
-    }
-  }
-  return false;
-}
-
 PDWORD PEImage::GetExportEntry(LPCSTR name) const {
   PIMAGE_EXPORT_DIRECTORY exports = GetExportDirectory();
 
   if (NULL == exports)
     return NULL;
 
   WORD ordinal = 0;
   if (!GetProcOrdinal(name, &ordinal))
     return NULL;
 
@@ skipping 402 matching lines @@
   DWORD disk_offset;
 
   if (!ImageAddrToOnDiskOffset(in_memory, &disk_offset))
     return NULL;
 
   return PEImage::RVAToAddr(disk_offset);
 }
 
 }  // namespace win
 }  // namespace base