Skip to content

Commit e79d97f

Browse files
Merge pull request #223 from andyvorld/222-fix-write-failure-net-framework
Added flag to disable changes from #215 for .Net Framework @andyvorld thanks
2 parents 5537968 + 011f6d7 commit e79d97f

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

src/Device.Net/Windows/ApiService.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ namespace Device.Net.Windows
1414
internal class ApiService : IApiService
1515
{
1616
#region Fields
17+
#if NETFRAMEWORK
18+
private const uint FILE_FLAG_OVERLAPPED = 0;
19+
#else
1720
private const uint FILE_FLAG_OVERLAPPED = 0x40000000;
21+
#endif
1822

1923
protected ILogger Logger { get; }
2024
#endregion

src/Hid.Net/Windows/WindowsHidApiService.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,14 @@ public Guid GetHidGuid()
137137
//TODO: These are not opening as async. If we do, we get an error. This is probably why cancellation tokens don't work.
138138
//https://github.com/MelbourneDeveloper/Device.Net/issues/188
139139

140-
public Stream OpenRead(SafeFileHandle readSafeFileHandle, ushort readBufferSize) => new FileStream(readSafeFileHandle, FileAccess.Read, readBufferSize, true);
141-
142-
public Stream OpenWrite(SafeFileHandle writeSafeFileHandle, ushort writeBufferSize) => new FileStream(writeSafeFileHandle, FileAccess.ReadWrite, writeBufferSize, true);
140+
#if NETFRAMEWORK
141+
private const bool _isAsync = false;
142+
#else
143+
private const bool _isAsync = true;
144+
#endif
145+
public Stream OpenRead(SafeFileHandle readSafeFileHandle, ushort readBufferSize) => new FileStream(readSafeFileHandle, FileAccess.Read, readBufferSize, _isAsync);
146+
147+
public Stream OpenWrite(SafeFileHandle writeSafeFileHandle, ushort writeBufferSize) => new FileStream(writeSafeFileHandle, FileAccess.ReadWrite, writeBufferSize, _isAsync);
143148
#endregion
144149

145150
#region Private Methods

0 commit comments

Comments
 (0)