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

sandbox/src/crosscall_client.h

-// 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.
 
-#ifndef SANDBOX_SRC_CROSSCALL_CLIENT_H__
-#define SANDBOX_SRC_CROSSCALL_CLIENT_H__
+#ifndef SANDBOX_SRC_CROSSCALL_CLIENT_H_
+#define SANDBOX_SRC_CROSSCALL_CLIENT_H_
 
 #include "sandbox/src/crosscall_params.h"
 #include "sandbox/src/sandbox.h"
 
 // This header defines the CrossCall(..) family of templated functions
 // Their purpose is to simulate the syntax of regular call but to generate
 // and IPC from the client-side.
 //
 // The basic pattern is to
 //   1) use template argument deduction to compute the size of each
@@ skipping 62 matching lines @@
   // Returns this object's type.
   ArgType GetType() {
     COMPILE_ASSERT(sizeof(T) == sizeof(uint32), need_specialization);
     return ULONG_TYPE;
   }
 
  private:
   const T& t_;
 };
 
+// This copy helper template specialization if for the void pointer
+// case both 32 and 64 bit.
+template<>
+class CopyHelper<void*> {
+ public:
+  CopyHelper(void* t) : t_(t) {}
+
+  // Returns the pointer to the start of the input.
+  const void* GetStart() const {
+    return &t_;
+  }
+
+  // Update the stored value with the value in the buffer. This is not
+  // supported for this type.
+  bool Update(void* buffer) {
+    // Not supported;
+    return true;
+  }
+
+  // Returns the size of the input in bytes.
+  size_t GetSize() const {
+    return sizeof(t_);
+  }
+
+  // Returns true if the current type is used as an In or InOut parameter.
+  bool IsInOut() {
+    return false;
+  }
+
+  // Returns this object's type.
+  ArgType GetType() {
+    return VOIDPTR_TYPE;
+  }
+
+ private:
+  const void* t_;
+};
+
 // This copy helper template specialization catches the cases where the
 // parameter is a pointer to a string.
 template<>
 class CopyHelper<const wchar_t*> {
  public:
   CopyHelper(const wchar_t* t)
       : t_(t) {
   }
 
   // Returns the pointer to the start of the string.
@@ skipping 337 matching lines @@
     XCALL_GEN_UPDATE_PARAM(5, call_params);
     XCALL_GEN_UPDATE_PARAM(6, call_params);
     XCALL_GEN_UPDATE_PARAM(7, call_params);
     XCALL_GEN_FREE_CHANNEL();
   }
   return result;
 }
 }  // namespace sandbox
 
 #endif  // SANDBOX_SRC_CROSSCALL_CLIENT_H__