[Dotgnu-pnet-commits] CVS: pnet/engine cvmc_setup.c,1.29,1.30 pinvoke.c,1.18,1.19

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/engine
In directory subversions:/tmp/cvs-serv22187/engine

Modified Files:
        cvmc_setup.c pinvoke.c 
Log Message:


Parse custom marshaling cookies.


Index: cvmc_setup.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/cvmc_setup.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** cvmc_setup.c        31 Jan 2003 02:00:29 -0000      1.29
--- cvmc_setup.c        31 Jan 2003 03:03:46 -0000      1.30
***************
*** 540,543 ****
--- 540,545 ----
        char *customName;
        int customNameLen;
+       char *customCookie;
+       int customCookieLen;
  #endif
  
***************
*** 574,578 ****
                if(!isInternal &&
                   (marshalType = ILPInvokeGetMarshalType(pinv, method, param,
!                                                                               
                  &customName, &customNameLen))
                                != IL_META_MARSHAL_DIRECT)
                {
--- 576,582 ----
                if(!isInternal &&
                   (marshalType = ILPInvokeGetMarshalType(pinv, method, param,
!                                                                               
                  &customName, &customNameLen,
!                                                                               
                  &customCookie,
!                                                                               
                  &customCookieLen))
                                != IL_META_MARSHAL_DIRECT)
                {
***************
*** 804,807 ****
--- 808,813 ----
        char *customName;
        int customNameLen;
+       char *customCookie;
+       int customCookieLen;
  
        /* Push the address of the argument array onto the stack */
***************
*** 1025,1029 ****
                        /* Marshal the PInvoke return value back into a CLR 
object */
                        marshalType = ILPInvokeGetMarshalType
!                               (ILPInvokeFind(method), method, 0, &customName, 
&customNameLen);
                        switch(marshalType)
                        {
--- 1031,1036 ----
                        /* Marshal the PInvoke return value back into a CLR 
object */
                        marshalType = ILPInvokeGetMarshalType
!                               (ILPInvokeFind(method), method, 0, &customName, 
&customNameLen,
!                                &customCookie, &customCookieLen);
                        switch(marshalType)
                        {

Index: pinvoke.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/pinvoke.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** pinvoke.c   31 Jan 2003 02:00:29 -0000      1.18
--- pinvoke.c   31 Jan 2003 03:03:46 -0000      1.19
***************
*** 458,461 ****
--- 458,463 ----
        char *customName;
        int customNameLen;
+       char *customCookie;
+       int customCookieLen;
        char *strValue;
  
***************
*** 477,481 ****
                /* Marshal parameters that need special handling */
                marshalType = ILPInvokeGetMarshalType(0, method, param,
!                                                                               
          &customName, &customNameLen);
                if(marshalType != IL_META_MARSHAL_DIRECT)
                {
--- 479,484 ----
                /* Marshal parameters that need special handling */
                marshalType = ILPInvokeGetMarshalType(0, method, param,
!                                                                               
          &customName, &customNameLen,
!                                                                               
          &customCookie, &customCookieLen);
                if(marshalType != IL_META_MARSHAL_DIRECT)
                {
***************
*** 706,713 ****
        char *customName;
        int customNameLen;
  
        /* Marshal return types that need special handling */
        marshalType = ILPInvokeGetMarshalType
!                       (0, method, 0, &customName, &customNameLen);
        if(marshalType != IL_META_MARSHAL_DIRECT)
        {
--- 709,719 ----
        char *customName;
        int customNameLen;
+       char *customCookie;
+       int customCookieLen;
  
        /* Marshal return types that need special handling */
        marshalType = ILPInvokeGetMarshalType
!                       (0, method, 0, &customName, &customNameLen,
!                        &customCookie, &customCookieLen);
        if(marshalType != IL_META_MARSHAL_DIRECT)
        {