Merge 237541 "Revert of https://codereview.chromium.org/71013004/"

sandbox/win/src/process_policy_test.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.
 
 #include <memory>
 #include <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/win/scoped_handle.h"
@@ skipping 32 matching lines @@
   const wchar_t *exe_name = NULL;
   if (!exe.empty())
     exe_name = exe.c_str();
 
   const wchar_t *cmd_line = NULL;
   if (!command.empty())
     cmd_line = command.c_str();
 
   // Create the process with the unicode version of the API.
   sandbox::SboxTestResult ret1 = sandbox::SBOX_TEST_FAILED;
-  PROCESS_INFORMATION temp_process_info = {};
-  if (::CreateProcessW(exe_name, const_cast<wchar_t*>(cmd_line), NULL, NULL,
-                       FALSE, 0, NULL, NULL, &si, &temp_process_info)) {
-    pi.Set(temp_process_info);
-    ret1 = sandbox::SBOX_TEST_SUCCEEDED;
-  } else {
+  if (!::CreateProcessW(exe_name, const_cast<wchar_t*>(cmd_line), NULL, NULL,
+                        FALSE, 0, NULL, NULL, &si, pi.Receive())) {
     DWORD last_error = GetLastError();
     if ((ERROR_NOT_ENOUGH_QUOTA == last_error) ||
         (ERROR_ACCESS_DENIED == last_error) ||
         (ERROR_FILE_NOT_FOUND == last_error)) {
       ret1 = sandbox::SBOX_TEST_DENIED;
     } else {
       ret1 = sandbox::SBOX_TEST_FAILED;
     }
+  } else {
+    ret1 = sandbox::SBOX_TEST_SUCCEEDED;
   }
 
   pi.Close();
 
   // Do the same with the ansi version of the api
   STARTUPINFOA sia = {sizeof(sia)};
   sandbox::SboxTestResult ret2 = sandbox::SBOX_TEST_FAILED;
 
   std::string narrow_cmd_line;
   if (cmd_line)
     narrow_cmd_line = base::SysWideToMultiByte(cmd_line, CP_UTF8);
-  if (::CreateProcessA(
+  if (!::CreateProcessA(
         exe_name ? base::SysWideToMultiByte(exe_name, CP_UTF8).c_str() : NULL,
         cmd_line ? const_cast<char*>(narrow_cmd_line.c_str()) : NULL,
-        NULL, NULL, FALSE, 0, NULL, NULL, &sia, &temp_process_info)) {
-    pi.Set(temp_process_info);
-    ret2 = sandbox::SBOX_TEST_SUCCEEDED;
-  } else {
+        NULL, NULL, FALSE, 0, NULL, NULL, &sia, pi.Receive())) {
     DWORD last_error = GetLastError();
     if ((ERROR_NOT_ENOUGH_QUOTA == last_error) ||
         (ERROR_ACCESS_DENIED == last_error) ||
         (ERROR_FILE_NOT_FOUND == last_error)) {
       ret2 = sandbox::SBOX_TEST_DENIED;
     } else {
       ret2 = sandbox::SBOX_TEST_FAILED;
     }
+  } else {
+    ret2 = sandbox::SBOX_TEST_SUCCEEDED;
   }
 
   if (ret1 == ret2)
     return ret1;
 
   return sandbox::SBOX_TEST_FAILED;
 }
 
 }  // namespace
 
@@ skipping 108 matching lines @@
 // Creates a process and checks if it's possible to get a handle to it's token.
 SBOX_TESTS_COMMAND int Process_GetChildProcessToken(int argc, wchar_t **argv) {
   if (argc != 1)
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   if ((NULL == argv) || (NULL == argv[0]))
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   string16 path = MakeFullPathToSystem32(argv[0]);
 
+  base::win::ScopedProcessInformation pi;
   STARTUPINFOW si = {sizeof(si)};
 
-  PROCESS_INFORMATION temp_process_info = {};
   if (!::CreateProcessW(path.c_str(), NULL, NULL, NULL, FALSE, CREATE_SUSPENDED,
-                        NULL, NULL, &si, &temp_process_info)) {
+                        NULL, NULL, &si, pi.Receive())) {
       return SBOX_TEST_FAILED;
   }
-  base::win::ScopedProcessInformation pi(temp_process_info);
 
   HANDLE token = NULL;
   BOOL result =
       ::OpenProcessToken(pi.process_handle(), TOKEN_IMPERSONATE, &token);
   DWORD error = ::GetLastError();
 
   base::win::ScopedHandle token_handle(token);
 
   if (!::TerminateProcess(pi.process_handle(), 0))
     return SBOX_TEST_FAILED;
@@ skipping 140 matching lines @@
   ASSERT_TRUE(!exe_path.empty());
   EXPECT_TRUE(runner.AddRule(TargetPolicy::SUBSYS_PROCESS,
                              TargetPolicy::PROCESS_ALL_EXEC,
                              exe_path.c_str()));
 
   EXPECT_EQ(SBOX_TEST_SUCCEEDED,
             runner.RunTest(L"Process_GetChildProcessToken findstr.exe"));
 }
 
 }  // namespace sandbox