SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@654 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2018-10-23 12:41:33 +00:00
parent c3daa24f23
commit 98399b08f8
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src_main/core/piobject.cpp
View File

@@ -302,10 +302,10 @@ bool PIObject::piConnectU(PIObject * src, const PIString & ename, PIObject * des
<< "\" and handler \"" << hname << "\" in class \"" << dest_o->className() << "\"! (" << loc << ")"; << "\" and handler \"" << hname << "\" in class \"" << dest_o->className() << "\"! (" << loc << ")";
return false; return false;
} }
//piCout << "connect" << ename << "->" << hname << "with" << args << "args";
src->connections << PIObject::__Connection(addr_dest, addr_src, ename, dest_o, dest, args, performer); src->connections << PIObject::__Connection(addr_dest, addr_src, ename, dest_o, dest, args, performer);
if (que) performer->proc_event_queue = true; if (que) performer->proc_event_queue = true;
dest_o->connectors << src; dest_o->connectors << src;
//piCout << cc << cq << _ol.size();//"connect" << src << "->" << dest_o << ", dest.connectors.size() =" << dest_o->connectors.size();
return true; return true;
} }

13
src_main/io_devices/piserial.cpp
View File

@@ -733,10 +733,15 @@ PIStringList PISerial::availableDevices(bool test) {
RegOpenKey(HKEY_LOCAL_MACHINE, (LPCTSTR)"HARDWARE\\DEVICEMAP\\SERIALCOMM", &key); RegOpenKey(HKEY_LOCAL_MACHINE, (LPCTSTR)"HARDWARE\\DEVICEMAP\\SERIALCOMM", &key);
if (key != 0) { if (key != 0) {
char name[1024], data[1024]; char name[1024], data[1024];
DWORD name_len = 1024, data_len = 1024, type = 0, index = 0; DWORD index = 0;
LONG ret; LONG ret = ERROR_SUCCESS;
while ((ret = RegEnumValue(key, index, (LPTSTR)name, &name_len, NULL, &type, (uchar * )data, &data_len)) != ERROR_NO_MORE_ITEMS) { while (ret != ERROR_NO_MORE_ITEMS) {
dl << PIString(data); memset(name, 0, 1024);
memset(data, 0, 1024);
DWORD name_len = 1024, data_len = 1024, type = 0;
ret = RegEnumValue(key, index, (LPTSTR)name, &name_len, NULL, &type, (uchar * )data, &data_len);
if (ret == ERROR_NO_MORE_ITEMS) break;
dl << PIString(data, data_len);
index++; index++;
} }
RegCloseKey(key); RegCloseKey(key);