From 5fa6edab288ad1adaa77309fb474c2a2b7eb8e7c Mon Sep 17 00:00:00 2001 From: Eugene Wang <8755753+soukoku@users.noreply.github.com> Date: Wed, 5 Apr 2023 07:53:10 -0400 Subject: [PATCH] Fix some build warnings. --- NTwain.sln | 3 +-- src/NTwain/Data/TWAINH.cs | 4 ++++ src/NTwain/Data/ValueReader.cs | 1 + src/NTwain/TransferErrorEventArgs.cs | 2 +- src/NTwain/Triplets/ControlDATs/DeviceEvent.cs | 5 ----- src/NTwain/Triplets/ControlDATs/Identity.cs | 7 ++++++- src/NTwain/Triplets/ControlDATs/Status.cs | 10 ---------- src/NTwain/Triplets/ControlDATs/StatusUtf8.cs | 5 +++-- src/NTwain/Triplets/ControlDATs/XferGroup.cs | 10 ---------- src/NTwain/Triplets/DGAudio.cs | 3 ++- src/NTwain/Triplets/DGControl.cs | 3 ++- src/NTwain/TwainAppSession.Caps.cs | 10 +++++----- src/NTwain/TwainAppSession.cs | 2 ++ 13 files changed, 27 insertions(+), 38 deletions(-) diff --git a/NTwain.sln b/NTwain.sln index 22a0e67..04dd84b 100644 --- a/NTwain.sln +++ b/NTwain.sln @@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NTwain-temp", "src\NTwain-t EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinForm32", "samples\WinForm32\WinForm32.csproj", "{7792A94E-D0B4-440D-8BD5-CA1CA548782C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinForm64", "samples\WinForm64\WinForm64.csproj", "{C9666CB2-C9A6-48C8-AB51-D616A48058A7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinForm64", "samples\WinForm64\WinForm64.csproj", "{C9666CB2-C9A6-48C8-AB51-D616A48058A7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -41,7 +41,6 @@ Global {3C8A3CF9-A60D-4F21-B866-D291A7AABD4A}.Release|Any CPU.Build.0 = Release|Any CPU {A7020B90-5CE4-43EF-A75D-5E1F9B501CAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A7020B90-5CE4-43EF-A75D-5E1F9B501CAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7020B90-5CE4-43EF-A75D-5E1F9B501CAC}.Release|Any CPU.Build.0 = Release|Any CPU {7792A94E-D0B4-440D-8BD5-CA1CA548782C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7792A94E-D0B4-440D-8BD5-CA1CA548782C}.Debug|Any CPU.Build.0 = Debug|Any CPU {7792A94E-D0B4-440D-8BD5-CA1CA548782C}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/NTwain/Data/TWAINH.cs b/src/NTwain/Data/TWAINH.cs index 91977a3..e9b4fea 100644 --- a/src/NTwain/Data/TWAINH.cs +++ b/src/NTwain/Data/TWAINH.cs @@ -240,6 +240,7 @@ namespace NTwain.Data /// Set our value... /// /// + /// private void SetValue(string a_sz, bool a_blMayHavePrefix) { // If we're running on a Mac, tack on the prefix 'byte'... @@ -415,6 +416,7 @@ namespace NTwain.Data /// Set our value... /// /// + /// private void SetValue(string a_sz, bool a_blMayHavePrefix) { // If we're running on a Mac, tack on the prefix 'byte'... @@ -629,6 +631,7 @@ namespace NTwain.Data /// Set our value... /// /// + /// private void SetValue(string a_sz, bool a_blMayHavePrefix) { // If we're running on a Mac, tack on the prefix 'byte'... @@ -923,6 +926,7 @@ namespace NTwain.Data /// Set our value... /// /// + /// private void SetValue(string a_sz, bool a_blMayHavePrefix) { // If we're running on a Mac, tack on the prefix 'byte'... diff --git a/src/NTwain/Data/ValueReader.cs b/src/NTwain/Data/ValueReader.cs index dd8e3e5..69120ac 100644 --- a/src/NTwain/Data/ValueReader.cs +++ b/src/NTwain/Data/ValueReader.cs @@ -15,6 +15,7 @@ namespace NTwain.Data /// /// Reads pointer as UTF8 string. /// + /// /// Pointer to string. /// Number of bytes to read. /// diff --git a/src/NTwain/TransferErrorEventArgs.cs b/src/NTwain/TransferErrorEventArgs.cs index b1adf3f..3d56341 100644 --- a/src/NTwain/TransferErrorEventArgs.cs +++ b/src/NTwain/TransferErrorEventArgs.cs @@ -21,7 +21,7 @@ namespace NTwain /// Initializes a new instance of the class. /// /// The code. - /// Additional status info from TWAIN. + /// Additional status info from TWAIN. public TransferErrorEventArgs(STS code, string? info) { Code = code; diff --git a/src/NTwain/Triplets/ControlDATs/DeviceEvent.cs b/src/NTwain/Triplets/ControlDATs/DeviceEvent.cs index a295bb7..987cfb0 100644 --- a/src/NTwain/Triplets/ControlDATs/DeviceEvent.cs +++ b/src/NTwain/Triplets/ControlDATs/DeviceEvent.cs @@ -8,11 +8,6 @@ namespace NTwain.Triplets.ControlDATs /// public class DeviceEvent { - /// - /// Gets the device event detail. - /// - /// - /// public TWRC Get(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, out TW_DEVICEEVENT data) { data = default; diff --git a/src/NTwain/Triplets/ControlDATs/Identity.cs b/src/NTwain/Triplets/ControlDATs/Identity.cs index a81f57d..44561a0 100644 --- a/src/NTwain/Triplets/ControlDATs/Identity.cs +++ b/src/NTwain/Triplets/ControlDATs/Identity.cs @@ -19,6 +19,8 @@ namespace NTwain.Triplets.ControlDATs /// Opens the TWAIN data source selector dialog /// to choose the default data source. /// + /// + /// /// public TWRC UserSelect(ref TW_IDENTITY_LEGACY app, out TW_IDENTITY_LEGACY ds) { @@ -35,6 +37,7 @@ namespace NTwain.Triplets.ControlDATs /// /// Sets the default data source. /// + /// /// /// public TWRC Set(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds) @@ -44,6 +47,7 @@ namespace NTwain.Triplets.ControlDATs /// Gets the first available data source in an enumerating fashion /// (use for subsequent ones). /// + /// /// /// public TWRC GetFirst(ref TW_IDENTITY_LEGACY app, out TW_IDENTITY_LEGACY ds) @@ -54,8 +58,9 @@ namespace NTwain.Triplets.ControlDATs /// /// Gets the next available data source in an enumerating fashion (after using ). - /// Ends when return values is . + /// Ends when return values is . /// + /// /// /// public TWRC GetNext(ref TW_IDENTITY_LEGACY app, out TW_IDENTITY_LEGACY ds) diff --git a/src/NTwain/Triplets/ControlDATs/Status.cs b/src/NTwain/Triplets/ControlDATs/Status.cs index e1b526c..9123734 100644 --- a/src/NTwain/Triplets/ControlDATs/Status.cs +++ b/src/NTwain/Triplets/ControlDATs/Status.cs @@ -9,11 +9,6 @@ namespace NTwain.Triplets.ControlDATs /// public class Status { - /// - /// Gets the current status for the DSM. - /// - /// - /// public TWRC GetForDSM(ref TW_IDENTITY_LEGACY app, out TW_STATUS status) { status = default; @@ -44,11 +39,6 @@ namespace NTwain.Triplets.ControlDATs return rc; } - /// - /// Gets the status for the current source. - /// - /// - /// public TWRC GetForDS(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, out TW_STATUS status) { status = default; diff --git a/src/NTwain/Triplets/ControlDATs/StatusUtf8.cs b/src/NTwain/Triplets/ControlDATs/StatusUtf8.cs index 0e322ed..f5c9b49 100644 --- a/src/NTwain/Triplets/ControlDATs/StatusUtf8.cs +++ b/src/NTwain/Triplets/ControlDATs/StatusUtf8.cs @@ -11,10 +11,11 @@ namespace NTwain.Triplets.ControlDATs { /// /// Gets the extended text info for a previously received . - /// If this is called you should try to extract the string value from it once - /// with or call + /// If this is called you should try to extract the string value from it + /// with or call /// so there's no memory leak. /// + /// /// /// /// diff --git a/src/NTwain/Triplets/ControlDATs/XferGroup.cs b/src/NTwain/Triplets/ControlDATs/XferGroup.cs index b6cf4aa..c0caea0 100644 --- a/src/NTwain/Triplets/ControlDATs/XferGroup.cs +++ b/src/NTwain/Triplets/ControlDATs/XferGroup.cs @@ -8,22 +8,12 @@ namespace NTwain.Triplets.ControlDATs /// public class XferGroup { - /// - /// Gets the transfer group used. - /// - /// - /// public TWRC Get(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, out DG data) { data = default; return DoIt(ref app, ref ds, MSG.GET, ref data); } - /// - /// Sets the transfer group to be used. - /// - /// - /// public TWRC Set(ref TW_IDENTITY_LEGACY app, ref TW_IDENTITY_LEGACY ds, DG data) { return DoIt(ref app, ref ds, MSG.SET, ref data); diff --git a/src/NTwain/Triplets/DGAudio.cs b/src/NTwain/Triplets/DGAudio.cs index 3b929a6..9fa7f8c 100644 --- a/src/NTwain/Triplets/DGAudio.cs +++ b/src/NTwain/Triplets/DGAudio.cs @@ -1,4 +1,5 @@ -using NTwain.Triplets.AudioDATs; +using NTwain.Data; +using NTwain.Triplets.AudioDATs; namespace NTwain.Triplets { diff --git a/src/NTwain/Triplets/DGControl.cs b/src/NTwain/Triplets/DGControl.cs index f610c3c..70f3ce6 100644 --- a/src/NTwain/Triplets/DGControl.cs +++ b/src/NTwain/Triplets/DGControl.cs @@ -1,4 +1,5 @@ -using NTwain.Triplets.ControlDATs; +using NTwain.Data; +using NTwain.Triplets.ControlDATs; namespace NTwain.Triplets { diff --git a/src/NTwain/TwainAppSession.Caps.cs b/src/NTwain/TwainAppSession.Caps.cs index 9d46e86..a7fd815 100644 --- a/src/NTwain/TwainAppSession.Caps.cs +++ b/src/NTwain/TwainAppSession.Caps.cs @@ -83,7 +83,7 @@ namespace NTwain /// Gets a CAP's help text (description). /// /// - /// + /// /// public STS GetCapHelp(CAP cap, out string? help) { @@ -98,7 +98,7 @@ namespace NTwain /// Gets a CAP's text name label. /// /// - /// + /// /// public STS GetCapLabel(CAP cap, out string? label) { @@ -113,7 +113,7 @@ namespace NTwain /// Gets a CAP's value label texts. /// /// - /// + /// /// public STS GetCapLabelEnum(CAP cap, out string[]? labels) { @@ -127,7 +127,7 @@ namespace NTwain /// /// Sets a CAP's current value. /// - /// + /// /// public STS SetCap(ref TW_CAPABILITY value) { @@ -139,7 +139,7 @@ namespace NTwain /// /// Sets a CAP's constraint values. /// - /// + /// /// public STS SetConstraint(ref TW_CAPABILITY value) { diff --git a/src/NTwain/TwainAppSession.cs b/src/NTwain/TwainAppSession.cs index 1192fff..ddf350d 100644 --- a/src/NTwain/TwainAppSession.cs +++ b/src/NTwain/TwainAppSession.cs @@ -110,7 +110,9 @@ namespace NTwain { IsBackground = true }; +#if WINDOWS || NETFRAMEWORK t.SetApartmentState(ApartmentState.STA); // just in case +#endif t.Start(); }