win: Placate more OS versions in the PEImageReader test

snapshot/win/pe_image_reader_test.cc

 // Copyright 2015 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 75 matching lines @@
     EXPECT_EQ(0, observed.dwFileFlags & ~observed.dwFileFlagsMask);
     EXPECT_EQ(VOS_NT_WINDOWS32, observed.dwFileOS);
     if (known_dll) {
       EXPECT_EQ(VFT_DLL, observed.dwFileType);
     } else {
       EXPECT_TRUE(observed.dwFileType == VFT_APP ||
                   observed.dwFileType == VFT_DLL);
     }
   }
 
-  // Use BaseName() to ensure that GetModuleVersionAndType() finds the
-  // already-loaded module with the specified name. Otherwise, dwFileVersionMS
-  // may not match.
+  base::FilePath module_path(module.name);
+
+  const DWORD version = GetVersion();
+  const int major_version = LOBYTE(LOWORD(version));
+  const int minor_version = HIBYTE(LOWORD(version));
+  if (major_version > 6 || (major_version == 6 && minor_version >= 2)) {
+    // Windows 8 or later.
+    //
+    // Use BaseName() to ensure that GetModuleVersionAndType() finds the
+    // already-loaded module with the specified name. Otherwise, dwFileVersionMS
+    // may not match. This appears to be related to the changes made in Windows
+    // 8.1 to GetVersion() and GetVersionEx() for non-manifested applications
+    module_path = module_path.BaseName();
+  }
+
   VS_FIXEDFILEINFO expected;
-  const bool expected_rv = GetModuleVersionAndType(
-      base::FilePath(module.name).BaseName(), &expected);
+  const bool expected_rv = GetModuleVersionAndType(module_path, &expected);
   ASSERT_TRUE(expected_rv || !known_dll);
 
   EXPECT_EQ(expected_rv, observed_rv);
 
   if (observed_rv && expected_rv) {
     EXPECT_EQ(expected.dwSignature, observed.dwSignature);
     EXPECT_EQ(expected.dwStrucVersion, observed.dwStrucVersion);
     EXPECT_EQ(expected.dwFileVersionMS, observed.dwFileVersionMS);
     EXPECT_EQ(expected.dwFileVersionLS, observed.dwFileVersionLS);
     EXPECT_EQ(expected.dwProductVersionMS, observed.dwProductVersionMS);
@@ skipping 41 matching lines @@
 
   for (const auto& module : modules) {
     SCOPED_TRACE(base::UTF16ToUTF8(module.name));
     TestVSFixedFileInfo(&process_reader, module, false);
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad