Re-land second sandbox round of changes...

sandbox/src/registry_dispatcher.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 "sandbox/src/registry_dispatcher.h"
 
 #include "base/scoped_handle_win.h"
 #include "base/win_util.h"
 #include "sandbox/src/crosscall_client.h"
 #include "sandbox/src/interception.h"
@@ skipping 24 matching lines @@
   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, ULONG_TYPE, ULONG_TYPE,
+    {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, ULONG_TYPE, ULONG_TYPE},
+    {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 (win_util::GetWinVersion() >= win_util::WINVERSION_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, DWORD root_directory,
+    IPCInfo* ipc, std::wstring* name, DWORD attributes, HANDLE root,
     DWORD desired_access, DWORD title_index, DWORD create_options) {
   ScopedHandle root_handle;
   std::wstring real_path = *name;
 
-  HANDLE root = reinterpret_cast<HANDLE>(
-                    static_cast<ULONG_PTR>(root_directory));
-
   // 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);
   }
@@ skipping 21 matching lines @@
   }
 
   // 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, DWORD root_directory,
+                                   DWORD attributes, HANDLE root,
                                    DWORD desired_access) {
   ScopedHandle root_handle;
   std::wstring real_path = *name;
 
-  HANDLE root = reinterpret_cast<HANDLE>(
-                    static_cast<ULONG_PTR>(root_directory));
-
   // 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);
   }
 
@@ skipping 16 matching lines @@
     return true;
   }
 
   // Return operation status on the IPC.
   ipc->return_info.nt_status = nt_status;
   ipc->return_info.handle = handle;
   return true;
 }
 
 }  // namespace sandbox