lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-09-18 17:47:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some name-breaking changes so master is now v3. V2 will continue to be the code on nuget for now.

Browse Source
This commit is contained in:
soukoku
2014-09-15 07:24:13 -04:00
parent 0cd02ac16e
commit 92063d2b84
62 changed files with 422 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
NTwain/Data/TwainTypesExtended.cs
View File

@@ -635,7 +635,7 @@ namespace NTwain.Data
public TWCapability(CapabilityId capability)
{
Capability = capability;
ContainerType = ContainerType.DontCare;
ContainerType = ContainerType.DoNotCare;
}
/// <summary>
/// Initializes a new instance of the <see cref="TWCapability" /> class.
@@ -699,7 +699,7 @@ namespace NTwain.Data
// since one value can only house UInt32 we will not allow type size > 4
if (TypeReader.GetItemTypeSize(value.ItemType) > 4) { throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, Resources.BadValueType, "TWOneValue")); }
_hContainer = Platform.MemoryManager.Allocate((uint)Marshal.SizeOf(value));
_hContainer = PlatformInfo.Current.MemoryManager.Allocate((uint)Marshal.SizeOf(value));
if (_hContainer != IntPtr.Zero)
{
Marshal.StructureToPtr(value, _hContainer, false);
@@ -715,8 +715,8 @@ namespace NTwain.Data
Int32 valueSize = TWEnumeration.ItemOffset + value.ItemList.Length * TypeReader.GetItemTypeSize(value.ItemType);
int offset = 0;
_hContainer = Platform.MemoryManager.Allocate((uint)valueSize);
IntPtr baseAddr = Platform.MemoryManager.Lock(_hContainer);
_hContainer = PlatformInfo.Current.MemoryManager.Allocate((uint)valueSize);
IntPtr baseAddr = PlatformInfo.Current.MemoryManager.Lock(_hContainer);
// can't safely use StructureToPtr here so write it our own
WriteValue(baseAddr, ref offset, ItemType.UInt16, value.ItemType);
@@ -727,7 +727,7 @@ namespace NTwain.Data
{
WriteValue(baseAddr, ref offset, value.ItemType, item);
}
Platform.MemoryManager.Unlock(baseAddr);
PlatformInfo.Current.MemoryManager.Unlock(baseAddr);
}
@@ -739,7 +739,7 @@ namespace NTwain.Data
// since range value can only house UInt32 we will not allow type size > 4
if (TypeReader.GetItemTypeSize(value.ItemType) > 4) { throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, Resources.BadValueType, "TWRange")); }
_hContainer = Platform.MemoryManager.Allocate((uint)Marshal.SizeOf(value));
_hContainer = PlatformInfo.Current.MemoryManager.Allocate((uint)Marshal.SizeOf(value));
if (_hContainer != IntPtr.Zero)
{
Marshal.StructureToPtr(value, _hContainer, false);
@@ -903,7 +903,7 @@ namespace NTwain.Data
if (disposing) { }
if (_hContainer != IntPtr.Zero)
{
Platform.MemoryManager.Free(_hContainer);
PlatformInfo.Current.MemoryManager.Free(_hContainer);
_hContainer = IntPtr.Zero;
}
}
@@ -1435,7 +1435,7 @@ namespace NTwain.Data
{
// uintptr to intptr could be bad
var ptr = new IntPtr(BitConverter.ToInt64(BitConverter.GetBytes(it.Item.ToUInt64()), 0));
Platform.MemoryManager.Free(ptr);
PlatformInfo.Current.MemoryManager.Free(ptr);
}
}
it.Item = UIntPtr.Zero;
@@ -2138,7 +2138,7 @@ namespace NTwain.Data
/// </summary>
public TWPendingXfers()
{
_count = TwainConst.DontCare16;
_count = TwainConst.DoNotCare16;
}
/// <summary>
@@ -2146,7 +2146,7 @@ namespace NTwain.Data
/// connected to. If no more transfers are available, set to zero. If an unknown and
/// non-zero number of transfers are available, set to -1.
/// </summary>
public int Count { get { return _count == TwainConst.DontCare16 ? -1 : (int)_count; } }
public int Count { get { return _count == TwainConst.DoNotCare16 ? -1 : (int)_count; } }
/// <summary>
/// The application should check this field if the CapJobControl is set to other
/// than None. If this is not 0, the application should expect more data
@@ -2181,7 +2181,7 @@ namespace NTwain.Data
/// <summary>
/// The device’s "power-on" value for the capability. If the application is
/// performing a MSG_SET operation and isn’t sure what the default
/// value is, set this field to <see cref="TwainConst.DontCare32"/>.
/// value is, set this field to <see cref="TwainConst.DoNotCare32"/>.
/// </summary>
public uint DefaultValue { get { return _defaultValue; } set { _defaultValue = value; } }
/// <summary>
@@ -2352,7 +2352,7 @@ namespace NTwain.Data
}
if (_uTF8string != IntPtr.Zero)
{
Platform.MemoryManager.Free(_uTF8string);
PlatformInfo.Current.MemoryManager.Free(_uTF8string);
_uTF8string = IntPtr.Zero;
}
}

10
NTwain/Data/TwainValues.cs
View File

@@ -40,7 +40,7 @@ namespace NTwain.Data
/// <summary>
/// The don't care value.
/// </summary>
DontCare = TwainConst.DontCare16,
DoNotCare = TwainConst.DoNotCare16,
}
/// <summary>
@@ -2044,7 +2044,7 @@ namespace NTwain.Data
/// Corresponds to TWQC_*.
/// </summary>
[Flags]
public enum QuerySupport
public enum QuerySupports
{
None = 0,
Get = 0x1,
@@ -2120,15 +2120,15 @@ namespace NTwain.Data
/// <summary>
/// Don't care value for 8 bit types.
/// </summary>
public const byte DontCare8 = 0xff;
public const byte DoNotCare8 = 0xff;
/// <summary>
/// Don't care value for 16 bit types.
/// </summary>
public const ushort DontCare16 = 0xffff;
public const ushort DoNotCare16 = 0xffff;
/// <summary>
/// Don't care value for 32 bit types.
/// </summary>
public const uint DontCare32 = 0xffffffff;
public const uint DoNotCare32 = 0xffffffff;
/// <summary>
/// The major version number of TWAIN supported by this library.