diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 23:01:12 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 23:01:12 +0000 |
| commit | 2254f2189de2e8d1f823dbf4affe90a5843dfaf2 (patch) | |
| tree | d44b2a3ad70382d4fcefbfaff26551e42fcb7d00 /base | |
| parent | 362ec501c31fcba4b4ed5889e91f83bad43d7a51 (diff) | |
| download | chromium_src-2254f2189de2e8d1f823dbf4affe90a5843dfaf2.zip chromium_src-2254f2189de2e8d1f823dbf4affe90a5843dfaf2.tar.gz chromium_src-2254f2189de2e8d1f823dbf4affe90a5843dfaf2.tar.bz2 | |
Update sections and relocations for Win7 x64
I manually extracted these values on Win7 using dumpbin.
Review URL: https://chromiumcodereview.appspot.com/12217076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/win/pe_image_unittest.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/base/win/pe_image_unittest.cc b/base/win/pe_image_unittest.cc index e308eae..386fe4f 100644 --- a/base/win/pe_image_unittest.cc +++ b/base/win/pe_image_unittest.cc @@ -139,7 +139,8 @@ int GetExpectedValue(Value value, DWORD os) { const int win7_exports = 806; const int win7_imports = 568; const int win7_delay_imports = 71; - const int win7_relocs = 7812; + int win7_relocs = 7812; + int win7_sections = 4; const int win8_delay_dlls = 9; const int win8_exports = 806; const int win8_imports = 568; @@ -149,15 +150,21 @@ int GetExpectedValue(Value value, DWORD os) { int win8_import_dlls = 17; base::win::OSInfo* os_info = base::win::OSInfo::GetInstance(); + // 32-bit process on a 32-bit system. if (os_info->architecture() == base::win::OSInfo::X86_ARCHITECTURE) { win8_sections = 5; win8_import_dlls = 19; + + // 64-bit process on a 64-bit system. + } else if (os_info->wow64_status() == base::win::OSInfo::WOW64_DISABLED) { + win7_sections = 6; + win7_relocs = 2712; } // Contains the expected value, for each enumerated property (Value), and the // OS version: [Value][os_version] const int expected[][5] = { - {4, 4, 4, 4, win8_sections}, + {4, 4, 4, win7_sections, win8_sections}, {3, 3, 3, 13, win8_import_dlls}, {w2k_delay_dlls, xp_delay_dlls, vista_delay_dlls, win7_delay_dlls, win8_delay_dlls}, |