X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fmetadata.h;h=6036fe3ae7dcf7e576e50f2af39f30d8ede9410e;hb=aefc06ddf682848e3a6a4e0a534f443b335a6167;hp=046491943d5e7d5493b9a225d2a28f7e275162c5;hpb=2a01bde545a47e287977637a4a08f8f965ca45dc;p=mono.git diff --git a/mono/metadata/metadata.h b/mono/metadata/metadata.h index 046491943d5..6036fe3ae7d 100644 --- a/mono/metadata/metadata.h +++ b/mono/metadata/metadata.h @@ -76,6 +76,9 @@ typedef enum { MONO_NATIVE_LPSTRUCT = 0x2b, MONO_NATIVE_CUSTOM = 0x2c, MONO_NATIVE_ERROR = 0x2d, + // TODO: MONO_NATIVE_IINSPECTABLE = 0x2e + // TODO: MONO_NATIVE_HSTRING = 0x2f + MONO_NATIVE_UTF8STR = 0x30, MONO_NATIVE_MAX = 0x50 /* no info */ } MonoMarshalNative; @@ -162,7 +165,11 @@ typedef enum { MONO_MARSHAL_FREE_ARRAY, MONO_MARSHAL_CONV_BSTR_STR, MONO_MARSHAL_CONV_SAFEHANDLE, - MONO_MARSHAL_CONV_HANDLEREF + MONO_MARSHAL_CONV_HANDLEREF, + MONO_MARSHAL_CONV_STR_UTF8STR, + MONO_MARSHAL_CONV_SB_UTF8STR, + MONO_MARSHAL_CONV_UTF8STR_STR, + MONO_MARSHAL_CONV_UTF8STR_SB, } MonoMarshalConv; #define MONO_MARSHAL_CONV_INVALID ((MonoMarshalConv)-1)