Hey,
The attached patch fixes the behavior for GetReferencedAssemblies (it
used to load the references and get the info from them, instead of
getting it from the metadata tables, just like MS impl).
It also fix a problem when calling this with a Reflection Only assembly.
The corlib nunit tests ran just fine (both for default and 2_0
profiles).
May I commit it?
Carlos.
Index: ChangeLog
===
--- ChangeLog (revisión: 47832)
+++ ChangeLog (copia de trabajo)
@@ -1,3 +1,11 @@
+2005-07-29 Carlos Alberto Cortez [EMAIL PROTECTED]
+
+ * icall.c (ves_icall_System_Reflection_GetReferencedAssemblies):
+ Fix the last behavior, which used to load the assemblies and
+ extract MonoReflectionAssemblyName information, instead of
+ extract it from the metadata tables. Needed for Reflection
+ Only assemblies.
+
2005-07-28 Zoltan Varga [EMAIL PROTECTED]
* reflection.c (mono_method_get_object): Fix warning.
Index: icall.c
===
--- icall.c (revisión: 47832)
+++ icall.c (copia de trabajo)
@@ -3622,12 +3622,11 @@
}
static MonoObject*
-create_version (MonoDomain *domain, MonoAssemblyName *aname)
+create_version (MonoDomain *domain, guint32 major, guint32 minor, guint32 build, guint32 revision)
{
static MonoClass *System_Version = NULL;
static MonoMethod *create_version = NULL;
MonoObject *result;
- int major, minor, build, revision;
gpointer args [4];
if (!System_Version) {
@@ -3642,10 +3641,6 @@
mono_method_desc_free (desc);
}
- major = aname-major;
- minor = aname-minor;
- build = aname-build;
- revision = aname-revision;
args [0] = major;
args [1] = minor;
args [2] = build;
@@ -3664,6 +3659,7 @@
MonoDomain *domain = mono_object_domain (assembly);
int i, count = 0;
static MonoMethod *create_culture = NULL;
+ MonoImage *image = assembly-assembly-image;
MonoTableInfo *t;
MONO_ARCH_SAVE_REGS;
@@ -3686,52 +3682,46 @@
}
for (i = 0; i count; i++) {
- MonoAssembly *assem;
MonoReflectionAssemblyName *aname;
+ guint32 cols [MONO_ASSEMBLYREF_SIZE];
- /* FIXME: There is no need to load the assemblies themselves */
- mono_assembly_load_reference (assembly-assembly-image, i);
+ mono_metadata_decode_row (t, i, cols, MONO_ASSEMBLYREF_SIZE);
- assem = assembly-assembly-image-references [i];
- if (assem == (gpointer)-1) {
- char *msg = g_strdup_printf (Assembly %d referenced from assembly %s not found , i, assembly-assembly-image-name);
- MonoException *ex = mono_get_exception_file_not_found2 (msg, NULL);
- g_free (msg);
- mono_raise_exception (ex);
- }
-
aname = (MonoReflectionAssemblyName *) mono_object_new (
domain, System_Reflection_AssemblyName);
- aname-name = mono_string_new (domain, assem-aname.name);
+ aname-name = mono_string_new (domain, mono_metadata_string_heap (image, cols [MONO_ASSEMBLYREF_NAME]));
- aname-major = assem-aname.major;
- aname-minor = assem-aname.minor;
- aname-build = assem-aname.build;
- aname-revision = assem-aname.revision;
- aname-hashalg = assem-aname.hash_alg;
- aname-flags = assem-aname.flags;
+ aname-major = cols [MONO_ASSEMBLYREF_MAJOR_VERSION];
+ aname-minor = cols [MONO_ASSEMBLYREF_MINOR_VERSION];
+ aname-build = cols [MONO_ASSEMBLYREF_BUILD_NUMBER];
+ aname-revision = cols [MONO_ASSEMBLYREF_REV_NUMBER];
+ aname-flags = cols [MONO_ASSEMBLYREF_FLAGS];
aname-versioncompat = 1; /* SameMachine (default) */
- aname-version = create_version (domain, assem-aname);
+ aname-hashalg = ASSEMBLY_HASH_SHA1; /* SHA1 (default) */
+ aname-version = create_version (domain, aname-major, aname-minor, aname-build, aname-revision);
if (create_culture) {
gpointer args [1];
- args [0] = mono_string_new (domain, assem-aname.culture);
+ args [0] = mono_string_new (domain, mono_metadata_string_heap (image, cols [MONO_ASSEMBLYREF_CULTURE]));
aname-cultureInfo = mono_runtime_invoke (create_culture, NULL, args, NULL);
}
+
+ if (cols [MONO_ASSEMBLYREF_PUBLIC_KEY]) {
+ const gchar *pkey_ptr = mono_metadata_blob_heap (image, cols [MONO_ASSEMBLYREF_PUBLIC_KEY]);
+ guint32 pkey_len = mono_metadata_decode_blob_size (pkey_ptr, pkey_ptr);
- if (assem-aname.public_key) {
- guint32 pkey_len;
- const char *pkey_ptr = (char*)assem-aname.public_key;
- pkey_len = mono_metadata_decode_blob_size (pkey_ptr, pkey_ptr);
-
- aname-publicKey = mono_array_new (domain, mono_defaults.byte_class, pkey_len);
- memcpy (mono_array_addr (aname-publicKey, guint8, 0), pkey_ptr, pkey_len);
+ if ((cols [MONO_ASSEMBLYREF_FLAGS] ASSEMBLYREF_FULL_PUBLIC_KEY_FLAG)) {
+/* public key token isn't copied - the class library will
+ automatically generate it from the public key if required */
+aname-publicKey = mono_array_new (domain, mono_defaults.byte_class, pkey_len);
+memcpy (mono_array_addr (aname-publicKey, guint8, 0), pkey_ptr, pkey_len);
+ } else {
+
