Sign with SignPath

.github/workflows/build.yml

@@ -60,7 +60,6 @@ jobs:
         run: Src\Setup\BuildBinaries.bat
 
       - name: Upload binaries
-        if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' # Only manual master builds
         id: upload-binaries
         uses: actions/upload-artifact@v7
         with:
@@ -70,16 +69,14 @@ jobs:
             !Src/Setup/Output/*.skin
             !Src/Setup/Output/*.skin7
             !Src/Setup/Output/*.zip
-          retention-days: 1
 
       - name: Sign binaries with SignPath
-        if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' # Only manual master builds
         uses: signpath/github-action-submit-signing-request@v2
         with:
           api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
           organization-id: 'b34b60e3-e5bf-4a6e-a13c-dcf641b4362c'
           project-slug: 'Open-Shell-Menu'
-          signing-policy-slug: 'release-signing'
+          signing-policy-slug: 'test-signing'
           artifact-configuration-slug: 'Binaries'
           github-artifact-id: '${{ steps.upload-binaries.outputs.artifact-id }}'
           wait-for-completion: true
@@ -92,89 +89,59 @@ jobs:
         run: Src\Setup\_BuildEnglish.bat
 
       - name: Upload installers
-        if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' # Only manual master builds
         id: upload-installers
         uses: actions/upload-artifact@v7
         with:
           name: MSI
           path: |
             Src/Setup/Temp/*.msi
-          retention-days: 1
 
       - name: Sign installers with SignPath
-        if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' # Only manual master builds
         uses: signpath/github-action-submit-signing-request@v2
         with:
           api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
           organization-id: 'b34b60e3-e5bf-4a6e-a13c-dcf641b4362c'
           project-slug: 'Open-Shell-Menu'
-          signing-policy-slug: 'release-signing'
+          signing-policy-slug: 'test-signing'
           artifact-configuration-slug: 'Installers'
           github-artifact-id: '${{ steps.upload-installers.outputs.artifact-id }}'
           wait-for-completion: true
           output-artifact-directory: 'Src/Setup/Temp/'
 
-      - name: Build setup and symbols
+      - name: Build final
         shell: cmd
         env:
           CS_VERSION: ${{ steps.versioning.outputs.NEW_VERSION }}
         run: Src\Setup\BuildArchives.bat
 
-      - name: Upload symbols
+      - name: Upload final
+        id: upload-final
         uses: actions/upload-artifact@v7
         with:
+          name: Final
           path: |
-            Src/Setup/Final/OpenShellSymbols*.7z
+            Src/Setup/Final/
-          archive: false
+            !Src/Setup/Final/OpenShellLoc.zip
 
-      - name: Upload utility
+      - name: Sign final artifacts with SignPath
-        uses: actions/upload-artifact@v7
-        with:
-          path: |
-            Src/Setup/Final/Utility.exe
-          archive: false
-
-      - name: Upload setup
-        id: upload-setup
-        uses: actions/upload-artifact@v7
-        with:
-          path: |
-            Src/Setup/Final/OpenShellSetup*.exe
-          archive: false
-
-      - name: Sign setup with SignPath
-        if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' # Only manual master builds
         uses: signpath/github-action-submit-signing-request@v2
         with:
           api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
           organization-id: 'b34b60e3-e5bf-4a6e-a13c-dcf641b4362c'
           project-slug: 'Open-Shell-Menu'
-          signing-policy-slug: 'release-signing'
+          signing-policy-slug: 'test-signing'
-          github-artifact-id: '${{ steps.upload-setup.outputs.artifact-id }}'
+          artifact-configuration-slug: 'Final'
+          github-artifact-id: '${{ steps.upload-final.outputs.artifact-id }}'
           wait-for-completion: true
-          skip-decompress: true
           output-artifact-directory: 'Src/Setup/Final/'
 
-      # `overwrite: true` doesn't work with `archive: false`, so we have to delete the original first
+      - name: Upload final (signed)
-      # https://github.com/actions/upload-artifact/issues/769
-      # https://github.com/actions/upload-artifact/issues/785
-      - name: Delete temporary artifacts
-        if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' # Only manual master builds
-        uses: geekyeggo/delete-artifact@v6
-        with:
-          name: |
-            OpenShellSetup*.exe
-            Binaries
-            MSI
-
-      - name: Upload setup (signed)
-        if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' # Only manual master builds
         uses: actions/upload-artifact@v7
         with:
+          name: Final-signed
           path: |
-            Src/Setup/Final/OpenShellSetup*.exe
+            Src/Setup/Final/
-          archive: false
+            !Src/Setup/Final/OpenShellLoc.zip
-          overwrite: true
 
   release:
     if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' # Only manual master builds
@@ -183,29 +150,7 @@ jobs:
     permissions:
       contents: write # Elevate permissions ONLY for this job
     steps:
-      - name: Download setup
+      - name: Download artifacts
         uses: actions/download-artifact@v8
         with:
-          pattern: OpenShellSetup*.exe
+          name: OpenShell
-      - name: Download symbols
-        uses: actions/download-artifact@v8
-        with:
-          pattern: OpenShellSymbols*.7z
-      - name: Download utility
-        uses: actions/download-artifact@v8
-        with:
-          pattern: Utility.exe
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v3
-        with:
-          tag_name: v${{ needs.build.outputs.new_version }}
-          name: ${{ needs.build.outputs.new_version }}
-          generate_release_notes: true
-          prerelease: true
-          files: |
-            OpenShellSetup*.exe
-            OpenShellSymbols_*.7z
-            Utility.exe
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -29,9 +29,6 @@ You can find the latest stable version here:
 >
 > If you install older one on a Windows for ARM installation (ex. using Parallels Desktop on an Apple Silicon Mac), you will no longer be able to log into your account the next time you reboot. Please refrain from installing Open-Shell on Windows for ARM.
 
-### Code signing
-Free code signing provided by [SignPath.io](https://about.signpath.io/), certificate by [SignPath Foundation](https://signpath.org/)
-
 ### 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

Src/ClassicExplorer/ClassicExplorer.vcxproj

@@ -59,7 +59,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>

Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj

@@ -23,7 +23,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>

Src/ClassicIE/ClassicIE.vcxproj

@@ -47,7 +47,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>

Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj

@@ -59,7 +59,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>

Src/Common.props

@@ -34,7 +34,7 @@
       <WarningLevel>Level3</WarningLevel>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>

Src/Lib/Lib.vcxproj

@@ -43,7 +43,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>

Src/Setup/BuildArchives.bat

@@ -160,10 +160,10 @@ cd ..
 
 cd Setup
 
-copy /B Output\Utility.exe .\Final > nul
+copy /B ..\..\build\bin\Release\Utility.exe .\Final > nul
 
 if defined APPVEYOR (
-	appveyor PushArtifact Output\Utility.exe
+	appveyor PushArtifact ..\..\build\bin\Release\Utility.exe
 )
 
 exit /b 0

Src/Setup/BuildBinaries.bat

@@ -55,7 +55,6 @@ copy /B ..\..\build\bin\Setup\StartMenuHelper32.dll Output > nul
 copy /B ..\..\build\bin\Release\Update.exe Output > nul
 copy /B ..\..\build\bin\Release\DesktopToasts.dll Output > nul
 copy /B ..\..\build\bin\Release\SetupHelper.exe Output > nul
-copy /B ..\..\build\bin\Release\Utility.exe Output > nul
 
 copy /B ..\..\build\bin\SetupARM64\ClassicExplorer64.dll Output\ARM64 > nul
 copy /B ..\..\build\bin\SetupARM64\ClassicIEDLL_64.dll Output\ARM64 > nul

Src/Setup/Setup.vcxproj

@@ -19,7 +19,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
   </PropertyGroup>

Src/Setup/SetupHelper/SetupHelper.vcxproj

@@ -19,7 +19,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
   </PropertyGroup>

Src/Setup/Utility/Utility.vcxproj

@@ -35,7 +35,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>

Src/Setup/en-US/en-US.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/ClassicSkin/ClassicSkin.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/ClassicSkin7/ClassicSkin7.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/FullGlass/FullGlass.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/Immersive/Immersive.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/Immersive7/Immersive7.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/Metallic7/Metallic7.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/Metro/Metro.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/Metro7/Metro7.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/Midnight7/Midnight7.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/SmokedGlass/SmokedGlass.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/Win7Aero/Win7Aero.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/Win7Aero7/Win7Aero7.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/Win7Basic/Win7Basic.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/Win8/Win8.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/Win87/Win87.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/Skins/WinXP/WinXP.vcxproj

@@ -15,7 +15,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Src/StartMenu/StartMenu.vcxproj

@@ -47,7 +47,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>

Src/StartMenu/StartMenuDLL/MenuCommands.cpp

@@ -24,60 +24,6 @@
 #include <propvarutil.h>
 #include <algorithm>
 #include <propkey.h>
-#include <thread>
-
-// Execute function on a separate STA thread while pumping messages on caller thread.
-template <typename TFunc>
-static auto ExecuteOnSTAThread(TFunc&& func) -> decltype(func())
-{
-	using ReturnType = decltype(func());
-	ReturnType result{};
-
-	std::thread worker([&func, &result]() mutable {
-		CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
-		result = func();
-		CoUninitialize();
-	});
-
-	// Pump messages while waiting for the worker (dialog) to finish
-	while (true)
-	{
-		HANDLE hWorker = worker.native_handle();
-		if (MsgWaitForMultipleObjects(1, &hWorker, FALSE, INFINITE, QS_ALLINPUT) == WAIT_OBJECT_0)
-			break;
-
-		MSG msg;
-		while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
-		{
-			if (msg.message == WM_QUIT)
-			{
-				PostQuitMessage((int)msg.wParam);
-				break;
-			}
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
-		}
-	}
-	worker.join();
-
-	return result;
-}
-
-// Wrapper for IContextMenu::InvokeCommand that runs on separate STA thread and pumps messages
-static HRESULT InvokeCommandSafe(IContextMenu* pMenu, LPCMINVOKECOMMANDINFO pInfo)
-{
-	return ExecuteOnSTAThread([&]() {
-		return pMenu->InvokeCommand(pInfo);
-	});
-}
-
-// Wrapper for SHOpenFolderAndSelectItems that runs on separate STA thread and pumps messages
-static HRESULT SHOpenFolderAndSelectItemsSafe(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD dwFlags)
-{
-	return ExecuteOnSTAThread([=]() {
-		return SHOpenFolderAndSelectItems(pidlFolder, cidl, apidl, dwFlags);
-	});
-}
 
 static CString g_RenameText;
 static POINT g_RenamePos;
@@ -989,7 +935,7 @@ static bool ExecuteShutdownCommand(TMenuID menuCommand)
 		if (!ProceedWithShutdown(flags))
 			return true;
 
-		flags |= SHUTDOWN_FORCE_OTHERS | SHUTDOWN_ARSO;
+		flags |= SHUTDOWN_FORCE_OTHERS;
 
 		if (SetShutdownPrivileges())
 		{
@@ -1433,19 +1379,6 @@ static HRESULT CreatePinLink( PCIDLIST_ABSOLUTE sourcePidl, const wchar_t *name,
 	return S_OK;
 }
 
-static CString GetContextMenuItemVerb(IContextMenu* pContextMenu, UINT_PTR uId)
-{
-	wchar_t verbW[256] = {};
-	if (SUCCEEDED(pContextMenu->GetCommandString(uId, GCS_VERBW, nullptr, reinterpret_cast<char*>(verbW), sizeof(verbW))))
-		return CString(verbW);
-
-	char verbA[256] = {};
-	if (SUCCEEDED(pContextMenu->GetCommandString(uId, GCS_VERBA, nullptr, verbA, sizeof(verbA))))
-		return CString(verbA);
-
-	return {};
-}
-
 // This function "activates" an item. The item can be activated in multiple ways:
 // ACTIVATE_SELECT - select the item, make sure it is visible
 // ACTIVATE_OPEN - if the item is a submenu, it is opened. otherwise the item is just selected (but all submenus are closed first)
@@ -2938,7 +2871,7 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
 		}
 		else
 		{
-			SHOpenFolderAndSelectItemsSafe(pItemPidl1,0,NULL,0);
+			SHOpenFolderAndSelectItems(pItemPidl1,0,NULL,0);
 		}
 		res=0;
 	}
@@ -3180,14 +3113,7 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
 			}
 			else
 			{
-				HRESULT hr{};
+				HRESULT hr=pInvokeMenu->InvokeCommand((LPCMINVOKECOMMANDINFO)&info);
-				auto verb = GetContextMenuItemVerb(pInvokeMenu, (UINT_PTR)info.lpVerbW);
-				// if the verb is "properties", we need to invoke it directly in this UI thread (as it needs to be called on thread that crated context menu object),
-				// otherwise we will invoke the command on separate STA thread to make sure it won't block UI thread
-				if (verb.CompareNoCase(L"properties") == 0)
-					hr = pInvokeMenu->InvokeCommand((LPCMINVOKECOMMANDINFO)&info);
-				else
-					hr = InvokeCommandSafe(pInvokeMenu, (LPCMINVOKECOMMANDINFO)&info);
 				LOG_MENU(LOG_EXECUTE,L"Invoke command, ptr=%p, res=%d",this,hr);
 				executeSuccess=SUCCEEDED(hr);
 			}

Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp

@@ -22,7 +22,6 @@
 #include <dbghelp.h>
 #include <set>
 #include <Thumbcache.h>
-#include <tlhelp32.h>
 
 #define HOOK_DROPTARGET // define this to replace the IDropTarget of the start button
 #define START_TOUCH // touch support for the start button
@@ -2937,35 +2936,6 @@ static void OpenCortana( void )
 		ShellExecute(NULL,NULL,L"shell:::{2559a1f8-21d7-11d4-bdaf-00c04f60b9f0}",NULL,NULL,SW_SHOWNORMAL);
 }
 
-HMODULE GetModuleHandleByPrefix(const WCHAR* prefix)
-{
-	HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId());
-	if (snapshot == INVALID_HANDLE_VALUE)
-		return nullptr;
-
-	size_t prefixLength = wcslen(prefix);
-
-	MODULEENTRY32 me{};
-	me.dwSize = sizeof(me);
-
-	HMODULE result = nullptr;
-
-	if (Module32First(snapshot, &me))
-	{
-		do
-		{
-			if (_wcsnicmp(me.szModule, prefix, prefixLength) == 0)
-			{
-				result = reinterpret_cast<HMODULE>(me.modBaseAddr);
-				break;
-			}
-		} while (Module32Next(snapshot, &me));
-	}
-
-	CloseHandle(snapshot);
-	return result;
-}
-
 static void InitStartMenuDLL( void )
 {
 	static bool initCalled = false;
@@ -3009,7 +2979,10 @@ static void InitStartMenuDLL( void )
 		auto module=GetModuleHandle(L"taskbar.dll");
 		if (!module)
 		{
-			module = GetModuleHandleByPrefix(L"ep_taskbar");
+			module = GetModuleHandle(L"ep_taskbar.5.dll");
+			if (!module)
+				module = GetModuleHandle(L"ep_taskbar.2.dll");
+
 			if (module)
 				g_epTaskbar = true;
 		}

Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj

@@ -47,7 +47,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>

Src/StartMenu/StartMenuHelper/StartMenuHelper.vcxproj

@@ -59,7 +59,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>

Src/Update/DesktopToasts/DesktopToasts.vcxproj

@@ -20,7 +20,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
   </PropertyGroup>

Src/Update/Update.vcxproj

@@ -19,7 +19,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>