UDI/buf - buf_copy/buf_free/fixes

[tpg/acess2.git] / KernelLand / Modules / Interfaces / UDI / udi_lib / core / mei.c

diff --git a/KernelLand/Modules/Interfaces/UDI/udi_lib/core/mei.c b/KernelLand/Modules/Interfaces/UDI/udi_lib/core/mei.c
index 338898c..29217ac 100644 (file)
--- a/KernelLand/Modules/Interfaces/UDI/udi_lib/core/mei.c
+++ b/KernelLand/Modules/Interfaces/UDI/udi_lib/core/mei.c
@@ -35,7 +35,7 @@ void udi_mei_call(udi_cb_t *gcb, udi_mei_init_t *meta_info, udi_index_t meta_ops
                for( ; ops->meta_ops_num && ops->meta_ops_num != meta_ops_num; ops ++ )
                        ;
                if( !ops->meta_ops_num ) {
-                       LEAVE('-');
+//                     LEAVE('-');
                        return ;
                }
                mei_op = &ops->op_template_list[vec_idx-1];
@@ -67,11 +67,26 @@ void udi_mei_call(udi_cb_t *gcb, udi_mei_init_t *meta_info, udi_index_t meta_ops
        // Check call type
        udi_op_t        *const*ops = UDI_int_ChannelPrepForCall(gcb, metalang, meta_ops_num);
        udi_op_t        *op = ops[vec_idx];
+       
+       // Change ownership of chained cbs
+       size_t  chain_ofs = metalang->CbTypes[cb_type].ChainOfs;
+       if( chain_ofs )
+       {
+               udi_cb_t        *chained_cb = gcb;
+               while( (chained_cb = *(udi_cb_t**)((void*)chained_cb + chain_ofs)) )
+                       UDI_int_ChannelFlip(chained_cb);
+       }
+       
        if( indirect_call )
        {
                va_list args;
                va_start(args, vec_idx);
                size_t  marshal_size = _udi_marshal_values(NULL, mei_op->marshal_layout, args);
+               if( marshal_size == 0 && mei_op->marshal_layout[0] != UDI_DL_END ) {
+                       Warning("udi_mei_call(%s) - Marshalling failure", mei_op->op_name);
+//                     LEAVE('-');
+                       return ;
+               }
                va_end(args);
                tUDI_MeiCall    *call = malloc(sizeof(tUDI_MeiCall) + marshal_size);
                call->DCall.Next = NULL;