Some non-functional change updates.

This commit is contained in:
soukoku
2014-09-11 21:14:41 -04:00
parent 669de30345
commit 9415d5d43d
17 changed files with 172 additions and 140 deletions

View File

@@ -5,12 +5,11 @@ using System.Runtime.InteropServices;
namespace NTwain.Triplets
{
static partial class Dsm
{
internal const string LINUX_DSM_PATH = "/usr/local/lib/libtwaindsm.so";
{
static partial class NativeMethods
{
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -19,7 +18,7 @@ namespace NTwain.Triplets
Message msg,
ref IntPtr data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -28,7 +27,7 @@ namespace NTwain.Triplets
Message msg,
ref DataGroups data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -37,7 +36,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWAudioInfo data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -46,7 +45,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWCapability data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -55,7 +54,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWCustomDSData data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -64,7 +63,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWDeviceEvent data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -73,7 +72,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWCallback data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -82,7 +81,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWCallback2 data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -91,7 +90,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWEntryPoint data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -100,7 +99,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWEvent data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -109,7 +108,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWFileSystem data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
IntPtr zero,
@@ -118,7 +117,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWIdentity data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -127,7 +126,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWPassThru data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -136,7 +135,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWPendingXfers data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -145,7 +144,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWSetupFileXfer data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -154,7 +153,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWSetupMemXfer data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -163,7 +162,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWStatusUtf8 data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -172,7 +171,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWUserInterface data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -181,7 +180,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWCieColor data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -190,7 +189,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWExtImageInfo data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -199,7 +198,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWFilter data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -208,7 +207,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWGrayResponse data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -217,7 +216,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWImageInfo data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -226,7 +225,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWImageLayout data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -235,7 +234,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWImageMemXfer data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -244,7 +243,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWJpegCompression data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -253,7 +252,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWPalette8 data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -262,7 +261,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWRgbResponse data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -271,7 +270,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWStatus data);
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = DSM_ENTRY)]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,