fix com port detection on windows

jef · jef · commit 9f79f6f1cc57 · 2010-10-05T12:30:43.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14339 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -889,7 +889,9 @@ void QgsGPSInformationWidget::populateDevices()
   QList< QPair<QString, QString> > ports = QgsGPSDetector::availablePorts();
 
   mCboDevices->clear();
-  for ( int i = 0; i < ports.size(); i++ )
+
+  // add devices to combobox, but skip gpsd which is first.
+  for ( int i = 1; i < ports.size(); i++ )
   {
     mCboDevices->addItem( ports[i].second, ports[i].first );
   }
diff --git a/src/core/gps/qextserialport/qextserialenumerator.cpp b/src/core/gps/qextserialport/qextserialenumerator.cpp
@@ -85,7 +85,27 @@ QextSerialEnumerator::~QextSerialEnumerator( )
     //static
     void QextSerialEnumerator::setupAPIScan(QList<QextPortInfo> & infoList)
     {
+#if 0
         enumerateDevicesWin(GUID_DEVCLASS_PORTS, &infoList);
+#else
+        // just iterate the com ports.
+        // looks like GUID_DEVCLASS_PORTS doesn't find them all.
+        for( unsigned int i = 0 ; i < 256; i++ )
+        {
+          QString port = "\\\\.\\COM" + QString::number(i);
+
+          HANDLE hPort = ::CreateFile(port.toAscii(), GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
+          if( hPort == INVALID_HANDLE_VALUE )
+            continue;
+
+          QextPortInfo info;
+          info.friendName = QString("COM%1:").arg( i );
+          info.portName = port;
+          infoList.append(info);
+
+          CloseHandle( hPort );
+				}
+#endif
     }
 
     void QextSerialEnumerator::enumerateDevicesWin( const GUID & guid, QList<QextPortInfo>* infoList )

Original file line number	Diff line number	Diff line change
`@@ -889,7 +889,9 @@ void QgsGPSInformationWidget::populateDevices()`
`889`	`889`	`QList< QPair<QString, QString> > ports = QgsGPSDetector::availablePorts();`
`890`	`890`
`891`	`891`	`mCboDevices->clear();`
`892`		`- for ( int i = 0; i < ports.size(); i++ )`
	`892`	`+`
	`893`	`+ // add devices to combobox, but skip gpsd which is first.`
	`894`	`+ for ( int i = 1; i < ports.size(); i++ )`
`893`	`895`	`{`
`894`	`896`	`mCboDevices->addItem( ports[i].second, ports[i].first );`
`895`	`897`	`}`