Emergency revert; rietveld broke; tree broke

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146646 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 161 deletions

diff --git a/sandbox/win/src/registry_dispatcher.cc b/sandbox/win/src/registry_dispatcher.cc
deleted file mode 100644
index f4dc5f5..0000000
--- a/sandbox/win/src/registry_dispatcher.cc
+++ /dev/null
@@ -1,161 +0,0 @@
-// 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.
-
-#include "sandbox/win/src/registry_dispatcher.h"
-
-#include "base/win/scoped_handle.h"
-#include "base/win/windows_version.h"
-#include "sandbox/win/src/crosscall_client.h"
-#include "sandbox/win/src/interception.h"
-#include "sandbox/win/src/interceptors.h"
-#include "sandbox/win/src/ipc_tags.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/policy_broker.h"
-#include "sandbox/win/src/policy_params.h"
-#include "sandbox/win/src/sandbox.h"
-#include "sandbox/win/src/registry_interception.h"
-#include "sandbox/win/src/registry_policy.h"
-
-namespace {
-
-// Builds a path using the root directory and the name.
-bool GetCompletePath(HANDLE root, const std::wstring& name,
-                     std::wstring* complete_name) {
-  if (root) {
-    if (!sandbox::GetPathFromHandle(root, complete_name))
-      return false;
-
-    *complete_name += L"\\";
-    *complete_name += name;
-  } else {
-    *complete_name = name;
-  }
-
-  return true;
-}
-
-}
-
-namespace sandbox {
-
-RegistryDispatcher::RegistryDispatcher(PolicyBase* policy_base)
-    : policy_base_(policy_base) {
-  static const IPCCall create_params = {
-    {IPC_NTCREATEKEY_TAG, WCHAR_TYPE, ULONG_TYPE, VOIDPTR_TYPE, ULONG_TYPE,
-     ULONG_TYPE, ULONG_TYPE},
-    reinterpret_cast<CallbackGeneric>(&RegistryDispatcher::NtCreateKey)
-  };
-
-  static const IPCCall open_params = {
-    {IPC_NTOPENKEY_TAG, WCHAR_TYPE, ULONG_TYPE, VOIDPTR_TYPE, ULONG_TYPE},
-    reinterpret_cast<CallbackGeneric>(&RegistryDispatcher::NtOpenKey)
-  };
-
-  ipc_calls_.push_back(create_params);
-  ipc_calls_.push_back(open_params);
-}
-
-bool RegistryDispatcher::SetupService(InterceptionManager* manager,
-                                      int service) {
-  if (IPC_NTCREATEKEY_TAG == service)
-    return INTERCEPT_NT(manager, NtCreateKey, CREATE_KEY_ID, 32);
-
-  if (IPC_NTOPENKEY_TAG == service) {
-    bool result = INTERCEPT_NT(manager, NtOpenKey, OPEN_KEY_ID, 16);
-    if (base::win::GetVersion() >= base::win::VERSION_WIN7)
-      result &= INTERCEPT_NT(manager, NtOpenKeyEx, OPEN_KEY_EX_ID, 20);
-    return result;
-  }
-
-  return false;
-}
-
-bool RegistryDispatcher::NtCreateKey(
-    IPCInfo* ipc, std::wstring* name, DWORD attributes, HANDLE root,
-    DWORD desired_access, DWORD title_index, DWORD create_options) {
-  base::win::ScopedHandle root_handle;
-  std::wstring real_path = *name;
-
-  // If there is a root directory, we need to duplicate the handle to make
-  // it valid in this process.
-  if (root) {
-    if (!::DuplicateHandle(ipc->client_info->process, root,
-                           ::GetCurrentProcess(), &root, 0, FALSE,
-                           DUPLICATE_SAME_ACCESS))
-      return false;
-
-    root_handle.Set(root);
-  }
-
-  if (!GetCompletePath(root, *name, &real_path))
-    return false;
-
-  const wchar_t* regname = real_path.c_str();
-  CountedParameterSet<OpenKey> params;
-  params[OpenKey::NAME] = ParamPickerMake(regname);
-  params[OpenKey::ACCESS] = ParamPickerMake(desired_access);
-
-  EvalResult result = policy_base_->EvalPolicy(IPC_NTCREATEKEY_TAG,
-                                               params.GetBase());
-
-  HANDLE handle;
-  NTSTATUS nt_status;
-  ULONG disposition = 0;
-  if (!RegistryPolicy::CreateKeyAction(result, *ipc->client_info, *name,
-                                       attributes, root, desired_access,
-                                       title_index, create_options, &handle,
-                                       &nt_status, &disposition)) {
-    ipc->return_info.nt_status = STATUS_ACCESS_DENIED;
-    return true;
-  }
-
-  // Return operation status on the IPC.
-  ipc->return_info.extended[0].unsigned_int = disposition;
-  ipc->return_info.nt_status = nt_status;
-  ipc->return_info.handle = handle;
-  return true;
-}
-
-bool RegistryDispatcher::NtOpenKey(IPCInfo* ipc, std::wstring* name,
-                                   DWORD attributes, HANDLE root,
-                                   DWORD desired_access) {
-  base::win::ScopedHandle root_handle;
-  std::wstring real_path = *name;
-
-  // If there is a root directory, we need to duplicate the handle to make
-  // it valid in this process.
-  if (root) {
-    if (!::DuplicateHandle(ipc->client_info->process, root,
-                           ::GetCurrentProcess(), &root, 0, FALSE,
-                           DUPLICATE_SAME_ACCESS))
-      return false;
-      root_handle.Set(root);
-  }
-
-  if (!GetCompletePath(root, *name, &real_path))
-    return false;
-
-  const wchar_t* regname = real_path.c_str();
-  CountedParameterSet<OpenKey> params;
-  params[OpenKey::NAME] = ParamPickerMake(regname);
-  params[OpenKey::ACCESS] = ParamPickerMake(desired_access);
-
-  EvalResult result = policy_base_->EvalPolicy(IPC_NTOPENKEY_TAG,
-                                               params.GetBase());
-  HANDLE handle;
-  NTSTATUS nt_status;
-  if (!RegistryPolicy::OpenKeyAction(result, *ipc->client_info, *name,
-                                     attributes, root, desired_access, &handle,
-                                     &nt_status)) {
-    ipc->return_info.nt_status = STATUS_ACCESS_DENIED;
-    return true;
-  }
-
-  // Return operation status on the IPC.
-  ipc->return_info.nt_status = nt_status;
-  ipc->return_info.handle = handle;
-  return true;
-}
-
-}  // namespace sandbox