lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-11-07 18:14:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some refactor ideas

Browse Source
This commit is contained in:
soukoku
2014-04-05 16:48:28 -04:00
parent 4fa3e77fba
commit 67c6705224
49 changed files with 183 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
NTwain/Data/TypesExtended.cs
View File

@@ -1,7 +1,9 @@
using NTwain.Properties;
using NTwain.Values;
using System;
using System.Diagnostics;
using System.Globalization;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.Permissions;
using System.Text;
@@ -663,7 +665,7 @@ namespace NTwain.Data
var value = new TWOneValue();
if (_hContainer != IntPtr.Zero)
{
IntPtr baseAddr = MemoryManager.Global.MemLock(_hContainer);
IntPtr baseAddr = MemoryManager.Instance.MemLock(_hContainer);
try
{
int offset = 0;
@@ -672,7 +674,7 @@ namespace NTwain.Data
value.Item = (uint)ReadValue(baseAddr, ref offset, ItemType.UInt32);
}
catch { }
MemoryManager.Global.MemUnlock(_hContainer);
MemoryManager.Instance.MemUnlock(_hContainer);
}
return value;
}
@@ -686,7 +688,7 @@ namespace NTwain.Data
// since one value can only house UInt32 we will not allow type size > 4
if (GetItemTypeSize(value.ItemType) > 4) { throw new ArgumentException("Invalid one value type"); }
_hContainer = MemoryManager.Global.MemAllocate((uint)Marshal.SizeOf(value));
_hContainer = MemoryManager.Instance.MemAllocate((uint)Marshal.SizeOf(value));
if (_hContainer != IntPtr.Zero)
{
Marshal.StructureToPtr(value, _hContainer, false);
@@ -705,7 +707,7 @@ namespace NTwain.Data
var value = new TWArray();
if (_hContainer != IntPtr.Zero)
{
IntPtr baseAddr = MemoryManager.Global.MemLock(_hContainer);
IntPtr baseAddr = MemoryManager.Instance.MemLock(_hContainer);
int offset = 0;
value.ItemType = (ItemType)(ushort)Marshal.ReadInt16(baseAddr, offset);
offset += 2;
@@ -719,7 +721,7 @@ namespace NTwain.Data
value.ItemList[i] = ReadValue(baseAddr, ref offset, value.ItemType);
}
}
MemoryManager.Global.MemUnlock(_hContainer);
MemoryManager.Instance.MemUnlock(_hContainer);
}
return value;
}
@@ -736,7 +738,7 @@ namespace NTwain.Data
var value = new TWEnumeration();
if (_hContainer != IntPtr.Zero)
{
IntPtr baseAddr = MemoryManager.Global.MemLock(_hContainer);
IntPtr baseAddr = MemoryManager.Instance.MemLock(_hContainer);
int offset = 0;
value.ItemType = (ItemType)(ushort)Marshal.ReadInt16(baseAddr, offset);
offset += 2;
@@ -754,7 +756,7 @@ namespace NTwain.Data
value.ItemList[i] = ReadValue(baseAddr, ref offset, value.ItemType);
}
}
MemoryManager.Global.MemUnlock(_hContainer);
MemoryManager.Instance.MemUnlock(_hContainer);
}
return value;
}
@@ -768,8 +770,8 @@ namespace NTwain.Data
Int32 valueSize = value.ItemOffset + value.ItemList.Length * GetItemTypeSize(value.ItemType);
int offset = 0;
_hContainer = MemoryManager.Global.MemAllocate((uint)valueSize);
IntPtr baseAddr = MemoryManager.Global.MemLock(_hContainer);
_hContainer = MemoryManager.Instance.MemAllocate((uint)valueSize);
IntPtr baseAddr = MemoryManager.Instance.MemLock(_hContainer);
// can't safely use StructureToPtr here so write it our own
WriteValue(baseAddr, ref offset, ItemType.UInt16, value.ItemType);
@@ -780,7 +782,7 @@ namespace NTwain.Data
{
WriteValue(baseAddr, ref offset, value.ItemType, item);
}
MemoryManager.Global.MemUnlock(_hContainer);
MemoryManager.Instance.MemUnlock(_hContainer);
}
/// <summary>
@@ -795,7 +797,7 @@ namespace NTwain.Data
var value = new TWRange();
if (_hContainer != IntPtr.Zero)
{
IntPtr baseAddr = MemoryManager.Global.MemLock(_hContainer);
IntPtr baseAddr = MemoryManager.Instance.MemLock(_hContainer);
int offset = 0;
value.ItemType = (ItemType)(ushort)Marshal.ReadInt16(baseAddr, offset);
@@ -810,7 +812,7 @@ namespace NTwain.Data
offset += 4;
value.CurrentValue = (uint)Marshal.ReadInt32(baseAddr, offset);
MemoryManager.Global.MemUnlock(_hContainer);
MemoryManager.Instance.MemUnlock(_hContainer);
}
return value;
}
@@ -823,7 +825,7 @@ namespace NTwain.Data
// since range value can only house UInt32 we will not allow type size > 4
if (GetItemTypeSize(value.ItemType) > 4) { throw new ArgumentException("Invalid range value type"); }
_hContainer = MemoryManager.Global.MemAllocate((uint)Marshal.SizeOf(value));
_hContainer = MemoryManager.Instance.MemAllocate((uint)Marshal.SizeOf(value));
if (_hContainer != IntPtr.Zero)
{
Marshal.StructureToPtr(value, _hContainer, false);
@@ -1123,7 +1125,7 @@ namespace NTwain.Data
{
if (_hContainer != IntPtr.Zero)
{
MemoryManager.Global.MemFree(_hContainer);
MemoryManager.Instance.MemFree(_hContainer);
_hContainer = IntPtr.Zero;
}
GC.SuppressFinalize(this);
@@ -1136,7 +1138,7 @@ namespace NTwain.Data
{
if (_hContainer != IntPtr.Zero)
{
MemoryManager.Global.MemFree(_hContainer);
MemoryManager.Instance.MemFree(_hContainer);
_hContainer = IntPtr.Zero;
}
}
@@ -1857,12 +1859,24 @@ namespace NTwain.Data
/// </summary>
public string ProductName { get { return _productName; } set { value.VerifyLengthUnder(TwainConst.String32 - 1); _productName = value; } }
//public static TWIdentity CreateFromAssembly(DataGroups supportedGroups)
//{
// return Create(supportedGroups);
//}
/// <summary>
/// Creates a <see cref="TWIdentity"/> specified values.
/// Creates a <see cref="TWIdentity"/> from assembly values.
/// </summary>
/// <param name="supportedGroups">The supported groups.</param>
/// <param name="assembly">The assembly.</param>
/// <returns></returns>
/// <exception cref="ArgumentNullException">assembly</exception>
public static TWIdentity CreateFromAssembly(DataGroups supportedGroups, Assembly assembly)
{
if (assembly == null) { throw new ArgumentNullException("assembly"); }
var info = FileVersionInfo.GetVersionInfo(assembly.Location);
return Create(supportedGroups, assembly.GetName().Version, info.CompanyName, info.ProductName, info.ProductName, info.FileDescription);
}
/// <summary>
/// Creates a <see cref="TWIdentity"/> from specified values.
/// </summary>
/// <param name="supportedGroups">The supported groups.</param>
/// <param name="version">The version.</param>