Myth/serial
1
0
Fork 0
mirror of https://github.com/wjwwood/serial.git synced 2026-01-22 11:44:53 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96 from wjwwood/issue_84

Browse Source 
fix handling of COM ports over 10 on Windows, fixes #84
This commit is contained in:
William Woodall 2015-04-21 21:38:04 -07:00
commit 03ca3be6a8
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/impl/win.cc
View File

@ -20,6 +20,15 @@ using serial::SerialException;
using serial::PortNotOpenedException; using serial::PortNotOpenedException;
using serial::IOException; using serial::IOException;
inline wstring
_prefix_port_if_needed(const wstring &input)
{
static wstring windows_com_port_prefix = L"\\\\.\\";
if (input.compare(windows_com_port_prefix) != 0)
{
return windows_com_port_prefix + input;
}
}
Serial::SerialImpl::SerialImpl (const string &port, unsigned long baudrate, Serial::SerialImpl::SerialImpl (const string &port, unsigned long baudrate,
bytesize_t bytesize, bytesize_t bytesize,
@ -52,7 +61,9 @@ Serial::SerialImpl::open ()
throw SerialException ("Serial port already open."); throw SerialException ("Serial port already open.");
} }
LPCWSTR lp_port = port_.c_str(); // See: https://github.com/wjwwood/serial/issues/84
wstring port_with_prefix = _prefix_port_if_needed(port_);
LPCWSTR lp_port = port_with_prefix.c_str();
fd_ = CreateFileW(lp_port, fd_ = CreateFileW(lp_port,
GENERIC_READ | GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE,
0, 0,