Create a "GetWOW64Status()" utility function and make the rest of the codebas...

sandbox/src/interception.cc

-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 // For information about interceptions as a whole see
 // http://dev.chromium.org/developers/design-documents/sandbox .
 
 #include <set>
 
 #include "sandbox/src/interception.h"
 
@@ skipping 405 matching lines @@
   // Bypass purify's interception.
   wchar_t* loader_get = reinterpret_cast<wchar_t*>(
                             ntdll_image.GetProcAddress("LdrGetDllHandle"));
   if (loader_get) {
     if (!GetModuleHandleHelper(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
                                    GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
                                loader_get, &ntdll_base))
       return false;
   }
 
-  Wow64 WowHelper(child_, ntdll_base);
   if (base::win::GetVersion() <= base::win::VERSION_VISTA) {
-    if (!WowHelper.WaitForNtdll(INFINITE))
+    Wow64 WowHelper(child_, ntdll_base);
+    if (!WowHelper.WaitForNtdll())
       return false;
   }
 
   char* interceptor_base = NULL;
 
 #if SANDBOX_EXPORTS
   interceptor_base = reinterpret_cast<char*>(child_->MainModule());
   HMODULE local_interceptor = ::LoadLibrary(child_->Name());
 #endif
 
   ServiceResolverThunk* thunk;
-  if (WowHelper.IsWow64())
+  if (base::win::GetWOW64Status() == base::win::WOW64_ENABLED)
     thunk = new Wow64ResolverThunk(child_->Process(), relaxed_);
   else if (!IsXPSP2OrLater())
     thunk = new Win2kResolverThunk(child_->Process(), relaxed_);
   else
     thunk = new ServiceResolverThunk(child_->Process(), relaxed_);
 
   std::list<InterceptionData>::iterator it = interceptions_.begin();
   for (; it != interceptions_.end(); ++it) {
     const std::wstring ntdll(kNtdllName);
     if (it->dll != ntdll)
@@ skipping 43 matching lines @@
     ::FreeLibrary(local_interceptor);
 #endif
 
   if (it != interceptions_.end())
     return false;
 
   return true;
 }
 
 }  // namespace sandbox