Author: spouliot
Date: 2005-04-14 09:23:21 -0400 (Thu, 14 Apr 2005)
New Revision: 43000
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/icall.c
trunk/mono/mono/metadata/object-internals.h
Log:
2005-04-14 Sebastien Pouliot <[EMAIL PROTECTED]>
* icall.c: don't return the codebase in the AssemblyName[] returned by
ves_icall_System_Reflection_Assembly_GetReferencedAssemblies.
* object-internals.h: Removed FIXME (fields were presents) and fixed
versioncompat declaration.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2005-04-14 12:45:27 UTC (rev 42999)
+++ trunk/mono/mono/metadata/ChangeLog 2005-04-14 13:23:21 UTC (rev 43000)
@@ -1,3 +1,10 @@
+2005-04-14 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * icall.c: don't return the codebase in the AssemblyName[] returned by
+ ves_icall_System_Reflection_Assembly_GetReferencedAssemblies.
+ * object-internals.h: Removed FIXME (fields were presents) and fixed
+ versioncompat declaration.
+
2005-04-14 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* threadpool.c: sometimes we get EBADF from epoll but the epollfd is
Modified: trunk/mono/mono/metadata/icall.c
===================================================================
--- trunk/mono/mono/metadata/icall.c 2005-04-14 12:45:27 UTC (rev 42999)
+++ trunk/mono/mono/metadata/icall.c 2005-04-14 13:23:21 UTC (rev 43000)
@@ -3511,7 +3511,6 @@
for (i = 0; i < count; i++) {
MonoAssembly *assem;
MonoReflectionAssemblyName *aname;
- char *codebase, *absolute;
/* FIXME: There is no need to load the assemblies themselves */
mono_assembly_load_reference (assembly->assembly->image, i);
@@ -3536,6 +3535,7 @@
aname->revision = assem->aname.revision;
aname->hashalg = assem->aname.hash_alg;
aname->flags = assem->aname.flags;
+ aname->versioncompat = 1; /* SameMachine (default) */
if (create_culture) {
gpointer args [1];
@@ -3555,11 +3555,9 @@
/* public key token isn't copied - the class library will
automatically generate it from the public key if required */
- absolute = g_build_filename (assem->basedir,
assem->image->module_name, NULL);
- codebase = g_filename_to_uri (absolute, NULL, NULL);
- aname->codebase = mono_string_new (domain, codebase);
- g_free (codebase);
- g_free (absolute);
+ /* note: this function doesn't return the codebase on purpose
(i.e. it can
+ be used under partial trust as path information isn't
present). */
+
mono_array_set (result, gpointer, i, aname);
}
return result;
Modified: trunk/mono/mono/metadata/object-internals.h
===================================================================
--- trunk/mono/mono/metadata/object-internals.h 2005-04-14 12:45:27 UTC (rev
42999)
+++ trunk/mono/mono/metadata/object-internals.h 2005-04-14 13:23:21 UTC (rev
43000)
@@ -872,19 +872,13 @@
MonoString *name;
MonoString *codebase;
gint32 major, minor, build, revision;
- /* FIXME: add missing stuff */
-/* CultureInfo cultureinfo;
- AssemblyNameFlags flags;
- AssemblyHashAlgorithm hashalg;
- StrongNameKeyPair keypair;
- AssemblyVersionCompatibility versioncompat;*/
MonoObject *cultureInfo;
guint32 flags;
guint32 hashalg;
MonoObject *keypair;
MonoArray *publicKey;
MonoArray *keyToken;
- MonoObject *versioncompat;
+ guint32 versioncompat;
} MonoReflectionAssemblyName;
typedef struct {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
