lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-07-16 04:34:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reorg'd things the way I like.

Browse Source
This commit is contained in:
Eugene Wang 2023-04-02 07:56:54 -04:00
parent 3fc0b97096
commit addbf7f31d
14 changed files with 169 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/NTwain/DSM/OSXLegacyDSM.cs
View File

@ -9,110 +9,70 @@ namespace NTwain.DSM
const string DsmName = "/System/Library/Frameworks/framework/TWAIN";
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref IntPtr hwnd
ref TW_IDENTITY_MACOSX origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref IntPtr hwnd
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_IDENTITY_MACOSX twidentity
ref TW_IDENTITY_MACOSX origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_IDENTITY_MACOSX twidentity
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
ref TW_IDENTITY_MACOSX dest,
DG dg,
DAT dat,
MSG msg,
ref TW_STATUS twstatus
ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_STATUS twstatus
ref TW_IDENTITY_MACOSX origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_STATUSUTF8 twstatusutf8
ref TW_IDENTITY_MACOSX origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_STATUSUTF8 twstatusutf8
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_ENTRYPOINT twentrypoint
ref TW_IDENTITY_MACOSX origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_ENTRYPOINT twentrypoint
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
ref TW_IDENTITY_MACOSX dest,
DG dg,
DAT dat,
MSG msg,
ref TW_DEVICEEVENT twdeviceevent
ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
DG dg, DAT dat, MSG msg, ref TW_DEVICEEVENT twdeviceevent
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
ref TW_IDENTITY_MACOSX dest,
DG dg,
DAT dat,
MSG msg,
ref TW_CUSTOMDSDATA twcustomedsdata
ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
DG dg, DAT dat, MSG msg, ref TW_CUSTOMDSDATA twcustomedsdata
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
ref TW_IDENTITY_MACOSX dest,
DG dg,
DAT dat,
MSG msg,
ref TW_CALLBACK twcallback
ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
DG dg, DAT dat, MSG msg, ref TW_CALLBACK twcallback
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
ref TW_IDENTITY_MACOSX dest,
DG dg,
DAT dat,
MSG msg,
ref TW_CALLBACK2 twcallback
ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
DG dg, DAT dat, MSG msg, ref TW_CALLBACK2 twcallback
);
}
}

100
src/NTwain/DSM/OSXNewDSM.cs
View File

@ -9,110 +9,70 @@ namespace NTwain.DSM
const string DsmName = "/Library/Frameworks/TWAINDSM.framework/TWAINDSM";
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref IntPtr hwnd
ref TW_IDENTITY_MACOSX origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref IntPtr hwnd
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_IDENTITY_MACOSX twidentity
ref TW_IDENTITY_MACOSX origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_IDENTITY_MACOSX twidentity
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
ref TW_IDENTITY_MACOSX dest,
DG dg,
DAT dat,
MSG msg,
ref TW_STATUS twstatus
ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_STATUS twstatus
ref TW_IDENTITY_MACOSX origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_STATUSUTF8 twstatusutf8
ref TW_IDENTITY_MACOSX origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_STATUSUTF8 twstatusutf8
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_ENTRYPOINT twentrypoint
ref TW_IDENTITY_MACOSX origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_ENTRYPOINT twentrypoint
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
ref TW_IDENTITY_MACOSX dest,
DG dg,
DAT dat,
MSG msg,
ref TW_DEVICEEVENT twdeviceevent
ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
DG dg, DAT dat, MSG msg, ref TW_DEVICEEVENT twdeviceevent
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
ref TW_IDENTITY_MACOSX dest,
DG dg,
DAT dat,
MSG msg,
ref TW_CUSTOMDSDATA twcustomedsdata
ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
DG dg, DAT dat, MSG msg, ref TW_CUSTOMDSDATA twcustomedsdata
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
ref TW_IDENTITY_MACOSX dest,
DG dg,
DAT dat,
MSG msg,
ref TW_CALLBACK twcallback
ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
DG dg, DAT dat, MSG msg, ref TW_CALLBACK twcallback
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_MACOSX origin,
ref TW_IDENTITY_MACOSX dest,
DG dg,
DAT dat,
MSG msg,
ref TW_CALLBACK2 twcallback
ref TW_IDENTITY_MACOSX origin, ref TW_IDENTITY_MACOSX dest,
DG dg, DAT dat, MSG msg, ref TW_CALLBACK2 twcallback
);
}
}

100
src/NTwain/DSM/WinLegacyDSM.cs
View File

@ -9,110 +9,70 @@ namespace NTwain.DSM
const string DsmName = "twain_32.dll";
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref IntPtr hwnd
ref TW_IDENTITY_LEGACY origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref IntPtr hwnd
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_IDENTITY_LEGACY twidentity
ref TW_IDENTITY_LEGACY origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_IDENTITY_LEGACY twidentity
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
ref TW_IDENTITY_LEGACY dest,
DG dg,
DAT dat,
MSG msg,
ref TW_STATUS twstatus
ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_STATUS twstatus
ref TW_IDENTITY_LEGACY origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_STATUSUTF8 twstatusutf8
ref TW_IDENTITY_LEGACY origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_STATUSUTF8 twstatusutf8
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_ENTRYPOINT twentrypoint
ref TW_IDENTITY_LEGACY origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_ENTRYPOINT twentrypoint
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
ref TW_IDENTITY_LEGACY dest,
DG dg,
DAT dat,
MSG msg,
ref TW_DEVICEEVENT twdeviceevent
ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
DG dg, DAT dat, MSG msg, ref TW_DEVICEEVENT twdeviceevent
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
ref TW_IDENTITY_LEGACY dest,
DG dg,
DAT dat,
MSG msg,
ref TW_CUSTOMDSDATA twcustomedsdata
ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
DG dg, DAT dat, MSG msg, ref TW_CUSTOMDSDATA twcustomedsdata
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
ref TW_IDENTITY_LEGACY dest,
DG dg,
DAT dat,
MSG msg,
ref TW_CALLBACK twcallback
ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
DG dg, DAT dat, MSG msg, ref TW_CALLBACK twcallback
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
ref TW_IDENTITY_LEGACY dest,
DG dg,
DAT dat,
MSG msg,
ref TW_CALLBACK2 twcallback
ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
DG dg, DAT dat, MSG msg, ref TW_CALLBACK2 twcallback
);
}
}

100
src/NTwain/DSM/WinNewDSM.cs
View File

@ -9,110 +9,70 @@ namespace NTwain.DSM
const string DsmName = "twaindsm.dll";
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref IntPtr hwnd
ref TW_IDENTITY_LEGACY origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref IntPtr hwnd
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_IDENTITY_LEGACY twidentity
ref TW_IDENTITY_LEGACY origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_IDENTITY_LEGACY twidentity
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
ref TW_IDENTITY_LEGACY dest,
DG dg,
DAT dat,
MSG msg,
ref TW_STATUS twstatus
ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_STATUS twstatus
ref TW_IDENTITY_LEGACY origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_STATUS twstatus
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_STATUSUTF8 twstatusutf8
ref TW_IDENTITY_LEGACY origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_STATUSUTF8 twstatusutf8
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
IntPtr dest,
DG dg,
DAT dat,
MSG msg,
ref TW_ENTRYPOINT twentrypoint
ref TW_IDENTITY_LEGACY origin, IntPtr dest,
DG dg, DAT dat, MSG msg, ref TW_ENTRYPOINT twentrypoint
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
ref TW_IDENTITY_LEGACY dest,
DG dg,
DAT dat,
MSG msg,
ref TW_DEVICEEVENT twdeviceevent
ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
DG dg, DAT dat, MSG msg, ref TW_DEVICEEVENT twdeviceevent
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
ref TW_IDENTITY_LEGACY dest,
DG dg,
DAT dat,
MSG msg,
ref TW_CUSTOMDSDATA twcustomedsdata
ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
DG dg, DAT dat, MSG msg, ref TW_CUSTOMDSDATA twcustomedsdata
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
ref TW_IDENTITY_LEGACY dest,
DG dg,
DAT dat,
MSG msg,
ref TW_CALLBACK twcallback
ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
DG dg, DAT dat, MSG msg, ref TW_CALLBACK twcallback
);
[DllImport(DsmName, CharSet = CharSet.Ansi)]
internal static extern UInt16 DSM_Entry
internal static extern ushort DSM_Entry
(
ref TW_IDENTITY_LEGACY origin,
ref TW_IDENTITY_LEGACY dest,
DG dg,
DAT dat,
MSG msg,
ref TW_CALLBACK2 twcallback
ref TW_IDENTITY_LEGACY origin, ref TW_IDENTITY_LEGACY dest,
DG dg, DAT dat, MSG msg, ref TW_CALLBACK2 twcallback
);
}
}

6
src/NTwain/Triplets/DATCallback.cs → src/NTwain/Triplets/ControlDATs/Callback.cs
View File

@ -1,14 +1,14 @@
using NTwain.DSM;
using TWAINWorkingGroup;
namespace NTwain.Triplets
namespace NTwain.Triplets.ControlDATs
{
/// <summary>
/// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.CALLBACK"/>.
/// </summary>
public class DATCallback : TripletBase
public class Callback : TripletBase
{
public DATCallback(TwainSession session) : base(session)
public Callback(TwainSession session) : base(session)
{
}

6
src/NTwain/Triplets/DATCallback2.cs → src/NTwain/Triplets/ControlDATs/Callback2.cs
View File

@ -1,14 +1,14 @@
using NTwain.DSM;
using TWAINWorkingGroup;
namespace NTwain.Triplets
namespace NTwain.Triplets.ControlDATs
{
/// <summary>
/// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.CALLBACK2"/>.
/// </summary>
public class DATCallback2 : TripletBase
public class Callback2 : TripletBase
{
public DATCallback2(TwainSession session) : base(session)
public Callback2(TwainSession session) : base(session)
{
}

6
src/NTwain/Triplets/DATCustomDsData.cs → src/NTwain/Triplets/ControlDATs/CustomDsData.cs
View File

@ -1,14 +1,14 @@
using NTwain.DSM;
using TWAINWorkingGroup;
namespace NTwain.Triplets
namespace NTwain.Triplets.ControlDATs
{
/// <summary>
/// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.CUSTOMDSDATA"/>.
/// </summary>
public class DATCustomDsData : TripletBase
public class CustomDsData : TripletBase
{
public DATCustomDsData(TwainSession session) : base(session)
public CustomDsData(TwainSession session) : base(session)
{
}

6
src/NTwain/Triplets/DATDeviceEvent.cs → src/NTwain/Triplets/ControlDATs/DeviceEvent.cs
View File

@ -1,14 +1,14 @@
using NTwain.DSM;
using TWAINWorkingGroup;
namespace NTwain.Triplets
namespace NTwain.Triplets.ControlDATs
{
/// <summary>
/// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.DEVICEEVENT"/>.
/// </summary>
public class DATDeviceEvent : TripletBase
public class DeviceEvent : TripletBase
{
public DATDeviceEvent(TwainSession session) : base(session)
public DeviceEvent(TwainSession session) : base(session)
{
}

6
src/NTwain/Triplets/DATEntryPoint.cs → src/NTwain/Triplets/ControlDATs/EntryPoint.cs
View File

@ -3,14 +3,14 @@ using System;
using System.Runtime.InteropServices;
using TWAINWorkingGroup;
namespace NTwain.Triplets
namespace NTwain.Triplets.ControlDATs
{
/// <summary>
/// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.ENTRYPOINT"/>.
/// </summary>
public class DATEntryPoint : TripletBase
public class EntryPoint : TripletBase
{
public DATEntryPoint(TwainSession session) : base(session)
public EntryPoint(TwainSession session) : base(session)
{
}

6
src/NTwain/Triplets/DATIdentity.cs → src/NTwain/Triplets/ControlDATs/Identity.cs
View File

@ -2,14 +2,14 @@
using System;
using TWAINWorkingGroup;
namespace NTwain.Triplets
namespace NTwain.Triplets.ControlDATs
{
/// <summary>
/// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.IDENTITY"/>.
/// </summary>
public class DATIdentity : TripletBase
public class Identity : TripletBase
{
public DATIdentity(TwainSession session) : base(session)
public Identity(TwainSession session) : base(session)
{
}

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

@ -2,14 +2,14 @@
using System;
using TWAINWorkingGroup;
namespace NTwain.Triplets
namespace NTwain.Triplets.ControlDATs
{
/// <summary>
/// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.PARENT"/>.
/// </summary>
public class DATParent : TripletBase
public class Parent : TripletBase
{
public DATParent(TwainSession session) : base(session)
public Parent(TwainSession session) : base(session)
{
}
@ -32,7 +32,7 @@ namespace NTwain.Triplets
}
// determine memory mgmt routines used
if ((((DG)Session.AppIdentity.SupportedGroups) & DG.DSM2) == DG.DSM2)
if (((DG)Session.AppIdentity.SupportedGroups & DG.DSM2) == DG.DSM2)
{
if (Session.DGControl.EntryPoint.Get(out TW_ENTRYPOINT_DELEGATES entry) == STS.SUCCESS)
{

6
src/NTwain/Triplets/DATStatus.cs → src/NTwain/Triplets/ControlDATs/Status.cs
View File

@ -2,14 +2,14 @@
using System;
using TWAINWorkingGroup;
namespace NTwain.Triplets
namespace NTwain.Triplets.ControlDATs
{
/// <summary>
/// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.STATUS"/>.
/// </summary>
public class DATStatus : TripletBase
public class Status : TripletBase
{
public DATStatus(TwainSession session) : base(session)
public Status(TwainSession session) : base(session)
{
}

6
src/NTwain/Triplets/DATStatusUtf8.cs → src/NTwain/Triplets/ControlDATs/StatusUtf8.cs
View File

@ -2,14 +2,14 @@
using System;
using TWAINWorkingGroup;
namespace NTwain.Triplets
namespace NTwain.Triplets.ControlDATs
{
/// <summary>
/// Contains calls used with <see cref="DG.CONTROL"/> and <see cref="DAT.STATUSUTF8"/>.
/// </summary>
public class DATStatusUtf8 : TripletBase
public class StatusUtf8 : TripletBase
{
public DATStatusUtf8(TwainSession session) : base(session)
public StatusUtf8(TwainSession session) : base(session)
{
}

40
src/NTwain/Triplets/DGControl.cs
View File

@ -1,4 +1,6 @@
namespace NTwain.Triplets
using NTwain.Triplets.ControlDATs;
namespace NTwain.Triplets
{
/// <summary>
/// Contains calls used with <see cref="DG.CONTROL"/>.
@ -9,32 +11,32 @@
{
}
private DATParent? _parent;
public DATParent Parent => _parent ??= new DATParent(Session);
private Parent? _parent;
public Parent Parent => _parent ??= new Parent(Session);
private DATEntryPoint? _entryPoint;
public DATEntryPoint EntryPoint => _entryPoint ??= new DATEntryPoint(Session);
private EntryPoint? _entryPoint;
public EntryPoint EntryPoint => _entryPoint ??= new EntryPoint(Session);
private DATIdentity? _identity;
public DATIdentity Identity => _identity ??= new DATIdentity(Session);
private Identity? _identity;
public Identity Identity => _identity ??= new Identity(Session);
private DATStatus? _status;
public DATStatus Status => _status ??= new DATStatus(Session);
private Status? _status;
public Status Status => _status ??= new Status(Session);
private DATStatusUtf8? _statusUtf8;
public DATStatusUtf8 StatusUtf8 => _statusUtf8 ??= new DATStatusUtf8(Session);
private StatusUtf8? _statusUtf8;
public StatusUtf8 StatusUtf8 => _statusUtf8 ??= new StatusUtf8(Session);
private DATCustomDsData? _customDsData;
public DATCustomDsData CustomDsData => _customDsData ??= new DATCustomDsData(Session);
private CustomDsData? _customDsData;
public CustomDsData CustomDsData => _customDsData ??= new CustomDsData(Session);
private DATDeviceEvent? _deviceEvent;
public DATDeviceEvent DeviceEvent => _deviceEvent ??= new DATDeviceEvent(Session);
private DeviceEvent? _deviceEvent;
public DeviceEvent DeviceEvent => _deviceEvent ??= new DeviceEvent(Session);
private DATCallback? _callback;
public DATCallback Callback => _callback ??= new DATCallback(Session);
private Callback? _callback;
public Callback Callback => _callback ??= new Callback(Session);
private DATCallback2? _callback2;
public DATCallback2 Callback2 => _callback2 ??= new DATCallback2(Session);
private Callback2? _callback2;
public Callback2 Callback2 => _callback2 ??= new Callback2(Session);
}
}