[Dotgnu-pnet-commits] pnet/image marshal.c,1.12,1.13

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        marshal.c 
Log Message:


Marshal structures that contain delegate fields.


Index: marshal.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/marshal.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** marshal.c   15 Jul 2003 10:07:52 -0000      1.12
--- marshal.c   7 Oct 2003 09:38:16 -0000       1.13
***************
*** 53,58 ****
  
        /* Check the class for character set information */
!       if((method->member.owner->attributes &
!                               IL_META_TYPEDEF_STRING_FORMAT_MASK) ==
                        IL_META_TYPEDEF_UNICODE_CLASS)
        {
--- 53,58 ----
  
        /* Check the class for character set information */
!       if(method && (method->member.owner->attributes &
!                                               
IL_META_TYPEDEF_STRING_FORMAT_MASK) ==
                        IL_META_TYPEDEF_UNICODE_CLASS)
        {
***************
*** 80,86 ****
                                                                 unsigned long 
param, char **customName,
                                                                 int 
*customNameLen, char **customCookie,
!                                                                int 
*customCookieLen)
  {
-       ILType *type = ILTypeGetParam(method->member.signature, param);
        ILParameter *parameter;
        ILFieldMarshal *marshal;
--- 80,85 ----
                                                                 unsigned long 
param, char **customName,
                                                                 int 
*customNameLen, char **customCookie,
!                                                                int 
*customCookieLen, ILType *type)
  {
        ILParameter *parameter;
        ILFieldMarshal *marshal;
***************
*** 90,101 ****
  
        /* Find the parameter information block */
!       if(!(method->parameters))
        {
!               _ILMethodLoadParams(method);
        }
!       parameter = method->parameters;
!       while(parameter != 0 && parameter->paramNum != param)
        {
!               parameter = parameter->next;
        }
  
--- 89,107 ----
  
        /* Find the parameter information block */
!       if(method)
        {
!               if(!(method->parameters))
!               {
!                       _ILMethodLoadParams(method);
!               }
!               parameter = method->parameters;
!               while(parameter != 0 && parameter->paramNum != param)
!               {
!                       parameter = parameter->next;
!               }
        }
!       else
        {
!               parameter = 0;
        }
  
***************
*** 220,224 ****
                                                                 unsigned long 
param, char **customName,
                                                                 int 
*customNameLen, char **customCookie,
!                                                                int 
*customCookieLen)
  {
        return IL_META_MARSHAL_DIRECT;
--- 226,230 ----
                                                                 unsigned long 
param, char **customName,
                                                                 int 
*customNameLen, char **customCookie,
!                                                                int 
*customCookieLen, ILType *type)
  {
        return IL_META_MARSHAL_DIRECT;