diff options
| author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 05:34:25 +0000 |
|---|---|---|
| committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 05:34:25 +0000 |
| commit | 1cda29e91ff949440ee93675241ee8e1e9e8ab10 (patch) | |
| tree | 05fa297fdc8717f746e54c383f47397b12c222d0 /base | |
| parent | 0174b6962c8c75e60218b1e38fd7cedac9f5bebc (diff) | |
| download | chromium_src-1cda29e91ff949440ee93675241ee8e1e9e8ab10.zip chromium_src-1cda29e91ff949440ee93675241ee8e1e9e8ab10.tar.gz chromium_src-1cda29e91ff949440ee93675241ee8e1e9e8ab10.tar.bz2 | |
Fix issue 8348: unfork pe_image.h / pe_image.cc
Moved versions of those files from sandbox/src/ to base/ (overwrite versions in
base/ to avoid 64-bit warning).
Removed 'sandbox' namespace, adapted other files as necessary.
BUG=8348
TEST=none
Original review URL: http://codereview.chromium.org/179039
Patch by rsteiner
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/pe_image.cc | 4 | ||||
| -rw-r--r-- | base/pe_image.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/base/pe_image.cc b/base/pe_image.cc index 79afcf8..33fa20c 100644 --- a/base/pe_image.cc +++ b/base/pe_image.cc @@ -521,14 +521,14 @@ bool PEImage::ImageAddrToOnDiskOffset(LPVOID address, return true; } -PVOID PEImage::RVAToAddr(DWORD_PTR rva) const { +PVOID PEImage::RVAToAddr(DWORD rva) const { if (rva == 0) return NULL; return reinterpret_cast<char*>(module_) + rva; } -PVOID PEImageAsData::RVAToAddr(DWORD_PTR rva) const { +PVOID PEImageAsData::RVAToAddr(DWORD rva) const { if (rva == 0) return NULL; diff --git a/base/pe_image.h b/base/pe_image.h index f2a929d..f2461d3 100644 --- a/base/pe_image.h +++ b/base/pe_image.h @@ -205,7 +205,7 @@ class PEImage { bool VerifyMagic() const; // Converts an rva value to the appropriate address. - virtual PVOID RVAToAddr(DWORD_PTR rva) const; + virtual PVOID RVAToAddr(DWORD rva) const; // Converts an rva value to an offset on disk. // Returns true on success. @@ -225,7 +225,7 @@ class PEImageAsData : public PEImage { public: explicit PEImageAsData(HMODULE hModule) : PEImage(hModule) {} - virtual PVOID RVAToAddr(DWORD_PTR rva) const; + virtual PVOID RVAToAddr(DWORD rva) const; }; inline bool PEImage::IsOrdinal(LPCSTR name) { |