Search modern settings using our new shell folder

ge0rdi · ge0rdi · commit 0da20180ac44 · 2020-08-29T14:03:59.000+02:00
Use our modern settings shell folder (`shell:::{82E749ED-B971-4550-BAF7-06AA2BF7E836}`) to search (enumerate) modern settings. Fixes #57
diff --git a/Src/StartMenu/StartMenuDLL/MenuCommands.cpp b/Src/StartMenu/StartMenuDLL/MenuCommands.cpp
@@ -2192,11 +2192,15 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
 
 	if (res==CMD_PINSETTING)
 	{
-		CSearchManager::TItemCategory cat=(CSearchManager::TItemCategory)(item.categoryHash&CSearchManager::CATEGORY_MASK);
-		if (cat==CSearchManager::CATEGORY_SETTING)
-			CreatePinLink(pItemPidl1,item.name,NULL,0);
-		else if (cat==CSearchManager::CATEGORY_METROSETTING)
-			CreatePinLink(pItemPidl1,item.name,L"%windir%\\ImmersiveControlPanel\\systemsettings.exe",0);
+		CString iconPath;
+		if (item.pItemInfo)
+		{
+			CItemManager::RWLock lock(&g_ItemManager, false, CItemManager::RWLOCK_ITEMS);
+			if (_wcsicmp(PathFindExtension(item.pItemInfo->GetPath()), L".settingcontent-ms") == 0)
+				iconPath = L"%windir%\\ImmersiveControlPanel\\systemsettings.exe";
+		}
+
+		CreatePinLink(pItemPidl1, item.name, iconPath.IsEmpty() ? nullptr : iconPath.GetString(), 0);
 		m_bRefreshItems=true;
 	}
 
diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp
@@ -2656,17 +2656,11 @@ int CMenuContainer::AddSearchItems( const std::vector<SearchItem> &items, const
 				if (!categoryName.IsEmpty())
 				{
 					MenuItem item(MENU_SEARCH_CATEGORY);
-					if (categoryHash==CSearchManager::CATEGORY_PROGRAM || categoryHash==CSearchManager::CATEGORY_SETTING)
-					{
-						item.name.Format(L"%s (%d)",categoryName,originalCount);
-					}
-					else
-					{
-						item.name=categoryName;
-						item.bSplit=(s_Skin.More_bitmap_Size.cx>0);
-					}
+					item.name.Format(L"%s (%d)",categoryName,originalCount);
 					item.nameHash=CalcFNVHash(categoryName);
 					item.categoryHash=categoryHash;
+					if (categoryHash!=CSearchManager::CATEGORY_PROGRAM || categoryHash!=CSearchManager::CATEGORY_SETTING)
+						item.bSplit=(s_Skin.More_bitmap_Size.cx>0);
 					m_Items.push_back(item);
 				}
 			}
@@ -2724,7 +2718,7 @@ bool CMenuContainer::InitSearchItems( void )
 	unsigned int runCategoryHash=0;
 	CString runCommand;
 	CComString runExe;
-	if (!bAutoComlpete && !s_bNoRun && s_SearchResults.programs.empty() && s_SearchResults.settings.empty())
+	if (!bAutoComlpete && !s_bNoRun && s_SearchResults.programs.empty() && s_SearchResults.settings.empty() && s_SearchResults.metrosettings.empty())
 	{
 		if (s_bWin7Style)
 			m_SearchBox.GetWindowText(runCommand);
@@ -2787,6 +2781,12 @@ bool CMenuContainer::InitSearchItems( void )
 			if (m_SearchCategoryHash==CSearchManager::CATEGORY_SETTING)
 				selectedCount=(int)s_SearchResults.settings.size();
 		}
+		if (!s_SearchResults.metrosettings.empty())
+		{
+			counts.push_back((int)s_SearchResults.metrosettings.size());
+			if (m_SearchCategoryHash==CSearchManager::CATEGORY_METROSETTING)
+				selectedCount=(int)s_SearchResults.metrosettings.size();
+		}
 		for (std::list<CSearchManager::SearchCategory>::const_iterator it=s_SearchResults.indexed.begin();it!=s_SearchResults.indexed.end();++it)
 		{
 			if (!it->items.empty())
@@ -2829,14 +2829,16 @@ bool CMenuContainer::InitSearchItems( void )
 
 	// add categories
 	std::list<CSearchManager::SearchCategory>::const_iterator it=s_SearchResults.indexed.begin();
-	for (size_t idx=0;idx<s_SearchResults.indexed.size()+2;idx++)
+	for (size_t idx=0;idx<s_SearchResults.indexed.size()+3;idx++)
 	{
 		items.clear();
 		unsigned int categoryHash;
 		if (idx==0)
 			categoryHash=CSearchManager::CATEGORY_PROGRAM;
 		else if (idx==1)
 			categoryHash=CSearchManager::CATEGORY_SETTING;
+		else if (idx==2)
+			categoryHash=CSearchManager::CATEGORY_METROSETTING;
 		else
 			categoryHash=it->categoryHash;
 
@@ -2854,7 +2856,7 @@ bool CMenuContainer::InitSearchItems( void )
 		}
 		if (count<=0)
 		{
-			if (idx>=2) ++it;
+			if (idx>=3) ++it;
 			continue;
 		}
 
@@ -2880,6 +2882,16 @@ bool CMenuContainer::InitSearchItems( void )
 				items.push_back(SearchItem(*it));
 			name=FindTranslation(L"Search.CategorySettings",L"Settings");
 		}
+		else if (idx==2)
+		{
+			originalCount=(int)s_SearchResults.metrosettings.size();
+			if (count>originalCount)
+				count=originalCount;
+			items.reserve(count);
+			for (std::vector<const CItemManager::ItemInfo*>::const_iterator it=s_SearchResults.metrosettings.begin();it!=s_SearchResults.metrosettings.end() && (int)items.size()<count;++it)
+				items.push_back(SearchItem(*it));
+			name=FindTranslation(L"Search.CategoryPCSettings", L"Modern Settings");
+		}
 		else
 		{
 			originalCount=(int)it->items.size();
diff --git a/Src/StartMenu/StartMenuDLL/SearchManager.cpp b/Src/StartMenu/StartMenuDLL/SearchManager.cpp
@@ -170,6 +170,7 @@ void CSearchManager::CloseMenu( void )
 	m_SettingsItems.clear();
 	m_SettingsHash=FNV_HASH0;
 	m_bSettingsFound=false;
+	m_bMetroSettingsFound = false;
 
 	m_IndexedItems.clear();
 	m_AutoCompleteItems.clear();
@@ -310,7 +311,9 @@ bool CSearchManager::AddSearchItem( IShellItem *pItem, const wchar_t *name, int
 		PROPVARIANT val;
 		PropVariantInit(&val);
 		pItem2->GetProperty(PKEY_Keywords,&val);
-		wchar_t keywords[1024];
+		if (val.vt==VT_EMPTY)
+			pItem2->GetProperty(PKEY_HighKeywords,&val);
+		wchar_t keywords[2048];
 		int len=0;
 		if (val.vt==VT_BSTR || val.vt==VT_LPWSTR)
 		{
@@ -334,7 +337,7 @@ bool CSearchManager::AddSearchItem( IShellItem *pItem, const wchar_t *name, int
 	}
 
 	Lock lock(this,LOCK_DATA);
-	if (category==CATEGORY_PROGRAM || category==CATEGORY_SETTING)
+	if (category==CATEGORY_PROGRAM || category==CATEGORY_SETTING || category==CATEGORY_METROSETTING)
 	{
 		if (searchRequest.requestId<m_LastProgramsRequestId)
 			return false;
@@ -345,10 +348,10 @@ bool CSearchManager::AddSearchItem( IShellItem *pItem, const wchar_t *name, int
 			return false;
 	}
 	bool res=true;
-	if (category==CATEGORY_PROGRAM || category==CATEGORY_SETTING)
+	if (category==CATEGORY_PROGRAM || category==CATEGORY_SETTING || category==CATEGORY_METROSETTING)
 	{
 		std::vector<SearchItem> &items=(category==CATEGORY_PROGRAM)?m_ProgramItems:m_SettingsItems;
-		if (category==CATEGORY_SETTING)
+		if (category==CATEGORY_SETTING || category==CATEGORY_METROSETTING)
 		{
 			// remove duplicate settings
 			for (std::vector<SearchItem>::const_iterator it=items.begin();it!=items.end();++it)
@@ -381,6 +384,8 @@ bool CSearchManager::AddSearchItem( IShellItem *pItem, const wchar_t *name, int
 		}
 
 		items.push_back(item);
+		if (item.category==CATEGORY_METROSETTING)
+			m_bMetroSettingsFound=true;
 	}
 	else if (category==CATEGORY_AUTOCOMPLETE)
 	{
@@ -409,7 +414,7 @@ void CSearchManager::CollectSearchItems( IShellItem *pFolder, int flags, TItemCa
 	CComPtr<IShellItem> pChild;
 	while (pChild=NULL,pEnum->Next(1,&pChild,NULL)==S_OK)
 	{
-		if (category==CATEGORY_PROGRAM || category==CATEGORY_SETTING)
+		if (category==CATEGORY_PROGRAM || category==CATEGORY_SETTING || category==CATEGORY_METROSETTING)
 		{
 			if (searchRequest.requestId<m_LastProgramsRequestId)
 				break;
@@ -428,7 +433,7 @@ void CSearchManager::CollectSearchItems( IShellItem *pFolder, int flags, TItemCa
 			{
 				// go into subfolders but not archives or links to folders
 				CollectSearchItems(pChild,flags,category,searchRequest);
-				if (category==CATEGORY_PROGRAM || category==CATEGORY_SETTING)
+				if (category==CATEGORY_PROGRAM || category==CATEGORY_SETTING || category==CATEGORY_METROSETTING)
 				{
 					if (searchRequest.requestId<m_LastProgramsRequestId)
 						break;
@@ -733,6 +738,14 @@ void CSearchManager::SearchThread( void )
 					if (searchRequest.requestId<m_LastProgramsRequestId)
 						continue;
 				}
+				if (searchRequest.bSearchMetroSettings)
+				{
+					CComPtr<IShellItem> pFolder;
+					if (SUCCEEDED(SHCreateItemFromParsingName(L"shell:::{82E749ED-B971-4550-BAF7-06AA2BF7E836}",NULL,IID_IShellItem,(void**)&pFolder)))
+						CollectSearchItems(pFolder,(searchRequest.bSearchKeywords?COLLECT_KEYWORDS:0)|COLLECT_NOREFRESH,CATEGORY_METROSETTING,searchRequest);
+					if (searchRequest.requestId<m_LastProgramsRequestId)
+						continue;
+				}
 			}
 			bool bRefresh=false;
 			{
@@ -780,12 +793,12 @@ void CSearchManager::SearchThread( void )
 		{
 			std::list<SearchScope> scopeList;
 
-			if (searchRequest.bSearchMetroSettings)
+			if (searchRequest.bSearchMetroSettings && !m_bMetroSettingsFound)
 			{
 				scopeList.push_back(SearchScope());
 				SearchScope &scope=*scopeList.rbegin();
 				scope.bFiles=true;
-				scope.name=FindTranslation(L"Search.CategoryPCSettings",L"Settings");
+				scope.name=FindTranslation(L"Search.CategoryPCSettings",L"Modern Settings");
 				scope.categoryHash=CATEGORY_METROSETTING;
 				scope.roots.push_back(L"FILE:");
 			}
@@ -1240,7 +1253,7 @@ void CSearchManager::SearchThread( void )
 						Lock lock(this,LOCK_DATA);
 						m_IndexedItems.push_back(SearchCategory());
 						pCategory=&*m_IndexedItems.rbegin();
-						pCategory->name.Format(L"%s (%d)",it->name,it->resultCount);
+						pCategory->name=it->name;
 						pCategory->categoryHash=it->categoryHash;
 						pCategory->search.Clone(it->search);
 					}
@@ -1348,6 +1361,7 @@ void CSearchManager::GetSearchResults( SearchResults &results )
 {
 	results.programs.clear();
 	results.settings.clear();
+	results.metrosettings.clear();
 	results.indexed.clear();
 	results.autocomplete.clear();
 	results.autoCompletePath.Empty();
@@ -1397,14 +1411,19 @@ void CSearchManager::GetSearchResults( SearchResults &results )
 			std::vector<SearchItem> &settings=m_bSettingsFound?m_SettingsItems:m_SettingsItemsOld;
 			for (std::vector<SearchItem>::iterator it=settings.begin();it!=settings.end();++it)
 			{
-				int match=(it->category==CATEGORY_SETTING)?it->MatchText(m_SearchText,bSearchSubWord):0;
+				int match=(it->category==CATEGORY_SETTING || it->category==CATEGORY_METROSETTING)?it->MatchText(m_SearchText,bSearchSubWord):0;
 				it->rank=(it->rank&0xFFFFFFFE)|(match>>1);
 			}
 			std::sort(settings.begin(),settings.end());
 			for (std::vector<SearchItem>::const_iterator it=settings.begin();it!=settings.end();++it)
 			{
-				if (it->category==CATEGORY_SETTING && it->MatchText(m_SearchText,bSearchSubWord))
-					results.settings.push_back(it->pInfo);
+				if (it->MatchText(m_SearchText, bSearchSubWord))
+				{
+					if (it->category==CATEGORY_SETTING)
+						results.settings.push_back(it->pInfo);
+					if (it->category==CATEGORY_METROSETTING)
+						results.metrosettings.push_back(it->pInfo);
+				}
 			}
 		}
 
@@ -1423,7 +1442,7 @@ void CSearchManager::GetSearchResults( SearchResults &results )
 				results.autocomplete.push_back(it->pInfo);
 		}
 	}
-	results.bResults=(!results.programs.empty() || !results.settings.empty() || !results.indexed.empty() || !results.autocomplete.empty());
+	results.bResults=(!results.programs.empty() || !results.settings.empty() || !results.metrosettings.empty() || !results.indexed.empty() || !results.autocomplete.empty());
 	results.bSearching=(m_LastCompletedId!=m_LastRequestId);
 }
 
diff --git a/Src/StartMenu/StartMenuDLL/SearchManager.h b/Src/StartMenu/StartMenuDLL/SearchManager.h
@@ -63,6 +63,7 @@ class CSearchManager
 		CString autoCompletePath;
 		std::vector<const CItemManager::ItemInfo*> programs;
 		std::vector<const CItemManager::ItemInfo*> settings;
+		std::vector<const CItemManager::ItemInfo*> metrosettings;
 		std::vector<const CItemManager::ItemInfo*> autocomplete;
 		std::list<SearchCategory> indexed;
 	};
@@ -149,6 +150,7 @@ class CSearchManager
 	unsigned int m_SettingsHashOld;
 	bool m_bProgramsFound;
 	bool m_bSettingsFound;
+	bool m_bMetroSettingsFound = false;
 	std::vector<SearchItem> m_AutoCompleteItems;
 	std::list<SearchCategory> m_IndexedItems;
 	std::vector<ItemRank> m_ItemRanks;

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,7 @@ void CSearchManager::CloseMenu( void )`
`170`	`170`	`m_SettingsItems.clear();`
`171`	`171`	`m_SettingsHash=FNV_HASH0;`
`172`	`172`	`m_bSettingsFound=false;`
	`173`	`+ m_bMetroSettingsFound = false;`
`173`	`174`
`174`	`175`	`m_IndexedItems.clear();`
`175`	`176`	`m_AutoCompleteItems.clear();`
`@@ -310,7 +311,9 @@ bool CSearchManager::AddSearchItem( IShellItem pItem, const wchar_t name, int`
`310`	`311`	`PROPVARIANT val;`
`311`	`312`	`PropVariantInit(&val);`
`312`	`313`	`pItem2->GetProperty(PKEY_Keywords,&val);`
`313`		`- wchar_t keywords[1024];`
	`314`	`+ if (val.vt==VT_EMPTY)`
	`315`	`+ pItem2->GetProperty(PKEY_HighKeywords,&val);`
	`316`	`+ wchar_t keywords[2048];`
`314`	`317`	`int len=0;`
`315`	`318`	`if (val.vt==VT_BSTR \|\| val.vt==VT_LPWSTR)`
`316`	`319`	`{`
`@@ -334,7 +337,7 @@ bool CSearchManager::AddSearchItem( IShellItem pItem, const wchar_t name, int`
`334`	`337`	`}`
`335`	`338`
`336`	`339`	`Lock lock(this,LOCK_DATA);`
`337`		`- if (category==CATEGORY_PROGRAM \|\| category==CATEGORY_SETTING)`
	`340`	`+ if (category==CATEGORY_PROGRAM \|\| category==CATEGORY_SETTING \|\| category==CATEGORY_METROSETTING)`
`338`	`341`	`{`
`339`	`342`	`if (searchRequest.requestId<m_LastProgramsRequestId)`
`340`	`343`	`return false;`
`@@ -345,10 +348,10 @@ bool CSearchManager::AddSearchItem( IShellItem pItem, const wchar_t name, int`
`345`	`348`	`return false;`
`346`	`349`	`}`
`347`	`350`	`bool res=true;`
`348`		`- if (category==CATEGORY_PROGRAM \|\| category==CATEGORY_SETTING)`
	`351`	`+ if (category==CATEGORY_PROGRAM \|\| category==CATEGORY_SETTING \|\| category==CATEGORY_METROSETTING)`
`349`	`352`	`{`
`350`	`353`	`std::vector<SearchItem> &items=(category==CATEGORY_PROGRAM)?m_ProgramItems:m_SettingsItems;`
`351`		`- if (category==CATEGORY_SETTING)`
	`354`	`+ if (category==CATEGORY_SETTING \|\| category==CATEGORY_METROSETTING)`
`352`	`355`	`{`
`353`	`356`	`// remove duplicate settings`
`354`	`357`	`for (std::vector<SearchItem>::const_iterator it=items.begin();it!=items.end();++it)`
`@@ -381,6 +384,8 @@ bool CSearchManager::AddSearchItem( IShellItem pItem, const wchar_t name, int`
`381`	`384`	`}`
`382`	`385`
`383`	`386`	`items.push_back(item);`
	`387`	`+ if (item.category==CATEGORY_METROSETTING)`
	`388`	`+ m_bMetroSettingsFound=true;`
`384`	`389`	`}`
`385`	`390`	`else if (category==CATEGORY_AUTOCOMPLETE)`
`386`	`391`	`{`
`@@ -409,7 +414,7 @@ void CSearchManager::CollectSearchItems( IShellItem *pFolder, int flags, TItemCa`
`409`	`414`	`CComPtr<IShellItem> pChild;`
`410`	`415`	`while (pChild=NULL,pEnum->Next(1,&pChild,NULL)==S_OK)`
`411`	`416`	`{`
`412`		`- if (category==CATEGORY_PROGRAM \|\| category==CATEGORY_SETTING)`
	`417`	`+ if (category==CATEGORY_PROGRAM \|\| category==CATEGORY_SETTING \|\| category==CATEGORY_METROSETTING)`
`413`	`418`	`{`
`414`	`419`	`if (searchRequest.requestId<m_LastProgramsRequestId)`
`415`	`420`	`break;`
`@@ -428,7 +433,7 @@ void CSearchManager::CollectSearchItems( IShellItem *pFolder, int flags, TItemCa`
`428`	`433`	`{`
`429`	`434`	`// go into subfolders but not archives or links to folders`
`430`	`435`	`CollectSearchItems(pChild,flags,category,searchRequest);`
`431`		`- if (category==CATEGORY_PROGRAM \|\| category==CATEGORY_SETTING)`
	`436`	`+ if (category==CATEGORY_PROGRAM \|\| category==CATEGORY_SETTING \|\| category==CATEGORY_METROSETTING)`
`432`	`437`	`{`
`433`	`438`	`if (searchRequest.requestId<m_LastProgramsRequestId)`
`434`	`439`	`break;`
`@@ -733,6 +738,14 @@ void CSearchManager::SearchThread( void )`
`733`	`738`	`if (searchRequest.requestId<m_LastProgramsRequestId)`
`734`	`739`	`continue;`
`735`	`740`	`}`
	`741`	`+ if (searchRequest.bSearchMetroSettings)`
	`742`	`+ {`
	`743`	`+ CComPtr<IShellItem> pFolder;`
	`744`	`+ if (SUCCEEDED(SHCreateItemFromParsingName(L"shell:::{82E749ED-B971-4550-BAF7-06AA2BF7E836}",NULL,IID_IShellItem,(void**)&pFolder)))`
	`745`	`+ CollectSearchItems(pFolder,(searchRequest.bSearchKeywords?COLLECT_KEYWORDS:0)\|COLLECT_NOREFRESH,CATEGORY_METROSETTING,searchRequest);`
	`746`	`+ if (searchRequest.requestId<m_LastProgramsRequestId)`
	`747`	`+ continue;`
	`748`	`+ }`
`736`	`749`	`}`
`737`	`750`	`bool bRefresh=false;`
`738`	`751`	`{`
`@@ -780,12 +793,12 @@ void CSearchManager::SearchThread( void )`
`780`	`793`	`{`
`781`	`794`	`std::list<SearchScope> scopeList;`
`782`	`795`
`783`		`- if (searchRequest.bSearchMetroSettings)`
	`796`	`+ if (searchRequest.bSearchMetroSettings && !m_bMetroSettingsFound)`
`784`	`797`	`{`
`785`	`798`	`scopeList.push_back(SearchScope());`
`786`	`799`	`SearchScope &scope=*scopeList.rbegin();`
`787`	`800`	`scope.bFiles=true;`
`788`		`- scope.name=FindTranslation(L"Search.CategoryPCSettings",L"Settings");`
	`801`	`+ scope.name=FindTranslation(L"Search.CategoryPCSettings",L"Modern Settings");`
`789`	`802`	`scope.categoryHash=CATEGORY_METROSETTING;`
`790`	`803`	`scope.roots.push_back(L"FILE:");`
`791`	`804`	`}`
`@@ -1240,7 +1253,7 @@ void CSearchManager::SearchThread( void )`
`1240`	`1253`	`Lock lock(this,LOCK_DATA);`
`1241`	`1254`	`m_IndexedItems.push_back(SearchCategory());`
`1242`	`1255`	`pCategory=&*m_IndexedItems.rbegin();`
`1243`		`- pCategory->name.Format(L"%s (%d)",it->name,it->resultCount);`
	`1256`	`+ pCategory->name=it->name;`
`1244`	`1257`	`pCategory->categoryHash=it->categoryHash;`
`1245`	`1258`	`pCategory->search.Clone(it->search);`
`1246`	`1259`	`}`
`@@ -1348,6 +1361,7 @@ void CSearchManager::GetSearchResults( SearchResults &results )`
`1348`	`1361`	`{`
`1349`	`1362`	`results.programs.clear();`
`1350`	`1363`	`results.settings.clear();`
	`1364`	`+ results.metrosettings.clear();`
`1351`	`1365`	`results.indexed.clear();`
`1352`	`1366`	`results.autocomplete.clear();`
`1353`	`1367`	`results.autoCompletePath.Empty();`
`@@ -1397,14 +1411,19 @@ void CSearchManager::GetSearchResults( SearchResults &results )`
`1397`	`1411`	`std::vector<SearchItem> &settings=m_bSettingsFound?m_SettingsItems:m_SettingsItemsOld;`
`1398`	`1412`	`for (std::vector<SearchItem>::iterator it=settings.begin();it!=settings.end();++it)`
`1399`	`1413`	`{`
`1400`		`- int match=(it->category==CATEGORY_SETTING)?it->MatchText(m_SearchText,bSearchSubWord):0;`
	`1414`	`+ int match=(it->category==CATEGORY_SETTING \|\| it->category==CATEGORY_METROSETTING)?it->MatchText(m_SearchText,bSearchSubWord):0;`
`1401`	`1415`	`it->rank=(it->rank&0xFFFFFFFE)\|(match>>1);`
`1402`	`1416`	`}`
`1403`	`1417`	`std::sort(settings.begin(),settings.end());`
`1404`	`1418`	`for (std::vector<SearchItem>::const_iterator it=settings.begin();it!=settings.end();++it)`
`1405`	`1419`	`{`
`1406`		`- if (it->category==CATEGORY_SETTING && it->MatchText(m_SearchText,bSearchSubWord))`
`1407`		`- results.settings.push_back(it->pInfo);`
	`1420`	`+ if (it->MatchText(m_SearchText, bSearchSubWord))`
	`1421`	`+ {`
	`1422`	`+ if (it->category==CATEGORY_SETTING)`
	`1423`	`+ results.settings.push_back(it->pInfo);`
	`1424`	`+ if (it->category==CATEGORY_METROSETTING)`
	`1425`	`+ results.metrosettings.push_back(it->pInfo);`
	`1426`	`+ }`
`1408`	`1427`	`}`
`1409`	`1428`	`}`
`1410`	`1429`
`@@ -1423,7 +1442,7 @@ void CSearchManager::GetSearchResults( SearchResults &results )`
`1423`	`1442`	`results.autocomplete.push_back(it->pInfo);`
`1424`	`1443`	`}`
`1425`	`1444`	`}`
`1426`		`- results.bResults=(!results.programs.empty() \|\| !results.settings.empty() \|\| !results.indexed.empty() \|\| !results.autocomplete.empty());`
	`1445`	`+ results.bResults=(!results.programs.empty() \|\| !results.settings.empty() \|\| !results.metrosettings.empty() \|\| !results.indexed.empty() \|\| !results.autocomplete.empty());`
`1427`	`1446`	`results.bSearching=(m_LastCompletedId!=m_LastRequestId);`
`1428`	`1447`	`}`
`1429`	`1448`