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

Wrap event calls in try-catch to prevent consumers from breaking flow.

Browse Source
This commit is contained in:
Eugene Wang 2023-04-06 07:18:10 -04:00
parent e4a6d8d8d3
commit f7a3cc699e
5 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ namespace NTwain
public STS GetCapCurrent(CAP cap, out TW_CAPABILITY value)
{
value = new TW_CAPABILITY(cap);
return WrapInSTS(DGControl.Capability.Get(ref _appIdentity, ref _currentDS, ref value));
return WrapInSTS(DGControl.Capability.GetCurrent(ref _appIdentity, ref _currentDS, ref value));
}
/// <summary>

12
src/NTwain/TwainAppSession.PropEvents.cs
View File

@ -31,7 +31,11 @@ namespace NTwain
internal set
{
_currentDS = value;
CurrentSourceChanged?.Invoke(this, value);
try
{
CurrentSourceChanged?.Invoke(this, value);
}
catch { }
}
}
TW_IDENTITY_LEGACY _currentDS;
@ -57,7 +61,11 @@ namespace NTwain
if (_state != value)
{
_state = value;
StateChanged?.Invoke(this, value); // TODO: should care about thread
try
{
StateChanged?.Invoke(this, value); // TODO: should care about thread
}
catch { }
}
}
}

12
src/NTwain/TwainAppSession.Sources.cs
View File

@ -33,7 +33,11 @@ namespace NTwain
if (rc == TWRC.SUCCESS)
{
_defaultDS = ds;
DefaultSourceChanged?.Invoke(this, ds);
try
{
DefaultSourceChanged?.Invoke(this, ds);
}
catch { }
}
return WrapInSTS(rc);
}
@ -82,7 +86,11 @@ namespace NTwain
if (rc == TWRC.SUCCESS)
{
_defaultDS = source;
DefaultSourceChanged?.Invoke(this, source);
try
{
DefaultSourceChanged?.Invoke(this, source);
}
catch { }
}
return WrapInSTS(rc);
}

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

@ -31,7 +31,7 @@ namespace NTwain
/// </summary>
void EnterTransferRoutine()
{
// default options if source don't support them or whatever
// default options if source doesn't support changing them or whatever
bool xferImage = true;
bool xferAudio = false;
var imgXferMech = TWSX.NATIVE;
@ -54,21 +54,13 @@ namespace NTwain
}
}
if (xferImage)
if (xferImage && GetCapCurrent(CAP.ICAP_XFERMECH, out TW_CAPABILITY cap).RC == TWRC.SUCCESS)
{
if (GetCapCurrent(CAP.ICAP_XFERMECH, out TW_CAPABILITY cap).RC == TWRC.SUCCESS)
{
// todo:
cap.Free(this);
}
imgXferMech = cap.ReadOneValue<TWSX>(this);
}
else if (xferAudio)
else if (xferAudio && GetCapCurrent(CAP.ACAP_XFERMECH, out cap).RC == TWRC.SUCCESS)
{
if (GetCapCurrent(CAP.ACAP_XFERMECH, out TW_CAPABILITY cap).RC == TWRC.SUCCESS)
{
// todo:
cap.Free(this);
}
audXferMech = cap.ReadOneValue<TWSX>(this);
}
TW_PENDINGXFERS pending = default;
@ -80,7 +72,11 @@ namespace NTwain
var readyArgs = new TransferReadyEventArgs(this, pending.Count, (TWEJ)pending.EOJ);
_uiThreadMarshaller.Invoke(() =>
{
TransferReady?.Invoke(this, readyArgs);
try
{
TransferReady?.Invoke(this, readyArgs);
}
catch { } // don't let consumer kill the loop if they have exception
});
switch (readyArgs.Cancel)

18
src/NTwain/TwainAppSession.cs
View File

@ -135,7 +135,11 @@ namespace NTwain
{
_uiThreadMarshaller.BeginInvoke(() =>
{
DeviceEvent?.Invoke(this, de);
try
{
DeviceEvent?.Invoke(this, de);
}
catch { }
});
}
break;
@ -197,7 +201,11 @@ namespace NTwain
if (DGControl.Identity.GetDefault(ref _appIdentity, out TW_IDENTITY_LEGACY ds) == TWRC.SUCCESS)
{
_defaultDS = ds;
DefaultSourceChanged?.Invoke(this, _defaultDS);
try
{
DefaultSourceChanged?.Invoke(this, _defaultDS);
}
catch { }
}
// determine memory mgmt routines used
@ -222,7 +230,11 @@ namespace NTwain
State = STATE.S2;
_entryPoint = default;
_defaultDS = default;
DefaultSourceChanged?.Invoke(this, _defaultDS);
try
{
DefaultSourceChanged?.Invoke(this, _defaultDS);
}
catch { }
_hwnd = IntPtr.Zero;
}
return WrapInSTS(rc, true);