2004-09-30 Zoltan Varga <vargaz@freemail.hu>

	* marshal.h marshal.c icall.c: Fix bugs in previous patch.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index f9413116af6640eaa6118d2eb30b2d45c870a421..dcf334dc8030c875712285ee6633bf92633a4f1a 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,5 +1,7 @@
 2004-09-30  Zoltan Varga  <vargaz@freemail.hu>
 
+       * marshal.h marshal.c icall.c: Fix bugs in previous patch.
+
        * marshal.c marshal.h icall.c: Add GetDelegateForFunctionPointerInternal icall.
 
        * marshal.c: Fix warnings.

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index db1fd6c7604bd722bda1650f5f1369009264cd3f..58687881787018cc545b3a270998deaf8ee86dc2 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -6100,8 +6100,8 @@ static const IcallEntry marshal_icalls [] = {
        {"DestroyStructure", ves_icall_System_Runtime_InteropServices_Marshal_DestroyStructure},
        {"FreeCoTaskMem", ves_icall_System_Runtime_InteropServices_Marshal_FreeCoTaskMem},
        {"FreeHGlobal", ves_icall_System_Runtime_InteropServices_Marshal_FreeHGlobal},
-       {"GetFunctionPointerForDelegateInternal", mono_delegate_to_ftnptr},
        {"GetDelegateForFunctionPointerInternal", ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerInternal},
+       {"GetFunctionPointerForDelegateInternal", mono_delegate_to_ftnptr},
        {"GetLastWin32Error", ves_icall_System_Runtime_InteropServices_Marshal_GetLastWin32Error},
        {"OffsetOf", ves_icall_System_Runtime_InteropServices_Marshal_OffsetOf},
        {"Prelink", ves_icall_System_Runtime_InteropServices_Marshal_Prelink},

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index e100abf89d6df83ff400f085952cd1a143918382..967c37a891d447ec68ca9c27f4bef15905712d3f 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -6148,7 +6148,7 @@ ves_icall_System_Runtime_InteropServices_Marshal_UnsafeAddrOfPinnedArrayElement
 }
 
 MonoDelegate*
-ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerInternal (MonoReflectionType *type, void *ftn)
+ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerInternal (void *ftn, MonoReflectionType *type)
 {
        return mono_ftnptr_to_delegate (mono_type_get_class (type->type), ftn);
 }

diff --git a/mono/metadata/marshal.h b/mono/metadata/marshal.h
index 7986b63b6e29329b855705734d1e21bd3fde7abf..bcfa22e0b6b2d33fe8632189aa0d0057673e74d5 100644 (file)
--- a/mono/metadata/marshal.h
+++ b/mono/metadata/marshal.h
@@ -325,7 +325,7 @@ void*
 ves_icall_System_Runtime_InteropServices_Marshal_UnsafeAddrOfPinnedArrayElement (MonoArray *arrayobj, int index);
 
 MonoDelegate*
-ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerInternal (MonoReflectionType *type, void *ftn);
+ves_icall_System_Runtime_InteropServices_Marshal_GetDelegateForFunctionPointerInternal (void *ftn, MonoReflectionType *type);
 
 #endif /* __MONO_MARSHAL_H__ */