* locales.c
[mono.git] / mono / metadata / image.c
index f733d9638e322292ecfbebe7e124dcc174b46c75..0c8ca5f9043e6a8c51652c3a35ae2442b0d2576a 100644 (file)
@@ -2,13 +2,12 @@
  * image.c: Routines for manipulating an image stored in an
  * extended PE/COFF file.
  * 
- * Author:
+ * Authors:
  *   Miguel de Icaza (miguel@ximian.com)
+ *   Paolo Molaro (lupus@ximian.com)
  *
- * (C) 2001 Ximian, Inc.  http://www.ximian.com
+ * (C) 2001-2003 Ximian, Inc.  http://www.ximian.com
  *
- * TODO:
- *   Implement big-endian versions of the reading routines.
  */
 #include <config.h>
 #include <stdio.h>
@@ -22,6 +21,8 @@
 #include "mono-endian.h"
 #include "private.h"
 #include "tabledefs.h"
+#include "tokentype.h"
+#include <mono/io-layer/io-layer.h>
 
 #define INVALID_ADDRESS 0xffffffff
 
@@ -29,6 +30,9 @@
  * Keeps track of the various assemblies loaded
  */
 static GHashTable *loaded_images_hash;
+static GHashTable *loaded_images_guid_hash;
+
+static CRITICAL_SECTION images_mutex;
 
 guint32
 mono_cli_rva_image_map (MonoCLIImageInfo *iinfo, guint32 addr)
@@ -65,6 +69,20 @@ mono_cli_rva_map (MonoCLIImageInfo *iinfo, guint32 addr)
        return NULL;
 }
 
+/**
+ * mono_images_init:
+ *
+ *  Initialize the global variables used by this module.
+ */
+void
+mono_images_init (void)
+{
+       InitializeCriticalSection (&images_mutex);
+
+       loaded_images_hash = g_hash_table_new (g_str_hash, g_str_equal);
+       loaded_images_guid_hash = g_hash_table_new (g_str_hash, g_str_equal);
+}
+
 /**
  * mono_image_ensure_section_idx:
  * @image: The image we are operating on
@@ -91,6 +109,13 @@ mono_image_ensure_section_idx (MonoImage *image, int section)
        
        writable = sect->st_flags & SECT_FLAGS_MEM_WRITE;
 
+       if (!image->f) {
+               if (sect->st_raw_data_ptr + sect->st_raw_data_size > image->raw_data_len)
+                       return FALSE;
+               /* FIXME: we ignore the writable flag since we don't patch the binary */
+               iinfo->cli_sections [section] = image->raw_data + sect->st_raw_data_ptr;
+               return TRUE;
+       }
        iinfo->cli_sections [section] = mono_raw_buffer_load (
                fileno (image->f), writable,
                sect->st_raw_data_ptr, sect->st_raw_data_size);
@@ -127,7 +152,7 @@ mono_image_ensure_section (MonoImage *image, const char *section)
 }
 
 static int
-load_section_tables (MonoImage *image, MonoCLIImageInfo *iinfo)
+load_section_tables (MonoImage *image, MonoCLIImageInfo *iinfo, guint32 offset)
 {
        const int top = iinfo->cli_header.coff.coff_sections;
        int i;
@@ -138,9 +163,16 @@ load_section_tables (MonoImage *image, MonoCLIImageInfo *iinfo)
        
        for (i = 0; i < top; i++){
                MonoSectionTable *t = &iinfo->cli_section_tables [i];
-               
-               if (fread (t, sizeof (MonoSectionTable), 1, image->f) != 1)
-                       return FALSE;
+
+               if (!image->f) {
+                       if (offset + sizeof (MonoSectionTable) > image->raw_data_len)
+                               return FALSE;
+                       memcpy (t, image->raw_data + offset, sizeof (MonoSectionTable));
+                       offset += sizeof (MonoSectionTable);
+               } else {
+                       if (fread (t, sizeof (MonoSectionTable), 1, image->f) != 1)
+                               return FALSE;
+               }
 
 #if G_BYTE_ORDER != G_LITTLE_ENDIAN
                t->st_virtual_size = GUINT32_FROM_LE (t->st_virtual_size);
@@ -173,11 +205,17 @@ load_cli_header (MonoImage *image, MonoCLIImageInfo *iinfo)
        if (offset == INVALID_ADDRESS)
                return FALSE;
 
-       if (fseek (image->f, offset, SEEK_SET) != 0)
-               return FALSE;
+       if (!image->f) {
+               if (offset + sizeof (MonoCLIHeader) > image->raw_data_len)
+                       return FALSE;
+               memcpy (&iinfo->cli_cli_header, image->raw_data + offset, sizeof (MonoCLIHeader));
+       } else {
+               if (fseek (image->f, offset, SEEK_SET) != 0)
+                       return FALSE;
        
-       if ((n = fread (&iinfo->cli_cli_header, sizeof (MonoCLIHeader), 1, image->f)) != 1)
-               return FALSE;
+               if ((n = fread (&iinfo->cli_cli_header, sizeof (MonoCLIHeader), 1, image->f)) != 1)
+                       return FALSE;
+       }
 
 #if G_BYTE_ORDER != G_LITTLE_ENDIAN
 #define SWAP32(x) (x) = GUINT32_FROM_LE ((x))
@@ -236,15 +274,25 @@ load_metadata_ptrs (MonoImage *image, MonoCLIImageInfo *iinfo)
        guint32 offset, size;
        guint16 streams;
        int i;
+       guint32 pad;
        char *ptr;
        
        offset = mono_cli_rva_image_map (iinfo, iinfo->cli_cli_header.ch_metadata.rva);
-       size = iinfo->cli_cli_header.ch_metadata.size;
-       
-       image->raw_metadata = mono_raw_buffer_load (fileno (image->f), FALSE, offset, size);
-       if (image->raw_metadata == NULL)
+       if (offset == INVALID_ADDRESS)
                return FALSE;
 
+       size = iinfo->cli_cli_header.ch_metadata.size;
+
+       if (!image->f) {
+               if (offset + size > image->raw_data_len)
+                       return FALSE;
+               image->raw_metadata = image->raw_data + offset;
+       } else {
+               image->raw_metadata = mono_raw_buffer_load (fileno (image->f), FALSE, offset, size);
+               if (image->raw_metadata == NULL)
+                       return FALSE;
+       }
+
        ptr = image->raw_metadata;
 
        if (strncmp (ptr, "BSJB", 4) == 0){
@@ -253,9 +301,11 @@ load_metadata_ptrs (MonoImage *image, MonoCLIImageInfo *iinfo)
                ptr += 12;
                version_string_len = read32 (ptr);
                ptr += 4;
+               image->version = g_strndup (ptr, version_string_len);
                ptr += version_string_len;
-               if (((guint32) ptr) % 4)
-                       ptr += 4 - (((guint32) ptr) %4);
+               pad = ptr - image->raw_metadata;
+               if (pad % 4)
+                       ptr += 4 - (pad % 4);
        } else
                return FALSE;
 
@@ -286,14 +336,23 @@ load_metadata_ptrs (MonoImage *image, MonoCLIImageInfo *iinfo)
                        image->heap_guid.data = image->raw_metadata + read32 (ptr);
                        image->heap_guid.size = read32 (ptr + 4);
                        ptr += 8 + 6;
+               } else if (strncmp (ptr + 8, "#-", 3) == 0) {
+                       g_print ("Assembly '%s' has the non-standard metadata heap #-.\nRecompile it correctly (without the /incremental switch or in Release mode).", image->name);
+                       return FALSE;
                } else {
                        g_message ("Unknown heap type: %s\n", ptr + 8);
-                       ptr += 8 + strlen (ptr) + 1;
-               }
-               if (((guint32)ptr) % 4){
-                       ptr += 4 - (((guint32)ptr) % 4);
+                       ptr += 8 + strlen (ptr + 8) + 1;
                }
+               pad = ptr - image->raw_metadata;
+               if (pad % 4)
+                       ptr += 4 - (pad % 4);
        }
+
+       g_assert (image->heap_guid.data);
+       g_assert (image->heap_guid.size >= 16);
+
+       image->guid = mono_guid_to_string (image->heap_guid.data);
+
        return TRUE;
 }
 
@@ -305,7 +364,7 @@ load_tables (MonoImage *image)
 {
        const char *heap_tables = image->heap_tables.data;
        const guint32 *rows;
-       guint64 valid_mask;
+       guint64 valid_mask, sorted_mask;
        int valid = 0, table;
        int heap_sizes;
        
@@ -315,6 +374,7 @@ load_tables (MonoImage *image)
        image->idx_blob_wide   = ((heap_sizes & 0x04) == 4);
        
        valid_mask = read64 (heap_tables + 8);
+       sorted_mask = read64 (heap_tables + 16);
        rows = (const guint32 *) (heap_tables + 24);
        
        for (table = 0; table < 64; table++){
@@ -322,9 +382,12 @@ load_tables (MonoImage *image)
                        image->tables [table].rows = 0;
                        continue;
                }
-               if (table > 0x2b) {
-                       g_warning("bits in valid must be zero above 0x2b (II - 23.1.6)");
+               if (table > MONO_TABLE_LAST) {
+                       g_warning("bits in valid must be zero above 0x2d (II - 23.1.6)");
                }
+               /*if ((sorted_mask & ((guint64) 1 << table)) == 0){
+                       g_print ("table %s (0x%02x) is sorted\n", mono_meta_table_name (table), table);
+               }*/
                image->tables [table].rows = read32 (rows);
                rows++;
                valid++;
@@ -348,6 +411,57 @@ load_metadata (MonoImage *image, MonoCLIImageInfo *iinfo)
        return load_tables (image);
 }
 
+void
+mono_image_add_to_name_cache (MonoImage *image, const char *nspace, 
+                                                         const char *name, guint32 index)
+{
+       GHashTable *nspace_table;
+       GHashTable *name_cache = image->name_cache;
+
+       if (!(nspace_table = g_hash_table_lookup (name_cache, nspace))) {
+               nspace_table = g_hash_table_new (g_str_hash, g_str_equal);
+               g_hash_table_insert (name_cache, (char *)nspace, (char *)nspace_table);
+       }
+       g_hash_table_insert (nspace_table, (char *) name, GUINT_TO_POINTER (index));
+}
+
+static void
+load_modules (MonoImage *image, MonoImageOpenStatus *status)
+{
+       MonoTableInfo *t;
+       int i;
+       char *base_dir;
+
+       if (image->modules)
+               return;
+
+       t = &image->tables [MONO_TABLE_MODULEREF];
+       image->modules = g_new0 (MonoImage *, t->rows);
+       base_dir = g_path_get_dirname (image->name);
+       for (i = 0; i < t->rows; i++){
+               char *module_ref;
+               const char *name;
+               guint32 cols [MONO_MODULEREF_SIZE];
+
+               mono_metadata_decode_row (t, i, cols, MONO_MODULEREF_SIZE);
+               name = mono_metadata_string_heap (image, cols [MONO_MODULEREF_NAME]);
+               module_ref = g_build_filename (base_dir, name, NULL);
+               image->modules [i] = mono_image_open (module_ref, status);
+               if (image->modules [i]) {
+                       //g_print ("loaded module %s from %s (%p)\n", module_ref, image->name, image->assembly);
+               }
+               /* 
+                * FIXME: what do we do here? it could be a native dll...
+                * We should probably do lazy-loading of modules.
+                */
+               if (status)
+                       *status = MONO_IMAGE_OK;
+               g_free (module_ref);
+       }
+
+       g_free (base_dir);
+}
+
 static void
 load_class_names (MonoImage *image)
 {
@@ -355,71 +469,151 @@ load_class_names (MonoImage *image)
        guint32 cols [MONO_TYPEDEF_SIZE];
        const char *name;
        const char *nspace;
-       GHashTable *nspace_table;
-       GHashTable *name_cache = image->name_cache;
-       guint32 i, visib;
+       guint32 i, visib, nspace_index;
+       GHashTable *name_cache2, *nspace_table;
+
+       /* Temporary hash table to avoid lookups in the nspace_table */
+       name_cache2 = g_hash_table_new (NULL, NULL);
 
        for (i = 1; i <= t->rows; ++i) {
                mono_metadata_decode_row (t, i - 1, cols, MONO_TYPEDEF_SIZE);
                /* nested types are accessed from the nesting name */
                visib = cols [MONO_TYPEDEF_FLAGS] & TYPE_ATTRIBUTE_VISIBILITY_MASK;
-               if (visib > TYPE_ATTRIBUTE_PUBLIC && visib < TYPE_ATTRIBUTE_NESTED_ASSEMBLY)
+               if (visib > TYPE_ATTRIBUTE_PUBLIC && visib <= TYPE_ATTRIBUTE_NESTED_ASSEMBLY)
                        continue;
                name = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAME]);
                nspace = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAMESPACE]);
-               if (!(nspace_table = g_hash_table_lookup (name_cache, nspace))) {
+
+               nspace_index = cols [MONO_TYPEDEF_NAMESPACE];
+               nspace_table = g_hash_table_lookup (name_cache2, GUINT_TO_POINTER (nspace_index));
+               if (!nspace_table) {
                        nspace_table = g_hash_table_new (g_str_hash, g_str_equal);
-                       g_hash_table_insert (name_cache, (char *)nspace, (char *)nspace_table);
+                       g_hash_table_insert (image->name_cache, (char*)nspace, nspace_table);
+                       g_hash_table_insert (name_cache2, GUINT_TO_POINTER (nspace_index),
+                                                                nspace_table);
                }
                g_hash_table_insert (nspace_table, (char *) name, GUINT_TO_POINTER (i));
        }
+
+       /* Load type names from EXPORTEDTYPES table */
+       {
+               MonoTableInfo  *t = &image->tables [MONO_TABLE_EXPORTEDTYPE];
+               guint32 cols [MONO_EXP_TYPE_SIZE];
+               int i;
+
+               for (i = 0; i < t->rows; ++i) {
+                       mono_metadata_decode_row (t, i, cols, MONO_EXP_TYPE_SIZE);
+                       name = mono_metadata_string_heap (image, cols [MONO_EXP_TYPE_NAME]);
+                       nspace = mono_metadata_string_heap (image, cols [MONO_EXP_TYPE_NAMESPACE]);
+
+                       nspace_index = cols [MONO_EXP_TYPE_NAMESPACE];
+                       nspace_table = g_hash_table_lookup (name_cache2, GUINT_TO_POINTER (nspace_index));
+                       if (!nspace_table) {
+                               nspace_table = g_hash_table_new (g_str_hash, g_str_equal);
+                               g_hash_table_insert (image->name_cache, (char*)nspace, nspace_table);
+                               g_hash_table_insert (name_cache2, GUINT_TO_POINTER (nspace_index),
+                                                                        nspace_table);
+                       }
+                       g_hash_table_insert (nspace_table, (char *) name, GUINT_TO_POINTER (mono_metadata_make_token (MONO_TABLE_EXPORTEDTYPE, i + 1)));
+               }
+       }
+
+       g_hash_table_destroy (name_cache2);
+}
+
+static void
+register_guid (gpointer key, gpointer value, gpointer user_data)
+{
+       MonoImage *image = (MonoImage*)value;
+
+       if (!g_hash_table_lookup (loaded_images_guid_hash, image))
+               g_hash_table_insert (loaded_images_guid_hash, image->guid, image);
+}
+
+static void
+build_guid_table (void)
+{
+       g_hash_table_foreach (loaded_images_hash, register_guid, NULL);
+}
+
+void
+mono_image_init (MonoImage *image)
+{
+       image->method_cache = g_hash_table_new (NULL, NULL);
+       image->class_cache = g_hash_table_new (NULL, NULL);
+       image->field_cache = g_hash_table_new (NULL, NULL);
+       image->name_cache = g_hash_table_new (g_str_hash, g_str_equal);
+       image->array_cache = g_hash_table_new (NULL, NULL);
+
+       image->delegate_begin_invoke_cache = 
+               g_hash_table_new ((GHashFunc)mono_signature_hash, 
+                                 (GCompareFunc)mono_metadata_signature_equal);
+       image->delegate_end_invoke_cache = 
+               g_hash_table_new ((GHashFunc)mono_signature_hash, 
+                                 (GCompareFunc)mono_metadata_signature_equal);
+       image->delegate_invoke_cache = 
+               g_hash_table_new ((GHashFunc)mono_signature_hash, 
+                                 (GCompareFunc)mono_metadata_signature_equal);
+
+       image->runtime_invoke_cache = g_hash_table_new (NULL, NULL);
+       image->managed_wrapper_cache = g_hash_table_new (NULL, NULL);
+       image->native_wrapper_cache = g_hash_table_new (NULL, NULL);
+       image->remoting_invoke_cache = g_hash_table_new (NULL, NULL);
+       image->synchronized_cache = g_hash_table_new (NULL, NULL);
+
+       image->typespec_cache = g_hash_table_new (NULL, NULL);
+
+       image->generic_inst_cache =
+               g_hash_table_new ((GHashFunc)mono_metadata_generic_inst_hash,
+                                 (GCompareFunc)mono_metadata_generic_inst_equal);
 }
 
 static MonoImage *
-do_mono_image_open (const char *fname, enum MonoImageOpenStatus *status)
+do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status)
 {
        MonoCLIImageInfo *iinfo;
        MonoDotNetHeader *header;
        MonoMSDOSHeader msdos;
-       MonoImage *image;
        int n;
+       guint32 offset = 0;
 
-       image = g_new0 (MonoImage, 1);
-       image->f = fopen (fname, "rb");
-       image->name = g_strdup (fname);
-       iinfo = g_new0 (MonoCLIImageInfo, 1);
-       image->image_info = iinfo;
-
-       image->method_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
-       image->class_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
-       image->name_cache = g_hash_table_new (g_str_hash, g_str_equal);
-       image->array_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
+       mono_image_init (image);
 
+       iinfo = image->image_info;
        header = &iinfo->cli_header;
                
-       if (image->f == NULL){
-               if (status)
-                       *status = MONO_IMAGE_ERROR_ERRNO;
-               mono_image_close (image);
-               return NULL;
-       }
-
        if (status)
                *status = MONO_IMAGE_IMAGE_INVALID;
+
+       if (!image->f) {
+               if (offset + sizeof (msdos) > image->raw_data_len)
+                       goto invalid_image;
+               memcpy (&msdos, image->raw_data + offset, sizeof (msdos));
+       } else {
+               if (fread (&msdos, sizeof (msdos), 1, image->f) != 1)
+                       goto invalid_image;
+       }
        
-       if (fread (&msdos, sizeof (msdos), 1, image->f) != 1)
-               goto invalid_image;
-       
-       if (!(msdos.msdos_header [0] == 'M' && msdos.msdos_header [1] == 'Z'))
+       if (!(msdos.msdos_sig [0] == 'M' && msdos.msdos_sig [1] == 'Z'))
                goto invalid_image;
        
        msdos.pe_offset = GUINT32_FROM_LE (msdos.pe_offset);
 
-       if (msdos.pe_offset != sizeof (msdos))
-               fseek (image->f, msdos.pe_offset, SEEK_SET);
-       
-       if ((n = fread (header, sizeof (MonoDotNetHeader), 1, image->f)) != 1)
-               goto invalid_image;
+       if (msdos.pe_offset != sizeof (msdos)) {
+               if (image->f)
+                       fseek (image->f, msdos.pe_offset, SEEK_SET);
+       }
+       offset = msdos.pe_offset;
+
+       if (!image->f) {
+               if (offset + sizeof (MonoDotNetHeader) > image->raw_data_len)
+                       goto invalid_image;
+               memcpy (header, image->raw_data + offset, sizeof (MonoDotNetHeader));
+               offset += sizeof (MonoDotNetHeader);
+       } else {
+               if ((n = fread (header, sizeof (MonoDotNetHeader), 1, image->f)) != 1)
+                       goto invalid_image;
+       }
 
 #if G_BYTE_ORDER != G_LITTLE_ENDIAN
 #define SWAP32(x) (x) = GUINT32_FROM_LE ((x))
@@ -496,14 +690,27 @@ do_mono_image_open (const char *fname, enum MonoImageOpenStatus *status)
        if (header->pesig[0] != 'P' || header->pesig[1] != 'E' || header->pe.pe_magic != 0x10B)
                goto invalid_image;
 
+#if 0
+       /*
+        * The spec says that this field should contain 6.0, but Visual Studio includes a new compiler,
+        * which produces binaries with 7.0.  From Sergey:
+        *
+        * The reason is that MSVC7 uses traditional compile/link
+        * sequence for CIL executables, and VS.NET (and Framework
+        * SDK) includes linker version 7, that puts 7.0 in this
+        * field.  That's why it's currently not possible to load VC
+        * binaries with Mono.  This field is pretty much meaningless
+        * anyway (what linker?).
+        */
        if (header->pe.pe_major != 6 || header->pe.pe_minor != 0)
                goto invalid_image;
+#endif
 
        /*
         * FIXME: byte swap all addresses here for header.
         */
        
-       if (!load_section_tables (image, iinfo))
+       if (!load_section_tables (image, iinfo, offset))
                goto invalid_image;
        
        /* Load the CLI header */
@@ -515,13 +722,23 @@ do_mono_image_open (const char *fname, enum MonoImageOpenStatus *status)
 
        load_class_names (image);
 
-       image->assembly_name = mono_metadata_string_heap (image, 
+       /* modules don't have an assembly table row */
+       if (image->tables [MONO_TABLE_ASSEMBLY].rows)
+               image->assembly_name = mono_metadata_string_heap (image, 
                        mono_metadata_decode_row_col (&image->tables [MONO_TABLE_ASSEMBLY],
                                        0, MONO_ASSEMBLY_NAME));
 
+       image->module_name = mono_metadata_string_heap (image, 
+                       mono_metadata_decode_row_col (&image->tables [MONO_TABLE_MODULE],
+                                       0, MONO_MODULE_NAME));
+
+       load_modules (image, status);
+
        if (status)
                *status = MONO_IMAGE_OK;
 
+       image->ref_count=1;
+
        return image;
 
 invalid_image:
@@ -529,11 +746,91 @@ invalid_image:
                return NULL;
 }
 
+static MonoImage *
+do_mono_image_open (const char *fname, MonoImageOpenStatus *status)
+{
+       MonoCLIImageInfo *iinfo;
+       MonoImage *image;
+       FILE *filed;
+
+       if ((filed = fopen (fname, "rb")) == NULL){
+               if (status)
+                       *status = MONO_IMAGE_ERROR_ERRNO;
+               return NULL;
+       }
+
+       image = g_new0 (MonoImage, 1);
+       image->ref_count = 1;
+       image->f = filed;
+       iinfo = g_new0 (MonoCLIImageInfo, 1);
+       image->image_info = iinfo;
+
+       if (g_path_is_absolute (fname))
+               image->name = g_strdup (fname);
+       else {
+               gchar *path = g_get_current_dir ();
+               image->name = g_build_filename (path, fname, NULL);
+               g_free (path);
+       }
+
+       return do_mono_image_load (image, status);
+}
+
 MonoImage *
-mono_image_loaded (const char *name) {
-       if (loaded_images_hash)
-               return g_hash_table_lookup (loaded_images_hash, name);
-       return NULL;
+mono_image_loaded (const char *name)
+{
+       MonoImage *res;
+        
+       EnterCriticalSection (&images_mutex);
+       res = g_hash_table_lookup (loaded_images_hash, name);
+       LeaveCriticalSection (&images_mutex);
+       return res;
+}
+
+MonoImage *
+mono_image_loaded_by_guid (const char *guid)
+{
+       MonoImage *res;
+
+       EnterCriticalSection (&images_mutex);
+       res = g_hash_table_lookup (loaded_images_guid_hash, guid);
+       LeaveCriticalSection (&images_mutex);
+       return res;
+}
+
+MonoImage *
+mono_image_open_from_data (char *data, guint32 data_len, gboolean need_copy, MonoImageOpenStatus *status)
+{
+       MonoCLIImageInfo *iinfo;
+       MonoImage *image;
+       char *datac;
+
+       if (!data || !data_len) {
+               if (status)
+                       *status = MONO_IMAGE_IMAGE_INVALID;
+               return NULL;
+       }
+       datac = data;
+       if (need_copy) {
+               datac = g_try_malloc (data_len);
+               if (!datac) {
+                       if (status)
+                               *status = MONO_IMAGE_ERROR_ERRNO;
+                       return NULL;
+               }
+               memcpy (datac, data, data_len);
+       }
+
+       image = g_new0 (MonoImage, 1);
+       image->ref_count = 1;
+       image->raw_data = datac;
+       image->raw_data_len = data_len;
+       image->raw_data_allocated = need_copy;
+       image->name = g_strdup_printf ("data-%p", datac);
+       iinfo = g_new0 (MonoCLIImageInfo, 1);
+       image->image_info = iinfo;
+
+       return do_mono_image_load (image, status);
 }
 
 /**
@@ -545,38 +842,68 @@ mono_image_loaded (const char *name) {
  * if NULL, then check the value of @status for details on the error
  */
 MonoImage *
-mono_image_open (const char *fname, enum MonoImageOpenStatus *status)
+mono_image_open (const char *fname, MonoImageOpenStatus *status)
 {
-       MonoImage *image;
+       MonoImage *image, *image2;
        
        g_return_val_if_fail (fname != NULL, NULL);
 
-       if (loaded_images_hash){
-               image = g_hash_table_lookup (loaded_images_hash, fname);
-               if (image){
-                       image->ref_count++;
-                       return image;
-               }
+       /*
+        * The easiest solution would be to do all the loading inside the mutex,
+        * but that would lead to scalability problems. So we let the loading
+        * happen outside the mutex, and if multiple threads happen to load
+        * the same image, we discard all but the first copy.
+        */
+       EnterCriticalSection (&images_mutex);
+       image = g_hash_table_lookup (loaded_images_hash, fname);
+       if (image){
+               image->ref_count++;
+               LeaveCriticalSection (&images_mutex);
+               return image;
        }
+       LeaveCriticalSection (&images_mutex);
 
        image = do_mono_image_open (fname, status);
        if (image == NULL)
                return NULL;
 
-       if (!loaded_images_hash)
-               loaded_images_hash = g_hash_table_new (g_str_hash, g_str_equal);
+       EnterCriticalSection (&images_mutex);
+       image2 = g_hash_table_lookup (loaded_images_hash, fname);
+       if (image2) {
+               /* Somebody else beat us to it */
+               image2->ref_count ++;
+               LeaveCriticalSection (&images_mutex);
+               mono_image_close (image);
+
+               return image2;
+       }
        g_hash_table_insert (loaded_images_hash, image->name, image);
-       g_hash_table_insert (loaded_images_hash, (char *) image->assembly_name, image);
-       
+       if (image->assembly_name)
+               g_hash_table_insert (loaded_images_hash, (char *) image->assembly_name, image); 
+       g_hash_table_insert (loaded_images_guid_hash, image->guid, image);
+       LeaveCriticalSection (&images_mutex);
+
        return image;
 }
 
 static void
-free_hash_table(gpointer key, gpointer val, gpointer user_data)
+free_hash_table (gpointer key, gpointer val, gpointer user_data)
 {
        g_hash_table_destroy ((GHashTable*)val);
 }
 
+/**
+ * mono_image_close:
+ * @image: The image file we wish to add a reference to
+ *
+ *  Increases the reference count of an image.
+ */
+void
+mono_image_addref (MonoImage *image)
+{
+       InterlockedIncrement (&image->ref_count);
+}      
+
 /**
  * mono_image_close:
  * @image: The image file we wish to close
@@ -587,23 +914,50 @@ free_hash_table(gpointer key, gpointer val, gpointer user_data)
 void
 mono_image_close (MonoImage *image)
 {
+       MonoImage *image2;
+
        g_return_if_fail (image != NULL);
 
-       if (--image->ref_count)
+       EnterCriticalSection (&images_mutex);
+       if (--image->ref_count) {
+               LeaveCriticalSection (&images_mutex);
                return;
+       }
+       image2 = g_hash_table_lookup (loaded_images_hash, image->name);
+       if (image == image2) {
+               /* This is not true if we are called from mono_image_open () */
+               g_hash_table_remove (loaded_images_hash, image->name);
+               if (image->assembly_name)
+                       g_hash_table_remove (loaded_images_hash, (char *) image->assembly_name);        
+               g_hash_table_remove (loaded_images_guid_hash, image->guid);
+               /* Multiple images might have the same guid */
+               build_guid_table ();
+       }       
+       LeaveCriticalSection (&images_mutex);
 
-       g_hash_table_remove (loaded_images_hash, image->name);
-       
        if (image->f)
                fclose (image->f);
+       if (image->raw_data_allocated)
+               g_free (image->raw_data);
 
        g_free (image->name);
+       g_free (image->files);
 
        g_hash_table_destroy (image->method_cache);
        g_hash_table_destroy (image->class_cache);
+       g_hash_table_destroy (image->field_cache);
        g_hash_table_destroy (image->array_cache);
        g_hash_table_foreach (image->name_cache, free_hash_table, NULL);
        g_hash_table_destroy (image->name_cache);
+       g_hash_table_destroy (image->native_wrapper_cache);
+       g_hash_table_destroy (image->managed_wrapper_cache);
+       g_hash_table_destroy (image->delegate_begin_invoke_cache);
+       g_hash_table_destroy (image->delegate_end_invoke_cache);
+       g_hash_table_destroy (image->delegate_invoke_cache);
+       g_hash_table_destroy (image->remoting_invoke_cache);
+       g_hash_table_destroy (image->runtime_invoke_cache);
+       g_hash_table_destroy (image->typespec_cache);
+       g_hash_table_destroy (image->generic_inst_cache);
        
        if (image->raw_metadata != NULL)
                mono_raw_buffer_free (image->raw_metadata);
@@ -623,7 +977,7 @@ mono_image_close (MonoImage *image)
                        g_free (ii->cli_sections);
                g_free (image->image_info);
        }
-       
+
        g_free (image);
 }
 
@@ -634,7 +988,7 @@ mono_image_close (MonoImage *image)
  * Returns: a string describing the error
  */
 const char *
-mono_image_strerror (enum MonoImageOpenStatus status)
+mono_image_strerror (MonoImageOpenStatus status)
 {
        switch (status){
        case MONO_IMAGE_OK:
@@ -649,3 +1003,255 @@ mono_image_strerror (enum MonoImageOpenStatus status)
        return "Internal error";
 }
 
+static gpointer
+mono_image_walk_resource_tree (MonoCLIImageInfo *info, guint32 res_id,
+                              guint32 lang_id, gunichar2 *name,
+                              MonoPEResourceDirEntry *entry,
+                              MonoPEResourceDir *root, guint32 level)
+{
+       gboolean is_string=entry->name_is_string;
+
+       /* Level 0 holds a directory entry for each type of resource
+        * (identified by ID or name).
+        *
+        * Level 1 holds a directory entry for each named resource
+        * item, and each "anonymous" item of a particular type of
+        * resource.
+        *
+        * Level 2 holds a directory entry for each language pointing to
+        * the actual data.
+        */
+
+       if(level==0) {
+               if((is_string==FALSE && entry->name_offset!=res_id) ||
+                  (is_string==TRUE)) {
+                       return(NULL);
+               }
+       } else if (level==1) {
+#if 0
+               if(name!=NULL &&
+                  is_string==TRUE && name!=lookup (entry->name_offset)) {
+                       return(NULL);
+               }
+#endif
+       } else if (level==2) {
+               if((is_string==FALSE && entry->name_offset!=lang_id) ||
+                  (is_string==TRUE)) {
+                       return(NULL);
+               }
+       } else {
+               g_assert_not_reached ();
+       }
+
+       if(entry->is_dir==TRUE) {
+               MonoPEResourceDir *res_dir=(MonoPEResourceDir *)(((char *)root)+entry->dir_offset);
+               MonoPEResourceDirEntry *sub_entries=(MonoPEResourceDirEntry *)(res_dir+1);
+               guint32 entries, i;
+               
+               entries=res_dir->res_named_entries + res_dir->res_id_entries;
+
+               for(i=0; i<entries; i++) {
+                       MonoPEResourceDirEntry *sub_entry=&sub_entries[i];
+                       gpointer ret;
+                       
+                       ret=mono_image_walk_resource_tree (info, res_id,
+                                                          lang_id, name,
+                                                          sub_entry, root,
+                                                          level+1);
+                       if(ret!=NULL) {
+                               return(ret);
+                       }
+               }
+
+               return(NULL);
+       } else {
+               MonoPEResourceDataEntry *data_entry=(MonoPEResourceDataEntry *)((char *)(root)+entry->dir_offset);
+               
+               return(data_entry);
+       }
+}
+
+gpointer
+mono_image_lookup_resource (MonoImage *image, guint32 res_id, guint32 lang_id, gunichar2 *name)
+{
+       MonoCLIImageInfo *info;
+       MonoDotNetHeader *header;
+       MonoPEDatadir *datadir;
+       MonoPEDirEntry *rsrc;
+       MonoPEResourceDir *resource_dir;
+       MonoPEResourceDirEntry *res_entries;
+       guint32 entries, i;
+
+       if(image==NULL) {
+               return(NULL);
+       }
+
+       info=image->image_info;
+       if(info==NULL) {
+               return(NULL);
+       }
+
+       header=&info->cli_header;
+       if(header==NULL) {
+               return(NULL);
+       }
+
+       datadir=&header->datadir;
+       if(datadir==NULL) {
+               return(NULL);
+       }
+
+       rsrc=&datadir->pe_resource_table;
+       if(rsrc==NULL) {
+               return(NULL);
+       }
+
+       resource_dir=(MonoPEResourceDir *)mono_cli_rva_map (info, rsrc->rva);
+       if(resource_dir==NULL) {
+               return(NULL);
+       }
+       
+       entries=resource_dir->res_named_entries + resource_dir->res_id_entries;
+       res_entries=(MonoPEResourceDirEntry *)(resource_dir+1);
+       
+       for(i=0; i<entries; i++) {
+               MonoPEResourceDirEntry *entry=&res_entries[i];
+               gpointer ret;
+               
+               ret=mono_image_walk_resource_tree (info, res_id, lang_id,
+                                                  name, entry, resource_dir,
+                                                  0);
+               if(ret!=NULL) {
+                       return(ret);
+               }
+       }
+
+       return(NULL);
+}
+
+guint32
+mono_image_get_entry_point (MonoImage *image)
+{
+       return ((MonoCLIImageInfo*)image->image_info)->cli_cli_header.ch_entry_point;
+}
+
+const char*
+mono_image_get_resource (MonoImage *image, guint32 offset, guint32 *size)
+{
+       MonoCLIImageInfo *iinfo = image->image_info;
+       MonoCLIHeader *ch = &iinfo->cli_cli_header;
+       const char* data;
+
+       if (!ch->ch_resources.rva || offset + 4 > ch->ch_resources.size)
+               return NULL;
+       
+       data = mono_cli_rva_map (iinfo, ch->ch_resources.rva);
+       if (!data)
+               return NULL;
+       data += offset;
+       if (size)
+               *size = read32 (data);
+       data += 4;
+       return data;
+}
+
+MonoImage*
+mono_image_load_file_for_image (MonoImage *image, int fileidx)
+{
+       char *base_dir, *name;
+       MonoImage *res;
+       MonoTableInfo  *t = &image->tables [MONO_TABLE_FILE];
+       const char *fname;
+       guint32 fname_id;
+
+       if (fileidx < 1 || fileidx > t->rows)
+               return NULL;
+
+       if (image->files && image->files [fileidx - 1])
+               return image->files [fileidx - 1];
+
+       if (!image->files)
+               image->files = g_new0 (MonoImage*, t->rows);
+
+       fname_id = mono_metadata_decode_row_col (t, fileidx - 1, MONO_FILE_NAME);
+       fname = mono_metadata_string_heap (image, fname_id);
+       base_dir = g_path_get_dirname (image->name);
+       name = g_build_filename (base_dir, fname, NULL);
+       res = mono_image_open (name, NULL);
+       if (res) {
+               int i;
+               t = &res->tables [MONO_TABLE_MODULEREF];
+               //g_print ("loaded file %s from %s (%p)\n", name, image->name, image->assembly);
+               res->assembly = image->assembly;
+               for (i = 0; i < t->rows; ++i) {
+                       if (res->modules [i] && !res->modules [i]->assembly)
+                               res->modules [i]->assembly = image->assembly;
+               }
+
+               image->files [fileidx - 1] = res;
+       }
+       g_free (name);
+       g_free (base_dir);
+       return res;
+}
+
+const char*
+mono_image_get_strong_name (MonoImage *image, guint32 *size)
+{
+       MonoCLIImageInfo *iinfo = image->image_info;
+       MonoPEDirEntry *de = &iinfo->cli_cli_header.ch_strong_name;
+       const char* data;
+
+       if (!de->size || !de->rva)
+               return NULL;
+       data = mono_cli_rva_map (iinfo, de->rva);
+       if (!data)
+               return NULL;
+       if (size)
+               *size = de->size;
+       return data;
+}
+
+guint32
+mono_image_strong_name_position (MonoImage *image, guint32 *size)
+{
+       MonoCLIImageInfo *iinfo = image->image_info;
+       MonoPEDirEntry *de = &iinfo->cli_cli_header.ch_strong_name;
+       const int top = iinfo->cli_section_count;
+       MonoSectionTable *tables = iinfo->cli_section_tables;
+       int i;
+       guint32 addr = de->rva;
+       
+       if (size)
+               *size = de->size;
+       if (!de->size || !de->rva)
+               return 0;
+       for (i = 0; i < top; i++){
+               if ((addr >= tables->st_virtual_address) &&
+                   (addr < tables->st_virtual_address + tables->st_raw_data_size)){
+                       return tables->st_raw_data_ptr +
+                               (addr - tables->st_virtual_address);
+               }
+               tables++;
+       }
+
+       return 0;
+}
+
+const char*
+mono_image_get_public_key (MonoImage *image, guint32 *size)
+{
+       const char *pubkey;
+       guint32 len, tok;
+       if (image->tables [MONO_TABLE_ASSEMBLY].rows != 1)
+               return NULL;
+       tok = mono_metadata_decode_row_col (&image->tables [MONO_TABLE_ASSEMBLY], 0, MONO_ASSEMBLY_PUBLIC_KEY);
+       if (!tok)
+               return NULL;
+       pubkey = mono_metadata_blob_heap (image, tok);
+       len = mono_metadata_decode_blob_size (pubkey, &pubkey);
+       if (size)
+               *size = len;
+       return pubkey;
+}
+