From 69d76569ffa32c36081156a3ff5d52e70d88bbbd Mon Sep 17 00:00:00 2001 From: Eugene Wang Date: Sat, 4 Jul 2015 11:18:03 -0400 Subject: [PATCH] Added pluggable log (#44) --- samples/Sample.WPF/MainWindow.xaml.cs | 8 +- samples/Sample.WPF/Sample.WPF.csproj | 11 +-- samples/Sample.WPF/ViewModels/TwainVM.cs | 4 +- samples/Sample.WPF/packages.config | 14 ++-- samples/Sample.Winform/TestForm.cs | 14 ++-- src/NTwain.Net35/NTwain.Net35.csproj | 6 ++ src/NTwain/DataSource.cs | 4 +- src/NTwain/ILog.cs | 83 +++++++++++++++++++ src/NTwain/IPlatformInfo.cs | 8 ++ .../Internals/InternalMessageLoopHook.cs | 2 +- src/NTwain/Internals/TraceLog.cs | 82 ++++++++++++++++++ src/NTwain/Internals/WindowsHook.cs | 1 - src/NTwain/NTwain.csproj | 2 + src/NTwain/PlatformInfo.cs | 28 +++++-- src/NTwain/Properties/VersionInfo.cs | 2 +- src/NTwain/TwainSession.cs | 26 +++--- src/NTwain/TwainSessionInternal.cs | 14 ++-- 17 files changed, 253 insertions(+), 56 deletions(-) create mode 100644 src/NTwain/ILog.cs create mode 100644 src/NTwain/Internals/TraceLog.cs diff --git a/samples/Sample.WPF/MainWindow.xaml.cs b/samples/Sample.WPF/MainWindow.xaml.cs index 6dd1197..e58ebb9 100644 --- a/samples/Sample.WPF/MainWindow.xaml.cs +++ b/samples/Sample.WPF/MainWindow.xaml.cs @@ -30,18 +30,18 @@ namespace Sample.WPF { _twainVM = this.DataContext as TwainVM; - Messenger.Default.Register(this, m => m.HandleRefreshCommands()); - Messenger.Default.Register(this, msg => + Messenger.Default.Register(this, m => m.HandleIt()); + Messenger.Default.Register(this, msg => { if (Dispatcher.CheckAccess()) { - this.HandleDialogMessageModern(msg); + msg.HandleWithModern(this); } else { Dispatcher.BeginInvoke(new Action(() => { - this.HandleDialogMessageModern(msg); + msg.HandleWithModern(this); })); } }); diff --git a/samples/Sample.WPF/Sample.WPF.csproj b/samples/Sample.WPF/Sample.WPF.csproj index 2667bab..bef1d10 100644 --- a/samples/Sample.WPF/Sample.WPF.csproj +++ b/samples/Sample.WPF/Sample.WPF.csproj @@ -44,8 +44,8 @@ - False - ..\..\packages\CommonWin32.2.0.5.5\lib\net35-Client\CommonWin32.dll + ..\..\packages\CommonWin32.2.0.5.6\lib\net35-Client\CommonWin32.dll + True ..\..\packages\MvvmLightLibs.5.1.1.0\lib\net40\GalaSoft.MvvmLight.dll @@ -70,11 +70,12 @@ ..\..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.ShellExtensions.dll - ..\..\packages\ModernWPF.1.2.10\lib\net40-Client\ModernWPF.dll + ..\..\packages\ModernWPF.1.3.0\lib\net40-Client\ModernWPF.dll True - - ..\..\packages\ModernWPF.Mvvm.0.7.0\lib\net40-Client\ModernWPF.Mvvm.dll + + ..\..\packages\ModernWPF.Mvvm.0.7.3\lib\net40-Client\ModernWPF.Mvvm.dll + True diff --git a/samples/Sample.WPF/ViewModels/TwainVM.cs b/samples/Sample.WPF/ViewModels/TwainVM.cs index 74b0e10..cf03964 100644 --- a/samples/Sample.WPF/ViewModels/TwainVM.cs +++ b/samples/Sample.WPF/ViewModels/TwainVM.cs @@ -225,7 +225,7 @@ namespace Sample.WPF { if (e.Exception != null) { - Messenger.Default.Send(new DialogMessage(e.Exception.Message, null) + Messenger.Default.Send(new MessageBoxMessage (e.Exception.Message, null) { Caption = "Transfer Error Exception", Icon = System.Windows.MessageBoxImage.Error, @@ -234,7 +234,7 @@ namespace Sample.WPF } else { - Messenger.Default.Send(new DialogMessage(string.Format("Return Code: {0}\nCondition Code: {1}", e.ReturnCode, e.SourceStatus.ConditionCode), null) + Messenger.Default.Send(new MessageBoxMessage(string.Format("Return Code: {0}\nCondition Code: {1}", e.ReturnCode, e.SourceStatus.ConditionCode), null) { Caption = "Transfer Error", Icon = System.Windows.MessageBoxImage.Error, diff --git a/samples/Sample.WPF/packages.config b/samples/Sample.WPF/packages.config index dc2fc81..b9fb596 100644 --- a/samples/Sample.WPF/packages.config +++ b/samples/Sample.WPF/packages.config @@ -1,10 +1,10 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/samples/Sample.Winform/TestForm.cs b/samples/Sample.Winform/TestForm.cs index 2524b88..963f322 100644 --- a/samples/Sample.Winform/TestForm.cs +++ b/samples/Sample.Winform/TestForm.cs @@ -67,22 +67,22 @@ namespace Sample.Winform _twain = new TwainSession(appId); _twain.StateChanged += (s, e) => { - Debug.WriteLine("State changed to " + _twain.State + " on thread " + Thread.CurrentThread.ManagedThreadId); + PlatformInfo.Current.Log.Info("State changed to " + _twain.State + " on thread " + Thread.CurrentThread.ManagedThreadId); }; _twain.TransferError += (s, e) => { - Debug.WriteLine("Got xfer error on thread " + Thread.CurrentThread.ManagedThreadId); + PlatformInfo.Current.Log.Info("Got xfer error on thread " + Thread.CurrentThread.ManagedThreadId); }; _twain.DataTransferred += (s, e) => { - Debug.WriteLine("Transferred data event on thread " + Thread.CurrentThread.ManagedThreadId); + PlatformInfo.Current.Log.Info("Transferred data event on thread " + Thread.CurrentThread.ManagedThreadId); // example on getting ext image info var infos = e.GetExtImageInfo(ExtendedImageInfo.Camera).Where(it => it.ReturnCode == ReturnCode.Success); foreach (var it in infos) { var values = it.ReadValues(); - Debug.WriteLine(string.Format("{0} = {1}", it.InfoID, values.FirstOrDefault())); + PlatformInfo.Current.Log.Info(string.Format("{0} = {1}", it.InfoID, values.FirstOrDefault())); break; } @@ -115,7 +115,7 @@ namespace Sample.Winform }; _twain.SourceDisabled += (s, e) => { - Debug.WriteLine("Source disabled event on thread " + Thread.CurrentThread.ManagedThreadId); + PlatformInfo.Current.Log.Info("Source disabled event on thread " + Thread.CurrentThread.ManagedThreadId); this.BeginInvoke(new Action(() => { btnStopScan.Enabled = false; @@ -126,13 +126,13 @@ namespace Sample.Winform }; _twain.TransferReady += (s, e) => { - Debug.WriteLine("Transferr ready event on thread " + Thread.CurrentThread.ManagedThreadId); + PlatformInfo.Current.Log.Info("Transferr ready event on thread " + Thread.CurrentThread.ManagedThreadId); e.CancelAll = _stopScan; }; // either set sync context and don't worry about threads during events, // or don't and use control.invoke during the events yourself - Debug.WriteLine("Setup thread = " + Thread.CurrentThread.ManagedThreadId); + PlatformInfo.Current.Log.Info("Setup thread = " + Thread.CurrentThread.ManagedThreadId); _twain.SynchronizationContext = SynchronizationContext.Current; if (_twain.State < 3) { diff --git a/src/NTwain.Net35/NTwain.Net35.csproj b/src/NTwain.Net35/NTwain.Net35.csproj index 5ebe768..e900e24 100644 --- a/src/NTwain.Net35/NTwain.Net35.csproj +++ b/src/NTwain.Net35/NTwain.Net35.csproj @@ -85,6 +85,9 @@ IDataSource.cs + + ILog.cs + IMemoryManager.cs @@ -112,6 +115,9 @@ Internals\TentativeStateCommitable.cs + + Internals\TraceLog.cs + Internals\TransferLogic.cs diff --git a/src/NTwain/DataSource.cs b/src/NTwain/DataSource.cs index bb6cfa4..809eab5 100644 --- a/src/NTwain/DataSource.cs +++ b/src/NTwain/DataSource.cs @@ -36,7 +36,7 @@ namespace NTwain var rc = ReturnCode.Failure; _session.MessageLoopHook.Invoke(() => { - Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: OpenSource.", Thread.CurrentThread.ManagedThreadId)); + PlatformInfo.Current.Log.Debug("Thread {0}: OpenSource.", Thread.CurrentThread.ManagedThreadId); rc = _session.DGControl.Identity.OpenDS(this); _session.UpdateCallback(); @@ -53,7 +53,7 @@ namespace NTwain var rc = ReturnCode.Failure; _session.MessageLoopHook.Invoke(() => { - Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: CloseSource.", Thread.CurrentThread.ManagedThreadId)); + PlatformInfo.Current.Log.Debug("Thread {0}: CloseSource.", Thread.CurrentThread.ManagedThreadId); rc = _session.DGControl.Identity.CloseDS(); //if (rc == ReturnCode.Success) diff --git a/src/NTwain/ILog.cs b/src/NTwain/ILog.cs new file mode 100644 index 0000000..d9b4cc9 --- /dev/null +++ b/src/NTwain/ILog.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace NTwain +{ + /// + /// Simple log interface used by NTwain. + /// + public interface ILog + { + /// + /// Gets or sets a value indicating whether info messages will be logged. + /// + /// + /// true to enable info logging. + /// + bool IsInfoEnabled { get; set; } + + /// + /// Gets or sets a value indicating whether debug messages will be logged. + /// + /// + /// true to enable debug logging. + /// + bool IsDebugEnabled { get; set; } + + /// + /// Gets or sets a value indicating whether error messages will be logged. + /// + /// + /// true to enable error logging. + /// + bool IsErrorEnabled { get; set; } + + /// + /// Logs info type message. + /// + /// The message. + void Info(string message); + + /// + /// Logs info type message. + /// + /// The message format. + /// The arguments. + void Info(string messageFormat, params object[] args); + + /// + /// Logs debug type message. + /// + /// The message. + void Debug(string message); + /// + /// Logs debug type message. + /// + /// The message format. + /// The arguments. + void Debug(string messageFormat, params object[] args); + + /// + /// Logs error type message. + /// + /// The message. + void Error(string message); + + /// + /// Logs error type message. + /// + /// The message. + /// The exception. + void Error(string message, Exception exception); + + /// + /// Logs error type message. + /// + /// The message format. + /// The exception. + /// The arguments. + void Error(string messageFormat, Exception exception, params object[] args); + } +} diff --git a/src/NTwain/IPlatformInfo.cs b/src/NTwain/IPlatformInfo.cs index efd3a3d..0371028 100644 --- a/src/NTwain/IPlatformInfo.cs +++ b/src/NTwain/IPlatformInfo.cs @@ -86,5 +86,13 @@ namespace NTwain /// The memory manager. /// IMemoryManager MemoryManager { get; } + + /// + /// Gets or sets the log used by NTwain. + /// + /// + /// The log. + /// + ILog Log { get; set; } } } diff --git a/src/NTwain/Internals/InternalMessageLoopHook.cs b/src/NTwain/Internals/InternalMessageLoopHook.cs index 3902220..93aa1de 100644 --- a/src/NTwain/Internals/InternalMessageLoopHook.cs +++ b/src/NTwain/Internals/InternalMessageLoopHook.cs @@ -34,7 +34,7 @@ namespace NTwain.Internals { var loopThread = new Thread(new ThreadStart(() => { - Debug.WriteLine("NTwain message loop is starting."); + PlatformInfo.Current.Log.Debug("NTwain internal message loop is starting."); _dispatcher = Dispatcher.CurrentDispatcher; if (!PlatformInfo.Current.IsOnMono) { diff --git a/src/NTwain/Internals/TraceLog.cs b/src/NTwain/Internals/TraceLog.cs new file mode 100644 index 0000000..e607478 --- /dev/null +++ b/src/NTwain/Internals/TraceLog.cs @@ -0,0 +1,82 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; + +namespace NTwain.Internals +{ + class TraceLog : ILog + { + public TraceLog() + { + IsInfoEnabled = true; + IsErrorEnabled = true; + } + + public bool IsInfoEnabled { get; set; } + + public bool IsDebugEnabled { get; set; } + + public bool IsErrorEnabled { get; set; } + + + public void Info(string message) + { + if (IsInfoEnabled && message != null) + { + System.Diagnostics.Trace.WriteLine(message, "Info"); + } + } + + public void Info(string messageFormat, params object[] args) + { + Debug(string.Format(CultureInfo.CurrentCulture, messageFormat, args)); + } + + public void Debug(string message) + { + if (IsDebugEnabled && message != null) + { + System.Diagnostics.Trace.WriteLine(message, "Debug"); + } + } + + public void Debug(string messageFormat, params object[] args) + { + Debug(string.Format(CultureInfo.CurrentCulture, messageFormat, args)); + } + + public void Error(string message) + { + if (IsErrorEnabled && message != null) + { + System.Diagnostics.Trace.WriteLine(message, "Error"); + } + } + + public void Error(string message, Exception exception) + { + if (exception == null) + { + Error(message); + } + else + { + Error(message + Environment.NewLine + exception.ToString()); + } + } + + public void Error(string messageFormat, Exception exception, params object[] args) + { + if (exception == null) + { + Error(string.Format(CultureInfo.CurrentCulture, messageFormat, args)); + } + else + { + Error(string.Format(CultureInfo.CurrentCulture, messageFormat, args) + Environment.NewLine + exception.ToString()); + } + } + } +} diff --git a/src/NTwain/Internals/WindowsHook.cs b/src/NTwain/Internals/WindowsHook.cs index ed686c5..8b274aa 100644 --- a/src/NTwain/Internals/WindowsHook.cs +++ b/src/NTwain/Internals/WindowsHook.cs @@ -47,7 +47,6 @@ namespace NTwain.Internals } if (!handled) { - Debug.WriteLine("Hwnd=" + hwnd); handled = true; // unnecessary to do default wndproc? return NativeMethods.DefWindowProc(hwnd, (uint)msg, wParam, lParam); diff --git a/src/NTwain/NTwain.csproj b/src/NTwain/NTwain.csproj index cebbd26..b1f3b01 100644 --- a/src/NTwain/NTwain.csproj +++ b/src/NTwain/NTwain.csproj @@ -63,6 +63,8 @@ + + diff --git a/src/NTwain/PlatformInfo.cs b/src/NTwain/PlatformInfo.cs index 224b8af..e16073f 100644 --- a/src/NTwain/PlatformInfo.cs +++ b/src/NTwain/PlatformInfo.cs @@ -32,7 +32,7 @@ namespace NTwain IsOnMono = Type.GetType("Mono.Runtime") != null; IsWindows = Environment.OSVersion.Platform == PlatformID.Win32NT; IsLinux = Environment.OSVersion.Platform == PlatformID.Unix; - + _defaultLog = new TraceLog(); if (IsWindows) { _defaultMemManager = new WinMemoryManager(); @@ -84,7 +84,7 @@ namespace NTwain ExpectedDsmPath = newDsmPath; IsSupported = DsmExists = File.Exists(ExpectedDsmPath); UseNewWinDSM = true; - Debug.WriteLine("Using new dsm in windows."); + Log.Debug("Using new dsm in windows."); } else { @@ -92,14 +92,14 @@ namespace NTwain { ExpectedDsmPath = newDsmPath; UseNewWinDSM = IsSupported = DsmExists = true; - Debug.WriteLine("Using new dsm in windows."); + Log.Debug("Using new dsm in windows."); } else { ExpectedDsmPath = oldDsmPath; IsSupported = DsmExists = File.Exists(ExpectedDsmPath); UseNewWinDSM = false; - Debug.WriteLine("Using old dsm in windows."); + Log.Debug("Using old dsm in windows."); } } } @@ -186,13 +186,29 @@ namespace NTwain { get { - if (_specifiedMemManager == null) { return _defaultMemManager; } - return _specifiedMemManager; + return _specifiedMemManager ?? _defaultMemManager; } internal set { _specifiedMemManager = value; } } + + + readonly ILog _defaultLog; + private ILog _log; + + /// + /// Gets or sets the log used by NTwain. + /// + /// + /// The log. + /// + public ILog Log + { + get { return _log ?? _defaultLog; } + set { _log = value; } + } + } } diff --git a/src/NTwain/Properties/VersionInfo.cs b/src/NTwain/Properties/VersionInfo.cs index 2477df9..90a0550 100644 --- a/src/NTwain/Properties/VersionInfo.cs +++ b/src/NTwain/Properties/VersionInfo.cs @@ -23,7 +23,7 @@ namespace NTwain /// /// The build release version number. /// - public const string Build = "3.3.4"; // change this for each nuget release + public const string Build = "3.3.5"; // change this for each nuget release } diff --git a/src/NTwain/TwainSession.cs b/src/NTwain/TwainSession.cs index b8d5e45..55b2de6 100644 --- a/src/NTwain/TwainSession.cs +++ b/src/NTwain/TwainSession.cs @@ -62,7 +62,7 @@ namespace NTwain DataSource GetSourceInstance(ITwainSessionInternal session, TWIdentity sourceId) { DataSource source = null; - Debug.WriteLine("Source id = " + sourceId.Id); + PlatformInfo.Current.Log.Debug("Source id = {0}", sourceId.Id); var key = string.Format(CultureInfo.InvariantCulture, "{0}|{1}|{2}|{3}", sourceId.Id, sourceId.Manufacturer, sourceId.ProductFamily, sourceId.ProductName); if (_ownedSources.ContainsKey(key)) { @@ -230,7 +230,7 @@ namespace NTwain var rc = ReturnCode.Failure; _msgLoopHook.Invoke(() => { - Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: OpenManager.", Thread.CurrentThread.ManagedThreadId)); + PlatformInfo.Current.Log.Debug("Thread {0}: OpenManager.", Thread.CurrentThread.ManagedThreadId); rc = ((ITwainSessionInternal)this).DGControl.Parent.OpenDsm(_msgLoopHook.Handle); if (rc == ReturnCode.Success) @@ -243,7 +243,7 @@ namespace NTwain if (rc == ReturnCode.Success) { PlatformInfo.InternalCurrent.MemoryManager = entry; - Debug.WriteLine("Using TWAIN2 memory functions."); + PlatformInfo.Current.Log.Debug("Using TWAIN2 memory functions."); } else { @@ -264,7 +264,7 @@ namespace NTwain var rc = ReturnCode.Failure; _msgLoopHook.Invoke(() => { - Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: CloseManager.", Thread.CurrentThread.ManagedThreadId)); + PlatformInfo.Current.Log.Debug("Thread {0}: CloseManager.", Thread.CurrentThread.ManagedThreadId); rc = ((ITwainSessionInternal)this).DGControl.Parent.CloseDsm(_msgLoopHook.Handle); if (rc == ReturnCode.Success) @@ -360,7 +360,7 @@ namespace NTwain /// State of the target. public void ForceStepDown(int targetState) { - Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: ForceStepDown.", Thread.CurrentThread.ManagedThreadId)); + PlatformInfo.Current.Log.Debug("Thread {0}: ForceStepDown.", Thread.CurrentThread.ManagedThreadId); bool origFlag = EnforceState; EnforceState = false; @@ -462,7 +462,7 @@ namespace NTwain } catch (Exception ex) { - Debug.WriteLine("PropertyChanged event error: " + ex.ToString()); + PlatformInfo.Current.Log.Error("PropertyChanged event error.", ex); } } else @@ -476,7 +476,7 @@ namespace NTwain } catch (Exception ex) { - Debug.WriteLine("PropertyChanged event error: " + ex.ToString()); + PlatformInfo.Current.Log.Error("PropertyChanged event error.", ex); } }, null); } @@ -533,7 +533,7 @@ namespace NTwain } catch (Exception ex) { - Debug.WriteLine(handler.Method.Name + " event error: " + ex.ToString()); + PlatformInfo.Current.Log.Error("{0} event error.", ex, handler.Method.Name); } } else @@ -547,7 +547,7 @@ namespace NTwain } catch (Exception ex) { - Debug.WriteLine(handler.Method.Name + " event error: " + ex.ToString()); + PlatformInfo.Current.Log.Error("{0} event error.", ex, handler.Method.Name); } }, null); } @@ -566,7 +566,7 @@ namespace NTwain var syncer = SynchronizationContext; if (syncer == null) { - Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Trying to raise event {0} on thread {1} without sync.", e.GetType().Name, Thread.CurrentThread.ManagedThreadId)); + PlatformInfo.Current.Log.Debug("Trying to raise event {0} on thread {1} without sync.", e.GetType().Name, Thread.CurrentThread.ManagedThreadId); try { @@ -575,12 +575,12 @@ namespace NTwain } catch (Exception ex) { - Debug.WriteLine(handler.Method.Name + " event error: " + ex.ToString()); + PlatformInfo.Current.Log.Error("{0} event error.", ex, handler.Method.Name); } } else { - Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Trying to raise event {0} on thread {1} with sync.", e.GetType().Name, Thread.CurrentThread.ManagedThreadId)); + PlatformInfo.Current.Log.Debug("Trying to raise event {0} on thread {1} with sync.", e.GetType().Name, Thread.CurrentThread.ManagedThreadId); // on some consumer desktop scanner with poor drivers this can frequently hang. there's nothing I can do here. syncer.Send(o => { @@ -591,7 +591,7 @@ namespace NTwain } catch (Exception ex) { - Debug.WriteLine(handler.Method.Name + " event error: " + ex.ToString()); + PlatformInfo.Current.Log.Error("{0} event error.", ex, handler.Method.Name); } }, null); } diff --git a/src/NTwain/TwainSessionInternal.cs b/src/NTwain/TwainSessionInternal.cs index 46d43d1..493f99f 100644 --- a/src/NTwain/TwainSessionInternal.cs +++ b/src/NTwain/TwainSessionInternal.cs @@ -45,7 +45,7 @@ namespace NTwain if (rc == ReturnCode.Success) { - Debug.WriteLine("Registered callback2 OK."); + PlatformInfo.Current.Log.Debug("Registered callback2 OK."); _callbackObj = cb; } } @@ -59,7 +59,7 @@ namespace NTwain if (rc == ReturnCode.Success) { - Debug.WriteLine("Registered callback OK."); + PlatformInfo.Current.Log.Debug("Registered callback OK."); _callbackObj = cb; } } @@ -159,7 +159,7 @@ namespace NTwain _msgLoopHook.Invoke(() => { - Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: EnableSource with {1}.", Thread.CurrentThread.ManagedThreadId, mode)); + PlatformInfo.Current.Log.Debug("Thread {0}: EnableSource with {1}.", Thread.CurrentThread.ManagedThreadId, mode); _twui = new TWUserInterface(); @@ -190,7 +190,7 @@ namespace NTwain { _msgLoopHook.Invoke(() => { - Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: DisableSource.", Thread.CurrentThread.ManagedThreadId)); + PlatformInfo.Current.Log.Debug("Thread {0}: DisableSource.", Thread.CurrentThread.ManagedThreadId); rc = ((ITwainSessionInternal)this).DGControl.UserInterface.DisableDS(_twui); if (rc == ReturnCode.Success) @@ -242,7 +242,7 @@ namespace NTwain evt.pEvent = msgPtr; if (handled = (((ITwainSessionInternal)this).DGControl.Event.ProcessEvent(evt) == ReturnCode.DSEvent)) { - Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: HandleWndProcMessage at state {1} with MSG={2}.", Thread.CurrentThread.ManagedThreadId, State, evt.TWMessage)); + PlatformInfo.Current.Log.Debug("Thread {0}: HandleWndProcMessage at state {1} with MSG={2}.", Thread.CurrentThread.ManagedThreadId, State, evt.TWMessage); HandleSourceMsg(evt.TWMessage); } @@ -264,7 +264,7 @@ namespace NTwain { if (origin != null && CurrentSource != null && origin.Id == CurrentSource.Identity.Id && _state >= 5) { - Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: CallbackHandler at state {1} with MSG={2}.", Thread.CurrentThread.ManagedThreadId, State, msg)); + PlatformInfo.Current.Log.Debug("Thread {0}: CallbackHandler at state {1} with MSG={2}.", Thread.CurrentThread.ManagedThreadId, State, msg); // spec says we must handle this on the thread that enabled the DS. // by using the internal dispatcher this will be the case. @@ -282,6 +282,7 @@ namespace NTwain // final method that handles msg from the source, whether it's from wndproc or callbacks void HandleSourceMsg(Message msg) { + PlatformInfo.Current.Log.Debug("Got TWAIN msg " + msg); switch (msg) { case Message.XferReady: @@ -301,7 +302,6 @@ namespace NTwain break; case Message.CloseDSReq: case Message.CloseDSOK: - Debug.WriteLine("Got msg " + msg); // even though it says closeDS it's really disable. // dsok is sent if source is enabled with uionly