2004-01-07 Zoltan Varga <[email protected]>

	* icall.c (ves_icall_get_enum_info): Store the value of the enum fields
	in field->def_value, as done in all other cases.

	* reflection.c (mono_reflection_get_custom_attrs): Add support for
	TypeBuilders.

	* reflection.c (mono_reflection_create_runtime_class): Remove
	errorneous assignment to klass->element_class, since it is already
	done in mono_reflection_setup_internal_class.

svn path=/trunk/mono/; revision=21808

mono/metadata/ChangeLog

@@ -1,3 +1,15 @@
+2004-01-07  Zoltan Varga  <[email protected]>
+
+	* icall.c (ves_icall_get_enum_info): Store the value of the enum fields
+	in field->def_value, as done in all other cases.
+
+	* reflection.c (mono_reflection_get_custom_attrs): Add support for
+	TypeBuilders.
+
+	* reflection.c (mono_reflection_create_runtime_class): Remove 
+	errorneous assignment to klass->element_class, since it is already
+	done in mono_reflection_setup_internal_class.
+
 2004-01-07  Gonzalo Paniagua Javier <[email protected]>
 
 	* gc.c: added missing LeaveCriticalSection.

mono/metadata/icall.c

@@ -2000,7 +2000,7 @@ ves_icall_get_enum_info (MonoReflectionType *type, MonoEnumInfo *info)
 	MonoClass *enumc = mono_class_from_mono_type (type->type);
 	guint i, j, nvalues, crow;
 	MonoClassField *field;
-	
+
 	MONO_ARCH_SAVE_REGS;
 
 	info->utype = mono_type_get_object (domain, enumc->enum_basetype);
@@ -2010,35 +2010,42 @@ ves_icall_get_enum_info (MonoReflectionType *type, MonoEnumInfo *info)
 	
 	crow = -1;
 	for (i = 0, j = 0; i < enumc->field.count; ++i) {
+		const char *p;
+		int len;
+
 		field = &enumc->fields [i];
 		if (strcmp ("value__", field->name) == 0)
 			continue;
 		if (mono_field_is_deleted (field))
 			continue;
 		mono_array_set (info->names, gpointer, j, mono_string_new (domain, field->name));
-		if (!field->data) {
+		if (!field->def_value) {
+			field->def_value = g_new0 (MonoConstant, 1);
 			crow = mono_metadata_get_constant_index (enumc->image, MONO_TOKEN_FIELD_DEF | (i+enumc->field.first+1), crow + 1);
+			field->def_value->type = mono_metadata_decode_row_col (&enumc->image->tables [MONO_TABLE_CONSTANT], crow-1, MONO_CONSTANT_TYPE);
 			crow = mono_metadata_decode_row_col (&enumc->image->tables [MONO_TABLE_CONSTANT], crow-1, MONO_CONSTANT_VALUE);
-			/* 1 is the length of the blob */
-			field->data = 1 + mono_metadata_blob_heap (enumc->image, crow);
+			field->def_value->value = (gpointer)mono_metadata_blob_heap (enumc->image, crow);
 		}
+
+		p = field->def_value->value;
+		len = mono_metadata_decode_blob_size (p, &p);
 		switch (enumc->enum_basetype->type) {
 		case MONO_TYPE_U1:
 		case MONO_TYPE_I1:
-			mono_array_set (info->values, gchar, j, *field->data);
+			mono_array_set (info->values, gchar, j, *p);
 			break;
 		case MONO_TYPE_CHAR:
 		case MONO_TYPE_U2:
 		case MONO_TYPE_I2:
-			mono_array_set (info->values, gint16, j, read16 (field->data));
+			mono_array_set (info->values, gint16, j, read16 (p));
 			break;
 		case MONO_TYPE_U4:
 		case MONO_TYPE_I4:
-			mono_array_set (info->values, gint32, j, read32 (field->data));
+			mono_array_set (info->values, gint32, j, read32 (p));
 			break;
 		case MONO_TYPE_U8:
 		case MONO_TYPE_I8:
-			mono_array_set (info->values, gint64, j, read64 (field->data));
+			mono_array_set (info->values, gint64, j, read64 (p));
 			break;
 		default:
 			g_error ("Implement type 0x%02x in get_enum_info", enumc->enum_basetype->type);

mono/metadata/reflection.c

@@ -3816,7 +3816,7 @@ assembly_add_win32_resources (MonoDynamicImage *assembly, MonoReflectionAssembly
 	/* Currently, we only support one resource */
 	g_assert (mono_array_length (assemblyb->win32_resources) == 1);
 
-	win32_res = mono_array_addr (assemblyb->win32_resources, MonoReflectionWin32Resource, 0);
+	win32_res = (MonoReflectionWin32Resource*)mono_array_addr (assemblyb->win32_resources, MonoReflectionWin32Resource, 0);
 
 	/*
 	 * For the format of the resource directory, see the article
@@ -5698,6 +5698,9 @@ mono_reflection_get_custom_attrs (MonoObject *obj)
 	} else if (strcmp ("AssemblyBuilder", klass->name) == 0) {
 		MonoReflectionAssemblyBuilder *assemblyb = (MonoReflectionAssemblyBuilder*)obj;
 		cinfo = mono_custom_attrs_from_builders (assemblyb->assembly.assembly->image, assemblyb->cattrs);
+	} else if (strcmp ("TypeBuilder", klass->name) == 0) {
+		MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder*)obj;
+		cinfo = mono_custom_attrs_from_builders (&tb->module->dynamic_image->image, tb->cattrs);
 	} else { /* handle other types here... */
 		g_error ("get custom attrs not yet supported for %s", klass->name);
 	}
@@ -7047,7 +7050,6 @@ mono_reflection_create_runtime_class (MonoReflectionTypeBuilder *tb)
 	 * nested_classes
 	 */
 	klass->flags = tb->attrs;
-	klass->element_class = klass;
 
 	if (!((MonoDynamicImage*)(MonoDynamicImage*)klass->image)->run)
 		/* No need to fully construct the type */