Fix CRITICAL_SECTION test

handler/win/crashy_test_program.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 99 matching lines @@
     LOG(ERROR) << "SetHandler";
     return 1;
   }
   if (!client.UseHandler()) {
     LOG(ERROR) << "UseHandler";
     return 1;
   }
 
   AllocateMemoryOfVariousProtections();
 
-  CrashpadInitializeCriticalSectionEx(
-      &g_test_critical_section, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
-  EnterCriticalSection(&g_test_critical_section);
+
+  DWORD cs_flags = 0;
+
+  // We can only force the .DebugInfo critical section on Win 8 and later.
+  DWORD version = GetVersion();
+  DWORD major_version = LOBYTE(LOWORD(version));
+  DWORD minor_version = HIBYTE(LOWORD(version));
+  if (major_version >= 6 && minor_version >= 2)

[Mark Mentovai, 2015/10/16 03:36:44]

This condition doesn’t seem quite right, it won’t match Windows 10. I think you
want (major == 6 && minor >= 2) || major > 6

[scottmg, 2015/10/16 19:29:00]

It happens to work because we're unmanifested, but was unnecessarily confusing.
(The version apis are such a mess now.)

+    cs_flags = RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO;
+
+  if (CrashpadInitializeCriticalSectionEx(
+          &g_test_critical_section, 0, cs_flags)) {
+    EnterCriticalSection(&g_test_critical_section);
+  }
 
   SomeCrashyFunction();
 
   return 0;
 }
 
 }  // namespace
 }  // namespace crashpad
 
 int wmain(int argc, wchar_t* argv[]) {
   return crashpad::ToolSupport::Wmain(argc, argv, crashpad::CrashyMain);
 }