Re-land second sandbox round of changes...

sandbox/src/crosscall_server.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 <string>
 #include <vector>
 
 #include "sandbox/src/crosscall_server.h"
 #include "sandbox/src/crosscall_params.h"
 #include "sandbox/src/crosscall_client.h"
 #include "base/logging.h"
@@ skipping 157 matching lines @@
   }
   // The size is always computed from the parameter minus the next
   // parameter, this works because the message has an extra parameter slot
   *size = param_info_[index].size_;
   *type = param_info_[index].type_;
 
   return param_info_[index].offset_ + reinterpret_cast<char*>(this);
 }
 
 // Covers common case for 32 bit integers.
-bool CrossCallParamsEx::GetParameter32(size_t index, void* param) {
+bool CrossCallParamsEx::GetParameter32(size_t index, uint32* param) {
   size_t size = 0;
   ArgType type;
   void* start = GetRawParameter(index, &size, &type);
   if ((NULL == start) || (4 != size) || (ULONG_TYPE != type)) {
     return false;
   }
   // Copy the 4 bytes.
   *(reinterpret_cast<uint32*>(param)) = *(reinterpret_cast<uint32*>(start));
   return true;
 }
 
+bool CrossCallParamsEx::GetParameterVoidPtr(size_t index, void** param) {
+  size_t size = 0;
+  ArgType type;
+  void* start = GetRawParameter(index, &size, &type);
+  if ((NULL == start) || (sizeof(void*) != size) || (VOIDPTR_TYPE != type)) {
+    return false;
+  }
+  *param = *(reinterpret_cast<void**>(start));
+  return true;
+}
+
 // Covers the common case of reading a string. Note that the string is not
 // scanned for invalid characters.
 bool CrossCallParamsEx::GetParameterStr(size_t index, std::wstring* string) {
   size_t size = 0;
   ArgType type;
   void* start = GetRawParameter(index, &size, &type);
   if (WCHAR_TYPE != type) {
     return false;
   }
 
@@ skipping 44 matching lines @@
   for (; it != ipc_calls_.end(); ++it) {
     if (it->params.Matches(ipc)) {
       *callback = it->callback;
       return this;
     }
   }
   return NULL;
 }
 
 }  // namespace sandbox