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

sandbox/tests/validation_tests/commands.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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 <windows.h>
 #include <string>
 
 #include "sandbox/tests/validation_tests/commands.h"
 
 #include "sandbox/tests/common/controller.h"
 
@@ skipping 68 matching lines @@
   return TestValidWindow(window);
 }
 
 int TestValidWindow(HWND window) {
   if (::IsWindow(window))
     return SBOX_TEST_SUCCEEDED;
 
   return SBOX_TEST_DENIED;
 }
 
-SBOX_TESTS_COMMAND int OpenProcess(int argc, wchar_t **argv) {
+SBOX_TESTS_COMMAND int OpenProcessCmd(int argc, wchar_t **argv) {
   if (1 != argc)
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   DWORD process_id = _wtoi(argv[0]);
-
   return TestOpenProcess(process_id);
 }
 
 int TestOpenProcess(DWORD process_id) {
   HANDLE process = ::OpenProcess(PROCESS_VM_READ,
                                  FALSE,  // Do not inherit handle.
                                  process_id);
   if (NULL == process) {
     if (ERROR_ACCESS_DENIED == ::GetLastError()) {
       return SBOX_TEST_DENIED;
     } else {
       return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
     }
   } else {
     ::CloseHandle(process);
     return SBOX_TEST_SUCCEEDED;
   }
 }
 
-SBOX_TESTS_COMMAND int OpenThread(int argc, wchar_t **argv) {
+SBOX_TESTS_COMMAND int OpenThreadCmd(int argc, wchar_t **argv) {
   if (1 != argc)
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   DWORD thread_id = _wtoi(argv[0]);
-
   return TestOpenThread(thread_id);
 }
 
 int TestOpenThread(DWORD thread_id) {
 
   HANDLE thread = ::OpenThread(THREAD_QUERY_INFORMATION,
                                FALSE,  // Do not inherit handles.
                                thread_id);
 
   if (NULL == thread) {
@@ skipping 114 matching lines @@
   if (NULL == sbox_desk) {
     return SBOX_TEST_FAILED;
   }
   if (::SwitchDesktop(sbox_desk)) {
     return SBOX_TEST_SUCCEEDED;
   }
   return SBOX_TEST_DENIED;
 }
 
 }  // namespace sandbox