diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-05-04 09:13:40 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 12:07:07 +0200 |
| commit | b45f0418e34a73da1729376c540b312b14b8ffda (patch) | |
| tree | 7fac0f85020574eafe567c4e2df37cd7638aedc3 | |
| parent | ba2f772dffcae953de561ee7c666cdcb959ddaf8 (diff) | |
Windows 7 - fix nativewifi bearer plugin
The plugin code only handled the 2 events from windows XP, while
there are more events defined on vista/7. As the scan complete event
was being ignored, updates did not complete.
Task-number: QTBUG-24503
Change-Id: Ib1fd6883b0fd6962f61dab7830e577b9292163ef
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
| -rw-r--r-- | src/plugins/bearer/nativewifi/platformdefs.h | 3 | ||||
| -rw-r--r-- | src/plugins/bearer/nativewifi/qnativewifiengine.cpp | 25 |
2 files changed, 21 insertions, 7 deletions
diff --git a/src/plugins/bearer/nativewifi/platformdefs.h b/src/plugins/bearer/nativewifi/platformdefs.h index 7614bdb96a..bd6385d03d 100644 --- a/src/plugins/bearer/nativewifi/platformdefs.h +++ b/src/plugins/bearer/nativewifi/platformdefs.h @@ -45,8 +45,11 @@ #include <wtypes.h> #undef interface +//proper header is wlanapi.h, but that is not included in windows XP + #define WLAN_MAX_NAME_LENGTH 256 #define WLAN_MAX_PHY_TYPE_NUMBER 8 +#define WLAN_NOTIFICATION_SOURCE_ACM 0x00000008 #define WLAN_NOTIFICATION_SOURCE_ALL 0x0000ffff #define WLAN_AVAILABLE_NETWORK_CONNECTED 1 #define WLAN_AVAILABLE_NETWORK_HAS_PROFILE 2 diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp index 90230bb7d0..f9cd6ebccb 100644 --- a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp +++ b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp @@ -69,13 +69,24 @@ void qNotificationCallback(WLAN_NOTIFICATION_DATA *data, QNativeWifiEngine *d) { Q_UNUSED(d); - switch (data->NotificationCode) { - case wlan_notification_acm_connection_complete: - case wlan_notification_acm_disconnected: - QMetaObject::invokeMethod(d, "scanComplete", Qt::QueuedConnection); - break; - default: - ; + if (data->NotificationSource == WLAN_NOTIFICATION_SOURCE_ACM) { + switch (data->NotificationCode) { + case wlan_notification_acm_connection_complete: + case wlan_notification_acm_disconnected: + case wlan_notification_acm_scan_complete: + case wlan_notification_acm_scan_fail: + QMetaObject::invokeMethod(d, "scanComplete", Qt::QueuedConnection); + break; + default: +#ifdef BEARER_MANAGEMENT_DEBUG + qDebug() << "wlan acm notification" << (int)data->NotificationCode; +#endif + break; + } + } else { +#ifdef BEARER_MANAGEMENT_DEBUG + qDebug() << "wlan notification source" << (int)data->NotificationSource << "code" << (int)data->NotificationCode; +#endif } } |