sean-m
/
Vanara
mirror of https://github.com/dahall/Vanara.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed Marshal.SizeOf to InteropExtensions.SizeOf to account for IVanaraMarshaler instances

pull/83/head
David Hall 2019-11-25 19:36:46 -07:00
parent 80b7256543
commit 61fe0f30d8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/InteropServices/NativeMemoryStream.cs
View File

@ -222,7 +222,7 @@ namespace Vanara.InteropServices
ThrowIfDisposed();
if (!CanRead) throw new NotSupportedException();
if (fsize == 0) return Array.CreateInstance(elemType, 0);
var elemSize = elemType == typeof(string) || byRef ? IntPtr.Size : Marshal.SizeOf(elemType);
var elemSize = elemType == typeof(string) || byRef ? IntPtr.Size : (int)InteropExtensions.SizeOf(elemType);
var blockSize = elemSize * fsize;
if (Position + blockSize > Capacity) throw new ArgumentOutOfRangeException();
Array ret;
@ -479,10 +479,10 @@ namespace Vanara.InteropServices
return es.Sum(s => s.GetByteCount(true, charSet));
case IEnumerable<object> eo:
return eo.Sum(o => o is null ? 0 : Marshal.SizeOf(o));
return eo.Sum(o => o is null ? 0 : (int)InteropExtensions.SizeOf(o.GetType()));
default:
return Marshal.SizeOf(obj);
return (int)InteropExtensions.SizeOf(obj.GetType());
}
}