Update

[mono.git] / mono / metadata / marshal.h

diff --git a/mono/metadata/marshal.h b/mono/metadata/marshal.h
index 5bc20507ee62a7b0c1ddaeb7e14ea426ff4de95d..5c238dd13ce951cf88d12a698450f3177036736d 100644 (file)
--- a/mono/metadata/marshal.h
+++ b/mono/metadata/marshal.h
@@ -13,7 +13,8 @@
 #define __MONO_MARSHAL_H__
 
 #include <mono/metadata/class.h>
-#include <mono/metadata/object.h>
+#include <mono/metadata/object-internals.h>
+#include <mono/metadata/class-internals.h>
 #include <mono/metadata/opcodes.h>
 #include <mono/metadata/reflection.h>
 
@@ -70,11 +71,10 @@ mono_string_to_byvalwstr (gpointer dst, MonoString *src, int size);
 gpointer
 mono_delegate_to_ftnptr (MonoDelegate *delegate);
 
-void * 
-mono_marshal_string_array (MonoArray *array);
+MonoDelegate*
+mono_ftnptr_to_delegate (MonoClass *klass, gpointer ftn);
 
-void *
-mono_marshal_string_array_to_unicode (MonoArray *array);
+void mono_delegate_free_ftnptr (MonoDelegate *delegate);
 
 void
 mono_marshal_set_last_error (void);
@@ -164,6 +164,12 @@ mono_marshal_method_from_wrapper (MonoMethod *wrapper);
 MonoMethod *
 mono_marshal_get_remoting_invoke (MonoMethod *method);
 
+MonoMethod *
+mono_marshal_get_xappdomain_invoke (MonoMethod *method);
+
+MonoMethod *
+mono_marshal_get_remoting_invoke_for_target (MonoMethod *method, MonoRemotingTarget target_type);
+
 MonoMethod *
 mono_marshal_get_remoting_invoke_with_check (MonoMethod *method);
 
@@ -188,6 +194,9 @@ mono_marshal_get_icall_wrapper (MonoMethodSignature *sig, const char *name, gcon
 MonoMethod *
 mono_marshal_get_native_wrapper (MonoMethod *method);
 
+MonoMethod *
+mono_marshal_get_native_func_wrapper (MonoMethodSignature *sig, MonoMethodPInvoke *piinfo, MonoMarshalSpec **mspecs, gpointer func);
+
 MonoMethod *
 mono_marshal_get_struct_to_ptr (MonoClass *klass);
 
@@ -200,9 +209,18 @@ mono_marshal_get_stfld_wrapper (MonoType *type);
 MonoMethod *
 mono_marshal_get_ldfld_wrapper (MonoType *type);
 
+MonoMethod *
+mono_marshal_get_ldfld_remote_wrapper (MonoClass *klass);
+
+MonoMethod *
+mono_marshal_get_stfld_remote_wrapper (MonoClass *klass);
+
 MonoMethod *
 mono_marshal_get_synchronized_wrapper (MonoMethod *method);
 
+MonoMethod *
+mono_marshal_get_unbox_wrapper (MonoMethod *method);
+
 MonoMethod *
 mono_marshal_get_isinst (MonoClass *klass);
 
@@ -212,10 +230,13 @@ mono_marshal_get_castclass (MonoClass *klass);
 MonoMethod *
 mono_marshal_get_proxy_cancast (MonoClass *klass);
 
+MonoMethod *
+mono_marshal_get_stelemref (void);
+
 /* marshaling internal calls */
 
 void * 
-mono_marshal_alloc (gpointer size);
+mono_marshal_alloc (gulong size);
 
 void 
 mono_marshal_free (gpointer ptr);
@@ -312,8 +333,17 @@ ves_icall_System_Runtime_InteropServices_Marshal_AllocCoTaskMem (int size);
 void
 ves_icall_System_Runtime_InteropServices_Marshal_FreeCoTaskMem (void *ptr);
 
+void*
+ves_icall_System_Runtime_InteropServices_Marshal_AllocHGlobal (int size);
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_FreeHGlobal (void *ptr);
+
 void*
 ves_icall_System_Runtime_InteropServices_Marshal_UnsafeAddrOfPinnedArrayElement (MonoArray *arrayobj, int index);
 
+MonoDelegate*
+ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerInternal (void *ftn, MonoReflectionType *type);
+
 #endif /* __MONO_MARSHAL_H__ */