projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3213 from henricm/fix-for-win-securestring-to-bstr
[mono.git]
/
mono
/
metadata
/
marshal.h
diff --git
a/mono/metadata/marshal.h
b/mono/metadata/marshal.h
index 512d44b421193642b7ec40979bdbca756d973ae6..166db1478ce52312ca113fd954646df022247a7e 100644
(file)
--- a/
mono/metadata/marshal.h
+++ b/
mono/metadata/marshal.h
@@
-275,7
+275,10
@@
gpointer
mono_string_to_ansibstr (MonoString *string_obj);
gpointer
mono_string_to_ansibstr (MonoString *string_obj);
gpointer
-mono_string_to_bstr (MonoString *string_obj);
+mono_ptr_to_bstr (gpointer ptr, int slen);
+
+gpointer
+mono_string_to_bstr(MonoString* str);
void mono_delegate_free_ftnptr (MonoDelegate *delegate);
void mono_delegate_free_ftnptr (MonoDelegate *delegate);
@@
-472,6
+475,9
@@
ves_icall_System_Runtime_InteropServices_Marshal_OffsetOf (MonoReflectionType *t
gpointer
ves_icall_System_Runtime_InteropServices_Marshal_StringToBSTR (MonoString *string);
gpointer
ves_icall_System_Runtime_InteropServices_Marshal_StringToBSTR (MonoString *string);
+gpointer
+ves_icall_System_Runtime_InteropServices_Marshal_BufferToBSTR (MonoArray *ptr, int len);
+
gpointer
ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalAnsi (MonoString *string);
gpointer
ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalAnsi (MonoString *string);