Second round of sbox changes for 64 bit port...

sandbox/src/policy_target_test.cc

 // Copyright (c) 2006-2010 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.
 
 #include "base/win_util.h"
 #include "sandbox/src/sandbox.h"
 #include "sandbox/src/sandbox_factory.h"
 #include "sandbox/src/sandbox_utils.h"
 #include "sandbox/src/target_services.h"
 #include "sandbox/tests/common/controller.h"
@@ skipping 132 matching lines @@
 
   return SBOX_TEST_SUCCEEDED;
 }
 
 // Tests that we can call CreateProcess.
 SBOX_TESTS_COMMAND int PolicyTargetTest_process(int argc, wchar_t **argv) {
   // Use default values to create a new process.
   STARTUPINFO startup_info = {0};
   startup_info.cb = sizeof(startup_info);
   PROCESS_INFORMATION process_info;
-  ::CreateProcess(L"foo.exe", L"foo.exe", NULL, NULL, FALSE, 0, NULL, NULL,
-                  &startup_info, &process_info);
-
-  return SBOX_TEST_SUCCEEDED;
+  if (!::CreateProcessW(L"foo.exe", L"foo.exe", NULL, NULL, FALSE, 0,
+                        NULL, NULL, &startup_info, &process_info))
+    return SBOX_TEST_SUCCEEDED;
+  return SBOX_TEST_FAILED;
 }
 
 TEST(PolicyTargetTest, SetInformationThread) {
   TestRunner runner;
   if (win_util::GetWinVersion() >= win_util::WINVERSION_XP) {
     runner.SetTestState(BEFORE_REVERT);
     EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"PolicyTargetTest_token"));
   }
 
   runner.SetTestState(AFTER_REVERT);
@@ skipping 20 matching lines @@
   if (win_util::GetWinVersion() < win_util::WINVERSION_XP)
     return;
 
   runner.SetTestState(BEFORE_REVERT);
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"PolicyTargetTest_token3"));
 
   runner.SetTestState(AFTER_REVERT);
   EXPECT_EQ(ERROR_NO_TOKEN, runner.RunTest(L"PolicyTargetTest_token3"));
 }
 
-#if !defined(_WIN64)
-// Bug 27218: We don't have dispatch for some x64 syscalls.
 TEST(PolicyTargetTest, OpenThread) {
   TestRunner runner;
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"PolicyTargetTest_thread")) <<
       "Opens the current thread";
 
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"PolicyTargetTest_thread2")) <<
       "Creates a new thread and opens it";
 }
 
 TEST(PolicyTargetTest, OpenProcess) {
   TestRunner runner;
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"PolicyTargetTest_process")) <<
       "Opens a process";
 }
 
+#if !defined(_WIN64)
+
 // Launches the app in the sandbox and ask it to wait in an
 // infinite loop. Waits for 2 seconds and then check if the
 // desktop associated with the app thread is not the same as the
 // current desktop.
 TEST(PolicyTargetTest, DesktopPolicy) {
   BrokerServices* broker = GetBroker();
 
   // Precreate the desktop.
   TargetPolicy* temp_policy = broker->CreatePolicy();
   temp_policy->CreateAlternateDesktop(false);
@@ skipping 110 matching lines @@
   EXPECT_TRUE(::CloseHandle(target.hThread));
 
   // Close the desktop handle.
   temp_policy = broker->CreatePolicy();
   temp_policy->DestroyAlternateDesktop();
   temp_policy->Release();
 }
 #endif  // _WIN64
 
 }  // namespace sandbox