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

Unified Diff: base/win/pe_image.cc

Issue 5236002: Add infrastructure enabling tests of installer upgrade scenarios.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | chrome/installer/upgrade_test.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/win/pe_image.cc
===================================================================
--- base/win/pe_image.cc (revision 66767)
+++ base/win/pe_image.cc (working copy)
@@ -558,12 +558,12 @@
return NULL;
PVOID in_memory = PEImage::RVAToAddr(rva);
- DWORD dummy;
+ DWORD disk_offset;
- if (!ImageAddrToOnDiskOffset(in_memory, &dummy))
+ if (!ImageAddrToOnDiskOffset(in_memory, &disk_offset))
return NULL;
- return in_memory;
+ return PEImage::RVAToAddr(disk_offset);
}
} // namespace win
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | chrome/installer/upgrade_test.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698