dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dotgnu-pnet-commits] CVS: pnet/image marshal.c,1.10,1.11


From: Rhys Weatherley <address@hidden>
Subject: [Dotgnu-pnet-commits] CVS: pnet/image marshal.c,1.10,1.11
Date: Thu, 01 May 2003 06:29:11 -0400

Update of /cvsroot/dotgnu-pnet/pnet/image
In directory subversions:/tmp/cvs-serv15975/image

Modified Files:
        marshal.c 
Log Message:


Add "String[]" to the set of types that are specially marshalled in
PInvoke operations (Bug #3387).


Index: marshal.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/marshal.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** marshal.c   16 Apr 2003 04:51:28 -0000      1.10
--- marshal.c   1 May 2003 10:29:08 -0000       1.11
***************
*** 170,175 ****
        else if(ILType_IsSimpleArray(type))
        {
!               /* Array type, passed in by pointer to the first element */
!               return IL_META_MARSHAL_ARRAY;
        }
        else if(type != 0 && ILType_IsComplex(type) &&
--- 170,190 ----
        else if(ILType_IsSimpleArray(type))
        {
!               if(ILTypeIsStringClass(ILTypeGetElemType(type)))
!               {
!                       /* Array of strings, passed as "char **" */
!                       if(StringCharSet(pinvoke, method) == 
IL_META_MARSHAL_ANSI_STRING)
!                       {
!                               return IL_META_MARSHAL_ANSI_ARRAY;
!                       }
!                       else
!                       {
!                               return IL_META_MARSHAL_UTF8_ARRAY;
!                       }
!               }
!               else
!               {
!                       /* Array type, passed in by pointer to the first 
element */
!                       return IL_META_MARSHAL_ARRAY;
!               }
        }
        else if(type != 0 && ILType_IsComplex(type) &&





reply via email to

[Prev in Thread] Current Thread [Next in Thread]