diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 13:02:03 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 13:02:03 +0000 |
| commit | c88873923d37e1d77d985f8fe614aaf835dcfa82 (patch) | |
| tree | ef1c4f68daac23e83b2bc149c9b5802781bf3815 /base/pe_image.cc | |
| parent | f9fb868acd8f9977254f33fc50565a9b7bdb3295 (diff) | |
| download | chromium_src-c88873923d37e1d77d985f8fe614aaf835dcfa82.zip chromium_src-c88873923d37e1d77d985f8fe614aaf835dcfa82.tar.gz chromium_src-c88873923d37e1d77d985f8fe614aaf835dcfa82.tar.bz2 | |
Fix most issues when building base as a x64 target.
BUG=1282556
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/pe_image.cc')
| -rw-r--r-- | base/pe_image.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/base/pe_image.cc b/base/pe_image.cc index b50bca5..d060903 100644 --- a/base/pe_image.cc +++ b/base/pe_image.cc @@ -32,6 +32,13 @@ #include "base/pe_image.h" +#ifdef _WIN64 +#error This code is not tested on x64. Please make sure all the base unit tests\ + pass before doing any real work. The current unit tests don't test the\ + differences between 32- and 64-bits implementations. Bugs may slip through.\ + You need to improve the coverage before continuing. +#endif + // Structure to perform imports enumerations. struct EnumAllImportsStorage { PEImage::EnumImportsFunction callback; @@ -539,14 +546,14 @@ bool PEImage::ImageAddrToOnDiskOffset(LPVOID address, return true; } -PVOID PEImage::RVAToAddr(DWORD rva) const { +PVOID PEImage::RVAToAddr(DWORD_PTR rva) const { if (rva == 0) return NULL; return reinterpret_cast<char*>(module_) + rva; } -PVOID PEImageAsData::RVAToAddr(DWORD rva) const { +PVOID PEImageAsData::RVAToAddr(DWORD_PTR rva) const { if (rva == 0) return NULL; |