Author: gert
Date: 2008-01-20 10:51:17 -0500 (Sun, 20 Jan 2008)
New Revision: 93347
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/assembly.c
trunk/mono/mono/metadata/icall.c
trunk/mono/mono/metadata/metadata-internals.h
Log:
* assembly.c (build_assembly_name): add arg for passing the assembly
flags. Do not consider a PublicKey with value "null" valid.
(mono_assembly_name_parse_full): added boolean argument that will be
set if the assembly name contains a PublicKeyToken spec. Added support
for the Retargetable spec for which only Yes or No are allowed as valid
value. Consider assembly name invalid if Retargetable spec is set, but
either version, culture or public key (token) are not specified.
* metadata-internals.h: sync signature of mono_assembly_name_parse_full
with implementation in assembly.c.
* icall.c (fill_reflection_assembly_name): also copy assembly flags
from MonoAssemblyName.
(ves_icall_System_Reflection_AssemblyName_ParseName): use newly
introduced argument for mono_assembly_name_parse_full to know if the
assembly name has a PublicKeyToken spec, and if it has instruct
fill_reflection_assembly_name to use default value for keyToken (if
PublicKeyToken is null).
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2008-01-20 14:33:32 UTC (rev 93346)
+++ trunk/mono/mono/metadata/ChangeLog 2008-01-20 15:51:17 UTC (rev 93347)
@@ -1,3 +1,22 @@
+2008-01-20 Gert Driesen <[EMAIL PROTECTED]>
+
+ * assembly.c (build_assembly_name): add arg for passing the assembly
+ flags. Do not consider a PublicKey with value "null" valid.
+ (mono_assembly_name_parse_full): added boolean argument that will be
+ set if the assembly name contains a PublicKeyToken spec. Added support
+ for the Retargetable spec for which only Yes or No are allowed as valid
+ value. Consider assembly name invalid if Retargetable spec is set, but
+ either version, culture or public key (token) are not specified.
+ * metadata-internals.h: sync signature of mono_assembly_name_parse_full
+ with implementation in assembly.c.
+ * icall.c (fill_reflection_assembly_name): also copy assembly flags
+ from MonoAssemblyName.
+ (ves_icall_System_Reflection_AssemblyName_ParseName): use newly
+ introduced argument for mono_assembly_name_parse_full to know if the
+ assembly name has a PublicKeyToken spec, and if it has instruct
+ fill_reflection_assembly_name to use default value for keyToken (if
+ PublicKeyToken is null).
+
2008-01-18 Rodrigo Kumpera <[EMAIL PROTECTED]>
* verify.c (mono_method_verify): fixed ovf ops with
Modified: trunk/mono/mono/metadata/assembly.c
===================================================================
--- trunk/mono/mono/metadata/assembly.c 2008-01-20 14:33:32 UTC (rev 93346)
+++ trunk/mono/mono/metadata/assembly.c 2008-01-20 15:51:17 UTC (rev 93347)
@@ -1356,7 +1356,7 @@
slen = mono_metadata_decode_value (data + 2, &data);
aname = g_new0 (MonoAssemblyName, 1);
/*g_print ("friend ass: %s\n", data);*/
- if (mono_assembly_name_parse_full (data, aname, TRUE, NULL)) {
+ if (mono_assembly_name_parse_full (data, aname, TRUE, NULL,
NULL)) {
ass->friend_assembly_names = g_slist_prepend
(ass->friend_assembly_names, aname);
} else {
g_free (aname);
@@ -1563,7 +1563,7 @@
}
static gboolean
-build_assembly_name (const char *name, const char *version, const char
*culture, const char *token, const char *key, MonoAssemblyName *aname, gboolean
save_public_key)
+build_assembly_name (const char *name, const char *version, const char
*culture, const char *token, const char *key, guint32 flags, MonoAssemblyName
*aname, gboolean save_public_key)
{
gint major, minor, build, revision;
gint len;
@@ -1592,6 +1592,7 @@
aname->revision = 0;
}
+ aname->flags = flags;
aname->name = g_strdup (name);
if (culture) {
@@ -1611,8 +1612,8 @@
g_free (lower);
}
- if (key && strncmp (key, "null", 4) != 0) {
- if (!parse_public_key (key, &pkey)) {
+ if (key) {
+ if (strcmp (key, "null") == 0 || !parse_public_key (key,
&pkey)) {
mono_assembly_name_free (aname);
return FALSE;
}
@@ -1645,30 +1646,36 @@
return FALSE;
}
- res = build_assembly_name (name, parts[0], parts[1], parts[2], NULL,
aname, FALSE);
+ res = build_assembly_name (name, parts[0], parts[1], parts[2], NULL, 0,
aname, FALSE);
g_strfreev (parts);
return res;
}
gboolean
-mono_assembly_name_parse_full (const char *name, MonoAssemblyName *aname,
gboolean save_public_key, gboolean *is_version_defined)
+mono_assembly_name_parse_full (const char *name, MonoAssemblyName *aname,
gboolean save_public_key, gboolean *is_version_defined, gboolean
*is_token_defined)
{
gchar *dllname;
gchar *version = NULL;
gchar *culture = NULL;
gchar *token = NULL;
gchar *key = NULL;
+ gchar *retargetable = NULL;
gboolean res;
gchar *value;
gchar **parts;
gchar **tmp;
gboolean version_defined;
+ gboolean token_defined;
+ guint32 flags = 0;
if (!is_version_defined)
is_version_defined = &version_defined;
*is_version_defined = FALSE;
+ if (!is_token_defined)
+ is_token_defined = &token_defined;
+ *is_token_defined = FALSE;
- parts = tmp = g_strsplit (name, ",", 4);
+ parts = tmp = g_strsplit (name, ",", 6);
if (!tmp || !*tmp) {
g_strfreev (tmp);
return FALSE;
@@ -1686,7 +1693,6 @@
if (strlen (version) == 0) {
return FALSE;
}
-
tmp++;
continue;
}
@@ -1701,6 +1707,7 @@
}
if (!g_ascii_strncasecmp (value, "PublicKeyToken=", 15)) {
+ *is_token_defined = TRUE;
token = g_strstrip (value + 15);
if (strlen (token) == 0) {
return FALSE;
@@ -1718,6 +1725,20 @@
continue;
}
+ if (!g_ascii_strncasecmp (value, "Retargetable=", 13)) {
+ retargetable = g_strstrip (value + 13);
+ if (strlen (retargetable) == 0) {
+ return FALSE;
+ }
+ if (!g_ascii_strcasecmp (retargetable, "yes")) {
+ flags |= ASSEMBLYREF_RETARGETABLE_FLAG;
+ } else if (g_ascii_strcasecmp (retargetable, "no")) {
+ return FALSE;
+ }
+ tmp++;
+ continue;
+ }
+
if (!g_ascii_strncasecmp (value, "ProcessorArchitecture=", 22))
{
/* this is ignored for now, until we can change
MonoAssemblyName */
tmp++;
@@ -1728,7 +1749,13 @@
return FALSE;
}
- res = build_assembly_name (dllname, version, culture, token, key,
aname, save_public_key);
+ /* if retargetable flag is set, then we must have a fully qualified
name */
+ if (retargetable != NULL && (version == NULL || culture == NULL || (key
== NULL && token == NULL))) {
+ return FALSE;
+ }
+
+ res = build_assembly_name (dllname, version, culture, token, key, flags,
+ aname, save_public_key);
g_strfreev (parts);
return res;
}
@@ -1746,7 +1773,7 @@
gboolean
mono_assembly_name_parse (const char *name, MonoAssemblyName *aname)
{
- return mono_assembly_name_parse_full (name, aname, FALSE, NULL);
+ return mono_assembly_name_parse_full (name, aname, FALSE, NULL, NULL);
}
static MonoAssembly*
Modified: trunk/mono/mono/metadata/icall.c
===================================================================
--- trunk/mono/mono/metadata/icall.c 2008-01-20 14:33:32 UTC (rev 93346)
+++ trunk/mono/mono/metadata/icall.c 2008-01-20 15:51:17 UTC (rev 93347)
@@ -4749,6 +4749,7 @@
aname->major = name->major;
aname->minor = name->minor;
aname->build = name->build;
+ aname->flags = name->flags;
aname->revision = name->revision;
aname->hashalg = name->hash_alg;
aname->versioncompat = 1; /* SameMachine (default) */
@@ -5079,13 +5080,14 @@
MonoDomain *domain = mono_object_domain (name);
char *val;
gboolean is_version_defined;
+ gboolean is_token_defined;
val = mono_string_to_utf8 (assname);
- if (!mono_assembly_name_parse_full (val, &aname, TRUE,
&is_version_defined))
+ if (!mono_assembly_name_parse_full (val, &aname, TRUE,
&is_version_defined, &is_token_defined))
return FALSE;
fill_reflection_assembly_name (domain, name, &aname, "",
is_version_defined,
- FALSE, FALSE);
+ FALSE, is_token_defined);
mono_assembly_name_free (&aname);
g_free ((guint8*) aname.public_key);
Modified: trunk/mono/mono/metadata/metadata-internals.h
===================================================================
--- trunk/mono/mono/metadata/metadata-internals.h 2008-01-20 14:33:32 UTC
(rev 93346)
+++ trunk/mono/mono/metadata/metadata-internals.h 2008-01-20 15:51:17 UTC
(rev 93347)
@@ -422,7 +422,8 @@
mono_assembly_name_parse_full (const char *name,
MonoAssemblyName *aname,
gboolean save_public_key,
- gboolean *is_version_defined)
MONO_INTERNAL;
+ gboolean *is_version_defined,
+ gboolean *is_token_defined)
MONO_INTERNAL;
guint32 mono_metadata_get_generic_param_row (MonoImage *image, guint32 token,
guint32 *owner);
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
