[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Runtime/InteropServic
|
From: |
Rhys Weatherley <address@hidden> |
|
Subject: |
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Runtime/InteropServices Marshal.cs,1.10,1.11 |
|
Date: |
Wed, 04 Jun 2003 00:02:56 -0400 |
Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/InteropServices
In directory
subversions:/tmp/cvs-serv30008/runtime/System/Runtime/InteropServices
Modified Files:
Marshal.cs
Log Message:
Test cases and bug fixes for System.Runtime.InteropServices.Marshal.
Index: Marshal.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Runtime/InteropServices/Marshal.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Marshal.cs 29 May 2003 03:12:58 -0000 1.10
--- Marshal.cs 4 Jun 2003 04:02:54 -0000 1.11
***************
*** 63,66 ****
--- 63,84 ----
IntPtr destination, int length)
{
+ if(source == null)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex > source.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (source.Length - startIndex) <
length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyMU(source, startIndex, destination, length);
}
***************
*** 68,71 ****
--- 86,107 ----
IntPtr destination, int length)
{
+ if(source == null)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex > source.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (source.Length - startIndex) <
length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyMU(source, startIndex * 2, destination,
length * 2);
}
***************
*** 73,76 ****
--- 109,130 ----
IntPtr destination, int length)
{
+ if(source == null)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex > source.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (source.Length - startIndex) <
length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyMU(source, startIndex * 8, destination,
length * 8);
}
***************
*** 78,81 ****
--- 132,153 ----
IntPtr destination, int length)
{
+ if(source == null)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex > source.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (source.Length - startIndex) <
length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyMU(source, startIndex * 4, destination,
length * 4);
}
***************
*** 83,86 ****
--- 155,176 ----
IntPtr destination, int length)
{
+ if(source == null)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex > source.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (source.Length - startIndex) <
length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyMU(source, startIndex * 4, destination,
length * 4);
}
***************
*** 88,91 ****
--- 178,199 ----
IntPtr destination, int length)
{
+ if(source == null)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex > source.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (source.Length - startIndex) <
length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyMU(source, startIndex * 8, destination,
length * 8);
}
***************
*** 93,96 ****
--- 201,222 ----
IntPtr destination, int length)
{
+ if(source == null)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex > source.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (source.Length - startIndex) <
length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyMU(source, startIndex * 2, destination,
length * 2);
}
***************
*** 105,108 ****
--- 231,252 ----
int startIndex, int
length)
{
+ if(source == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == null)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex >
destination.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (destination.Length -
startIndex) < length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyUM(source, destination, startIndex, length);
}
***************
*** 110,113 ****
--- 254,275 ----
int startIndex, int
length)
{
+ if(source == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == null)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex >
destination.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (destination.Length -
startIndex) < length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyUM(source, destination, startIndex * 2,
length * 2);
}
***************
*** 115,118 ****
--- 277,298 ----
int startIndex, int
length)
{
+ if(source == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == null)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex >
destination.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (destination.Length -
startIndex) < length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyUM(source, destination, startIndex * 8,
length * 8);
}
***************
*** 120,123 ****
--- 300,321 ----
int startIndex, int
length)
{
+ if(source == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == null)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex >
destination.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (destination.Length -
startIndex) < length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyUM(source, destination, startIndex * 4,
length * 4);
}
***************
*** 125,128 ****
--- 323,344 ----
int startIndex, int
length)
{
+ if(source == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == null)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex >
destination.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (destination.Length -
startIndex) < length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyUM(source, destination, startIndex * 4,
length * 4);
}
***************
*** 130,133 ****
--- 346,367 ----
int startIndex, int
length)
{
+ if(source == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == null)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex >
destination.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (destination.Length -
startIndex) < length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyUM(source, destination, startIndex * 8,
length * 8);
}
***************
*** 135,138 ****
--- 369,390 ----
int startIndex, int
length)
{
+ if(source == IntPtr.Zero)
+ {
+ throw new
ArgumentNullException("source");
+ }
+ if(destination == null)
+ {
+ throw new
ArgumentNullException("destination");
+ }
+ if(startIndex < 0 || startIndex >
destination.Length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("startIndex",
_("ArgRange_Array"));
+ }
+ if(length < 0 || (destination.Length -
startIndex) < length)
+ {
+ throw new ArgumentOutOfRangeException
+ ("length", _("ArgRange_Array"));
+ }
CopyUM(source, destination, startIndex * 2,
length * 2);
}
***************
*** 144,166 ****
// Get the offset of a field within a class.
[MethodImpl(MethodImplOptions.InternalCall)]
! extern public static IntPtr OffsetOf(Type t, String fieldName);
// Convert a pointer to an ANSI string into a string object.
[MethodImpl(MethodImplOptions.InternalCall)]
! extern public static String PtrToStringAnsi(IntPtr ptr);
!
! [MethodImpl(MethodImplOptions.InternalCall)]
! extern public static String PtrToStringAnsi(IntPtr ptr, int len);
// Convert a pointer to an Auto string into a string object.
public static String PtrToStringAuto(IntPtr ptr)
{
! // Auto and ANSI are identical in this
implementation.
! return PtrToStringAnsi(ptr);
}
public static String PtrToStringAuto(IntPtr ptr, int len)
{
! // Auto and ANSI are identical in this
implementation.
! return PtrToStringAnsi(ptr, len);
}
--- 396,612 ----
// Get the offset of a field within a class.
[MethodImpl(MethodImplOptions.InternalCall)]
! extern private static IntPtr OffsetOfInternal(Type t, String fieldName);
! public static IntPtr OffsetOf(Type t, String fieldName)
! {
! if(t == null)
! {
! throw new ArgumentNullException("t");
! }
! else if(!(t is ClrType))
! {
! throw new
ArgumentException(_("Arg_MustBeType"), "t");
! }
! if(fieldName == null)
! {
! throw new
ArgumentNullException("fieldName");
! }
! IntPtr offset = OffsetOfInternal(t, fieldName);
! if(offset == (IntPtr)(-1))
! {
! throw new ArgumentException
! (_("Reflection_UnknownField"),
"fieldName");
! }
! return offset;
! }
// Convert a pointer to an ANSI string into a string object.
[MethodImpl(MethodImplOptions.InternalCall)]
! extern private static String PtrToStringAnsiInternal(IntPtr ptr, int
len);
! public static String PtrToStringAnsi(IntPtr ptr)
! {
! if(ptr == IntPtr.Zero)
! {
! throw new ArgumentNullException("ptr");
! }
! else
! {
! return PtrToStringAnsiInternal(ptr, -1);
! }
! }
! public static String PtrToStringAnsi(IntPtr ptr, int len)
! {
! if(ptr == IntPtr.Zero)
! {
! throw new ArgumentNullException("ptr");
! }
! else if(len < 0)
! {
! throw new
ArgumentException(_("ArgRange_NonNegative"));
! }
! else
! {
! return PtrToStringAnsiInternal(ptr,
len);
! }
! }
// Convert a pointer to an Auto string into a string object.
+ // In this implementation, "Auto" is UTF-8.
+ [MethodImpl(MethodImplOptions.InternalCall)]
+ extern private static String PtrToStringAutoInternal(IntPtr ptr, int
len);
public static String PtrToStringAuto(IntPtr ptr)
{
! if(ptr == IntPtr.Zero)
! {
! throw new ArgumentNullException("ptr");
! }
! else
! {
! return PtrToStringAutoInternal(ptr, -1);
! }
}
public static String PtrToStringAuto(IntPtr ptr, int len)
{
! if(ptr == IntPtr.Zero)
! {
! throw new ArgumentNullException("ptr");
! }
! else if(len < 0)
! {
! throw new
ArgumentException(_("ArgRange_NonNegative"));
! }
! else
! {
! return PtrToStringAutoInternal(ptr,
len);
! }
! }
!
! // Convert a pointer to a Unicode string into a string object.
! [MethodImpl(MethodImplOptions.InternalCall)]
! extern private static String PtrToStringUniInternal(IntPtr ptr, int
len);
! public static String PtrToStringUni(IntPtr ptr)
! {
! if(ptr == IntPtr.Zero)
! {
! throw new ArgumentNullException("ptr");
! }
! else
! {
! return PtrToStringUniInternal(ptr, -1);
! }
! }
! public static String PtrToStringUni(IntPtr ptr, int len)
! {
! if(ptr == IntPtr.Zero)
! {
! throw new ArgumentNullException("ptr");
! }
! else if(len < 0)
! {
! throw new
ArgumentException(_("ArgRange_NonNegative"));
! }
! else
! {
! return PtrToStringUniInternal(ptr, len);
! }
! }
!
!
! // Convert the data at an unmanaged pointer location into
! // an object by marshalling its fields one by one.
! [MethodImpl(MethodImplOptions.InternalCall)]
! extern private static bool PtrToStructureInternal
! (IntPtr ptr, Object structure, bool
allowValueTypes);
! public static void PtrToStructure(IntPtr ptr, Object structure)
! {
! if(ptr == IntPtr.Zero)
! {
! throw new ArgumentNullException("ptr");
! }
! else if(structure == null)
! {
! throw new
ArgumentNullException("structure");
! }
! if(!PtrToStructureInternal(ptr, structure,
false))
! {
! throw new ArgumentException
! (_("Arg_CannotMarshalStruct"));
! }
! }
! #if CONFIG_REFLECTION
! public static Object PtrToStructure(IntPtr ptr, Type structureType)
! {
! if(ptr == IntPtr.Zero)
! {
! return null;
! }
! else if(structureType == null)
! {
! throw new
ArgumentNullException("structureType");
! }
! else if(!(structureType is ClrType))
! {
! throw new ArgumentException
! (_("Arg_MustBeType"),
"structureType");
! }
! Object obj =
Activator.CreateInstance(structureType);
! if(!PtrToStructureInternal(ptr, obj, true))
! {
! throw new ArgumentException
! (_("Arg_CannotMarshalStruct"));
! }
! return obj;
! }
! #endif
!
! // Destroy the contents of an unmanaged structure.
! [MethodImpl(MethodImplOptions.InternalCall)]
! extern private static bool DestroyStructureInternal
! (IntPtr ptr, Type structureType);
! public static void DestroyStructure(IntPtr ptr, Type structureType)
! {
! if(ptr == IntPtr.Zero)
! {
! throw new ArgumentNullException("ptr");
! }
! else if(structureType == null)
! {
! throw new
ArgumentNullException("structureType");
! }
! else if(!(structureType is ClrType))
! {
! throw new ArgumentException
! (_("Arg_MustBeType"),
"structureType");
! }
! if(!DestroyStructureInternal(ptr,
structureType))
! {
! throw new ArgumentException
! (_("Arg_CannotMarshalStruct"));
! }
! }
!
! // Convert an object into an unmanaged structure.
! [MethodImpl(MethodImplOptions.InternalCall)]
! extern private static bool StructureToPtrInternal
! (Object structure, IntPtr ptr);
! public static void StructureToPtr(Object structure, IntPtr ptr,
! bool
fDeleteOld)
! {
! if(structure == null)
! {
! throw new
ArgumentNullException("structure");
! }
! else if(ptr == IntPtr.Zero)
! {
! throw new ArgumentNullException("ptr");
! }
! if(!StructureToPtrInternal(structure, ptr))
! {
! throw new ArgumentException
! (_("Arg_CannotMarshalStruct"));
! }
! if(fDeleteOld)
! {
! DestroyStructure(ptr,
structure.GetType());
! }
}
***************
*** 235,243 ****
// Get the size of a type.
[MethodImpl(MethodImplOptions.InternalCall)]
! extern public static int SizeOf(Type t);
// Get the size of an object.
public static int SizeOf(Object o)
{
return SizeOf(o.GetType());
}
--- 681,708 ----
// Get the size of a type.
[MethodImpl(MethodImplOptions.InternalCall)]
! extern private static int SizeOfInternal(Type t);
! public static int SizeOf(Type t)
! {
! if(t == null)
! {
! throw new ArgumentNullException("t");
! }
! else if(!(t is ClrType))
! {
! throw new
ArgumentException(_("Arg_MustBeType"), "t");
! }
! else
! {
! return SizeOfInternal(t);
! }
! }
// Get the size of an object.
public static int SizeOf(Object o)
{
+ if(o == null)
+ {
+ throw new ArgumentNullException("o");
+ }
return SizeOf(o.GetType());
}
***************
*** 248,256 ****
// Convert a string into an Auto character buffer.
! public static IntPtr StringToHGlobalAuto(String s)
! {
! // Auto and ANSI are identical in this
implementation.
! return StringToHGlobalAnsi(s);
! }
// Get the address of a pinned array element.
--- 713,723 ----
// Convert a string into an Auto character buffer.
! // In this implementation, "Auto" is UTF-8.
! [MethodImpl(MethodImplOptions.InternalCall)]
! extern public static IntPtr StringToHGlobalAuto(String s);
!
! // Convert a string into a Unicode character buffer.
! [MethodImpl(MethodImplOptions.InternalCall)]
! extern public static IntPtr StringToHGlobalUni(String s);
// Get the address of a pinned array element.
***************
*** 507,514 ****
// Other methods that aren't relevant to this implementation.
- public static void DestroyStructure(IntPtr ptr, Type structureType)
- {
- throw new NotImplementedException();
- }
public static void FreeBSTR(IntPtr str)
{
--- 974,977 ----
***************
*** 582,625 ****
throw new NotImplementedException();
}
- public static String PtrToStringUni(IntPtr ptr)
- {
- throw new NotImplementedException();
- }
- public static String PtrToStringUni(IntPtr ptr, int len)
- {
- throw new NotImplementedException();
- }
-
- [MethodImpl(MethodImplOptions.InternalCall)]
- extern private static void PtrToStructureInternal
- (IntPtr ptr, Object structure);
- public static void PtrToStructure(IntPtr ptr, Object structure)
- {
- if(structure.GetType().IsValueType)
- {
- throw new ArgumentException("Object must be of type
class.");
- }
- PtrToStructureInternal(ptr,structure);
- }
-
- #if CONFIG_REFLECTION
- public static Object PtrToStructure(IntPtr ptr, Type structureType)
- {
- Object obj=Activator.CreateInstance(structureType);
- PtrToStructureInternal(ptr,obj);
- return obj;
- }
- #endif
-
public static IntPtr StringToBSTR(String s)
- {
- throw new NotImplementedException();
- }
- public static IntPtr StringToHGlobalUni(String s)
- {
- throw new NotImplementedException();
- }
- public static void StructureToPtr(Object structure, IntPtr ptr,
- bool
fDeleteOld)
{
throw new NotImplementedException();
--- 1045,1049 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Runtime/InteropServices Marshal.cs,1.10,1.11,
Rhys Weatherley <address@hidden> <=
- Prev by Date:
[Dotgnu-pnet-commits] CVS: pnetlib/resources/en_US/runtime Arg.txt,1.39,1.40 Reflection.txt,1.3,1.4
- Next by Date:
[Dotgnu-pnet-commits] CVS: pnetlib ChangeLog,1.986,1.987
- Previous by thread:
[Dotgnu-pnet-commits] CVS: pnetlib/resources/en_US/runtime Arg.txt,1.39,1.40 Reflection.txt,1.3,1.4
- Next by thread:
[Dotgnu-pnet-commits] CVS: pnetlib ChangeLog,1.986,1.987
- Index(es):