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

Merge pull request #68 from bakercp/mingw_vs_text

Browse Source 
Fixes to allow cross correct encoding on both codeblocks / mingw and VS
This commit is contained in:
William Woodall 2014-07-15 13:35:28 -07:00
commit 17aac9b77d
1 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/impl/list_ports/list_ports_win.cc
View File

@ -8,6 +8,7 @@
*/
#include "serial/serial.h"
#include <tchar.h>
#include <windows.h>
#include <SetupAPI.h>
#include <devguid.h>
@ -21,6 +22,15 @@ static const DWORD port_name_max_length = 256;
static const DWORD friendly_name_max_length = 256;
static const DWORD hardware_id_max_length = 256;
// Convert a wide Unicode string to an UTF8 string
std::string utf8_encode(const std::wstring &wstr)
{
int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), NULL, 0, NULL, NULL);
std::string strTo( size_needed, 0 );
WideCharToMultiByte (CP_UTF8, 0, &wstr[0], (int)wstr.size(), &strTo[0], size_needed, NULL, NULL);
return strTo;
}
vector<PortInfo>
serial::list_ports()
{
@ -51,12 +61,12 @@ serial::list_ports()
DIREG_DEV,
KEY_READ);
char port_name[port_name_max_length];
TCHAR port_name[port_name_max_length];
DWORD port_name_length = port_name_max_length;
LONG return_code = RegQueryValueEx(
hkey,
"PortName",
_T("PortName"),
NULL,
NULL,
(LPBYTE)port_name,
@ -74,12 +84,12 @@ serial::list_ports()
// Ignore parallel ports
if(strstr(port_name, "LPT") != NULL)
if(_tcsstr(port_name, _T("LPT")) != NULL)
continue;
// Get port friendly name
char friendly_name[friendly_name_max_length];
TCHAR friendly_name[friendly_name_max_length];
DWORD friendly_name_actual_length = 0;
BOOL got_friendly_name = SetupDiGetDeviceRegistryProperty(
@ -98,7 +108,7 @@ serial::list_ports()
// Get hardware ID
char hardware_id[hardware_id_max_length];
TCHAR hardware_id[hardware_id_max_length];
DWORD hardware_id_actual_length = 0;
BOOL got_hardware_id = SetupDiGetDeviceRegistryProperty(
@ -115,10 +125,20 @@ serial::list_ports()
else
hardware_id[0] = '\0';
#ifdef UNICODE
std::string portName = utf8_encode(port_name);
std::string friendlyName = utf8_encode(friendly_name);
std::string hardwareId = utf8_encode(hardware_id);
#else
std::string portName = port_name;
std::string friendlyName = friendly_name;
std::string hardwareId = hardware_id;
#endif
PortInfo port_entry;
port_entry.port = port_name;
port_entry.description = friendly_name;
port_entry.hardware_id = hardware_id;
port_entry.port = portName;
port_entry.description = friendlyName;
port_entry.hardware_id = hardwareId;
devices_found.push_back(port_entry);
}