win x86: Grab bag of restructuring to get tests working on x86-on-x86

snapshot/win/pe_image_reader_test.cc

Index: snapshot/win/pe_image_reader_test.cc
diff --git a/snapshot/win/pe_image_reader_test.cc b/snapshot/win/pe_image_reader_test.cc
index 8da329e47d7bf047df5cdb3ce104fd508e6dcea4..6c0733e035f05b2833275d6ca287f1b08f0df011 100644
--- a/snapshot/win/pe_image_reader_test.cc
+++ b/snapshot/win/pe_image_reader_test.cc
@@ -14,6 +14,7 @@
 
 #include "snapshot/win/pe_image_reader.h"
 
+#define PSAPI_VERSION 1
 #include <psapi.h>
 
 #include "gtest/gtest.h"
@@ -25,6 +26,17 @@ namespace crashpad {
 namespace test {
 namespace {
 
+BOOL CrashpadGetModuleInformation(HANDLE process,

[scottmg, 2015/09/15 21:13:34]

This craziness is because XP -> 7+ did some weird things moving this function
around:
https://msdn.microsoft.com/en-us/library/windows/desktop/ms683201(v=vs.85).aspx

[Mark Mentovai, 2015/09/16 02:57:19]

scottmg wrote:
What you wrote looks right, but that document appears to say the opposite.

[scottmg, 2015/09/16 18:05:06]

As far as I can tell the K32... goop applies only to static linking, so only the
last sentence of the Remarks applies here -- that is, load psapi.dll and use the
function as usual.

/exports of xp, win10-x64 and win10-x86 here:
https://gist.github.com/sgraham/442af65edb21ecf24089

+                          HMODULE module,
+                          MODULEINFO* module_info,
+                          DWORD cb) {
+  static decltype(::GetModuleInformation)* get_module_information =

[Mark Mentovai, 2015/09/16 02:57:19]

Usually no :: in Crashpad, here and on the next line.

[scottmg, 2015/09/16 18:05:06]

Oops, I was playing with trying to call this function just
"GetModuleInformation" but couldn't get it to work. Done.

+      reinterpret_cast<decltype(::GetModuleInformation)*>(
+          GetProcAddress(LoadLibrary(L"psapi.dll"), "GetModuleInformation"));
+  DCHECK(get_module_information);
+  return get_module_information(process, module, module_info, cb);
+}
+
 TEST(PEImageReader, DebugDirectory) {
   PEImageReader pe_image_reader;
   ProcessReaderWin process_reader;
@@ -32,7 +44,7 @@ TEST(PEImageReader, DebugDirectory) {
                                         ProcessSuspensionState::kRunning));
   HMODULE self = reinterpret_cast<HMODULE>(&__ImageBase);
   MODULEINFO module_info;
-  ASSERT_TRUE(GetModuleInformation(
+  ASSERT_TRUE(CrashpadGetModuleInformation(
       GetCurrentProcess(), self, &module_info, sizeof(module_info)));
   EXPECT_EQ(self, module_info.lpBaseOfDll);
   EXPECT_TRUE(pe_image_reader.Initialize(&process_reader,