Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

2008-07-15 Jonathan Chambers <joncham@gmail.com>

       * assembly.c (mono_set_rootdir): Revert part of mixed
       mode assembly patch to fix build. Use mono_module_handle
       instead of linker specific __ImageBase.

       * coree.h: Add back mono_module_handle.

       * coree.c: Add back mono_module_handle.

       Code is contributed under MIT/X11 license.

2008-07-15  Jonathan Chambers  <joncham@gmail.com>

       * driver.c: Add back mono_module_handle and
       initialize in DllMain DLL_PROCESS_ATTACH case.

       Code is contributed under MIT/X11 license.


svn path=/branches/mono-2-0/mono/; revision=108051
  • Loading branch information...
commit 57dbdb3e42c98860392c8eeccbcbdf3df50ee461 1 parent e83157f
@joncham joncham authored
View
12 mono/metadata/ChangeLog
@@ -1,3 +1,15 @@
+2008-07-15 Jonathan Chambers <joncham@gmail.com>
+
+ * assembly.c (mono_set_rootdir): Revert part of mixed
+ mode assembly patch to fix build. Use mono_module_handle
+ instead of linker specific __ImageBase.
+
+ * coree.h: Add back mono_module_handle.
+
+ * coree.c: Add back mono_module_handle.
+
+ Code is contributed under MIT/X11 license.
+
2008-07-15 Zoltan Varga <vargaz@gmail.com>
* decimal.c (my_g_bit_nth_msf): Implement this directly without calling
View
2  mono/metadata/assembly.c
@@ -551,7 +551,7 @@ mono_set_rootdir (void)
#ifdef PLATFORM_WIN32
gchar *bindir, *installdir, *root, *name, *config;
- name = mono_get_module_file_name ((HMODULE) &__ImageBase);
+ name = mono_get_module_file_name (mono_module_handle);
bindir = g_path_get_dirname (name);
installdir = g_path_get_dirname (bindir);
root = g_build_path (G_DIR_SEPARATOR_S, installdir, "lib", NULL);
View
1  mono/metadata/coree.c
@@ -33,6 +33,7 @@
#include "environment.h"
#include "coree.h"
+HMODULE mono_module_handle = NULL;
HMODULE coree_module_handle = NULL;
static gboolean init_from_coree = FALSE;
View
4 mono/metadata/coree.h
@@ -22,9 +22,7 @@
STDAPI MonoFixupCorEE(HMODULE ModuleHandle);
-/* Defined by the linker. */
-extern IMAGE_DOS_HEADER __ImageBase MONO_INTERNAL;
-
+extern HMODULE mono_module_handle MONO_INTERNAL;
extern HMODULE coree_module_handle MONO_INTERNAL;
HMODULE WINAPI MonoLoadImage(LPCWSTR FileName) MONO_INTERNAL;
View
7 mono/mini/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-15 Jonathan Chambers <joncham@gmail.com>
+
+ * driver.c: Add back mono_module_handle and
+ initialize in DllMain DLL_PROCESS_ATTACH case.
+
+ Code is contributed under MIT/X11 license.
+
2008-07-14 Zoltan Varga <vargaz@gmail.com>
* mini.c (mono_method_to_ir): Disable aot for code using CCASTCLASS on x86 as
View
1  mono/mini/driver.c
@@ -1089,6 +1089,7 @@ BOOL APIENTRY DllMain (HMODULE module_handle, DWORD reason, LPVOID reserved)
switch (reason)
{
case DLL_PROCESS_ATTACH:
+ mono_module_handle = module_handle;
mono_install_runtime_load (mini_init);
break;
case DLL_PROCESS_DETACH:
Please sign in to comment.
Something went wrong with that request. Please try again.