X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fexception.h;h=fa17fa29e241a8ba920b2ea10c198c0ec2ae50e8;hb=8e0792472f54311772f942f0188ce06ba7deb2b6;hp=47285ee2d252aa751818154b8c80522b857ef1a6;hpb=234225d112c4b018b8d1796f4c06a15812137500;p=mono.git

diff --git a/mono/metadata/exception.h b/mono/metadata/exception.h
index 47285ee2d25..fa17fa29e24 100644
--- a/mono/metadata/exception.h
+++ b/mono/metadata/exception.h
@@ -7,13 +7,15 @@
 #include <mono/metadata/object.h>
 #include <mono/metadata/image.h>
 
+MONO_BEGIN_DECLS
+
 extern MonoException *
 mono_exception_from_name               (MonoImage *image, 
 					const char* name_space, 
 					const char *name);
 
 MonoException *
-mono_exception_from_token              (MonoImage *image, guint32 token);
+mono_exception_from_token              (MonoImage *image, uint32_t token);
 
 MonoException *
 mono_exception_from_name_two_strings (MonoImage *image, const char *name_space,
@@ -21,7 +23,11 @@ mono_exception_from_name_two_strings (MonoImage *image, const char *name_space,
 
 MonoException *
 mono_exception_from_name_msg	       (MonoImage *image, const char *name_space,
-					const char *name, const guchar *msg);
+					const char *name, const char *msg);
+
+MonoException *
+mono_exception_from_token_two_strings (MonoImage *image, uint32_t token,
+						   MonoString *a1, MonoString *a2);
 
 extern MonoException *
 mono_exception_from_name_domain        (MonoDomain *domain, MonoImage *image, 
@@ -44,22 +50,25 @@ MonoException *
 mono_get_exception_null_reference      (void);
 
 MonoException *
-mono_get_exception_execution_engine    (const guchar *msg);
+mono_get_exception_execution_engine    (const char *msg);
 
 MonoException *
 mono_get_exception_thread_abort        (void);
 
 MonoException *
-mono_get_exception_thread_state        (const guchar *msg);
+mono_get_exception_thread_state        (const char *msg);
+
+MonoException *
+mono_get_exception_thread_interrupted  (void);
 
 MonoException *
-mono_get_exception_serialization       (const guchar *msg);
+mono_get_exception_serialization       (const char *msg);
 
 MonoException *
 mono_get_exception_invalid_cast        (void);
 
 MonoException *
-mono_get_exception_invalid_operation (const guchar *msg);
+mono_get_exception_invalid_operation (const char *msg);
 
 MonoException *
 mono_get_exception_index_out_of_range  (void);
@@ -68,51 +77,74 @@ MonoException *
 mono_get_exception_array_type_mismatch (void);
 
 MonoException *
-mono_get_exception_type_load           (MonoString *type_name);
+mono_get_exception_type_load           (MonoString *class_name, char *assembly_name);
 
 MonoException *
-mono_get_exception_missing_method      (void);
+mono_get_exception_missing_method      (const char *class_name, const char *member_name);
 
 MonoException *
-mono_get_exception_not_implemented     (const guchar *msg);
+mono_get_exception_missing_field       (const char *class_name, const char *member_name);
+
+MonoException *
+mono_get_exception_not_implemented     (const char *msg);
+
+MonoException *
+mono_get_exception_not_supported       (const char *msg);
 
 MonoException*
-mono_get_exception_argument_null       (const guchar *arg);
+mono_get_exception_argument_null       (const char *arg);
 
 MonoException *
-mono_get_exception_argument            (const guchar *arg, const guchar *msg);
+mono_get_exception_argument            (const char *arg, const char *msg);
 
 MonoException *
-mono_get_exception_argument_out_of_range (const guchar *arg);
+mono_get_exception_argument_out_of_range (const char *arg);
 
 MonoException *
-mono_get_exception_io                    (const guchar *msg);
+mono_get_exception_io                    (const char *msg);
 
 MonoException *
 mono_get_exception_file_not_found        (MonoString *fname);
 
 MonoException *
-mono_get_exception_file_not_found2       (const guchar *msg, MonoString *fname);
+mono_get_exception_file_not_found2       (const char *msg, MonoString *fname);
 
 MonoException *
-mono_get_exception_type_initialization (const gchar *type_name, MonoException *inner);
+mono_get_exception_type_initialization (const char *type_name, MonoException *inner);
 
 MonoException *
-mono_get_exception_synchronization_lock (const guchar *msg);
+mono_get_exception_synchronization_lock (const char *msg);
 
 MonoException *
-mono_get_exception_cannot_unload_appdomain (const guchar *msg);
+mono_get_exception_cannot_unload_appdomain (const char *msg);
 
 MonoException *
 mono_get_exception_appdomain_unloaded (void);
 
 MonoException *
-mono_get_exception_bad_image_format (const guchar *msg);
+mono_get_exception_bad_image_format (const char *msg);
+
+MonoException *
+mono_get_exception_bad_image_format2 (const char *msg, MonoString *fname);
 
 MonoException *
 mono_get_exception_stack_overflow (void);
 
+MonoException *
+mono_get_exception_out_of_memory (void);
+
+MonoException *
+mono_get_exception_field_access (void);
+
+MonoException *
+mono_get_exception_method_access (void);
+
 MonoException *
 mono_get_exception_reflection_type_load (MonoArray *types, MonoArray *exceptions);
 
+MonoException *
+mono_get_exception_runtime_wrapped (MonoObject *wrapped_exception);
+
+MONO_END_DECLS
+
 #endif /* _MONO_METADATA_EXCEPTION_H_ */