Compare commits

...
Author SHA1 Message Date
Jonathan Chambers 57dbdb3e42 2008-07-15 Jonathan Chambers <[email protected]>
* 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  <[email protected]>

       * 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
2008-07-16 16:09:49 +00:00
Marek Habersack e83157f0bf Backport of r108024
svn path=/branches/mono-2-0/mcs/; revision=108030
2008-07-16 13:59:06 +00:00
Zoltan Varga 6bc712404f Merge r107985 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=107988
2008-07-15 18:22:47 +00:00
Andrew Jorgensen 31349722b8 Update versions to 2.0
svn path=/branches/mono-2-0/mono/; revision=107979
2008-07-15 17:11:32 +00:00
10 changed files with 47 additions and 7 deletions

No files matched your search

+1 -1
View File
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mono,1.9)
AM_INIT_AUTOMAKE(mono,2.0)
AM_MAINTAINER_MODE
API_VER=1.0
@@ -1,3 +1,8 @@
2008-07-16 Marek Habersack <[email protected]>
* XmlDataSource.cs: check if Page isn't null before stringifying
it in GetDataKey (), fixes bug #409492
2008-07-13 Roei Erez <[email protected]>
* GridView.cs: When the RowDataBound event is invoked, the value
@@ -140,7 +140,10 @@ namespace System.Web.UI.WebControls {
string GetDataKey ()
{
return TemplateSourceDirectory + "_" + Page.ToString () + "_" + ID;
Page page = Page;
string p = page != null ? page.ToString () : "NullPage";
return TemplateSourceDirectory + "_" + p + "_" + ID;
}
Cache DataCache
+17
View File
@@ -1,3 +1,20 @@
2008-07-15 Jonathan Chambers <[email protected]>
* 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 <[email protected]>
* decimal.c (my_g_bit_nth_msf): Implement this directly without calling
g_bit_nth_msf () since that macro is not implemented in glib.
2008-07-13 Zoltan Varga <[email protected]>
* class.c (mono_class_generic_sharing_enabled): Always disable generic sharing
+1 -1
View File
@@ -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);
+1
View File
@@ -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;
+1 -3
View File
@@ -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;
+9 -1
View File
@@ -579,7 +579,15 @@ my_g_bit_nth_msf (gsize mask)
return bIndex;
return -1;
#else
return g_bit_nth_msf (mask, sizeof (gsize) * 8);
int i;
i = sizeof (gsize) * 8;
while (i > 0) {
i --;
if (mask & (1UL << i))
return i;
}
return -1;
#endif
}
+7
View File
@@ -1,3 +1,10 @@
2008-07-15 Jonathan Chambers <[email protected]>
* 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 <[email protected]>
* mini.c (mono_method_to_ir): Disable aot for code using CCASTCLASS on x86 as
+1
View File
@@ -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: