2004-02-02 Zoltan Varga <vargaz@freemail.hu>

	* interp.c (ves_exec_method_with_context): Add new marshalling
	conventions.

svn path=/trunk/mono/; revision=22707

diff --git a/mono/interpreter/ChangeLog b/mono/interpreter/ChangeLog
index 1e5464eda5df66b49b625abac755ff47d48722e4..79f0cf272e2ad8e9f73f8c78e56dd6e83f42e9bb 100644 (file)
--- a/mono/interpreter/ChangeLog
+++ b/mono/interpreter/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-02  Zoltan Varga  <vargaz@freemail.hu>
+
+       * interp.c (ves_exec_method_with_context): Add new marshalling 
+       conventions.
+
 2004-01-22  Zoltan Varga  <vargaz@freemail.hu>
 
        * interp.c (mono_main): Remove call to mono_verify_corlib (), since

diff --git a/mono/interpreter/interp.c b/mono/interpreter/interp.c
index baf7ac8325dee3d48c45254b98cf032fb28a5fbf..6013a5894e46171f964344c0ecde55694336395e 100644 (file)
--- a/mono/interpreter/interp.c
+++ b/mono/interpreter/interp.c
@@ -4153,8 +4153,12 @@ array_constructed:
                                        sp->data.p = mono_string_to_ansibstr (sp->data.p);
                                        break;
                                case MONO_MARSHAL_CONV_SB_LPSTR:
+                               case MONO_MARSHAL_CONV_SB_LPTSTR:
                                        sp->data.p = mono_string_builder_to_utf8 (sp->data.p);
                                        break;
+                               case MONO_MARSHAL_CONV_SB_LPWSTR:
+                                       sp->data.p = mono_string_builder_to_utf16 (sp->data.p);
+                                       break;
                                case MONO_MARSHAL_CONV_ARRAY_SAVEARRAY:
                                        sp->data.p = mono_array_to_savearray (sp->data.p);
                                        break;
@@ -4187,8 +4191,12 @@ array_constructed:
 
                                switch (conv) {
                                case MONO_MARSHAL_CONV_LPSTR_SB:
+                               case MONO_MARSHAL_CONV_LPTSTR_SB:
                                        mono_string_utf8_to_builder (sp [0].data.p, sp [1].data.p);
                                        break;
+                               case MONO_MARSHAL_CONV_LPWSTR_SB:
+                                       mono_string_utf16_to_builder (sp [0].data.p, sp [1].data.p);
+                                       break;
                                case MONO_MARSHAL_FREE_ARRAY:
                                        mono_marshal_free_array (sp [0].data.p, sp [1].data.i);
                                        break;