Display monochrome icons using color of corresponding text item

Some icons (modern settings, jump-list tasks) are monochrome, basically
they are defined just by alpha channel.
Thus they can be displayed in any color (white is default).

Since these icons are white by default, they look nice on dark
backgrounds. But they are not very visible on light backgrounds.

Thus the idea is to 'colorize' such icon using color of corresponding
text item. That way they will always have proper color.

Fixes #466.

.gitignore

@@ -4,6 +4,10 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
+# ignore vscode stuff
+.vscode/
+.ionide/
+
 # User-specific files
 *.suo
 *.user

README.md

@@ -2,16 +2,13 @@
 
 *Originally* **[Classic Shell](http://www.classicshell.net)** *by [Ivo Beltchev](https://sourceforge.net/u/ibeltchev/profile/)*
 
-[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![Build status](https://ci.appveyor.com/api/projects/status/2wj5x5qoypfjj0tr/branch/master?svg=true)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master) [![GitQ](https://gitq.com/badge.svg)](https://gitq.com/passionate-coder/Classic-Start) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/open-shell/Lobby)
+[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![Build status](https://ci.appveyor.com/api/projects/status/2wj5x5qoypfjj0tr/branch/master?svg=true)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master) [![GitQ](https://gitq.com/badge.svg)](https://gitq.com/passionate-coder/Classic-Start) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/open-shell/Lobby) [![Discord](https://img.shields.io/discord/757701054782636082?color=%4E5D94&label=Discord&logo=discord&logoColor=white)](https://discord.gg/7H6arr5)
 
-[Home Page](https://open-shell.github.io/Open-Shell-Menu)
-
-[Discussion room](https://gitter.im/Open-Shell)
-
-[Latest nightly build](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master/artifacts)
+[Home Page](https://open-shell.github.io/Open-Shell-Menu)  
+[Discussion room](https://gitter.im/Open-Shell)  
+[Latest nightly build](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master/artifacts)  
 
 ### Features
-
 - Classic style Start Menu for Windows 7, 8, 8.1, 10
 - Toolbar for Windows Explorer
 - Classic copy UI (Windows 7 only)
@@ -19,16 +16,18 @@
 - Title bar and status bar for Internet Explorer
 
 ### Download
-If you just want to use it or looking for setup file, click here to download!!!
+If you just want to use it or looking for setup file, click here to download:
 
 [![GitHub All Releases](https://img.shields.io/github/downloads/Open-Shell/Open-Shell-Menu/total?style=for-the-badge)](https://github.com/Open-Shell/Open-Shell-Menu/releases)
 
+### Temporary Translation/Language Solution
+1. Download [language DLL](https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html)  
+2. Place it either in the Open-Shell's __install folder__ or in the `%ALLUSERSPROFILE%\OpenShell\Languages` folder
+
 ---
 
 *For archival reasons, we have a mirror of `www.classicshell.net` [here](https://coddec.github.io/Classic-Shell/www.classicshell.net/).*
 
-[How To Skin a Start Menu](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/skintutorial.html)
-	
-[Classic Shell - Custom Start Buttons](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/buttontutorial.html)
-
+[How To Skin a Start Menu](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/skintutorial.html)  
+[Classic Shell - Custom Start Buttons](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/buttontutorial.html)  
 [Report a bug/issue or submit a feature request](https://github.com/Open-Shell/Open-Shell-Menu/issues)

Src/BUILDME.txt

@@ -5,9 +5,9 @@ for other languages.
 The final files (installers, archives) are saved to the Setup\Final folder.
 
 You need the following tools:
-Visual Studio 2017 (Community Edition is enough)
+Visual Studio 2019 (Community Edition is enough)
   - Desktop development with C++ workload
-  - Windows 10 SDK (10.0.17134.0) for Desktop C++
+  - Windows 10 SDK (10.0.19041.0) for Desktop C++
   - Visual C++ ATL support
 HTML Help Workshop
 WiX 3.7

Src/ClassicExplorer/ClassicExplorer.vcxproj

@@ -158,7 +158,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -178,6 +177,7 @@
       <ModuleDefinitionFile>.\$(TargetName).def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
+      <PerUserRedirection>true</PerUserRedirection>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -194,7 +194,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -214,6 +213,7 @@
       <ModuleDefinitionFile>.\$(TargetName).def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
+      <PerUserRedirection>true</PerUserRedirection>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -251,6 +251,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <PerUserRedirection>true</PerUserRedirection>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -287,6 +288,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <PerUserRedirection>true</PerUserRedirection>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'">

Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj

@@ -77,7 +77,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>

Src/ClassicIE/ClassicIE.vcxproj

@@ -142,7 +142,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -163,7 +162,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>

Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj

@@ -152,7 +152,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -171,6 +170,7 @@
       <ModuleDefinitionFile>.\$(TargetName).def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
+      <PerUserRedirection>true</PerUserRedirection>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -187,7 +187,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;CLASSICIEDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -206,6 +205,7 @@
       <ModuleDefinitionFile>.\$(TargetName).def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
+      <PerUserRedirection>true</PerUserRedirection>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -242,6 +242,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <PerUserRedirection>true</PerUserRedirection>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -277,6 +278,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <PerUserRedirection>true</PerUserRedirection>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'">

Src/Lib/ComHelper.h

@@ -14,6 +14,7 @@ public:
 	CAbsolutePidl( const CAbsolutePidl &pidl ) { m_Pidl=pidl?ILCloneFull(pidl):NULL; }
 	~CAbsolutePidl( void ) { Clear(); }
 	void operator=( const CAbsolutePidl &pidl ) { Clone(pidl); }
+	void operator=( PCIDLIST_ABSOLUTE pidl ) { Clone(pidl); }
 
 	void Clear( void ) { if (m_Pidl) ILFree(m_Pidl); m_Pidl=NULL; }
 	operator PIDLIST_ABSOLUTE( void ) const { return m_Pidl; }
@@ -21,7 +22,7 @@ public:
 	void Swap( CAbsolutePidl &pidl ) { PIDLIST_ABSOLUTE q=pidl.m_Pidl; pidl.m_Pidl=m_Pidl; m_Pidl=q; }
 	void Attach( PIDLIST_ABSOLUTE pidl ) { Clear(); m_Pidl=pidl; }
 	PIDLIST_ABSOLUTE Detach( void ) { PIDLIST_ABSOLUTE pidl=m_Pidl; m_Pidl=NULL; return pidl; }
-	void Clone( PIDLIST_ABSOLUTE pidl ) { Clear(); m_Pidl=pidl?ILCloneFull(pidl):NULL; }
+	void Clone( PCIDLIST_ABSOLUTE pidl ) { Clear(); m_Pidl=pidl?ILCloneFull(pidl):NULL; }
 
 private:
 	PIDLIST_ABSOLUTE m_Pidl;

Src/Lib/DownloadHelper.cpp

@@ -14,6 +14,7 @@
 #include "FNVHash.h"
 #include "StringUtils.h"
 #include "Translations.h"
+#include "json.hpp"
 #include <wininet.h>
 #include <softpub.h>
 
@@ -141,30 +142,9 @@ LRESULT CProgressDlg::OnCancel( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 
 static bool g_bCheckingVersion;
 
-static DWORD GetTimeStamp( const wchar_t *fname )
-{
-	HANDLE h=CreateFile(fname,GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
-	if (h==INVALID_HANDLE_VALUE)
-		return 0;
-	DWORD res=0;
-	DWORD q;
-	IMAGE_DOS_HEADER header;
-	if (ReadFile(h,&header,sizeof(header),&q,NULL) && q==sizeof(header))
-	{
-		if (SetFilePointer(h,header.e_lfanew+8,NULL,FILE_BEGIN)!=INVALID_SET_FILE_POINTER)
-		{
-			if (!ReadFile(h,&res,4,&q,NULL) || q!=4)
-				res=0;
-		}
-	}
-	CloseHandle(h);
-	return res;
-}
-
 enum TDownloadResult
 {
 	DOWNLOAD_OK,
-	DOWNLOAD_SAMETIME,
 	DOWNLOAD_CANCEL,
 
 	// errors
@@ -176,8 +156,7 @@ enum TDownloadResult
 
 // Downloads a file
 // filename - returns the name of the downloaded file
-// timestamp - if not zero, it is compared to the timestamp of the file and returns DOWNLOAD_SAMETIME if the same (and buf will be empty)
-static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf, CString *pFilename, DWORD timestamp, bool bAcceptCached, CProgressDlg *pProgress, TSettingsComponent component )
+static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf, CString *pFilename, bool bAcceptCached, CProgressDlg *pProgress, TSettingsComponent component )
 {
 	const wchar_t *compName=L"Open-Shell";
 	switch (component)
@@ -211,7 +190,7 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf,
 	int time=GetTickCount();
 	if (pProgress)
 		pProgress->SetText(LoadStringEx(IDS_PROGRESS_CONNECT));
-	HINTERNET hConnect=InternetConnect(hInternet,host,INTERNET_DEFAULT_HTTP_PORT,L"",L"",INTERNET_SERVICE_HTTP,0,0);
+	HINTERNET hConnect=InternetConnect(hInternet,host,components.nPort,L"",L"",INTERNET_SERVICE_HTTP,0,0);
 	if (hConnect)
 	{
 		if (pProgress && pProgress->IsCanceled())
@@ -219,7 +198,7 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf,
 		const wchar_t *accept[]={L"*/*",NULL};
 		if (res==DOWNLOAD_OK)
 		{
-			HINTERNET hRequest=HttpOpenRequest(hConnect,L"GET",file,NULL,NULL,accept,bAcceptCached?0:INTERNET_FLAG_RELOAD,0);
+			HINTERNET hRequest=HttpOpenRequest(hConnect,L"GET",file,NULL,NULL,accept,((components.nScheme==INTERNET_SCHEME_HTTPS)?INTERNET_FLAG_SECURE:0)|(bAcceptCached?0:INTERNET_FLAG_RELOAD),0);
 			if (hRequest)
 			{
 				if (pProgress && pProgress->IsCanceled())
@@ -264,7 +243,7 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf,
 						if (fileSize==0)
 							pProgress->SetProgress(-1);
 					}
-					int CHUNK_SIZE=timestamp?1024:32768; // start with small chunk to verify the timestamp
+					int CHUNK_SIZE=32768;
 					DWORD size=0;
 					buf.reserve(fileSize+CHUNK_SIZE);
 					while (1)
@@ -286,25 +265,6 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf,
 						size+=dwSize;
 						if (pProgress && fileSize)
 							pProgress->SetProgress(size*100/fileSize);
-						if (timestamp && (size<sizeof(IMAGE_DOS_HEADER) || buf[0]!='M' || buf[1]!='Z'))
-						{
-							res=DOWNLOAD_FAIL;
-							break;
-						}
-						if (timestamp && size>=sizeof(IMAGE_DOS_HEADER))
-						{
-							DWORD pos=((IMAGE_DOS_HEADER*)&buf[0])->e_lfanew+8;
-							if (size>=pos+4)
-							{
-								if (timestamp==*(DWORD*)&buf[pos])
-								{
-									res=DOWNLOAD_SAMETIME;
-									break;
-								}
-								timestamp=0;
-								CHUNK_SIZE=32768;
-							}
-						}
 					}
 					buf.resize(size);
 				}
@@ -358,6 +318,7 @@ struct VersionCheckParams
 	TSettingsComponent component;
 	tNewVersionCallback callback;
 	CProgressDlg *progress;
+	bool nightly = false;
 };
 
 // 0 - fail, 1 - success, 2 - cancel
@@ -377,80 +338,17 @@ static DWORD WINAPI ThreadVersionCheck( void *param )
 		return 0;
 	}
 	DWORD curVersion=GetVersionEx(g_Instance);
-	regKey.SetDWORDValue(L"LastUpdateVersion",curVersion);
 
-	// download file
-	wchar_t fname[_MAX_PATH]=L"%ALLUSERSPROFILE%\\OpenShell";
-	DoEnvironmentSubst(fname,_countof(fname));
-	SHCreateDirectory(NULL,fname);
-	PathAppend(fname,L"update.ver");
-
-	bool res=false;
-	CString urlBase=LoadStringEx(IDS_VERSION_URL);
+	bool res = false;
 	VersionData data;
-	data.Clear();
-	if (data.Load(fname,false)==VersionData::LOAD_OK)
+
 	{
-		if (!data.altUrl.IsEmpty())
-			urlBase=data.altUrl;
-		WIN32_FILE_ATTRIBUTE_DATA attr;
-		if (GetFileAttributesEx(fname,GetFileExInfoStandard,&attr))
-		{
-			DWORD writeTime=(DWORD)(((((ULONGLONG)attr.ftLastWriteTime.dwHighDateTime)<<32)|attr.ftLastWriteTime.dwLowDateTime)/TIME_DIVISOR);
-			if (curTime>writeTime && (curTime-writeTime)<TIME_PRECISION)
-			{
-				res=true; // the file is valid and less than an hour old, don't download again
-			}
-		}
-	}
-	if (!res)
-	{
-		data.Clear();
-		CString url;
-		url.Format(L"%s%d.%d.%d.ver",urlBase,curVersion>>24,(curVersion>>16)&0xFF,curVersion&0xFFFF);
+		auto load = params.nightly ? data.LoadNightly() : data.Load();
 
-	#ifdef UPDATE_LOG
-		LogToFile(UPDATE_LOG,L"URL: %s",url);
-	#endif
-
-		std::vector<char> buf;
-		TDownloadResult download=DownloadFile(url,buf,NULL,GetTimeStamp(fname),false,params.progress,params.component);
-	#ifdef UPDATE_LOG
-		LogToFile(UPDATE_LOG,L"Download result: %d",download);
-	#endif
-		if (download==DOWNLOAD_CANCEL)
-		{
-			g_bCheckingVersion=false;
-			return 2;
-		}
-
-		if (download<DOWNLOAD_FIRST_ERROR)
-		{
-			if (download==DOWNLOAD_SAMETIME || SaveFile(fname,buf)==0)
-			{
-				if (download==DOWNLOAD_SAMETIME)
-				{
-					HANDLE h=CreateFile(fname,GENERIC_WRITE,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
-					if (h!=INVALID_HANDLE_VALUE)
-					{
-						SetFileTime(h,NULL,NULL,(FILETIME*)&curTimeL);
-						CloseHandle(h);
-					}
-				}
-				if (params.progress)
-				{
-					params.progress->SetText(LoadStringEx(IDS_PROGRESS_VERIFY));
-					params.progress->SetProgress(-1);
-				}
-				VersionData::TLoadResult load=data.Load(fname,false);
-	#ifdef UPDATE_LOG
-				LogToFile(UPDATE_LOG,L"Load result: %d",load);
-	#endif
-				if (load==VersionData::LOAD_BAD_FILE)
-					DeleteFile(fname);
-				res=(load==VersionData::LOAD_OK);
-			}
-		}
+#ifdef UPDATE_LOG
+		LogToFile(UPDATE_LOG, L"Load result: %d", load);
+#endif
+		res = (load == VersionData::LOAD_OK);
 	}
 
 	curTime+=(rand()*TIME_PRECISION)/(RAND_MAX+1)-(TIME_PRECISION/2); // add between -30 and 30 minutes to randomize access
@@ -553,6 +451,21 @@ DWORD CheckForNewVersion( HWND owner, TSettingsComponent component, TVersionChec
 		params->callback=callback;
 		params->progress=NULL;
 
+		// check the Update setting (uses the current value in the registry, not the one from memory
+		{
+			CRegKey regSettings, regSettingsUser, regPolicy, regPolicyUser;
+			bool bUpgrade = OpenSettingsKeys(COMPONENT_SHARED, regSettings, regSettingsUser, regPolicy, regPolicyUser);
+
+			CSetting settings[] = {
+				{L"Nightly",CSetting::TYPE_BOOL,0,0,0},
+				{NULL}
+			};
+
+			settings[0].LoadValue(regSettings, regSettingsUser, regPolicy, regPolicyUser);
+
+			params->nightly = GetSettingBool(settings[0]);
+		}
+
 		if (!owner)
 			return ThreadVersionCheck(params);
 
@@ -583,57 +496,38 @@ DWORD CheckForNewVersion( HWND owner, TSettingsComponent component, TVersionChec
 	}
 	else
 	{
-		DWORD buildTime=0;
-		{
-			// skip the update if the update component is not found
-			wchar_t path[_MAX_PATH];
-			GetModuleFileName(_AtlBaseModule.GetModuleInstance(),path,_countof(path));
-			PathRemoveFileSpec(path);
-			PathAppend(path,L"Update.exe");
-
-			WIN32_FILE_ATTRIBUTE_DATA attr;
-			if (!GetFileAttributesEx(path,GetFileExInfoStandard,&attr))
-				return 0;
-
-			buildTime=(DWORD)(((((ULONGLONG)attr.ftCreationTime.dwHighDateTime)<<32)|attr.ftCreationTime.dwLowDateTime)/TIME_DIVISOR); // in 0.01 hours
-		}
-
 		ULONGLONG curTimeL;
 		GetSystemTimeAsFileTime((FILETIME*)&curTimeL);
 		DWORD curTime=(DWORD)(curTimeL/TIME_DIVISOR); // in 0.01 hours
-		if (curTime-buildTime>24*365*TIME_PRECISION)
-			return 0; // the build is more than a year old, don't do automatic updates
 
 		CRegKey regKey;
 		if (regKey.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\OpenShell")!=ERROR_SUCCESS)
 			regKey.Create(HKEY_CURRENT_USER,L"Software\\OpenShell\\OpenShell");
 
-		DWORD lastVersion;
-		if (regKey.QueryDWORDValue(L"LastUpdateVersion",lastVersion)!=ERROR_SUCCESS)
-			lastVersion=0;
-		if (lastVersion==GetVersionEx(g_Instance))
-		{
-			DWORD lastTime;
-			if (regKey.QueryDWORDValue(L"LastUpdateTime",lastTime)!=ERROR_SUCCESS)
-				lastTime=0;
-			if ((int)(curTime-lastTime)<168*TIME_PRECISION)
-				return 0; // check weekly
-		}
+		DWORD lastTime;
+		if (regKey.QueryDWORDValue(L"LastUpdateTime",lastTime)!=ERROR_SUCCESS)
+			lastTime=0;
+		if ((int)(curTime-lastTime)<168*TIME_PRECISION)
+			return 0; // check weekly
 
 		// check the Update setting (uses the current value in the registry, not the one from memory
+		bool nightly = false;
 		{
 			CRegKey regSettings, regSettingsUser, regPolicy, regPolicyUser;
 			bool bUpgrade=OpenSettingsKeys(COMPONENT_SHARED,regSettings,regSettingsUser,regPolicy,regPolicyUser);
 
 			CSetting settings[]={
 				{L"Update",CSetting::TYPE_BOOL,0,0,1},
+				{L"Nightly",CSetting::TYPE_BOOL,0,0,0},
 				{NULL}
 			};
 
 			settings[0].LoadValue(regSettings,regSettingsUser,regPolicy,regPolicyUser);
+			settings[1].LoadValue(regSettings,regSettingsUser,regPolicy,regPolicyUser);
 
 			if (!GetSettingBool(settings[0]))
-					return 0;
+				return 0;
+			nightly = GetSettingBool(settings[1]);
 		}
 
 		VersionCheckParams *params=new VersionCheckParams;
@@ -641,6 +535,7 @@ DWORD CheckForNewVersion( HWND owner, TSettingsComponent component, TVersionChec
 		params->component=component;
 		params->callback=callback;
 		params->progress=NULL;
+		params->nightly=nightly;
 
 		g_bCheckingVersion=true;
 		if (check==CHECK_AUTO_WAIT)
@@ -848,6 +743,204 @@ void VersionData::Swap( VersionData &data )
 	std::swap(languages,data.languages);
 }
 
+std::vector<char> DownloadUrl(const wchar_t* url)
+{
+#ifdef UPDATE_LOG
+	LogToFile(UPDATE_LOG, L"URL: %s", url);
+#endif
+
+	std::vector<char> buffer;
+	TDownloadResult download = DownloadFile(url, buffer, nullptr, false, nullptr, COMPONENT_UPDATE);
+
+#ifdef UPDATE_LOG
+	LogToFile(UPDATE_LOG, L"Download result: %d", download);
+#endif
+
+	if (download != DOWNLOAD_OK)
+		buffer.clear();
+
+	return buffer;
+}
+
+using namespace nlohmann;
+
+VersionData::TLoadResult VersionData::Load()
+{
+	Clear();
+
+	auto buf = DownloadUrl(L"https://api.github.com/repos/Open-Shell/Open-Shell-Menu/releases/latest");
+	if (buf.empty())
+		return LOAD_ERROR;
+
+	try
+	{
+		auto data = json::parse(buf.begin(), buf.end());
+
+		// skip prerelease versions
+		if (data["prerelease"].get<bool>())
+			return LOAD_BAD_VERSION;
+
+		// get version from tag name
+		auto tag = data["tag_name"].get<std::string>();
+		if (tag.empty())
+			return LOAD_BAD_FILE;
+
+		int v1, v2, v3;
+		if (sscanf_s(tag.c_str(), "v%d.%d.%d", &v1, &v2, &v3) != 3)
+			return LOAD_BAD_FILE;
+
+		newVersion = (v1 << 24) | (v2 << 16) | v3;
+
+		// installer url
+		std::string url;
+		for (const auto& asset : data["assets"])
+		{
+			if (asset["name"].get<std::string>().find("OpenShellSetup") == 0)
+			{
+				url = asset["browser_download_url"].get<std::string>();
+				break;
+			}
+		}
+
+		if (url.empty())
+			return LOAD_BAD_FILE;
+
+		downloadUrl.Append(CA2T(url.c_str()));
+
+		// changelog
+		auto body = data["body"].get<std::string>();
+		if (!body.empty())
+		{
+			auto name = data["name"].get<std::string>();
+			if (!name.empty())
+			{
+				news.Append(CA2T(name.c_str()));
+				news.Append(L"\r\n\r\n");
+			}
+
+			news.Append(CA2T(body.c_str()));
+			news.Replace(L"\\n", L"\n");
+			news.Replace(L"\\r", L"\r");
+		}
+
+		return LOAD_OK;
+	}
+	catch (...)
+	{
+		return LOAD_BAD_FILE;
+	}
+}
+
+VersionData::TLoadResult VersionData::LoadNightly()
+{
+	Clear();
+
+	auto buf = DownloadUrl(L"https://ci.appveyor.com/api/projects/passionate-coder/open-shell-menu/branch/master");
+	if (buf.empty())
+		return LOAD_ERROR;
+
+	try
+	{
+		auto data = json::parse(buf.begin(), buf.end());
+		auto build = data["build"];
+
+		// get version
+		auto version = build["version"].get<std::string>();
+		if (version.empty())
+			return LOAD_BAD_FILE;
+
+		{
+			int v1, v2, v3;
+			if (sscanf_s(version.c_str(), "%d.%d.%d", &v1, &v2, &v3) != 3)
+				return LOAD_BAD_FILE;
+
+			newVersion = (v1 << 24) | (v2 << 16) | v3;
+
+			if (newVersion <= GetVersionEx(g_Instance))
+				return LOAD_OK;
+		}
+
+		// artifact url
+		{
+			auto jobId = build["jobs"][0]["jobId"].get<std::string>();
+			if (jobId.empty())
+				return LOAD_BAD_FILE;
+
+			std::wstring jobUrl(L"https://ci.appveyor.com/api/buildjobs/");
+			jobUrl += std::wstring(jobId.begin(), jobId.end());
+			jobUrl += L"/artifacts";
+
+			buf = DownloadUrl(jobUrl.c_str());
+			if (buf.empty())
+				return LOAD_ERROR;
+
+			auto artifacts = json::parse(buf.begin(), buf.end());
+
+			std::string fileName;
+			for (const auto& artifact : artifacts)
+			{
+				auto name = artifact["fileName"].get<std::string>();
+				if (name.find("OpenShellSetup") == 0)
+				{
+					fileName = name;
+					break;
+				}
+			}
+
+			if (fileName.empty())
+				return LOAD_BAD_FILE;
+
+			auto artifactUrl(jobUrl);
+			artifactUrl += L'/';
+			artifactUrl += std::wstring(fileName.begin(), fileName.end());
+
+			downloadUrl = artifactUrl.c_str();
+		}
+
+		// changelog
+		news.Append(CA2T(version.c_str()));
+		news.Append(L"\r\n\r\n");
+		try
+		{
+			// use Github API to compare commit that actual version was built from (APPVEYOR_REPO_COMMIT)
+			// and commit that AppVeyor version was built from (commitId)
+			auto commitId = build["commitId"].get<std::string>();
+
+			std::wstring compareUrl(L"https://api.github.com/repos/Open-Shell/Open-Shell-Menu/compare/");
+			compareUrl += _T(APPVEYOR_REPO_COMMIT);
+			compareUrl += L"...";
+			compareUrl += std::wstring(commitId.begin(), commitId.end());
+
+			buf = DownloadUrl(compareUrl.c_str());
+			auto compare = json::parse(buf.begin(), buf.end());
+
+			// then use first lines (subjects) of commit messages as changelog
+			auto commits = compare["commits"];
+			for (const auto& commit : commits)
+			{
+				auto message = commit["commit"]["message"].get<std::string>();
+
+				auto pos = message.find('\n');
+				if (pos != message.npos)
+					message.resize(pos);
+
+				news.Append(L"- ");
+				news.Append(CA2T(message.c_str()));
+				news.Append(L"\r\n");
+			}
+		}
+		catch (...)
+		{
+		}
+	}
+	catch (...)
+	{
+		return LOAD_BAD_FILE;
+	}
+
+	return LOAD_OK;
+}
+
 VersionData::TLoadResult VersionData::Load( const wchar_t *fname, bool bLoadFlags )
 {
 	Clear();
@@ -937,7 +1030,7 @@ static DWORD WINAPI ThreadDownloadFile( void *param )
 	params.saveRes=0;
 
 	std::vector<char> buf;
-	params.downloadRes=DownloadFile(params.url,buf,params.fname.IsEmpty()?&params.fname:NULL,0,params.bAcceptCached,params.progress,params.component);
+	params.downloadRes=DownloadFile(params.url,buf,params.fname.IsEmpty()?&params.fname:NULL,params.bAcceptCached,params.progress,params.component);
 	if (params.downloadRes==DOWNLOAD_CANCEL || params.downloadRes>=DOWNLOAD_FIRST_ERROR)
 		return 0;
 
@@ -971,6 +1064,7 @@ static DWORD WINAPI ThreadDownloadFile( void *param )
 		return 0;
 
 	// validate signer
+/*
 	if (params.signer)
 	{
 		if (params.progress)
@@ -982,7 +1076,7 @@ static DWORD WINAPI ThreadDownloadFile( void *param )
 			return 0;
 		}
 	}
-
+*/
 	return 0;
 }
 
@@ -1089,6 +1183,12 @@ DWORD DownloadNewVersion( HWND owner, TSettingsComponent component, const wchar_
 	params.bAcceptCached=true;
 	params.component=component;
 
+	{
+		const wchar_t* name = wcsrchr(url, '/');
+		if (name && name[1])
+			params.fname.Append(name+1);
+	}
+
 	HANDLE hThread=CreateThread(NULL,0,ThreadDownloadFile,&params,0,NULL);
 
 	while (1)

Src/Lib/DownloadHelper.h

@@ -31,19 +31,19 @@ struct LanguageVersionData
 
 struct VersionData
 {
-	bool bValid;
-	DWORD newVersion;
-	DWORD encodedLangVersion;
+	bool bValid = false;
+	DWORD newVersion = 0;
+	DWORD encodedLangVersion = 0;
 	CString downloadUrl;
 	CString downloadSigner;
 	CString news;
 	CString updateLink;
 	CString languageLink;
 	CString altUrl;
-	bool bNewVersion;
-	bool bIgnoreVersion;
-	bool bNewLanguage;
-	bool bIgnoreLanguage;
+	bool bNewVersion = false;
+	bool bIgnoreVersion = false;
+	bool bNewLanguage = false;
+	bool bIgnoreLanguage = false;
 	CString newLanguage;
 	std::vector<LanguageVersionData> languages;
 
@@ -59,6 +59,8 @@ struct VersionData
 		LOAD_BAD_FILE, // the file is corrupted
 	};
 
+	TLoadResult Load();
+	TLoadResult LoadNightly();
 	TLoadResult Load( const wchar_t *fname, bool bLoadFlags );
 private:
 	void operator=( const VersionData& );

Src/Lib/Lib.rc

@@ -71,7 +71,7 @@ BEGIN
     CONTROL         "Show all settings",IDC_CHECKALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,7,79,12
     CONTROL         "<a>Help...</a>",IDC_LINKHELP,"SysLink",WS_TABSTOP,348,9,26,10,WS_EX_TRANSPARENT
     CONTROL         "",IDC_TABSETTINGS,"SysTabControl32",TCS_MULTILINE | TCS_FOCUSNEVER,7,20,367,169
-    CONTROL         "<a>www.classicshell.net</a>",IDC_LINKWEB,"SysLink",WS_TABSTOP,7,195,66,10,WS_EX_TRANSPARENT
+    CONTROL         "<a>Open-Shell Homepage</a>",IDC_LINKWEB,"SysLink",WS_TABSTOP,7,195,75,10,WS_EX_TRANSPARENT
     CONTROL         "Name of translator goes <a href=""http://www.yoursite.com"">here</a>",IDC_SYSLINKLOC,
                     "SysLink",NOT WS_VISIBLE | WS_TABSTOP,80,195,111,10
     PUSHBUTTON      "&Backup",IDC_BUTTONBACKUP,200,192,60,14,WS_GROUP
@@ -277,7 +277,7 @@ BEGIN
     IDS_BMP_TITLE           "Select Image File"
     IDS_SEARCH_PROMPT       "Search Settings"
     IDS_SETTING_SEARCH      "Search Results"
-    IDS_WEBSITE_TIP         "Visit Open-Shell on the web - http://www.classicshell.net"
+    IDS_WEBSITE_TIP         "Visit Open-Shell on the web - https://open-shell.github.io/Open-Shell-Menu"
     IDS_LOCATE_SETTING      "Locate setting"
     IDS_LANGUAGE_UPDATED    "The language %s is up to date."
     IDS_LANGUAGE_MISSING    "Update for language %s is not available."

Src/Lib/Lib.vcxproj

@@ -83,6 +83,11 @@
     <OutDir>$(Configuration)64\</OutDir>
     <IntDir>$(Configuration)64\</IntDir>
   </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>APPVEYOR_REPO_COMMIT="$(APPVEYOR_REPO_COMMIT)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>

Src/Lib/ResourceHelper.cpp

@@ -332,6 +332,7 @@ HBITMAP BitmapFromIcon( HICON hIcon, int iconSize, unsigned int **pBits, bool bD
 // Premultiplies a DIB section by the alpha channel and a given color
 void PremultiplyBitmap( HBITMAP hBitmap, COLORREF rgb )
 {
+	if (hBitmap == NULL) return;
 	BITMAP info;
 	GetObject(hBitmap,sizeof(info),&info);
 	int n=info.bmWidth*info.bmHeight;

Src/Lib/Settings.cpp

@@ -1810,7 +1810,7 @@ LRESULT CSettingsDlg::OnHelp( int idCtrl, LPNMHDR pnmh, BOOL& bHandled )
 
 LRESULT CSettingsDlg::OnWeb( int idCtrl, LPNMHDR pnmh, BOOL& bHandled )
 {
-	ShellExecute(m_hWnd,NULL,L"http://www.classicshell.net",NULL,NULL,SW_SHOWNORMAL);
+	ShellExecute(m_hWnd,NULL,L"https://open-shell.github.io/Open-Shell-Menu",NULL,NULL,SW_SHOWNORMAL);
 	return 0;
 }
 

Src/OpenShell.sln

@@ -40,6 +40,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicIEDLL", "ClassicIE\ClassicIEDLL\ClassicIEDLL.vcxproj", "{BC0E6E7C-08C1-4F12-A754-4608E5A22FA8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Update", "Update\Update.vcxproj", "{171B46B0-6083-4D9E-BD33-946EA3BD76FA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D94BD2A6-1872-4F01-B911-F406603AA2E1} = {D94BD2A6-1872-4F01-B911-F406603AA2E1}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win7Aero7", "Skins\Win7Aero7\Win7Aero7.vcxproj", "{A2CCDE9F-17CE-461E-8BD9-00261B8855A6}"
 EndProject
@@ -63,6 +66,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metro", "Skins\Metro\Metro.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metallic7", "Skins\Metallic7\Metallic7.vcxproj", "{CA5BFC96-428D-42F5-9F7D-CDDE048A357C}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DesktopToasts", "Update\DesktopToasts\DesktopToasts.vcxproj", "{D94BD2A6-1872-4F01-B911-F406603AA2E1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -374,6 +379,15 @@ Global
 		{CA5BFC96-428D-42F5-9F7D-CDDE048A357C}.Setup|Win32.ActiveCfg = Resource|Win32
 		{CA5BFC96-428D-42F5-9F7D-CDDE048A357C}.Setup|Win32.Build.0 = Resource|Win32
 		{CA5BFC96-428D-42F5-9F7D-CDDE048A357C}.Setup|x64.ActiveCfg = Resource|Win32
+		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Debug|Win32.Build.0 = Debug|Win32
+		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Debug|x64.ActiveCfg = Debug|Win32
+		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Release|Win32.ActiveCfg = Release|Win32
+		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Release|Win32.Build.0 = Release|Win32
+		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Release|x64.ActiveCfg = Release|Win32
+		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|Win32.ActiveCfg = Release|Win32
+		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|Win32.Build.0 = Release|Win32
+		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Src/Setup/BuildArchives.bat

@@ -3,9 +3,7 @@ REM ***** Collect PDBs
 echo -- Creating symbols package
 set CS_SYMBOLS_NAME=OpenShellPDB_%CS_VERSION_STR%.7z
 
-cd Output
-7z a -mx9 ..\Final\%CS_SYMBOLS_NAME% PDB32 PDB64 > nul
-cd ..
+7z a -mx9 .\Final\%CS_SYMBOLS_NAME% .\Output\symbols\* > nul
 
 if defined APPVEYOR (
 	appveyor PushArtifact Final\%CS_SYMBOLS_NAME%

Src/Setup/BuildBinaries.bat

@@ -1,8 +1,6 @@
 if exist Output rd /Q /S Output
 md Output
 md Output\x64
-md Output\PDB32
-md Output\PDB64
 
 echo -- Compiling
 
@@ -40,6 +38,7 @@ copy /B ..\ClassicIE\Setup\ClassicIE_32.exe Output > nul
 copy /B ..\StartMenu\Setup\StartMenu.exe Output > nul
 copy /B ..\StartMenu\Setup\StartMenuDLL.dll Output > nul
 copy /B ..\Update\Release\Update.exe Output > nul
+copy /B ..\Update\DesktopToasts\Release\DesktopToasts.dll Output > nul
 copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.dll Output > nul
 copy /B ..\Setup\SetupHelper\Release\SetupHelper.exe Output > nul
 
@@ -67,6 +66,8 @@ copy /B "..\StartMenu\Skins\Metallic.skin7" Output > nul
 
 
 REM ********* Collect debug info
+md Output\PDB32
+md Output\PDB64
 
 REM Explorer 32
 copy /B ..\ClassicExplorer\Setup\ClassicExplorer32.pdb Output\PDB32 > nul
@@ -99,6 +100,8 @@ copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.pdb Output\PDB32 >
 copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul
 copy /B ..\Update\Release\Update.pdb Output\PDB32 > nul
 copy /B Output\Update.exe Output\PDB32 > nul
+copy /B ..\Update\DesktopToasts\Release\DesktopToasts.pdb Output\PDB32 > nul
+copy /B Output\DesktopToasts.dll Output\PDB32 > nul
 
 REM Menu 64
 copy /B ..\StartMenu\Setup64\StartMenu.pdb Output\PDB64 > nul
@@ -126,6 +129,18 @@ if exist %PDBSTR_PATH% (
 	)
 )
 
+REM ********* Prepare symbols
+
+set SYMSTORE_PATH="C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore.exe"
+
+%SYMSTORE_PATH% add /r /f Output\PDB32 /s Output\symbols /t OpenShell -:NOREFS > nul
+%SYMSTORE_PATH% add /r /f Output\PDB64 /s Output\symbols /t OpenShell -:NOREFS > nul
+rd /Q /S Output\symbols\000Admin > nul
+del Output\symbols\pingme.txt > nul
+
+rd /Q /S Output\PDB32
+rd /Q /S Output\PDB64
+
 REM ********* Build ADMX
 echo --- ADMX
 if exist Output\PolicyDefinitions.zip (

Src/Setup/Setup.vcxproj

@@ -55,7 +55,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>

Src/Setup/Setup.wxs

@@ -105,7 +105,9 @@
 			</Feature>
 			<Feature Id="Update" Level="1" Title="!(loc.UpdateTitle)" ConfigurableDirectory="APPLICATIONFOLDER" AllowAdvertise="no" Description="!(loc.UpdateDesc)">
 				<ComponentRef Id="Update.exe" />
+				<ComponentRef Id="DesktopToasts.dll" />
 				<ComponentRef Id="UpdateSettingsLink" />
+				<ComponentRef Id="ToastActivator" />
 			</Feature>
 		</Feature>
 		<UI>
@@ -388,8 +390,8 @@
 				<Control Type="Icon" Id="Icon1" Width="12" Height="12" X="7" Y="203" Hidden="yes" Text="web.ico">
 					<Condition Action="show">NOT Installed</Condition>
 				</Control>
-				<Control Type="Hyperlink" Id="Link1" Width="131" Height="10" X="22" Y="204" Hidden="yes" ToolTip="https://github.com/Open-Shell/Open-Shell-Menu">
-					<Text><![CDATA[<a href="https://github.com/Open-Shell/Open-Shell-Menu">!(loc.WebLink)</a>]]></Text>
+				<Control Type="Hyperlink" Id="Link1" Width="131" Height="10" X="22" Y="204" Hidden="yes" ToolTip="https://open-shell.github.io/Open-Shell-Menu">
+					<Text><![CDATA[<a href="https://open-shell.github.io/Open-Shell-Menu">!(loc.WebLink)</a>]]></Text>
 					<Condition Action="show">NOT Installed</Condition>
 				</Control>
 			</Dialog>
@@ -476,6 +478,9 @@
 			<Component Id="Update.exe" Guid="FB6C213F-B670-4888-8B2C-12E807E335A7" Win64="$(var.CS_WIN64)">
 				<File Id="Update" KeyPath="yes" Source="Output\Update.exe" Checksum="yes" Vital="yes" />
 			</Component>
+			<Component Id="DesktopToasts.dll" Guid="B42157AF-3984-4796-8BD6-501FC5450FF1" Win64="$(var.CS_WIN64)">
+				<File Id="DesktopToasts.dll" KeyPath="yes" Source="Output\DesktopToasts.dll" Checksum="yes" Vital="yes" />
+			</Component>
 			<Component Id="PolicyDefinitions.zip" Guid="580A15D0-4023-471d-9D82-9D63FBA42B5D" Win64="$(var.CS_WIN64)">
 				<File Id="PolicyDefinitions.zip" KeyPath="yes" Source="Output\PolicyDefinitions.zip" Vital="yes" />
 			</Component>
@@ -551,6 +556,11 @@
 			<Component Id="TreatAs" Guid="B1E7462A-E1E2-47eb-A42C-7BD272D738AA" Win64="$(var.CS_WIN64)">
 				<RegistryKey Root="HKCR" Key="CLSID\{ECD4FC4D-521C-11D0-B792-00A0C90312E1}\TreatAs" ForceDeleteOnUninstall="yes" />
 			</Component>
+			<Component Id="ToastActivator" Guid="3A0FDC31-D5D3-4C2E-9A0B-292CAB46DA87" Win64="$(var.CS_WIN64)">
+				<RegistryKey Root="HKCR" Key="CLSID\{E407B70A-1FBD-4D5E-8822-231C69102472}\LocalServer32" ForceDeleteOnUninstall="yes">
+					<RegistryValue Value="&quot;[APPLICATIONFOLDER]Update.exe&quot; -ToastActivated" Type="string" />
+				</RegistryKey>
+			</Component>
 		</DirectoryRef>
 		<DirectoryRef Id="StartMenuDir">
 			<Component Id="HelpLink" Guid="D631C351-7BD4-42CE-813C-5D46347068AF">
@@ -564,7 +574,10 @@
 				<Condition>START_MENU_FOLDER=1</Condition>
 			</Component>
 			<Component Id="UpdateSettingsLink" Guid="10B5A082-6C92-4EA7-AFF8-21AE3D2D7FE0">
-				<Shortcut Id="UpdateSettingsLink" Name="!(loc.UpdateItem)" Advertise="no" Description="!(loc.UpdateSettingsDesc)" Target="[APPLICATIONFOLDER]Update.exe" WorkingDirectory="APPLICATIONFOLDER" />
+				<Shortcut Id="UpdateSettingsLink" Name="!(loc.UpdateItem)" Advertise="no" Description="!(loc.UpdateSettingsDesc)" Target="[APPLICATIONFOLDER]Update.exe" WorkingDirectory="APPLICATIONFOLDER">
+					<ShortcutProperty Key="System.AppUserModel.ID" Value="OpenShell.Update"/>
+					<ShortcutProperty Key="System.AppUserModel.ToastActivatorCLSID" Value="{E407B70A-1FBD-4D5E-8822-231C69102472}"/>
+				</Shortcut>
 				<CreateFolder />
 				<Condition>START_MENU_FOLDER=1</Condition>
 			</Component>
@@ -607,9 +620,9 @@
 		<Property Id="ApplicationFolderName" Value="Open-Shell" />
 		<Property Id="WixAppFolder" Value="WixPerMachineFolder" />
 		<Property Id="ALLUSERS" Value="1" />
-		<Property Id="ARPHELPLINK" Value="http://www.classicshell.net/forum/" />
+		<Property Id="ARPHELPLINK" Value="https://github.com/Open-Shell/Open-Shell-Menu/issues" />
 		<Property Id="ARPSIZE" Value="9000" />
-		<Property Id="ARPURLINFOABOUT" Value="http://www.classicshell.net/" />
+		<Property Id="ARPURLINFOABOUT" Value="https://open-shell.github.io/Open-Shell-Menu" />
 		<Property Id="ARPNOMODIFY" Value="1" />
 		<Property Id="ARPNOREPAIR" Value="1" />
 		<Property Id="START_MENU_FOLDER" Value="1" />

Src/Setup/SetupHelper/SetupHelper.vcxproj

@@ -53,7 +53,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>

Src/Setup/Utility/ManualUninstall.cpp

@@ -453,6 +453,32 @@ static void SaveReportFile( void )
 	}
 }
 
+static void RemoveShellExtKey(const wchar_t* progID)
+{
+	static const auto ShellExtName = L"StartMenuExt";
+	auto contextMenuHandlers = std::wstring(progID) + L"\\ShellEx\\ContextMenuHandlers";
+	auto startMenuExt = contextMenuHandlers + L"\\" + ShellExtName;
+
+	HKEY hkey = NULL;
+	if (RegOpenKeyEx(HKEY_CLASSES_ROOT, startMenuExt.c_str(), 0, KEY_READ | KEY_WOW64_64KEY, &hkey) == ERROR_SUCCESS)
+	{
+		RegCloseKey(hkey);
+		LogMessage(-1, L"Deleting registry key HKEY_CLASSES_ROOT\\%s", startMenuExt.c_str());
+		auto error = RegCreateKeyEx(HKEY_CLASSES_ROOT, contextMenuHandlers.c_str(), NULL, NULL, REG_OPTION_BACKUP_RESTORE, KEY_WRITE | DELETE | KEY_WOW64_64KEY, NULL, &hkey, NULL);
+		if (error == ERROR_SUCCESS)
+		{
+			error = RegDeleteTree2(hkey, ShellExtName);
+			if (error != ERROR_SUCCESS && error != ERROR_FILE_NOT_FOUND)
+				LogMessage(error, L"Failed to delete registry key HKEY_CLASSES_ROOT\\%s.", startMenuExt.c_str());
+			RegCloseKey(hkey);
+		}
+		else if (error != ERROR_FILE_NOT_FOUND)
+		{
+			LogMessage(error, L"Failed to open registry key HKEY_CLASSES_ROOT\\%s for writing.", contextMenuHandlers.c_str());
+		}
+	}
+}
+
 static bool RemoveRegistryKeys( bool bPin )
 {
 	HKEY hkey=NULL;
@@ -489,40 +515,11 @@ static bool RemoveRegistryKeys( bool bPin )
 		}
 	}
 
-	hkey=NULL;
 	if (bPin)
 	{
-		if (RegOpenKeyEx(HKEY_CLASSES_ROOT,L"Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers\\StartMenuExt",0,KEY_READ|KEY_WOW64_64KEY,&hkey)==ERROR_SUCCESS)
-		{
-			RegCloseKey(hkey);
-			LogMessage(-1,L"Deleting registry key HKEY_CLASSES_ROOT\\Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers\\StartMenuExt");
-			error=RegCreateKeyEx(HKEY_CLASSES_ROOT,L"Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers",NULL,NULL,REG_OPTION_BACKUP_RESTORE,KEY_WRITE|DELETE|KEY_WOW64_64KEY,NULL,&hkey,NULL);
-			if (error==ERROR_SUCCESS)
-			{
-				error=RegDeleteTree2(hkey,L"StartMenuExt");
-				if (error!=ERROR_SUCCESS && error!=ERROR_FILE_NOT_FOUND)
-					LogMessage(error,L"Failed to delete registry key HKEY_CLASSES_ROOT\\Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers\\StartMenuExt.");
-				RegCloseKey(hkey);
-			}
-			else if (error!=ERROR_FILE_NOT_FOUND)
-				LogMessage(error,L"Failed to open registry key HKEY_CLASSES_ROOT\\Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers for writing.");
-		}
-
-		if (RegOpenKeyEx(HKEY_CLASSES_ROOT,L"Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers\\StartMenuExt",0,KEY_READ|KEY_WOW64_64KEY,&hkey)==ERROR_SUCCESS)
-		{
-			RegCloseKey(hkey);
-			LogMessage(-1,L"Deleting registry key HKEY_CLASSES_ROOT\\Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers\\StartMenuExt");
-			error=RegCreateKeyEx(HKEY_CLASSES_ROOT,L"Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers",NULL,NULL,REG_OPTION_BACKUP_RESTORE,KEY_WRITE|DELETE|KEY_WOW64_64KEY,NULL,&hkey,NULL);
-			if (error==ERROR_SUCCESS)
-			{
-				error=RegDeleteTree2(hkey,L"StartMenuExt");
-				if (error!=ERROR_SUCCESS && error!=ERROR_FILE_NOT_FOUND)
-					LogMessage(error,L"Failed to delete registry key HKEY_CLASSES_ROOT\\Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers\\StartMenuExt.");
-				RegCloseKey(hkey);
-			}
-			else if (error!=ERROR_FILE_NOT_FOUND)
-				LogMessage(error,L"Failed to open registry key HKEY_CLASSES_ROOT\\Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers for writing.");
-		}
+		RemoveShellExtKey(L"Launcher.ImmersiveApplication");
+		RemoveShellExtKey(L"Launcher.DesktopPackagedApplication");
+		RemoveShellExtKey(L"Launcher.SystemSettings");
 	}
 
 	return true;

Src/Setup/Utility/MetroColorViewer.cpp

@@ -405,7 +405,7 @@ void ShowMetroColorViewer( void )
 			if (fout) fprintf(fout,"%02X%02X%02X%02X %S\n",(color>>24)&0xFF,color&0xFF,(color>>8)&0xFF,(color>>16)&0xFF,name);
 #endif
 			MetroColor mc;
-			mc.name=name;
+			mc.name=text;
 			mc.NAME=mc.name;
 			mc.NAME.MakeUpper();
 			mc.type=type;

Src/Setup/Utility/Utility.vcxproj

@@ -92,7 +92,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -112,7 +111,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>

Src/Setup/__MakeFinal.bat

@@ -7,7 +7,7 @@ rem Clean repository and build fresh. Will erase current changes so disabled by
 rem git clean -dfx
 
 rem Default version
-set CS_VERSION=4.4.110
+set CS_VERSION=4.4.1000
 
 if defined APPVEYOR_BUILD_VERSION (
 	set CS_VERSION=%APPVEYOR_BUILD_VERSION%

Src/Setup/__MakeFinalAllLanguages.bat

@@ -9,7 +9,7 @@ rem Clean repository and build fresh. Will erase current changes so disabled by
 rem git clean -dfx
 
 rem Default version
-set CS_VERSION=4.3.2
+set CS_VERSION=4.4.1000
 
 if defined APPVEYOR_BUILD_VERSION (
 	set CS_VERSION=%APPVEYOR_BUILD_VERSION%

Src/StartMenu/StartMenu.vcxproj

@@ -136,7 +136,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -159,7 +158,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>

Src/StartMenu/StartMenuDLL/Accessibility.cpp

@@ -182,7 +182,7 @@ HRESULT STDMETHODCALLTYPE CMenuAccessible::accSelect( long flagsSelect, VARIANT
 		int index=varChild.lVal-1;
 		if (index<0 || index>=(int)m_pOwner->m_Items.size())
 			return S_FALSE;
-		m_pOwner->ActivateItem(index,CMenuContainer::ACTIVATE_SELECT,NULL,false);
+		m_pOwner->ActivateItem(index,CMenuContainer::ACTIVATE_SELECT,NULL);
 	}
 	return S_OK;
 }

Src/StartMenu/StartMenuDLL/DragDrop.cpp

@@ -852,9 +852,14 @@ HRESULT STDMETHODCALLTYPE CMenuContainer::Drop( IDataObject *pDataObj, DWORD grf
 			CComQIPtr<IDataObjectAsyncCapability> pAsync=pDataObj;
 			if (pAsync)
 				pAsync->SetAsyncMode(FALSE);
-			for (std::vector<CMenuContainer*>::iterator it=s_Menus.begin();it!=s_Menus.end();++it)
-				if (!(*it)->m_bDestroyed)
-					(*it)->EnableWindow(FALSE); // disable all menus
+			for (auto& it : s_Menus)
+			{
+				if (!it->m_bDestroyed)
+				{
+					it->EnableWindow(FALSE); // disable all menus
+					it->SetWindowPos(HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+				}
+			}
 			bool bAllPrograms=s_bAllPrograms;
 			if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,FALSE);
 			bool bOld=s_bPreventClosing;
@@ -862,9 +867,14 @@ HRESULT STDMETHODCALLTYPE CMenuContainer::Drop( IDataObject *pDataObj, DWORD grf
 			AddRef();
 			pTarget->Drop(pDataObj,grfKeyState,pt,pdwEffect);
 			s_bPreventClosing=bOld;
-			for (std::vector<CMenuContainer*>::iterator it=s_Menus.begin();it!=s_Menus.end();++it)
-				if (!(*it)->m_bDestroyed)
-					(*it)->EnableWindow(TRUE); // enable all menus
+			for (auto& it : s_Menus)
+			{
+				if (!it->m_bDestroyed)
+				{
+					it->EnableWindow(TRUE); // enable all menus
+					it->SetWindowPos(HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+				}
+			}
 			if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,TRUE);
 		}
 		else

Src/StartMenu/StartMenuDLL/ItemManager.cpp

@@ -55,8 +55,8 @@ GUID IID_IApplicationResolver8={0xde25675a,0x72de,0x44b4,{0x93,0x73,0x05,0x17,0x
 
 interface IResourceContext;
 
-const GUID IID_IResourceMap={0x6e21e72b, 0xb9b0, 0x42ae, {0xa6, 0x86, 0x98, 0x3c, 0xf7, 0x84, 0xed, 0xcd}};
-interface IResourceMap : public IUnknown
+MIDL_INTERFACE("6e21e72b-b9b0-42ae-a686-983cf784edcd")
+IResourceMap : public IUnknown
 {
 	virtual HRESULT STDMETHODCALLTYPE GetUri(const wchar_t **pUri ) = 0;
 	virtual HRESULT STDMETHODCALLTYPE GetSubtree(const wchar_t *propName, IResourceMap **pSubTree ) = 0;
@@ -76,8 +76,8 @@ enum RESOURCE_SCALE
 	RES_SCALE_80 =3,
 };
 
-const GUID IID_ResourceContext={0xe3c22b30, 0x8502, 0x4b2f, {0x91, 0x33, 0x55, 0x96, 0x74, 0x58, 0x7e, 0x51}};
-interface IResourceContext : public IUnknown
+MIDL_INTERFACE("e3c22b30-8502-4b2f-9133-559674587e51")
+IResourceContext : public IUnknown
 {
 	virtual HRESULT STDMETHODCALLTYPE GetLanguage( void ) = 0;
 	virtual HRESULT STDMETHODCALLTYPE GetHomeRegion( wchar_t *pRegion ) = 0;
@@ -142,10 +142,11 @@ static bool DetectGrayscaleImage( const unsigned int *bits, int stride, int widt
 		for (int x=0;x<width;x++)
 		{
 			unsigned int pixel=bits[x];
+			int a=(pixel>>24)&255;
 			int r=(pixel>>16)&255;
 			int g=(pixel>>8)&255;
 			int b=(pixel)&255;
-			if (abs(r-g)>2 || abs(r-b)>2 || abs(g-b)>2)
+			if (abs(a-r)>2 || abs(r-g)>2 || abs(r-b)>2 || abs(g-b)>2)
 				return false; // found colored pixel
 			if (!(pixel&0xFF000000))
 				transparent++;
@@ -175,6 +176,27 @@ static void CreateMonochromeImage( unsigned int *bits, int stride, int width, in
 	}
 }
 
+HBITMAP ColorizeMonochromeImage(HBITMAP bitmap, DWORD color)
+{
+	{
+		BITMAP info{};
+		GetObject(bitmap, sizeof(info), &info);
+		if (!DetectGrayscaleImage((const unsigned int*)info.bmBits, info.bmWidth, info.bmWidth, info.bmHeight))
+			return nullptr;
+	}
+
+	HBITMAP bmp = (HBITMAP)CopyImage(bitmap, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION);
+	if (bmp)
+	{
+		BITMAP info{};
+		GetObject(bmp, sizeof(info), &info);
+
+		CreateMonochromeImage((unsigned int*)info.bmBits, info.bmWidth, info.bmWidth, info.bmHeight, color);
+	}
+
+	return bmp;
+}
+
 static HBITMAP BitmapFromMetroIcon( HICON hIcon, int bitmapSize, int iconSize, DWORD metroColor, bool bDestroyIcon=true )
 {
 	ICONINFO info;
@@ -258,7 +280,6 @@ static HBITMAP BitmapFromMetroBitmap( HBITMAP hBitmap, int bitmapSize, DWORD met
 	HGDIOBJ bmp0=SelectObject(hdc,bmp);
 	HGDIOBJ bmp02=SelectObject(hsrc,hBitmap);
 	int offset=(bitmapSize-info.bmWidth)/2;
-	bool bInvert=g_bInvertMetroIcons;
 	if (g_bInvertMetroIcons && bGrayscale)
 	{
 		FillRect(hdc,&rc,(HBRUSH)GetStockObject(BLACK_BRUSH));
@@ -299,10 +320,9 @@ static HBITMAP BitmapFromMetroBitmap( HBITMAP hBitmap, int bitmapSize, DWORD met
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static HBITMAP LoadMetroBitmap0( const wchar_t *path, int bitmapSize, DWORD metroColor )
+static HBITMAP LoadMetroBitmap0(const wchar_t *path, int bitmapSize, DWORD metroColor = 0xFFFFFFFF)
 {
-	int iconSize=g_bInvertMetroIcons?bitmapSize:(bitmapSize-2);
-	SIZE size={-iconSize,iconSize};
+	SIZE size={-bitmapSize,bitmapSize};
 	HBITMAP hBitmap=LoadImageFile(path,&size,true,true,NULL);
 	if (hBitmap)
 	{
@@ -439,16 +459,8 @@ static HBITMAP LoadMetroBitmap2( const wchar_t *location, int bitmapSize, DWORD
 	}
 	if (iconSize)
 	{
-		if (g_bInvertMetroIcons)
-		{
-			if (iconSize>bitmapSize)
-				iconSize=bitmapSize;
-		}
-		else
-		{
-			if (iconSize>bitmapSize-2)
-				iconSize=bitmapSize-2;
-		}
+		if (iconSize>bitmapSize)
+			iconSize=bitmapSize;
 		SIZE size={iconSize,iconSize};
 		HBITMAP hBitmap=LoadImageFile(path,&size,true,true,NULL);
 		if (hBitmap)
@@ -1113,6 +1125,49 @@ const CItemManager::ItemInfo *CItemManager::GetCustomIcon( const wchar_t *path,
 	return GetCustomIcon(text,index,iconSizeType,false);
 }
 
+const CItemManager::ItemInfo* CItemManager::GetLinkIcon(IShellLink* link, TIconSizeType iconSizeType)
+{
+	wchar_t location[_MAX_PATH];
+	int index;
+
+	if (link->GetIconLocation(location, _countof(location), &index) == S_OK && location[0])
+		return GetCustomIcon(location, index, iconSizeType, (index == 0)); // assuming that if index!=0 the icon comes from a permanent location like a dll or exe
+
+	CComQIPtr<IPropertyStore> store(link);
+	if (store)
+	{
+		//  Name:     System.AppUserModel.DestListLogoUri -- PKEY_AppUserModel_DestListLogoUri
+		//  Type:     String -- VT_LPWSTR
+		//  FormatID: {9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}, 29
+		static const PROPERTYKEY PKEY_AppUserModel_DestListLogoUri = { {0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 29 };
+
+		auto logoUri = GetPropertyStoreString(store, PKEY_AppUserModel_DestListLogoUri);
+		if (!logoUri.IsEmpty())
+		{
+			auto appId = GetPropertyStoreString(store, PKEY_AppUserModel_ID);
+			if (!appId.IsEmpty())
+			{
+				CComPtr<IResourceManager> resManager;
+				if (SUCCEEDED(resManager.CoCreateInstance(CLSID_ResourceManager)))
+				{
+					if (SUCCEEDED(resManager->InitializeForPackage(GetPackageFullName(appId))))
+					{
+						CComPtr<IResourceMap> resMap;
+						if (SUCCEEDED(resManager->GetMainResourceMap(IID_PPV_ARGS(&resMap))))
+						{
+							CComString location;
+							if (SUCCEEDED(resMap->GetFilePath(logoUri, &location)))
+								return GetCustomIcon(location, -65536, iconSizeType, true);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return nullptr;
+}
+
 const CItemManager::ItemInfo *CItemManager::GetMetroAppInfo10( const wchar_t *appid )
 {
 	wchar_t APPID[256];
@@ -1823,7 +1878,11 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte
 					{
 						newInfo.bLink=true;
 						pStore=pLink;
-
+#ifdef _DEBUG
+						LOG_MENU(LOG_OPEN, L"Link: %s", newInfo.path);
+						LOG_MENU(LOG_OPEN, L"Link property store:");
+						LogPropertyStore(LOG_OPEN, pStore);
+#endif
 						if (SUCCEEDED(pLink->GetIDList(&newInfo.targetPidl)))
 						{
 							wchar_t path[_MAX_PATH];
@@ -1832,6 +1891,28 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte
 								CharUpper(path);
 								newInfo.targetPATH=path;
 							}
+
+							CComPtr<IShellItem> target;
+							if (SUCCEEDED(SHCreateItemFromIDList(newInfo.targetPidl, IID_PPV_ARGS(&target))))
+							{
+								CComPtr<IPropertyStore> store;
+								if (SUCCEEDED(target->BindToHandler(nullptr, BHID_PropertyStore, IID_PPV_ARGS(&store))))
+								{
+#ifdef _DEBUG
+									LOG_MENU(LOG_OPEN, L"Target property store:");
+									LogPropertyStore(LOG_OPEN, store);
+#endif
+									PROPVARIANT val;
+									PropVariantInit(&val);
+									if (SUCCEEDED(store->GetValue(PKEY_MetroAppLauncher, &val)) && (val.vt == VT_I4 || val.vt == VT_UI4) && val.intVal)
+									{
+										newInfo.bLink = false;
+										pItem = target;
+										pStore = store;
+									}
+									PropVariantClear(&val);
+								}
+							}
 						}
 					}
 				}
@@ -1923,7 +2004,6 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte
 			{
 				newInfo.targetPidl.Clear();
 				newInfo.targetPATH.Empty();
-				newInfo.metroName.Empty();
 				newInfo.iconPath.Empty();
 				newInfo.bNoPin=newInfo.bNoNew=false;
 				if (!newInfo.bMetroApp)
@@ -2296,12 +2376,6 @@ void CItemManager::LoadShellIcon( IShellItem *pItem, int refreshFlags, const Ico
 	int smallIconSize=SMALL_ICON_SIZE;
 	int largeIconSize=LARGE_ICON_SIZE;
 	int extraLargeIconSize=EXTRA_LARGE_ICON_SIZE;
-	if (pMetroColor)
-	{
-		smallIconSize-=2;
-		largeIconSize-=2;
-		extraLargeIconSize-=2;
-	}
 	HICON hSmallIcon=NULL, hLargeIcon=NULL, hExtraLargeIcon=NULL;
 	if (bNotFileName)
 	{
@@ -2414,14 +2488,13 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic
 	if (FAILED(pResManager->InitializeForPackage(packageName)))
 		return;
 	CComPtr<IResourceMap> pResMap;
-	if (FAILED(pResManager->GetMainResourceMap(IID_IResourceMap,(void**)&pResMap)))
+	if (FAILED(pResManager->GetMainResourceMap(IID_PPV_ARGS(&pResMap))))
 		return;
 	CComPtr<IResourceContext> pResContext;
-	if (FAILED(pResManager->GetDefaultContext(IID_ResourceContext,(void**)&pResContext)))
+	if (FAILED(pResManager->GetDefaultContext(IID_PPV_ARGS(&pResContext))))
 		return;
 	int iconFlags=0;
-	int delta=g_bInvertMetroIcons?0:2;
-	if ((refreshFlags&INFO_SMALL_ICON) && SetResContextTargetSize(pResContext,SMALL_ICON_SIZE-delta))
+	if ((refreshFlags&INFO_SMALL_ICON) && SetResContextTargetSize(pResContext,SMALL_ICON_SIZE))
 	{
 		CComString pLocation;
 		if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation)))
@@ -2431,7 +2504,7 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic
 			StoreInCache(hash,L"",hSmallBitmap,NULL,NULL,INFO_SMALL_ICON,smallIcon,largeIcon,extraLargeIcon,false,true);
 		}
 	}
-	if ((refreshFlags&INFO_LARGE_ICON) && SetResContextTargetSize(pResContext,LARGE_ICON_SIZE-delta))
+	if ((refreshFlags&INFO_LARGE_ICON) && SetResContextTargetSize(pResContext,LARGE_ICON_SIZE))
 	{
 		CComString pLocation;
 		if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation)))
@@ -2441,7 +2514,7 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic
 			StoreInCache(hash,L"",NULL,hLargeBitmap,NULL,INFO_LARGE_ICON,smallIcon,largeIcon,extraLargeIcon,false,true);
 		}
 	}
-	if ((refreshFlags&INFO_SMALL_ICON) && SetResContextTargetSize(pResContext,EXTRA_LARGE_ICON_SIZE-delta))
+	if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && SetResContextTargetSize(pResContext,EXTRA_LARGE_ICON_SIZE))
 	{
 		CComString pLocation;
 		if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation)))
@@ -2586,49 +2659,45 @@ void CItemManager::IconInfo::SetPath( const wchar_t *path )
 	timestamp.dwHighDateTime=timestamp.dwLowDateTime=0;
 }
 
-void CItemManager::LoadCustomIcon( const wchar_t *iconPath, int iconIndex, int refreshFlags, const IconInfo *&smallIcon, const IconInfo *&largeIcon, const IconInfo *&extraLargeIcon, bool bTemp )
+void CItemManager::LoadCustomIcon(const wchar_t *iconPath, int iconIndex, int refreshFlags, const IconInfo *&smallIcon, const IconInfo *&largeIcon, const IconInfo *&extraLargeIcon, bool bTemp)
 {
-	unsigned int hash=CalcFNVHash(iconPath,CalcFNVHash(&iconIndex,4));
+	unsigned int hash = CalcFNVHash(iconPath, CalcFNVHash(&iconIndex, 4));
 
-	FindInCache(hash,refreshFlags,smallIcon,largeIcon,extraLargeIcon);
-	if (!refreshFlags) return;
+	FindInCache(hash, refreshFlags, smallIcon, largeIcon, extraLargeIcon);
+	if (!refreshFlags)
+		return;
+
+	auto ExtractIconAsBitmap = [&](int iconSize) -> HBITMAP {
+
+		if (iconIndex == -65536)
+			return LoadMetroBitmap0(iconPath, iconSize);
+
+		HICON hIcon;
+
+		if (!*iconPath)
+			hIcon = (HICON)LoadImage(g_Instance, MAKEINTRESOURCE(-iconIndex), IMAGE_ICON, iconSize, iconSize, LR_DEFAULTCOLOR);
+		else
+			hIcon = ShExtractIcon(iconPath, iconIndex == -1 ? 0 : iconIndex, iconSize);
+
+		if (hIcon)
+			return BitmapFromIcon(hIcon, iconSize);
+
+		return nullptr;
+	};
 
 	// extract icon
-	HBITMAP hSmallBitmap=NULL, hLargeBitmap=NULL, hExtraLargeBitmap=NULL;
-	if (refreshFlags&INFO_SMALL_ICON)
-	{
-		HICON hIcon;
-		if (!*iconPath)
-			hIcon=(HICON)LoadImage(g_Instance,MAKEINTRESOURCE(-iconIndex),IMAGE_ICON,SMALL_ICON_SIZE,SMALL_ICON_SIZE,LR_DEFAULTCOLOR);
-		else
-			hIcon=ShExtractIcon(iconPath,iconIndex==-1?0:iconIndex,SMALL_ICON_SIZE);
-		if (hIcon)
-			hSmallBitmap=BitmapFromIcon(hIcon,SMALL_ICON_SIZE);
-	}
+	HBITMAP hSmallBitmap = nullptr, hLargeBitmap = nullptr, hExtraLargeBitmap = nullptr;
 
-	if (refreshFlags&INFO_LARGE_ICON)
-	{
-		HICON hIcon;
-		if (!*iconPath)
-			hIcon=(HICON)LoadImage(g_Instance,MAKEINTRESOURCE(-iconIndex),IMAGE_ICON,LARGE_ICON_SIZE,LARGE_ICON_SIZE,LR_DEFAULTCOLOR);
-		else
-			hIcon=ShExtractIcon(iconPath,iconIndex==-1?0:iconIndex,LARGE_ICON_SIZE);
-		if (hIcon)
-			hLargeBitmap=BitmapFromIcon(hIcon,LARGE_ICON_SIZE);
-	}
+	if (refreshFlags & INFO_SMALL_ICON)
+		hSmallBitmap = ExtractIconAsBitmap(SMALL_ICON_SIZE);
 
-	if (refreshFlags&INFO_EXTRA_LARGE_ICON)
-	{
-		HICON hIcon;
-		if (!*iconPath)
-			hIcon=(HICON)LoadImage(g_Instance,MAKEINTRESOURCE(-iconIndex),IMAGE_ICON,EXTRA_LARGE_ICON_SIZE,EXTRA_LARGE_ICON_SIZE,LR_DEFAULTCOLOR);
-		else
-			hIcon=ShExtractIcon(iconPath,iconIndex==-1?0:iconIndex,EXTRA_LARGE_ICON_SIZE);
-		if (hIcon)
-			hExtraLargeBitmap=BitmapFromIcon(hIcon,EXTRA_LARGE_ICON_SIZE);
-	}
+	if (refreshFlags & INFO_LARGE_ICON)
+		hLargeBitmap = ExtractIconAsBitmap(LARGE_ICON_SIZE);
 
-	StoreInCache(hash,bTemp?NULL:iconPath,hSmallBitmap,hLargeBitmap,hExtraLargeBitmap,refreshFlags,smallIcon,largeIcon,extraLargeIcon,bTemp,false);
+	if (refreshFlags & INFO_EXTRA_LARGE_ICON)
+		hExtraLargeBitmap = ExtractIconAsBitmap(EXTRA_LARGE_ICON_SIZE);
+
+	StoreInCache(hash, bTemp ? nullptr : iconPath, hSmallBitmap, hLargeBitmap, hExtraLargeBitmap, refreshFlags, smallIcon, largeIcon, extraLargeIcon, bTemp, false);
 }
 
 // Recursive function to preload the items for a folder

Src/StartMenu/StartMenuDLL/ItemManager.h

@@ -173,6 +173,7 @@ public:
 	const ItemInfo *GetItemInfo( CString path, int refreshFlags, TLocation location=LOCATION_UNKNOWN );
 	const ItemInfo *GetCustomIcon( const wchar_t *location, int index, TIconSizeType iconSizeType, bool bTemp );
 	const ItemInfo *GetCustomIcon( const wchar_t *path, TIconSizeType iconSizeType );
+	const ItemInfo* GetLinkIcon(IShellLink* link, TIconSizeType iconSizeType);
 	const ItemInfo *GetMetroAppInfo10( const wchar_t *appid );
 	void UpdateItemInfo( const ItemInfo *pInfo, int refreshFlags, bool bHasWriteLock=false );
 	void WaitForShortcuts( const POINT &balloonPos );
@@ -466,6 +467,7 @@ bool MenuGetFileTimestamp( const wchar_t *path, FILETIME *pWriteTime, FILETIME *
 STDAPI ShGetKnownFolderPath( REFKNOWNFOLDERID rfid, PWSTR *pPath );
 STDAPI ShGetKnownFolderIDList(REFKNOWNFOLDERID rfid, PIDLIST_ABSOLUTE *pPidl );
 STDAPI ShGetKnownFolderItem(REFKNOWNFOLDERID rfid, IShellItem **ppItem );
+HBITMAP ColorizeMonochromeImage(HBITMAP bitmap, DWORD color);
 
 #define TASKBAR_PINNED_ROOT L"%APPDATA%\\Microsoft\\Internet Explorer\\Quick Launch\\User Pinned\\TaskBar"
 #define START_MENU_PINNED_ROOT L"%APPDATA%\\OpenShell\\Pinned"

Src/StartMenu/StartMenuDLL/JumpLists.cpp

@@ -322,6 +322,9 @@ static void AddJumpItem( CJumpGroup &group, IUnknown *pUnknown, std::vector<CCom
 			}
 		}
 		LOG_MENU(LOG_OPEN,L"Jumplist Link Name: %s",item.name);
+#ifdef _DEBUG
+		LogPropertyStore(LOG_OPEN, pStore);
+#endif
 		if (!item.name.IsEmpty())
 			group.items.push_back(item);
 		return;
@@ -519,91 +522,15 @@ bool GetJumplist( const wchar_t *appid, CJumpList &list, int maxCount, int maxHe
 bool ExecuteJumpItem( const CItemManager::ItemInfo *pAppInfo, const CJumpItem &item, HWND hwnd )
 {
 	Assert(GetWinVersion()>=WIN_VER_WIN7);
-	if (!item.pItem) return false;
+	if (!item.pItem)
+		return false;
+
 	if (item.type==CJumpItem::TYPE_ITEM)
 	{
-/*		CString appid;
-		{
-			CItemManager::RWLock lock(&g_ItemManager,false,CItemManager::RWLOCK_ITEMS);
-			appid=pAppInfo->GetAppid();
-		}
-		LOG_MENU(LOG_OPEN,L"Execute Item: name=%s, appid=%s",item.name,appid);*/
 		CComQIPtr<IShellItem> pItem(item.pItem);
 		if (!pItem)
 			return false;
-/*		CComString pName;
-		if (FAILED(pItem->GetDisplayName(SIGDN_DESKTOPABSOLUTEPARSING,&pName)))
-			return false;
-		wchar_t ext[_MAX_EXT];
-		Strcpy(ext,_countof(ext),PathFindExtension(pName));
 
-		// find the correct association handler by appid and invoke it on the item
-		CComPtr<IEnumAssocHandlers> pEnumHandlers;
-		if (ext[0] && SUCCEEDED(SHAssocEnumHandlers(ext,ASSOC_FILTER_RECOMMENDED,&pEnumHandlers)))
-		{
-			CComPtr<IAssocHandler> pHandler;
-			ULONG count;
-			while (SUCCEEDED(pEnumHandlers->Next(1,&pHandler,&count)) && count==1)
-			{
-				CComQIPtr<IObjectWithAppUserModelID> pObject=pHandler;
-				if (pObject)
-				{
-					CComString pID;
-					if (SUCCEEDED(pObject->GetAppID(&pID)))
-					{
-						// found explicit appid
-						if (_wcsicmp(appid,pID)==0)
-						{
-							LOG_MENU(LOG_OPEN,L"Found handler appid");
-							CComPtr<IDataObject> pDataObject;
-							if (SUCCEEDED(pItem->BindToHandler(NULL,BHID_DataObject,IID_IDataObject,(void**)&pDataObject)) && SUCCEEDED(pHandler->Invoke(pDataObject)))
-								return true;
-							break;
-						}
-					}
-				}
-				pHandler=NULL;
-			}
-			pEnumHandlers=NULL;
-
-			// find the correct association handler by exe name and invoke it on the item
-			wchar_t targetPath[_MAX_PATH];
-			targetPath[0]=0;
-			{
-				CComPtr<IShellItem> pItem;
-				SHCreateItemFromIDList(pAppInfo->GetPidl(),IID_IShellItem,(void**)&pItem);
-				CComPtr<IShellLink> pLink;
-				if (pItem)
-					pItem->BindToHandler(NULL,BHID_SFUIObject,IID_IShellLink,(void**)&pLink);
-				CAbsolutePidl target;
-				if (pLink && SUCCEEDED(pLink->Resolve(NULL,SLR_INVOKE_MSI|SLR_NO_UI|SLR_NOUPDATE)) && SUCCEEDED(pLink->GetIDList(&target)))
-				{
-					if (FAILED(SHGetPathFromIDList(target,targetPath)))
-						targetPath[0]=0;
-				}
-			}
-			if (targetPath[0] && SUCCEEDED(SHAssocEnumHandlers(ext,ASSOC_FILTER_RECOMMENDED,&pEnumHandlers)))
-			{
-				while (SUCCEEDED(pEnumHandlers->Next(1,&pHandler,&count)) && count==1)
-				{
-					CComString pExe;
-					if (SUCCEEDED(pHandler->GetName(&pExe)))
-					{
-						if (_wcsicmp(targetPath,pExe)==0)
-						{
-							LOG_MENU(LOG_OPEN,L"Found handler appexe %s",targetPath);
-							CComPtr<IDataObject> pDataObject;
-							if (SUCCEEDED(pItem->BindToHandler(NULL,BHID_DataObject,IID_IDataObject,(void**)&pDataObject)) && SUCCEEDED(pHandler->Invoke(pDataObject)))
-								return true;
-							break;
-						}
-					}
-					pHandler=NULL;
-				}
-			}
-		}
-*/
-		// couldn't find a handler, execute the old way
 		SHELLEXECUTEINFO execute={sizeof(execute),SEE_MASK_IDLIST|SEE_MASK_FLAG_LOG_USAGE};
 		execute.nShow=SW_SHOWNORMAL;
 		CAbsolutePidl pidl;
@@ -617,9 +544,50 @@ bool ExecuteJumpItem( const CItemManager::ItemInfo *pAppInfo, const CJumpItem &i
 
 	if (item.type==CJumpItem::TYPE_LINK)
 	{
-		// invoke the link through its context menu
+		//  Name:     System.AppUserModel.HostEnvironment -- PKEY_AppUserModel_HostEnvironment
+		//  Type:     UInt32 -- VT_UI4
+		//  FormatID: {9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}, 14
+		static const PROPERTYKEY PKEY_AppUserModel_HostEnvironment = { {0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 14 };
+
+		//  Name:     System.AppUserModel.ActivationContext -- PKEY_AppUserModel_ActivationContext
+		//  Type:     String -- VT_LPWSTR
+		//  FormatID: {9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}, 20
+		static const PROPERTYKEY PKEY_AppUserModel_ActivationContext = { {0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 20 };
+
 		CComQIPtr<IContextMenu> pMenu(item.pItem);
-		if (!pMenu) return false;
+		CStringA params;
+
+		CComQIPtr<IShellLink> pLink(item.pItem);
+		if (pLink)
+		{
+			CComQIPtr<IPropertyStore> store(pLink);
+			if (store)
+			{
+				auto appId = GetPropertyStoreString(store, PKEY_AppUserModel_ID);
+				if (!appId.IsEmpty())
+				{
+					CComPtr<IShellItem2> target;
+					if (SUCCEEDED(SHCreateItemInKnownFolder(FOLDERID_AppsFolder, 0, appId, IID_PPV_ARGS(&target))))
+					{
+						ULONG modern = 0;
+						if (SUCCEEDED(target->GetUInt32(PKEY_AppUserModel_HostEnvironment, &modern)) && modern)
+						{
+							CComQIPtr<IContextMenu> targetMenu;
+							if (SUCCEEDED(target->BindToHandler(nullptr, BHID_SFUIObject, IID_PPV_ARGS(&targetMenu))))
+							{
+								pMenu = targetMenu;
+								params = CT2CA(GetPropertyStoreString(store, PKEY_AppUserModel_ActivationContext));
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// invoke the link through its context menu
+		if (!pMenu)
+			return false;
+
 		HRESULT hr;
 		HMENU menu=CreatePopupMenu();
 		hr=pMenu->QueryContextMenu(menu,0,1,1000,CMF_DEFAULTONLY);
@@ -633,6 +601,8 @@ bool ExecuteJumpItem( const CItemManager::ItemInfo *pAppInfo, const CJumpItem &i
 		{
 			CMINVOKECOMMANDINFO command={sizeof(command),CMIC_MASK_FLAG_LOG_USAGE};
 			command.lpVerb=MAKEINTRESOURCEA(id-1);
+			if (!params.IsEmpty())
+				command.lpParameters = params;
 			wchar_t path[_MAX_PATH];
 			GetModuleFileName(NULL,path,_countof(path));
 			if (_wcsicmp(PathFindFileName(path),L"explorer.exe")==0)

Src/StartMenu/StartMenuDLL/LogManager.cpp

@@ -7,10 +7,13 @@
 #include "stdafx.h"
 #include "LogManager.h"
 #include "ResourceHelper.h"
+#include "ComHelper.h"
+#include <propvarutil.h>
+#include <chrono>
 
 int g_LogCategories;
 static FILE *g_LogFile;
-static int g_LogTime;
+static std::chrono::time_point<std::chrono::steady_clock> g_LogTime;
 
 void InitLog( int categories, const wchar_t *fname )
 {
@@ -21,7 +24,7 @@ void InitLog( int categories, const wchar_t *fname )
 		wchar_t bom=0xFEFF;
 		fwrite(&bom,2,1,g_LogFile);
 		g_LogCategories=categories;
-		g_LogTime=GetTickCount();
+		g_LogTime=std::chrono::steady_clock::now();
 		LogMessage(L"version=%x, PID=%d, TID=%d, Categories=%08x\r\n",GetWinVersion(),GetCurrentProcessId(),GetCurrentThreadId(),categories);
 	}
 }
@@ -38,7 +41,7 @@ void LogMessage( const wchar_t *text, ... )
 	if (!g_LogFile) return;
 
 	wchar_t buf[2048];
-	int len=Sprintf(buf,_countof(buf),L"%8d: ",GetTickCount()-g_LogTime);
+	int len=Sprintf(buf,_countof(buf),L"%8d: ",std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now()-g_LogTime).count());
 	fwrite(buf,2,len,g_LogFile);
 
 	va_list args;
@@ -51,3 +54,31 @@ void LogMessage( const wchar_t *text, ... )
 
 	fflush(g_LogFile);
 }
+
+void LogPropertyStore(TLogCategory category, IPropertyStore* store)
+{
+	if (!store)
+		return;
+
+	DWORD count = 0;
+	store->GetCount(&count);
+	for (DWORD i = 0; i < count; i++)
+	{
+		PROPERTYKEY key{};
+		store->GetAt(i, &key);
+
+		PROPVARIANT val;
+		PropVariantInit(&val);
+
+		store->GetValue(key, &val);
+
+		CComString valueStr;
+		PropVariantToStringAlloc(val, &valueStr);
+		PropVariantClear(&val);
+
+		wchar_t guidStr[100]{};
+		StringFromGUID2(key.fmtid, guidStr, _countof(guidStr));
+
+		LOG_MENU(category, L"Property: {%s, %u} = %s", guidStr, key.pid, valueStr ? valueStr : L"???");
+	}
+}

Src/StartMenu/StartMenuDLL/LogManager.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <propsys.h>
+
 // LogManager.h - logging functionality (for debugging)
 // Logs different events in the start menu
 // Turn it on by setting the LogLevel setting in the registry
@@ -33,3 +35,5 @@ void CloseLog( void );
 void LogMessage( const wchar_t *text, ... );
 
 #define STARTUP_LOG L"Software\\OpenShell\\StartMenu\\Settings|LogStartup|%LOCALAPPDATA%\\OpenShell\\StartupLog.txt"
+
+void LogPropertyStore(TLogCategory category, IPropertyStore* store);

Src/StartMenu/StartMenuDLL/MenuCommands.cpp

@@ -402,7 +402,7 @@ void CMenuContainer::OpenSubMenu( int index, TActivateType type, bool bShift )
 	if (m_Options&CONTAINER_NOEXTENSIONS)
 		options|=CONTAINER_NOEXTENSIONS;
 
-	if (item.id==MENU_PROGRAMS || item.id==MENU_APPS || (m_Options&CONTAINER_MULTICOL_REC))
+	if (item.id==MENU_PROGRAMS || item.id==MENU_APPS || item.bFolder || (m_Options&CONTAINER_MULTICOL_REC))
 		options|=CONTAINER_MULTICOL_REC;
 	if ((options&CONTAINER_MULTICOL_REC) && !bShift)
 		options|=CONTAINER_MULTICOLUMN;
@@ -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;
 	}
 
@@ -2800,8 +2804,11 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
 				info.fMask|=CMIC_MASK_NOASYNC; // wait for delete/link commands to finish so we can refresh the menu
 
 			s_bPreventClosing=true;
-			for (std::vector<CMenuContainer*>::iterator it=s_Menus.begin();it!=s_Menus.end();++it)
-				(*it)->EnableWindow(FALSE); // disable all menus
+			for (auto& it : s_Menus)
+			{
+				it->EnableWindow(FALSE); // disable all menus
+				it->SetWindowPos(HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+			}
 			bool bAllPrograms=s_bAllPrograms;
 			if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,FALSE);
 			info.hwnd=g_OwnerWindow;
@@ -2846,9 +2853,14 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
 					}
 				}
 			}
-			for (std::vector<CMenuContainer*>::iterator it=s_Menus.begin();it!=s_Menus.end();++it)
-				if (!(*it)->m_bDestroyed)
-					(*it)->EnableWindow(TRUE); // enable all menus
+			for (auto& it : s_Menus)
+			{
+				if (!it->m_bDestroyed)
+				{
+					it->EnableWindow(TRUE); // enable all menus
+					it->SetWindowPos(HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+				}
+			}
 			if (bAllPrograms) ::EnableWindow(g_TopWin7Menu,TRUE);
 			if (bRefreshMain && m_bSubMenu)
 			{

Src/StartMenu/StartMenuDLL/MenuContainer.cpp

@@ -1937,15 +1937,6 @@ void CMenuContainer::GetRecentPrograms( std::vector<MenuItem> &items, int maxCou
 					continue;
 				}
 
-				{
-					CComPtr<IShellItem> pAppItem;
-					if (FAILED(SHCreateItemInKnownFolder(FOLDERID_AppsFolder2,0,uaItem.name,IID_IShellItem,(void**)&pAppItem)))
-						continue;
-					CComString pName;
-					if (FAILED(pAppItem->GetDisplayName(SIGDN_NORMALDISPLAY,&pName)) || wcsncmp(pName,L"@{",2)==0)
-						continue;
-				}
-
 				uaItem.pLinkInfo=g_ItemManager.GetMetroAppInfo10(uaItem.name);
 				if (!uaItem.pLinkInfo)
 				{
@@ -1956,6 +1947,11 @@ void CMenuContainer::GetRecentPrograms( std::vector<MenuItem> &items, int maxCou
 				LOG_MENU(LOG_MFU,L"UserAssist: '%s', %d, %.3f",uaItem.name,data.count,uaItem.rank);
 				{
 					CItemManager::RWLock lock(&g_ItemManager,false,CItemManager::RWLOCK_ITEMS);
+					if (uaItem.pLinkInfo->GetMetroName().IsEmpty() || wcsncmp(uaItem.pLinkInfo->GetMetroName(), L"@{",2)==0)
+					{
+						LOG_MENU(LOG_MFU, L"UserAssist: Dropping: No metro name");
+						continue;
+					}
 					if (uaItem.pLinkInfo->IsNoPin())
 					{
 						LOG_MENU(LOG_MFU,L"UserAssist: Dropping: No pin");
@@ -2207,10 +2203,7 @@ void CMenuContainer::AddJumpListItems( std::vector<MenuItem> &items )
 				if (pLink)
 				{
 					pLink->GetIDList(&item.pItem1);
-					wchar_t location[_MAX_PATH];
-					int index;
-					if (pLink->GetIconLocation(location,_countof(location),&index)==S_OK && location[0])
-						item.pItemInfo=g_ItemManager.GetCustomIcon(location,index,CItemManager::ICON_SIZE_TYPE_SMALL,(index==0)); // assuming that if index!=0 the icon comes from a permanent location like a dll or exe
+					item.pItemInfo = g_ItemManager.GetLinkIcon(pLink, CItemManager::ICON_SIZE_TYPE_SMALL);
 				}
 			}
 			else if (jumpItem.type==CJumpItem::TYPE_ITEM)
@@ -2656,17 +2649,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 +2711,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 +2774,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,7 +2822,7 @@ 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;
@@ -2837,6 +2830,8 @@ bool CMenuContainer::InitSearchItems( void )
 			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 +2849,7 @@ bool CMenuContainer::InitSearchItems( void )
 		}
 		if (count<=0)
 		{
-			if (idx>=2) ++it;
+			if (idx>=3) ++it;
 			continue;
 		}
 
@@ -2880,6 +2875,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();
@@ -6660,8 +6665,7 @@ bool CMenuContainer::GetDescription( int index, wchar_t *text, int size )
 			{
 				if (SUCCEEDED(pLink->GetDescription(text,size)) && text[0])
 					return true;
-				wchar_t args[256];
-				if (SUCCEEDED(pLink->GetArguments(args,_countof(args))) && args[0])
+				if (jumpItem.bHasArguments)
 				{
 					// don't use default tip for items with arguments
 					Strcpy(text,size,item.name);
@@ -7319,8 +7323,9 @@ static void NewVersionCallback( VersionData &data )
 	wchar_t cmdLine[1024];
 	Sprintf(cmdLine,_countof(cmdLine),L"\"%s\" -popup",path);
 	STARTUPINFO startupInfo={sizeof(startupInfo)};
-	PROCESS_INFORMATION processInfo;
-	memset(&processInfo,0,sizeof(processInfo));
+	// don't display busy cursor as we are doing this on background
+	startupInfo.dwFlags=STARTF_FORCEOFFFEEDBACK;
+	PROCESS_INFORMATION processInfo{};
 	if (CreateProcess(path,cmdLine,NULL,NULL,TRUE,0,NULL,NULL,&startupInfo,&processInfo))
 	{
 		CloseHandle(processInfo.hThread);

Src/StartMenu/StartMenuDLL/MenuPaint.cpp

@@ -2200,6 +2200,21 @@ void CMenuContainer::DrawBackground( HDC hdc, const RECT &drawRect )
 		else
 			iconSize.cx=iconSize.cy=0;
 
+		COLORREF color, shadowColor;
+		{
+			bool bHotColor = (bHot && !bSplit) || stateLeft > 0;
+			if (item.id == MENU_EMPTY || item.id == MENU_EMPTY_TOP)
+			{
+				color = settings.textColors[bHotColor ? 3 : 2];
+				shadowColor = settings.textShadowColors[bHotColor ? 3 : 2];
+			}
+			else
+			{
+				color = settings.textColors[bHotColor ? 1 : 0];
+				shadowColor = settings.textShadowColors[bHotColor ? 1 : 0];
+			}
+		}
+
 		// draw icon
 		if (drawType==MenuSkin::PROGRAMS_BUTTON || drawType==MenuSkin::PROGRAMS_BUTTON_NEW)
 		{
@@ -2256,15 +2271,21 @@ void CMenuContainer::DrawBackground( HDC hdc, const RECT &drawRect )
 			const CItemManager::IconInfo *pIcon=(settings.iconSize==MenuSkin::ICON_SIZE_LARGE)?item.pItemInfo->largeIcon:item.pItemInfo->smallIcon;
 			if (pIcon && pIcon->bitmap)
 			{
+				HBITMAP temp = ColorizeMonochromeImage(pIcon->bitmap, color);
+				HBITMAP bitmap = temp ? temp : pIcon->bitmap;
+
 				BITMAP info;
-				GetObject(pIcon->bitmap,sizeof(info),&info);
-				HGDIOBJ bmp0=SelectObject(hdc2,pIcon->bitmap);
+				GetObject(bitmap,sizeof(info),&info);
+				HGDIOBJ bmp0=SelectObject(hdc2,bitmap);
 				if (bmp0)
 				{
 					BLENDFUNCTION func={AC_SRC_OVER,0,255,AC_SRC_ALPHA};
 					AlphaBlend(hdc,iconX,iconY,iconSize.cx,iconSize.cy,hdc2,0,0,info.bmWidth,info.bmHeight,func);
 					SelectObject(hdc2,bmp0);
 				}
+
+				if (temp)
+					DeleteObject(temp);
 			}
 		}
 		else if (item.id==MENU_SHUTDOWN_BUTTON && s_bHasUpdates && s_Skin.Shutdown_bitmap.GetBitmap())
@@ -2287,18 +2308,6 @@ void CMenuContainer::DrawBackground( HDC hdc, const RECT &drawRect )
 
 		// draw text
 		SelectObject(hdc,settings.font);
-		COLORREF color, shadowColor;
-		bool bHotColor=(bHot && !bSplit) || stateLeft>0;
-		if (item.id==MENU_EMPTY || item.id==MENU_EMPTY_TOP)
-		{
-			color=settings.textColors[bHotColor?3:2];
-			shadowColor=settings.textShadowColors[bHotColor?3:2];
-		}
-		else
-		{
-			color=settings.textColors[bHotColor?1:0];
-			shadowColor=settings.textShadowColors[bHotColor?1:0];
-		}
 		RECT rc={itemRect.left+settings.iconPadding.left+settings.iconPadding.right+settings.textPadding.left,itemRect.top+settings.textPadding.top,
 		         itemRect.right-settings.arrPadding.cx-settings.arrPadding.cy-settings.textPadding.right,itemRect.bottom-settings.textPadding.bottom};
 		if (item.id==MENU_SHUTDOWN_BUTTON)

Src/StartMenu/StartMenuDLL/MetroLinkManager.cpp

@@ -301,21 +301,12 @@ bool CanUninstallMetroApp( const wchar_t *appid )
 // Uninstalls the app with the given id
 void UninstallMetroApp( const wchar_t *appid )
 {
-	CComPtr<IShellItem> pAppItem;
-	if (SUCCEEDED(SHCreateItemInKnownFolder(FOLDERID_AppsFolder2,0,appid,IID_IShellItem,(void**)&pAppItem)))
+	auto packageName = GetPackageFullName(appid);
+	if (!packageName.IsEmpty())
 	{
-		CComPtr<IPropertyStore> pStore;
-		pAppItem->BindToHandler(NULL,BHID_PropertyStore,IID_IPropertyStore,(void**)&pStore);
-		if (pStore)
-		{
-			CString packageName=GetPropertyStoreString(pStore,PKEY_MetroPackageName);
-			if (!packageName.IsEmpty())
-			{
-				wchar_t command[1024];
-				Sprintf(command,_countof(command),L"Remove-AppxPackage %s",packageName);
-				ShellExecute(NULL,L"open",L"powershell.exe",command,NULL,SW_HIDE);
-			}
-		}
+		wchar_t command[1024];
+		Sprintf(command, _countof(command), L"Remove-AppxPackage %s", packageName);
+		ShellExecute(NULL, L"open", L"powershell.exe", command, NULL, SW_HIDE);
 	}
 }
 
@@ -381,3 +372,16 @@ bool IsEdgeDefaultBrowser( void )
 	}
 	return false;
 }
+
+CString GetPackageFullName(const wchar_t* appId)
+{
+	CComPtr<IShellItem> item;
+	if (SUCCEEDED(SHCreateItemInKnownFolder(FOLDERID_AppsFolder, 0, appId, IID_PPV_ARGS(&item))))
+	{
+		CComPtr<IPropertyStore> store;
+		if (SUCCEEDED(item->BindToHandler(nullptr, BHID_PropertyStore, IID_PPV_ARGS(&store))))
+			return GetPropertyStoreString(store, PKEY_MetroPackageName);
+	}
+
+	return {};
+}

Src/StartMenu/StartMenuDLL/MetroLinkManager.h

@@ -53,3 +53,6 @@ CComPtr<IContextMenu> GetMetroPinMenu( const wchar_t *appid );
 
 // Determines if Edge is the default browser
 bool IsEdgeDefaultBrowser( void );
+
+// Returns full package name for given App ID
+CString GetPackageFullName(const wchar_t* appId);

Src/StartMenu/StartMenuDLL/ProgramsTree.cpp

@@ -60,9 +60,9 @@ void CProgramsTree::Create( CMenuContainer *pOwner )
 	HWND hWnd=CreateWindowEx(0,WC_TREEVIEW,NULL,WS_CHILD|TVS_EDITLABELS|TVS_FULLROWSELECT|(CMenuContainer::s_TipHideTime?TVS_INFOTIP:0)|TVS_NOHSCROLL|TVS_SHOWSELALWAYS|TVS_NONEVENHEIGHT,0,0,0,0,pOwner->m_hWnd,NULL,g_Instance,NULL);
 	TreeView_SetExtendedStyle(hWnd,TVS_EX_AUTOHSCROLL,TVS_EX_AUTOHSCROLL);
 	const MenuSkin &skin=CMenuContainer::s_Skin;
-	m_TreeTheme=OpenThemeData(m_hWnd,L"treeview");
+	m_TreeTheme=OpenThemeData(hWnd,L"treeview");
 	if (skin.BHasScrollbar)
-		m_ScrollTheme=OpenThemeData(m_hWnd,L"scrollbar");
+		m_ScrollTheme=OpenThemeData(hWnd,L"scrollbar");
 
 	const MenuSkin::ItemDrawSettings &settings=skin.ItemSettings[MenuSkin::PROGRAMS_TREE_ITEM];
 

Src/StartMenu/StartMenuDLL/SearchManager.cpp

@@ -139,18 +139,25 @@ void CSearchManager::CloseMenu( void )
 	Lock lock(this,LOCK_DATA);
 	m_LastRequestId++;
 	m_LastProgramsRequestId=m_LastRequestId;
-	if (g_LogCategories&LOG_SEARCH)
+	if (g_LogCategories & LOG_SEARCH)
 	{
-		for (std::vector<SearchItem>::const_iterator it=m_ProgramItems.begin();it!=m_ProgramItems.end();++it)
+		for (const auto& item : m_ProgramItems)
 		{
-			if (it->category==CATEGORY_PROGRAM)
-				LOG_MENU(LOG_SEARCH,L"Program: '%s', %d",it->name,it->rank);
+			if (item.category == CATEGORY_PROGRAM)
+				LOG_MENU(LOG_SEARCH, L"Program: '%s', %d", item.name, item.rank);
 		}
-		std::sort(m_SettingsItems.begin(),m_SettingsItems.end());
-		for (std::vector<SearchItem>::const_iterator it=m_SettingsItems.begin();it!=m_SettingsItems.end();++it)
+
+		std::sort(m_SettingsItems.begin(), m_SettingsItems.end());
+
+		for (const auto& item : m_SettingsItems)
 		{
-			if (it->category==CATEGORY_SETTING)
-				LOG_MENU(LOG_SEARCH,L"Setting: '%s', %d",it->name,it->rank);
+			if (item.category == CATEGORY_SETTING)
+				LOG_MENU(LOG_SEARCH, L"Setting: '%s', %d", item.name, item.rank);
+		}
+		for (const auto& item : m_SettingsItems)
+		{
+			if (item.category == CATEGORY_METROSETTING)
+				LOG_MENU(LOG_SEARCH, L"MetroSetting: '%s', %d", item.name, item.rank);
 		}
 	}
 	if (m_bProgramsFound)
@@ -170,6 +177,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 +318,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 +344,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 +355,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 +391,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 +421,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 +440,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;
@@ -670,7 +682,7 @@ void CSearchManager::SearchThread( void )
 				if (GetWinVersion()>=WIN_VER_WIN8 && searchRequest.bSearchMetroApps)
 				{
 					std::vector<MetroLink> links;
-					GetMetroLinks(links,false);
+					GetMetroLinks(links,true);
 					for (std::vector<MetroLink>::const_iterator it=links.begin();it!=links.end();++it)
 					{
 						if (GetWinVersion()<WIN_VER_WIN10)
@@ -733,6 +745,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 +800,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 +1260,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 +1368,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 +1418,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 +1449,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);
 }
 

Src/StartMenu/StartMenuDLL/SearchManager.h

@@ -63,6 +63,7 @@ public:
 		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 @@ private:
 	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;

Src/StartMenu/StartMenuDLL/SettingsUI.cpp

@@ -3718,7 +3718,6 @@ protected:
 	CWindow m_ImageClassic1, m_ImageClassic2, m_ImageWin7;
 	CWindow m_Tooltip;
 	CWindow m_ButtonAero, m_ButtonClassic, m_ButtonCustom;
-	bool m_bLargeBitmaps;
 	HICON m_hIcon;
 	CString m_IconPath;
 
@@ -3737,14 +3736,13 @@ LRESULT CMenuStyleDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam, BO
 	HDC hdc=::GetDC(NULL);
 	int dpi=GetDeviceCaps(hdc,LOGPIXELSY);
 	::ReleaseDC(NULL,hdc);
-	m_bLargeBitmaps=dpi>=144;
-	if (m_bLargeBitmaps)
+	bool bLargeBitmaps=dpi>=144;
 	{
-		HBITMAP bmp=(HBITMAP)LoadImage(g_Instance,MAKEINTRESOURCE(IDB_STYLE_CLASSIC1150),IMAGE_BITMAP,0,0,LR_CREATEDIBSECTION);
+		HBITMAP bmp=LoadImageResource(g_Instance,MAKEINTRESOURCE(bLargeBitmaps?IDB_STYLE_CLASSIC1150:IDB_STYLE_CLASSIC1),true,true);
 		m_ImageClassic1.SendMessage(STM_SETIMAGE,IMAGE_BITMAP,(LPARAM)bmp);
-		bmp=(HBITMAP)LoadImage(g_Instance,MAKEINTRESOURCE(IDB_STYLE_CLASSIC2150),IMAGE_BITMAP,0,0,LR_CREATEDIBSECTION);
+		bmp=LoadImageResource(g_Instance,MAKEINTRESOURCE(bLargeBitmaps?IDB_STYLE_CLASSIC2150:IDB_STYLE_CLASSIC2),true,true);
 		m_ImageClassic2.SendMessage(STM_SETIMAGE,IMAGE_BITMAP,(LPARAM)bmp);
-		bmp=(HBITMAP)LoadImage(g_Instance,MAKEINTRESOURCE(IDB_STYLE_WIN7150),IMAGE_BITMAP,0,0,LR_CREATEDIBSECTION);
+		bmp=LoadImageResource(g_Instance,MAKEINTRESOURCE(bLargeBitmaps?IDB_STYLE_WIN7150:IDB_STYLE_WIN7),true,true);
 		m_ImageWin7.SendMessage(STM_SETIMAGE,IMAGE_BITMAP,(LPARAM)bmp);
 	}
 
@@ -3779,7 +3777,6 @@ LRESULT CMenuStyleDlg::OnDestroy( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
 {
 	if (m_hIcon) DestroyIcon(m_hIcon);
 	m_hIcon=NULL;
-	if (m_bLargeBitmaps)
 	{
 		HBITMAP bmp=(HBITMAP)m_ImageClassic1.SendMessage(STM_GETIMAGE,IMAGE_BITMAP);
 		if (bmp) DeleteObject(bmp);

Src/StartMenu/StartMenuDLL/SkinManager.cpp

@@ -375,7 +375,10 @@ COLORREF MenuSkin::GetMetroColor( const wchar_t *names ) const
 			if (GetImmersiveUserColorSetPreference!=NULL)
 			{
 				wchar_t text[256];
-				Sprintf(text,_countof(text),L"Immersive%s",name);
+				if (wcsncmp(name,L"Immersive",9)==0)
+					wcscpy_s(text,name);
+				else
+					Sprintf(text,_countof(text),L"Immersive%s",name);
 				int type=GetImmersiveColorTypeFromName(text);
 				data.colorType=type<0?-1:type;
 				if (type>=0)
@@ -1495,8 +1498,21 @@ bool MenuSkin::ComputeOptionStates( const std::map<CString,CString> &options, st
 		values.push_back(L"ALL_PROGRAMS");
 	if (SkinType==SKIN_TYPE_CLASSIC2)
 		values.push_back(L"TWO_COLUMNS");
+	// for compatibility with existing skins
 	if (Dpi>=144)
 		values.push_back(L"HIGH_DPI");
+	if (Dpi>=240)
+		values.push_back(L"240_DPI");	// 250% scaling
+	else if (Dpi>=216)
+		values.push_back(L"216_DPI");	// 225% scaling
+	else if (Dpi>=192)
+		values.push_back(L"192_DPI");	// 200% scaling
+	else if (Dpi>=168)
+		values.push_back(L"168_DPI");	// 175% scaling
+	else if (Dpi>=144)
+		values.push_back(L"144_DPI");	// 150% scaling
+	else if (Dpi>=120)
+		values.push_back(L"120_DPI");	// 125% scaling
 	if (ForceTouch || (GetWinVersion()>=WIN_VER_WIN8 && GetSettingBool(L"EnableTouch") && (GetSystemMetrics(SM_DIGITIZER)&NID_INTEGRATED_TOUCH)!=0))
 		values.push_back(L"TOUCH_ENABLED");
 	if (GetSettingInt(L"SearchBox")!=SEARCHBOX_HIDDEN)

Src/StartMenu/StartMenuDLL/StartMenuDLL.rc

@@ -369,19 +369,20 @@ IDI_START10             ICON                    "start10.ico"
 IDB_ARROWS              BITMAP                  "menu_arrows.bmp"
 IDB_ARROWS150           BITMAP                  "menu_arrows150.bmp"
 IDB_SEARCH_ICONS        BITMAP                  "search_icons.bmp"
-IDB_STYLE_CLASSIC1      BITMAP                  "style_classic.bmp"
-IDB_STYLE_CLASSIC2      BITMAP                  "style_vista.bmp"
-IDB_STYLE_WIN7          BITMAP                  "style_7.bmp"
 IDB_BTN_CLASSIC         BITMAP                  "btn_classic.bmp"
-IDB_STYLE_CLASSIC1150   BITMAP                  "style_classic150.bmp"
-IDB_STYLE_CLASSIC2150   BITMAP                  "style_vista150.bmp"
-IDB_STYLE_WIN7150       BITMAP                  "style_7150.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // IMAGE
 //
 
+IDB_STYLE_CLASSIC1      IMAGE                   "style_classic.png"
+IDB_STYLE_CLASSIC2      IMAGE                   "style_vista.png"
+IDB_STYLE_WIN7          IMAGE                   "style_7.png"
+IDB_STYLE_CLASSIC1150   IMAGE                   "style_classic150.png"
+IDB_STYLE_CLASSIC2150   IMAGE                   "style_vista150.png"
+IDB_STYLE_WIN7150       IMAGE                   "style_7150.png"
+
 IDB_BUTTON96            IMAGE                   "button96.png"
 IDB_BUTTON120           IMAGE                   "button120.png"
 IDB_BUTTON144           IMAGE                   "button144.png"

Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj

@@ -136,7 +136,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -161,7 +160,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>

Src/StartMenu/StartMenuHelper/ModernSettings.cpp

@@ -0,0 +1,434 @@
+// Modern settings helper
+
+// - parse modern settings definitions from %windir%\ImmersiveControlPanel\Settings\AllSystemSettings_{253E530E-387D-4BC2-959D-E6F86122E5F2}.xml
+// - store cached data (parsed settings, localized strings) in %LOCALAPPDATA%\OpenShell\ModernSettings.dat
+// - provide mapped view over cached data
+
+#include "stdafx.h"
+#include "ModernSettings.h"
+#include "ResourceHelper.h"
+#include <Shlobj.h>
+#include <Shlwapi.h>
+#include <functional>
+#include <iterator>
+#include <mutex>
+
+enum class Id : uint32_t
+{
+	Header = 'SMSO',
+	Undef = 0,
+	Blob,
+	FileName,
+	DeepLink,
+	Icon,
+	Glyph,
+	PageId,
+	HostId,
+	GroupId,
+	SettingId,
+	Description,
+	Keywords,
+};
+
+#pragma pack(1)
+struct FileHdr
+{
+	uint32_t openShellVersion = GetVersionEx(g_Instance);
+	uint32_t windowsVersion = GetVersionEx(GetModuleHandle(L"user32.dll"));
+	uint32_t userLanguageId = GetUserDefaultUILanguage();
+
+	bool operator==(const FileHdr& other) const
+	{
+		return (windowsVersion == other.windowsVersion) &&
+		       (openShellVersion == other.openShellVersion) &&
+		       (userLanguageId == other.userLanguageId);
+	}
+};
+
+struct ItemHdr
+{
+	Id       id;
+	uint32_t size;
+
+	const uint8_t* data() const
+	{
+		return (const uint8_t*)this + sizeof(*this);
+	}
+
+	const ItemHdr* next() const
+	{
+		return (const ItemHdr*)(data() + size);
+	}
+
+	std::wstring_view asString() const
+	{
+		std::wstring_view retval((const wchar_t*)data(), size / sizeof(wchar_t));
+		if (!retval.empty() && retval.back() == 0)
+		{
+			retval.remove_suffix(1);
+			return retval;
+		}
+
+		return {};
+	}
+};
+#pragma pack()
+
+class AttributeWriter
+{
+public:
+	std::vector<uint8_t> buffer()
+	{
+		return std::move(m_buffer);
+	}
+
+	void addBlob(Id id, const void* data, size_t size)
+	{
+		ItemHdr hdr{ id, (uint32_t)size };
+		append(&hdr, sizeof(hdr));
+		append(data, size);
+	}
+
+	void addString(Id id, const std::wstring& str)
+	{
+		if (!str.empty())
+			addBlob(id, str.data(), (str.size() + 1) * sizeof(str[0]));
+	}
+
+private:
+	void append(const void* data, size_t size)
+	{
+		m_buffer.insert(m_buffer.end(), (const uint8_t*)data, (const uint8_t*)data + size);
+	}
+
+	std::vector<uint8_t> m_buffer;
+};
+
+static void ProcessAttributes(const void* buffer, size_t size, std::function<void(const ItemHdr&)> callback)
+{
+	if (size < sizeof(ItemHdr))
+		return;
+
+	auto item = (const ItemHdr*)buffer;
+	auto last = (const ItemHdr*)((const uint8_t*)buffer + size);
+
+	while (item < last)
+	{
+		auto next = item->next();
+		if (next <= item || next > last)
+			break;
+
+		callback(*item);
+
+		item = next;
+	}
+}
+
+///
+
+static std::wstring TranslateIndirectString(const WCHAR* string)
+{
+	std::wstring retval;
+	retval.resize(1024);
+
+	if (SUCCEEDED(::SHLoadIndirectString(string, retval.data(), (UINT)retval.size(), nullptr)))
+	{
+		retval.resize(wcslen(retval.data()));
+		return retval;
+	}
+
+	return {};
+}
+
+static std::wstring TranslateIndirectMultiString(const WCHAR* string)
+{
+	std::wstring retval;
+	std::wstring_view str(string);
+
+	// remove '@'
+	str.remove_prefix(1);
+
+	while (!str.empty())
+	{
+		auto len = str.find(L'@', 1);
+		if (len == std::wstring::npos)
+			len = str.length();
+
+		std::wstring tmp(str.substr(0, len));
+		retval += TranslateIndirectString(tmp.c_str());
+
+		str.remove_prefix(len);
+	}
+
+	return retval;
+}
+
+static std::wstring GetTranslatedString(CComPtr<IXMLDOMNode>& parent, const WCHAR* name)
+{
+	CComPtr<IXMLDOMNode> node;
+	if (parent->selectSingleNode(CComBSTR(name), &node) == S_OK)
+	{
+		CComBSTR value;
+		if (node->get_text(&value) == S_OK)
+		{
+			if (value[0] == L'@')
+			{
+				if (value[1] == L'@')
+					return TranslateIndirectMultiString(value);
+				else
+					return TranslateIndirectString(value);
+			}
+			else
+			{
+				return (LPWSTR)value;
+			}
+		}
+	}
+
+	return {};
+}
+
+static void ParseFileName(CComPtr<IXMLDOMNode>& parent, AttributeWriter& writer)
+{
+	writer.addString(Id::FileName, GetTranslatedString(parent, L"Filename"));
+}
+
+static void ParseApplicationInformation(CComPtr<IXMLDOMNode>& parent, AttributeWriter& writer)
+{
+	CComPtr<IXMLDOMNode> node;
+	if (parent->selectSingleNode(CComBSTR(L"ApplicationInformation"), &node) == S_OK)
+	{
+		writer.addString(Id::DeepLink, GetTranslatedString(node, L"DeepLink"));
+		writer.addString(Id::Icon, GetTranslatedString(node, L"Icon"));
+		writer.addString(Id::Glyph, GetTranslatedString(node, L"Glyph"));
+	}
+}
+
+static void ParseSettingIdentity(CComPtr<IXMLDOMNode>& parent, AttributeWriter& writer)
+{
+	CComPtr<IXMLDOMNode> node;
+	if (parent->selectSingleNode(CComBSTR(L"SettingIdentity"), &node) == S_OK)
+	{
+		writer.addString(Id::PageId, GetTranslatedString(node, L"PageID"));
+		writer.addString(Id::HostId, GetTranslatedString(node, L"HostID"));
+		writer.addString(Id::GroupId, GetTranslatedString(node, L"GroupID"));
+		writer.addString(Id::SettingId, GetTranslatedString(node, L"SettingID"));
+	}
+}
+
+static void ParseSettingInformation(CComPtr<IXMLDOMNode>& parent, AttributeWriter& writer)
+{
+	CComPtr<IXMLDOMNode> node;
+	if (parent->selectSingleNode(CComBSTR(L"SettingInformation"), &node) == S_OK)
+	{
+		auto description = GetTranslatedString(node, L"Description");
+		if (description.empty())
+			description = GetTranslatedString(node, L"Name");
+
+		writer.addString(Id::Description, description);
+
+		auto keywords = GetTranslatedString(node, L"HighKeywords");
+		keywords += GetTranslatedString(node, L"LowKeywords");
+		keywords += GetTranslatedString(node, L"Keywords");
+
+		writer.addString(Id::Keywords, keywords);
+	}
+}
+
+static std::vector<uint8_t> ParseSetting(CComPtr<IXMLDOMNode>& parent)
+{
+	AttributeWriter writer;
+
+	ParseFileName(parent, writer);
+	ParseApplicationInformation(parent, writer);
+	ParseSettingIdentity(parent, writer);
+	ParseSettingInformation(parent, writer);
+
+	return writer.buffer();
+}
+
+static std::vector<uint8_t> ParseModernSettings()
+{
+	AttributeWriter writer;
+
+	CComPtr<IXMLDOMDocument> doc;
+	if (SUCCEEDED(doc.CoCreateInstance(L"Msxml2.FreeThreadedDOMDocument")))
+	{
+		doc->put_async(VARIANT_FALSE);
+
+		wchar_t path[MAX_PATH]{};
+		wcscpy_s(path, LR"(%windir%\ImmersiveControlPanel\Settings\AllSystemSettings_{253E530E-387D-4BC2-959D-E6F86122E5F2}.xml)");
+		DoEnvironmentSubst(path, _countof(path));
+
+		VARIANT_BOOL loaded;
+		if (SUCCEEDED(doc->load(CComVariant(path), &loaded)) && loaded)
+		{
+			CComPtr<IXMLDOMNode> root;
+			if (doc->selectSingleNode(CComBSTR(L"PCSettings"), &root) == S_OK)
+			{
+				FileHdr hdr{};
+				writer.addBlob(Id::Header, &hdr, sizeof(hdr));
+
+				CComPtr<IXMLDOMNode> node;
+				root->get_firstChild(&node);
+				while (node)
+				{
+					auto buffer = ParseSetting(node);
+					if (!buffer.empty())
+						writer.addBlob(Id::Blob, buffer.data(), buffer.size());
+
+					CComPtr<IXMLDOMNode> next;
+					if (FAILED(node->get_nextSibling(&next)))
+						break;
+					node = next;
+				}
+			}
+		}
+	}
+
+	return writer.buffer();
+}
+
+ModernSettings::ModernSettings(const wchar_t* fname) : m_storage(fname)
+{
+	if (m_storage)
+	{
+		bool valid = false;
+		auto s = m_storage.get();
+		ProcessAttributes(s.data, s.size, [&](const ItemHdr& item) {
+			switch (item.id)
+			{
+			case Id::Header:
+				if (item.size >= sizeof(FileHdr))
+				{
+					const auto hdr = (const FileHdr*)item.data();
+					if (FileHdr() == *hdr)
+						valid = true;
+				}
+				break;
+			case Id::Blob:
+				if (valid)
+				{
+					const Blob blob = { item.data(), item.size };
+					ModernSettings::Setting s(blob);
+					if (s)
+						m_settings.emplace(s.fileName, blob);
+				}
+				break;
+			}
+		});
+	}
+}
+
+ModernSettings::Setting::Setting(const Blob& blob)
+{
+	ProcessAttributes(blob.data, blob.size, [&](const ItemHdr& item) {
+		switch (item.id)
+		{
+		case Id::FileName:
+			fileName = item.asString();
+			break;
+		case Id::DeepLink:
+			deepLink = item.asString();
+			break;
+		case Id::Glyph:
+			glyph = item.asString();
+			break;
+		case Id::Icon:
+			icon = item.asString();
+			break;
+		case Id::PageId:
+			pageId = item.asString();
+			break;
+		case Id::HostId:
+			hostId = item.asString();
+			break;
+		case Id::GroupId:
+			groupId = item.asString();
+			break;
+		case Id::SettingId:
+			settingId = item.asString();
+			break;
+		case Id::Description:
+			description = item.asString();;
+			break;
+		case Id::Keywords:
+			keywords = item.asString();
+			break;
+		}
+	});
+}
+
+std::vector<std::wstring_view> ModernSettings::enumerate() const
+{
+	std::vector<std::wstring_view> retval;
+	retval.reserve(m_settings.size());
+
+	for (const auto& i : m_settings)
+		retval.emplace_back(i.first);
+
+	return retval;
+}
+
+ModernSettings::Setting ModernSettings::get(const std::wstring_view& name) const
+{
+	auto it = m_settings.find(name);
+	if (it != m_settings.end())
+		return { (*it).second };
+
+	return {};
+}
+
+static std::mutex s_lock;
+static std::shared_ptr<ModernSettings> s_settings;
+
+std::wstring GetLocalAppData()
+{
+	WCHAR path[MAX_PATH]{};
+	wcscpy_s(path, L"%LOCALAPPDATA%\\OpenShell");
+	DoEnvironmentSubst(path, _countof(path));
+
+	// make sure directory exists
+	SHCreateDirectory(nullptr, path);
+
+	return { path };
+}
+
+std::shared_ptr<ModernSettings> GetModernSettings()
+{
+	std::unique_lock l(s_lock);
+
+	if (!s_settings)
+	{
+		auto path = GetLocalAppData();
+		path += L"\\ModernSettings.dat";
+
+		// try to open cached settings
+		s_settings = std::make_shared<ModernSettings>(path.c_str());
+		if (s_settings->size() == 0)
+		{
+			// file doesn't exist or wrong format
+			s_settings.reset();
+
+			// re-parse settings
+			auto buffer = ParseModernSettings();
+			if (!buffer.empty())
+			{
+				// store to file
+				{
+					File f(path.c_str(), GENERIC_WRITE, 0, CREATE_ALWAYS);
+					if (f)
+					{
+						DWORD written;
+						::WriteFile(f, buffer.data(), (DWORD)buffer.size(), &written, nullptr);
+					}
+				}
+
+				// and try again
+				s_settings = std::make_shared<ModernSettings>(path.c_str());
+			}
+		}
+	}
+
+	return s_settings;
+}

Src/StartMenu/StartMenuHelper/ModernSettings.h

@@ -0,0 +1,139 @@
+// Modern settings helper
+
+#pragma once
+
+#include <functional>
+#include <map>
+#include <string>
+#include <vector>
+
+struct Blob
+{
+	const void* data = nullptr;
+	size_t size = 0;
+};
+
+class File
+{
+public:
+	File(const WCHAR* fileName, DWORD desiredAccess, DWORD shareMode, DWORD creationDisposition = OPEN_EXISTING, DWORD flagsAndAttributes = FILE_ATTRIBUTE_NORMAL)
+	{
+		m_handle = ::CreateFile(fileName, desiredAccess, shareMode, nullptr, creationDisposition, flagsAndAttributes, nullptr);
+	}
+
+	~File()
+	{
+		if (m_handle != INVALID_HANDLE_VALUE)
+			::CloseHandle(m_handle);
+	}
+
+	File(const File&) = delete;
+	File& operator=(const File&) = delete;
+
+	explicit operator bool() const
+	{
+		return (m_handle != INVALID_HANDLE_VALUE);
+	}
+
+	operator HANDLE() const
+	{
+		return m_handle;
+	}
+
+	uint64_t size() const
+	{
+		LARGE_INTEGER li = {};
+		return ::GetFileSizeEx(m_handle, &li) ? li.QuadPart : (uint64_t)-1;
+	}
+
+private:
+	HANDLE m_handle;
+};
+
+class MappedFile
+{
+public:
+	MappedFile(const WCHAR* fileName) : m_file(fileName, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE)
+	{
+		if (m_file)
+		{
+			auto mapping = ::CreateFileMapping(m_file, nullptr, PAGE_READONLY, 0, 0, nullptr);
+			if (mapping)
+			{
+				m_view.data = ::MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0);
+				if (m_view.data)
+					m_view.size = (size_t)m_file.size();
+
+				::CloseHandle(mapping);
+			}
+		}
+	}
+
+	~MappedFile()
+	{
+		if (m_view.data)
+			::UnmapViewOfFile(m_view.data);
+	}
+
+	MappedFile(const MappedFile&) = delete;
+	MappedFile& operator=(const MappedFile&) = delete;
+
+	explicit operator bool() const
+	{
+		return (m_view.data != nullptr);
+	}
+
+	Blob get() const
+	{
+		return m_view;
+	}
+
+private:
+	File m_file;
+	Blob m_view;
+};
+
+class ModernSettings
+{
+public:
+	ModernSettings(const wchar_t* fname);
+
+	size_t size() const
+	{
+		return m_settings.size();
+	}
+
+	struct Setting
+	{
+		std::wstring_view fileName;
+
+		std::wstring_view deepLink;
+		std::wstring_view icon;
+		std::wstring_view glyph;
+
+		std::wstring_view pageId;
+		std::wstring_view hostId;
+		std::wstring_view groupId;
+		std::wstring_view settingId;
+		std::wstring_view description;
+		std::wstring_view keywords;
+
+		Setting() = default;
+		Setting(const Blob& blob);
+
+		explicit operator bool() const
+		{
+			return !fileName.empty();
+		}
+	};
+
+	std::vector<std::wstring_view> enumerate() const;
+	Setting get(const std::wstring_view& name) const;
+
+private:
+	MappedFile m_storage;
+	std::map<std::wstring_view, Blob> m_settings;
+};
+
+// retrieve actual instance of ModernSettings
+std::shared_ptr<ModernSettings> GetModernSettings();

Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.cpp

@@ -0,0 +1,210 @@
+// Context menu handler for Open-Shell Modern Settings shell folder
+
+// Based on Explorer Data Provider Sample (https://docs.microsoft.com/en-us/windows/win32/shell/samples-explorerdataprovider)
+
+#include "stdafx.h"
+#include "ModernSettings.h"
+#include "ModernSettingsContextMenu.h"
+#include "ComHelper.h"
+
+#define MENUVERB_OPEN     0
+
+struct ICIVERBTOIDMAP
+{
+	LPCWSTR pszCmd;         // verbW
+	LPCSTR  pszCmdA;        // verbA
+	UINT    idCmd;          // hmenu id
+};
+
+static const ICIVERBTOIDMAP g_ContextMenuIDMap[] =
+{
+	{ L"open",       "open",      MENUVERB_OPEN },
+};
+
+HRESULT _MapICIVerbToCmdID(LPCMINVOKECOMMANDINFO pici, UINT* pid)
+{
+	if (IS_INTRESOURCE(pici->lpVerb))
+	{
+		*pid = LOWORD((UINT_PTR)pici->lpVerb);
+		return S_OK;
+	}
+
+	if (pici->fMask & CMIC_MASK_UNICODE)
+	{
+		for (const auto& i : g_ContextMenuIDMap)
+		{
+			if (StrCmpIC(((LPCMINVOKECOMMANDINFOEX)pici)->lpVerbW, i.pszCmd) == 0)
+			{
+				*pid = i.idCmd;
+				return S_OK;
+			}
+		}
+	}
+	else
+	{
+		for (const auto& i : g_ContextMenuIDMap)
+		{
+			if (StrCmpICA(pici->lpVerb, i.pszCmdA) == 0)
+			{
+				*pid = i.idCmd;
+				return S_OK;
+			}
+		}
+	}
+
+	return E_FAIL;
+}
+
+static bool ActivateModernSettingPage(const WCHAR* page)
+{
+	CComPtr<IApplicationActivationManager> mgr;
+	mgr.CoCreateInstance(CLSID_ApplicationActivationManager);
+	if (mgr)
+	{
+		DWORD pid = 0;
+		return SUCCEEDED(mgr->ActivateApplication(L"windows.immersivecontrolpanel_cw5n1h2txyewy!microsoft.windows.immersivecontrolpanel", page, AO_NONE, &pid));
+	}
+
+	return false;
+}
+
+extern ModernSettings::Setting GetModernSetting(LPCITEMIDLIST pidl);
+
+static HRESULT Execute(const wchar_t* cmd)
+{
+	return (intptr_t)::ShellExecute(nullptr, L"open", cmd, nullptr, nullptr, SW_SHOWNORMAL) > 32 ? S_OK : E_FAIL;
+}
+
+static HRESULT OpenItemByPidl(LPCITEMIDLIST pidl)
+{
+	auto child = ILFindLastID(pidl);
+	auto setting = GetModernSetting(child);
+
+	if (!setting)
+		return E_INVALIDARG;
+
+	if (setting.hostId == L"{6E6DDBCB-9C89-434B-A994-D5F22239523B}")
+	{
+		if (setting.deepLink.empty())
+			return E_INVALIDARG;
+
+		std::wstring cmd(L"windowsdefender://");
+		cmd += setting.deepLink;
+
+		return Execute(cmd.c_str());
+	}
+
+	if (setting.hostId == L"{7E0522FC-1AC4-41CA-AFD0-3610417A9C41}")
+	{
+		if (setting.pageId.empty())
+			return E_INVALIDARG;
+
+		std::wstring cmd(L"shell:::");
+		cmd += setting.pageId;
+
+		return Execute(cmd.c_str());
+	}
+
+	if (setting.hostId == L"{12B1697E-D3A0-4DBC-B568-CCF64A3F934D}")
+	{
+		if (setting.deepLink.empty())
+			return E_INVALIDARG;
+
+		std::wstring cmd(setting.deepLink);
+
+		if (cmd.compare(0, 8, L"shell:::") == 0)
+			return Execute(cmd.c_str());
+
+		cmd.resize(MAX_PATH);
+		DoEnvironmentSubst(cmd.data(), (UINT)cmd.size());
+
+		STARTUPINFO startupInfo = { sizeof(startupInfo) };
+		PROCESS_INFORMATION processInfo{};
+
+		if (!CreateProcess(nullptr, cmd.data(), nullptr, nullptr, FALSE, 0, nullptr, nullptr, &startupInfo, &processInfo))
+			return E_FAIL;
+
+		CloseHandle(processInfo.hThread);
+		CloseHandle(processInfo.hProcess);
+
+		return S_OK;
+	}
+
+	if (setting.pageId.empty())
+		return E_INVALIDARG;
+
+	std::wstring page;
+
+	page += L"page=";
+	page += setting.pageId;
+
+	if (!setting.settingId.empty())
+	{
+		page += L"&target=";
+		page += setting.settingId;
+	}
+	else if (!setting.groupId.empty())
+	{
+		page += L"&group=";
+		page += setting.groupId;
+	}
+
+	page += L"&ActivationType=Search";
+
+	ActivateModernSettingPage(page.c_str());
+
+	return S_OK;
+}
+
+
+// CModernSettingsContextMenu
+
+HRESULT CModernSettingsContextMenu::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT /* idCmdLast */, UINT /* uFlags */)
+{
+	InsertMenu(hmenu, indexMenu++, MF_BYPOSITION, idCmdFirst + MENUVERB_OPEN, L"Open");
+	// other verbs could go here...
+
+	// indicate that we added one verb.
+	return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (USHORT)(1));
+}
+
+HRESULT CModernSettingsContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO pici)
+{
+	HRESULT hr = E_INVALIDARG;
+	UINT uID;
+	// Is this command for us?
+	if (SUCCEEDED(_MapICIVerbToCmdID(pici, &uID)))
+	{
+		if (uID == MENUVERB_OPEN && m_pdtobj)
+		{
+			CAbsolutePidl pidl;
+			hr = SHGetIDListFromObject(m_pdtobj, &pidl);
+			if (SUCCEEDED(hr))
+				hr = OpenItemByPidl(pidl);
+		}
+	}
+
+	return hr;
+}
+
+HRESULT CModernSettingsContextMenu::GetCommandString(UINT_PTR /* idCmd */, UINT /* uType */, UINT* /* pRes */, LPSTR /* pszName */, UINT /* cchMax */)
+{
+	return E_NOTIMPL;
+}
+
+HRESULT CModernSettingsContextMenu::Initialize(PCIDLIST_ABSOLUTE /* pidlFolder */, IDataObject* pdtobj, HKEY /* hkeyProgID */)
+{
+	m_pdtobj = pdtobj;
+	return S_OK;
+}
+
+HRESULT CModernSettingsContextMenu::SetSite(IUnknown* punkSite)
+{
+	m_punkSite = punkSite;
+	return S_OK;
+}
+
+HRESULT CModernSettingsContextMenu::GetSite(REFIID riid, void** ppvSite)
+{
+	return m_punkSite ? m_punkSite->QueryInterface(riid, ppvSite) : E_FAIL;
+}

Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.h

@@ -0,0 +1,60 @@
+// Context menu handler for Open-Shell Modern Settings shell folder
+
+#pragma once
+#include "resource.h"
+#include "StartMenuHelper_i.h"
+#include <shlobj.h>
+
+// CModernSettingsContextMenu
+
+class ATL_NO_VTABLE CModernSettingsContextMenu :
+	public CComObjectRootEx<CComSingleThreadModel>,
+	public CComCoClass<CModernSettingsContextMenu, &CLSID_ModernSettingsContextMenu>,
+	public IContextMenu,
+	public IShellExtInit,
+	public IObjectWithSite
+{
+public:
+	CModernSettingsContextMenu()
+	{
+	}
+
+DECLARE_REGISTRY_RESOURCEID(IDR_MODERNSETTINGSCONTEXTMENU)
+
+DECLARE_NOT_AGGREGATABLE(CModernSettingsContextMenu)
+
+BEGIN_COM_MAP(CModernSettingsContextMenu)
+	COM_INTERFACE_ENTRY(IContextMenu)
+	COM_INTERFACE_ENTRY(IShellExtInit)
+	COM_INTERFACE_ENTRY(IObjectWithSite)
+END_COM_MAP()
+
+	DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+	HRESULT FinalConstruct()
+	{
+		return S_OK;
+	}
+
+	void FinalRelease()
+	{
+	}
+
+	// IContextMenu
+	IFACEMETHODIMP QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags);
+	IFACEMETHODIMP InvokeCommand(LPCMINVOKECOMMANDINFO lpici);
+	IFACEMETHODIMP GetCommandString(UINT_PTR idCmd, UINT uType, UINT* pRes, LPSTR pszName, UINT cchMax);
+
+	// IShellExtInit
+	IFACEMETHODIMP Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject* pdtobj, HKEY hkeyProgID);
+
+	// IObjectWithSite
+	IFACEMETHODIMP SetSite(IUnknown* punkSite);
+	IFACEMETHODIMP GetSite(REFIID riid, void** ppvSite);
+
+private:
+	CComPtr<IDataObject> m_pdtobj;
+	CComPtr<IUnknown> m_punkSite;
+};
+
+OBJECT_ENTRY_AUTO(__uuidof(ModernSettingsContextMenu), CModernSettingsContextMenu)

Src/StartMenu/StartMenuHelper/ModernSettingsContextMenu.rgs

@@ -0,0 +1,19 @@
+HKCR
+{
+	NoRemove CLSID
+	{
+		ForceRemove {5ab14324-c087-42c1-b905-a0bfdb4e9532} = s 'Open-Shell Modern Settings Context Menu'
+		{
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'Apartment'
+			}
+			ShellEx
+			{
+				MayChangeDefaultMenu = s ''
+				{
+				}
+			}
+		}
+	}
+}

Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.cpp

@@ -0,0 +1,593 @@
+// Open-Shell Modern Settings shell folder
+// Provides folder that contains all modern settings
+//
+// To open the folder press Win+R and type:
+// shell:::{82E749ED-B971-4550-BAF7-06AA2BF7E836}
+
+// Based on Explorer Data Provider Sample (https://docs.microsoft.com/en-us/windows/win32/shell/samples-explorerdataprovider)
+
+#include "stdafx.h"
+#include "ModernSettings.h"
+#include "ModernSettingsShellFolder.h"
+#include <propkey.h>
+#include <strsafe.h>
+#include <Uxtheme.h>
+
+struct ColumnDescription
+{
+	const wchar_t* name;
+	PROPERTYKEY    key;
+};
+
+static const ColumnDescription g_columnDescriptions[] =
+{
+	{L"Name", PKEY_ItemNameDisplay},
+	{L"Keywords", PKEY_Keywords},
+	{L"Filename", PKEY_FileName},
+};
+
+#define MAGIC 'SMSO'
+
+#pragma pack(1)
+struct FVITEMID
+{
+	USHORT  cb;
+	DWORD   magic;
+	WORD    size;
+	wchar_t data[1];
+};
+#pragma pack()
+
+static const FVITEMID* PidlToItem(LPCITEMIDLIST pidl)
+{
+	if (pidl)
+	{
+		auto item = (const FVITEMID*)pidl;
+		if (item->cb && item->magic == MAGIC)
+			return item;
+	}
+
+	return nullptr;
+}
+
+ModernSettings::Setting GetModernSetting(LPCITEMIDLIST pidl)
+{
+	auto item = PidlToItem(pidl);
+	if (item)
+	{
+		auto settings = GetModernSettings();
+		if (settings)
+			return settings->get({ item->data, item->size / sizeof(wchar_t) });
+	}
+
+	return {};
+}
+
+STDAPI StringToStrRet(PCWSTR pszName, STRRET* pStrRet)
+{
+	pStrRet->uType = STRRET_WSTR;
+	return SHStrDup(pszName, &pStrRet->pOleStr);
+}
+
+// CModernSettingsShellFolderEnumIDList
+
+class ATL_NO_VTABLE CModernSettingsShellFolderEnumIDList :
+	public CComObjectRoot,
+	public IEnumIDList
+{
+public:
+	BEGIN_COM_MAP(CModernSettingsShellFolderEnumIDList)
+		COM_INTERFACE_ENTRY(IEnumIDList)
+	END_COM_MAP()
+
+	// IEnumIDList
+	IFACEMETHODIMP Next(ULONG celt, PITEMID_CHILD* rgelt, ULONG* pceltFetched)
+	{
+		ULONG celtFetched = 0;
+
+		HRESULT hr = (pceltFetched || celt <= 1) ? S_OK : E_INVALIDARG;
+		if (SUCCEEDED(hr))
+		{
+			ULONG i = 0;
+			while (SUCCEEDED(hr) && i < celt && m_item < m_items.size())
+			{
+				hr = m_parent->CreateChildID(m_items[m_item], &rgelt[i]);
+				if (SUCCEEDED(hr))
+				{
+					celtFetched++;
+					i++;
+				}
+
+				m_item++;
+			}
+		}
+
+		if (pceltFetched)
+			*pceltFetched = celtFetched;
+
+		return (celtFetched == celt) ? S_OK : S_FALSE;
+	}
+	IFACEMETHODIMP Skip(DWORD celt)
+	{
+		m_item += celt;
+		return S_OK;
+	}
+	IFACEMETHODIMP Reset()
+	{
+		m_item = 0;
+		return S_OK;
+	}
+	IFACEMETHODIMP Clone(IEnumIDList** ppenum)
+	{
+		// this method is rarely used and it's acceptable to not implement it.
+		*ppenum = NULL;
+		return E_NOTIMPL;
+	}
+
+	void Initialize(CModernSettingsShellFolder* parent)
+	{
+		m_parent = parent;
+
+		m_settings = GetModernSettings();
+		if (m_settings)
+			m_items = m_settings->enumerate();
+	}
+
+private:
+	CComPtr<CModernSettingsShellFolder> m_parent;
+	std::shared_ptr<ModernSettings> m_settings;
+	std::vector<std::wstring_view> m_items;
+	DWORD m_item = 0;
+};
+
+// Extract icon
+
+static void BitmapDataToStraightAlpha(void* bits, UINT width, UINT height)
+{
+	RGBQUAD* data = (RGBQUAD*)bits;
+	for (UINT y = 0; y < height; y++)
+	{
+		for (UINT x = 0; x < width; x++)
+		{
+			auto alpha = data->rgbReserved;
+			if (alpha)
+			{
+				data->rgbBlue = (BYTE)((DWORD)data->rgbBlue * 255 / alpha);
+				data->rgbGreen = (BYTE)((DWORD)data->rgbGreen * 255 / alpha);
+				data->rgbRed = (BYTE)((DWORD)data->rgbRed * 255 / alpha);
+			}
+			data++;
+		}
+	}
+}
+
+HICON IconFromGlyph(UINT glyph, UINT size)
+{
+	ICONINFO info{};
+
+	info.fIcon = TRUE;
+	info.hbmMask = CreateBitmap(size, size, 1, 1, nullptr);
+
+	BITMAPINFO bi{};
+	bi.bmiHeader.biSize = sizeof(bi.bmiHeader);
+	bi.bmiHeader.biWidth = size;
+	bi.bmiHeader.biHeight = -((LONG)size);
+	bi.bmiHeader.biPlanes = 1;
+	bi.bmiHeader.biBitCount = 32;
+
+	void* bits = nullptr;
+	info.hbmColor = CreateDIBSection(nullptr, &bi, 0, &bits, nullptr, 0);
+
+	HDC dc = CreateCompatibleDC(nullptr);
+	SelectObject(dc, info.hbmColor);
+
+	HFONT font = CreateFontW(size, 0, 0, 0, 400, 0, 0, 0, 1, 0, 0, 0, 0, L"Segoe MDL2 Assets");
+	SelectObject(dc, font);
+
+	RECT rc{};
+	rc.right = size;
+	rc.bottom = size;
+
+	auto theme = OpenThemeData(nullptr, L"CompositedWindow::Window");
+	DTTOPTS opts{};
+	opts.dwSize = sizeof(opts);
+	opts.dwFlags = DTT_TEXTCOLOR | DTT_COMPOSITED;
+	opts.crText = 0x00FFFFFF;
+	DrawThemeTextEx(theme, dc, 0, 0, (LPCWSTR)&glyph, 1, DT_CENTER | DT_VCENTER | DT_SINGLELINE, &rc, &opts);
+	CloseThemeData(theme);
+
+	DeleteObject(font);
+	DeleteDC(dc);
+
+	BitmapDataToStraightAlpha(bits, size, size);
+
+	HICON retval = CreateIconIndirect(&info);
+
+	DeleteObject(info.hbmColor);
+	DeleteObject(info.hbmMask);
+
+	return retval;
+}
+
+class ATL_NO_VTABLE GlyphExtractIcon :
+	public CComObjectRoot,
+	public IExtractIconW
+{
+public:
+
+	BEGIN_COM_MAP(GlyphExtractIcon)
+		COM_INTERFACE_ENTRY(IExtractIconW)
+	END_COM_MAP()
+
+	void SetGlyph(USHORT glyph)
+	{
+		m_glyph = glyph;
+	}
+
+	// IExtractIconW methods
+	IFACEMETHODIMP GetIconLocation(UINT uFlags, _Out_writes_(cchMax) PWSTR pszIconFile, UINT cchMax, _Out_ int* piIndex, _Out_ UINT* pwFlags)
+	{
+		StringCchCopy(pszIconFile, cchMax, L"OpenShell-ModernSettingIcon");
+		*piIndex = m_glyph;
+		*pwFlags = GIL_NOTFILENAME;
+		return S_OK;
+	}
+	IFACEMETHODIMP Extract(_In_ PCWSTR pszFile, UINT nIconIndex, _Out_opt_ HICON* phiconLarge, _Out_opt_ HICON* phiconSmall, UINT nIconSize)
+	{
+		if (phiconLarge)
+			*phiconLarge = IconFromGlyph(nIconIndex, LOWORD(nIconSize));
+		if (phiconSmall)
+			*phiconSmall = IconFromGlyph(nIconIndex, HIWORD(nIconSize));
+		return S_OK;
+	}
+
+private:
+	USHORT m_glyph = 0;
+};
+
+
+// CModernSettingsShellFolder
+
+// IShellFolder methods
+
+// Translates a display name into an item identifier list.
+HRESULT CModernSettingsShellFolder::ParseDisplayName(HWND hwnd, IBindCtx* pbc, PWSTR pszName, ULONG* pchEaten, PIDLIST_RELATIVE* ppidl, ULONG* pdwAttributes)
+{
+	return E_INVALIDARG;
+}
+
+// Allows a client to determine the contents of a folder by
+// creating an item identifier enumeration object and returning
+// its IEnumIDList interface. The methods supported by that
+// interface can then be used to enumerate the folder's contents.
+HRESULT CModernSettingsShellFolder::EnumObjects(HWND /* hwnd */, DWORD grfFlags, IEnumIDList** ppenumIDList)
+{
+	CComObject<CModernSettingsShellFolderEnumIDList>* enumIdList;
+	auto hr = CComObject<CModernSettingsShellFolderEnumIDList>::CreateInstance(&enumIdList);
+	if (SUCCEEDED(hr))
+	{
+		enumIdList->Initialize(this);
+		hr = enumIdList->QueryInterface(IID_PPV_ARGS(ppenumIDList));
+	}
+
+	return hr;
+}
+
+// Factory for handlers for the specified item.
+HRESULT CModernSettingsShellFolder::BindToObject(PCUIDLIST_RELATIVE pidl, IBindCtx* pbc, REFIID riid, void** ppv)
+{
+	return E_NOINTERFACE;
+}
+
+HRESULT CModernSettingsShellFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, IBindCtx* pbc, REFIID riid, void** ppv)
+{
+	return BindToObject(pidl, pbc, riid, ppv);
+}
+
+// Called to determine the equivalence and/or sort order of two idlists.
+HRESULT CModernSettingsShellFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2)
+{
+	UINT column = LOWORD(lParam);
+	return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (USHORT)(StrCmp(GetColumnDisplayName(pidl1, column).data(), GetColumnDisplayName(pidl2, column).data())));
+}
+
+// Called by the Shell to create the View Object and return it.
+HRESULT CModernSettingsShellFolder::CreateViewObject(HWND hwnd, REFIID riid, void** ppv)
+{
+	HRESULT hr = E_NOINTERFACE;
+	*ppv = NULL;
+
+	if (riid == IID_IShellView)
+	{
+		SFV_CREATE csfv = { sizeof(csfv), 0 };
+		hr = QueryInterface(IID_PPV_ARGS(&csfv.pshf));
+		if (SUCCEEDED(hr))
+		{
+			hr = SHCreateShellFolderView(&csfv, (IShellView**)ppv);
+			csfv.pshf->Release();
+		}
+	}
+
+	return hr;
+}
+
+// Retrieves the attributes of one or more file objects or subfolders.
+HRESULT CModernSettingsShellFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, ULONG* rgfInOut)
+{
+	*rgfInOut &= SFGAO_CANLINK;
+	return S_OK;
+}
+
+// Retrieves an OLE interface that can be used to carry out
+// actions on the specified file objects or folders.
+HRESULT CModernSettingsShellFolder::GetUIObjectOf(HWND hwnd, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT* /* prgfInOut */, void** ppv)
+{
+	HRESULT hr = E_NOINTERFACE;
+	*ppv = nullptr;
+
+	if (riid == IID_IContextMenu)
+	{
+		// The default context menu will call back for IQueryAssociations to determine the
+		// file associations with which to populate the menu.
+		const DEFCONTEXTMENU dcm = { hwnd, nullptr, m_pidl, static_cast<IShellFolder2*>(this), cidl, apidl, nullptr, 0, nullptr };
+		hr = SHCreateDefaultContextMenu(&dcm, riid, ppv);
+	}
+	else if (riid == IID_IExtractIconW)
+	{
+		hr = E_INVALIDARG;
+
+		auto s = GetModernSetting(*apidl);
+		if (s)
+		{
+			if (!s.icon.empty())
+			{
+				CComPtr<IDefaultExtractIconInit> pdxi;
+				hr = SHCreateDefaultExtractIcon(IID_PPV_ARGS(&pdxi));
+				if (SUCCEEDED(hr))
+				{
+					WCHAR icon_path[MAX_PATH];
+
+					StringCchCopy(icon_path, _countof(icon_path), s.icon.data());
+					auto location = PathParseIconLocation(icon_path);
+
+					hr = pdxi->SetNormalIcon(icon_path, location);
+					if (SUCCEEDED(hr))
+						hr = pdxi->QueryInterface(riid, ppv);
+				}
+			}
+			else
+			{
+				auto glyph = !s.glyph.empty() ? s.glyph.front() : 0xe115;
+
+				CComObject<GlyphExtractIcon>* extract;
+				hr = CComObject<GlyphExtractIcon>::CreateInstance(&extract);
+				if (SUCCEEDED(hr))
+				{
+					extract->SetGlyph(glyph);
+					hr = extract->QueryInterface(riid, ppv);
+				}
+			}
+		}
+	}
+	else if (riid == IID_IDataObject)
+	{
+		hr = SHCreateDataObject(m_pidl, cidl, apidl, nullptr, riid, ppv);
+	}
+	else if (riid == IID_IQueryAssociations)
+	{
+		WCHAR szFolderViewImplClassID[64];
+		hr = StringFromGUID2(CLSID_ModernSettingsShellFolder, szFolderViewImplClassID, ARRAYSIZE(szFolderViewImplClassID));
+		if (SUCCEEDED(hr))
+		{
+			const ASSOCIATIONELEMENT assocItem = { ASSOCCLASS_CLSID_STR, nullptr, szFolderViewImplClassID };
+			hr = AssocCreateForClasses(&assocItem, 1, riid, ppv);
+		}
+	}
+
+	return hr;
+}
+
+// Retrieves the display name for the specified file object or subfolder.
+HRESULT CModernSettingsShellFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, SHGDNF shgdnFlags, STRRET* pName)
+{
+	auto setting = GetModernSetting(pidl);
+	if (!setting)
+		return E_INVALIDARG;
+
+	HRESULT hr = S_OK;
+
+	if (shgdnFlags & SHGDN_FORPARSING)
+	{
+		if (shgdnFlags & SHGDN_INFOLDER)
+		{
+			// This form of the display name needs to be handled by ParseDisplayName.
+			hr = StringToStrRet(setting.fileName.data(), pName);
+		}
+		else
+		{
+			WCHAR szDisplayName[MAX_PATH];
+			CComString pszThisFolder;
+			hr = SHGetNameFromIDList(m_pidl, (shgdnFlags & SHGDN_FORADDRESSBAR) ? SIGDN_DESKTOPABSOLUTEEDITING : SIGDN_DESKTOPABSOLUTEPARSING, &pszThisFolder);
+			if (SUCCEEDED(hr))
+			{
+				StringCchCopy(szDisplayName, ARRAYSIZE(szDisplayName), pszThisFolder);
+				StringCchCat(szDisplayName, ARRAYSIZE(szDisplayName), L"\\");
+				StringCchCat(szDisplayName, ARRAYSIZE(szDisplayName), setting.fileName.data());
+
+				hr = StringToStrRet(szDisplayName, pName);
+			}
+		}
+	}
+	else
+	{
+		hr = StringToStrRet(setting.description.data(), pName);
+	}
+
+	return hr;
+}
+
+// Sets the display name of a file object or subfolder, changing the item identifier in the process.
+HRESULT CModernSettingsShellFolder::SetNameOf(HWND /* hwnd */, PCUITEMID_CHILD /* pidl */,	PCWSTR /* pszName */, DWORD /* uFlags */, PITEMID_CHILD* ppidlOut)
+{
+	*ppidlOut = NULL;
+	return E_NOTIMPL;
+}
+
+// IShellFolder2 methods
+
+// Requests the GUID of the default search object for the folder.
+HRESULT CModernSettingsShellFolder::GetDefaultSearchGUID(GUID* /* pguid */)
+{
+	return E_NOTIMPL;
+}
+
+HRESULT CModernSettingsShellFolder::EnumSearches(IEnumExtraSearch** ppEnum)
+{
+	*ppEnum = NULL;
+	return E_NOINTERFACE;
+}
+
+// Retrieves the default sorting and display column (indices from GetDetailsOf).
+HRESULT CModernSettingsShellFolder::GetDefaultColumn(DWORD /* dwRes */, ULONG* pSort, ULONG* pDisplay)
+{
+	*pSort = 0;
+	*pDisplay = 0;
+	return S_OK;
+}
+
+// Retrieves the default state for a specified column.
+HRESULT CModernSettingsShellFolder::GetDefaultColumnState(UINT iColumn, SHCOLSTATEF* pcsFlags)
+{
+	if (iColumn < _countof(g_columnDescriptions))
+	{
+		*pcsFlags = SHCOLSTATE_ONBYDEFAULT | SHCOLSTATE_TYPE_STR;
+		return S_OK;
+	}
+
+	return E_INVALIDARG;
+}
+
+// Retrieves detailed information, identified by a property set ID (FMTID) and property ID (PID), on an item in a Shell folder.
+HRESULT CModernSettingsShellFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const PROPERTYKEY* pkey, VARIANT* pv)
+{
+	for (const auto& desc : g_columnDescriptions)
+	{
+		if (IsEqualPropertyKey(*pkey, desc.key))
+		{
+			auto str = GetColumnDisplayName(pidl, (UINT)std::distance(g_columnDescriptions, &desc));
+
+			pv->vt = VT_BSTR;
+			pv->bstrVal = SysAllocString(str.data());
+			return pv->bstrVal ? S_OK : E_OUTOFMEMORY;
+		}
+	}
+
+	return S_OK;
+}
+
+//  Retrieves detailed information, identified by a column index, on an item in a Shell folder.
+HRESULT CModernSettingsShellFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS* pDetails)
+{
+	pDetails->cxChar = 24;
+
+	if (!pidl)
+	{
+		// No item means we're returning information about the column itself.
+
+		if (iColumn >= _countof(g_columnDescriptions))
+		{
+			// GetDetailsOf is called with increasing column indices until failure.
+			return E_FAIL;
+		}
+
+		pDetails->fmt = LVCFMT_LEFT;
+		return StringToStrRet(g_columnDescriptions[iColumn].name, &pDetails->str);
+	}
+
+	auto str = GetColumnDisplayName(pidl, iColumn);
+	return StringToStrRet(str.data(), &pDetails->str);
+}
+
+//  Converts a column name to the appropriate property set ID (FMTID) and property ID (PID).
+HRESULT CModernSettingsShellFolder::MapColumnToSCID(UINT iColumn, PROPERTYKEY* pkey)
+{
+	if (iColumn < _countof(g_columnDescriptions))
+	{
+		*pkey = g_columnDescriptions[iColumn].key;
+		return S_OK;
+	}
+
+	return E_FAIL;
+}
+
+// IPersist method
+HRESULT CModernSettingsShellFolder::GetClassID(CLSID* pClassID)
+{
+	*pClassID = CLSID_ModernSettingsShellFolder;
+	return S_OK;
+}
+
+// IPersistFolder method
+HRESULT CModernSettingsShellFolder::Initialize(PCIDLIST_ABSOLUTE pidl)
+{
+	m_pidl = pidl;
+	return m_pidl ? S_OK : E_FAIL;
+}
+
+// IPersistFolder2 methods
+// Retrieves the PIDLIST_ABSOLUTE for the folder object.
+HRESULT CModernSettingsShellFolder::GetCurFolder(PIDLIST_ABSOLUTE* ppidl)
+{
+	*ppidl = NULL;
+	HRESULT hr = m_pidl ? S_OK : E_FAIL;
+	if (SUCCEEDED(hr))
+	{
+		*ppidl = ILCloneFull(m_pidl);
+		hr = *ppidl ? S_OK : E_OUTOFMEMORY;
+	}
+	return hr;
+}
+
+HRESULT CModernSettingsShellFolder::CreateChildID(const std::wstring_view& fileName, PITEMID_CHILD* ppidl)
+{
+	auto size = fileName.size() * sizeof(wchar_t);
+
+	// Sizeof an object plus the next cb plus the characters in the string.
+	UINT nIDSize = sizeof(FVITEMID) + sizeof(USHORT) + (WORD)size;
+
+	// Allocate and zero the memory.
+	FVITEMID* lpMyObj = (FVITEMID*)CoTaskMemAlloc(nIDSize);
+
+	HRESULT hr = lpMyObj ? S_OK : E_OUTOFMEMORY;
+	if (SUCCEEDED(hr))
+	{
+		ZeroMemory(lpMyObj, nIDSize);
+		lpMyObj->cb = static_cast<short>(nIDSize - sizeof(lpMyObj->cb));
+		lpMyObj->magic = MAGIC;
+		lpMyObj->size = (WORD)size;
+		memcpy(lpMyObj->data, fileName.data(), size);
+
+		*ppidl = (PITEMID_CHILD)lpMyObj;
+	}
+
+	return hr;
+}
+
+std::wstring_view CModernSettingsShellFolder::GetColumnDisplayName(PCUITEMID_CHILD pidl, UINT iColumn)
+{
+	auto setting = GetModernSetting(pidl);
+	if (setting)
+	{
+		switch (iColumn)
+		{
+		case 0:
+			return setting.description;
+		case 1:
+			return setting.keywords;
+		case 2:
+			return setting.fileName;
+		}
+	}
+
+	return {};
+}

Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.h

@@ -0,0 +1,85 @@
+// Open-Shell Modern Settings shell folder
+// Provides folder that contains all modern settings
+
+#pragma once
+#include "resource.h"
+#include "ComHelper.h"
+#include "StartMenuHelper_i.h"
+#include <shlobj.h>
+#include <string>
+
+// CModernSettingsShellFolder
+
+class ATL_NO_VTABLE CModernSettingsShellFolder :
+	public CComObjectRootEx<CComSingleThreadModel>,
+	public CComCoClass<CModernSettingsShellFolder, &CLSID_ModernSettingsShellFolder>,
+	public IShellFolder2,
+	public IPersistFolder2
+{
+public:
+	CModernSettingsShellFolder()
+	{
+	}
+
+DECLARE_REGISTRY_RESOURCEID(IDR_MODERNSETTINGSSHELLFOLDER)
+
+DECLARE_NOT_AGGREGATABLE(CModernSettingsShellFolder)
+
+BEGIN_COM_MAP(CModernSettingsShellFolder)
+	COM_INTERFACE_ENTRY(IShellFolder)
+	COM_INTERFACE_ENTRY(IShellFolder2)
+	COM_INTERFACE_ENTRY(IPersist)
+	COM_INTERFACE_ENTRY(IPersistFolder)
+	COM_INTERFACE_ENTRY(IPersistFolder2)
+END_COM_MAP()
+
+	DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+	HRESULT FinalConstruct()
+	{
+		return S_OK;
+	}
+
+	void FinalRelease()
+	{
+	}
+
+	// IShellFolder
+	IFACEMETHODIMP ParseDisplayName(HWND hwnd, IBindCtx* pbc, PWSTR pszName, ULONG* pchEaten, PIDLIST_RELATIVE* ppidl, ULONG* pdwAttributes);
+	IFACEMETHODIMP EnumObjects(HWND hwnd, DWORD grfFlags, IEnumIDList** ppenumIDList);
+	IFACEMETHODIMP BindToObject(PCUIDLIST_RELATIVE pidl, IBindCtx* pbc, REFIID riid, void** ppv);
+	IFACEMETHODIMP BindToStorage(PCUIDLIST_RELATIVE pidl, IBindCtx* pbc, REFIID riid, void** ppv);
+	IFACEMETHODIMP CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2);
+	IFACEMETHODIMP CreateViewObject(HWND hwnd, REFIID riid, void** ppv);
+	IFACEMETHODIMP GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, ULONG* rgfInOut);
+	IFACEMETHODIMP GetUIObjectOf(HWND hwnd, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT* prgfInOut, void** ppv);
+	IFACEMETHODIMP GetDisplayNameOf(PCUITEMID_CHILD pidl, SHGDNF shgdnFlags, STRRET* pName);
+	IFACEMETHODIMP SetNameOf(HWND hwnd, PCUITEMID_CHILD pidl, PCWSTR pszName, DWORD uFlags, PITEMID_CHILD* ppidlOut);
+
+	// IShellFolder2
+	IFACEMETHODIMP GetDefaultSearchGUID(GUID* pGuid);
+	IFACEMETHODIMP EnumSearches(IEnumExtraSearch** ppenum);
+	IFACEMETHODIMP GetDefaultColumn(DWORD dwRes, ULONG* pSort, ULONG* pDisplay);
+	IFACEMETHODIMP GetDefaultColumnState(UINT iColumn, SHCOLSTATEF* pbState);
+	IFACEMETHODIMP GetDetailsEx(PCUITEMID_CHILD pidl, const PROPERTYKEY* pkey, VARIANT* pv);
+	IFACEMETHODIMP GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS* pDetails);
+	IFACEMETHODIMP MapColumnToSCID(UINT iColumn, PROPERTYKEY* pkey);
+
+	// IPersist
+	IFACEMETHODIMP GetClassID(CLSID* pClassID);
+
+	// IPersistFolder
+	IFACEMETHODIMP Initialize(PCIDLIST_ABSOLUTE pidl);
+
+	// IPersistFolder2
+	IFACEMETHODIMP GetCurFolder(PIDLIST_ABSOLUTE* ppidl);
+
+	HRESULT CreateChildID(const std::wstring_view& fileName, PITEMID_CHILD* ppidl);
+
+private:
+	std::wstring_view GetColumnDisplayName(PCUITEMID_CHILD pidl, UINT iColumn);
+
+	CAbsolutePidl m_pidl;             // where this folder is in the name space
+};
+
+OBJECT_ENTRY_AUTO(__uuidof(ModernSettingsShellFolder), CModernSettingsShellFolder)

Src/StartMenu/StartMenuHelper/ModernSettingsShellFolder.rgs

@@ -0,0 +1,26 @@
+HKCR
+{
+	NoRemove CLSID
+	{
+		ForceRemove {82e749ed-b971-4550-baf7-06aa2bf7e836} = s 'Open-Shell Modern Settings'
+		{
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'Apartment'
+			}
+			ShellFolder
+			{
+				val Attributes = d '&HA0000000'
+			}
+			ShellEx
+			{
+				ContextMenuHandlers
+				{
+					Default = s '{5ab14324-c087-42c1-b905-a0bfdb4e9532}'
+					{
+					}
+				}
+			}
+		}
+	}
+}

Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp

@@ -25,6 +25,8 @@ const CLSID g_ExplorerClsid= {0xECD4FC4D, 0x521C, 0x11D0, {0xB7, 0x92, 0x00, 0xA
 const CLSID g_EmulationClsid= {0xD3214FBB, 0x3CA1, 0x406A, {0xB3, 0xE8, 0x3E, 0xB7, 0xC3, 0x93, 0xA1, 0x5E}};
 #define EMULATION_KEY L"TreatAs"
 
+#define SHELLEXT_NAME L"StartMenuExt"
+
 static void AdjustPrivileges( void )
 {
 	HANDLE hToken;
@@ -46,6 +48,18 @@ static void AdjustPrivileges( void )
 	}
 }
 
+static void AddShellExt(const wchar_t* progID, const LPSECURITY_ATTRIBUTES sa)
+{
+	HKEY hkey = NULL;
+
+	if (RegCreateKeyEx(HKEY_CLASSES_ROOT, CString(progID) + L"\\ShellEx\\ContextMenuHandlers\\" SHELLEXT_NAME, NULL, NULL, REG_OPTION_BACKUP_RESTORE, KEY_WRITE, sa, &hkey, NULL) == ERROR_SUCCESS)
+	{
+		wchar_t val[] = L"{E595F05F-903F-4318-8B0A-7F633B520D2B}";
+		RegSetValueEx(hkey, NULL, NULL, REG_SZ, (BYTE*)val, sizeof(val));
+		RegCloseKey(hkey);
+	}
+}
+
 static void AddRegistryKeys( bool bPin )
 {
 	AdjustPrivileges();
@@ -103,21 +117,12 @@ static void AddRegistryKeys( bool bPin )
 					RegSetValueEx(hkey,NULL,NULL,REG_SZ,(BYTE*)val,sizeof(val));
 					RegCloseKey(hkey);
 				}
-				hkey=NULL;
+
 				if (bPin)
 				{
-					if (RegCreateKeyEx(HKEY_CLASSES_ROOT,L"Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers\\StartMenuExt",NULL,NULL,REG_OPTION_BACKUP_RESTORE,KEY_WRITE,&sa,&hkey,NULL)==ERROR_SUCCESS)
-					{
-						wchar_t val[]=L"{E595F05F-903F-4318-8B0A-7F633B520D2B}";
-						RegSetValueEx(hkey,NULL,NULL,REG_SZ,(BYTE*)val,sizeof(val));
-						RegCloseKey(hkey);
-					}
-					if (RegCreateKeyEx(HKEY_CLASSES_ROOT,L"Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers\\StartMenuExt",NULL,NULL,REG_OPTION_BACKUP_RESTORE,KEY_WRITE,&sa,&hkey,NULL)==ERROR_SUCCESS)
-					{
-						wchar_t val[]=L"{E595F05F-903F-4318-8B0A-7F633B520D2B}";
-						RegSetValueEx(hkey,NULL,NULL,REG_SZ,(BYTE*)val,sizeof(val));
-						RegCloseKey(hkey);
-					}
+					AddShellExt(L"Launcher.ImmersiveApplication", &sa);
+					AddShellExt(L"Launcher.DesktopPackagedApplication", &sa);
+					AddShellExt(L"Launcher.SystemSettings", &sa);
 				}
 			}
 		} 
@@ -127,6 +132,16 @@ static void AddRegistryKeys( bool bPin )
 	FreeSid(pAdminSID);
 }
 
+static void RemoveShellExt(const wchar_t* progID)
+{
+	HKEY hkey = NULL;
+	if (RegCreateKeyEx(HKEY_CLASSES_ROOT, CString(progID) + L"\\ShellEx\\ContextMenuHandlers", NULL, NULL, REG_OPTION_BACKUP_RESTORE, KEY_WRITE | DELETE, NULL, &hkey, NULL) == ERROR_SUCCESS)
+	{
+		RegDeleteTree(hkey, SHELLEXT_NAME);
+		RegCloseKey(hkey);
+	}
+}
+
 static void RemoveRegistryKeys( bool bPin )
 {
 	AdjustPrivileges();
@@ -136,19 +151,12 @@ static void RemoveRegistryKeys( bool bPin )
 		RegDeleteTree(hkey,EMULATION_KEY);
 		RegCloseKey(hkey);
 	}
-	hkey=NULL;
+
 	if (bPin)
 	{
-		if (RegCreateKeyEx(HKEY_CLASSES_ROOT,L"Launcher.ImmersiveApplication\\ShellEx\\ContextMenuHandlers",NULL,NULL,REG_OPTION_BACKUP_RESTORE,KEY_WRITE|DELETE,NULL,&hkey,NULL)==ERROR_SUCCESS)
-		{
-			RegDeleteTree(hkey,L"StartMenuExt");
-			RegCloseKey(hkey);
-		}
-		if (RegCreateKeyEx(HKEY_CLASSES_ROOT,L"Launcher.SystemSettings\\ShellEx\\ContextMenuHandlers",NULL,NULL,REG_OPTION_BACKUP_RESTORE,KEY_WRITE|DELETE,NULL,&hkey,NULL)==ERROR_SUCCESS)
-		{
-			RegDeleteTree(hkey,L"StartMenuExt");
-			RegCloseKey(hkey);
-		}
+		RemoveShellExt(L"Launcher.ImmersiveApplication");
+		RemoveShellExt(L"Launcher.DesktopPackagedApplication");
+		RemoveShellExt(L"Launcher.SystemSettings");
 	}
 }
 

Src/StartMenu/StartMenuHelper/StartMenuHelper.idl

@@ -6,6 +6,7 @@
 
 import "oaidl.idl";
 import "ocidl.idl";
+import "shobjidl.idl";
 
 [
 	object,
@@ -31,4 +32,21 @@ library StartMenuHelperLib
 	{
 		[default] interface IStartMenuExt;
 	};
+	[
+		uuid(82e749ed-b971-4550-baf7-06aa2bf7e836)
+	]
+	coclass ModernSettingsShellFolder
+	{
+		interface IShellFolder2;
+		interface IPersistFolder2;
+	};
+	[
+		uuid(5ab14324-c087-42c1-b905-a0bfdb4e9532)
+	]
+	coclass ModernSettingsContextMenu
+	{
+		interface IContextMenu;
+		interface IShellExtInit;
+		interface IObjectWithSite;
+	};
 };

Src/StartMenu/StartMenuHelper/StartMenuHelper.rc

@@ -98,6 +98,8 @@ END
 
 IDR_STARTMENUHELPER     REGISTRY                "StartMenuHelper.rgs"
 IDR_STARTMENUEXT        REGISTRY                "StartMenuExt.rgs"
+IDR_MODERNSETTINGSSHELLFOLDER REGISTRY          "ModernSettingsShellFolder.rgs"
+IDR_MODERNSETTINGSCONTEXTMENU REGISTRY          "ModernSettingsContextMenu.rgs"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 

Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj

@@ -157,7 +157,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -177,6 +176,7 @@
       <ModuleDefinitionFile>.\$(TargetName).def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
+      <PerUserRedirection>true</PerUserRedirection>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -192,7 +192,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -212,6 +211,7 @@
       <ModuleDefinitionFile>.\$(TargetName).def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
+      <PerUserRedirection>true</PerUserRedirection>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -248,6 +248,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <PerUserRedirection>true</PerUserRedirection>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -283,6 +284,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <PerUserRedirection>true</PerUserRedirection>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'">
@@ -356,6 +358,9 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp" />
+    <ClCompile Include="ModernSettings.cpp" />
+    <ClCompile Include="ModernSettingsContextMenu.cpp" />
+    <ClCompile Include="ModernSettingsShellFolder.cpp" />
     <ClCompile Include="StartMenuExt.cpp" />
     <ClCompile Include="StartMenuHelper.cpp" />
     <ClCompile Include="StartMenuHelper_i.c">
@@ -369,6 +374,8 @@
     <Midl Include="StartMenuHelper.idl" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="ModernSettingsContextMenu.rgs" />
+    <None Include="ModernSettingsShellFolder.rgs" />
     <None Include="StartMenuExt.rgs" />
     <None Include="StartMenuHelper.rgs" />
     <None Include="StartMenuHelper32.def" />
@@ -377,6 +384,9 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="dllmain.h" />
+    <ClInclude Include="ModernSettings.h" />
+    <ClInclude Include="ModernSettingsContextMenu.h" />
+    <ClInclude Include="ModernSettingsShellFolder.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="StartMenuExt.h" />
     <ClInclude Include="StartMenuHelper_i.h" />

Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters

@@ -34,6 +34,15 @@
     <ClCompile Include="StartMenuHelper_i.c">
       <Filter>Generated Files</Filter>
     </ClCompile>
+    <ClCompile Include="ModernSettingsShellFolder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ModernSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ModernSettingsContextMenu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Midl Include="StartMenuHelper.idl">
@@ -56,6 +65,12 @@
     <None Include="StartMenuHelperL10N.ini">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="ModernSettingsShellFolder.rgs">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="ModernSettingsContextMenu.rgs">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="dllmain.h">
@@ -76,6 +91,15 @@
     <ClInclude Include="StartMenuHelper_i.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
+    <ClInclude Include="ModernSettingsShellFolder.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ModernSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ModernSettingsContextMenu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="StartMenuHelper.rc">

Src/StartMenu/StartMenuHelper/resource.h

@@ -4,6 +4,8 @@
 //
 #define IDR_STARTMENUHELPER             101
 #define IDR_STARTMENUEXT                102
+#define IDR_MODERNSETTINGSSHELLFOLDER   103
+#define IDR_MODERNSETTINGSCONTEXTMENU   104
 
 // Next default values for new objects
 // 
@@ -12,6 +14,6 @@
 #define _APS_NEXT_RESOURCE_VALUE        201
 #define _APS_NEXT_COMMAND_VALUE         32768
 #define _APS_NEXT_CONTROL_VALUE         201
-#define _APS_NEXT_SYMED_VALUE           103
+#define _APS_NEXT_SYMED_VALUE           105
 #endif
 #endif

Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp

@@ -0,0 +1,291 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+#include "DesktopNotificationManagerCompat.h"
+#include <appmodel.h>
+#include <wrl\wrappers\corewrappers.h>
+
+#define RETURN_IF_FAILED(hr) do { HRESULT _hrTemp = hr; if (FAILED(_hrTemp)) { return _hrTemp; } } while (false)
+
+using namespace ABI::Windows::Data::Xml::Dom;
+using namespace Microsoft::WRL;
+using namespace Microsoft::WRL::Wrappers;
+
+namespace DesktopNotificationManagerCompat
+{
+    HRESULT RegisterComServer(GUID clsid, const wchar_t exePath[]);
+    HRESULT EnsureRegistered();
+    bool IsRunningAsUwp();
+
+    bool s_registeredAumidAndComServer = false;
+    std::wstring s_aumid;
+    bool s_registeredActivator = false;
+    bool s_hasCheckedIsRunningAsUwp = false;
+    bool s_isRunningAsUwp = false;
+
+    HRESULT RegisterAumidAndComServer(const wchar_t *aumid, GUID clsid)
+    {
+/*
+        // If running as Desktop Bridge
+        if (IsRunningAsUwp())
+        {
+            // Clear the AUMID since Desktop Bridge doesn't use it, and then we're done.
+            // Desktop Bridge apps are registered with platform through their manifest.
+            // Their LocalServer32 key is also registered through their manifest.
+            s_aumid = L"";
+            s_registeredAumidAndComServer = true;
+            return S_OK;
+        }
+*/
+        // Copy the aumid
+        s_aumid = std::wstring(aumid);
+/*
+        // Get the EXE path
+        wchar_t exePath[MAX_PATH];
+        DWORD charWritten = ::GetModuleFileName(nullptr, exePath, ARRAYSIZE(exePath));
+        RETURN_IF_FAILED(charWritten > 0 ? S_OK : HRESULT_FROM_WIN32(::GetLastError()));
+
+        // Register the COM server
+        RETURN_IF_FAILED(RegisterComServer(clsid, exePath));
+*/
+        s_registeredAumidAndComServer = true;
+        return S_OK;
+    }
+
+    HRESULT RegisterActivator()
+    {
+        // Module<OutOfProc> needs a callback registered before it can be used.
+        // Since we don't care about when it shuts down, we'll pass an empty lambda here.
+        Module<OutOfProc>::Create([] {});
+
+        // If a local server process only hosts the COM object then COM expects
+        // the COM server host to shutdown when the references drop to zero.
+        // Since the user might still be using the program after activating the notification,
+        // we don't want to shutdown immediately.  Incrementing the object count tells COM that
+        // we aren't done yet.
+        Module<OutOfProc>::GetModule().IncrementObjectCount();
+
+        RETURN_IF_FAILED(Module<OutOfProc>::GetModule().RegisterObjects());
+
+        s_registeredActivator = true;
+        return S_OK;
+    }
+
+    HRESULT RegisterComServer(GUID clsid, const wchar_t exePath[])
+    {
+        // Turn the GUID into a string
+        OLECHAR* clsidOlechar;
+        StringFromCLSID(clsid, &clsidOlechar);
+        std::wstring clsidStr(clsidOlechar);
+        ::CoTaskMemFree(clsidOlechar);
+
+        // Create the subkey
+        // Something like SOFTWARE\Classes\CLSID\{23A5B06E-20BB-4E7E-A0AC-6982ED6A6041}\LocalServer32
+        std::wstring subKey = LR"(SOFTWARE\Classes\CLSID\)" + clsidStr + LR"(\LocalServer32)";
+
+        // Include -ToastActivated launch args on the exe
+        std::wstring exePathStr(exePath);
+        exePathStr = L"\"" + exePathStr + L"\" " + TOAST_ACTIVATED_LAUNCH_ARG;
+
+        // We don't need to worry about overflow here as ::GetModuleFileName won't
+        // return anything bigger than the max file system path (much fewer than max of DWORD).
+        DWORD dataSize = static_cast<DWORD>((exePathStr.length() + 1) * sizeof(WCHAR));
+
+        // Register the EXE for the COM server
+        return HRESULT_FROM_WIN32(::RegSetKeyValue(
+            HKEY_CURRENT_USER,
+            subKey.c_str(),
+            nullptr,
+            REG_SZ,
+            reinterpret_cast<const BYTE*>(exePathStr.c_str()),
+            dataSize));
+    }
+
+    HRESULT CreateToastNotifier(IToastNotifier **notifier)
+    {
+        RETURN_IF_FAILED(EnsureRegistered());
+
+        ComPtr<IToastNotificationManagerStatics> toastStatics;
+        RETURN_IF_FAILED(Windows::Foundation::GetActivationFactory(
+            HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotificationManager).Get(),
+            &toastStatics));
+
+        if (s_aumid.empty())
+        {
+            return toastStatics->CreateToastNotifier(notifier);
+        }
+        else
+        {
+            return toastStatics->CreateToastNotifierWithId(HStringReference(s_aumid.c_str()).Get(), notifier);
+        }
+    }
+
+    HRESULT CreateXmlDocumentFromString(const wchar_t *xmlString, IXmlDocument **doc)
+    {
+        ComPtr<IXmlDocument> answer;
+        RETURN_IF_FAILED(Windows::Foundation::ActivateInstance(HStringReference(RuntimeClass_Windows_Data_Xml_Dom_XmlDocument).Get(), &answer));
+
+        ComPtr<IXmlDocumentIO> docIO;
+        RETURN_IF_FAILED(answer.As(&docIO));
+
+        // Load the XML string
+        RETURN_IF_FAILED(docIO->LoadXml(HStringReference(xmlString).Get()));
+
+        return answer.CopyTo(doc);
+    }
+
+    HRESULT CreateToastNotification(IXmlDocument *content, IToastNotification **notification)
+    {
+        ComPtr<IToastNotificationFactory> factory;
+        RETURN_IF_FAILED(Windows::Foundation::GetActivationFactory(
+            HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotification).Get(),
+            &factory));
+
+        return factory->CreateToastNotification(content, notification);
+    }
+
+    HRESULT get_History(std::unique_ptr<DesktopNotificationHistoryCompat>* history)
+    {
+        RETURN_IF_FAILED(EnsureRegistered());
+
+        ComPtr<IToastNotificationManagerStatics> toastStatics;
+        RETURN_IF_FAILED(Windows::Foundation::GetActivationFactory(
+            HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotificationManager).Get(),
+            &toastStatics));
+
+        ComPtr<IToastNotificationManagerStatics2> toastStatics2;
+        RETURN_IF_FAILED(toastStatics.As(&toastStatics2));
+
+        ComPtr<IToastNotificationHistory> nativeHistory;
+        RETURN_IF_FAILED(toastStatics2->get_History(&nativeHistory));
+
+        *history = std::unique_ptr<DesktopNotificationHistoryCompat>(new DesktopNotificationHistoryCompat(s_aumid.c_str(), nativeHistory));
+        return S_OK;
+    }
+
+    bool CanUseHttpImages()
+    {
+        return IsRunningAsUwp();
+    }
+
+    HRESULT EnsureRegistered()
+    {
+        // If not registered AUMID yet
+        if (!s_registeredAumidAndComServer)
+        {
+            // Check if Desktop Bridge
+            if (IsRunningAsUwp())
+            {
+                // Implicitly registered, all good!
+                s_registeredAumidAndComServer = true;
+            }
+            else
+            {
+                // Otherwise, incorrect usage, must call RegisterAumidAndComServer first
+                return E_ILLEGAL_METHOD_CALL;
+            }
+        }
+
+        // If not registered activator yet
+        if (!s_registeredActivator)
+        {
+            // Incorrect usage, must call RegisterActivator first
+            return E_ILLEGAL_METHOD_CALL;
+        }
+
+        return S_OK;
+    }
+
+    bool IsRunningAsUwp()
+    {
+        if (!s_hasCheckedIsRunningAsUwp)
+        {
+            // https://stackoverflow.com/questions/39609643/determine-if-c-application-is-running-as-a-uwp-app-in-desktop-bridge-project
+            UINT32 length;
+            wchar_t packageFamilyName[PACKAGE_FAMILY_NAME_MAX_LENGTH + 1];
+            LONG result = GetPackageFamilyName(GetCurrentProcess(), &length, packageFamilyName);
+            s_isRunningAsUwp = result == ERROR_SUCCESS;
+            s_hasCheckedIsRunningAsUwp = true;
+        }
+
+        return s_isRunningAsUwp;
+    }
+}
+
+DesktopNotificationHistoryCompat::DesktopNotificationHistoryCompat(const wchar_t *aumid, ComPtr<IToastNotificationHistory> history)
+{
+    m_aumid = std::wstring(aumid);
+    m_history = history;
+}
+
+HRESULT DesktopNotificationHistoryCompat::Clear()
+{
+    if (m_aumid.empty())
+    {
+        return m_history->Clear();
+    }
+    else
+    {
+        return m_history->ClearWithId(HStringReference(m_aumid.c_str()).Get());
+    }
+}
+
+HRESULT DesktopNotificationHistoryCompat::GetHistory(ABI::Windows::Foundation::Collections::IVectorView<ToastNotification*> **toasts)
+{
+    ComPtr<IToastNotificationHistory2> history2;
+    RETURN_IF_FAILED(m_history.As(&history2));
+
+    if (m_aumid.empty())
+    {
+        return history2->GetHistory(toasts);
+    }
+    else
+    {
+        return history2->GetHistoryWithId(HStringReference(m_aumid.c_str()).Get(), toasts);
+    }
+}
+
+HRESULT DesktopNotificationHistoryCompat::Remove(const wchar_t *tag)
+{
+    if (m_aumid.empty())
+    {
+        return m_history->Remove(HStringReference(tag).Get());
+    }
+    else
+    {
+        return m_history->RemoveGroupedTagWithId(HStringReference(tag).Get(), HStringReference(L"").Get(), HStringReference(m_aumid.c_str()).Get());
+    }
+}
+
+HRESULT DesktopNotificationHistoryCompat::RemoveGroupedTag(const wchar_t *tag, const wchar_t *group)
+{
+    if (m_aumid.empty())
+    {
+        return m_history->RemoveGroupedTag(HStringReference(tag).Get(), HStringReference(group).Get());
+    }
+    else
+    {
+        return m_history->RemoveGroupedTagWithId(HStringReference(tag).Get(), HStringReference(group).Get(), HStringReference(m_aumid.c_str()).Get());
+    }
+}
+
+HRESULT DesktopNotificationHistoryCompat::RemoveGroup(const wchar_t *group)
+{
+    if (m_aumid.empty())
+    {
+        return m_history->RemoveGroup(HStringReference(group).Get());
+    }
+    else
+    {
+        return m_history->RemoveGroupWithId(HStringReference(group).Get(), HStringReference(m_aumid.c_str()).Get());
+    }
+}

Src/Update/DesktopToasts/DesktopNotificationManagerCompat.h

@@ -0,0 +1,108 @@
+// ******************************************************************
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
+// ******************************************************************
+
+#pragma once
+#include <string>
+#include <memory>
+#include <Windows.h>
+#include <windows.ui.notifications.h>
+#include <wrl.h>
+#define TOAST_ACTIVATED_LAUNCH_ARG L"-ToastActivated"
+
+using namespace ABI::Windows::UI::Notifications;
+
+class DesktopNotificationHistoryCompat;
+
+namespace DesktopNotificationManagerCompat
+{
+    /// <summary>
+    /// If not running under the Desktop Bridge, you must call this method to register your AUMID with the Compat library and to
+    /// register your COM CLSID and EXE in LocalServer32 registry. Feel free to call this regardless, and we will no-op if running
+    /// under Desktop Bridge. Call this upon application startup, before calling any other APIs.
+    /// </summary>
+    /// <param name="aumid">An AUMID that uniquely identifies your application.</param>
+    /// <param name="clsid">The CLSID of your NotificationActivator class.</param>
+    HRESULT RegisterAumidAndComServer(const wchar_t *aumid, GUID clsid);
+
+    /// <summary>
+    /// Registers your module to handle COM activations. Call this upon application startup.
+    /// </summary>
+    HRESULT RegisterActivator();
+
+    /// <summary>
+    /// Creates a toast notifier. You must have called RegisterActivator first (and also RegisterAumidAndComServer if you're a classic Win32 app), or this will throw an exception.
+    /// </summary>
+    HRESULT CreateToastNotifier(IToastNotifier** notifier);
+
+    /// <summary>
+    /// Creates an XmlDocument initialized with the specified string. This is simply a convenience helper method.
+    /// </summary>
+    HRESULT CreateXmlDocumentFromString(const wchar_t *xmlString, ABI::Windows::Data::Xml::Dom::IXmlDocument** doc);
+
+    /// <summary>
+    /// Creates a toast notification. This is simply a convenience helper method.
+    /// </summary>
+    HRESULT CreateToastNotification(ABI::Windows::Data::Xml::Dom::IXmlDocument* content, IToastNotification** notification);
+
+    /// <summary>
+    /// Gets the DesktopNotificationHistoryCompat object. You must have called RegisterActivator first (and also RegisterAumidAndComServer if you're a classic Win32 app), or this will throw an exception.
+    /// </summary>
+    HRESULT get_History(std::unique_ptr<DesktopNotificationHistoryCompat>* history);
+
+    /// <summary>
+    /// Gets a boolean representing whether http images can be used within toasts. This is true if running under Desktop Bridge.
+    /// </summary>
+    bool CanUseHttpImages();
+}
+
+class DesktopNotificationHistoryCompat
+{
+public:
+
+    /// <summary>
+    /// Removes all notifications sent by this app from action center.
+    /// </summary>
+    HRESULT Clear();
+
+    /// <summary>
+    /// Gets all notifications sent by this app that are currently still in Action Center.
+    /// </summary>
+    HRESULT GetHistory(ABI::Windows::Foundation::Collections::IVectorView<ToastNotification*>** history);
+
+    /// <summary>
+    /// Removes an individual toast, with the specified tag label, from action center.
+    /// </summary>
+    /// <param name="tag">The tag label of the toast notification to be removed.</param>
+    HRESULT Remove(const wchar_t *tag);
+
+    /// <summary>
+    /// Removes a toast notification from the action using the notification's tag and group labels.
+    /// </summary>
+    /// <param name="tag">The tag label of the toast notification to be removed.</param>
+    /// <param name="group">The group label of the toast notification to be removed.</param>
+    HRESULT RemoveGroupedTag(const wchar_t *tag, const wchar_t *group);
+
+    /// <summary>
+    /// Removes a group of toast notifications, identified by the specified group label, from action center.
+    /// </summary>
+    /// <param name="group">The group label of the toast notifications to be removed.</param>
+    HRESULT RemoveGroup(const wchar_t *group);
+
+    /// <summary>
+    /// Do not call this. Instead, call DesktopNotificationManagerCompat.get_History() to obtain an instance.
+    /// </summary>
+    DesktopNotificationHistoryCompat(const wchar_t *aumid, Microsoft::WRL::ComPtr<IToastNotificationHistory> history);
+
+private:
+    std::wstring m_aumid;
+    Microsoft::WRL::ComPtr<IToastNotificationHistory> m_history = nullptr;
+};

Src/Update/DesktopToasts/DesktopToasts.def

@@ -0,0 +1,5 @@
+LIBRARY "DesktopToasts.dll"
+
+EXPORTS
+	Initialize
+	DisplaySimpleToast

Src/Update/DesktopToasts/DesktopToasts.h

@@ -0,0 +1,59 @@
+#include <VersionHelpers.h>
+
+using DesktopToastActivateHandler = void(__cdecl*)(void* context, LPCWSTR invokedArgs);
+
+HRESULT Initialize(LPCWSTR appUserModelId, DesktopToastActivateHandler handler, void* handlerContext);
+HRESULT DisplaySimpleToast(LPCWSTR title, LPCWSTR text);
+
+class DesktopToasts
+{
+public:
+	explicit DesktopToasts(LPCWSTR appUserModelId)
+	{
+		if (::IsWindows10OrGreater())
+		{
+			auto m_lib = ::LoadLibrary(L"DesktopToasts.dll");
+			if (m_lib)
+			{
+				m_pInitialize = (decltype(m_pInitialize))::GetProcAddress(m_lib, "Initialize");
+				m_pDisplayToast = (decltype(m_pDisplayToast))::GetProcAddress(m_lib, "DisplaySimpleToast");
+
+				if (m_pInitialize && m_pDisplayToast)
+				{
+					if (m_pInitialize(appUserModelId, ToastActivate, this) == S_OK)
+						m_initialized = true;
+				}
+			}
+		}
+	}
+
+	~DesktopToasts()
+	{
+		if (m_lib)
+			::FreeLibrary(m_lib);
+	}
+
+	explicit operator bool() const
+	{
+		return m_initialized;
+	}
+
+	HRESULT DisplaySimpleToast(LPCWSTR title, LPCWSTR text)
+	{
+		return m_pDisplayToast(title, text);
+	}
+
+private:
+	virtual void OnToastActivate(LPCWSTR invokedArgs) {}
+
+	static void __cdecl ToastActivate(void* context, LPCWSTR invokedArgs)
+	{
+		static_cast<DesktopToasts*>(context)->OnToastActivate(invokedArgs);
+	}
+
+	bool m_initialized = false;
+
+	HMODULE m_lib = nullptr;
+	decltype(&::Initialize) m_pInitialize = nullptr;
+	decltype(&::DisplaySimpleToast) m_pDisplayToast = nullptr;
+};

Src/Update/DesktopToasts/DesktopToasts.rc

@@ -0,0 +1,61 @@
+// Microsoft Visual C++ generated resource script.
+//
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION _PRODUCT_VERSION
+ PRODUCTVERSION _PRODUCT_VERSION
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "CompanyName", "Open-Shell"
+            VALUE "FileDescription", "Desktop toast notifications support"
+            VALUE "FileVersion", _PRODUCT_VERSION_STR
+            VALUE "InternalName", "DesktopToasts.dll"
+            VALUE "LegalCopyright", "Copyright (C) 2020, The Open-Shell Team"
+            VALUE "OriginalFilename", "DesktopToasts.dll"
+            VALUE "ProductName", "Open-Shell"
+            VALUE "ProductVersion", _PRODUCT_VERSION_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////

Src/Update/DesktopToasts/DesktopToasts.vcxproj

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{d94bd2a6-1872-4f01-b911-f406603aa2e1}</ProjectGuid>
+    <RootNamespace>DesktopToasts</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\Version.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\Version.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>..\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;DESKTOPTOASTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>DesktopToasts.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;DESKTOPTOASTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>DesktopToasts.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="DesktopNotificationManagerCompat.h" />
+    <ClInclude Include="DesktopToasts.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="DesktopNotificationManagerCompat.cpp" />
+    <ClCompile Include="dllmain.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="DesktopToasts.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="DesktopToasts.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

Src/Update/DesktopToasts/DesktopToasts.vcxproj.filters

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="DesktopNotificationManagerCompat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DesktopToasts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DesktopNotificationManagerCompat.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="DesktopToasts.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="DesktopToasts.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

Src/Update/DesktopToasts/dllmain.cpp

@@ -0,0 +1,131 @@
+// dllmain.cpp : Defines the entry point for the DLL application.
+#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
+#include <windows.h>
+#include <NotificationActivationCallback.h>
+#include <windows.ui.notifications.h>
+#include <wrl/wrappers/corewrappers.h>
+
+#include "DesktopToasts.h"
+#include "DesktopNotificationManagerCompat.h"
+
+#define RETURN_IF_FAILED(hr) do { HRESULT _hrTemp = hr; if (FAILED(_hrTemp)) { return _hrTemp; } } while (false)
+
+using namespace ABI::Windows::Data::Xml::Dom;
+using namespace ABI::Windows::UI::Notifications;
+using namespace Microsoft::WRL;
+using namespace Microsoft::WRL::Wrappers;
+
+DesktopToastActivateHandler g_handler = nullptr;
+void* g_handlerContext = nullptr;
+
+class DECLSPEC_UUID("E407B70A-1FBD-4D5E-8822-231C69102472") NotificationActivator WrlSealed WrlFinal
+	: public RuntimeClass<RuntimeClassFlags<ClassicCom>, INotificationActivationCallback>
+{
+public:
+   virtual HRESULT STDMETHODCALLTYPE Activate(
+	   _In_ LPCWSTR appUserModelId,
+	   _In_ LPCWSTR invokedArgs,
+	   _In_reads_(dataCount) const NOTIFICATION_USER_INPUT_DATA * data,
+	   ULONG dataCount) override
+   {
+	   if (g_handler)
+		   g_handler(g_handlerContext, invokedArgs);
+
+	   return S_OK;
+   }
+};
+
+// Flag class as COM creatable
+CoCreatableClass(NotificationActivator);
+
+HRESULT Initialize(LPCWSTR appUserModelId, DesktopToastActivateHandler handler, void* handlerContext)
+{
+	RETURN_IF_FAILED(DesktopNotificationManagerCompat::RegisterAumidAndComServer(appUserModelId, __uuidof(NotificationActivator)));
+	RETURN_IF_FAILED(DesktopNotificationManagerCompat::RegisterActivator());
+	g_handler = handler;
+	g_handlerContext = handlerContext;
+
+	return S_OK;
+}
+
+HRESULT SetNodeValueString(HSTRING inputString, IXmlNode* node, IXmlDocument* xml)
+{
+	ComPtr<IXmlText> inputText;
+	RETURN_IF_FAILED(xml->CreateTextNode(inputString, &inputText));
+
+	ComPtr<IXmlNode> inputTextNode;
+	RETURN_IF_FAILED(inputText.As(&inputTextNode));
+
+	ComPtr<IXmlNode> appendedChild;
+	return node->AppendChild(inputTextNode.Get(), &appendedChild);
+}
+
+_Use_decl_annotations_
+HRESULT SetTextValues(const PCWSTR* textValues, UINT32 textValuesCount, IXmlDocument* toastXml)
+{
+	ComPtr<IXmlNodeList> nodeList;
+	RETURN_IF_FAILED(toastXml->GetElementsByTagName(HStringReference(L"text").Get(), &nodeList));
+
+	UINT32 nodeListLength;
+	RETURN_IF_FAILED(nodeList->get_Length(&nodeListLength));
+
+	// If a template was chosen with fewer text elements, also change the amount of strings
+	// passed to this method.
+	RETURN_IF_FAILED(textValuesCount <= nodeListLength ? S_OK : E_INVALIDARG);
+
+	for (UINT32 i = 0; i < textValuesCount; i++)
+	{
+		ComPtr<IXmlNode> textNode;
+		RETURN_IF_FAILED(nodeList->Item(i, &textNode));
+
+		RETURN_IF_FAILED(SetNodeValueString(HStringReference(textValues[i]).Get(), textNode.Get(), toastXml));
+	}
+
+	return S_OK;
+}
+
+HRESULT DisplaySimpleToast(LPCWSTR title, LPCWSTR text)
+{
+	// Construct XML
+	ComPtr<IXmlDocument> doc;
+	HRESULT hr = DesktopNotificationManagerCompat::CreateXmlDocumentFromString(L"<toast><visual><binding template='ToastGeneric'><text></text><text></text></binding></visual></toast>", &doc);
+	if (SUCCEEDED(hr))
+	{
+		PCWSTR textValues[] = { title, text };
+		SetTextValues(textValues, ARRAYSIZE(textValues), doc.Get());
+
+		// Create the notifier
+		// Classic Win32 apps MUST use the compat method to create the notifier
+		ComPtr<IToastNotifier> notifier;
+		hr = DesktopNotificationManagerCompat::CreateToastNotifier(&notifier);
+		if (SUCCEEDED(hr))
+		{
+			// Create the notification itself (using helper method from compat library)
+			ComPtr<IToastNotification> toast;
+			hr = DesktopNotificationManagerCompat::CreateToastNotification(doc.Get(), &toast);
+			if (SUCCEEDED(hr))
+			{
+				// And show it!
+				hr = notifier->Show(toast.Get());
+			}
+		}
+	}
+
+	return hr;
+}
+
+BOOL APIENTRY DllMain( HMODULE hModule,
+                       DWORD  ul_reason_for_call,
+                       LPVOID lpReserved
+                     )
+{
+    switch (ul_reason_for_call)
+    {
+    case DLL_PROCESS_ATTACH:
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+    case DLL_PROCESS_DETACH:
+        break;
+    }
+    return TRUE;
+}

Src/Update/Update.cpp

@@ -16,6 +16,7 @@
 #include "ResourceHelper.h"
 #include "Translations.h"
 #include <shlobj.h>
+#include "DesktopToasts/DesktopToasts.h"
 
 
 void ClosingSettings( HWND hWnd, int flags, int command )
@@ -59,11 +60,13 @@ static CSetting g_Settings[]={
 {L"Update",CSetting::TYPE_GROUP},
 	{L"Language",CSetting::TYPE_STRING,0,0,L"",CSetting::FLAG_SHARED},
 	{L"Update",CSetting::TYPE_BOOL,0,0,1,CSetting::FLAG_SHARED},
+	{L"Nightly",CSetting::TYPE_BOOL,0,0,0,CSetting::FLAG_SHARED},
 
 	{NULL}
 };
 
 const int SETTING_UPDATE=2;
+const int SETTING_NIGHTLY=3;
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -78,6 +81,7 @@ public:
 		MESSAGE_HANDLER( WM_GETMINMAXINFO, OnGetMinMaxInfo )
 		MESSAGE_HANDLER( WM_CTLCOLORSTATIC, OnColorStatic )
 		COMMAND_HANDLER( IDC_CHECKAUTOCHECK, BN_CLICKED, OnCheckAuto )
+		COMMAND_HANDLER( IDC_CHECKNIGHTLY, BN_CLICKED, OnCheckNightly )
 		COMMAND_HANDLER( IDC_BUTTONCHECKNOW, BN_CLICKED, OnCheckNow )
 		COMMAND_HANDLER( IDC_BUTTONDOWNLOAD, BN_CLICKED, OnDownload )
 		COMMAND_HANDLER( IDC_CHECKDONT, BN_CLICKED, OnDontRemind )
@@ -113,6 +117,7 @@ protected:
 	LRESULT OnCancel( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled );
 	LRESULT OnColorStatic( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled );
 	LRESULT OnCheckAuto( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled );
+	LRESULT OnCheckNightly( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled );
 	LRESULT OnCheckNow( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled );
 	LRESULT OnDownload( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled );
 	LRESULT OnDontRemind( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled );
@@ -160,6 +165,13 @@ LRESULT CUpdateDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
 	CheckDlgButton(IDC_CHECKAUTOCHECK,check?BST_CHECKED:BST_UNCHECKED);
 	GetDlgItem(IDC_CHECKAUTOCHECK).EnableWindow(!(g_Settings[SETTING_UPDATE].flags&CSetting::FLAG_LOCKED_MASK));
 	GetDlgItem(IDC_BUTTONCHECKNOW).EnableWindow(!(g_Settings[SETTING_UPDATE].flags&CSetting::FLAG_LOCKED_MASK) || check);
+
+	bool nightly = false;
+	if (g_Settings[SETTING_NIGHTLY].value.vt == VT_I4)
+		nightly = g_Settings[SETTING_NIGHTLY].value.intVal != 0;
+	CheckDlgButton(IDC_CHECKNIGHTLY, nightly ? BST_CHECKED : BST_UNCHECKED);
+	GetDlgItem(IDC_CHECKNIGHTLY).EnableWindow(!(g_Settings[SETTING_NIGHTLY].flags & CSetting::FLAG_LOCKED_MASK) && check);
+
 	UpdateUI();
 
 	return TRUE;
@@ -209,6 +221,17 @@ LRESULT CUpdateDlg::OnCheckAuto( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 	bool check=IsDlgButtonChecked(IDC_CHECKAUTOCHECK)==BST_CHECKED;
 	g_Settings[SETTING_UPDATE].value=CComVariant(check?1:0);
 	g_Settings[SETTING_UPDATE].flags&=~CSetting::FLAG_DEFAULT;
+	GetDlgItem(IDC_CHECKNIGHTLY).EnableWindow(check);
+	UpdateUI();
+	return 0;
+}
+
+LRESULT CUpdateDlg::OnCheckNightly(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+{
+	CSettingsLockWrite lock;
+	bool check = IsDlgButtonChecked(IDC_CHECKNIGHTLY) == BST_CHECKED;
+	g_Settings[SETTING_NIGHTLY].value = CComVariant(check ? 1 : 0);
+	g_Settings[SETTING_NIGHTLY].flags &= ~CSetting::FLAG_DEFAULT;
 	UpdateUI();
 	return 0;
 }
@@ -319,7 +342,7 @@ LRESULT CUpdateDlg::OnDontRemind( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL
 
 LRESULT CUpdateDlg::OnWeb( int idCtrl, LPNMHDR pnmh, BOOL& bHandled )
 {
-	ShellExecute(m_hWnd,NULL,L"https://github.com/Open-Shell/Open-Shell-Menu",NULL,NULL,SW_SHOWNORMAL);
+	ShellExecute(m_hWnd,NULL,L"https://open-shell.github.io/Open-Shell-Menu/",NULL,NULL,SW_SHOWNORMAL);
 	return 0;
 }
 
@@ -399,6 +422,9 @@ void CUpdateDlg::UpdateUI( void )
 
 void CUpdateDlg::Run( void )
 {
+	if (m_hWnd)
+		return;
+
 	DLGTEMPLATE *pTemplate=LoadDialogEx(IDD_UPDATE);
 	Create(NULL,pTemplate);
 	MSG msg;
@@ -457,15 +483,25 @@ protected:
 
 ///////////////////////////////////////////////////////////////////////////////
 
+class UpdateToasts : public DesktopToasts
+{
+public:
+	UpdateToasts() : DesktopToasts(L"OpenShell.Update") {}
+
+private:
+	void OnToastActivate(LPCWSTR invokedArgs) override
+	{
+		g_UpdateDlg.Run();
+	}
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
 int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine, int nCmdShow )
 {
 	INITCOMMONCONTROLSEX init={sizeof(init),ICC_STANDARD_CLASSES};
 	InitCommonControlsEx(&init);
-/*
-	VersionData data;
-	data.Load(L"D:\\Work\\OpenShell\\Setup\\Final\\update_4.0.4.ver",false);
-	return 0;
-*/
+
 	// prevent multiple instances from running on the same desktop
 	// the assumption is that multiple desktops for the same user will have different name (but may repeat across users)
 	wchar_t userName[256];
@@ -491,8 +527,6 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
 	CString language=GetSettingString(L"Language");
 	ParseTranslations(NULL,language);
 
-	g_Instance=hInstance;
-
 	HINSTANCE resInstance=LoadTranslationDll(language);
 
 	LoadTranslationResources(resInstance,g_LoadDialogs);
@@ -504,6 +538,9 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
 
 	COwnerWindow ownerWindow;
 	ownerWindow.Create(NULL,0,0,WS_POPUP);
+
+	UpdateToasts toasts;
+
 	if (wcsstr(lpstrCmdLine,L"-popup")!=NULL)
 	{
 		g_UpdateDlg.UpdateData();
@@ -511,57 +548,85 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
 		int sleep=5000-(timeGetTime()-time0);
 		if (sleep>0)
 			Sleep(sleep);
-		HWND balloon=CreateWindowEx(WS_EX_TOPMOST|WS_EX_TOOLWINDOW|(IsLanguageRTL()?WS_EX_LAYOUTRTL:0),TOOLTIPS_CLASS,NULL,WS_POPUP|TTS_CLOSE|TTS_NOPREFIX,0,0,0,0,NULL,NULL,g_Instance,NULL);
-		SendMessage(balloon,TTM_SETMAXTIPWIDTH,0,500);
-		TOOLINFO tool={sizeof(tool),TTF_ABSOLUTE|TTF_TRANSPARENT|TTF_TRACK|(IsLanguageRTL()?TTF_RTLREADING:0U)};
-		tool.uId=1;
-		CString message=LoadStringEx(g_UpdateDlg.HasNewLanguage()?IDS_LANG_NEWVERSION:IDS_NEWVERSION);
-		tool.lpszText=(wchar_t*)(const wchar_t*)message;
-		SendMessage(balloon,TTM_ADDTOOL,0,(LPARAM)&tool);
-		SendMessage(balloon,TTM_SETTITLE,(WPARAM)LoadIcon(g_Instance,MAKEINTRESOURCE(IDI_APPICON)),(LPARAM)(const wchar_t*)LoadStringEx(IDS_UPDATE_TITLE));
-		APPBARDATA appbar={sizeof(appbar)};
-		SHAppBarMessage(ABM_GETTASKBARPOS,&appbar);
-		MONITORINFO info={sizeof(info)};
-		GetMonitorInfo(MonitorFromWindow(appbar.hWnd,MONITOR_DEFAULTTOPRIMARY),&info);
-		SendMessage(balloon,TTM_TRACKPOSITION,0,0);
-		SendMessage(balloon,TTM_TRACKACTIVATE,TRUE,(LPARAM)&tool);
-		RECT rc;
-		GetWindowRect(balloon,&rc);
-		LONG pos;
-		if (appbar.uEdge==ABE_LEFT)
-			pos=MAKELONG(info.rcWork.left,info.rcWork.bottom-rc.bottom+rc.top);
-		else if (appbar.uEdge==ABE_RIGHT)
-			pos=MAKELONG(info.rcWork.right-rc.right+rc.left,info.rcWork.bottom-rc.bottom+rc.top);
-		else if (appbar.uEdge==ABE_TOP)
-			pos=MAKELONG(IsLanguageRTL()?info.rcWork.left:info.rcWork.right-rc.right+rc.left,info.rcWork.top);
-		else
-			pos=MAKELONG(IsLanguageRTL()?info.rcWork.left:info.rcWork.right-rc.right+rc.left,info.rcWork.bottom-rc.bottom+rc.top);
-		SendMessage(balloon,TTM_TRACKPOSITION,0,pos);
-		SetWindowSubclass(balloon,SubclassBalloonProc,0,'CLSH');
-		PlaySound(L"SystemNotification",NULL,SND_APPLICATION|SND_ALIAS|SND_ASYNC|SND_NODEFAULT|SND_SYSTEM);
-		int time0=timeGetTime();
-		while (IsWindowVisible(balloon))
+
+		auto title = LoadStringEx(IDS_UPDATE_TITLE);
+		auto message = LoadStringEx(g_UpdateDlg.HasNewLanguage() ? IDS_LANG_NEWVERSION : IDS_NEWVERSION);
+
+		if (toasts)
 		{
-			if (time0 && (timeGetTime()-time0)>=15000)
-			{
-				time0=0;
-				TOOLINFO tool={sizeof(tool)};
-				tool.uId=1;
-				SendMessage(balloon,TTM_TRACKACTIVATE,FALSE,(LPARAM)&tool);
-			}
-			MSG msg;
-			while (PeekMessage(&msg,0,0,0,PM_REMOVE))
-			{
-				TranslateMessage(&msg);
-				DispatchMessage(&msg);
-			}
-			Sleep(10);
+			toasts.DisplaySimpleToast(title, message);
 		}
+		else
+		{
+			HWND balloon = CreateWindowEx(WS_EX_TOPMOST | WS_EX_TOOLWINDOW | (IsLanguageRTL() ? WS_EX_LAYOUTRTL : 0), TOOLTIPS_CLASS, NULL, WS_POPUP | TTS_CLOSE | TTS_NOPREFIX, 0, 0, 0, 0, NULL, NULL, g_Instance, NULL);
+			SendMessage(balloon, TTM_SETMAXTIPWIDTH, 0, 500);
+			TOOLINFO tool = { sizeof(tool),TTF_ABSOLUTE | TTF_TRANSPARENT | TTF_TRACK | (IsLanguageRTL() ? TTF_RTLREADING : 0U) };
+			tool.uId = 1;
+			tool.lpszText = (wchar_t*)(const wchar_t*)message;
+			SendMessage(balloon, TTM_ADDTOOL, 0, (LPARAM)&tool);
+			SendMessage(balloon, TTM_SETTITLE, (WPARAM)LoadIcon(g_Instance, MAKEINTRESOURCE(IDI_APPICON)), (LPARAM)(const wchar_t*)title);
+			APPBARDATA appbar = { sizeof(appbar) };
+			SHAppBarMessage(ABM_GETTASKBARPOS, &appbar);
+			MONITORINFO info = { sizeof(info) };
+			GetMonitorInfo(MonitorFromWindow(appbar.hWnd, MONITOR_DEFAULTTOPRIMARY), &info);
+			SendMessage(balloon, TTM_TRACKPOSITION, 0, 0);
+			SendMessage(balloon, TTM_TRACKACTIVATE, TRUE, (LPARAM)&tool);
+			RECT rc;
+			GetWindowRect(balloon, &rc);
+			LONG pos;
+			if (appbar.uEdge == ABE_LEFT)
+				pos = MAKELONG(info.rcWork.left, info.rcWork.bottom - rc.bottom + rc.top);
+			else if (appbar.uEdge == ABE_RIGHT)
+				pos = MAKELONG(info.rcWork.right - rc.right + rc.left, info.rcWork.bottom - rc.bottom + rc.top);
+			else if (appbar.uEdge == ABE_TOP)
+				pos = MAKELONG(IsLanguageRTL() ? info.rcWork.left : info.rcWork.right - rc.right + rc.left, info.rcWork.top);
+			else
+				pos = MAKELONG(IsLanguageRTL() ? info.rcWork.left : info.rcWork.right - rc.right + rc.left, info.rcWork.bottom - rc.bottom + rc.top);
+			SendMessage(balloon, TTM_TRACKPOSITION, 0, pos);
+			SetWindowSubclass(balloon, SubclassBalloonProc, 0, 'CLSH');
+			PlaySound(L"SystemNotification", NULL, SND_APPLICATION | SND_ALIAS | SND_ASYNC | SND_NODEFAULT | SND_SYSTEM);
+			int time0 = timeGetTime();
+			while (IsWindowVisible(balloon))
+			{
+				if (time0 && (timeGetTime() - time0) >= 15000)
+				{
+					time0 = 0;
+					TOOLINFO tool = { sizeof(tool) };
+					tool.uId = 1;
+					SendMessage(balloon, TTM_TRACKACTIVATE, FALSE, (LPARAM)&tool);
+				}
+				MSG msg;
+				while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
+				{
+					TranslateMessage(&msg);
+					DispatchMessage(&msg);
+				}
+				Sleep(10);
+			}
+		}
+	}
+	else if (wcsstr(lpstrCmdLine, L"-ToastActivated"))
+	{
+		g_UpdateDlg.UpdateData();
+		// dialog will be shown once toast is activated (UpdateToasts::OnToastActivate)
 	}
 	else
 	{
 		g_UpdateDlg.Run();
 	}
+
+	// process messages for a while
+	for (int i = 0; i < 100; i++)
+	{
+		MSG msg;
+		while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
+		{
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+		}
+		Sleep(10);
+	}
+
 	ownerWindow.DestroyWindow();
 	CoUninitialize();
 	return 0;

Src/Update/Update.rc

@@ -123,22 +123,24 @@ END
 // Dialog
 //
 
-IDD_UPDATE DIALOGEX 0, 0, 316, 181
+IDD_UPDATE DIALOGEX 0, 0, 316, 200
 STYLE DS_SETFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Open-Shell Update"
 FONT 9, "Segoe UI", 400, 0, 0x0
 BEGIN
     CONTROL         "Automatically check for new versions",IDC_CHECKAUTOCHECK,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,129,10
-    PUSHBUTTON      "Check now",IDC_BUTTONCHECKNOW,7,17,50,14
-    LTEXT           "message",IDC_STATICLATEST,7,33,302,10,SS_CENTERIMAGE
-    EDITTEXT        IDC_EDITTEXT,7,45,302,97,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE | WS_VSCROLL
-    PUSHBUTTON      "Download",IDC_BUTTONDOWNLOAD,7,144,50,14,NOT WS_VISIBLE
+    CONTROL         "Check for nightly builds",IDC_CHECKNIGHTLY,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,19,151,10
+    PUSHBUTTON      "Check now",IDC_BUTTONCHECKNOW,7,34,50,14
+    LTEXT           "message",IDC_STATICLATEST,7,48,302,10,SS_CENTERIMAGE
+    EDITTEXT        IDC_EDITTEXT,7,60,302,97,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE | WS_VSCROLL
+    PUSHBUTTON      "Download",IDC_BUTTONDOWNLOAD,7,161,50,14,NOT WS_VISIBLE
     CONTROL         "Don't remind me again about this version",IDC_CHECKDONT,
-                    "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,61,144,141,14
-    CONTROL         "<a>https://github.com/Open-Shell/Open-Shell-Menu</a>",IDC_LINKWEB,"SysLink",WS_TABSTOP,7,164,66,10,WS_EX_TRANSPARENT
-    DEFPUSHBUTTON   "OK",IDOK,202,160,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,259,160,50,14
+                    "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,61,161,141,14
+    CONTROL         "<a>Open-Shell-Menu</a>",IDC_LINKWEB,"SysLink",WS_TABSTOP,7,181,66,10,WS_EX_TRANSPARENT
+    DEFPUSHBUTTON   "OK",IDOK,202,177,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,259,177,50,14
 END
 
 
@@ -155,7 +157,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 309
         TOPMARGIN, 7
-        BOTTOMMARGIN, 174
+        BOTTOMMARGIN, 191
     END
 END
 #endif    // APSTUDIO_INVOKED

Src/Update/Update.vcxproj

@@ -57,7 +57,6 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\Lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>

Src/Update/resource.h

@@ -9,6 +9,7 @@
 #define IDC_CHECKDONT                   1004
 #define IDC_BUTTONCHECKNOW              1005
 #define IDC_CHECKAUTOCHECK              1006
+#define IDC_CHECKNIGHTLY                1007
 #define IDD_UPDATE                      6001
 #define IDS_UPDATED                     6001
 #define IDS_OUTOFDATE                   6002
@@ -21,7 +22,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        227
+#define _APS_NEXT_RESOURCE_VALUE        228
 #define _APS_NEXT_COMMAND_VALUE         32769
 #define _APS_NEXT_CONTROL_VALUE         262
 #define _APS_NEXT_SYMED_VALUE           106

Src/Version.props

@@ -4,7 +4,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <!-- Default product version to use if CS_VERSION environment variable is not defined -->
-    <CS_VERSION Condition="'$(CS_VERSION)'==''">4.3.2</CS_VERSION>
+    <CS_VERSION Condition="'$(CS_VERSION)'==''">4.4.1000</CS_VERSION>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ResourceCompile>