Isolate Win11 XAML TAP lifetime from StartMenuDLL

Author: YellowNest

Src/StartMenu/StartMenuDLL/Win11StartButton.cpp

@@ -5,6 +5,7 @@
 #include "resource.h"
 #include "StartMenuHelper_h.h"
 #include "dllmain.h"
+#include "Win11StartButtonTap.h"
 #include "ResourceHelper.h"
 #include "Settings.h"
 #include "StringUtils.h"
@@ -206,6 +207,11 @@ static void StartStartMenu( void )
 STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
 {
 	WaitDllInitThread();
+
+	HRESULT tapResult = GetWin11StartButtonTapClassObject(rclsid, riid, ppv);
+	if (tapResult != CLASS_E_CLASSNOTAVAILABLE)
+		return tapResult;
+
 	if (rclsid==g_EmulationClsid)
 	{
 		LogToFile(STARTUP_LOG,L"StartMenuHelper: DllGetClassObject1");

Src/StartMenu/StartMenuHelper/StartMenuHelper.cpp

@@ -109,6 +109,7 @@
     <ClCompile Include="ModernSettingsShellFolder.cpp" />
     <ClCompile Include="StartMenuExt.cpp" />
     <ClCompile Include="StartMenuHelper.cpp" />
+    <ClCompile Include="Win11StartButtonTap.cpp" />
     <ClCompile Include="StartMenuHelper_i.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
@@ -138,6 +139,7 @@
     <ClInclude Include="Resource.h" />
     <ClInclude Include="StartMenuExt.h" />
     <ClInclude Include="StartMenuHelper_h.h" />
+    <ClInclude Include="Win11StartButtonTap.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>

Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj

@@ -43,6 +43,9 @@
     <ClCompile Include="ModernSettingsContextMenu.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Win11StartButtonTap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Midl Include="StartMenuHelper.idl">
@@ -100,6 +103,9 @@
     <ClInclude Include="ModernSettingsContextMenu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Win11StartButtonTap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="StartMenuHelper.rc">

Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj.filters

@@ -8,3 +8,6 @@ EXPORTS
 	DllRegisterServer	PRIVATE
 	DllUnregisterServer	PRIVATE
 	DllInstall		PRIVATE
+	StartWin11StartButtonTap
+	UpdateWin11StartButtonTap
+	StopWin11StartButtonTap

Src/StartMenu/StartMenuHelper/StartMenuHelper32.def

@@ -8,3 +8,6 @@ EXPORTS
 	DllRegisterServer	PRIVATE
 	DllUnregisterServer	PRIVATE
 	DllInstall		PRIVATE
+	StartWin11StartButtonTap
+	UpdateWin11StartButtonTap
+	StopWin11StartButtonTap