[WLANWIZ] Update 'Connect' button outside of drawing routine

Author: SigmaTel71

dll/shellext/wlanwiz/draw.cpp

@@ -348,16 +348,11 @@ LRESULT CWlanWizard::OnDrawItem(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b
                 if (pdis->itemState & ODS_SELECTED)
                 {
                     ATL::CStringW cswExpandedText = L"";
-                    ATL::CStringW cswConnectButtonText = L"";
 
                     if (wlanNetwork.dwFlags & WLAN_AVAILABLE_NETWORK_CONNECTED)
-                    {
-                        cswConnectButtonText.LoadStringW(IDS_WLANWIZ_DISCONNECT);
                         cswExpandedText.LoadStringW(IDS_WLANWIZ_EXPAND_CONNECTED);
-                    }
                     else
                     {
-                        cswConnectButtonText.LoadStringW(IDS_WLANWIZ_CONNECT);
                         if (wlanNetwork.bSecurityEnabled)
                         {
                             wlanNetwork.dot11DefaultAuthAlgorithm < DOT11_AUTH_ALGO_WPA
@@ -377,7 +372,6 @@ LRESULT CWlanWizard::OnDrawItem(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b
                     };
 
                     DrawTextW(pdis->hDC, cswExpandedText, cswExpandedText.GetLength(), &rcExpandedText, DT_WORDBREAK | DT_LEFT);
-                    GetDlgItem(IDC_WLANWIZ_MAINBUTTON).SetWindowTextW(cswConnectButtonText);
                 }
 
                 SetTextColor(pdis->hDC, crItemText);

dll/shellext/wlanwiz/wlanwiz.cpp

@@ -317,7 +317,10 @@ LRESULT CWlanWizard::OnListBox(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& b
     {
     case LBN_SELCHANGE:
         ATL::CWindow cwLB = hWndCtl;
+        ATL::CStringW cswConnectButtonText = L"";
+
         LRESULT dwItemID = cwLB.SendMessageW(LB_GETCURSEL, 0, 0);
+        DWORD dwConnectBtnStringID = IDS_WLANWIZ_CONNECT;
 
         if (dwItemID == LB_ERR)
             break;
@@ -326,9 +329,16 @@ LRESULT CWlanWizard::OnListBox(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& b
         cwLB.SendMessageW(LB_SETITEMHEIGHT, dwItemID, 136);
 
         this->dwSelectedItemID = static_cast<DWORD>(dwItemID);
+        LRESULT itemRealID = cwLB.SendMessageW(LB_GETITEMDATA, dwItemID);
 
         cwLB.Invalidate(FALSE);
         cwLB.UpdateWindow();
+
+        if (this->lstWlanNetworks->Network[itemRealID].dwFlags & WLAN_AVAILABLE_NETWORK_CONNECTED)
+            dwConnectBtnStringID = IDS_WLANWIZ_DISCONNECT;
+
+        cswConnectButtonText.LoadStringW(dwConnectBtnStringID);
+        m_ConnectButton.SetWindowTextW(cswConnectButtonText);
         break;
     }