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

Fixed some CA violations.

Browse Source
This commit is contained in:
soukoku
2014-04-06 08:22:59 -04:00
parent d70cf7c6a4
commit bb862bc107
11 changed files with 182 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
NTwain/MemoryManager.cs
View File

@@ -38,15 +38,23 @@ namespace NTwain
/// <returns>Handle to the allocated memory.</returns>
public IntPtr Allocate(uint size)
{
IntPtr retVal = IntPtr.Zero;
if (_twain2Entry != null && _twain2Entry.AllocateFunction != null)
{
return _twain2Entry.AllocateFunction(size);
retVal = _twain2Entry.AllocateFunction(size);
}
else
{
// 0x0040 is GPTR
return WinGlobalAlloc(0x0040, new UIntPtr(size));
retVal = NativeMethods.WinGlobalAlloc(0x0040, new UIntPtr(size));
}
if (retVal == IntPtr.Zero)
{
throw new OutOfMemoryException("Failed to allocate requested memory.");
}
return retVal;
}
/// <summary>
@@ -61,7 +69,7 @@ namespace NTwain
}
else
{
WinGlobalFree(handle);
NativeMethods.WinGlobalFree(handle);
}
}
@@ -78,7 +86,7 @@ namespace NTwain
}
else
{
return WinGlobalLock(handle);
return NativeMethods.WinGlobalLock(handle);
}
}
@@ -94,26 +102,8 @@ namespace NTwain
}
else
{
WinGlobalUnlock(handle);
NativeMethods.WinGlobalUnlock(handle);
}
}
#region old mem stuff for twain 1.x
[DllImport("kernel32", SetLastError = true, EntryPoint = "GlobalAlloc")]
static extern IntPtr WinGlobalAlloc(uint uFlags, UIntPtr dwBytes);
[DllImport("kernel32", SetLastError = true, EntryPoint = "GlobalFree")]
static extern IntPtr WinGlobalFree(IntPtr hMem);
[DllImport("kernel32", SetLastError = true, EntryPoint = "GlobalLock")]
static extern IntPtr WinGlobalLock(IntPtr handle);
[DllImport("kernel32", SetLastError = true, EntryPoint = "GlobalUnlock")]
[return: MarshalAs(UnmanagedType.Bool)]
static extern bool WinGlobalUnlock(IntPtr handle);
#endregion
}
}