lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-04-05 20:59:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed twain const and platform classes to shorter name.

Browse Source
This commit is contained in:
Eugene Wang 2023-04-09 15:31:28 -04:00
parent 63b10c85e0
commit a72e1ff1d0
47 changed files with 238 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/WinForm32/DsmLoader.cs
View File

@ -25,7 +25,7 @@ namespace WinFormSample
{ {
var dll = Path.Combine( var dll = Path.Combine(
Path.GetDirectoryName(Environment.ProcessPath ?? Assembly.GetExecutingAssembly().Location)!, Path.GetDirectoryName(Environment.ProcessPath ?? Assembly.GetExecutingAssembly().Location)!,
$@"runtimes\win-{(TwainPlatform.Is32bit ? "x86" : "x64")}\native\TWAINDSM.dll"); $@"runtimes\win-{(TWPlatform.Is32bit ? "x86" : "x64")}\native\TWAINDSM.dll");
__dllPtr = LoadLibraryW(dll); __dllPtr = LoadLibraryW(dll);
} }

27
samples/WinForm32/Form1.cs
View File

@ -10,6 +10,7 @@ using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.Versioning;
using System.Windows.Forms; using System.Windows.Forms;
namespace WinFormSample namespace WinFormSample
@ -23,9 +24,9 @@ namespace WinFormSample
{ {
InitializeComponent(); InitializeComponent();
var libVer = FileVersionInfo.GetVersionInfo(typeof(TwainAppSession).Assembly.Location).ProductVersion; var libVer = FileVersionInfo.GetVersionInfo(typeof(TwainAppSession).Assembly.Location).ProductVersion;
Text += $"{(TwainPlatform.Is32bit ? " 32bit" : " 64bit")} on NTwain {libVer}"; Text += $"{(TWPlatform.Is32bit ? " 32bit" : " 64bit")} on NTwain {libVer}";
TwainPlatform.PreferLegacyDSM = false; TWPlatform.PreferLegacyDSM = false;
twain = new TwainAppSession(new WinformMarshaller(this), Assembly.GetExecutingAssembly().Location); twain = new TwainAppSession(new WinformMarshaller(this), Assembly.GetExecutingAssembly().Location);
twain.StateChanged += Twain_StateChanged; twain.StateChanged += Twain_StateChanged;
@ -148,14 +149,18 @@ namespace WinFormSample
{ {
LoadCapInfoList(); LoadCapInfoList();
// never seen a driver support these but here it is // never seen a driver support these but here it is to test it
var sts = twain.GetCapLabel(CAP.ICAP_SUPPORTEDSIZES, out string? test); if (twain.GetCapLabel(CAP.ICAP_SUPPORTEDSIZES, out string? test).RC == TWRC.SUCCESS)
var sts2 = twain.GetCapHelp(CAP.ICAP_SUPPORTEDSIZES, out string? test2);
var sts3 = twain.GetCapLabelEnum(CAP.ICAP_SUPPORTEDSIZES, out IList<string>? test3);
if (sts.RC == TWRC.SUCCESS || sts2.RC == TWRC.SUCCESS || sts3.RC == TWRC.SUCCESS)
{ {
Debugger.Break(); Debug.WriteLine($"Supported sizes label from ds = {test}");
}
if (twain.GetCapHelp(CAP.ICAP_SUPPORTEDSIZES, out string? test2).RC == TWRC.SUCCESS)
{
Debug.WriteLine($"Supported sizes help from ds = {test2}");
}
if (twain.GetCapLabelEnum(CAP.ICAP_SUPPORTEDSIZES, out IList<string>? test3).RC == TWRC.SUCCESS && test3 != null)
{
Debug.WriteLine($"Supported sizes label enum from ds = {string.Join(Environment.NewLine, test3)}");
} }
} }
else else
@ -187,7 +192,9 @@ namespace WinFormSample
it.SubItems.Add(""); it.SubItems.Add("");
} }
it.SubItems.Add(extended.Contains(c).ToString()); it.SubItems.Add(extended.Contains(c).ToString());
it.SubItems.Add(twain.QueryCapSupport(c).ToString()); var supports = twain.QueryCapSupport(c);
it.SubItems.Add(supports.ToString());
if (!supports.HasFlag(TWQC.SET)) it.ForeColor = Color.Gray;
capListView.Items.Add(it); capListView.Items.Add(it);
} }
} }

16
src/NTwain/Data/TWAINH.cs
View File

@ -206,7 +206,7 @@ namespace NTwain.Data
} }
// If we're running on a Mac, take off the prefix 'byte'... // If we're running on a Mac, take off the prefix 'byte'...
if (a_blMayHavePrefix && TwainPlatform.IsMacOSX) if (a_blMayHavePrefix && TWPlatform.IsMacOSX)
{ {
sz = sz.Remove(0, 1); sz = sz.Remove(0, 1);
} }
@ -257,7 +257,7 @@ namespace NTwain.Data
{ {
a_sz = ""; a_sz = "";
} }
else if (a_blMayHavePrefix && TwainPlatform.IsMacOSX) else if (a_blMayHavePrefix && TWPlatform.IsMacOSX)
{ {
a_sz = (char)a_sz.Length + a_sz; a_sz = (char)a_sz.Length + a_sz;
} }
@ -391,7 +391,7 @@ namespace NTwain.Data
} }
// If we're running on a Mac, take off the prefix 'byte'... // If we're running on a Mac, take off the prefix 'byte'...
if (a_blMayHavePrefix && TwainPlatform.IsMacOSX) if (a_blMayHavePrefix && TWPlatform.IsMacOSX)
{ {
sz = sz.Remove(0, 1); sz = sz.Remove(0, 1);
} }
@ -442,7 +442,7 @@ namespace NTwain.Data
{ {
a_sz = ""; a_sz = "";
} }
else if (a_blMayHavePrefix && TwainPlatform.IsMacOSX) else if (a_blMayHavePrefix && TWPlatform.IsMacOSX)
{ {
a_sz = (char)a_sz.Length + a_sz; a_sz = (char)a_sz.Length + a_sz;
} }
@ -615,7 +615,7 @@ namespace NTwain.Data
} }
// If we're running on a Mac, take off the prefix 'byte'... // If we're running on a Mac, take off the prefix 'byte'...
if (a_blMayHavePrefix && TwainPlatform.IsMacOSX) if (a_blMayHavePrefix && TWPlatform.IsMacOSX)
{ {
sz = sz.Remove(0, 1); sz = sz.Remove(0, 1);
} }
@ -666,7 +666,7 @@ namespace NTwain.Data
{ {
a_sz = ""; a_sz = "";
} }
else if (a_blMayHavePrefix && TwainPlatform.IsMacOSX) else if (a_blMayHavePrefix && TWPlatform.IsMacOSX)
{ {
a_sz = (char)a_sz.Length + a_sz; a_sz = (char)a_sz.Length + a_sz;
} }
@ -919,7 +919,7 @@ namespace NTwain.Data
} }
// If we're running on a Mac, take off the prefix 'byte'... // If we're running on a Mac, take off the prefix 'byte'...
if (a_blMayHavePrefix && TwainPlatform.IsMacOSX) if (a_blMayHavePrefix && TWPlatform.IsMacOSX)
{ {
sz = sz.Remove(0, 1); sz = sz.Remove(0, 1);
} }
@ -970,7 +970,7 @@ namespace NTwain.Data
{ {
a_sz = ""; a_sz = "";
} }
else if (a_blMayHavePrefix && TwainPlatform.IsMacOSX) else if (a_blMayHavePrefix && TWPlatform.IsMacOSX)
{ {
a_sz = (char)a_sz.Length + a_sz; a_sz = (char)a_sz.Length + a_sz;
} }

48
src/NTwain/Data/TWAINH_EXTRAS.cs
View File

@ -11,9 +11,9 @@ namespace NTwain.Data
/// <summary> /// <summary>
/// Contains platform info for twain use. /// Contains platform info for twain use.
/// </summary> /// </summary>
public static class TwainPlatform public static class TWPlatform
{ {
static TwainPlatform() static TWPlatform()
{ {
Is32bit = IntPtr.Size == 4; Is32bit = IntPtr.Size == 4;
@ -78,7 +78,7 @@ namespace NTwain.Data
/// <summary> /// <summary>
/// Contains value that don't fit into enums nicely. /// Contains value that don't fit into enums nicely.
/// </summary> /// </summary>
public static class TwainConst public static class TWConst
{ {
/// <summary> /// <summary>
/// Don't care values... /// Don't care values...
@ -86,12 +86,6 @@ namespace NTwain.Data
public const byte TWON_DONTCARE8 = 0xff; public const byte TWON_DONTCARE8 = 0xff;
public const ushort TWON_DONTCARE16 = 0xffff; public const ushort TWON_DONTCARE16 = 0xffff;
public const uint TWON_DONTCARE32 = 0xffffffff; public const uint TWON_DONTCARE32 = 0xffffffff;
/// <summary>
/// We're departing from a strict translation of H so that
/// we can achieve a unified status return type.
/// </summary>
public const int STSCC = 0x10000; // get us past the custom space
} }
/// <summary> /// <summary>
@ -739,7 +733,7 @@ namespace NTwain.Data
public TW_CAPABILITY(CAP cap) public TW_CAPABILITY(CAP cap)
{ {
Cap = cap; Cap = cap;
ConType = (TWON)TwainConst.TWON_DONTCARE16; ConType = (TWON)TWConst.TWON_DONTCARE16;
} }
/// <summary> /// <summary>
@ -771,9 +765,9 @@ namespace NTwain.Data
/// <returns></returns> /// <returns></returns>
public uint DetermineBufferSize() public uint DetermineBufferSize()
{ {
if (Preferred != TwainConst.TWON_DONTCARE32) return Preferred; if (Preferred != TWConst.TWON_DONTCARE32) return Preferred;
if (MaxBufSize != TwainConst.TWON_DONTCARE32) return MaxBufSize; if (MaxBufSize != TWConst.TWON_DONTCARE32) return MaxBufSize;
if (MinBufSize != TwainConst.TWON_DONTCARE32) return MinBufSize; if (MinBufSize != TWConst.TWON_DONTCARE32) return MinBufSize;
// default to 16 kb if source doesn't really want to say what it needs // default to 16 kb if source doesn't really want to say what it needs
return 1024 * 16; return 1024 * 16;
} }
@ -789,13 +783,13 @@ namespace NTwain.Data
{ {
return new TW_IMAGEMEMXFER return new TW_IMAGEMEMXFER
{ {
BytesPerRow = TwainConst.TWON_DONTCARE32, BytesPerRow = TWConst.TWON_DONTCARE32,
BytesWritten = TwainConst.TWON_DONTCARE32, BytesWritten = TWConst.TWON_DONTCARE32,
Columns = TwainConst.TWON_DONTCARE32, Columns = TWConst.TWON_DONTCARE32,
Compression = TwainConst.TWON_DONTCARE16, Compression = TWConst.TWON_DONTCARE16,
Rows = TwainConst.TWON_DONTCARE32, Rows = TWConst.TWON_DONTCARE32,
XOffset = TwainConst.TWON_DONTCARE32, XOffset = TWConst.TWON_DONTCARE32,
YOffset = TwainConst.TWON_DONTCARE32, YOffset = TWConst.TWON_DONTCARE32,
}; };
} }
} }
@ -810,13 +804,13 @@ namespace NTwain.Data
{ {
return new TW_IMAGEMEMXFER_MACOSX return new TW_IMAGEMEMXFER_MACOSX
{ {
BytesPerRow = TwainConst.TWON_DONTCARE32, BytesPerRow = TWConst.TWON_DONTCARE32,
BytesWritten = TwainConst.TWON_DONTCARE32, BytesWritten = TWConst.TWON_DONTCARE32,
Columns = TwainConst.TWON_DONTCARE32, Columns = TWConst.TWON_DONTCARE32,
Compression = TwainConst.TWON_DONTCARE32, Compression = TWConst.TWON_DONTCARE32,
Rows = TwainConst.TWON_DONTCARE32, Rows = TWConst.TWON_DONTCARE32,
XOffset = TwainConst.TWON_DONTCARE32, XOffset = TWConst.TWON_DONTCARE32,
YOffset = TwainConst.TWON_DONTCARE32, YOffset = TWConst.TWON_DONTCARE32,
}; };
} }
} }

14
src/NTwain/Data/ValueReader.cs
View File

@ -60,7 +60,7 @@ namespace NTwain.Data
try try
{ {
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
type = (TWTY)(ushort)(uint)Marshal.ReadInt32(lockedPtr); type = (TWTY)(ushort)(uint)Marshal.ReadInt32(lockedPtr);
@ -102,7 +102,7 @@ namespace NTwain.Data
{ {
TWTY itemType; TWTY itemType;
// Mac has a level of indirection and a different structure (ick)... // Mac has a level of indirection and a different structure (ick)...
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
// Crack the container... // Crack the container...
var onevalue = MarshalTo<TW_ONEVALUE_MACOSX>(lockedPtr); var onevalue = MarshalTo<TW_ONEVALUE_MACOSX>(lockedPtr);
@ -144,7 +144,7 @@ namespace NTwain.Data
int count = 0; int count = 0;
// Mac has a level of indirection and a different structure (ick)... // Mac has a level of indirection and a different structure (ick)...
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
// Crack the container... // Crack the container...
var twenumerationmacosx = MarshalTo<TW_ENUMERATION_MACOSX>(lockedPtr); var twenumerationmacosx = MarshalTo<TW_ENUMERATION_MACOSX>(lockedPtr);
@ -214,7 +214,7 @@ namespace NTwain.Data
uint count; uint count;
// Mac has a level of indirection and a different structure (ick)... // Mac has a level of indirection and a different structure (ick)...
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
// Crack the container... // Crack the container...
var twarraymacosx = MarshalTo<TW_ARRAY_MACOSX>(lockedPtr); var twarraymacosx = MarshalTo<TW_ARRAY_MACOSX>(lockedPtr);
@ -263,7 +263,7 @@ namespace NTwain.Data
TW_RANGE_FIX32 twrangefix32 = default; TW_RANGE_FIX32 twrangefix32 = default;
// Mac has a level of indirection and a different structure (ick)... // Mac has a level of indirection and a different structure (ick)...
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
var twrangemacosx = MarshalTo<TW_RANGE_MACOSX>(lockedPtr); var twrangemacosx = MarshalTo<TW_RANGE_MACOSX>(lockedPtr);
var twrangefix32macosx = MarshalTo<TW_RANGE_FIX32_MACOSX>(lockedPtr); var twrangefix32macosx = MarshalTo<TW_RANGE_FIX32_MACOSX>(lockedPtr);
@ -365,7 +365,7 @@ namespace NTwain.Data
{ {
TWTY itemType; TWTY itemType;
// Mac has a level of indirection and a different structure (ick)... // Mac has a level of indirection and a different structure (ick)...
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
// Crack the container... // Crack the container...
var onevalue = MarshalTo<TW_ONEVALUE_MACOSX>(lockedPtr); var onevalue = MarshalTo<TW_ONEVALUE_MACOSX>(lockedPtr);
@ -424,7 +424,7 @@ namespace NTwain.Data
/// <summary> /// <summary>
/// Read the pointer content as a value specified by <see cref="TWTY"/>. /// Read the pointer content as a value specified by <see cref="TWTY"/>, except <see cref="TWTY.HANDLE"/>.
/// </summary> /// </summary>
/// <param name="intptr">A locked pointer to the data pointer. If data is array this is the 0th item.</param> /// <param name="intptr">A locked pointer to the data pointer. If data is array this is the 0th item.</param>
/// <param name="type">The twain type.</param> /// <param name="type">The twain type.</param>

22
src/NTwain/Data/ValueWriter.cs
View File

@ -59,7 +59,7 @@ namespace NTwain.Data
TWTY itemType = GetItemType<TValue>(); TWTY itemType = GetItemType<TValue>();
// Allocate the container (go for worst case, which is TW_STR255)... // Allocate the container (go for worst case, which is TW_STR255)...
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
twCap.hContainer = memMgr.Alloc((uint)(Marshal.SizeOf(default(TW_ONEVALUE_MACOSX)) + Marshal.SizeOf(default(TW_STR255)))); twCap.hContainer = memMgr.Alloc((uint)(Marshal.SizeOf(default(TW_ONEVALUE_MACOSX)) + Marshal.SizeOf(default(TW_STR255))));
lockedPtr = memMgr.Lock(twCap.hContainer); lockedPtr = memMgr.Lock(twCap.hContainer);
@ -114,7 +114,7 @@ namespace NTwain.Data
TWTY itemType = GetItemType<TValue>(); TWTY itemType = GetItemType<TValue>();
// Allocate the container (go for worst case, which is TW_STR255)... // Allocate the container (go for worst case, which is TW_STR255)...
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
// Allocate... // Allocate...
twCap.hContainer = memMgr.Alloc((uint)(Marshal.SizeOf(default(TW_ARRAY_MACOSX)) + ((values.Length + 1) * Marshal.SizeOf(default(TW_STR255))))); twCap.hContainer = memMgr.Alloc((uint)(Marshal.SizeOf(default(TW_ARRAY_MACOSX)) + ((values.Length + 1) * Marshal.SizeOf(default(TW_STR255)))));
@ -182,7 +182,7 @@ namespace NTwain.Data
TWTY itemType = GetItemType<TValue>(); TWTY itemType = GetItemType<TValue>();
// Allocate the container (go for worst case, which is TW_STR255)... // Allocate the container (go for worst case, which is TW_STR255)...
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
// Allocate... // Allocate...
twCap.hContainer = memMgr.Alloc((uint)(Marshal.SizeOf(default(TW_ENUMERATION_MACOSX)) + ((value.Items.Length + 1) * Marshal.SizeOf(default(TW_STR255))))); twCap.hContainer = memMgr.Alloc((uint)(Marshal.SizeOf(default(TW_ENUMERATION_MACOSX)) + ((value.Items.Length + 1) * Marshal.SizeOf(default(TW_STR255)))));
@ -270,7 +270,7 @@ namespace NTwain.Data
TWTY itemType = GetItemType<TValue>(); TWTY itemType = GetItemType<TValue>();
// Allocate the container (go for worst case, which is TW_STR255)... // Allocate the container (go for worst case, which is TW_STR255)...
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
// Allocate... // Allocate...
twCap.hContainer = memMgr.Alloc((uint)(Marshal.SizeOf(default(TW_RANGE_MACOSX)))); twCap.hContainer = memMgr.Alloc((uint)(Marshal.SizeOf(default(TW_RANGE_MACOSX))));
@ -314,7 +314,7 @@ namespace NTwain.Data
default: default:
throw new NotSupportedException($"{itemType} is not supported for range."); throw new NotSupportedException($"{itemType} is not supported for range.");
case TWTY.INT8: case TWTY.INT8:
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
twrangemacosx.ItemType = (uint)itemType; twrangemacosx.ItemType = (uint)itemType;
twrangemacosx.MinValue = (uint)Convert.ToSByte(value.MinValue); twrangemacosx.MinValue = (uint)Convert.ToSByte(value.MinValue);
@ -346,7 +346,7 @@ namespace NTwain.Data
//} //}
break; break;
case TWTY.UINT8: case TWTY.UINT8:
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
twrangemacosx.ItemType = (uint)itemType; twrangemacosx.ItemType = (uint)itemType;
twrangemacosx.MinValue = Convert.ToByte(value.MinValue); twrangemacosx.MinValue = Convert.ToByte(value.MinValue);
@ -378,7 +378,7 @@ namespace NTwain.Data
//} //}
break; break;
case TWTY.INT16: case TWTY.INT16:
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
twrangemacosx.ItemType = (uint)itemType; twrangemacosx.ItemType = (uint)itemType;
twrangemacosx.MinValue = (uint)Convert.ToInt16(value.MinValue); twrangemacosx.MinValue = (uint)Convert.ToInt16(value.MinValue);
@ -411,7 +411,7 @@ namespace NTwain.Data
break; break;
case TWTY.BOOL: case TWTY.BOOL:
case TWTY.UINT16: case TWTY.UINT16:
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
twrangemacosx.ItemType = (uint)itemType; twrangemacosx.ItemType = (uint)itemType;
twrangemacosx.MinValue = Convert.ToUInt16(value.MinValue); twrangemacosx.MinValue = Convert.ToUInt16(value.MinValue);
@ -443,7 +443,7 @@ namespace NTwain.Data
//} //}
break; break;
case TWTY.INT32: case TWTY.INT32:
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
twrangemacosx.ItemType = (uint)itemType; twrangemacosx.ItemType = (uint)itemType;
twrangemacosx.MinValue = (uint)Convert.ToInt32(value.MinValue); twrangemacosx.MinValue = (uint)Convert.ToInt32(value.MinValue);
@ -475,7 +475,7 @@ namespace NTwain.Data
//} //}
break; break;
case TWTY.UINT32: case TWTY.UINT32:
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
twrangemacosx.ItemType = (uint)itemType; twrangemacosx.ItemType = (uint)itemType;
twrangemacosx.MinValue = Convert.ToUInt32(value.MinValue); twrangemacosx.MinValue = Convert.ToUInt32(value.MinValue);
@ -512,7 +512,7 @@ namespace NTwain.Data
double step = Convert.ToDouble(value.StepSize); double step = Convert.ToDouble(value.StepSize);
double def = Convert.ToDouble(value.DefaultValue); double def = Convert.ToDouble(value.DefaultValue);
double current = Convert.ToDouble(value.CurrentValue); double current = Convert.ToDouble(value.CurrentValue);
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
TW_RANGE_FIX32_MACOSX twrangefix32macosx = default; TW_RANGE_FIX32_MACOSX twrangefix32macosx = default;
twrangefix32macosx.ItemType = (uint)itemType; twrangefix32macosx.ItemType = (uint)itemType;

8
src/NTwain/Triplets/AudioDATs/AudioFileXfer.cs
View File

@ -15,9 +15,9 @@ namespace NTwain.Triplets.AudioDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.AUDIO, DAT.AUDIOFILEXFER, msg, IntPtr.Zero); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.AUDIO, DAT.AUDIOFILEXFER, msg, IntPtr.Zero);
} }
@ -26,11 +26,11 @@ namespace NTwain.Triplets.AudioDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.AUDIO, DAT.AUDIOFILEXFER, msg, IntPtr.Zero); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.AUDIO, DAT.AUDIOFILEXFER, msg, IntPtr.Zero);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.AUDIO, DAT.AUDIOFILEXFER, msg, IntPtr.Zero); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.AUDIO, DAT.AUDIOFILEXFER, msg, IntPtr.Zero);
} }

8
src/NTwain/Triplets/AudioDATs/AudioInfo.cs
View File

@ -15,9 +15,9 @@ namespace NTwain.Triplets.AudioDATs
{ {
data = default; data = default;
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.AUDIO, DAT.AUDIOINFO, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.AUDIO, DAT.AUDIOINFO, msg, ref data);
} }
@ -26,11 +26,11 @@ namespace NTwain.Triplets.AudioDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.AUDIO, DAT.AUDIOINFO, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.AUDIO, DAT.AUDIOINFO, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.AUDIO, DAT.AUDIOINFO, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.AUDIO, DAT.AUDIOINFO, msg, ref data);
} }

8
src/NTwain/Triplets/AudioDATs/AudioNativeXfer.cs
View File

@ -16,9 +16,9 @@ namespace NTwain.Triplets.AudioDATs
{ {
data = default; data = default;
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.AUDIO, DAT.AUDIONATIVEXFER, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.AUDIO, DAT.AUDIONATIVEXFER, msg, ref data);
} }
@ -27,11 +27,11 @@ namespace NTwain.Triplets.AudioDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.AUDIO, DAT.AUDIONATIVEXFER, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.AUDIO, DAT.AUDIONATIVEXFER, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.AUDIO, DAT.AUDIONATIVEXFER, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.AUDIO, DAT.AUDIONATIVEXFER, msg, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/Callback.cs
View File

@ -11,9 +11,9 @@ namespace NTwain.Triplets.ControlDATs
public TWRC RegisterCallback(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_CALLBACK data) public TWRC RegisterCallback(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_CALLBACK data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CALLBACK, MSG.REGISTER_CALLBACK, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CALLBACK, MSG.REGISTER_CALLBACK, ref data);
} }
@ -22,11 +22,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CALLBACK, MSG.REGISTER_CALLBACK, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CALLBACK, MSG.REGISTER_CALLBACK, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.CALLBACK, MSG.REGISTER_CALLBACK, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.CALLBACK, MSG.REGISTER_CALLBACK, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/Callback2.cs
View File

@ -11,9 +11,9 @@ namespace NTwain.Triplets.ControlDATs
public TWRC RegisterCallback(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_CALLBACK2 data) public TWRC RegisterCallback(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_CALLBACK2 data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CALLBACK2, MSG.REGISTER_CALLBACK, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CALLBACK2, MSG.REGISTER_CALLBACK, ref data);
} }
@ -22,11 +22,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CALLBACK2, MSG.REGISTER_CALLBACK, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CALLBACK2, MSG.REGISTER_CALLBACK, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.CALLBACK2, MSG.REGISTER_CALLBACK, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.CALLBACK2, MSG.REGISTER_CALLBACK, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/Capability.cs
View File

@ -34,9 +34,9 @@ namespace NTwain.Triplets.ControlDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_CAPABILITY data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_CAPABILITY data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CAPABILITY, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CAPABILITY, msg, ref data);
} }
@ -45,11 +45,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CAPABILITY, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CAPABILITY, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.CAPABILITY, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.CAPABILITY, msg, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/CapabilityCustom.cs
View File

@ -32,9 +32,9 @@ namespace NTwain.Triplets.ControlDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ushort dat, MSG msg, ref TW_CAPABILITY data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ushort dat, MSG msg, ref TW_CAPABILITY data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, (DAT)dat, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, (DAT)dat, msg, ref data);
} }
@ -43,11 +43,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, (DAT)dat, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, (DAT)dat, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, (DAT)dat, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, (DAT)dat, msg, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/CustomDsData.cs
View File

@ -20,9 +20,9 @@ namespace NTwain.Triplets.ControlDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_CUSTOMDSDATA data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_CUSTOMDSDATA data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CUSTOMDSDATA, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CUSTOMDSDATA, msg, ref data);
} }
@ -31,11 +31,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CUSTOMDSDATA, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.CUSTOMDSDATA, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.CUSTOMDSDATA, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.CUSTOMDSDATA, msg, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/DeviceEvent.cs
View File

@ -12,9 +12,9 @@ namespace NTwain.Triplets.ControlDATs
{ {
data = default; data = default;
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.DEVICEEVENT, MSG.GET, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.DEVICEEVENT, MSG.GET, ref data);
} }
@ -23,11 +23,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.DEVICEEVENT, MSG.GET, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.DEVICEEVENT, MSG.GET, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.DEVICEEVENT, MSG.GET, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.DEVICEEVENT, MSG.GET, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/EntryPoint.cs
View File

@ -42,9 +42,9 @@ namespace NTwain.Triplets.ControlDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, MSG msg, ref TW_ENTRYPOINT entry) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, MSG msg, ref TW_ENTRYPOINT entry)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.ENTRYPOINT, msg, ref entry); rc = WinLegacyDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.ENTRYPOINT, msg, ref entry);
} }
@ -57,10 +57,10 @@ namespace NTwain.Triplets.ControlDATs
//{ //{
// var app = Session._appIdentity; // var app = Session._appIdentity;
//} //}
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, IntPtr.Zero, DG.CONTROL, DAT.ENTRYPOINT, msg, ref entry); rc = OSXLegacyDSM.DSM_Entry(ref app2, IntPtr.Zero, DG.CONTROL, DAT.ENTRYPOINT, msg, ref entry);
} }

8
src/NTwain/Triplets/ControlDATs/Event.cs
View File

@ -11,9 +11,9 @@ namespace NTwain.Triplets.ControlDATs
public TWRC ProcessEvent(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_EVENT data) public TWRC ProcessEvent(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_EVENT data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.EVENT, MSG.PROCESSEVENT, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.EVENT, MSG.PROCESSEVENT, ref data);
} }
@ -22,11 +22,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.EVENT, MSG.PROCESSEVENT, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.EVENT, MSG.PROCESSEVENT, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.EVENT, MSG.PROCESSEVENT, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.EVENT, MSG.PROCESSEVENT, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/FileSystem.cs
View File

@ -34,9 +34,9 @@ namespace NTwain.Triplets.ControlDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_FILESYSTEM data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_FILESYSTEM data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.FILESYSTEM, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.FILESYSTEM, msg, ref data);
} }
@ -45,11 +45,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.FILESYSTEM, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.FILESYSTEM, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.FILESYSTEM, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.FILESYSTEM, msg, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/Identity.cs
View File

@ -73,9 +73,9 @@ namespace NTwain.Triplets.ControlDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, MSG msg, ref TW_IDENTITY_LEGACY ds) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, MSG msg, ref TW_IDENTITY_LEGACY ds)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.IDENTITY, msg, ref ds); rc = WinLegacyDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.IDENTITY, msg, ref ds);
} }
@ -84,11 +84,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.IDENTITY, msg, ref ds); rc = WinNewDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.IDENTITY, msg, ref ds);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX osxds = ds; TW_IDENTITY_MACOSX osxds = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, IntPtr.Zero, DG.CONTROL, DAT.IDENTITY, msg, ref osxds); rc = OSXLegacyDSM.DSM_Entry(ref app2, IntPtr.Zero, DG.CONTROL, DAT.IDENTITY, msg, ref osxds);
} }

8
src/NTwain/Triplets/ControlDATs/Metrics.cs
View File

@ -15,9 +15,9 @@ namespace NTwain.Triplets.ControlDATs
data.SizeOf = (uint)Marshal.SizeOf<TW_METRICS>(); data.SizeOf = (uint)Marshal.SizeOf<TW_METRICS>();
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.METRICS, MSG.GET, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.METRICS, MSG.GET, ref data);
} }
@ -26,11 +26,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.METRICS, MSG.GET, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.METRICS, MSG.GET, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.METRICS, MSG.GET, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.METRICS, MSG.GET, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/Parent.cs
View File

@ -30,9 +30,9 @@ namespace NTwain.Triplets.ControlDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, MSG msg, IntPtr hwnd) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, MSG msg, IntPtr hwnd)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.PARENT, msg, ref hwnd); rc = WinLegacyDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.PARENT, msg, ref hwnd);
} }
@ -47,10 +47,10 @@ namespace NTwain.Triplets.ControlDATs
// rc = NativeMethods.LinuxDsmEntryParent(ref app, IntPtr.Zero, DG.CONTROL, DAT.PARENT, msg, ref hwnd); // rc = NativeMethods.LinuxDsmEntryParent(ref app, IntPtr.Zero, DG.CONTROL, DAT.PARENT, msg, ref hwnd);
// if (rc == TWRC.SUCCESS) Session._appIdentity = app; // if (rc == TWRC.SUCCESS) Session._appIdentity = app;
//} //}
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, IntPtr.Zero, DG.CONTROL, DAT.PARENT, msg, hwnd); rc = OSXLegacyDSM.DSM_Entry(ref app2, IntPtr.Zero, DG.CONTROL, DAT.PARENT, msg, hwnd);
} }

8
src/NTwain/Triplets/ControlDATs/Passthru.cs
View File

@ -11,9 +11,9 @@ namespace NTwain.Triplets.ControlDATs
public TWRC PassThrough(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_PASSTHRU data) public TWRC PassThrough(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_PASSTHRU data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.PASSTHRU, MSG.PASSTHRU, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.PASSTHRU, MSG.PASSTHRU, ref data);
} }
@ -22,11 +22,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.PASSTHRU, MSG.PASSTHRU, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.PASSTHRU, MSG.PASSTHRU, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.PASSTHRU, MSG.PASSTHRU, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.PASSTHRU, MSG.PASSTHRU, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/PendingXfers.cs
View File

@ -21,9 +21,9 @@ namespace NTwain.Triplets.ControlDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_PENDINGXFERS data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_PENDINGXFERS data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.PENDINGXFERS, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.PENDINGXFERS, msg, ref data);
} }
@ -32,11 +32,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.PENDINGXFERS, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.PENDINGXFERS, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.PENDINGXFERS, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.PENDINGXFERS, msg, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/SetupFileXfer.cs
View File

@ -30,9 +30,9 @@ namespace NTwain.Triplets.ControlDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_SETUPFILEXFER data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_SETUPFILEXFER data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.SETUPFILEXFER, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.SETUPFILEXFER, msg, ref data);
} }
@ -41,11 +41,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.SETUPFILEXFER, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.SETUPFILEXFER, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.SETUPFILEXFER, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.SETUPFILEXFER, msg, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/SetupMemXfer.cs
View File

@ -12,9 +12,9 @@ namespace NTwain.Triplets.ControlDATs
{ {
data = default; data = default;
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.SETUPMEMXFER, MSG.GET, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.SETUPMEMXFER, MSG.GET, ref data);
} }
@ -23,11 +23,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.SETUPMEMXFER, MSG.GET, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.SETUPMEMXFER, MSG.GET, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.SETUPMEMXFER, MSG.GET, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.SETUPMEMXFER, MSG.GET, ref data);
} }

16
src/NTwain/Triplets/ControlDATs/Status.cs
View File

@ -13,9 +13,9 @@ namespace NTwain.Triplets.ControlDATs
{ {
status = default; status = default;
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.STATUS, MSG.GET, ref status); rc = WinLegacyDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.STATUS, MSG.GET, ref status);
} }
@ -24,10 +24,10 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.STATUS, MSG.GET, ref status); rc = WinNewDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.STATUS, MSG.GET, ref status);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, IntPtr.Zero, DG.CONTROL, DAT.STATUS, MSG.GET, ref status); rc = OSXLegacyDSM.DSM_Entry(ref app2, IntPtr.Zero, DG.CONTROL, DAT.STATUS, MSG.GET, ref status);
} }
@ -43,9 +43,9 @@ namespace NTwain.Triplets.ControlDATs
{ {
status = default; status = default;
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.STATUS, MSG.GET, ref status); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.STATUS, MSG.GET, ref status);
} }
@ -54,11 +54,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.STATUS, MSG.GET, ref status); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.STATUS, MSG.GET, ref status);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX osxds = ds; TW_IDENTITY_MACOSX osxds = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref osxds, DG.CONTROL, DAT.STATUS, MSG.GET, ref status); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref osxds, DG.CONTROL, DAT.STATUS, MSG.GET, ref status);
} }

8
src/NTwain/Triplets/ControlDATs/StatusUtf8.cs
View File

@ -23,9 +23,9 @@ namespace NTwain.Triplets.ControlDATs
{ {
extendedStatus = new TW_STATUSUTF8 { Status = status }; extendedStatus = new TW_STATUSUTF8 { Status = status };
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.STATUSUTF8, MSG.GET, ref extendedStatus); rc = WinLegacyDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.STATUSUTF8, MSG.GET, ref extendedStatus);
} }
@ -34,10 +34,10 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.STATUSUTF8, MSG.GET, ref extendedStatus); rc = WinNewDSM.DSM_Entry(ref app, IntPtr.Zero, DG.CONTROL, DAT.STATUSUTF8, MSG.GET, ref extendedStatus);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, IntPtr.Zero, DG.CONTROL, DAT.STATUSUTF8, MSG.GET, ref extendedStatus); rc = OSXLegacyDSM.DSM_Entry(ref app2, IntPtr.Zero, DG.CONTROL, DAT.STATUSUTF8, MSG.GET, ref extendedStatus);
} }

8
src/NTwain/Triplets/ControlDATs/TwainDirect.cs
View File

@ -14,9 +14,9 @@ namespace NTwain.Triplets.ControlDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_TWAINDIRECT data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_TWAINDIRECT data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.CIECOLOR, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.CIECOLOR, msg, ref data);
} }
@ -25,11 +25,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.CIECOLOR, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.CIECOLOR, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.CIECOLOR, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.CIECOLOR, msg, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/UserInterface.cs
View File

@ -20,9 +20,9 @@ namespace NTwain.Triplets.ControlDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_USERINTERFACE data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_USERINTERFACE data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.USERINTERFACE, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.USERINTERFACE, msg, ref data);
} }
@ -31,11 +31,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.USERINTERFACE, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.USERINTERFACE, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.USERINTERFACE, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.USERINTERFACE, msg, ref data);
} }

8
src/NTwain/Triplets/ControlDATs/XferGroup.cs
View File

@ -22,9 +22,9 @@ namespace NTwain.Triplets.ControlDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref DG data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref DG data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.XFERGROUP, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.XFERGROUP, msg, ref data);
} }
@ -33,11 +33,11 @@ namespace NTwain.Triplets.ControlDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.XFERGROUP, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.CONTROL, DAT.XFERGROUP, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.XFERGROUP, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.XFERGROUP, msg, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/CieColor.cs
View File

@ -15,9 +15,9 @@ namespace NTwain.Triplets.ImageDATs
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
data = default; data = default;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.CIECOLOR, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.CIECOLOR, msg, ref data);
} }
@ -26,11 +26,11 @@ namespace NTwain.Triplets.ImageDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.CIECOLOR, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.CIECOLOR, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.CIECOLOR, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.CIECOLOR, msg, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/ExtImageInfo.cs
View File

@ -11,9 +11,9 @@ namespace NTwain.Triplets.ImageDATs
public TWRC Get(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_EXTIMAGEINFO data) public TWRC Get(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_EXTIMAGEINFO data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.EXTIMAGEINFO, MSG.GET, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.EXTIMAGEINFO, MSG.GET, ref data);
} }
@ -22,11 +22,11 @@ namespace NTwain.Triplets.ImageDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.EXTIMAGEINFO, MSG.GET, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.EXTIMAGEINFO, MSG.GET, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.EXTIMAGEINFO, MSG.GET, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.EXTIMAGEINFO, MSG.GET, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/Filter.cs
View File

@ -29,9 +29,9 @@ namespace NTwain.Triplets.ImageDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_FILTER data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_FILTER data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.FILTER, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.FILTER, msg, ref data);
} }
@ -40,11 +40,11 @@ namespace NTwain.Triplets.ImageDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.FILTER, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.FILTER, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.FILTER, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.FILTER, msg, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/GrayResponse.cs
View File

@ -19,9 +19,9 @@ namespace NTwain.Triplets.ImageDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_GRAYRESPONSE data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_GRAYRESPONSE data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.GRAYRESPONSE, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.GRAYRESPONSE, msg, ref data);
} }
@ -30,11 +30,11 @@ namespace NTwain.Triplets.ImageDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.GRAYRESPONSE, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.GRAYRESPONSE, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.GRAYRESPONSE, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.GRAYRESPONSE, msg, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/IccProfile.cs
View File

@ -15,9 +15,9 @@ namespace NTwain.Triplets.ImageDATs
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
data = default; data = default;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.ICCPROFILE, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.ICCPROFILE, msg, ref data);
} }
@ -26,11 +26,11 @@ namespace NTwain.Triplets.ImageDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.ICCPROFILE, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.ICCPROFILE, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.ICCPROFILE, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.ICCPROFILE, msg, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/ImageFileXfer.cs
View File

@ -15,9 +15,9 @@ namespace NTwain.Triplets.ImageDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGEFILEXFER, msg, IntPtr.Zero); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGEFILEXFER, msg, IntPtr.Zero);
} }
@ -26,11 +26,11 @@ namespace NTwain.Triplets.ImageDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGEFILEXFER, msg, IntPtr.Zero); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGEFILEXFER, msg, IntPtr.Zero);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGEFILEXFER, msg, IntPtr.Zero); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGEFILEXFER, msg, IntPtr.Zero);
} }

8
src/NTwain/Triplets/ImageDATs/ImageInfo.cs
View File

@ -15,9 +15,9 @@ namespace NTwain.Triplets.ImageDATs
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
data = default; data = default;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGEINFO, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGEINFO, msg, ref data);
} }
@ -26,11 +26,11 @@ namespace NTwain.Triplets.ImageDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGEINFO, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGEINFO, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGEINFO, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGEINFO, msg, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/ImageLayout.cs
View File

@ -29,9 +29,9 @@ namespace NTwain.Triplets.ImageDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_IMAGELAYOUT data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_IMAGELAYOUT data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGELAYOUT, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGELAYOUT, msg, ref data);
} }
@ -40,11 +40,11 @@ namespace NTwain.Triplets.ImageDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGELAYOUT, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGELAYOUT, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGELAYOUT, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGELAYOUT, msg, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/ImageMemFileXfer.cs
View File

@ -11,9 +11,9 @@ namespace NTwain.Triplets.ImageDATs
public TWRC Get(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_IMAGEMEMXFER data) public TWRC Get(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_IMAGEMEMXFER data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGEMEMFILEXFER, MSG.GET, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGEMEMFILEXFER, MSG.GET, ref data);
} }
@ -29,11 +29,11 @@ namespace NTwain.Triplets.ImageDATs
public TWRC Get(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_IMAGEMEMXFER_MACOSX data) public TWRC Get(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_IMAGEMEMXFER_MACOSX data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGEMEMXFER, MSG.GET, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGEMEMXFER, MSG.GET, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/ImageMemXfer.cs
View File

@ -11,9 +11,9 @@ namespace NTwain.Triplets.ImageDATs
public TWRC Get(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_IMAGEMEMXFER data) public TWRC Get(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_IMAGEMEMXFER data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGEMEMXFER, MSG.GET, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGEMEMXFER, MSG.GET, ref data);
} }
@ -28,11 +28,11 @@ namespace NTwain.Triplets.ImageDATs
public TWRC Get(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_IMAGEMEMXFER_MACOSX data) public TWRC Get(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, ref TW_IMAGEMEMXFER_MACOSX data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGEMEMXFER, MSG.GET, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGEMEMXFER, MSG.GET, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/ImageNativeXfer.cs
View File

@ -16,9 +16,9 @@ namespace NTwain.Triplets.ImageDATs
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
data = IntPtr.Zero; data = IntPtr.Zero;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGENATIVEXFER, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGENATIVEXFER, msg, ref data);
} }
@ -27,11 +27,11 @@ namespace NTwain.Triplets.ImageDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGENATIVEXFER, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.IMAGENATIVEXFER, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGENATIVEXFER, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGENATIVEXFER, msg, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/JpegCompression.cs
View File

@ -29,9 +29,9 @@ namespace NTwain.Triplets.ImageDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_JPEGCOMPRESSION data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_JPEGCOMPRESSION data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.JPEGCOMPRESSION, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.JPEGCOMPRESSION, msg, ref data);
} }
@ -40,11 +40,11 @@ namespace NTwain.Triplets.ImageDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.JPEGCOMPRESSION, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.JPEGCOMPRESSION, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.JPEGCOMPRESSION, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.JPEGCOMPRESSION, msg, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/Palette8.cs
View File

@ -29,9 +29,9 @@ namespace NTwain.Triplets.ImageDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_PALETTE8 data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_PALETTE8 data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.PALETTE8, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.PALETTE8, msg, ref data);
} }
@ -40,11 +40,11 @@ namespace NTwain.Triplets.ImageDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.PALETTE8, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.PALETTE8, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.PALETTE8, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.PALETTE8, msg, ref data);
} }

8
src/NTwain/Triplets/ImageDATs/RgbResponse.cs
View File

@ -19,9 +19,9 @@ namespace NTwain.Triplets.ImageDATs
static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_RGBRESPONSE data) static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg, ref TW_RGBRESPONSE data)
{ {
var rc = TWRC.FAILURE; var rc = TWRC.FAILURE;
if (TwainPlatform.IsWindows) if (TWPlatform.IsWindows)
{ {
if (TwainPlatform.Is32bit && TwainPlatform.PreferLegacyDSM) if (TWPlatform.Is32bit && TWPlatform.PreferLegacyDSM)
{ {
rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.RGBRESPONSE, msg, ref data); rc = WinLegacyDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.RGBRESPONSE, msg, ref data);
} }
@ -30,11 +30,11 @@ namespace NTwain.Triplets.ImageDATs
rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.RGBRESPONSE, msg, ref data); rc = WinNewDSM.DSM_Entry(ref app, ref ds, DG.IMAGE, DAT.RGBRESPONSE, msg, ref data);
} }
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
TW_IDENTITY_MACOSX app2 = app; TW_IDENTITY_MACOSX app2 = app;
TW_IDENTITY_MACOSX ds2 = ds; TW_IDENTITY_MACOSX ds2 = ds;
if (TwainPlatform.PreferLegacyDSM) if (TWPlatform.PreferLegacyDSM)
{ {
rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.RGBRESPONSE, msg, ref data); rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.RGBRESPONSE, msg, ref data);
} }

2
src/NTwain/TwainAppSession.Callbacks.cs
View File

@ -39,7 +39,7 @@ namespace NTwain
{ {
IntPtr cbPtr = IntPtr.Zero; IntPtr cbPtr = IntPtr.Zero;
if (TwainPlatform.IsMacOSX) if (TWPlatform.IsMacOSX)
{ {
cbPtr = Marshal.GetFunctionPointerForDelegate(_osxCallbackDelegate); cbPtr = Marshal.GetFunctionPointerForDelegate(_osxCallbackDelegate);
} }

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

@ -17,15 +17,15 @@ namespace NTwain
{ {
return _entryPoint.DSM_MemAllocate(size); return _entryPoint.DSM_MemAllocate(size);
} }
else if (TwainPlatform.IsWindows) else if (TWPlatform.IsWindows)
{ {
return NativeMemoryMethods.WinGlobalAlloc(NativeMemoryMethods.AllocFlag.GHND, (UIntPtr)size); return NativeMemoryMethods.WinGlobalAlloc(NativeMemoryMethods.AllocFlag.GHND, (UIntPtr)size);
} }
else if (TwainPlatform.IsLinux) else if (TWPlatform.IsLinux)
{ {
return Marshal.AllocHGlobal((int)size); return Marshal.AllocHGlobal((int)size);
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
return Marshal.AllocHGlobal((int)size); return Marshal.AllocHGlobal((int)size);
} }
@ -43,15 +43,15 @@ namespace NTwain
{ {
_entryPoint.DSM_MemFree(handle); _entryPoint.DSM_MemFree(handle);
} }
else if (TwainPlatform.IsWindows) else if (TWPlatform.IsWindows)
{ {
NativeMemoryMethods.WinGlobalFree(handle); NativeMemoryMethods.WinGlobalFree(handle);
} }
else if (TwainPlatform.IsLinux) else if (TWPlatform.IsLinux)
{ {
Marshal.FreeHGlobal(handle); Marshal.FreeHGlobal(handle);
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
Marshal.FreeHGlobal(handle); Marshal.FreeHGlobal(handle);
} }
@ -69,15 +69,15 @@ namespace NTwain
{ {
return _entryPoint.DSM_MemLock(handle); return _entryPoint.DSM_MemLock(handle);
} }
else if (TwainPlatform.IsWindows) else if (TWPlatform.IsWindows)
{ {
return NativeMemoryMethods.WinGlobalLock(handle); return NativeMemoryMethods.WinGlobalLock(handle);
} }
else if (TwainPlatform.IsLinux) else if (TWPlatform.IsLinux)
{ {
return handle; return handle;
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
return handle; return handle;
} }
@ -95,14 +95,14 @@ namespace NTwain
{ {
_entryPoint.DSM_MemUnlock(handle); _entryPoint.DSM_MemUnlock(handle);
} }
else if (TwainPlatform.IsWindows) else if (TWPlatform.IsWindows)
{ {
NativeMemoryMethods.WinGlobalUnlock(handle); NativeMemoryMethods.WinGlobalUnlock(handle);
} }
else if (TwainPlatform.IsLinux) else if (TWPlatform.IsLinux)
{ {
} }
else if (TwainPlatform.IsMacOSX) else if (TWPlatform.IsMacOSX)
{ {
} }
else else

8
src/NTwain/TwainAppSession.Xfers.cs
View File

@ -329,7 +329,7 @@ namespace NTwain
{ {
do do
{ {
rc = TwainPlatform.IsMacOSX ? rc = TWPlatform.IsMacOSX ?
DGImage.ImageMemXfer.Get(ref _appIdentity, ref _currentDS, ref memXferOSX) : DGImage.ImageMemXfer.Get(ref _appIdentity, ref _currentDS, ref memXferOSX) :
DGImage.ImageMemXfer.Get(ref _appIdentity, ref _currentDS, ref memXfer); DGImage.ImageMemXfer.Get(ref _appIdentity, ref _currentDS, ref memXfer);
@ -337,7 +337,7 @@ namespace NTwain
{ {
try try
{ {
var written = TwainPlatform.IsMacOSX ? var written = TWPlatform.IsMacOSX ?
memXferOSX.BytesWritten : memXfer.BytesWritten; memXferOSX.BytesWritten : memXfer.BytesWritten;
IntPtr lockedPtr = Lock(memPtr); IntPtr lockedPtr = Lock(memPtr);
@ -409,7 +409,7 @@ namespace NTwain
{ {
do do
{ {
rc = TwainPlatform.IsMacOSX ? rc = TWPlatform.IsMacOSX ?
DGImage.ImageMemFileXfer.Get(ref _appIdentity, ref _currentDS, ref memXferOSX) : DGImage.ImageMemFileXfer.Get(ref _appIdentity, ref _currentDS, ref memXferOSX) :
DGImage.ImageMemFileXfer.Get(ref _appIdentity, ref _currentDS, ref memXfer); DGImage.ImageMemFileXfer.Get(ref _appIdentity, ref _currentDS, ref memXfer);
@ -417,7 +417,7 @@ namespace NTwain
{ {
try try
{ {
var written = TwainPlatform.IsMacOSX ? var written = TWPlatform.IsMacOSX ?
memXferOSX.BytesWritten : memXfer.BytesWritten; memXferOSX.BytesWritten : memXfer.BytesWritten;
IntPtr lockedPtr = Lock(memPtr); IntPtr lockedPtr = Lock(memPtr);