Remove warning pragmas in pe_image.cc

base/win/pe_image_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains unit tests for PEImage.
 #include <algorithm>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ skipping 84 matching lines @@
   base::FilePath pe_image_test_path;
   ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &pe_image_test_path));
   pe_image_test_path = pe_image_test_path.Append(FILE_PATH_LITERAL("pe_image"));
 
 #if defined(ARCH_CPU_64_BITS)
   pe_image_test_path =
       pe_image_test_path.Append(FILE_PATH_LITERAL("pe_image_test_64.dll"));
   const int sections = 6;
   const int imports_dlls = 2;
   const int delay_dlls = 2;
-  const int exports = 2;
-  const int imports = 69;
+  const int exports = 3;
+  const int imports = 70;
   const int delay_imports = 2;
-  const int relocs = 632;
+  const int relocs = 976;
 #else
   pe_image_test_path =
       pe_image_test_path.Append(FILE_PATH_LITERAL("pe_image_test_32.dll"));
   const int sections = 5;
   const int imports_dlls = 2;
   const int delay_dlls = 2;
-  const int exports = 2;
+  const int exports = 3;
   const int imports = 66;
   const int delay_imports = 2;
-  const int relocs = 1586;
+  const int relocs = 2114;
 #endif
 
   HMODULE module = LoadLibrary(pe_image_test_path.value().c_str());
   ASSERT_TRUE(NULL != module);
 
   PEImage pe(module);
   int count = 0;
   EXPECT_TRUE(pe.VerifyMagic());
 
   pe.EnumSections(SectionsCallback, &count);
@@ skipping 38 matching lines @@
 
   FARPROC address1 = pe.GetProcAddress("RegEnumKeyExW");
   FARPROC address2 = pe.GetProcAddress(reinterpret_cast<char*>(ordinal));
   EXPECT_TRUE(address1 != NULL);
   EXPECT_TRUE(address2 != NULL);
   EXPECT_TRUE(address1 == address2);
 
   FreeLibrary(module);
 }
 
+// Tests that we can locate a forwarded export.
+TEST(PEImageTest, ForwardedExport) {
+  base::FilePath pe_image_test_path;
+  ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &pe_image_test_path));
+  pe_image_test_path = pe_image_test_path.Append(FILE_PATH_LITERAL("pe_image"));
+
+#if defined(ARCH_CPU_64_BITS)
+  pe_image_test_path =
+      pe_image_test_path.Append(FILE_PATH_LITERAL("pe_image_test_64.dll"));
+#else
+  pe_image_test_path =
+      pe_image_test_path.Append(FILE_PATH_LITERAL("pe_image_test_32.dll"));
+#endif
+
+  HMODULE module = LoadLibrary(pe_image_test_path.value().c_str());
+  ASSERT_TRUE(NULL != module);
+
+  PEImage pe(module);
+
+  FARPROC addr = pe.GetProcAddress("FwdExport");
+  EXPECT_EQ(FARPROC(-1), addr);

[Nico, 2015/12/24 14:11:11]

same question

[Will Harris, 2015/12/24 19:22:03]

Acknowledged.

+
+  PDWORD export_entry = pe.GetExportEntry("FwdExport");
+  EXPECT_NE(nullptr, export_entry);
+  PVOID fwd_addr = pe.RVAToAddr(*export_entry);
+  const char expected_fwd[] = "KERNEL32.CreateFileA";
+  EXPECT_STREQ(expected_fwd, reinterpret_cast<char*>(fwd_addr));
+
+  FreeLibrary(module);

[Nico, 2015/12/24 14:11:11]

(i'm a bit surprised we don't have a ScopedFoo for this. Possibly used often
enough in this file that a ScopedGeneric <> with a FreeLibrary() trait might be
worth it

[Will Harris, 2015/12/24 19:22:03]

yes, we do, it's base::ScopedNativeLibrary so I swapped it in.

+}
+
 // Test that we can get debug id out of a module.
 TEST(PEImageTest, GetDebugId) {
   HMODULE module = LoadLibrary(L"advapi32.dll");
   ASSERT_TRUE(NULL != module);
 
   PEImage pe(module);
   GUID guid = {0};
   DWORD age = 0;
   EXPECT_TRUE(pe.GetDebugId(&guid, &age));
 
   GUID empty_guid = {0};
   EXPECT_TRUE(!IsEqualGUID(empty_guid, guid));
   EXPECT_NE(0U, age);
   FreeLibrary(module);
 }
 
 }  // namespace win
 }  // namespace base