From a72e1ff1d0756934a2d7b1c74f2f80329566d881 Mon Sep 17 00:00:00 2001 From: Eugene Wang <8755753+soukoku@users.noreply.github.com> Date: Sun, 9 Apr 2023 15:31:28 -0400 Subject: [PATCH] Renamed twain const and platform classes to shorter name. --- samples/WinForm32/DsmLoader.cs | 2 +- samples/WinForm32/Form1.cs | 27 +++++++---- src/NTwain/Data/TWAINH.cs | 16 +++---- src/NTwain/Data/TWAINH_EXTRAS.cs | 48 ++++++++----------- src/NTwain/Data/ValueReader.cs | 14 +++--- src/NTwain/Data/ValueWriter.cs | 22 ++++----- .../Triplets/AudioDATs/AudioFileXfer.cs | 8 ++-- src/NTwain/Triplets/AudioDATs/AudioInfo.cs | 8 ++-- .../Triplets/AudioDATs/AudioNativeXfer.cs | 8 ++-- src/NTwain/Triplets/ControlDATs/Callback.cs | 8 ++-- src/NTwain/Triplets/ControlDATs/Callback2.cs | 8 ++-- src/NTwain/Triplets/ControlDATs/Capability.cs | 8 ++-- .../Triplets/ControlDATs/CapabilityCustom.cs | 8 ++-- .../Triplets/ControlDATs/CustomDsData.cs | 8 ++-- .../Triplets/ControlDATs/DeviceEvent.cs | 8 ++-- src/NTwain/Triplets/ControlDATs/EntryPoint.cs | 8 ++-- src/NTwain/Triplets/ControlDATs/Event.cs | 8 ++-- src/NTwain/Triplets/ControlDATs/FileSystem.cs | 8 ++-- src/NTwain/Triplets/ControlDATs/Identity.cs | 8 ++-- src/NTwain/Triplets/ControlDATs/Metrics.cs | 8 ++-- src/NTwain/Triplets/ControlDATs/Parent.cs | 8 ++-- src/NTwain/Triplets/ControlDATs/Passthru.cs | 8 ++-- .../Triplets/ControlDATs/PendingXfers.cs | 8 ++-- .../Triplets/ControlDATs/SetupFileXfer.cs | 8 ++-- .../Triplets/ControlDATs/SetupMemXfer.cs | 8 ++-- src/NTwain/Triplets/ControlDATs/Status.cs | 16 +++---- src/NTwain/Triplets/ControlDATs/StatusUtf8.cs | 8 ++-- .../Triplets/ControlDATs/TwainDirect.cs | 8 ++-- .../Triplets/ControlDATs/UserInterface.cs | 8 ++-- src/NTwain/Triplets/ControlDATs/XferGroup.cs | 8 ++-- src/NTwain/Triplets/ImageDATs/CieColor.cs | 8 ++-- src/NTwain/Triplets/ImageDATs/ExtImageInfo.cs | 8 ++-- src/NTwain/Triplets/ImageDATs/Filter.cs | 8 ++-- src/NTwain/Triplets/ImageDATs/GrayResponse.cs | 8 ++-- src/NTwain/Triplets/ImageDATs/IccProfile.cs | 8 ++-- .../Triplets/ImageDATs/ImageFileXfer.cs | 8 ++-- src/NTwain/Triplets/ImageDATs/ImageInfo.cs | 8 ++-- src/NTwain/Triplets/ImageDATs/ImageLayout.cs | 8 ++-- .../Triplets/ImageDATs/ImageMemFileXfer.cs | 8 ++-- src/NTwain/Triplets/ImageDATs/ImageMemXfer.cs | 8 ++-- .../Triplets/ImageDATs/ImageNativeXfer.cs | 8 ++-- .../Triplets/ImageDATs/JpegCompression.cs | 8 ++-- src/NTwain/Triplets/ImageDATs/Palette8.cs | 8 ++-- src/NTwain/Triplets/ImageDATs/RgbResponse.cs | 8 ++-- src/NTwain/TwainAppSession.Callbacks.cs | 2 +- src/NTwain/TwainAppSession.Memory.cs | 24 +++++----- src/NTwain/TwainAppSession.Xfers.cs | 8 ++-- 47 files changed, 238 insertions(+), 237 deletions(-) diff --git a/samples/WinForm32/DsmLoader.cs b/samples/WinForm32/DsmLoader.cs index 6311d90..2359279 100644 --- a/samples/WinForm32/DsmLoader.cs +++ b/samples/WinForm32/DsmLoader.cs @@ -25,7 +25,7 @@ namespace WinFormSample { var dll = Path.Combine( 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); } diff --git a/samples/WinForm32/Form1.cs b/samples/WinForm32/Form1.cs index a9ff3e1..18109d7 100644 --- a/samples/WinForm32/Form1.cs +++ b/samples/WinForm32/Form1.cs @@ -10,6 +10,7 @@ using System.Drawing.Imaging; using System.IO; using System.Linq; using System.Reflection; +using System.Runtime.Versioning; using System.Windows.Forms; namespace WinFormSample @@ -23,9 +24,9 @@ namespace WinFormSample { InitializeComponent(); 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.StateChanged += Twain_StateChanged; @@ -148,14 +149,18 @@ namespace WinFormSample { LoadCapInfoList(); - // never seen a driver support these but here it is - var sts = twain.GetCapLabel(CAP.ICAP_SUPPORTEDSIZES, out string? test); - var sts2 = twain.GetCapHelp(CAP.ICAP_SUPPORTEDSIZES, out string? test2); - var sts3 = twain.GetCapLabelEnum(CAP.ICAP_SUPPORTEDSIZES, out IList? test3); - - if (sts.RC == TWRC.SUCCESS || sts2.RC == TWRC.SUCCESS || sts3.RC == TWRC.SUCCESS) + // never seen a driver support these but here it is to test it + if (twain.GetCapLabel(CAP.ICAP_SUPPORTEDSIZES, out string? test).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? test3).RC == TWRC.SUCCESS && test3 != null) + { + Debug.WriteLine($"Supported sizes label enum from ds = {string.Join(Environment.NewLine, test3)}"); } } else @@ -187,7 +192,9 @@ namespace WinFormSample it.SubItems.Add(""); } 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); } } diff --git a/src/NTwain/Data/TWAINH.cs b/src/NTwain/Data/TWAINH.cs index b396065..bdd7d12 100644 --- a/src/NTwain/Data/TWAINH.cs +++ b/src/NTwain/Data/TWAINH.cs @@ -206,7 +206,7 @@ namespace NTwain.Data } // 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); } @@ -257,7 +257,7 @@ namespace NTwain.Data { a_sz = ""; } - else if (a_blMayHavePrefix && TwainPlatform.IsMacOSX) + else if (a_blMayHavePrefix && TWPlatform.IsMacOSX) { 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 (a_blMayHavePrefix && TwainPlatform.IsMacOSX) + if (a_blMayHavePrefix && TWPlatform.IsMacOSX) { sz = sz.Remove(0, 1); } @@ -442,7 +442,7 @@ namespace NTwain.Data { a_sz = ""; } - else if (a_blMayHavePrefix && TwainPlatform.IsMacOSX) + else if (a_blMayHavePrefix && TWPlatform.IsMacOSX) { 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 (a_blMayHavePrefix && TwainPlatform.IsMacOSX) + if (a_blMayHavePrefix && TWPlatform.IsMacOSX) { sz = sz.Remove(0, 1); } @@ -666,7 +666,7 @@ namespace NTwain.Data { a_sz = ""; } - else if (a_blMayHavePrefix && TwainPlatform.IsMacOSX) + else if (a_blMayHavePrefix && TWPlatform.IsMacOSX) { 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 (a_blMayHavePrefix && TwainPlatform.IsMacOSX) + if (a_blMayHavePrefix && TWPlatform.IsMacOSX) { sz = sz.Remove(0, 1); } @@ -970,7 +970,7 @@ namespace NTwain.Data { a_sz = ""; } - else if (a_blMayHavePrefix && TwainPlatform.IsMacOSX) + else if (a_blMayHavePrefix && TWPlatform.IsMacOSX) { a_sz = (char)a_sz.Length + a_sz; } diff --git a/src/NTwain/Data/TWAINH_EXTRAS.cs b/src/NTwain/Data/TWAINH_EXTRAS.cs index 37a2809..2b2dbde 100644 --- a/src/NTwain/Data/TWAINH_EXTRAS.cs +++ b/src/NTwain/Data/TWAINH_EXTRAS.cs @@ -11,9 +11,9 @@ namespace NTwain.Data /// /// Contains platform info for twain use. /// - public static class TwainPlatform + public static class TWPlatform { - static TwainPlatform() + static TWPlatform() { Is32bit = IntPtr.Size == 4; @@ -78,7 +78,7 @@ namespace NTwain.Data /// /// Contains value that don't fit into enums nicely. /// - public static class TwainConst + public static class TWConst { /// /// Don't care values... @@ -86,12 +86,6 @@ namespace NTwain.Data public const byte TWON_DONTCARE8 = 0xff; public const ushort TWON_DONTCARE16 = 0xffff; public const uint TWON_DONTCARE32 = 0xffffffff; - /// - /// We're departing from a strict translation of H so that - /// we can achieve a unified status return type. - /// - public const int STSCC = 0x10000; // get us past the custom space - } /// @@ -739,7 +733,7 @@ namespace NTwain.Data public TW_CAPABILITY(CAP cap) { Cap = cap; - ConType = (TWON)TwainConst.TWON_DONTCARE16; + ConType = (TWON)TWConst.TWON_DONTCARE16; } /// @@ -771,9 +765,9 @@ namespace NTwain.Data /// public uint DetermineBufferSize() { - if (Preferred != TwainConst.TWON_DONTCARE32) return Preferred; - if (MaxBufSize != TwainConst.TWON_DONTCARE32) return MaxBufSize; - if (MinBufSize != TwainConst.TWON_DONTCARE32) return MinBufSize; + if (Preferred != TWConst.TWON_DONTCARE32) return Preferred; + if (MaxBufSize != TWConst.TWON_DONTCARE32) return MaxBufSize; + if (MinBufSize != TWConst.TWON_DONTCARE32) return MinBufSize; // default to 16 kb if source doesn't really want to say what it needs return 1024 * 16; } @@ -789,13 +783,13 @@ namespace NTwain.Data { return new TW_IMAGEMEMXFER { - BytesPerRow = TwainConst.TWON_DONTCARE32, - BytesWritten = TwainConst.TWON_DONTCARE32, - Columns = TwainConst.TWON_DONTCARE32, - Compression = TwainConst.TWON_DONTCARE16, - Rows = TwainConst.TWON_DONTCARE32, - XOffset = TwainConst.TWON_DONTCARE32, - YOffset = TwainConst.TWON_DONTCARE32, + BytesPerRow = TWConst.TWON_DONTCARE32, + BytesWritten = TWConst.TWON_DONTCARE32, + Columns = TWConst.TWON_DONTCARE32, + Compression = TWConst.TWON_DONTCARE16, + Rows = TWConst.TWON_DONTCARE32, + XOffset = TWConst.TWON_DONTCARE32, + YOffset = TWConst.TWON_DONTCARE32, }; } } @@ -810,13 +804,13 @@ namespace NTwain.Data { return new TW_IMAGEMEMXFER_MACOSX { - BytesPerRow = TwainConst.TWON_DONTCARE32, - BytesWritten = TwainConst.TWON_DONTCARE32, - Columns = TwainConst.TWON_DONTCARE32, - Compression = TwainConst.TWON_DONTCARE32, - Rows = TwainConst.TWON_DONTCARE32, - XOffset = TwainConst.TWON_DONTCARE32, - YOffset = TwainConst.TWON_DONTCARE32, + BytesPerRow = TWConst.TWON_DONTCARE32, + BytesWritten = TWConst.TWON_DONTCARE32, + Columns = TWConst.TWON_DONTCARE32, + Compression = TWConst.TWON_DONTCARE32, + Rows = TWConst.TWON_DONTCARE32, + XOffset = TWConst.TWON_DONTCARE32, + YOffset = TWConst.TWON_DONTCARE32, }; } } diff --git a/src/NTwain/Data/ValueReader.cs b/src/NTwain/Data/ValueReader.cs index 3943e4e..75c8661 100644 --- a/src/NTwain/Data/ValueReader.cs +++ b/src/NTwain/Data/ValueReader.cs @@ -60,7 +60,7 @@ namespace NTwain.Data try { - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { type = (TWTY)(ushort)(uint)Marshal.ReadInt32(lockedPtr); @@ -102,7 +102,7 @@ namespace NTwain.Data { TWTY itemType; // Mac has a level of indirection and a different structure (ick)... - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { // Crack the container... var onevalue = MarshalTo(lockedPtr); @@ -144,7 +144,7 @@ namespace NTwain.Data int count = 0; // Mac has a level of indirection and a different structure (ick)... - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { // Crack the container... var twenumerationmacosx = MarshalTo(lockedPtr); @@ -214,7 +214,7 @@ namespace NTwain.Data uint count; // Mac has a level of indirection and a different structure (ick)... - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { // Crack the container... var twarraymacosx = MarshalTo(lockedPtr); @@ -263,7 +263,7 @@ namespace NTwain.Data TW_RANGE_FIX32 twrangefix32 = default; // Mac has a level of indirection and a different structure (ick)... - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { var twrangemacosx = MarshalTo(lockedPtr); var twrangefix32macosx = MarshalTo(lockedPtr); @@ -365,7 +365,7 @@ namespace NTwain.Data { TWTY itemType; // Mac has a level of indirection and a different structure (ick)... - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { // Crack the container... var onevalue = MarshalTo(lockedPtr); @@ -424,7 +424,7 @@ namespace NTwain.Data /// - /// Read the pointer content as a value specified by . + /// Read the pointer content as a value specified by , except . /// /// A locked pointer to the data pointer. If data is array this is the 0th item. /// The twain type. diff --git a/src/NTwain/Data/ValueWriter.cs b/src/NTwain/Data/ValueWriter.cs index 1a345b7..3f273e9 100644 --- a/src/NTwain/Data/ValueWriter.cs +++ b/src/NTwain/Data/ValueWriter.cs @@ -59,7 +59,7 @@ namespace NTwain.Data TWTY itemType = GetItemType(); // 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)))); lockedPtr = memMgr.Lock(twCap.hContainer); @@ -114,7 +114,7 @@ namespace NTwain.Data TWTY itemType = GetItemType(); // Allocate the container (go for worst case, which is TW_STR255)... - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { // Allocate... 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(); // Allocate the container (go for worst case, which is TW_STR255)... - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { // Allocate... 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(); // Allocate the container (go for worst case, which is TW_STR255)... - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { // Allocate... twCap.hContainer = memMgr.Alloc((uint)(Marshal.SizeOf(default(TW_RANGE_MACOSX)))); @@ -314,7 +314,7 @@ namespace NTwain.Data default: throw new NotSupportedException($"{itemType} is not supported for range."); case TWTY.INT8: - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { twrangemacosx.ItemType = (uint)itemType; twrangemacosx.MinValue = (uint)Convert.ToSByte(value.MinValue); @@ -346,7 +346,7 @@ namespace NTwain.Data //} break; case TWTY.UINT8: - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { twrangemacosx.ItemType = (uint)itemType; twrangemacosx.MinValue = Convert.ToByte(value.MinValue); @@ -378,7 +378,7 @@ namespace NTwain.Data //} break; case TWTY.INT16: - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { twrangemacosx.ItemType = (uint)itemType; twrangemacosx.MinValue = (uint)Convert.ToInt16(value.MinValue); @@ -411,7 +411,7 @@ namespace NTwain.Data break; case TWTY.BOOL: case TWTY.UINT16: - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { twrangemacosx.ItemType = (uint)itemType; twrangemacosx.MinValue = Convert.ToUInt16(value.MinValue); @@ -443,7 +443,7 @@ namespace NTwain.Data //} break; case TWTY.INT32: - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { twrangemacosx.ItemType = (uint)itemType; twrangemacosx.MinValue = (uint)Convert.ToInt32(value.MinValue); @@ -475,7 +475,7 @@ namespace NTwain.Data //} break; case TWTY.UINT32: - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { twrangemacosx.ItemType = (uint)itemType; twrangemacosx.MinValue = Convert.ToUInt32(value.MinValue); @@ -512,7 +512,7 @@ namespace NTwain.Data double step = Convert.ToDouble(value.StepSize); double def = Convert.ToDouble(value.DefaultValue); double current = Convert.ToDouble(value.CurrentValue); - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { TW_RANGE_FIX32_MACOSX twrangefix32macosx = default; twrangefix32macosx.ItemType = (uint)itemType; diff --git a/src/NTwain/Triplets/AudioDATs/AudioFileXfer.cs b/src/NTwain/Triplets/AudioDATs/AudioFileXfer.cs index 21f537c..50eff2a 100644 --- a/src/NTwain/Triplets/AudioDATs/AudioFileXfer.cs +++ b/src/NTwain/Triplets/AudioDATs/AudioFileXfer.cs @@ -15,9 +15,9 @@ namespace NTwain.Triplets.AudioDATs static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg) { 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); } @@ -26,11 +26,11 @@ namespace NTwain.Triplets.AudioDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.AUDIO, DAT.AUDIOFILEXFER, msg, IntPtr.Zero); } diff --git a/src/NTwain/Triplets/AudioDATs/AudioInfo.cs b/src/NTwain/Triplets/AudioDATs/AudioInfo.cs index 575c076..13df8f0 100644 --- a/src/NTwain/Triplets/AudioDATs/AudioInfo.cs +++ b/src/NTwain/Triplets/AudioDATs/AudioInfo.cs @@ -15,9 +15,9 @@ namespace NTwain.Triplets.AudioDATs { data = default; 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); } @@ -26,11 +26,11 @@ namespace NTwain.Triplets.AudioDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.AUDIO, DAT.AUDIOINFO, msg, ref data); } diff --git a/src/NTwain/Triplets/AudioDATs/AudioNativeXfer.cs b/src/NTwain/Triplets/AudioDATs/AudioNativeXfer.cs index bd47a33..514b72f 100644 --- a/src/NTwain/Triplets/AudioDATs/AudioNativeXfer.cs +++ b/src/NTwain/Triplets/AudioDATs/AudioNativeXfer.cs @@ -16,9 +16,9 @@ namespace NTwain.Triplets.AudioDATs { data = default; 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); } @@ -27,11 +27,11 @@ namespace NTwain.Triplets.AudioDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.AUDIO, DAT.AUDIONATIVEXFER, msg, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/Callback.cs b/src/NTwain/Triplets/ControlDATs/Callback.cs index aa2ce2d..a2bed13 100644 --- a/src/NTwain/Triplets/ControlDATs/Callback.cs +++ b/src/NTwain/Triplets/ControlDATs/Callback.cs @@ -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) { 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); } @@ -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); } } - else if (TwainPlatform.IsMacOSX) + else if (TWPlatform.IsMacOSX) { TW_IDENTITY_MACOSX app2 = app; 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); } diff --git a/src/NTwain/Triplets/ControlDATs/Callback2.cs b/src/NTwain/Triplets/ControlDATs/Callback2.cs index 70fc856..8df4c24 100644 --- a/src/NTwain/Triplets/ControlDATs/Callback2.cs +++ b/src/NTwain/Triplets/ControlDATs/Callback2.cs @@ -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) { 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); } @@ -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); } } - else if (TwainPlatform.IsMacOSX) + else if (TWPlatform.IsMacOSX) { TW_IDENTITY_MACOSX app2 = app; 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); } diff --git a/src/NTwain/Triplets/ControlDATs/Capability.cs b/src/NTwain/Triplets/ControlDATs/Capability.cs index b388f62..f4fe906 100644 --- a/src/NTwain/Triplets/ControlDATs/Capability.cs +++ b/src/NTwain/Triplets/ControlDATs/Capability.cs @@ -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) { 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); } @@ -45,11 +45,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.CAPABILITY, msg, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/CapabilityCustom.cs b/src/NTwain/Triplets/ControlDATs/CapabilityCustom.cs index 27450d2..e5b92ff 100644 --- a/src/NTwain/Triplets/ControlDATs/CapabilityCustom.cs +++ b/src/NTwain/Triplets/ControlDATs/CapabilityCustom.cs @@ -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) { 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); } @@ -43,11 +43,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, (DAT)dat, msg, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/CustomDsData.cs b/src/NTwain/Triplets/ControlDATs/CustomDsData.cs index a822aef..86ffc13 100644 --- a/src/NTwain/Triplets/ControlDATs/CustomDsData.cs +++ b/src/NTwain/Triplets/ControlDATs/CustomDsData.cs @@ -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) { 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); } @@ -31,11 +31,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.CUSTOMDSDATA, msg, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/DeviceEvent.cs b/src/NTwain/Triplets/ControlDATs/DeviceEvent.cs index 987cfb0..38f120d 100644 --- a/src/NTwain/Triplets/ControlDATs/DeviceEvent.cs +++ b/src/NTwain/Triplets/ControlDATs/DeviceEvent.cs @@ -12,9 +12,9 @@ namespace NTwain.Triplets.ControlDATs { data = default; 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); } @@ -23,11 +23,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.DEVICEEVENT, MSG.GET, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/EntryPoint.cs b/src/NTwain/Triplets/ControlDATs/EntryPoint.cs index 5c79230..40144b2 100644 --- a/src/NTwain/Triplets/ControlDATs/EntryPoint.cs +++ b/src/NTwain/Triplets/ControlDATs/EntryPoint.cs @@ -42,9 +42,9 @@ namespace NTwain.Triplets.ControlDATs static TWRC DoIt(ref TW_IDENTITY_LEGACY app, MSG msg, ref TW_ENTRYPOINT entry) { 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); } @@ -57,10 +57,10 @@ namespace NTwain.Triplets.ControlDATs //{ // var app = Session._appIdentity; //} - else if (TwainPlatform.IsMacOSX) + else if (TWPlatform.IsMacOSX) { 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); } diff --git a/src/NTwain/Triplets/ControlDATs/Event.cs b/src/NTwain/Triplets/ControlDATs/Event.cs index 2f1a71d..e8a19e2 100644 --- a/src/NTwain/Triplets/ControlDATs/Event.cs +++ b/src/NTwain/Triplets/ControlDATs/Event.cs @@ -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) { 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); } @@ -22,11 +22,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.EVENT, MSG.PROCESSEVENT, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/FileSystem.cs b/src/NTwain/Triplets/ControlDATs/FileSystem.cs index efa3c81..bd6b49d 100644 --- a/src/NTwain/Triplets/ControlDATs/FileSystem.cs +++ b/src/NTwain/Triplets/ControlDATs/FileSystem.cs @@ -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) { 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); } @@ -45,11 +45,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.FILESYSTEM, msg, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/Identity.cs b/src/NTwain/Triplets/ControlDATs/Identity.cs index 44561a0..b157e9d 100644 --- a/src/NTwain/Triplets/ControlDATs/Identity.cs +++ b/src/NTwain/Triplets/ControlDATs/Identity.cs @@ -73,9 +73,9 @@ namespace NTwain.Triplets.ControlDATs static TWRC DoIt(ref TW_IDENTITY_LEGACY app, MSG msg, ref TW_IDENTITY_LEGACY ds) { 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); } @@ -84,11 +84,11 @@ namespace NTwain.Triplets.ControlDATs 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 osxds = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, IntPtr.Zero, DG.CONTROL, DAT.IDENTITY, msg, ref osxds); } diff --git a/src/NTwain/Triplets/ControlDATs/Metrics.cs b/src/NTwain/Triplets/ControlDATs/Metrics.cs index 6f9f4e1..5d559b2 100644 --- a/src/NTwain/Triplets/ControlDATs/Metrics.cs +++ b/src/NTwain/Triplets/ControlDATs/Metrics.cs @@ -15,9 +15,9 @@ namespace NTwain.Triplets.ControlDATs data.SizeOf = (uint)Marshal.SizeOf(); 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); } @@ -26,11 +26,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.METRICS, MSG.GET, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/Parent.cs b/src/NTwain/Triplets/ControlDATs/Parent.cs index f2a11f4..d5519f5 100644 --- a/src/NTwain/Triplets/ControlDATs/Parent.cs +++ b/src/NTwain/Triplets/ControlDATs/Parent.cs @@ -30,9 +30,9 @@ namespace NTwain.Triplets.ControlDATs static TWRC DoIt(ref TW_IDENTITY_LEGACY app, MSG msg, IntPtr hwnd) { 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); } @@ -47,10 +47,10 @@ namespace NTwain.Triplets.ControlDATs // rc = NativeMethods.LinuxDsmEntryParent(ref app, IntPtr.Zero, DG.CONTROL, DAT.PARENT, msg, ref hwnd); // if (rc == TWRC.SUCCESS) Session._appIdentity = app; //} - else if (TwainPlatform.IsMacOSX) + else if (TWPlatform.IsMacOSX) { 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); } diff --git a/src/NTwain/Triplets/ControlDATs/Passthru.cs b/src/NTwain/Triplets/ControlDATs/Passthru.cs index 0b53d17..8fa43f8 100644 --- a/src/NTwain/Triplets/ControlDATs/Passthru.cs +++ b/src/NTwain/Triplets/ControlDATs/Passthru.cs @@ -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) { 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); } @@ -22,11 +22,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.PASSTHRU, MSG.PASSTHRU, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/PendingXfers.cs b/src/NTwain/Triplets/ControlDATs/PendingXfers.cs index 7b9ea21..4f6e977 100644 --- a/src/NTwain/Triplets/ControlDATs/PendingXfers.cs +++ b/src/NTwain/Triplets/ControlDATs/PendingXfers.cs @@ -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) { 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); } @@ -32,11 +32,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.PENDINGXFERS, msg, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/SetupFileXfer.cs b/src/NTwain/Triplets/ControlDATs/SetupFileXfer.cs index 308d0d0..b2db885 100644 --- a/src/NTwain/Triplets/ControlDATs/SetupFileXfer.cs +++ b/src/NTwain/Triplets/ControlDATs/SetupFileXfer.cs @@ -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) { 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); } @@ -41,11 +41,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.SETUPFILEXFER, msg, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/SetupMemXfer.cs b/src/NTwain/Triplets/ControlDATs/SetupMemXfer.cs index fddd37a..1e3195d 100644 --- a/src/NTwain/Triplets/ControlDATs/SetupMemXfer.cs +++ b/src/NTwain/Triplets/ControlDATs/SetupMemXfer.cs @@ -12,9 +12,9 @@ namespace NTwain.Triplets.ControlDATs { data = default; 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); } @@ -23,11 +23,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.SETUPMEMXFER, MSG.GET, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/Status.cs b/src/NTwain/Triplets/ControlDATs/Status.cs index 9123734..4dd4742 100644 --- a/src/NTwain/Triplets/ControlDATs/Status.cs +++ b/src/NTwain/Triplets/ControlDATs/Status.cs @@ -13,9 +13,9 @@ namespace NTwain.Triplets.ControlDATs { status = default; 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); } @@ -24,10 +24,10 @@ namespace NTwain.Triplets.ControlDATs 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; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { 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; 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); } @@ -54,11 +54,11 @@ namespace NTwain.Triplets.ControlDATs 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 osxds = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref osxds, DG.CONTROL, DAT.STATUS, MSG.GET, ref status); } diff --git a/src/NTwain/Triplets/ControlDATs/StatusUtf8.cs b/src/NTwain/Triplets/ControlDATs/StatusUtf8.cs index f5c9b49..d2bff5c 100644 --- a/src/NTwain/Triplets/ControlDATs/StatusUtf8.cs +++ b/src/NTwain/Triplets/ControlDATs/StatusUtf8.cs @@ -23,9 +23,9 @@ namespace NTwain.Triplets.ControlDATs { extendedStatus = new TW_STATUSUTF8 { Status = status }; 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); } @@ -34,10 +34,10 @@ namespace NTwain.Triplets.ControlDATs 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; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, IntPtr.Zero, DG.CONTROL, DAT.STATUSUTF8, MSG.GET, ref extendedStatus); } diff --git a/src/NTwain/Triplets/ControlDATs/TwainDirect.cs b/src/NTwain/Triplets/ControlDATs/TwainDirect.cs index e2b70e9..e8ca12f 100644 --- a/src/NTwain/Triplets/ControlDATs/TwainDirect.cs +++ b/src/NTwain/Triplets/ControlDATs/TwainDirect.cs @@ -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) { 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); } @@ -25,11 +25,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.CIECOLOR, msg, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/UserInterface.cs b/src/NTwain/Triplets/ControlDATs/UserInterface.cs index 07d58f0..526aabf 100644 --- a/src/NTwain/Triplets/ControlDATs/UserInterface.cs +++ b/src/NTwain/Triplets/ControlDATs/UserInterface.cs @@ -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) { 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); } @@ -31,11 +31,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.USERINTERFACE, msg, ref data); } diff --git a/src/NTwain/Triplets/ControlDATs/XferGroup.cs b/src/NTwain/Triplets/ControlDATs/XferGroup.cs index c0caea0..f49a85f 100644 --- a/src/NTwain/Triplets/ControlDATs/XferGroup.cs +++ b/src/NTwain/Triplets/ControlDATs/XferGroup.cs @@ -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) { 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); } @@ -33,11 +33,11 @@ namespace NTwain.Triplets.ControlDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.CONTROL, DAT.XFERGROUP, msg, ref data); } diff --git a/src/NTwain/Triplets/ImageDATs/CieColor.cs b/src/NTwain/Triplets/ImageDATs/CieColor.cs index d253621..c85da26 100644 --- a/src/NTwain/Triplets/ImageDATs/CieColor.cs +++ b/src/NTwain/Triplets/ImageDATs/CieColor.cs @@ -15,9 +15,9 @@ namespace NTwain.Triplets.ImageDATs { var rc = TWRC.FAILURE; 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); } @@ -26,11 +26,11 @@ namespace NTwain.Triplets.ImageDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.CIECOLOR, msg, ref data); } diff --git a/src/NTwain/Triplets/ImageDATs/ExtImageInfo.cs b/src/NTwain/Triplets/ImageDATs/ExtImageInfo.cs index 91b6460..46d6354 100644 --- a/src/NTwain/Triplets/ImageDATs/ExtImageInfo.cs +++ b/src/NTwain/Triplets/ImageDATs/ExtImageInfo.cs @@ -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) { 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); } @@ -22,11 +22,11 @@ namespace NTwain.Triplets.ImageDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.EXTIMAGEINFO, MSG.GET, ref data); } diff --git a/src/NTwain/Triplets/ImageDATs/Filter.cs b/src/NTwain/Triplets/ImageDATs/Filter.cs index 5890170..bb42d47 100644 --- a/src/NTwain/Triplets/ImageDATs/Filter.cs +++ b/src/NTwain/Triplets/ImageDATs/Filter.cs @@ -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) { 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); } @@ -40,11 +40,11 @@ namespace NTwain.Triplets.ImageDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.FILTER, msg, ref data); } diff --git a/src/NTwain/Triplets/ImageDATs/GrayResponse.cs b/src/NTwain/Triplets/ImageDATs/GrayResponse.cs index 75c681d..13b810d 100644 --- a/src/NTwain/Triplets/ImageDATs/GrayResponse.cs +++ b/src/NTwain/Triplets/ImageDATs/GrayResponse.cs @@ -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) { 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); } @@ -30,11 +30,11 @@ namespace NTwain.Triplets.ImageDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.GRAYRESPONSE, msg, ref data); } diff --git a/src/NTwain/Triplets/ImageDATs/IccProfile.cs b/src/NTwain/Triplets/ImageDATs/IccProfile.cs index 3ebb904..6479acc 100644 --- a/src/NTwain/Triplets/ImageDATs/IccProfile.cs +++ b/src/NTwain/Triplets/ImageDATs/IccProfile.cs @@ -15,9 +15,9 @@ namespace NTwain.Triplets.ImageDATs { var rc = TWRC.FAILURE; 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); } @@ -26,11 +26,11 @@ namespace NTwain.Triplets.ImageDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.ICCPROFILE, msg, ref data); } diff --git a/src/NTwain/Triplets/ImageDATs/ImageFileXfer.cs b/src/NTwain/Triplets/ImageDATs/ImageFileXfer.cs index b59849f..c7a7904 100644 --- a/src/NTwain/Triplets/ImageDATs/ImageFileXfer.cs +++ b/src/NTwain/Triplets/ImageDATs/ImageFileXfer.cs @@ -15,9 +15,9 @@ namespace NTwain.Triplets.ImageDATs static TWRC DoIt(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, MSG msg) { 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); } @@ -26,11 +26,11 @@ namespace NTwain.Triplets.ImageDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGEFILEXFER, msg, IntPtr.Zero); } diff --git a/src/NTwain/Triplets/ImageDATs/ImageInfo.cs b/src/NTwain/Triplets/ImageDATs/ImageInfo.cs index 701a1fc..b8aff50 100644 --- a/src/NTwain/Triplets/ImageDATs/ImageInfo.cs +++ b/src/NTwain/Triplets/ImageDATs/ImageInfo.cs @@ -15,9 +15,9 @@ namespace NTwain.Triplets.ImageDATs { var rc = TWRC.FAILURE; 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); } @@ -26,11 +26,11 @@ namespace NTwain.Triplets.ImageDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGEINFO, msg, ref data); } diff --git a/src/NTwain/Triplets/ImageDATs/ImageLayout.cs b/src/NTwain/Triplets/ImageDATs/ImageLayout.cs index b74518b..4c94345 100644 --- a/src/NTwain/Triplets/ImageDATs/ImageLayout.cs +++ b/src/NTwain/Triplets/ImageDATs/ImageLayout.cs @@ -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) { 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); } @@ -40,11 +40,11 @@ namespace NTwain.Triplets.ImageDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGELAYOUT, msg, ref data); } diff --git a/src/NTwain/Triplets/ImageDATs/ImageMemFileXfer.cs b/src/NTwain/Triplets/ImageDATs/ImageMemFileXfer.cs index bd748ff..a74dc9b 100644 --- a/src/NTwain/Triplets/ImageDATs/ImageMemFileXfer.cs +++ b/src/NTwain/Triplets/ImageDATs/ImageMemFileXfer.cs @@ -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) { 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); } @@ -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) { var rc = TWRC.FAILURE; - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { TW_IDENTITY_MACOSX app2 = app; 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); } diff --git a/src/NTwain/Triplets/ImageDATs/ImageMemXfer.cs b/src/NTwain/Triplets/ImageDATs/ImageMemXfer.cs index 9388b9c..47053a7 100644 --- a/src/NTwain/Triplets/ImageDATs/ImageMemXfer.cs +++ b/src/NTwain/Triplets/ImageDATs/ImageMemXfer.cs @@ -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) { 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); } @@ -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) { var rc = TWRC.FAILURE; - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { TW_IDENTITY_MACOSX app2 = app; 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); } diff --git a/src/NTwain/Triplets/ImageDATs/ImageNativeXfer.cs b/src/NTwain/Triplets/ImageDATs/ImageNativeXfer.cs index e377821..8bb6f95 100644 --- a/src/NTwain/Triplets/ImageDATs/ImageNativeXfer.cs +++ b/src/NTwain/Triplets/ImageDATs/ImageNativeXfer.cs @@ -16,9 +16,9 @@ namespace NTwain.Triplets.ImageDATs { var rc = TWRC.FAILURE; 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); } @@ -27,11 +27,11 @@ namespace NTwain.Triplets.ImageDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.IMAGENATIVEXFER, msg, ref data); } diff --git a/src/NTwain/Triplets/ImageDATs/JpegCompression.cs b/src/NTwain/Triplets/ImageDATs/JpegCompression.cs index 70f2cab..3612159 100644 --- a/src/NTwain/Triplets/ImageDATs/JpegCompression.cs +++ b/src/NTwain/Triplets/ImageDATs/JpegCompression.cs @@ -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) { 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); } @@ -40,11 +40,11 @@ namespace NTwain.Triplets.ImageDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.JPEGCOMPRESSION, msg, ref data); } diff --git a/src/NTwain/Triplets/ImageDATs/Palette8.cs b/src/NTwain/Triplets/ImageDATs/Palette8.cs index 44e6695..a87bd2e 100644 --- a/src/NTwain/Triplets/ImageDATs/Palette8.cs +++ b/src/NTwain/Triplets/ImageDATs/Palette8.cs @@ -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) { 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); } @@ -40,11 +40,11 @@ namespace NTwain.Triplets.ImageDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.PALETTE8, msg, ref data); } diff --git a/src/NTwain/Triplets/ImageDATs/RgbResponse.cs b/src/NTwain/Triplets/ImageDATs/RgbResponse.cs index 2a5e007..55d79c8 100644 --- a/src/NTwain/Triplets/ImageDATs/RgbResponse.cs +++ b/src/NTwain/Triplets/ImageDATs/RgbResponse.cs @@ -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) { 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); } @@ -30,11 +30,11 @@ namespace NTwain.Triplets.ImageDATs 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 ds2 = ds; - if (TwainPlatform.PreferLegacyDSM) + if (TWPlatform.PreferLegacyDSM) { rc = OSXLegacyDSM.DSM_Entry(ref app2, ref ds2, DG.IMAGE, DAT.RGBRESPONSE, msg, ref data); } diff --git a/src/NTwain/TwainAppSession.Callbacks.cs b/src/NTwain/TwainAppSession.Callbacks.cs index 976f779..16fb049 100644 --- a/src/NTwain/TwainAppSession.Callbacks.cs +++ b/src/NTwain/TwainAppSession.Callbacks.cs @@ -39,7 +39,7 @@ namespace NTwain { IntPtr cbPtr = IntPtr.Zero; - if (TwainPlatform.IsMacOSX) + if (TWPlatform.IsMacOSX) { cbPtr = Marshal.GetFunctionPointerForDelegate(_osxCallbackDelegate); } diff --git a/src/NTwain/TwainAppSession.Memory.cs b/src/NTwain/TwainAppSession.Memory.cs index ce3aa6f..0086117 100644 --- a/src/NTwain/TwainAppSession.Memory.cs +++ b/src/NTwain/TwainAppSession.Memory.cs @@ -17,15 +17,15 @@ namespace NTwain { return _entryPoint.DSM_MemAllocate(size); } - else if (TwainPlatform.IsWindows) + else if (TWPlatform.IsWindows) { return NativeMemoryMethods.WinGlobalAlloc(NativeMemoryMethods.AllocFlag.GHND, (UIntPtr)size); } - else if (TwainPlatform.IsLinux) + else if (TWPlatform.IsLinux) { return Marshal.AllocHGlobal((int)size); } - else if (TwainPlatform.IsMacOSX) + else if (TWPlatform.IsMacOSX) { return Marshal.AllocHGlobal((int)size); } @@ -43,15 +43,15 @@ namespace NTwain { _entryPoint.DSM_MemFree(handle); } - else if (TwainPlatform.IsWindows) + else if (TWPlatform.IsWindows) { NativeMemoryMethods.WinGlobalFree(handle); } - else if (TwainPlatform.IsLinux) + else if (TWPlatform.IsLinux) { Marshal.FreeHGlobal(handle); } - else if (TwainPlatform.IsMacOSX) + else if (TWPlatform.IsMacOSX) { Marshal.FreeHGlobal(handle); } @@ -69,15 +69,15 @@ namespace NTwain { return _entryPoint.DSM_MemLock(handle); } - else if (TwainPlatform.IsWindows) + else if (TWPlatform.IsWindows) { return NativeMemoryMethods.WinGlobalLock(handle); } - else if (TwainPlatform.IsLinux) + else if (TWPlatform.IsLinux) { return handle; } - else if (TwainPlatform.IsMacOSX) + else if (TWPlatform.IsMacOSX) { return handle; } @@ -95,14 +95,14 @@ namespace NTwain { _entryPoint.DSM_MemUnlock(handle); } - else if (TwainPlatform.IsWindows) + else if (TWPlatform.IsWindows) { NativeMemoryMethods.WinGlobalUnlock(handle); } - else if (TwainPlatform.IsLinux) + else if (TWPlatform.IsLinux) { } - else if (TwainPlatform.IsMacOSX) + else if (TWPlatform.IsMacOSX) { } else diff --git a/src/NTwain/TwainAppSession.Xfers.cs b/src/NTwain/TwainAppSession.Xfers.cs index 1d18543..945617a 100644 --- a/src/NTwain/TwainAppSession.Xfers.cs +++ b/src/NTwain/TwainAppSession.Xfers.cs @@ -329,7 +329,7 @@ namespace NTwain { do { - rc = TwainPlatform.IsMacOSX ? + rc = TWPlatform.IsMacOSX ? DGImage.ImageMemXfer.Get(ref _appIdentity, ref _currentDS, ref memXferOSX) : DGImage.ImageMemXfer.Get(ref _appIdentity, ref _currentDS, ref memXfer); @@ -337,7 +337,7 @@ namespace NTwain { try { - var written = TwainPlatform.IsMacOSX ? + var written = TWPlatform.IsMacOSX ? memXferOSX.BytesWritten : memXfer.BytesWritten; IntPtr lockedPtr = Lock(memPtr); @@ -409,7 +409,7 @@ namespace NTwain { do { - rc = TwainPlatform.IsMacOSX ? + rc = TWPlatform.IsMacOSX ? DGImage.ImageMemFileXfer.Get(ref _appIdentity, ref _currentDS, ref memXferOSX) : DGImage.ImageMemFileXfer.Get(ref _appIdentity, ref _currentDS, ref memXfer); @@ -417,7 +417,7 @@ namespace NTwain { try { - var written = TwainPlatform.IsMacOSX ? + var written = TWPlatform.IsMacOSX ? memXferOSX.BytesWritten : memXfer.BytesWritten; IntPtr lockedPtr = Lock(memPtr);