diff options
| author | John Chen <jochen@microsoft.com> | 2015-10-28 22:06:35 -0700 |
|---|---|---|
| committer | John Chen <jochen@microsoft.com> | 2015-10-28 22:13:23 -0700 |
| commit | 28c4854d78f02ee2c92ea536c3c29f4433865869 (patch) | |
| tree | 2fb9395fa27e77dfe877960edb1caf8fd75bb7c5 /src/inc/pedecoder.inl | |
| parent | 4c7d5e3365515cf7e02544e5460db5ba7e3d27fd (diff) | |
| download | coreclr-28c4854d78f02ee2c92ea536c3c29f4433865869.tar.gz coreclr-28c4854d78f02ee2c92ea536c3c29f4433865869.tar.bz2 coreclr-28c4854d78f02ee2c92ea536c3c29f4433865869.zip | |
Modify Platform ID of Linux NIs (issue #1035)
Diffstat (limited to 'src/inc/pedecoder.inl')
| -rw-r--r-- | src/inc/pedecoder.inl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/inc/pedecoder.inl b/src/inc/pedecoder.inl index 9794625a58..12b00d21ec 100644 --- a/src/inc/pedecoder.inl +++ b/src/inc/pedecoder.inl @@ -962,8 +962,11 @@ inline BOOL PEDecoder::IsNativeMachineFormat() const if (!HasContents() || !HasNTHeaders() ) return FALSE; _ASSERTE(m_pNTHeaders); + WORD expectedFormat = (HasNativeHeader() || HasReadyToRunHeader()) ? + IMAGE_FILE_MACHINE_NATIVE_NI : + IMAGE_FILE_MACHINE_NATIVE; //do not call GetNTHeaders as we do not want to bother with PE32->PE32+ conversion - return m_pNTHeaders->FileHeader.Machine==IMAGE_FILE_MACHINE_NATIVE; + return m_pNTHeaders->FileHeader.Machine==expectedFormat; } inline BOOL PEDecoder::IsI386() const |