[WLANWIZ] Fix improper assigning of adapter's GUID to CWlanWiz::m_sGUID

SigmaTel71 · Jul 29, 2024 · 123cf1b · 123cf1b
1 parent 5b55c36
commit 123cf1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dll/shellext/wlanwiz/wlanwiz.cpp b/dll/shellext/wlanwiz/wlanwiz.cpp
@@ -137,7 +137,7 @@ BOOL CWlanWizard::FindWlanDevice(ATL::CString sGUID)
         {
             if (IsEqualGUID(gWlanDeviceID, this->lstWlanInterfaces[i].InterfaceInfo->InterfaceGuid))
             {
-                this->m_sGUID = sGUID.GetBuffer();
+                StringFromIID(gWlanDeviceID, &this->m_sGUID);
                 return TRUE;
             }
         }

diff --git a/dll/shellext/wlanwiz/wlanwiz_advsettings.cpp b/dll/shellext/wlanwiz/wlanwiz_advsettings.cpp
@@ -43,18 +43,18 @@ LRESULT CWlanWizard::OnAdvancedSettings(WORD wNotifyCode, WORD wID, HWND hWndCtl
 	while (pEnum->Next(1, &lpConnItemPIDL, NULL) == S_OK)
 	{
 		PNETCONIDSTRUCT nfid = reinterpret_cast<PNETCONIDSTRUCT>(lpConnItemPIDL);
-		if (IsEqualGUID(gWlanAdapter, nfid->guidId))
-		{
+		if (!IsEqualGUID(gWlanAdapter, nfid->guidId))
 			ILFree(lpConnItemPIDL);
+		else
 			break;
-		}
 	}
 
 	CComPtr<IContextMenu> pcm;
 	if (SUCCEEDED(pShfConn->GetUIObjectOf(NULL, 1, const_cast<LPCITEMIDLIST*>(&lpConnItemPIDL), IID_IContextMenu, NULL, reinterpret_cast<PVOID*>(&pcm.p))))
 	{
 		CMINVOKECOMMANDINFO ici = { sizeof(ici) };
 		ici.hwnd = NULL;
+		ici.cbSize = sizeof(ici);
 		ici.nShow = SW_NORMAL;
 		ici.lpVerb = "properties";
 		pcm->InvokeCommand(&ici);