Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / metadata / coree.c

diff --git a/mono/metadata/coree.c b/mono/metadata/coree.c
index 428fb9b989f80b6fea16ac5b54aad5cdf52cceb3..75a9b3bd8c41c6717eaa807afbf4004c9e2d1dd3 100644 (file)
--- a/mono/metadata/coree.c
+++ b/mono/metadata/coree.c
@@ -1,5 +1,6 @@
-/*
- * coree.c: mscoree.dll functions
+/**
+ * \file
+ * mscoree.dll functions
  *
  * Author:
  *   Kornel Pal <http://www.kornelpal.hu/>
@@ -14,12 +15,12 @@
 
 #include <glib.h>
 #include <string.h>
-#include <mono/io-layer/io-layer.h>
 #include <mono/utils/mono-path.h>
+#include "utils/w32api.h"
 #include "cil-coff.h"
 #include "metadata-internals.h"
 #include "image.h"
-#include "assembly.h"
+#include "assembly-internals.h"
 #include "domain-internals.h"
 #include "appdomain.h"
 #include "object.h"
@@ -119,7 +120,7 @@ BOOL STDMETHODCALLTYPE _CorDllMain(HINSTANCE hInst, DWORD dwReason, LPVOID lpRes
                 * probably be delayed until the first call to an exported function.
                 */
                if (image->tables [MONO_TABLE_ASSEMBLY].rows && ((MonoCLIImageInfo*) image->image_info)->cli_cli_header.ch_vtable_fixups.rva)
-                       assembly = mono_assembly_open (file_name, NULL);
+                       assembly = mono_assembly_open_predicate (file_name, FALSE, FALSE, NULL, NULL, NULL);
 
                g_free (file_name);
                break;
@@ -170,7 +171,7 @@ __int32 STDMETHODCALLTYPE _CorExeMain(void)
                ExitProcess (1);
        }
 
-       assembly = mono_assembly_open (file_name, NULL);
+       assembly = mono_assembly_open_predicate (file_name, FALSE, FALSE, NULL, NULL, NULL);
        mono_close_exe_image ();
        if (!assembly) {
                g_free (file_name);