Updated entry name.

This commit is contained in:
soukoku
2014-04-19 21:02:44 -04:00
parent 1957d2af3c
commit 15779dbb15
2 changed files with 36 additions and 36 deletions

View File

@@ -9,7 +9,7 @@ namespace NTwain.Triplets
{ {
static partial class NativeMethods static partial class NativeMethods
{ {
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -18,7 +18,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
ref IntPtr data); ref IntPtr data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -27,7 +27,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
ref DataGroups data); ref DataGroups data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -36,7 +36,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWAudioInfo data); [In, Out]TWAudioInfo data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -45,7 +45,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWCapability data); [In, Out]TWCapability data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -54,7 +54,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWCustomDSData data); [In, Out]TWCustomDSData data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -63,7 +63,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWDeviceEvent data); [In, Out]TWDeviceEvent data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -72,7 +72,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWCallback data); [In, Out]TWCallback data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -81,7 +81,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWCallback2 data); [In, Out]TWCallback2 data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -90,7 +90,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWEntryPoint data); [In, Out]TWEntryPoint data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -99,7 +99,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWEvent data); [In, Out]TWEvent data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -108,7 +108,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWFileSystem data); [In, Out]TWFileSystem data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
IntPtr zero, IntPtr zero,
@@ -117,7 +117,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWIdentity data); [In, Out]TWIdentity data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -126,7 +126,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWPassThru data); [In, Out]TWPassThru data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -135,7 +135,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWPendingXfers data); [In, Out]TWPendingXfers data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -144,7 +144,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWSetupFileXfer data); [In, Out]TWSetupFileXfer data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -153,7 +153,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWSetupMemXfer data); [In, Out]TWSetupMemXfer data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -162,7 +162,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWStatusUtf8 data); [In, Out]TWStatusUtf8 data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -171,7 +171,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWUserInterface data); [In, Out]TWUserInterface data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -180,7 +180,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWCieColor data); [In, Out]TWCieColor data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -189,7 +189,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWExtImageInfo data); [In, Out]TWExtImageInfo data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -198,7 +198,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWFilter data); [In, Out]TWFilter data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -207,7 +207,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWGrayResponse data); [In, Out]TWGrayResponse data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -216,7 +216,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWImageInfo data); [In, Out]TWImageInfo data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -225,7 +225,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWImageLayout data); [In, Out]TWImageLayout data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -234,7 +234,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWImageMemXfer data); [In, Out]TWImageMemXfer data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -243,7 +243,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWJpegCompression data); [In, Out]TWJpegCompression data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -252,7 +252,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWPalette8 data); [In, Out]TWPalette8 data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -261,7 +261,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWRgbResponse data); [In, Out]TWRgbResponse data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,
@@ -270,7 +270,7 @@ namespace NTwain.Triplets
Message msg, Message msg,
[In, Out]TWStatus data); [In, Out]TWStatus data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "#1")] [DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux( public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin, [In, Out]TWIdentity origin,
[In, Out]TWIdentity destination, [In, Out]TWIdentity destination,

View File

@@ -236,7 +236,7 @@ namespace NTwain
/// <returns></returns> /// <returns></returns>
public ReturnCode OpenManager() public ReturnCode OpenManager()
{ {
ReturnCode rc = ReturnCode.Success; var rc = ReturnCode.Failure;
MessageLoop.Instance.Invoke(() => MessageLoop.Instance.Invoke(() =>
{ {
Debug.WriteLine(string.Format("Thread {0}: OpenManager.", Thread.CurrentThread.ManagedThreadId)); Debug.WriteLine(string.Format("Thread {0}: OpenManager.", Thread.CurrentThread.ManagedThreadId));
@@ -270,7 +270,7 @@ namespace NTwain
/// <returns></returns> /// <returns></returns>
public ReturnCode CloseManager() public ReturnCode CloseManager()
{ {
ReturnCode rc = ReturnCode.Success; ReturnCode rc = ReturnCode.Failure;
MessageLoop.Instance.Invoke(() => MessageLoop.Instance.Invoke(() =>
{ {
Debug.WriteLine(string.Format("Thread {0}: CloseManager.", Thread.CurrentThread.ManagedThreadId)); Debug.WriteLine(string.Format("Thread {0}: CloseManager.", Thread.CurrentThread.ManagedThreadId));
@@ -292,7 +292,7 @@ namespace NTwain
{ {
if (string.IsNullOrEmpty(sourceProductName)) { throw new ArgumentException(Resources.SourceRequired, "sourceProductName"); } if (string.IsNullOrEmpty(sourceProductName)) { throw new ArgumentException(Resources.SourceRequired, "sourceProductName"); }
ReturnCode rc = ReturnCode.Success; ReturnCode rc = ReturnCode.Failure;
MessageLoop.Instance.Invoke(() => MessageLoop.Instance.Invoke(() =>
{ {
Debug.WriteLine(string.Format("Thread {0}: OpenSource.", Thread.CurrentThread.ManagedThreadId)); Debug.WriteLine(string.Format("Thread {0}: OpenSource.", Thread.CurrentThread.ManagedThreadId));
@@ -314,7 +314,7 @@ namespace NTwain
/// <returns></returns> /// <returns></returns>
public ReturnCode CloseSource() public ReturnCode CloseSource()
{ {
ReturnCode rc = ReturnCode.Success; var rc = ReturnCode.Failure;
MessageLoop.Instance.Invoke(() => MessageLoop.Instance.Invoke(() =>
{ {
Debug.WriteLine(string.Format("Thread {0}: CloseSource.", Thread.CurrentThread.ManagedThreadId)); Debug.WriteLine(string.Format("Thread {0}: CloseSource.", Thread.CurrentThread.ManagedThreadId));
@@ -338,7 +338,7 @@ namespace NTwain
/// <exception cref="ArgumentNullException">context</exception> /// <exception cref="ArgumentNullException">context</exception>
public ReturnCode EnableSource(SourceEnableMode mode, bool modal, IntPtr windowHandle) public ReturnCode EnableSource(SourceEnableMode mode, bool modal, IntPtr windowHandle)
{ {
ReturnCode rc = ReturnCode.Success; var rc = ReturnCode.Failure;
MessageLoop.Instance.Invoke(() => MessageLoop.Instance.Invoke(() =>
{ {
@@ -392,7 +392,7 @@ namespace NTwain
/// <returns></returns> /// <returns></returns>
protected ReturnCode DisableSource() protected ReturnCode DisableSource()
{ {
ReturnCode rc = ReturnCode.Success; var rc = ReturnCode.Failure;
MessageLoop.Instance.Invoke(() => MessageLoop.Instance.Invoke(() =>
{ {