Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Side by Side Diff: base/pe_image.cc

Issue 179039: Fix issue 8348: unfork pe_image.h / pe_image.cc (Closed)
Patch Set: Removed unittest file and entries in .gyp file, restored #error message Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/pe_image.h ('k') | sandbox/sandbox.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file implements PEImage, a generic class to manipulate PE files. 5 // This file implements PEImage, a generic class to manipulate PE files.
6 // This file was adapted from GreenBorder's Code. 6 // This file was adapted from GreenBorder's Code.
7 7
8 #include "base/pe_image.h" 8 #include "base/pe_image.h"
9 9
10 #ifdef _WIN64 10 #ifdef _WIN64
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 // Don't follow the virtual RVAToAddr, use the one on the base. 514 // Don't follow the virtual RVAToAddr, use the one on the base.
515 DWORD offset_within_section = reinterpret_cast<DWORD>(address) - 515 DWORD offset_within_section = reinterpret_cast<DWORD>(address) -
516 reinterpret_cast<DWORD>(PEImage::RVAToAddr( 516 reinterpret_cast<DWORD>(PEImage::RVAToAddr(
517 section_header->VirtualAddress)); 517 section_header->VirtualAddress));
518 #pragma warning(pop) 518 #pragma warning(pop)
519 519
520 *on_disk_offset = section_header->PointerToRawData + offset_within_section; 520 *on_disk_offset = section_header->PointerToRawData + offset_within_section;
521 return true; 521 return true;
522 } 522 }
523 523
524 PVOID PEImage::RVAToAddr(DWORD_PTR rva) const { 524 PVOID PEImage::RVAToAddr(DWORD rva) const {
525 if (rva == 0) 525 if (rva == 0)
526 return NULL; 526 return NULL;
527 527
528 return reinterpret_cast<char*>(module_) + rva; 528 return reinterpret_cast<char*>(module_) + rva;
529 } 529 }
530 530
531 PVOID PEImageAsData::RVAToAddr(DWORD_PTR rva) const { 531 PVOID PEImageAsData::RVAToAddr(DWORD rva) const {
532 if (rva == 0) 532 if (rva == 0)
533 return NULL; 533 return NULL;
534 534
535 PVOID in_memory = PEImage::RVAToAddr(rva); 535 PVOID in_memory = PEImage::RVAToAddr(rva);
536 DWORD dummy; 536 DWORD dummy;
537 537
538 if (!ImageAddrToOnDiskOffset(in_memory, &dummy)) 538 if (!ImageAddrToOnDiskOffset(in_memory, &dummy))
539 return NULL; 539 return NULL;
540 540
541 return in_memory; 541 return in_memory;
542 } 542 }
OLDNEW
« no previous file with comments | « base/pe_image.h ('k') | sandbox/sandbox.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698