[WLANWIZ] Filter scan results

Eliminate all entries that have profile name different from SSID or not
have profile at all in case there is an entry that fully matches SSID w/
profile name.

Author: SigmaTel71

dll/shellext/wlanwiz/scan.cpp

@@ -164,14 +164,17 @@ LRESULT CWlanWizard::OnScanNetworks(WORD wNotifyCode, WORD wID, HWND hWndCtl, BO
         /* Remove networks that do not have profile name exactly matching SSID */
         for (const auto& dwKnownAPIdx : setAPsWithProfiles)
         {
-            WLAN_AVAILABLE_NETWORK wlanNetWithProfile = this->lstWlanNetworks->Network[dwKnownAPIdx];
+            PWLAN_AVAILABLE_NETWORK wlanNetWithProfile = &this->lstWlanNetworks->Network[dwKnownAPIdx];
 
             vecIndexesBySignalQuality.erase(std::remove_if(vecIndexesBySignalQuality.begin(), vecIndexesBySignalQuality.end(), [&](const DWORD& dwAP)
             {
-               bool bSameNetwork = dwKnownAPIdx == dwAP;
-               bool bProfileNameIsSSID = std::wstring_view(wlanNetWithProfile.strProfileName) == std::wstring_view(APNameToUnicode(&this->lstWlanNetworks->Network[dwAP].dot11Ssid));
+                if (dwKnownAPIdx == dwAP)
+                    return false;
 
-               return !bSameNetwork && !bProfileNameIsSSID;
+                bool bProfileNameIsSSID = std::wstring_view(wlanNetWithProfile->strProfileName) == std::wstring_view(APNameToUnicode(&this->lstWlanNetworks->Network[dwAP].dot11Ssid));
+                bool bHasProfile = (this->lstWlanNetworks->Network[dwAP].dwFlags & WLAN_AVAILABLE_NETWORK_HAS_PROFILE) != 0;
+
+                return bProfileNameIsSSID && !bHasProfile;
             }), vecIndexesBySignalQuality.end());
         }
 
@@ -193,11 +196,15 @@ LRESULT CWlanWizard::OnScanNetworks(WORD wNotifyCode, WORD wID, HWND hWndCtl, BO
         if (dwConnectedTo != MAXDWORD)
         {
             auto connectedIdx = std::find(vecIndexesBySignalQuality.begin(), vecIndexesBySignalQuality.end(), dwConnectedTo) - vecIndexesBySignalQuality.begin();
-            auto middle = connectedIdx + 1 <= vecIndexesBySignalQuality.size()
-                ? vecIndexesBySignalQuality.begin() + connectedIdx + 1
-                : vecIndexesBySignalQuality.end();
 
-            std::rotate(vecIndexesBySignalQuality.begin() + connectedIdx, middle, vecIndexesBySignalQuality.end());
+            if (connectedIdx > 0)
+            {
+                auto middle = connectedIdx + 1 <= vecIndexesBySignalQuality.size()
+                    ? vecIndexesBySignalQuality.begin() + connectedIdx + 1
+                    : vecIndexesBySignalQuality.end();
+
+                std::rotate(vecIndexesBySignalQuality.begin() + connectedIdx, middle, vecIndexesBySignalQuality.end());
+            }
         }
 
         for (const auto& dwNetwork : vecIndexesBySignalQuality)