* main.c (dis_nt_header): New. Dump pe_stack_reserve if different from the
[mono.git] / mono / metadata / image.c
index 82476ee94b946886722c49d2cc5e4601d90a751b..1db273008c8d2d1ae7889118b664a970c122717f 100644 (file)
 #include "cil-coff.h"
 #include "rawbuffer.h"
 #include "mono-endian.h"
-#include "private.h"
 #include "tabledefs.h"
 #include "tokentype.h"
+#include "metadata-internals.h"
+#include <mono/io-layer/io-layer.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #define INVALID_ADDRESS 0xffffffff
 
  */
 static GHashTable *loaded_images_hash;
 static GHashTable *loaded_images_guid_hash;
+static GHashTable *loaded_images_refonly_hash;
+static GHashTable *loaded_images_refonly_guid_hash;
+
+static CRITICAL_SECTION images_mutex;
 
 guint32
 mono_cli_rva_image_map (MonoCLIImageInfo *iinfo, guint32 addr)
@@ -49,8 +57,9 @@ mono_cli_rva_image_map (MonoCLIImageInfo *iinfo, guint32 addr)
 }
 
 char *
-mono_cli_rva_map (MonoCLIImageInfo *iinfo, guint32 addr)
+mono_image_rva_map (MonoImage *image, guint32 addr)
 {
+       MonoCLIImageInfo *iinfo = image->image_info;
        const int top = iinfo->cli_section_count;
        MonoSectionTable *tables = iinfo->cli_section_tables;
        int i;
@@ -58,6 +67,10 @@ mono_cli_rva_map (MonoCLIImageInfo *iinfo, guint32 addr)
        for (i = 0; i < top; i++){
                if ((addr >= tables->st_virtual_address) &&
                    (addr < tables->st_virtual_address + tables->st_raw_data_size)){
+                       if (!iinfo->cli_sections [i]) {
+                               if (!mono_image_ensure_section_idx (image, i))
+                                       return NULL;
+                       }
                        return (char*)iinfo->cli_sections [i] +
                                (addr - tables->st_virtual_address);
                }
@@ -66,6 +79,64 @@ mono_cli_rva_map (MonoCLIImageInfo *iinfo, guint32 addr)
        return NULL;
 }
 
+static gchar *
+canonicalize_path (const char *path)
+{
+       gchar *abspath, *pos, *lastpos, *dest;
+       int backc;
+
+       if (g_path_is_absolute (path)) {
+               abspath = g_strdup (path);
+       } else {
+               gchar *tmpdir = g_get_current_dir ();
+               abspath = g_build_filename (tmpdir, path, NULL);
+               g_free (tmpdir);
+       }
+
+       abspath = g_strreverse (abspath);
+
+       backc = 0;
+       dest = lastpos = abspath;
+       pos = strchr (lastpos, G_DIR_SEPARATOR);
+
+       while (pos != NULL) {
+               int len = pos - lastpos;
+               if (len == 1 && lastpos [0] == '.') {
+                       // nop
+               } else if (len == 2 && lastpos [0] == '.' && lastpos [1] == '.') {
+                       backc++;
+               } else if (len > 0) {
+                       if (backc > 0) {
+                               backc--;
+                       } else {
+                               if (dest != lastpos) strncpy (dest, lastpos, len + 1);
+                               dest += len + 1;
+                       }
+               }
+               lastpos = pos + 1;
+               pos = strchr (lastpos, G_DIR_SEPARATOR);
+       }
+       
+       if (dest != lastpos) strcpy (dest, lastpos);
+       return g_strreverse (abspath);
+}
+
+/**
+ * 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);
+       loaded_images_refonly_hash = g_hash_table_new (g_str_hash, g_str_equal);
+       loaded_images_refonly_guid_hash = g_hash_table_new (g_str_hash, g_str_equal);
+}
+
 /**
  * mono_image_ensure_section_idx:
  * @image: The image we are operating on
@@ -92,20 +163,10 @@ 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);
-
-       if (iinfo->cli_sections [section] == NULL)
+       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;
 }
 
@@ -147,15 +208,10 @@ load_section_tables (MonoImage *image, MonoCLIImageInfo *iinfo, guint32 offset)
        for (i = 0; i < top; i++){
                MonoSectionTable *t = &iinfo->cli_section_tables [i];
 
-               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 (offset + sizeof (MonoSectionTable) > image->raw_data_len)
+                       return FALSE;
+               memcpy (t, image->raw_data + offset, sizeof (MonoSectionTable));
+               offset += sizeof (MonoSectionTable);
 
 #if G_BYTE_ORDER != G_LITTLE_ENDIAN
                t->st_virtual_size = GUINT32_FROM_LE (t->st_virtual_size);
@@ -171,10 +227,6 @@ load_section_tables (MonoImage *image, MonoCLIImageInfo *iinfo, guint32 offset)
                /* consistency checks here */
        }
 
-       for (i = 0; i < top; i++)
-               if (!mono_image_ensure_section_idx (image, i))
-                       return FALSE;
-       
        return TRUE;
 }
 
@@ -182,23 +234,14 @@ static gboolean
 load_cli_header (MonoImage *image, MonoCLIImageInfo *iinfo)
 {
        guint32 offset;
-       int n;
        
        offset = mono_cli_rva_image_map (iinfo, iinfo->cli_header.datadir.pe_cli_header.rva);
        if (offset == INVALID_ADDRESS)
                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 (offset + sizeof (MonoCLIHeader) > image->raw_data_len)
+               return FALSE;
+       memcpy (&iinfo->cli_cli_header, image->raw_data + offset, sizeof (MonoCLIHeader));
 
 #if G_BYTE_ORDER != G_LITTLE_ENDIAN
 #define SWAP32(x) (x) = GUINT32_FROM_LE ((x))
@@ -261,17 +304,14 @@ load_metadata_ptrs (MonoImage *image, MonoCLIImageInfo *iinfo)
        char *ptr;
        
        offset = mono_cli_rva_image_map (iinfo, iinfo->cli_cli_header.ch_metadata.rva);
+       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;
-       }
+       if (offset + size > image->raw_data_len)
+               return FALSE;
+       image->raw_metadata = image->raw_data + offset;
 
        ptr = image->raw_metadata;
 
@@ -321,7 +361,7 @@ load_metadata_ptrs (MonoImage *image, MonoCLIImageInfo *iinfo)
                        return FALSE;
                } else {
                        g_message ("Unknown heap type: %s\n", ptr + 8);
-                       ptr += 8 + strlen (ptr) + 1;
+                       ptr += 8 + strlen (ptr + 8) + 1;
                }
                pad = ptr - image->raw_metadata;
                if (pad % 4)
@@ -359,16 +399,19 @@ load_tables (MonoImage *image)
        
        for (table = 0; table < 64; table++){
                if ((valid_mask & ((guint64) 1 << table)) == 0){
+                       if (table > MONO_TABLE_LAST)
+                               continue;
                        image->tables [table].rows = 0;
                        continue;
                }
                if (table > MONO_TABLE_LAST) {
                        g_warning("bits in valid must be zero above 0x2d (II - 23.1.6)");
+               } else {
+                       image->tables [table].rows = read32 (rows);
                }
                /*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++;
        }
@@ -411,12 +454,14 @@ load_modules (MonoImage *image, MonoImageOpenStatus *status)
        MonoTableInfo *t;
        int i;
        char *base_dir;
+       gboolean refonly = image->ref_only;
 
        if (image->modules)
                return;
 
        t = &image->tables [MONO_TABLE_MODULEREF];
        image->modules = g_new0 (MonoImage *, t->rows);
+       image->module_count = t->rows;
        base_dir = g_path_get_dirname (image->name);
        for (i = 0; i < t->rows; i++){
                char *module_ref;
@@ -426,10 +471,9 @@ load_modules (MonoImage *image, MonoImageOpenStatus *status)
                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);
+               image->modules [i] = mono_image_open_full (module_ref, status, refonly);
                if (image->modules [i]) {
-                       image->modules [i]->assembly = image->assembly;
-                       //g_print ("loaded module %s from %s (%p)\n", module_ref, image->name, image->assembly);
+                       /* 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...
@@ -439,6 +483,7 @@ load_modules (MonoImage *image, MonoImageOpenStatus *status)
                        *status = MONO_IMAGE_OK;
                g_free (module_ref);
        }
+
        g_free (base_dir);
 }
 
@@ -449,7 +494,11 @@ load_class_names (MonoImage *image)
        guint32 cols [MONO_TYPEDEF_SIZE];
        const char *name;
        const char *nspace;
-       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);
@@ -459,17 +508,69 @@ load_class_names (MonoImage *image)
                        continue;
                name = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAME]);
                nspace = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAMESPACE]);
-               mono_image_add_to_name_cache (image, nspace, name, i);
+
+               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 (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 (gboolean refonly)
+{
+       GHashTable *loaded_images = refonly ? loaded_images_refonly_hash : loaded_images_hash;
+       g_hash_table_foreach (loaded_images, register_guid, NULL);
 }
 
 void
 mono_image_init (MonoImage *image)
 {
-       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->mempool = mono_mempool_new ();
+       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->array_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
 
        image->delegate_begin_invoke_cache = 
                g_hash_table_new ((GHashFunc)mono_signature_hash, 
@@ -480,23 +581,28 @@ mono_image_init (MonoImage *image)
        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 (g_direct_hash, g_direct_equal);
-       image->managed_wrapper_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
-       image->native_wrapper_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
-       image->remoting_invoke_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
-       image->synchronized_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
-
-
+       image->runtime_invoke_cache  = 
+               g_hash_table_new ((GHashFunc)mono_signature_hash, 
+                                 (GCompareFunc)mono_metadata_signature_equal);
+       
+       image->managed_wrapper_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
+       image->native_wrapper_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
+       image->remoting_invoke_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
+       image->synchronized_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
+       image->unbox_wrapper_cache = g_hash_table_new (mono_aligned_addr_hash, NULL);
+
+       image->typespec_cache = g_hash_table_new (NULL, NULL);
+       image->memberref_signatures = g_hash_table_new (NULL, NULL);
+       image->helper_signatures = g_hash_table_new (g_str_hash, g_str_equal);
 }
 
 static MonoImage *
-do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status)
+do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status,
+                   gboolean care_about_cli)
 {
        MonoCLIImageInfo *iinfo;
        MonoDotNetHeader *header;
        MonoMSDOSHeader msdos;
-       int n;
        guint32 offset = 0;
 
        mono_image_init (image);
@@ -507,35 +613,21 @@ do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status)
        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 (offset + sizeof (msdos) > image->raw_data_len)
+               goto invalid_image;
+       memcpy (&msdos, image->raw_data + offset, sizeof (msdos));
        
        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)) {
-               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 (offset + sizeof (MonoDotNetHeader) > image->raw_data_len)
+               goto invalid_image;
+       memcpy (header, image->raw_data + offset, sizeof (MonoDotNetHeader));
+       offset += sizeof (MonoDotNetHeader);
 
 #if G_BYTE_ORDER != G_LITTLE_ENDIAN
 #define SWAP32(x) (x) = GUINT32_FROM_LE ((x))
@@ -635,6 +727,10 @@ do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status)
        if (!load_section_tables (image, iinfo, offset))
                goto invalid_image;
        
+       if (care_about_cli == FALSE) {
+               goto done;
+       }
+       
        /* Load the CLI header */
        if (!load_cli_header (image, iinfo))
                goto invalid_image;
@@ -656,6 +752,7 @@ do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status)
 
        load_modules (image, status);
 
+done:
        if (status)
                *status = MONO_IMAGE_OK;
 
@@ -669,11 +766,13 @@ invalid_image:
 }
 
 static MonoImage *
-do_mono_image_open (const char *fname, MonoImageOpenStatus *status)
+do_mono_image_open (const char *fname, MonoImageOpenStatus *status,
+                   gboolean care_about_cli, gboolean refonly)
 {
        MonoCLIImageInfo *iinfo;
        MonoImage *image;
        FILE *filed;
+       struct stat stat_buf;
 
        if ((filed = fopen (fname, "rb")) == NULL){
                if (status)
@@ -681,34 +780,88 @@ do_mono_image_open (const char *fname, MonoImageOpenStatus *status)
                return NULL;
        }
 
+       if (fstat (fileno (filed), &stat_buf)) {
+               fclose (filed);
+               if (status)
+                       *status = MONO_IMAGE_ERROR_ERRNO;
+               return NULL;
+       }
        image = g_new0 (MonoImage, 1);
        image->ref_count = 1;
-       image->f = filed;
-       image->name = g_strdup (fname);
+       image->file_descr = filed;
+       image->raw_data_len = stat_buf.st_size;
+       image->raw_data = mono_raw_buffer_load (fileno (filed), FALSE, 0, stat_buf.st_size);
        iinfo = g_new0 (MonoCLIImageInfo, 1);
        image->image_info = iinfo;
+       image->name = canonicalize_path (fname);
+       image->ref_only = refonly;
 
-       return do_mono_image_load (image, status);
+       return do_mono_image_load (image, status, care_about_cli);
 }
 
 MonoImage *
-mono_image_loaded (const char *name) {
-       if (strcmp (name, "mscorlib") == 0)
-               name = "corlib";
-       if (loaded_images_hash)
-               return g_hash_table_lookup (loaded_images_hash, name);
-       return NULL;
+mono_image_loaded_full (const char *name, gboolean refonly)
+{
+       MonoImage *res;
+       GHashTable *loaded_images = refonly ? loaded_images_refonly_hash : loaded_images_hash;
+        
+       EnterCriticalSection (&images_mutex);
+       res = g_hash_table_lookup (loaded_images, name);
+       LeaveCriticalSection (&images_mutex);
+       return res;
 }
 
 MonoImage *
-mono_image_loaded_by_guid (const char *guid) {
-       if (loaded_images_guid_hash)
-               return g_hash_table_lookup (loaded_images_guid_hash, guid);
-       return NULL;
+mono_image_loaded (const char *name)
+{
+       return mono_image_loaded_full (name, FALSE);
 }
 
 MonoImage *
-mono_image_open_from_data (char *data, guint32 data_len, gboolean need_copy, MonoImageOpenStatus *status)
+mono_image_loaded_by_guid_full (const char *guid, gboolean refonly)
+{
+       MonoImage *res;
+       GHashTable *loaded_images = refonly ? loaded_images_refonly_guid_hash : loaded_images_guid_hash;
+
+       EnterCriticalSection (&images_mutex);
+       res = g_hash_table_lookup (loaded_images, guid);
+       LeaveCriticalSection (&images_mutex);
+       return res;
+}
+
+MonoImage *
+mono_image_loaded_by_guid (const char *guid)
+{
+       return mono_image_loaded_by_guid_full (guid, FALSE);
+}
+
+static MonoImage *
+register_image (MonoImage *image)
+{
+       MonoImage *image2;
+       GHashTable *loaded_images = image->ref_only ? loaded_images_refonly_hash : loaded_images_hash;
+
+       EnterCriticalSection (&images_mutex);
+       image2 = g_hash_table_lookup (loaded_images, image->name);
+
+       if (image2) {
+               /* Somebody else beat us to it */
+               mono_image_addref (image2);
+               LeaveCriticalSection (&images_mutex);
+               mono_image_close (image);
+               return image2;
+       }
+       g_hash_table_insert (loaded_images, image->name, image);
+       if (image->assembly_name && (g_hash_table_lookup (loaded_images, image->assembly_name) == NULL))
+               g_hash_table_insert (loaded_images, (char *) image->assembly_name, image);      
+       g_hash_table_insert (image->ref_only ? loaded_images_refonly_guid_hash : loaded_images_guid_hash, image->guid, image);
+       LeaveCriticalSection (&images_mutex);
+
+       return image;
+}
+
+MonoImage *
+mono_image_open_from_data_full (char *data, guint32 data_len, gboolean need_copy, MonoImageOpenStatus *status, gboolean refonly)
 {
        MonoCLIImageInfo *iinfo;
        MonoImage *image;
@@ -738,56 +891,132 @@ mono_image_open_from_data (char *data, guint32 data_len, gboolean need_copy, Mon
        image->name = g_strdup_printf ("data-%p", datac);
        iinfo = g_new0 (MonoCLIImageInfo, 1);
        image->image_info = iinfo;
+       image->ref_only = refonly;
+
+       image = do_mono_image_load (image, status, TRUE);
+       if (image == NULL)
+               return NULL;
 
-       return do_mono_image_load (image, status);
+       return register_image (image);
 }
 
-/**
- * mono_image_open:
- * @fname: filename that points to the module we want to open
- * @status: An error condition is returned in this field
- *
- * Retuns: An open image of type %MonoImage or NULL on error.
- * if NULL, then check the value of @status for details on the error
- */
 MonoImage *
-mono_image_open (const char *fname, MonoImageOpenStatus *status)
+mono_image_open_from_data (char *data, guint32 data_len, gboolean need_copy, MonoImageOpenStatus *status)
+{
+       return mono_image_open_from_data_full (data, data_len, need_copy, status, FALSE);
+}
+
+MonoImage *
+mono_image_open_full (const char *fname, MonoImageOpenStatus *status, gboolean refonly)
 {
        MonoImage *image;
+       GHashTable *loaded_images;
+       char *absfname;
        
        g_return_val_if_fail (fname != NULL, NULL);
+       
+       absfname = canonicalize_path (fname);
 
-       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);
+       loaded_images = refonly ? loaded_images_refonly_hash : loaded_images_hash;
+       image = g_hash_table_lookup (loaded_images, absfname);
+       g_free (absfname);
+       
+       if (image){
+               mono_image_addref (image);
+               LeaveCriticalSection (&images_mutex);
+               return image;
        }
+       LeaveCriticalSection (&images_mutex);
 
-       image = do_mono_image_open (fname, status);
+       image = do_mono_image_open (fname, status, TRUE, refonly);
        if (image == NULL)
                return NULL;
 
-       if (!loaded_images_hash)
-               loaded_images_hash = g_hash_table_new (g_str_hash, g_str_equal);
-       g_hash_table_insert (loaded_images_hash, image->name, image);
-       if (image->assembly_name)
-               g_hash_table_insert (loaded_images_hash, (char *) image->assembly_name, image);
-       
-       if (!loaded_images_guid_hash)
-               loaded_images_guid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-       g_hash_table_insert (loaded_images_guid_hash, image->guid, image);
+       return register_image (image);
+}
 
-       return image;
+/**
+ * mono_image_open:
+ * @fname: filename that points to the module we want to open
+ * @status: An error condition is returned in this field
+ *
+ * Returns: An open image of type %MonoImage or NULL on error.
+ * if NULL, then check the value of @status for details on the error
+ */
+MonoImage *
+mono_image_open (const char *fname, MonoImageOpenStatus *status)
+{
+       return mono_image_open_full (fname, status, FALSE);
+}
+
+/**
+ * mono_pe_file_open:
+ * @fname: filename that points to the module we want to open
+ * @status: An error condition is returned in this field
+ *
+ * Returns: An open image of type %MonoImage or NULL on error.  if
+ * NULL, then check the value of @status for details on the error.
+ * This variant for mono_image_open DOES NOT SET UP CLI METADATA.
+ * It's just a PE file loader, used for FileVersionInfo.  It also does
+ * not use the image cache.
+ */
+MonoImage *
+mono_pe_file_open (const char *fname, MonoImageOpenStatus *status)
+{
+       g_return_val_if_fail (fname != NULL, NULL);
+       
+       return(do_mono_image_open (fname, status, FALSE, FALSE));
 }
 
 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);
 }
 
+static void
+free_mr_signatures (gpointer key, gpointer val, gpointer user_data)
+{
+       mono_metadata_free_method_signature ((MonoMethodSignature*)val);
+}
+
+static void
+free_remoting_wrappers (gpointer key, gpointer val, gpointer user_data)
+{
+       g_free (val);
+}
+
+/**
+ * mono_image_addref:
+ * @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);
+}      
+
+void
+mono_dynamic_stream_reset (MonoDynamicStream* stream)
+{
+       stream->alloc_size = stream->index = stream->offset = 0;
+       g_free (stream->data);
+       stream->data = NULL;
+       if (stream->hash) {
+               g_hash_table_destroy (stream->hash);
+               stream->hash = NULL;
+       }
+}
+
 /**
  * mono_image_close:
  * @image: The image file we wish to close
@@ -798,24 +1027,59 @@ free_hash_table(gpointer key, gpointer val, gpointer user_data)
 void
 mono_image_close (MonoImage *image)
 {
+       MonoImage *image2;
+       GHashTable *loaded_images, *loaded_images_guid;
+       int i;
+
        g_return_if_fail (image != NULL);
 
-       if (--image->ref_count)
+       if (InterlockedDecrement (&image->ref_count))
                return;
-
-       if (!loaded_images_hash)
-               loaded_images_hash = g_hash_table_new (g_str_hash, g_str_equal);
-       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);
+       EnterCriticalSection (&images_mutex);
+       loaded_images = image->ref_only ? loaded_images_refonly_hash : loaded_images_hash;
+       loaded_images_guid = image->ref_only ? loaded_images_refonly_guid_hash : loaded_images_guid_hash;
+       image2 = g_hash_table_lookup (loaded_images, image->name);
+       if (image == image2) {
+               /* This is not true if we are called from mono_image_open () */
+               g_hash_table_remove (loaded_images, image->name);
+               g_hash_table_remove (loaded_images_guid, image->guid);
+               /* Multiple images might have the same guid */
+               build_guid_table (image->ref_only);
+       }
+       if (image->assembly_name && (g_hash_table_lookup (loaded_images, image->assembly_name) == image))
+               g_hash_table_remove (loaded_images, (char *) image->assembly_name);     
+       LeaveCriticalSection (&images_mutex);
+
+       if (image->file_descr) {
+               fclose (image->file_descr);
+               image->file_descr = NULL;
+               if (image->raw_data != NULL)
+                       mono_raw_buffer_free (image->raw_data);
+       }
+       
+       if (image->raw_data_allocated) {
+               /* image->raw_metadata and cli_sections might lie inside image->raw_data */
+               MonoCLIImageInfo *ii = image->image_info;
 
+               if ((image->raw_metadata > image->raw_data) &&
+                       (image->raw_metadata <= (image->raw_data + image->raw_data_len)))
+                       image->raw_metadata = NULL;
+
+               for (i = 0; i < ii->cli_section_count; i++)
+                       if (((char*)(ii->cli_sections [i]) > image->raw_data) &&
+                               ((char*)(ii->cli_sections [i]) <= ((char*)image->raw_data + image->raw_data_len)))
+                               ii->cli_sections [i] = NULL;
+
+               g_free (image->raw_data);
+       }
        g_free (image->name);
+       g_free (image->guid);
+       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);
@@ -824,29 +1088,76 @@ mono_image_close (MonoImage *image)
        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_foreach (image->remoting_invoke_cache, free_remoting_wrappers, NULL);
        g_hash_table_destroy (image->remoting_invoke_cache);
        g_hash_table_destroy (image->runtime_invoke_cache);
-       
-       if (image->raw_metadata != NULL)
-               mono_raw_buffer_free (image->raw_metadata);
+       g_hash_table_destroy (image->synchronized_cache);
+       g_hash_table_destroy (image->unbox_wrapper_cache);
+       g_hash_table_destroy (image->typespec_cache);
+       g_hash_table_foreach (image->memberref_signatures, free_mr_signatures, NULL);
+       g_hash_table_destroy (image->memberref_signatures);
+       g_hash_table_foreach (image->helper_signatures, free_mr_signatures, NULL);
+       g_hash_table_destroy (image->helper_signatures);
        
        if (image->image_info){
                MonoCLIImageInfo *ii = image->image_info;
-               int i;
 
-               for (i = 0; i < ii->cli_section_count; i++){
-                       if (!ii->cli_sections [i])
-                               continue;
-                       mono_raw_buffer_free (ii->cli_sections [i]);
-               }
                if (ii->cli_section_tables)
                        g_free (ii->cli_section_tables);
                if (ii->cli_sections)
                        g_free (ii->cli_sections);
                g_free (image->image_info);
        }
-       
-       g_free (image);
+
+       for (i = 0; i < image->module_count; ++i) {
+               if (image->modules [i])
+                       mono_image_close (image->modules [i]);
+       }
+       /*g_print ("destroy image %p (dynamic: %d)\n", image, image->dynamic);*/
+       if (!image->dynamic) {
+               mono_mempool_destroy (image->mempool);
+               g_free (image);
+       } else {
+               /* Dynamic images are GC_MALLOCed */
+               struct _MonoDynamicImage *di = (struct _MonoDynamicImage*)image;
+               int i;
+               g_free ((char*)image->module_name);
+               if (di->typespec)
+                       g_hash_table_destroy (di->typespec);
+               if (di->typeref)
+                       g_hash_table_destroy (di->typeref);
+               if (di->handleref)
+                       g_hash_table_destroy (di->handleref);
+               if (di->tokens)
+                       mono_g_hash_table_destroy (di->tokens);
+               if (di->blob_cache)
+                       g_hash_table_destroy (di->blob_cache);
+               g_list_free (di->array_methods);
+               if (di->gen_params)
+                       g_ptr_array_free (di->gen_params, TRUE);
+               if (di->token_fixups)
+                       mono_g_hash_table_destroy (di->token_fixups);
+               if (di->method_to_table_idx)
+                       g_hash_table_destroy (di->method_to_table_idx);
+               if (di->field_to_table_idx)
+                       g_hash_table_destroy (di->field_to_table_idx);
+               if (di->method_aux_hash)
+                       g_hash_table_destroy (di->method_aux_hash);
+               g_free (di->strong_name);
+               g_free (di->win32_res);
+               /*g_print ("string heap destroy for image %p\n", di);*/
+               mono_dynamic_stream_reset (&di->sheap);
+               mono_dynamic_stream_reset (&di->code);
+               mono_dynamic_stream_reset (&di->resources);
+               mono_dynamic_stream_reset (&di->us);
+               mono_dynamic_stream_reset (&di->blob);
+               mono_dynamic_stream_reset (&di->tstream);
+               mono_dynamic_stream_reset (&di->guid);
+               for (i = 0; i < MONO_TABLE_NUM; ++i) {
+                       g_free (di->tables [i].values);
+               }
+               mono_mempool_destroy (image->mempool);
+       }
 }
 
 /** 
@@ -903,8 +1214,10 @@ mono_image_walk_resource_tree (MonoCLIImageInfo *info, guint32 res_id,
                }
 #endif
        } else if (level==2) {
-               if((is_string==FALSE && entry->name_offset!=lang_id) ||
-                  (is_string==TRUE)) {
+               if ((is_string == FALSE &&
+                   entry->name_offset != lang_id &&
+                   lang_id != 0) ||
+                  (is_string == TRUE)) {
                        return(NULL);
                }
        } else {
@@ -974,7 +1287,7 @@ mono_image_lookup_resource (MonoImage *image, guint32 res_id, guint32 lang_id, g
                return(NULL);
        }
 
-       resource_dir=(MonoPEResourceDir *)mono_cli_rva_map (info, rsrc->rva);
+       resource_dir=(MonoPEResourceDir *)mono_image_rva_map (image, rsrc->rva);
        if(resource_dir==NULL) {
                return(NULL);
        }
@@ -1013,7 +1326,7 @@ mono_image_get_resource (MonoImage *image, guint32 offset, guint32 *size)
        if (!ch->ch_resources.rva || offset + 4 > ch->ch_resources.size)
                return NULL;
        
-       data = mono_cli_rva_map (iinfo, ch->ch_resources.rva);
+       data = mono_image_rva_map (image, ch->ch_resources.rva);
        if (!data)
                return NULL;
        data += offset;
@@ -1023,6 +1336,45 @@ mono_image_get_resource (MonoImage *image, guint32 offset, guint32 *size)
        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;
+               /* g_print ("loaded file %s from %s (%p)\n", name, image->name, image->assembly); */
+               res->assembly = image->assembly;
+               for (i = 0; i < res->module_count; ++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)
 {
@@ -1032,7 +1384,7 @@ mono_image_get_strong_name (MonoImage *image, guint32 *size)
 
        if (!de->size || !de->rva)
                return NULL;
-       data = mono_cli_rva_map (iinfo, de->rva);
+       data = mono_image_rva_map (image, de->rva);
        if (!data)
                return NULL;
        if (size)
@@ -1083,3 +1435,64 @@ mono_image_get_public_key (MonoImage *image, guint32 *size)
        return pubkey;
 }
 
+const char*
+mono_image_get_name (MonoImage *image)
+{
+       return image->assembly_name;
+}
+
+const char*
+mono_image_get_filename (MonoImage *image)
+{
+       return image->name;
+}
+
+const char*
+mono_image_get_guid (MonoImage *image)
+{
+       return image->guid;
+}
+
+const MonoTableInfo*
+mono_image_get_table_info (MonoImage *image, int table_id)
+{
+       if (table_id < 0 || table_id >= MONO_TABLE_NUM)
+               return NULL;
+       return &image->tables [table_id];
+}
+
+int
+mono_image_get_table_rows (MonoImage *image, int table_id)
+{
+       if (table_id < 0 || table_id >= MONO_TABLE_NUM)
+               return 0;
+       return image->tables [table_id].rows;
+}
+
+int
+mono_table_info_get_rows (const MonoTableInfo *table)
+{
+       return table->rows;
+}
+
+MonoAssembly* 
+mono_image_get_assembly (MonoImage *image)
+{
+       return image->assembly;
+}
+
+gboolean
+mono_image_is_dynamic (MonoImage *image)
+{
+       return image->dynamic;
+}
+
+gboolean
+mono_image_has_authenticode_entry (MonoImage *image)
+{
+       MonoCLIImageInfo *iinfo = image->image_info;
+       MonoDotNetHeader *header = &iinfo->cli_header;
+       MonoPEDirEntry *de = &header->datadir.pe_certificate_table;
+       // the Authenticode "pre" (non ASN.1) header is 8 bytes long
+       return ((de->rva != 0) && (de->size > 8));
+}