nefarius/Nefarius.Peripherals.SerialPort
1
0
Fork 0
Code Issues Pull Requests Activity

Migrated to CsWin32 #1

Merged
nefarius merged 14 commits from nefarius/bugfix/refactoring into master 2024-07-13 15:32:14 +02:00
Conversation 0 Commits 14 Files Changed 9 +3 -10
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eec290ae8f - Show all commits

4
Nefarius.Peripherals.SerialPort/SerialPort.cs
View File

@ -190,7 +190,7 @@ public partial class SerialPort : IDisposable
private void InternalClose() private void InternalClose()
{ {
Win32Com.CancelIo(_hPort.DangerousGetHandle()); PInvoke.CancelIo(_hPort);
if (_rxThread != null) if (_rxThread != null)
{ {
_rxThread.Abort(); _rxThread.Abort();
@ -542,7 +542,7 @@ public partial class SerialPort : IDisposable
{ {
if (Marshal.GetLastWin32Error() == (int)WIN32_ERROR.ERROR_IO_PENDING) if (Marshal.GetLastWin32Error() == (int)WIN32_ERROR.ERROR_IO_PENDING)
{ {
Win32Com.CancelIo(_hPort.DangerousGetHandle()); PInvoke.CancelIo(_hPort);
gotBytes = 0; gotBytes = 0;
} }
else else

9
Nefarius.Peripherals.SerialPort/Win32PInvoke/Win32Com.cs
View File

@ -20,14 +20,7 @@ internal class Win32Com
[DllImport("kernel32.dll")] [DllImport("kernel32.dll")]
internal static extern Boolean GetHandleInformation(IntPtr hObject, out UInt32 lpdwFlags); internal static extern Boolean GetHandleInformation(IntPtr hObject, out UInt32 lpdwFlags);
[DllImport("kernel32.dll")]
internal static extern Boolean CancelIo(IntPtr hFile);
[DllImport("kernel32.dll", SetLastError = true)]
internal static extern Boolean ReadFile(IntPtr hFile, [Out] Byte[] lpBuffer, UInt32 nNumberOfBytesToRead,
out UInt32 nNumberOfBytesRead, IntPtr lpOverlapped);
[DllImport("kernel32.dll")] [DllImport("kernel32.dll")]
internal static extern Boolean TransmitCommChar(IntPtr hFile, Byte cChar); internal static extern Boolean TransmitCommChar(IntPtr hFile, Byte cChar);