Author: zoltan
Date: 2006-10-06 11:05:37 -0400 (Fri, 06 Oct 2006)
New Revision: 66357
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/image.c
Log:
2006-10-06 Zoltan Varga <[EMAIL PROTECTED]>
* image.c (load_metadata_ptrs): Put back the error message when
the #- heap is encountered since the support is not complete yet.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2006-10-06 14:58:18 UTC (rev 66356)
+++ trunk/mono/mono/metadata/ChangeLog 2006-10-06 15:05:37 UTC (rev 66357)
@@ -1,4 +1,8 @@
+2006-10-06 Zoltan Varga <[EMAIL PROTECTED]>
+ * image.c (load_metadata_ptrs): Put back the error message when
+ the #- heap is encountered since the support is not complete yet.
+
Fri Oct 6 16:57:26 CEST 2006 Paolo Molaro <[EMAIL PROTECTED]>
* gc.c: do not allow the user to SuppressFinalize () a
Modified: trunk/mono/mono/metadata/image.c
===================================================================
--- trunk/mono/mono/metadata/image.c 2006-10-06 14:58:18 UTC (rev 66356)
+++ trunk/mono/mono/metadata/image.c 2006-10-06 15:05:37 UTC (rev 66357)
@@ -345,11 +345,14 @@
image->heap_guid.size = read32 (ptr + 4);
ptr += 8 + 6;
} else if (strncmp (ptr + 8, "#-", 3) == 0) {
- mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY,
"Assembly '%s' has the non-standard metadata heap #-.\nRecompile it correctly
(without the /incremental switch or in Release mode).\n", image->name);
image->heap_tables.data = image->raw_metadata + read32
(ptr);
image->heap_tables.size = read32 (ptr + 4);
ptr += 8 + 3;
image->uncompressed_metadata = TRUE;
+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY,
"Assembly '%s' has the non-standard metadata heap #-.\nRecompile it correctly
(without the /incremental switch or in Release mode).\n", image->name);
+ /* This doesn't work yet (bug #38532) */
+ g_print ("Assembly '%s' has the non-standard metadata
heap #-.\nRecompile it correctly (without the /incremental switch or in Release
mode).\n", image->name);
+ return FALSE;
} else {
g_message ("Unknown heap type: %s\n", ptr + 8);
ptr += 8 + strlen (ptr + 8) + 1;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
