[WLANWIZ] Move helper functions outside of ATL callbacks

Author: SigmaTel71

dll/shellext/wlanwiz/CMakeLists.txt

@@ -9,6 +9,7 @@ list(APPEND SOURCE
     wlanwiz.cpp
     advsettings.cpp
     draw.cpp
+    helpers.cpp
     keyb.cpp
     scan.cpp
     subclassproc_lb.cpp

dll/shellext/wlanwiz/main.h

@@ -168,12 +168,6 @@ class CWlanWizard : public CDialogImpl<CWlanWizard>
 	/* Listbox specific variables */
 	DWORD dwSelectedItemID = 0;
 
-	HWND CreateToolTip(int toolID);
-	static DWORD WINAPI ScanNetworksThread(_In_ LPVOID lpParameter);
-	void TryInsertToAdHoc(std::set<DWORD>& setAdHoc, DWORD dwIndex);
-	void TryInsertToKnown(std::set<DWORD>& setProfiles, DWORD dwIndex);
-	DWORD TryFindConnected(DWORD dwIndex);
-
 	LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 	LRESULT OnDrawItem(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 	LRESULT OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
@@ -202,4 +196,12 @@ class CWlanWizard : public CDialogImpl<CWlanWizard>
 
 	/* ALT_MSG_MAP 4 */
 	LRESULT OnPaintGroupBox(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+
+	/* Helper functions */
+	HWND CreateToolTip(_In_ int toolID);
+	static DWORD WINAPI ScanNetworksThread(_In_ LPVOID lpParameter);
+	static ATL::CStringW APNameToUnicode(_In_ PDOT11_SSID dot11Ssid);
+	void TryInsertToAdHoc(_Inout_ std::set<DWORD>& setAdHoc, _In_ DWORD dwIndex);
+	void TryInsertToKnown(_Inout_ std::set<DWORD>& setProfiles, _In_ DWORD dwIndex);
+	DWORD TryFindConnected(_In_ DWORD dwIndex);
 };

dll/shellext/wlanwiz/scan.cpp

@@ -12,48 +12,6 @@
 #include <string>
 #include <vector>
 
-/* Convert SSID from UTF-8 to UTF-16 */ 
-static ATL::CStringW APNameToUnicode(PDOT11_SSID dot11Ssid)
-{
-    int iSSIDLengthWide = MultiByteToWideChar(CP_UTF8, 0, reinterpret_cast<LPCSTR>(dot11Ssid->ucSSID), dot11Ssid->uSSIDLength, NULL, 0);
-
-    ATL::CStringW cswSSID = ATL::CStringW(L"", iSSIDLengthWide);
-    MultiByteToWideChar(CP_UTF8, 0, reinterpret_cast<LPCSTR>(dot11Ssid->ucSSID), dot11Ssid->uSSIDLength, cswSSID.GetBuffer(), iSSIDLengthWide);
-
-    return cswSSID;
-}
-
-void CWlanWizard::TryInsertToKnown(std::set<DWORD>& setProfiles, DWORD dwIndex)
-{
-    PWLAN_AVAILABLE_NETWORK pWlanNetwork = &this->lstWlanNetworks->Network[dwIndex];
-
-    if ((pWlanNetwork->dwFlags & WLAN_AVAILABLE_NETWORK_HAS_PROFILE) == WLAN_AVAILABLE_NETWORK_HAS_PROFILE)
-    {
-        std::wstring_view wsvSSID = APNameToUnicode(&pWlanNetwork->dot11Ssid);
-
-        if (wsvSSID == pWlanNetwork->strProfileName)
-            setProfiles.insert(dwIndex);
-    }
-}
-
-void CWlanWizard::TryInsertToAdHoc(std::set<DWORD>& setAdHoc, DWORD dwIndex)
-{
-    PWLAN_AVAILABLE_NETWORK pWlanNetwork = &this->lstWlanNetworks->Network[dwIndex];
-
-    if (pWlanNetwork->dot11BssType == dot11_BSS_type_independent)
-        setAdHoc.insert(dwIndex);
-}
-
-DWORD CWlanWizard::TryFindConnected(DWORD dwIndex)
-{
-    PWLAN_AVAILABLE_NETWORK pWlanNetwork = &this->lstWlanNetworks->Network[dwIndex];
-
-    if ((pWlanNetwork->dwFlags & WLAN_AVAILABLE_NETWORK_CONNECTED) == WLAN_AVAILABLE_NETWORK_CONNECTED)
-        return dwIndex;
-
-    return MAXDWORD;
-}
-
 LRESULT CWlanWizard::OnScanNetworks(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
 {
     MSG msg;

dll/shellext/wlanwiz/wlanwiz.cpp

@@ -67,43 +67,6 @@ WlanWizOpen(HWND, HINSTANCE, LPCSTR lpszCmdLine, int) {
 
 }
 
-HWND CWlanWizard::CreateToolTip(int nID)
-{
-    ATL::CStringW cswTooltip;
-    BOOL bLoaded = cswTooltip.LoadStringW(nID + 40);
-
-    if (!nID || !bLoaded)
-        return FALSE;
-
-    HWND hDlgItem = this->GetDlgItem(nID);
-    ATL::CWindow hWndTip = ::CreateWindowExW(NULL,
-                                             TOOLTIPS_CLASSW,
-                                             NULL,
-                                             WS_POPUP,
-                                             CW_USEDEFAULT,
-                                             CW_USEDEFAULT,
-                                             CW_USEDEFAULT,
-                                             CW_USEDEFAULT,
-                                             this->m_hWnd,
-                                             NULL,
-                                             wlanwiz_hInstance,
-                                             NULL);
-
-    if (!hDlgItem || !hWndTip)
-        return NULL;
-
-    TOOLINFOW toolInfo = { 0 };
-    toolInfo.cbSize = sizeof(toolInfo);
-    toolInfo.hwnd = this->m_hWnd;
-    toolInfo.uFlags = TTF_IDISHWND | TTF_SUBCLASS;
-    toolInfo.uId = reinterpret_cast<UINT_PTR>(hDlgItem);
-    toolInfo.lpszText = cswTooltip.GetBuffer();
-
-    hWndTip.SendMessageW(TTM_ADDTOOL, NULL, reinterpret_cast<LPARAM>(&toolInfo));
-
-    return hWndTip;
-}
-
 void CWlanWizard::PreCloseCleanup()
 {
     CoTaskMemFree(gModule.m_sGUID);