Minor internal changes.

This commit is contained in:
soukoku
2014-09-02 19:10:35 -04:00
parent 41d821a9d5
commit 88bd745883
11 changed files with 167 additions and 141 deletions

View File

@@ -6,9 +6,11 @@ namespace NTwain.Triplets
{
static partial class Dsm
{
internal const string LINUX_DSM_PATH = "/usr/local/lib/libtwaindsm.so";
static partial class NativeMethods
{
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -17,7 +19,7 @@ namespace NTwain.Triplets
Message msg,
ref IntPtr data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -26,7 +28,7 @@ namespace NTwain.Triplets
Message msg,
ref DataGroups data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -35,7 +37,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWAudioInfo data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -44,7 +46,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWCapability data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -53,7 +55,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWCustomDSData data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -62,7 +64,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWDeviceEvent data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -71,7 +73,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWCallback data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -80,7 +82,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWCallback2 data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -89,7 +91,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWEntryPoint data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -98,7 +100,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWEvent data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -107,7 +109,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWFileSystem data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
IntPtr zero,
@@ -116,7 +118,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWIdentity data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -125,7 +127,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWPassThru data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -134,7 +136,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWPendingXfers data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -143,7 +145,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWSetupFileXfer data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -152,7 +154,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWSetupMemXfer data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -161,7 +163,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWStatusUtf8 data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -170,7 +172,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWUserInterface data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -179,7 +181,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWCieColor data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -188,7 +190,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWExtImageInfo data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -197,7 +199,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWFilter data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -206,7 +208,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWGrayResponse data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -215,7 +217,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWImageInfo data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -224,7 +226,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWImageLayout data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -233,7 +235,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWImageMemXfer data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -242,7 +244,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWJpegCompression data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -251,7 +253,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWPalette8 data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -260,7 +262,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWRgbResponse data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,
@@ -269,7 +271,7 @@ namespace NTwain.Triplets
Message msg,
[In, Out]TWStatus data);
[DllImport("/usr/local/lib/libtwaindsm.so", EntryPoint = "DSM_Entry")]
[DllImport(LINUX_DSM_PATH, EntryPoint = "DSM_Entry")]
public static extern ReturnCode DsmLinux(
[In, Out]TWIdentity origin,
[In, Out]TWIdentity destination,