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

Merge pull request #75 from soukoku/Win32-native-experiments

Browse Source 
Win32 native experiments
This commit is contained in:
Eugene Wang
2025-11-12 08:25:50 -05:00
committed by GitHub
parent 0780b950e2 02c722f964
commit 506366cba8
16 changed files with 666 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ScannerTester/ScannerTester.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net10.0-windows7.0</TargetFramework>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>

12
samples/WinConsole32/Program.cs
View File

@@ -127,13 +127,13 @@ namespace WinConsole32
}
static int xferCount = 0;
static Stopwatch watch;
static Stopwatch watch = new Stopwatch();
private static void Session_Transferred(TwainAppSession twain, TransferredEventArgs e)
{
if (e.Data != null)
{
var saveFile = $"twain_{DateTime.Now:yyyyMMdd_HHmmss}_{xferCount}";
Console.WriteLine("SUCCESS! Got twain memory data #{0} on thread {1}, saving to {saveFile}.", ++xferCount, Environment.CurrentManagedThreadId, saveFile);
Console.WriteLine($"SUCCESS! Got twain memory data #{++xferCount} on thread {Environment.CurrentManagedThreadId}, saving to {saveFile}.");
using (var img = new ImageMagick.MagickImage(e.Data.AsStream()))
{
@@ -157,11 +157,11 @@ namespace WinConsole32
else if (e.FileInfo != null)
{
var fi = e.FileInfo.Value;
Console.WriteLine("SUCCESS! Got twain file data #{0} on thread {1} as {saveFile}.", ++xferCount, Environment.CurrentManagedThreadId, fi.FileName);
Console.WriteLine($"SUCCESS! Got twain file data #{++xferCount} on thread {Environment.CurrentManagedThreadId} as {fi.FileName}.");
}
else
{
Console.WriteLine("BUMMER! No twain data #{0} on thread {1}.", ++xferCount, Environment.CurrentManagedThreadId);
Console.WriteLine($"BUMMER! No twain data #{++xferCount} on thread {Environment.CurrentManagedThreadId}.");
}
e.Dispose();
}
@@ -199,10 +199,10 @@ namespace WinConsole32
twain.Caps.ICAP_PIXELTYPE.Set(TWPT.RGB);
twain.Caps.ICAP_XRESOLUTION.Set(300f);
twain.Caps.ICAP_YRESOLUTION.Set(300f);
twain.Caps.CAP_XFERCOUNT.Set(100);
twain.Caps.CAP_XFERCOUNT.Set(4);
xferCount = 0;
watch = Stopwatch.StartNew();
watch.Restart();
var rc = twain.EnableSource(true, false);
}
}

2
samples/WinConsole32/WinConsole32.csproj
View File

@@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.0.0" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.9.1" />
</ItemGroup>
<ItemGroup>

2
samples/WinForm32/Form1.cs
View File

@@ -202,7 +202,7 @@ namespace WinFormSample
// color
saveFile += ".jpg";
format = ImageMagick.MagickFormat.Jpeg;
img.Quality = _jpegQuality;
img.Quality = (uint)_jpegQuality;
}
if (_saveDisk) img.Write(saveFile);
else img.Write(new NoOpStream(), format);

4
samples/WinForm32/WinForm32.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net10.0-windows7.0</TargetFramework>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<PlatformTarget>x86</PlatformTarget>
@@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Magick.NET-Q8-x86" Version="13.9.1" />
<PackageReference Include="Magick.NET-Q8-x86" Version="14.9.1" />
</ItemGroup>
<ItemGroup>

4
samples/WinForm64/WinForm64.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net10.0-windows7.0</TargetFramework>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<PlatformTarget>x64</PlatformTarget>
@@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Magick.NET-Q8-x64" Version="13.9.1" />
<PackageReference Include="Magick.NET-Q8-x64" Version="14.9.1" />
</ItemGroup>
<ItemGroup>

2
src/Directory.Build.props
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<!--change these in each release-->
<VersionPrefix>4.0.0.0</VersionPrefix>
<VersionSuffix>alpha.13</VersionSuffix>
<VersionSuffix>alpha.14</VersionSuffix>
<!--keep it the same until major # changes-->
<AssemblyVersion>4.0.0.0</AssemblyVersion>

19
src/NTwain/NTwain.csproj
View File

@@ -3,23 +3,24 @@
<PropertyGroup>
<PackageId>NTwain</PackageId>
<Description>Library containing the TWAIN API for dotnet.</Description>
<TargetFrameworks>net8.0;net8.0-windows;net9.0;net9.0-windows;net462;</TargetFrameworks>
<TargetFrameworks>net8.0;net8.0-windows;net9.0;net9.0-windows;net10.0;net10.0-windows;net472;</TargetFrameworks>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR $(TargetFramework.EndsWith('windows'))">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' OR $(TargetFramework.EndsWith('windows'))">
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net462'">
<ItemGroup Condition=" '$(TargetFramework)' == 'net472'">
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<!--<PackageReference Include="System.Buffers" Version="4.5.1" />-->
<PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="System.Memory" Version="4.6.3" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net462'">
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<ItemGroup Condition=" '$(TargetFramework)' != 'net472'">
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'!='Release'">
<None Remove="runtimes\win-x64\native\TWAINDSM.dll" />
@@ -33,6 +34,12 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.242">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<None Update="DSM\DSMGenerator.dummy">

128
src/NTwain/Native/BITMAP.cs
View File

@@ -2,99 +2,14 @@
using System.Runtime.InteropServices;
using System.Text;
namespace NTwain.Native
namespace Windows.Win32.Graphics.Gdi
{
// this is a good read
// http://atlc.sourceforge.net/bmp.html
/// <summary>
/// Defines the dimensions and color information for a DIB.
/// </summary>
[StructLayout(LayoutKind.Sequential)]
struct BITMAPINFO
partial struct BITMAPINFOHEADER
{
/// <summary>
/// Structure that contains information about the dimensions of color format.
/// </summary>
public BITMAPINFOHEADER bmiHeader;
/// <summary>
/// This contains one of the following:
/// 1. An array of RGBQUAD. The elements of the array that make up the color table.
/// 2. An array of 16-bit unsigned integers that specifies indexes into the currently realized logical palette. This use of bmiColors is allowed for functions that use DIBs.
/// The number of entries in the array depends on the values of the biBitCount and biClrUsed members of the BITMAPINFOHEADER structure.
/// </summary>
public IntPtr bmiColors;
};
/// <summary>
/// Structure that contains information about the dimensions and color format of a DIB.
/// </summary>
[StructLayout(LayoutKind.Sequential)]
struct BITMAPINFOHEADER
{
#region fields
/// <summary>
/// The number of bytes required by the structure.
/// </summary>
public uint biSize;
/// <summary>
/// The width of the bitmap, in pixels.
/// If Compression is JPEG or PNG, the Width member specifies the width of the decompressed
/// JPEG or PNG image file, respectively.
/// </summary>
public int biWidth;
/// <summary>
/// The height of the bitmap, in pixels. If Height is positive,
/// the bitmap is a bottom-up DIB and its origin is the lower-left corner.
/// If Height is negative, the bitmap is a top-down DIB and its origin is the upper-left corner.
/// If Height is negative, indicating a top-down DIB, Compression must be either RGB or BITFIELDS. Top-down DIBs cannot be compressed.
/// If Compression is JPEG or PNG, the Height member specifies the height of the decompressed JPEG or PNG image file, respectively.
/// </summary>
public int biHeight;
/// <summary>
/// The number of planes for the target device. This value must be set to 1.
/// </summary>
public ushort biPlanes;
/// <summary>
/// The number of bits-per-pixel. The BitCount member
/// determines the number of bits that define each pixel and the maximum number of colors in the bitmap.
/// </summary>
public ushort biBitCount;
/// <summary>
/// The type of compression for a compressed bottom-up bitmap (top-down DIBs cannot be compressed).
/// </summary>
public CompressionType biCompression;
/// <summary>
/// The size, in bytes, of the image. This may be set to zero for RGB bitmaps.
/// If Compression is JPEG or PNG, SizeImage indicates the size of the JPEG or PNG image buffer, respectively.
/// </summary>
public uint biSizeImage;
/// <summary>
/// The horizontal resolution, in pixels-per-meter, of the target device for the bitmap.
/// An application can use this value to select a bitmap from a resource group that
/// best matches the characteristics of the current device.
/// </summary>
public int biXPelsPerMeter;
/// <summary>
/// The vertical resolution, in pixels-per-meter, of the target device for the bitmap.
/// </summary>
public int biYPelsPerMeter;
/// <summary>
/// The number of color indexes in the color table that are actually used by the bitmap.
/// If this value is zero, the bitmap uses the maximum number of colors corresponding to
/// the value of the BitCount member for the compression mode specified by Compression.
/// </summary>
public uint biClrUsed;
/// <summary>
/// The number of color indexes that are required for displaying the bitmap.
/// If this value is zero, all colors are required.
/// </summary>
public uint biClrImportant;
#endregion
#region utilities
const double METER_INCH_RATIO = 39.3700787;
/// <summary>
@@ -119,7 +34,7 @@ namespace NTwain.Native
/// <returns></returns>
public static uint GetByteSize()
{
return (uint)Marshal.SizeOf(typeof(BITMAPINFOHEADER));
return (uint)Marshal.SizeOf<BITMAPINFOHEADER>();
}
/// <summary>
/// Checks to see if this structure contain valid data.
@@ -272,12 +187,7 @@ namespace NTwain.Native
return strideTest;
}
/// <summary>
/// Returns a <see cref="System.String" /> that represents this instance.
/// </summary>
/// <returns>
/// A <see cref="System.String" /> that represents this instance.
/// </returns>
/// <inheritdoc/>
public override string ToString()
{
return new StringBuilder().Append("BitmapInfoHeader:")
@@ -286,14 +196,18 @@ namespace NTwain.Native
.Append("\r\n\tHeight = " + biHeight)
.Append("\r\n\tPlanes = " + biPlanes)
.Append("\r\n\tBitCount = " + biBitCount)
.Append("\r\n\tCompression = " + biCompression)
.Append("\r\n\tCompression = " + Compression)
.Append("\r\n\tSizeImage = " + biSizeImage)
.Append("\r\n\tXPixelsPerMeter = " + biXPelsPerMeter)
.Append("\r\n\tYPixelsPerMeter = " + biYPelsPerMeter)
.Append("\r\n\tColorUsed = " + biClrUsed)
.Append("\r\n\tColorImportant = " + biClrImportant).ToString();
}
#endregion
/// <summary>
/// Gets the bitmap compression type.
/// </summary>
public CompressionType Compression { get { return (CompressionType)biCompression; } }
/// <summary>
/// Indicates the bitmap compression of <seealso cref="BITMAPINFOHEADER"/>.
@@ -326,15 +240,15 @@ namespace NTwain.Native
/// </summary>
BI_PNG = 5
}
};
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct BITMAPFILEHEADER
{
public ushort bfType;
public uint bfSize;
public ushort bfReserved1;
public ushort bfReserved2;
public uint bfOffBits;
}
//[StructLayout(LayoutKind.Sequential, Pack = 1)]
//struct BITMAPFILEHEADER
//{
// public ushort bfType;
// public uint bfSize;
// public ushort bfReserved1;
// public ushort bfReserved2;
// public uint bfOffBits;
//}
}

7
src/NTwain/Native/ImageTools.cs
View File

@@ -1,6 +1,7 @@
using NTwain.Data;
using System;
using System.Runtime.InteropServices;
using Windows.Win32.Graphics.Gdi;
namespace NTwain.Native
{
@@ -29,7 +30,7 @@ namespace NTwain.Native
var infoHeader = Marshal.PtrToStructure<BITMAPINFOHEADER>(data);
if (infoHeader.Validate())
{
var fileHeaderSize = Marshal.SizeOf(typeof(BITMAPFILEHEADER));
var fileHeaderSize = Marshal.SizeOf<BITMAPFILEHEADER>();
var fileHeader = new BITMAPFILEHEADER
{
@@ -66,8 +67,8 @@ namespace NTwain.Native
public static BufferedData? GetTiffData(IntPtr data)
{
// Find the size of the image so we can turn it into a memory stream...
var headerSize = Marshal.SizeOf(typeof(TIFFHEADER));
var tagSize = Marshal.SizeOf(typeof(TIFFTAG));
var headerSize = Marshal.SizeOf<TIFFHEADER>();
var tagSize = Marshal.SizeOf<TIFFTAG>();
var tiffSize = 0;
var tagPtr = data.ToInt64() + headerSize;
for (int i = 0; i < 999; i++)

40
src/NTwain/Native/WIN_MESSAGE.cs
View File

@@ -1,21 +1,21 @@
using System;
using System.Runtime.InteropServices;
//using System;
//using System.Runtime.InteropServices;
namespace NTwain.Native
{
/// <summary>
/// The MSG structure in Windows for TWAIN use.
/// </summary>
[StructLayout(LayoutKind.Sequential)]
struct WIN_MESSAGE
{
public IntPtr hwnd;
public uint message;
public IntPtr wParam;
public IntPtr lParam;
uint _time;
int _x;
int _y;
uint lprivate;
}
}
//namespace NTwain.Native
//{
// /// <summary>
// /// The MSG structure in Windows for TWAIN use.
// /// </summary>
// [StructLayout(LayoutKind.Sequential)]
// struct WIN_MESSAGE
// {
// public IntPtr hwnd;
// public uint message;
// public IntPtr wParam;
// public IntPtr lParam;
// uint _time;
// int _x;
// int _y;
// uint lprivate;
// }
//}

158
src/NTwain/Native/WinNativeMethods.cs
View File

@@ -1,97 +1,97 @@
using System;
using System.Runtime.InteropServices;
//using System;
//using System.Runtime.InteropServices;
namespace NTwain.Native
{
/// <summary>
/// Native methods for windows.
/// </summary>
static partial class WinNativeMethods
{
#if NET7_0_OR_GREATER
[LibraryImport("kernel32", SetLastError = true)]
public static partial IntPtr GlobalAlloc(AllocFlag uFlags, UIntPtr dwBytes);
//namespace NTwain.Native
//{
// /// <summary>
// /// Native methods for windows.
// /// </summary>
// static partial class WinNativeMethods
// {
//#if NET7_0_OR_GREATER
// [LibraryImport("kernel32", SetLastError = true)]
// public static partial IntPtr GlobalAlloc(AllocFlag uFlags, UIntPtr dwBytes);
[LibraryImport("kernel32", SetLastError = true)]
public static partial IntPtr GlobalFree(IntPtr hMem);
// [LibraryImport("kernel32", SetLastError = true)]
// public static partial IntPtr GlobalFree(IntPtr hMem);
[LibraryImport("kernel32", SetLastError = true)]
public static partial IntPtr GlobalLock(IntPtr handle);
// [LibraryImport("kernel32", SetLastError = true)]
// public static partial IntPtr GlobalLock(IntPtr handle);
[LibraryImport("kernel32", SetLastError = true)]
[return: MarshalAs(UnmanagedType.Bool)]
public static partial bool GlobalUnlock(IntPtr handle);
#else
[DllImport("kernel32", SetLastError = true)]
public static extern IntPtr GlobalAlloc(AllocFlag uFlags, UIntPtr dwBytes);
// [LibraryImport("kernel32", SetLastError = true)]
// [return: MarshalAs(UnmanagedType.Bool)]
// public static partial bool GlobalUnlock(IntPtr handle);
//#else
// [DllImport("kernel32", SetLastError = true)]
// public static extern IntPtr GlobalAlloc(AllocFlag uFlags, UIntPtr dwBytes);
[DllImport("kernel32", SetLastError = true)]
public static extern IntPtr GlobalFree(IntPtr hMem);
// [DllImport("kernel32", SetLastError = true)]
// public static extern IntPtr GlobalFree(IntPtr hMem);
[DllImport("kernel32", SetLastError = true)]
public static extern IntPtr GlobalLock(IntPtr handle);
// [DllImport("kernel32", SetLastError = true)]
// public static extern IntPtr GlobalLock(IntPtr handle);
[DllImport("kernel32", SetLastError = true)]
[return: MarshalAs(UnmanagedType.Bool)]
public static extern bool GlobalUnlock(IntPtr handle);
#endif
[Flags]
public enum AllocFlag : uint
{
/// <summary>
/// Allocates fixed memory. The return value is a pointer.
/// </summary>
GMEM_FIXED = 0,
/// <summary>
/// Allocates movable memory. Memory blocks are never moved in physical memory, but they can be moved within the default heap.
/// The return value is a handle to the memory object. To translate the handle into a pointer, use the GlobalLock function.
/// </summary>
GMEM_MOVEABLE = 2,
/// <summary>
/// Initializes memory contents to zero.
/// </summary>
GMEM_ZEROINIT = 0x40,
GPTR = GMEM_FIXED | GMEM_ZEROINIT,
GHND = GMEM_MOVEABLE | GMEM_ZEROINIT
}
// [DllImport("kernel32", SetLastError = true)]
// [return: MarshalAs(UnmanagedType.Bool)]
// public static extern bool GlobalUnlock(IntPtr handle);
//#endif
// [Flags]
// public enum PEEK_MESSAGE_REMOVE_TYPE : uint
// public enum AllocFlag : uint
// {
// PM_NOREMOVE = 0x00000000,
// PM_REMOVE = 0x00000001,
// PM_NOYIELD = 0x00000002,
// PM_QS_INPUT = 0x04070000,
// PM_QS_POSTMESSAGE = 0x00980000,
// PM_QS_PAINT = 0x00200000,
// PM_QS_SENDMESSAGE = 0x00400000,
// /// <summary>
// /// Allocates fixed memory. The return value is a pointer.
// /// </summary>
// GMEM_FIXED = 0,
// /// <summary>
// /// Allocates movable memory. Memory blocks are never moved in physical memory, but they can be moved within the default heap.
// /// The return value is a handle to the memory object. To translate the handle into a pointer, use the GlobalLock function.
// /// </summary>
// GMEM_MOVEABLE = 2,
// /// <summary>
// /// Initializes memory contents to zero.
// /// </summary>
// GMEM_ZEROINIT = 0x40,
// GPTR = GMEM_FIXED | GMEM_ZEROINIT,
// GHND = GMEM_MOVEABLE | GMEM_ZEROINIT
// }
//#if NET7_0_OR_GREATER
// [LibraryImport("USER32.dll")]
// public static partial int PeekMessageW(ref WIN_MESSAGE lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax, PEEK_MESSAGE_REMOVE_TYPE wRemoveMsg);
//// [Flags]
//// public enum PEEK_MESSAGE_REMOVE_TYPE : uint
//// {
//// PM_NOREMOVE = 0x00000000,
//// PM_REMOVE = 0x00000001,
//// PM_NOYIELD = 0x00000002,
//// PM_QS_INPUT = 0x04070000,
//// PM_QS_POSTMESSAGE = 0x00980000,
//// PM_QS_PAINT = 0x00200000,
//// PM_QS_SENDMESSAGE = 0x00400000,
//// }
// [LibraryImport("USER32.dll", SetLastError = true)]
// public static partial int GetMessageW(ref WIN_MESSAGE lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax);
////#if NET7_0_OR_GREATER
//// [LibraryImport("USER32.dll")]
//// public static partial int PeekMessageW(ref WIN_MESSAGE lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax, PEEK_MESSAGE_REMOVE_TYPE wRemoveMsg);
// [LibraryImport("USER32.dll")]
// public static partial int TranslateMessage(ref WIN_MESSAGE lpMsg);
//// [LibraryImport("USER32.dll", SetLastError = true)]
//// public static partial int GetMessageW(ref WIN_MESSAGE lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax);
// [LibraryImport("USER32.dll")]
// public static partial nint DispatchMessageW(ref WIN_MESSAGE lpMsg);
//#else
// [DllImport("USER32.dll")]
// public static extern int PeekMessageW(ref WIN_MESSAGE lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax, PEEK_MESSAGE_REMOVE_TYPE wRemoveMsg);
//// [LibraryImport("USER32.dll")]
//// public static partial int TranslateMessage(ref WIN_MESSAGE lpMsg);
// [DllImport("USER32.dll", SetLastError = true)]
// public static extern int GetMessageW(ref WIN_MESSAGE lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax);
//// [LibraryImport("USER32.dll")]
//// public static partial nint DispatchMessageW(ref WIN_MESSAGE lpMsg);
////#else
//// [DllImport("USER32.dll")]
//// public static extern int PeekMessageW(ref WIN_MESSAGE lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax, PEEK_MESSAGE_REMOVE_TYPE wRemoveMsg);
// [DllImport("USER32.dll")]
// public static extern int TranslateMessage(ref WIN_MESSAGE lpMsg);
//// [DllImport("USER32.dll", SetLastError = true)]
//// public static extern int GetMessageW(ref WIN_MESSAGE lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax);
// [DllImport("USER32.dll")]
// public static extern nint DispatchMessageW(ref WIN_MESSAGE lpMsg);
//#endif
}
}
//// [DllImport("USER32.dll")]
//// public static extern int TranslateMessage(ref WIN_MESSAGE lpMsg);
//// [DllImport("USER32.dll")]
//// public static extern nint DispatchMessageW(ref WIN_MESSAGE lpMsg);
////#endif
// }
//}

4
src/NTwain/NativeMethods.json Normal file
View File

@@ -0,0 +1,4 @@
{
"$schema": "https://aka.ms/CsWin32.schema.json",
"allowMarshaling": false
}

8
src/NTwain/NativeMethods.txt Normal file
View File

@@ -0,0 +1,8 @@
MSG
GlobalAlloc
GlobalFree
GlobalLock
GlobalUnlock
BITMAPINFOHEADER
BITMAPINFO
BITMAPFILEHEADER

27
src/NTwain/TwainAppSession.Memory.cs
View File

@@ -1,7 +1,9 @@
using NTwain.Data;
using NTwain.Native;
using System;
using System.Runtime.InteropServices;
using Windows.Win32;
using Windows.Win32.Foundation;
using Windows.Win32.System.Memory;
namespace NTwain
{
@@ -19,7 +21,10 @@ namespace NTwain
}
else if (TWPlatform.IsWindows)
{
return WinNativeMethods.GlobalAlloc(WinNativeMethods.AllocFlag.GHND, (UIntPtr)size);
#pragma warning disable CA1416 // Validate platform compatibility
return PInvoke.GlobalAlloc(GLOBAL_ALLOC_FLAGS.GHND, size);
#pragma warning restore CA1416 // Validate platform compatibility
//return WinNativeMethods.GlobalAlloc(WinNativeMethods.AllocFlag.GHND, (UIntPtr)size);
}
else if (TWPlatform.IsLinux)
{
@@ -45,7 +50,10 @@ namespace NTwain
}
else if (TWPlatform.IsWindows)
{
WinNativeMethods.GlobalFree(handle);
#pragma warning disable CA1416 // Validate platform compatibility
PInvoke.GlobalFree((HGLOBAL)handle);
#pragma warning restore CA1416 // Validate platform compatibility
//WinNativeMethods.GlobalFree(handle);
}
else if (TWPlatform.IsLinux)
{
@@ -71,7 +79,13 @@ namespace NTwain
}
else if (TWPlatform.IsWindows)
{
return WinNativeMethods.GlobalLock(handle);
unsafe
{
#pragma warning disable CA1416 // Validate platform compatibility
return (IntPtr)PInvoke.GlobalLock((HGLOBAL)handle);
#pragma warning restore CA1416 // Validate platform compatibility
}
//return WinNativeMethods.GlobalLock(handle);
}
else if (TWPlatform.IsLinux)
{
@@ -97,7 +111,10 @@ namespace NTwain
}
else if (TWPlatform.IsWindows)
{
WinNativeMethods.GlobalUnlock(handle);
#pragma warning disable CA1416 // Validate platform compatibility
PInvoke.GlobalUnlock((HGLOBAL)handle);
#pragma warning restore CA1416 // Validate platform compatibility
//WinNativeMethods.GlobalUnlock(handle);
}
else if (TWPlatform.IsLinux)
{

7
src/NTwain/TwainAppSession.Windows.cs
View File

@@ -7,6 +7,7 @@ using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using System.Windows.Interop;
using Windows.Win32.Foundation;
using MSG = NTwain.Data.MSG;
namespace NTwain
@@ -83,11 +84,11 @@ namespace NTwain
bool handled = false;
if (_state >= STATE.S5)
{
WIN_MESSAGE winMsg = new()
Windows.Win32.UI.WindowsAndMessaging.MSG winMsg = new()
{
hwnd = hWnd,
hwnd = (HWND)hWnd,
message = (uint)msg,
wParam = wParam,
wParam = TWPlatform.Is32bit ? new UIntPtr((uint)wParam.ToInt32()) : new UIntPtr((ulong)wParam.ToInt64()),
lParam = lParam
};
// no need to do another lock call when using marshal alloc