*
* (C) 2001 Ximian, Inc. http://www.ximian.com
*
- * TODO:
- * Implement big-endian versions of the reading routines.
*/
#include <config.h>
#include <stdio.h>
#endif
#include <mono/metadata/loader.h>
#include <mono/metadata/tabledefs.h>
+#include <mono/metadata/metadata-internals.h>
+#include <mono/metadata/domain-internals.h>
#include <mono/io-layer/io-layer.h>
#include <mono/utils/mono-uri.h>
#include <mono/metadata/mono-config.h>
#include <mono/utils/mono-digest.h>
+#include <mono/utils/mono-logger.h>
#ifdef PLATFORM_WIN32
#include <mono/os/util.h>
#endif
static gchar*
encode_public_tok (const guchar *token, gint32 len)
{
- static gchar allowed [] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+ const static gchar allowed [] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
gchar *res;
int i;
const char *path;
char **splitted;
- path = g_getenv ("MONO_GAC_PATH");
+ path = g_getenv ("MONO_GAC_PREFIX");
if (!path)
return;
aname->build = cols [MONO_ASSEMBLY_BUILD_NUMBER];
aname->revision = cols [MONO_ASSEMBLY_REV_NUMBER];
aname->hash_alg = cols [MONO_ASSEMBLY_HASH_ALG];
- if (cols [MONO_ASSEMBLY_PUBLIC_KEY])
+ if (cols [MONO_ASSEMBLY_PUBLIC_KEY]) {
+ gchar* token = g_malloc (8);
+ gchar* encoded;
+ int len;
+
+ aname->public_key = mono_metadata_blob_heap (image, cols [MONO_ASSEMBLY_PUBLIC_KEY]);
+ len = mono_metadata_decode_blob_size (aname->public_key, (const char**)&aname->public_key);
+
+ mono_digest_get_public_token (token, aname->public_key, len);
+ encoded = encode_public_tok (token, 8);
+ g_strlcpy (aname->public_key_token, encoded, MONO_PUBLIC_KEY_TOKEN_LENGTH);
+
+ g_free (encoded);
+ g_free (token);
+ }
+ else {
+ aname->public_key = NULL;
+ memset (aname->public_key_token, 0, MONO_PUBLIC_KEY_TOKEN_LENGTH);
+ }
+
+ if (cols [MONO_ASSEMBLY_PUBLIC_KEY]) {
aname->public_key = mono_metadata_blob_heap (image, cols [MONO_ASSEMBLY_PUBLIC_KEY]);
+ }
else
aname->public_key = 0;
aname.revision = cols [MONO_ASSEMBLYREF_REV_NUMBER];
if (cols [MONO_ASSEMBLYREF_PUBLIC_KEY]) {
- aname.public_tok_value = assemblyref_public_tok (image,
- cols [MONO_ASSEMBLYREF_PUBLIC_KEY], aname.flags);
+ gchar *token = assemblyref_public_tok (image, cols [MONO_ASSEMBLYREF_PUBLIC_KEY], aname.flags);
+ g_strlcpy (aname.public_key_token, token, MONO_PUBLIC_KEY_TOKEN_LENGTH);
+ g_free (token);
} else {
- aname.public_tok_value = NULL;
+ memset (aname.public_key_token, 0, MONO_PUBLIC_KEY_TOKEN_LENGTH);
}
references [i] = mono_assembly_load (&aname, image->assembly->basedir, status);
image->name, aname.name);
} else {
+ char *extra_msg = g_strdup ("");
+
+ if (*status == MONO_IMAGE_ERROR_ERRNO) {
+ extra_msg = g_strdup_printf ("System error: %s\n", strerror (errno));
+ } else if (*status == MONO_IMAGE_MISSING_ASSEMBLYREF) {
+ extra_msg = g_strdup ("Cannot find an assembly referenced from this one.\n");
+ } else if (*status == MONO_IMAGE_IMAGE_INVALID) {
+ extra_msg = g_strdup ("The file exists but is not a valid assembly.\n");
+ }
for (j = 0; j < i; j++)
mono_assembly_close (references [j]);
g_warning ("Could not find assembly %s, references from %s (assemblyref_index=%d)\n"
" Major/Minor: %d,%d\n"
" Build: %d,%d\n"
- " Token: %s\n",
+ " Token: %s\n%s",
aname.name, image->name, i,
aname.major, aname.minor, aname.build, aname.revision,
- aname.public_tok_value);
+ aname.public_key_token, extra_msg);
*status = MONO_IMAGE_MISSING_ASSEMBLYREF;
+ g_free (extra_msg);
return;
}
}
EnterCriticalSection (&assemblies_mutex);
image = mono_image_open (filename, status);
LeaveCriticalSection (&assemblies_mutex);
-
+
return image;
}
fname = g_strdup (filename);
}
- /* g_print ("file loading %s\n", fname); */
+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY,
+ "Assembly Loader probing location: '%s'.", filename);
image = do_mono_assembly_open (fname, status);
if (!image){
ass = mono_assembly_load_from (image, fname, status);
- mono_config_for_assembly (ass->image);
+ if (ass) {
+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY,
+ "Assembly Loader loaded assembly from location: '%s'.", filename);
+ mono_config_for_assembly (ass->image);
+ }
g_free (fname);
mono_assembly_load_from_gac (MonoAssemblyName *aname, gchar *filename, MonoImageOpenStatus *status)
{
MonoAssembly *result = NULL;
- gchar *name, *version, *fullpath, *subpath;
+ gchar *name, *version, *culture, *fullpath, *subpath;
gint32 len;
gchar **paths;
- if (!aname->public_tok_value) {
+ if (aname->public_key_token [0] == 0) {
return NULL;
}
name = g_strdup (aname->name);
}
+ if (aname->culture) {
+ culture = g_strdup (aname->culture);
+ g_strdown (culture);
+ } else {
+ culture = g_strdup ("");
+ }
+
version = g_strdup_printf ("%d.%d.%d.%d_%s_%s", aname->major,
aname->minor, aname->build, aname->revision,
- aname->culture == NULL ? "" : aname->culture,
- aname->public_tok_value);
+ culture, aname->public_key_token);
subpath = g_build_path (G_DIR_SEPARATOR_S, name, version, filename, NULL);
g_free (name);
g_free (version);
+ g_free (culture);
if (extra_gac_paths) {
paths = extra_gac_paths;
while (!result && *paths) {
- fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "gac", subpath, NULL);
+ fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
result = mono_assembly_open (fullpath, status);
g_free (fullpath);
paths++;
/* g_print ("loading %s\n", aname->name); */
/* special case corlib */
if (strcmp (aname->name, "mscorlib") == 0) {
+ char *corlib_file;
if (corlib) {
/* g_print ("corlib already loaded\n"); */
return corlib;
return corlib;
}
corlib = load_in_path ("mscorlib.dll", default_path, status);
+
+ if (corlib)
+ return corlib;
+
+ /* Load corlib from mono/<version> */
+
+ corlib_file = g_build_filename ("mono", mono_get_framework_version (), "mscorlib.dll", NULL);
+ if (assemblies_path) {
+ corlib = load_in_path (corlib_file, (const char**)assemblies_path, status);
+ if (corlib) {
+ g_free (corlib_file);
+ return corlib;
+ }
+ }
+ corlib = load_in_path (corlib_file, default_path, status);
+ g_free (corlib_file);
+
return corlib;
}
return(main_assembly);
}
-
+MonoImage*
+mono_assembly_get_image (MonoAssembly *assembly)
+{
+ return assembly->image;
+}
projects / mono.git / blobdiff