Update

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

diff --git a/mono/metadata/marshal.h b/mono/metadata/marshal.h
index 6faaec4e67d7ea87b4f9c7e7643a56ca8ec4a89d..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>
 
@@ -46,9 +47,15 @@ mono_array_to_lparray (MonoArray *array);
 void
 mono_string_utf8_to_builder (MonoStringBuilder *sb, char *text);
 
+void
+mono_string_utf16_to_builder (MonoStringBuilder *sb, gunichar2 *text);
+
 gpointer
 mono_string_builder_to_utf8 (MonoStringBuilder *sb);
 
+gpointer
+mono_string_builder_to_utf16 (MonoStringBuilder *sb);
+
 gpointer
 mono_string_to_ansibstr (MonoString *string_obj);
 
@@ -64,8 +71,19 @@ 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_delegate_free_ftnptr (MonoDelegate *delegate);
+
+void
+mono_marshal_set_last_error (void);
+
+gpointer
+mono_marshal_asany (MonoObject *obj, MonoMarshalNative string_encoding);
+
+void
+mono_marshal_free_asany (MonoObject *o, gpointer ptr, MonoMarshalNative string_encoding);
 
 /* method builder functions */
 
@@ -112,11 +130,14 @@ void
 mono_mb_emit_stloc (MonoMethodBuilder *mb, guint num);
 
 void
-mono_mb_emit_exception (MonoMethodBuilder *mb);
+mono_mb_emit_exception (MonoMethodBuilder *mb, const char *exc_name, const char *msg);
 
 void
 mono_mb_emit_icon (MonoMethodBuilder *mb, gint32 value);
 
+guint32
+mono_mb_emit_branch (MonoMethodBuilder *mb, guint8 op);
+
 void
 mono_mb_emit_add_to_local (MonoMethodBuilder *mb, guint16 local, gint32 incr);
 
@@ -143,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);
 
@@ -167,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);
 
@@ -179,13 +209,34 @@ 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);
+
+MonoMethod *
+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);
@@ -276,5 +327,23 @@ ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalUni (MonoString
 void
 ves_icall_System_Runtime_InteropServices_Marshal_DestroyStructure (gpointer src, MonoReflectionType *type);
 
+void*
+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__ */