Remove warning pragmas in pe_image.cc

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';
@@ skipping 181 matching lines @@
   PBYTE function = reinterpret_cast<PBYTE>(RVAToAddr(*export_entry));
 
   PBYTE exports = reinterpret_cast<PBYTE>(
       GetImageDirectoryEntryAddr(IMAGE_DIRECTORY_ENTRY_EXPORT));
   DWORD size = GetImageDirectoryEntrySize(IMAGE_DIRECTORY_ENTRY_EXPORT);
 
   // Check for forwarded exports as a special case.
   if (exports <= function && exports + size > function)
 #pragma warning(push)
 #pragma warning(disable: 4312)
-    // This cast generates a warning because it is 32 bit specific.
+    // Cast from 32-bit value to 64-bit pointer generates C4312 on 64-bit.

[Nico, 2015/12/23 20:57:01]

It'd be nice if the comment also said why the warning doesn't point to a bug in
this case.

[Will Harris, 2015/12/24 05:35:51]

I changed this function to return -1 on both 64-bit and 32-bit and added a test
to verify it.

     return reinterpret_cast<FARPROC>(0xFFFFFFFF);
 #pragma warning(pop)
 
   return reinterpret_cast<FARPROC>(function);
 }
 
 bool PEImage::GetProcOrdinal(LPCSTR function_name, WORD *ordinal) const {
   if (NULL == ordinal)
     return false;
 
@@ skipping 222 matching lines @@
     if (rvas) {
       module_name =
           reinterpret_cast<LPCSTR>(RVAToAddr(delay_descriptor->rvaDLLName));
       name_table = reinterpret_cast<PIMAGE_THUNK_DATA>(
           RVAToAddr(delay_descriptor->rvaINT));
       iat = reinterpret_cast<PIMAGE_THUNK_DATA>(
           RVAToAddr(delay_descriptor->rvaIAT));
     } else {
 #pragma warning(push)
 #pragma warning(disable: 4312)
-      // These casts generate warnings because they are 32 bit specific.
+      // Casts from 32-bit values to 64-bit pointers generates C4312 on 64-bit.

[Nico, 2015/12/23 20:57:01]

ditto

[Will Harris, 2015/12/24 05:35:51]

Done. Actually just changed the cast instead of suppressing the warning.

       module_name = reinterpret_cast<LPCSTR>(delay_descriptor->rvaDLLName);
       name_table =
           reinterpret_cast<PIMAGE_THUNK_DATA>(delay_descriptor->rvaINT);
       iat = reinterpret_cast<PIMAGE_THUNK_DATA>(delay_descriptor->rvaIAT);
 #pragma warning(pop)
     }
 
     if (!callback(*this, delay_descriptor, module_name, name_table, iat,
                   cookie))
       return false;
@@ skipping 16 matching lines @@
     if (IMAGE_SNAP_BY_ORDINAL(name_table->u1.Ordinal)) {
       ordinal = static_cast<WORD>(IMAGE_ORDINAL32(name_table->u1.Ordinal));
     } else {
       PIMAGE_IMPORT_BY_NAME import;
       bool rvas = (delay_descriptor->grAttrs & dlattrRva) != 0;
 
       if (rvas) {
         import = reinterpret_cast<PIMAGE_IMPORT_BY_NAME>(
                      RVAToAddr(name_table->u1.ForwarderString));
       } else {
-#pragma warning(push)
-#pragma warning(disable: 4312)
-        // This cast generates a warning because it is 32 bit specific.
         import = reinterpret_cast<PIMAGE_IMPORT_BY_NAME>(
                      name_table->u1.ForwarderString);
-#pragma warning(pop)
       }
 
       hint = import->Hint;
       name = reinterpret_cast<LPCSTR>(&import->Name);
     }
 
     if (!callback(*this, module_name, ordinal, name, hint, iat, cookie))
       return false;
   }
 
@@ skipping 67 matching lines @@
   DWORD disk_offset;
 
   if (!ImageAddrToOnDiskOffset(in_memory, &disk_offset))
     return NULL;
 
   return PEImage::RVAToAddr(disk_offset);
 }
 
 }  // namespace win
 }  // namespace base