Commit2b44f64

authored and

committed

Add support for UnmanagedType.LPUTF8Str (dotnet#4360)

1 parente1e4cce commit2b44f64Copy full SHA for 2b44f64

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 1 addition & 0 deletions

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -838,6 +838,7 @@ let nt_ARRAY = 0x2Auy`
`838`	`838`	`letnt_LPSTRUCT=0x2Buy`
`839`	`839`	`letnt_CUSTOMMARSHALER=0x2Cuy`
`840`	`840`	`letnt_ERROR=0x2Duy`
	`841`	`+letnt_LPUTF8STR=0x30uy`
`841`	`842`	`letnt_MAX=0x50uy`
`842`	`843`
`843`	`844`	`// From c:/clrenv.i386/Crt/Inc/i386/hs.h`
`@@ -894,6 +895,7 @@ let ILNativeTypeMap =`
`894`	`895`	`nt_LPSTR, ILNativeType.LPSTR`
`895`	`896`	`nt_LPWSTR, ILNativeType.LPWSTR`
`896`	`897`	`nt_LPTSTR, ILNativeType.LPTSTR`
	`898`	`+ nt_LPUTF8STR, ILNativeType.LPUTF8STR`
`897`	`899`	`nt_IUNKNOWN,(* COM interop*) ILNativeType.IUnknown`
`898`	`900`	`nt_IDISPATCH,(* COM interop*) ILNativeType.IDispatch`
`899`	`901`	`nt_BYVALSTR, ILNativeType.ByValStr`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4933,7 +4933,8 @@ and GenMarshal cenv attribs =`
`4933`	`4933`	`error(Error(FSComp.SR.ilCustomMarshallersCannotBeUsedInFSharp(),m))`
`4934`	`4934`	`(* ILNativeType.Custom of bytes * string * string * bytes(* GUID,nativeTypeName,custMarshallerName,cookieString))`
`4935`	`4935`	`//ILNativeType.Error`
`4936`		`-\|0x2D-> ILNativeType.Error`
	`4936`	`+\|0x2D-> ILNativeType.Error`
	`4937`	`+\|0x30-> ILNativeType.LPUTF8STR`
`4937`	`4938`	`\|_-> ILNativeType.Empty`
`4938`	`4939`	`Some(decodeUnmanagedType unmanagedType), otherAttribs`
`4939`	`4940`	`\| Some(Attrib(_,_,_,_,_,_,m))->`

Comments

(0)