Restore Explorer shell if setup leaves it stopped (#2552 )

Restore Explorer shell after successful setup
Fix false empty entry in custom submenus (#2551 )
2026-10-08 11:39:06 +11:00 · 2026-10-05 08:52:18 +02:00 · 2026-10-05 08:14:13 +02:00 · 2026-10-04 17:47:53 +02:00 · 2026-10-04 17:45:54 +02:00 · 2026-10-04 17:41:09 +02:00
59 changed files with 1036 additions and 218 deletions
@@ -0,0 +1,211 @@
+name: Build
+
+permissions:
+  contents: read # Default to secure
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'Src/**'
+      - 'Localization/**'
+      - '.github/workflows/build.yml'
+
+  workflow_dispatch:  # allows manual trigger for main/master
+
+jobs:
+  build:
+    runs-on: windows-2022
+    outputs:
+      new_version: ${{ steps.versioning.outputs.NEW_VERSION }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0 # Essential to see all tags
+
+      - name: Prepare version
+        id: versioning
+        shell: pwsh
+        run: |
+          # Fetch latest tag
+          $latestTag = git describe --tags --abbrev=0 2>$null
+
+          if ($latestTag -notmatch '^v\d+\.\d+\.\d+$') {
+            Write-Error "Error: Could not find a valid vX.Y.Z tag in history. Found: '$latestTag'"
+            exit 1
+          }
+          
+          # Parse and Increment
+          $version = [version]$latestTag.Substring(1)
+          $baseVersion = "$($version.Major).$($version.Minor).$($version.Build + 1)"
+
+          # Handle PR Suffix
+          if ("${{ github.event_name }}" -eq "pull_request") {
+            $shortSha = "${{ github.event.pull_request.head.sha }}".Substring(0, 7)
+            $finalVersion = "$baseVersion-pr-$shortSha"
+          } else {
+            $finalVersion = $baseVersion
+          }
+          
+          # Export
+          "NEW_VERSION=$finalVersion" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          Write-Host "Building version: $finalVersion"
+
+      - name: Build binaries
+        shell: cmd
+        env:
+          CS_VERSION: ${{ steps.versioning.outputs.NEW_VERSION }}
+        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:
+          name: Binaries
+          path: |
+            Src/Setup/Output/
+            !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'
+          artifact-configuration-slug: 'Binaries'
+          github-artifact-id: '${{ steps.upload-binaries.outputs.artifact-id }}'
+          wait-for-completion: true
+          output-artifact-directory: 'Src/Setup/Output/'
+
+      - name: Build installers
+        shell: cmd
+        env:
+          CS_VERSION: ${{ steps.versioning.outputs.NEW_VERSION }}
+        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'
+          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
+        shell: cmd
+        env:
+          CS_VERSION: ${{ steps.versioning.outputs.NEW_VERSION }}
+        run: Src\Setup\BuildArchives.bat
+
+      - name: Upload symbols
+        uses: actions/upload-artifact@v7
+        with:
+          path: |
+            Src/Setup/Final/OpenShellSymbols*.7z
+          archive: false
+
+      - name: Upload utility
+        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'
+          github-artifact-id: '${{ steps.upload-setup.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
+      # 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:
+          path: |
+            Src/Setup/Final/OpenShellSetup*.exe
+          archive: false
+          overwrite: true
+
+  release:
+    if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' # Only manual master builds
+    needs: build
+    runs-on: ubuntu-latest # Cheaper/faster than windows for just uploading
+    permissions:
+      contents: write # Elevate permissions ONLY for this job
+    steps:
+      - name: Download setup
+        uses: actions/download-artifact@v8
+        with:
+          pattern: OpenShellSetup*.exe
+      - 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 }}
@@ -7,7 +7,7 @@ A collection of utilities bringing back classic features to Windows.

 *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?style=flat-square)](https://github.com/Open-Shell/Open-Shell-Menu/releases/latest)&nbsp;&nbsp;[![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg?style=flat-square)](https://github.com/Open-Shell/Open-Shell-Menu/releases)&nbsp;&nbsp;[![Build status](https://img.shields.io/appveyor/build/passionate-coder/Open-Shell-Menu?logo=appveyor&style=flat-square)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master)&nbsp;&nbsp;[![GitQ](https://img.shields.io/badge/gitq-discussions-1577fa?style=flat-square)](https://gitq.com/passionate-coder/Classic-Start)&nbsp;&nbsp;[![Gitter chat](https://img.shields.io/gitter/room/badges/shields.svg?color=lightseagreen&logo=gitter&style=flat-square)](https://gitter.im/open-shell/Lobby)&nbsp;&nbsp;[![Discord](https://img.shields.io/discord/757701054782636082?color=mediumslateblue&label=Discord&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/7H6arr5)
+[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg?style=flat-square)](https://github.com/Open-Shell/Open-Shell-Menu/releases/latest)&nbsp;&nbsp;[![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg?style=flat-square)](https://github.com/Open-Shell/Open-Shell-Menu/releases)&nbsp;&nbsp;[![Build](https://github.com/Open-Shell/Open-Shell-Menu/actions/workflows/build.yml/badge.svg)](https://github.com/Open-Shell/Open-Shell-Menu/actions/workflows/build.yml)&nbsp;&nbsp;[![Build status](https://img.shields.io/appveyor/build/passionate-coder/Open-Shell-Menu?logo=appveyor&style=flat-square)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master)&nbsp;&nbsp;[![GitQ](https://img.shields.io/badge/gitq-discussions-1577fa?style=flat-square)](https://gitq.com/passionate-coder/Classic-Start)&nbsp;&nbsp;[![Gitter chat](https://img.shields.io/gitter/room/badges/shields.svg?color=lightseagreen&logo=gitter&style=flat-square)](https://gitter.im/open-shell/Lobby)&nbsp;&nbsp;[![Discord](https://img.shields.io/discord/757701054782636082?color=mediumslateblue&label=Discord&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/7H6arr5)

 [Open-Shell Homepage](https://open-shell.github.io/Open-Shell-Menu)  

@@ -29,6 +29,9 @@ 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
@@ -59,7 +59,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <UseOfAtl>Static</UseOfAtl>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
@@ -135,6 +135,8 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
 	FARPROC proc=GetProcAddress(dll,"ShowExplorerSettings");
 	if (!proc) return 2;

+	HRESULT comResult=CoInitialize(NULL);
 	proc();
+	if (SUCCEEDED(comResult)) CoUninitialize();
 	return 0;
 }
@@ -23,7 +23,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <UseOfAtl>Static</UseOfAtl>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
@@ -252,6 +252,8 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
 		return 0;
 	}

+	HRESULT comResult=CoInitialize(NULL);
 	ShowIESettings();
+	if (SUCCEEDED(comResult)) CoUninitialize();
 	return 0;
 }
@@ -47,7 +47,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <UseOfAtl>Static</UseOfAtl>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
@@ -59,7 +59,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <UseOfAtl>Static</UseOfAtl>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
@@ -34,7 +34,7 @@
      <WarningLevel>Level3</WarningLevel>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
    </ClCompile>
    <Midl>
      <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -70,7 +70,7 @@ BEGIN
    EDITTEXT        IDC_EDITSEARCH,22,7,120,12,ES_AUTOHSCROLL
    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         "",IDC_TABSETTINGS,"SysTabControl32",TCS_MULTILINE | WS_TABSTOP,7,20,367,169
    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
@@ -282,7 +282,9 @@ END

 STRINGTABLE 
 BEGIN
-    IDS_INITIATE_FAIL       "Failed to initiate the download."
+	IDS_SETTINGS_PAGES      "Settings pages"
+	IDS_SETTING_MODIFIED    "modified"
+	IDS_INITIATE_FAIL       "Failed to initiate the download."
    IDS_UPDATE_TITLE        "Open-Shell Update"
    IDS_INST_DOWNLOAD_FAIL  "Failed to download the new version."
    IDS_INST_SAVE_FAIL      "Failed to save file '%s'."
@@ -43,7 +43,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <UseOfAtl>Static</UseOfAtl>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
@@ -1110,6 +1110,7 @@ class CSettingsDlg: public CResizeableDlg<CSettingsDlg>
 public:
 	CSettingsDlg( void );
 	void Init( CSetting *pSettings, ICustomSettings *pCustom, int tab, const wchar_t* appId );
+	bool NavigateTab( bool bPrevious );

 	BEGIN_MSG_MAP( CSettingsDlg )
 		MESSAGE_HANDLER( WM_INITDIALOG, OnInitDialog )
@@ -1186,7 +1187,7 @@ private:
 	const wchar_t* m_AppId;

 	void AddTabs( int name, const CSetting *pSelect=NULL );
-	void SetCurTab( int index, bool bReset, const CSetting *pSelect=NULL );
+	void SetCurTab( int index, bool bReset, const CSetting *pSelect=NULL, bool bFocusPanel=true );
 	bool IsTabValid( void );
 	void StorePlacement( void );

@@ -1312,6 +1313,7 @@ LRESULT CSettingsDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 	icon=(HICON)LoadImage(GetModuleHandle(L"shell32.dll"),MAKEINTRESOURCE(323),IMAGE_ICON,GetSystemMetrics(SM_CXSMICON),GetSystemMetrics(SM_CYSMICON),LR_DEFAULTCOLOR);
 	SendDlgItemMessage(IDC_ICONSEARCH,STM_SETICON,(WPARAM)icon);
 	SendDlgItemMessage(IDC_EDITSEARCH,EM_SETCUEBANNER,FALSE,(LPARAM)(const wchar_t*)LoadStringEx(IDS_SEARCH_PROMPT));
+	SetControlAccessibleName(GetDlgItem(IDC_EDITSEARCH),LoadStringEx(IDS_SEARCH_PROMPT));
 	SetWindowSubclass(GetDlgItem(IDC_EDITSEARCH),SubclassSearchBoxProc,'CLSH',0);

 	CWindow tooltip;
@@ -1364,6 +1366,7 @@ LRESULT CSettingsDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam, BOO

 	SIZE maxSize={0,0};
 	m_Tabs=GetDlgItem(IDC_TABSETTINGS);
+	m_Tabs.SetWindowText(LoadStringEx(IDS_SETTINGS_PAGES));
 	m_Panel=NULL;
 	int idx=0;
 	for (const CSetting *pSetting=m_pSettings;pSetting->name;pSetting++)
@@ -1418,7 +1421,8 @@ LRESULT CSettingsDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 			ShowWindow(SW_MAXIMIZE);
 	}

-	return TRUE;
+	GetDlgItem(IDC_BUTTONBACKUP).SetFocus();
+	return FALSE;
 }

 LRESULT CSettingsDlg::OnDestroy( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled )
@@ -1477,6 +1481,14 @@ void CSettingsDlg::AddTabs( int name, const CSetting *pSelect )
 		if (pSetting->nameID==name)
 			idx=i;
 	}
+	int tabCount=TabCtrl_GetItemCount(m_Tabs);
+	LONG_PTR tabStyle=m_Tabs.GetWindowLongPtr(GWL_STYLE);
+	if (tabCount<=1)
+		tabStyle=(tabStyle&~WS_TABSTOP)|TCS_FOCUSNEVER;
+	else
+		tabStyle=(tabStyle|WS_TABSTOP)&~TCS_FOCUSNEVER;
+	m_Tabs.SetWindowLongPtr(GWL_STYLE,tabStyle);
+	m_Tabs.SetWindowPos(NULL,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER|SWP_NOACTIVATE|SWP_FRAMECHANGED);
 	m_Index=-1;
 	TabCtrl_SetCurSel(m_Tabs,idx);
 	m_Tabs.InvalidateRect(NULL);
@@ -1499,20 +1511,23 @@ LRESULT CSettingsDlg::OnKeyDown( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
 	if (wParam==VK_TAB && GetKeyState(VK_CONTROL)<0)
 	{
 		int sel=TabCtrl_GetCurSel(m_Tabs);
+		int count=TabCtrl_GetItemCount(m_Tabs);
 		if (GetKeyState(VK_SHIFT)<0)
 		{
-			if (sel>0)
+			if (count>0)
 			{
-				TabCtrl_SetCurSel(m_Tabs,sel-1);
-				SetCurTab(sel-1,false);
+				int next=(sel+count-1)%count;
+				TabCtrl_SetCurSel(m_Tabs,next);
+				SetCurTab(next,false);
 			}
 		}
 		else
 		{
-			if (sel<TabCtrl_GetItemCount(m_Tabs)-1)
+			if (count>0)
 			{
-				TabCtrl_SetCurSel(m_Tabs,sel+1);
-				SetCurTab(sel+1,false);
+				int next=(sel+1)%count;
+				TabCtrl_SetCurSel(m_Tabs,next);
+				SetCurTab(next,false);
 			}
 		}
 	}
@@ -1740,6 +1755,7 @@ LRESULT CSettingsDlg::OnCheckAll( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL
 	{
 		m_bBasic=bBasic;
 		AddTabs(-1);
+		::SetFocus(hWndCtl);
 	}
 	return 0;
 }
@@ -1758,7 +1774,7 @@ LRESULT CSettingsDlg::OnSearchChange( WORD wNotifyCode, WORD wID, HWND hWndCtl,
 	return 0;
 }

-void CSettingsDlg::SetCurTab( int index, bool bReset, const CSetting *pSelect )
+void CSettingsDlg::SetCurTab( int index, bool bReset, const CSetting *pSelect, bool bFocusPanel )
 {
 	if (m_Index==index && !bReset) return;
 	m_Index=index;
@@ -1778,12 +1794,59 @@ void CSettingsDlg::SetCurTab( int index, bool bReset, const CSetting *pSelect )
 	::MapWindowPoints(NULL,m_hWnd,(POINT*)&rc,2);
 	TabCtrl_AdjustRect(m_Tabs,FALSE,&rc);
 	HWND hwnd=pPanel->Activate(pGroup,rc,bReset);
+	CString pageTitle=LoadStringEx(pGroup->nameID);
+	::SetWindowText(hwnd,pageTitle);
 	if (hwnd!=m_Panel)
 	{
 		if (m_Panel) ::ShowWindow(m_Panel,SW_HIDE);
 		m_Panel=hwnd;
-		::SetFocus(m_Panel);
 	}
+	if (bFocusPanel) ::SetFocus(m_Panel);
+}
+
+bool CSettingsDlg::NavigateTab( bool bPrevious )
+{
+	HWND focus=::GetFocus();
+	HWND firstPanel=m_Panel?::GetNextDlgTabItem(m_Panel,NULL,FALSE):NULL;
+	HWND lastPanel=m_Panel?::GetNextDlgTabItem(m_Panel,NULL,TRUE):NULL;
+	HWND targets[]={
+		GetDlgItem(IDC_BUTTONBACKUP),
+		GetDlgItem(IDC_CHECKALL),
+		GetDlgItem(IDC_EDITSEARCH),
+		GetDlgItem(IDC_TABSETTINGS),
+		firstPanel,
+		GetDlgItem(IDOK),
+		GetDlgItem(IDCANCEL),
+		GetDlgItem(IDC_LINKHELP),
+		GetDlgItem(IDC_LINKWEB),
+	};
+
+	int current=-1;
+	if (m_Panel && (focus==m_Panel || ::IsChild(m_Panel,focus)))
+	{
+		HWND next=::GetNextDlgTabItem(m_Panel,focus,bPrevious);
+		HWND wrapped=bPrevious?lastPanel:firstPanel;
+		if (next && next!=wrapped)
+			return false; // Let IsDialogMessage move within the active page.
+		current=4;
+	}
+	else
+	{
+		for (int i=0;i<_countof(targets);i++)
+			if (focus==targets[i]) { current=i; break; }
+	}
+	if (current<0) return false;
+
+	for (int step=1;step<=_countof(targets);step++)
+	{
+		int index=(current+(bPrevious?-step:step)+_countof(targets)*2)%_countof(targets);
+		HWND target=(index==4 && bPrevious)?lastPanel:targets[index];
+		if (!target || !::IsWindowVisible(target) || !::IsWindowEnabled(target)) continue;
+		if (index==3 && !(::GetWindowLongPtr(target,GWL_STYLE)&WS_TABSTOP)) continue;
+		::SetFocus(target);
+		return true;
+	}
+	return false;
 }

 LRESULT CSettingsDlg::OnSelChanging( int idCtrl, LPNMHDR pnmh, BOOL& bHandled )
@@ -1793,7 +1856,9 @@ LRESULT CSettingsDlg::OnSelChanging( int idCtrl, LPNMHDR pnmh, BOOL& bHandled )

 LRESULT CSettingsDlg::OnSelChange( int idCtrl, LPNMHDR pnmh, BOOL& bHandled )
 {
-	SetCurTab(TabCtrl_GetCurSel(m_Tabs),false);
+	// Mouse clicks and Left/Right navigation keep focus on the tab strip.
+	// Ctrl+Tab is handled separately and moves focus into the new page.
+	SetCurTab(TabCtrl_GetCurSel(m_Tabs),false,NULL,false);
 	return 0;
 }

@@ -1926,6 +1991,11 @@ bool IsSettingsMessage( MSG *msg )
 		g_SettingsDlg.SendMessage(WM_KEYDOWN,VK_TAB,msg->lParam);
 		return true;
 	}
+	if (msg->message==WM_KEYDOWN && msg->wParam==VK_TAB)
+	{
+		if (g_SettingsDlg.NavigateTab(GetKeyState(VK_SHIFT)<0))
+			return true;
+	}
 	if (msg->message==WM_KEYDOWN && msg->wParam==VK_RETURN && GetKeyState(VK_CONTROL)<0)
 	{
 		g_SettingsDlg.SendMessage(WM_COMMAND,IDOK,0);
@@ -16,6 +16,183 @@
 #include <map>
 #include <algorithm>
 #include <thread>
+#include <oleacc.h>
+
+// Local constants avoid forcing every executable that links the Lib static
+// library to define the oleacc GUID symbols.
+static const GUID CLSID_SettingsAccPropServices={0xb5f8350b,0x0548,0x48b1,{0xa6,0xee,0x88,0xbd,0x00,0xb4,0xa5,0xe7}};
+static const GUID PROPID_SettingsAccState={0xa8d4d5b0,0x0a21,0x42d0,{0xa5,0xc0,0x51,0x4e,0x98,0x4f,0x45,0x7b}};
+static const GUID PROPID_SettingsAccName={0x608d3df8,0x8128,0x4aa7,{0xa4,0x28,0xf5,0x5e,0x49,0x26,0x72,0x91}};
+static const GUID PROPID_SettingsAccRole={0xcb905ff2,0x7bd1,0x4c05,{0xb3,0xc8,0xe6,0xc2,0x41,0x36,0x4d,0x70}};
+
+class CSettingsTreeAccServer: public IAccPropServer
+{
+public:
+	CSettingsTreeAccServer( void ): m_RefCount(1)
+	{
+		CoCreateInstance(CLSID_SettingsAccPropServices,NULL,CLSCTX_INPROC_SERVER,IID_PPV_ARGS(&m_Props));
+	}
+
+	virtual HRESULT STDMETHODCALLTYPE QueryInterface( REFIID iid, void **object )
+	{
+		if (!object) return E_POINTER;
+		*object=NULL;
+		if (iid==IID_IUnknown || iid==IID_IAccPropServer)
+		{
+			*object=static_cast<IAccPropServer*>(this);
+			AddRef();
+			return S_OK;
+		}
+		return E_NOINTERFACE;
+	}
+	virtual ULONG STDMETHODCALLTYPE AddRef( void ) { return InterlockedIncrement(&m_RefCount); }
+	virtual ULONG STDMETHODCALLTYPE Release( void )
+	{
+		ULONG count=InterlockedDecrement(&m_RefCount);
+		if (!count) delete this;
+		return count;
+	}
+	virtual HRESULT STDMETHODCALLTYPE GetPropValue( const BYTE *identity, DWORD identitySize, MSAAPROPID prop, VARIANT *value, BOOL *hasProp )
+	{
+		if (!value || !hasProp) return E_POINTER;
+		VariantInit(value);
+		*hasProp=FALSE;
+		if (!m_Props) return S_OK;
+
+		HWND tree=NULL;
+		DWORD objectId=0, childId=0;
+		if (FAILED(m_Props->DecomposeHwndIdentityString(identity,identitySize,&tree,&objectId,&childId)) || objectId!=OBJID_CLIENT || childId==CHILDID_SELF)
+			return S_OK;
+		HTREEITEM hItem=TreeView_MapAccIDToHTREEITEM(tree,childId);
+		if (!hItem) return S_OK;
+
+		wchar_t text[256];
+		TVITEM item={TVIF_IMAGE|TVIF_STATE|TVIF_TEXT,hItem,0,TVIS_SELECTED|TVIS_EXPANDED|TVIS_CUT,text,_countof(text)};
+		if (!TreeView_GetItem(tree,&item)) return S_OK;
+		if (prop==PROPID_SettingsAccRole)
+		{
+			if (item.iImage&SETTING_STATE_CHECKBOX)
+				value->lVal=ROLE_SYSTEM_CHECKBUTTON;
+			else if (item.iImage&SETTING_STATE_RADIO)
+				value->lVal=ROLE_SYSTEM_RADIOBUTTON;
+			else
+				return S_OK;
+			value->vt=VT_I4;
+			*hasProp=TRUE;
+			return S_OK;
+		}
+		if (prop==PROPID_SettingsAccName)
+		{
+			// A sighted user can see which child choice is checked without
+			// opening the group. Give screen-reader users the same summary.
+			for (HTREEITEM child=TreeView_GetChild(tree,hItem);child;child=TreeView_GetNextSibling(tree,child))
+			{
+				wchar_t childText[256];
+				TVITEM childItem={TVIF_IMAGE|TVIF_TEXT,child,0,0,childText,_countof(childText)};
+				if (TreeView_GetItem(tree,&childItem) && (childItem.iImage&SETTING_STATE_CHECKED))
+				{
+					CString name;
+					name.Format(L"%s: %s",text,childText);
+					value->vt=VT_BSTR;
+					value->bstrVal=SysAllocString(name);
+					if (!value->bstrVal) return E_OUTOFMEMORY;
+					*hasProp=TRUE;
+					return S_OK;
+				}
+			}
+			return S_OK;
+		}
+		if (prop!=PROPID_SettingsAccState) return S_OK;
+		LONG state=STATE_SYSTEM_SELECTABLE|STATE_SYSTEM_FOCUSABLE;
+		if (item.state&TVIS_SELECTED)
+		{
+			state|=STATE_SYSTEM_SELECTED;
+			if (GetFocus()==tree) state|=STATE_SYSTEM_FOCUSED;
+		}
+		if (TreeView_GetChild(tree,hItem))
+			state|=(item.state&TVIS_EXPANDED)?STATE_SYSTEM_EXPANDED:STATE_SYSTEM_COLLAPSED;
+		if (item.state&TVIS_CUT || (item.iImage&SETTING_STATE_DISABLED))
+			state|=STATE_SYSTEM_UNAVAILABLE;
+		if ((item.iImage&(SETTING_STATE_CHECKBOX|SETTING_STATE_RADIO)) && (item.iImage&SETTING_STATE_CHECKED))
+			state|=STATE_SYSTEM_CHECKED;
+		RECT rect;
+		if (!TreeView_GetItemRect(tree,hItem,&rect,FALSE))
+			state|=STATE_SYSTEM_INVISIBLE;
+
+		value->vt=VT_I4;
+		value->lVal=state;
+		*hasProp=TRUE;
+		return S_OK;
+	}
+
+private:
+	LONG m_RefCount;
+	CComPtr<IAccPropServices> m_Props;
+};
+
+void EnableSettingsTreeAccessibility( HWND tree )
+{
+	CComPtr<IAccPropServices> props;
+	if (FAILED(CoCreateInstance(CLSID_SettingsAccPropServices,NULL,CLSCTX_INPROC_SERVER,IID_PPV_ARGS(&props)))) return;
+	CSettingsTreeAccServer *server=new CSettingsTreeAccServer;
+	MSAAPROPID property=PROPID_SettingsAccState;
+	props->SetHwndPropServer(tree,OBJID_CLIENT,CHILDID_SELF,&property,1,server,ANNO_CONTAINER);
+	server->Release();
+}
+
+void ClearSettingsTreeItemAccessibility( HWND tree )
+{
+	CComPtr<IAccPropServices> props;
+	if (FAILED(CoCreateInstance(CLSID_SettingsAccPropServices,NULL,CLSCTX_INPROC_SERVER,IID_PPV_ARGS(&props)))) return;
+	MSAAPROPID properties[]={PROPID_SettingsAccState,PROPID_SettingsAccName,PROPID_SettingsAccRole};
+	for (HTREEITEM item=TreeView_GetRoot(tree);item;)
+	{
+		props->ClearHwndProps(tree,OBJID_CLIENT,TreeView_MapHTREEITEMToAccID(tree,item),properties,_countof(properties));
+		HTREEITEM next=TreeView_GetChild(tree,item);
+		if (!next)
+		{
+			next=TreeView_GetNextSibling(tree,item);
+			while (!next && (item=TreeView_GetParent(tree,item))!=NULL)
+				next=TreeView_GetNextSibling(tree,item);
+		}
+		item=next;
+	}
+}
+
+void SetControlAccessibleName( HWND control, const wchar_t *name )
+{
+	CComPtr<IAccPropServices> props;
+	if (SUCCEEDED(CoCreateInstance(CLSID_SettingsAccPropServices,NULL,CLSCTX_INPROC_SERVER,IID_PPV_ARGS(&props))))
+		props->SetHwndPropStr(control,OBJID_CLIENT,CHILDID_SELF,PROPID_SettingsAccName,name);
+}
+
+void SetSettingsTreeAccessibleName( HWND tree, const wchar_t *name )
+{
+	SetControlAccessibleName(tree,name);
+}
+
+void SetSettingsTreeItemAccessibleName( HWND tree, HTREEITEM item, const wchar_t *name )
+{
+	CComPtr<IAccPropServices> props;
+	if (SUCCEEDED(CoCreateInstance(CLSID_SettingsAccPropServices,NULL,CLSCTX_INPROC_SERVER,IID_PPV_ARGS(&props))))
+		props->SetHwndPropStr(tree,OBJID_CLIENT,TreeView_MapHTREEITEMToAccID(tree,item),PROPID_SettingsAccName,name);
+}
+
+void SetSettingsTreeItemAccessibleRole( HWND tree, HTREEITEM item, LONG role )
+{
+	CComPtr<IAccPropServices> props;
+	if (SUCCEEDED(CoCreateInstance(CLSID_SettingsAccPropServices,NULL,CLSCTX_INPROC_SERVER,IID_PPV_ARGS(&props))))
+	{
+		// Some settings hosts do not ask a container annotation server for
+		// descendant state. Bind the dynamic state provider to the item too.
+		CSettingsTreeAccServer *server=new CSettingsTreeAccServer;
+		MSAAPROPID stateProperty=PROPID_SettingsAccState;
+		props->SetHwndPropServer(tree,OBJID_CLIENT,TreeView_MapHTREEITEMToAccID(tree,item),&stateProperty,1,server,ANNO_THIS);
+		server->Release();
+		CComVariant value(role);
+		props->SetHwndProp(tree,OBJID_CLIENT,TreeView_MapHTREEITEMToAccID(tree,item),PROPID_SettingsAccRole,value);
+	}
+}

 const KNOWNFOLDERID FOLDERID_DesktopRoot={'DESK', 'TO', 'P', {'D', 'E', 'S', 'K', 'T', 'O', 'P', 0x00}};

@@ -2334,7 +2511,6 @@ public:
 		NOTIFY_HANDLER( IDC_SETTINGS, TVN_KEYDOWN, OnKeyDown )
 		NOTIFY_HANDLER( IDC_SETTINGS, TVN_GETINFOTIP, OnGetInfoTip )
 		NOTIFY_HANDLER( IDC_SETTINGS, TVN_SELCHANGED, OnSelChanged )
-		NOTIFY_HANDLER( IDC_SETTINGS, TVN_ITEMEXPANDING, OnExpanding )
 	END_MSG_MAP()

 	BEGIN_RESIZE_MAP
@@ -2364,7 +2540,6 @@ protected:
 	LRESULT OnClick( int idCtrl, LPNMHDR pnmh, BOOL& bHandled );
 	LRESULT OnGetInfoTip( int idCtrl, LPNMHDR pnmh, BOOL& bHandled );
 	LRESULT OnSelChanged( int idCtrl, LPNMHDR pnmh, BOOL& bHandled );
-	LRESULT OnExpanding( int idCtrl, LPNMHDR pnmh, BOOL& bHandled ) { return TRUE; } // prevent collapsing

 private:
 	CWindow m_Tree;
@@ -2398,6 +2573,32 @@ static LRESULT CALLBACK SubclassTreeProc( HWND hWnd, UINT uMsg, WPARAM wParam, L
 {
 	if (uMsg==WM_COMMAND)
 		return SendMessage(GetParent(hWnd),uMsg,wParam,lParam);
+	if (uMsg==WM_KEYDOWN && (wParam==VK_LEFT || wParam==VK_RIGHT) && GetKeyState(VK_MENU)>=0)
+	{
+		HTREEITEM item=TreeView_GetSelection(hWnd);
+		if (!item) return 0;
+		HTREEITEM child=TreeView_GetChild(hWnd,item);
+		TVITEM state={TVIF_STATE,item,0,TVIS_EXPANDED};
+		TreeView_GetItem(hWnd,&state);
+		if (wParam==VK_LEFT)
+		{
+			if (child && (state.state&TVIS_EXPANDED))
+				TreeView_Expand(hWnd,item,TVE_COLLAPSE);
+			else
+			{
+				HTREEITEM parent=TreeView_GetParent(hWnd,item);
+				if (parent) TreeView_SelectItem(hWnd,parent);
+			}
+		}
+		else if (child)
+		{
+			if (state.state&TVIS_EXPANDED)
+				TreeView_SelectItem(hWnd,child);
+			else
+				TreeView_Expand(hWnd,item,TVE_EXPAND);
+		}
+		return 0;
+	}
 	return DefSubclassProc(hWnd,uMsg,wParam,lParam);
 }

@@ -2534,6 +2735,16 @@ LRESULT CTreeSettingsDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam,
 		SetWindowTheme(m_Tree,L"Explorer",NULL);
 	}
 	m_Tree.SendMessage(TVM_SETEXTENDEDSTYLE,TVS_EX_DOUBLEBUFFER,TVS_EX_DOUBLEBUFFER);
+	EnableSettingsTreeAccessibility(m_Tree);
+	CString tip;
+	GetDlgItemText(IDC_STATICTIP,tip);
+	int line=tip.Find(L'\n');
+	if (line>=0)
+	{
+		tip=tip.Mid(line+1);
+		tip.Trim();
+		SetControlAccessibleName(GetDlgItem(IDC_STATICTIP),tip);
+	}
 	SetWindowSubclass(m_Tree,SubclassTreeProc,'CLSH',0);
 	HINSTANCE hInstance=_AtlBaseModule.GetResourceInstance();

@@ -3201,6 +3412,7 @@ void CTreeSettingsDlg::ItemSelected( HTREEITEM hItem, CSetting *pSetting, bool b
 	if (mode!=EDIT_NONE)
 	{
 		CString str=LoadStringEx(pSetting->nameID);
+		SetControlAccessibleName(m_EditBox,str);
 		TVITEM item={TVIF_TEXT,hItem,0,0,(LPWSTR)(LPCWSTR)str};
 		TreeView_SetItem(m_Tree,&item);
 		m_Tree.GetClientRect(&rc);
@@ -3242,6 +3454,12 @@ void CTreeSettingsDlg::ItemSelected( HTREEITEM hItem, CSetting *pSetting, bool b
 		m_EditBox.SetWindowPos(NULL,&rc,SWP_NOZORDER|SWP_SHOWWINDOW);
 		SendMessage(WM_NEXTDLGCTL,(LPARAM)m_EditBox.m_hWnd,TRUE);
 		SetWindowSubclass(m_EditBox,SubclassEditProc,'CLSH',(mode==EDIT_HOTKEY)?1:((mode==EDIT_HOTKEY_ANY)?2:0));
+		// The same overlay edit is reused while Up/Down moves through the
+		// tree. Its HWND and keyboard focus do not change, so explicitly
+		// announce that its accessible name has changed.
+		NotifyWinEvent(EVENT_OBJECT_NAMECHANGE,m_EditBox,OBJID_CLIENT,CHILDID_SELF);
+		if (::GetFocus()==m_EditBox)
+			NotifyWinEvent(EVENT_OBJECT_FOCUS,m_EditBox,OBJID_CLIENT,CHILDID_SELF);
 	}
 	else
 		m_EditBox.ShowWindow(SW_HIDE);
@@ -3385,11 +3603,14 @@ HTREEITEM CTreeSettingsDlg::FindSettingsItem( const wchar_t *name )

 void CTreeSettingsDlg::SetGroup( CSetting *pGroup, const CString &filter, const CSetting *pSelect )
 {
+	CString groupName=LoadStringEx(pGroup->nameID);
+	SetSettingsTreeAccessibleName(m_Tree,groupName);
 	ItemSelected(NULL,NULL,false);
 	m_pGroup=pGroup;
 	// fill tree control
 	m_Tree.SendMessage(WM_SETREDRAW,FALSE);
 	TreeView_SelectItem(m_Tree,NULL);
+	ClearSettingsTreeItemAccessibility(m_Tree);
 	TreeView_DeleteAllItems(m_Tree);
 	int level=0;
 	HTREEITEM hRadioParent=NULL;
@@ -3566,9 +3787,14 @@ void CTreeSettingsDlg::UpdateGroup( const CSetting *pModified )
 			RECT rc;
 			TreeView_GetItemRect(m_Tree,hItem,&rc,FALSE);
 			m_Tree.InvalidateRect(&rc);
+			NotifyWinEvent(EVENT_OBJECT_STATECHANGE,m_Tree,OBJID_CLIENT,TreeView_MapHTREEITEMToAccID(m_Tree,hItem));
 		}
+		if (pSetting->type==CSetting::TYPE_BOOL)
+			SetSettingsTreeItemAccessibleRole(m_Tree,hItem,ROLE_SYSTEM_CHECKBUTTON);

 		// update radio buttons
+		wchar_t selectedText[256];
+		selectedText[0]=0;
 		if (pSetting->type==CSetting::TYPE_INT && pSetting[1].type==CSetting::TYPE_RADIO)
 		{
 			int val=0;
@@ -3598,9 +3824,37 @@ void CTreeSettingsDlg::UpdateGroup( const CSetting *pModified )
 					RECT rc;
 					TreeView_GetItemRect(m_Tree,hRadio,&rc,FALSE);
 					m_Tree.InvalidateRect(&rc);
+					NotifyWinEvent(EVENT_OBJECT_STATECHANGE,m_Tree,OBJID_CLIENT,TreeView_MapHTREEITEMToAccID(m_Tree,hRadio));
 				}
+				SetSettingsTreeItemAccessibleRole(m_Tree,hRadio,ROLE_SYSTEM_RADIOBUTTON);
+			}
+			for (HTREEITEM hRadio=TreeView_GetChild(m_Tree,hItem);hRadio;hRadio=TreeView_GetNextSibling(m_Tree,hRadio))
+			{
+				TVITEM radioName={TVIF_IMAGE|TVIF_TEXT,hRadio,0,0,selectedText,_countof(selectedText)};
+				if (TreeView_GetItem(m_Tree,&radioName) && (radioName.iImage&SETTING_STATE_CHECKED)) break;
+				selectedText[0]=0;
 			}
 		}
+
+		// Bold is the visual indication that a setting differs from its
+		// default. Expose the same information in the accessible name.
+		wchar_t parentText[256];
+		TVITEM parentName={TVIF_TEXT,hItem,0,0,parentText,_countof(parentText)};
+		TreeView_GetItem(m_Tree,&parentName);
+		CString accessibleName=parentText;
+		if (selectedText[0])
+		{
+			accessibleName+=L": ";
+			accessibleName+=selectedText;
+		}
+		if (!bDefault)
+		{
+			accessibleName+=L", ";
+			accessibleName+=LoadStringEx(IDS_SETTING_MODIFIED);
+		}
+		SetSettingsTreeItemAccessibleName(m_Tree,hItem,accessibleName);
+		if (pSetting==pModified)
+			NotifyWinEvent(EVENT_OBJECT_NAMECHANGE,m_Tree,OBJID_CLIENT,TreeView_MapHTREEITEMToAccID(m_Tree,hItem));
 	}
 }

@@ -14,6 +14,16 @@ class CSettingsTree;
 class ISettingsPanel;
 struct CSetting;

+// Adds the checked/unchecked and unavailable states used by the settings
+// trees to their MSAA/UIA representation. The visual state remains provided
+// by Open-Shell's existing image list.
+void EnableSettingsTreeAccessibility( HWND tree );
+void ClearSettingsTreeItemAccessibility( HWND tree );
+void SetControlAccessibleName( HWND control, const wchar_t *name );
+void SetSettingsTreeAccessibleName( HWND tree, const wchar_t *name );
+void SetSettingsTreeItemAccessibleName( HWND tree, HTREEITEM item, const wchar_t *name );
+void SetSettingsTreeItemAccessibleRole( HWND tree, HTREEITEM item, LONG role );
+
 ///////////////////////////////////////////////////////////////////////////////

 // CResizeableDlg - a dialog that rearranges its controls when it gets resized
@@ -139,6 +139,8 @@
 #define IDS_BMP_FILTERS2                4077
 #define IDS_UNSAVED_CHANGES             4078
 #define IDS_UNSAVED_TITLE               4079
+#define IDS_SETTINGS_PAGES              4080
+#define IDS_SETTING_MODIFIED            4081

 // Next default values for new objects
 // 
@@ -1,5 +1,145 @@
+@echo off
+set PATH=C:\Program Files\7-Zip\;%PATH%
+cd %~dp0
+
+call _Version.bat
+
+REM ********* Build MSI Checksums
+echo --- MSI Checksums
+..\..\build\bin\Release\Utility.exe crcmsi Temp
+@if ERRORLEVEL 1 exit /b 1
+
+REM ********* Build bootstrapper
+echo --- Bootstrapper
+for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do set MSBuildDir=%%i\MSBuild\Current\Bin\
+
+"%MSBuildDir%MSBuild.exe" Setup.sln /m /t:Rebuild /p:Configuration="Release" /p:Platform="Win32" /verbosity:quiet /nologo
+@if ERRORLEVEL 1 exit /b 1
+
+
+if exist Final rd /Q /S Final
+md Final
+
+copy /B ..\..\build\bin\Release\Setup.exe Final\OpenShellSetup_%CS_VERSION_STR%.exe > nul
+
+if defined APPVEYOR (
+	appveyor PushArtifact Final\OpenShellSetup_%CS_VERSION_STR%.exe
+)
+
 REM ***** Collect PDBs

+REM ********* Collect debug info
+md Output\PDB32
+md Output\PDB64
+md Output\PDBARM64
+
+REM Explorer 32
+copy /B ..\..\build\bin\Setup\ClassicExplorer32.pdb Output\PDB32 > nul
+copy /B Output\ClassicExplorer32.dll Output\PDB32 > nul
+copy /B ..\..\build\bin\Setup\ClassicExplorerSettings.pdb Output\PDB32 > nul
+copy /B Output\ClassicExplorerSettings.exe Output\PDB32 > nul
+
+REM Explorer 64
+copy /B ..\..\build\bin\Setup64\ClassicExplorer64.pdb Output\PDB64 > nul
+copy /B Output\x64\ClassicExplorer64.dll Output\PDB64 > nul
+
+REM Explorer ARM64
+copy /B ..\..\build\bin\SetupARM64\ClassicExplorer64.pdb Output\PDBARM64 > nul
+copy /B Output\ARM64\ClassicExplorer64.dll Output\PDBARM64 > nul
+
+REM IE 32
+copy /B ..\..\build\bin\Setup\ClassicIEDLL_32.pdb Output\PDB32 > nul
+copy /B Output\ClassicIEDLL_32.dll Output\PDB32 > nul
+copy /B ..\..\build\bin\Setup\ClassicIE_32.pdb Output\PDB32 > nul
+copy /B Output\ClassicIE_32.exe Output\PDB32 > nul
+
+REM IE 64
+copy /B ..\..\build\bin\Setup64\ClassicIEDLL_64.pdb Output\PDB64 > nul
+copy /B Output\x64\ClassicIEDLL_64.dll Output\PDB64 > nul
+copy /B ..\..\build\bin\Setup64\ClassicIE_64.pdb Output\PDB64 > nul
+copy /B Output\x64\ClassicIE_64.exe Output\PDB64 > nul
+
+REM IE ARM64
+copy /B ..\..\build\bin\SetupARM64\ClassicIEDLL_64.pdb Output\PDBARM64 > nul
+copy /B Output\ARM64\ClassicIEDLL_64.dll Output\PDBARM64 > nul
+copy /B ..\..\build\bin\SetupARM64\ClassicIE_64.pdb Output\PDBARM64 > nul
+copy /B Output\ARM64\ClassicIE_64.exe Output\PDBARM64 > nul
+
+REM Menu 32
+copy /B ..\..\build\bin\Setup\StartMenu.pdb Output\PDB32 > nul
+copy /B Output\StartMenu.exe Output\PDB32 > nul
+copy /B ..\..\build\bin\Setup\StartMenuDLL.pdb Output\PDB32 > nul
+copy /B Output\StartMenuDLL.dll Output\PDB32 > nul
+copy /B ..\..\build\bin\Setup\StartMenuHelper32.pdb Output\PDB32 > nul
+copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul
+copy /B ..\..\build\bin\Release\Update.pdb Output\PDB32 > nul
+copy /B Output\Update.exe Output\PDB32 > nul
+copy /B ..\..\build\bin\Release\DesktopToasts.pdb Output\PDB32 > nul
+copy /B Output\DesktopToasts.dll Output\PDB32 > nul
+
+REM Menu 64
+copy /B ..\..\build\bin\Setup64\StartMenu.pdb Output\PDB64 > nul
+copy /B Output\x64\StartMenu.exe Output\PDB64 > nul
+copy /B ..\..\build\bin\Setup64\StartMenuDLL.pdb Output\PDB64 > nul
+copy /B Output\x64\StartMenuDLL.dll Output\PDB64 > nul
+copy /B ..\..\build\bin\Setup64\StartMenuHelper64.pdb Output\PDB64 > nul
+copy /B Output\x64\StartMenuHelper64.dll Output\PDB64 > nul
+
+REM Menu ARM64
+copy /B ..\..\build\bin\SetupARM64\StartMenu.pdb Output\PDBARM64 > nul
+copy /B Output\ARM64\StartMenu.exe Output\PDBARM64 > nul
+copy /B ..\..\build\bin\SetupARM64\StartMenuDLL.pdb Output\PDBARM64 > nul
+copy /B Output\ARM64\StartMenuDLL.dll Output\PDBARM64 > nul
+copy /B ..\..\build\bin\SetupARM64\StartMenuHelper64.pdb Output\PDBARM64 > nul
+copy /B Output\ARM64\StartMenuHelper64.dll Output\PDBARM64 > nul
+
+REM ********* Source Index PDBs
+
+set PDBSTR_PATH="C:\Program Files (x86)\Windows Kits\10\Debuggers\x86\srcsrv\pdbstr.exe"
+
+if exist %PDBSTR_PATH% (
+	echo --- Adding source index to PDBs
+	call CreateSourceIndex.bat ..\.. > Output\pdbstr.txt
+
+	for %%f in (Output\PDB32\*.pdb) do (
+		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
+		if not ERRORLEVEL 0 (
+			echo Error adding source index to PDB
+			exit /b 1
+		)
+	)
+
+	for %%f in (Output\PDB64\*.pdb) do (
+		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
+		if not ERRORLEVEL 0 (
+			echo Error adding source index to PDB
+			exit /b 1
+		)
+	)
+
+	for %%f in (Output\PDBARM64\*.pdb) do (
+		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
+		if not ERRORLEVEL 0 (
+			echo Error adding source index to PDB
+			exit /b 1
+		)
+	)
+)
+
+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
+%SYMSTORE_PATH% add /r /f Output\PDBARM64 /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
+rd /Q /S Output\PDBARM64
+
 echo -- Creating symbols package
 set CS_SYMBOLS_NAME=OpenShellSymbols_%CS_VERSION_STR%.7z

@@ -20,8 +160,10 @@ cd ..

 cd Setup

+copy /B Output\Utility.exe .\Final > nul
+
 if defined APPVEYOR (
-	appveyor PushArtifact ..\..\build\bin\Release\Utility.exe
+	appveyor PushArtifact Output\Utility.exe
 )

 exit /b 0
@@ -1,3 +1,8 @@
+@echo off
+cd %~dp0
+
+call _Version.bat
+
 if exist Output rd /Q /S Output
 md Output
 md Output\x64
@@ -50,6 +55,7 @@ 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
@@ -82,119 +88,6 @@ copy /B "..\..\build\bin\Skins\Metallic.skin7" Output > nul
 copy /B "..\..\build\bin\Skins\Immersive.skin" Output > nul
 copy /B "..\..\build\bin\Skins\Immersive.skin7" Output > nul

-
-REM ********* Collect debug info
-md Output\PDB32
-md Output\PDB64
-md Output\PDBARM64
-
-REM Explorer 32
-copy /B ..\..\build\bin\Setup\ClassicExplorer32.pdb Output\PDB32 > nul
-copy /B Output\ClassicExplorer32.dll Output\PDB32 > nul
-copy /B ..\..\build\bin\Setup\ClassicExplorerSettings.pdb Output\PDB32 > nul
-copy /B Output\ClassicExplorerSettings.exe Output\PDB32 > nul
-
-REM Explorer 64
-copy /B ..\..\build\bin\Setup64\ClassicExplorer64.pdb Output\PDB64 > nul
-copy /B Output\x64\ClassicExplorer64.dll Output\PDB64 > nul
-
-REM Explorer ARM64
-copy /B ..\..\build\bin\SetupARM64\ClassicExplorer64.pdb Output\PDBARM64 > nul
-copy /B Output\ARM64\ClassicExplorer64.dll Output\PDBARM64 > nul
-
-REM IE 32
-copy /B ..\..\build\bin\Setup\ClassicIEDLL_32.pdb Output\PDB32 > nul
-copy /B Output\ClassicIEDLL_32.dll Output\PDB32 > nul
-copy /B ..\..\build\bin\Setup\ClassicIE_32.pdb Output\PDB32 > nul
-copy /B Output\ClassicIE_32.exe Output\PDB32 > nul
-
-REM IE 64
-copy /B ..\..\build\bin\Setup64\ClassicIEDLL_64.pdb Output\PDB64 > nul
-copy /B Output\x64\ClassicIEDLL_64.dll Output\PDB64 > nul
-copy /B ..\..\build\bin\Setup64\ClassicIE_64.pdb Output\PDB64 > nul
-copy /B Output\x64\ClassicIE_64.exe Output\PDB64 > nul
-
-REM IE ARM64
-copy /B ..\..\build\bin\SetupARM64\ClassicIEDLL_64.pdb Output\PDBARM64 > nul
-copy /B Output\ARM64\ClassicIEDLL_64.dll Output\PDBARM64 > nul
-copy /B ..\..\build\bin\SetupARM64\ClassicIE_64.pdb Output\PDBARM64 > nul
-copy /B Output\ARM64\ClassicIE_64.exe Output\PDBARM64 > nul
-
-REM Menu 32
-copy /B ..\..\build\bin\Setup\StartMenu.pdb Output\PDB32 > nul
-copy /B Output\StartMenu.exe Output\PDB32 > nul
-copy /B ..\..\build\bin\Setup\StartMenuDLL.pdb Output\PDB32 > nul
-copy /B Output\StartMenuDLL.dll Output\PDB32 > nul
-copy /B ..\..\build\bin\Setup\StartMenuHelper32.pdb Output\PDB32 > nul
-copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul
-copy /B ..\..\build\bin\Release\Update.pdb Output\PDB32 > nul
-copy /B Output\Update.exe Output\PDB32 > nul
-copy /B ..\..\build\bin\Release\DesktopToasts.pdb Output\PDB32 > nul
-copy /B Output\DesktopToasts.dll Output\PDB32 > nul
-
-REM Menu 64
-copy /B ..\..\build\bin\Setup64\StartMenu.pdb Output\PDB64 > nul
-copy /B Output\x64\StartMenu.exe Output\PDB64 > nul
-copy /B ..\..\build\bin\Setup64\StartMenuDLL.pdb Output\PDB64 > nul
-copy /B Output\x64\StartMenuDLL.dll Output\PDB64 > nul
-copy /B ..\..\build\bin\Setup64\StartMenuHelper64.pdb Output\PDB64 > nul
-copy /B Output\x64\StartMenuHelper64.dll Output\PDB64 > nul
-
-REM Menu ARM64
-copy /B ..\..\build\bin\SetupARM64\StartMenu.pdb Output\PDBARM64 > nul
-copy /B Output\ARM64\StartMenu.exe Output\PDBARM64 > nul
-copy /B ..\..\build\bin\SetupARM64\StartMenuDLL.pdb Output\PDBARM64 > nul
-copy /B Output\ARM64\StartMenuDLL.dll Output\PDBARM64 > nul
-copy /B ..\..\build\bin\SetupARM64\StartMenuHelper64.pdb Output\PDBARM64 > nul
-copy /B Output\ARM64\StartMenuHelper64.dll Output\PDBARM64 > nul
-
-REM ********* Source Index PDBs
-
-set PDBSTR_PATH="C:\Program Files (x86)\Windows Kits\10\Debuggers\x86\srcsrv\pdbstr.exe"
-
-if exist %PDBSTR_PATH% (
-	echo --- Adding source index to PDBs
-	call CreateSourceIndex.bat ..\.. > Output\pdbstr.txt
-
-	for %%f in (Output\PDB32\*.pdb) do (
-		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
-		if not ERRORLEVEL 0 (
-			echo Error adding source index to PDB
-			exit /b 1
-		)
-	)
-
-	for %%f in (Output\PDB64\*.pdb) do (
-		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
-		if not ERRORLEVEL 0 (
-			echo Error adding source index to PDB
-			exit /b 1
-		)
-	)
-
-	for %%f in (Output\PDBARM64\*.pdb) do (
-		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
-		if not ERRORLEVEL 0 (
-			echo Error adding source index to PDB
-			exit /b 1
-		)
-	)
-)
-
-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
-%SYMSTORE_PATH% add /r /f Output\PDBARM64 /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
-rd /Q /S Output\PDBARM64
-
 REM ********* Build ADMX
 echo --- ADMX
 if exist Output\PolicyDefinitions.zip (
@@ -209,7 +102,7 @@ cd ..\Localization\English
@if ERRORLEVEL 1 exit /b 1
 md en-US
 copy /B *.adml en-US > nul
-7z a ..\..\Setup\Output\PolicyDefinitions.zip *.admx en-US\*.adml PolicyDefinitions.rtf > nul
+tar -a -c -f ..\..\Setup\Output\PolicyDefinitions.zip *.admx en-US\*.adml PolicyDefinitions.rtf
 rd /Q /S en-US
 cd ..\..\Setup

@@ -1,3 +1,9 @@
+@echo off
+set PATH=C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\WiX Toolset v3.14\bin\;%PATH%
+cd %~dp0
+
+call _Version.bat
+
 REM ********* Build Help
 echo -- Building Installer (%CS_LANG_NAME_SHORT%)
@setlocal EnableDelayedExpansion
@@ -22,9 +28,6 @@ echo -- Building Installer (%CS_LANG_NAME_SHORT%)
@if _%CS_LANG_NAME%==_ echo Unrecognized language '%CS_LANG_FOLDER%'
@if _%CS_LANG_NAME%==_ exit /b 1

-SET CS_INSTALLER_NAME=OpenShellSetup_%CS_VERSION_STR%-%CS_LANG_NAME_SHORT%
-if %CS_LANG_NAME_SHORT%==en SET CS_INSTALLER_NAME=OpenShellSetup_%CS_VERSION_STR%
-
 if exist Temp rd /Q /S Temp
 md Temp

@@ -66,27 +69,6 @@ candle Setup.wxs -nologo -out Temp\SetupARM64.wixobj -ext WixUIExtension -ext Wi
 light Temp\SetupARM64.wixobj -nologo -out Temp\SetupARM64.msi -ext WixUIExtension -ext WixUtilExtension -loc ..\Localization\%CS_LANG_FOLDER%\OpenShellText-%CS_LANG_NAME%.wxl -loc ..\Localization\%CS_LANG_FOLDER%\WixUI_%CS_LANG_NAME%.wxl -sice:ICE38 -sice:ICE43 -sice:ICE09
@if ERRORLEVEL 1 exit /b 1

-REM ********* Build MSI Checksums
-echo --- MSI Checksums
-..\..\build\bin\Release\Utility.exe crcmsi Temp
-@if ERRORLEVEL 1 exit /b 1
-
-REM ********* Build bootstrapper
-echo --- Bootstrapper
-for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do set MSBuildDir=%%i\MSBuild\Current\Bin\
-
-"%MSBuildDir%MSBuild.exe" Setup.sln /m /t:Rebuild /p:Configuration="Release" /p:Platform="Win32" /verbosity:quiet /nologo
-@if ERRORLEVEL 1 exit /b 1
-
-if exist Final rd /Q /S Final
-md Final
-
-copy /B ..\..\build\bin\Release\Setup.exe Final\%CS_INSTALLER_NAME%.exe > nul
-
-if defined APPVEYOR (
-	appveyor PushArtifact Final\%CS_INSTALLER_NAME%.exe
-)
-
 SET CS_LANG_FOLDER=
 SET CS_LANG_NAME=
 SET CS_LANG_NAME_SHORT=
@@ -12,8 +12,8 @@ set SRC_ROOT=%~fdp1

 rem get repo url
 for /f %%A in ('git remote get-url origin') do set REPO_URL=%%A
-rem remove .git from the end
-set REPO_URL=%REPO_URL:~0,-4%
+rem remove eventual .git from the end
+if /I "%REPO_URL:~-4%"==".git" set "REPO_URL=%REPO_URL:~0,-4%"

 rem get actual commit id
 for /f %%A in ('git rev-parse HEAD') do set COMMIT=%%A
@@ -47,6 +47,69 @@ struct Chunk
 	int start1, start2, len;
 };

+static bool IsExplorerShellRunning( void )
+{
+	HWND shellWindow=GetShellWindow();
+	if (!shellWindow)
+		return false;
+
+	DWORD shellProcessId=0;
+	GetWindowThreadProcessId(shellWindow,&shellProcessId);
+	if (!shellProcessId)
+		return false;
+
+	DWORD currentSession=0;
+	DWORD shellSession=0;
+	if (!ProcessIdToSessionId(GetCurrentProcessId(),&currentSession) ||
+		!ProcessIdToSessionId(shellProcessId,&shellSession) ||
+		currentSession!=shellSession)
+	{
+		return false;
+	}
+
+	HANDLE process=OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION,FALSE,shellProcessId);
+	if (!process)
+		return false;
+
+	wchar_t path[_MAX_PATH];
+	DWORD pathSize=_countof(path);
+	bool isExplorer=false;
+	if (QueryFullProcessImageName(process,0,path,&pathSize))
+		isExplorer=_wcsicmp(PathFindFileName(path),L"explorer.exe")==0;
+
+	CloseHandle(process);
+	return isExplorer;
+}
+
+static void RestoreExplorerShellIfNeeded( bool wasRunning )
+{
+	if (!wasRunning)
+		return;
+
+	// Restart Manager normally brings Explorer back before msiexec exits.
+	// Give it a short grace period before applying our fallback so we don't
+	// race a normal restart or create an extra Explorer process.
+	for (int i=0;i<50;i++)
+	{
+		if (IsExplorerShellRunning())
+			return;
+		Sleep(100);
+	}
+
+	wchar_t explorerPath[_MAX_PATH];
+	UINT len=GetWindowsDirectory(explorerPath,_countof(explorerPath));
+	if (!len || len>=_countof(explorerPath) || !PathAppend(explorerPath,L"explorer.exe"))
+		return;
+
+	STARTUPINFO startupInfo={sizeof(startupInfo)};
+	PROCESS_INFORMATION processInfo={};
+	if (CreateProcess(explorerPath,NULL,NULL,NULL,FALSE,0,NULL,NULL,&startupInfo,&processInfo))
+	{
+		CloseHandle(processInfo.hThread);
+		CloseHandle(processInfo.hProcess);
+	}
+}
+
 static void WriteFileXOR( HANDLE hFile, const unsigned char *buf, int size )
 {
 	if (size>0)
@@ -409,6 +472,11 @@ int APIENTRY wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCm
 	if (extractType == ARM64)
 		Wow64DisableWow64FsRedirection(&wow64FsRedirVal);

+	// Remember whether this interactive session had the Explorer desktop shell.
+	// If Restart Manager closes it during MSI processing but fails to bring it
+	// back, restore only the shell that was present before setup started.
+	const bool explorerWasRunning=IsExplorerShellRunning();
+
 	// start the installer
 	STARTUPINFO startupInfo={sizeof(startupInfo)};
 	PROCESS_INFORMATION processInfo;
@@ -438,6 +506,12 @@ int APIENTRY wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCm
 		GetExitCodeProcess(processInfo.hProcess,&code);
 		CloseHandle(processInfo.hProcess);
 		DeleteFile(msiName);
+
+		// Only repair the shell after a successful transaction. Reboot-required
+		// outcomes deliberately keep Windows Installer in control of recovery.
+		if (code==ERROR_SUCCESS)
+			RestoreExplorerShellIfNeeded(explorerWasRunning);
+
 		return code;
 	}
 }
@@ -19,7 +19,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
  </PropertyGroup>
@@ -19,7 +19,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
  </PropertyGroup>
@@ -30,17 +30,17 @@
 #ifdef SAFE_MODE
 #define RegDeleteTree2(x,y) 5
 #define RegDeleteValue2(x,y) 5
-#define DeleteFile2(x) (SetLastError(3), FALSE)
+#define DeleteFile3(x) (SetLastError(3), FALSE)
 #define MoveFileEx2(x,y,z) (SetLastError(5), FALSE)
 #define SHFileOperation2(x) 0x78
-#define RemoveDirectory2(x) FALSE
+#define RemoveDirectory3(x) FALSE
 #else
 #define RegDeleteTree2(x,y) RegDeleteTree(x,y)
 #define RegDeleteValue2(x,y) RegDeleteValue(x,y)
-#define DeleteFile2(x) DeleteFile(x)
+#define DeleteFile3(x) DeleteFile(x)
 #define MoveFileEx2(x,y,z) MoveFileEx(x,y,z)
 #define SHFileOperation2(x) SHFileOperation(x)
-#define RemoveDirectory2(x) RemoveDirectory(x)
+#define RemoveDirectory3(x) RemoveDirectory(x)
 #endif

 // files to delete from the Open-Shell folder
@@ -777,7 +777,7 @@ static bool DeleteFileEx( const wchar_t *fname, bool bAllowDelay )
 		if (attribs&FILE_ATTRIBUTE_READONLY)
 			SetFileAttributes(fname,attribs&~FILE_ATTRIBUTE_READONLY);
 		LogMessage(-1,L"Deleting file %s",fname);
-		if (!DeleteFile2(fname))
+		if (!DeleteFile3(fname))
 		{
 			int error=GetLastError();
 			if (error==ERROR_ACCESS_DENIED && bAllowDelay)
@@ -826,7 +826,7 @@ static void DeleteDirectoryEx( const wchar_t *path, bool bDelay )
 	else
 	{
 		LogMessage(-1,L"Deleting directory %s",path);
-		if (!RemoveDirectory2(path))
+		if (!RemoveDirectory3(path))
 		{
 			int error=GetLastError();
 			bool bOldHasErrors=g_bHasErrors;
@@ -35,7 +35,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <UseOfAtl>Static</UseOfAtl>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
@@ -1,3 +1,6 @@
+@echo off
+cd %~dp0
+
 SET CS_LANG_FOLDER=English
 SET CS_LANG_NAME=en-US
 SET CS_LANG_NAME_SHORT=en
@@ -0,0 +1,9 @@
+@echo off
+
+rem Convert . to _
+set CS_VERSION_STR=%CS_VERSION:.=_%
+
+set CS_VERSION_ORIG=%CS_VERSION%
+
+rem Strip optional "-xyz" suffix from version
+for /f "delims=- tokens=1,1" %%i in ("%CS_VERSION%") do set CS_VERSION=%%i
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -15,7 +15,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -47,7 +47,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <UseOfAtl>Static</UseOfAtl>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
@@ -53,7 +53,14 @@ HRESULT STDMETHODCALLTYPE CMenuAccessible::get_accName( VARIANT varChild, BSTR *
 	if (!m_pOwner) return RPC_E_DISCONNECTED;
 	*pszName=NULL;
 	if (varChild.vt!=VT_I4) return S_FALSE;
-	if (varChild.lVal==CHILDID_SELF) return S_FALSE;
+	if (varChild.lVal==CHILDID_SELF)
+	{
+		if (m_pOwner->m_pParent && m_pOwner->m_ParentIndex>=0 && m_pOwner->m_ParentIndex<(int)m_pOwner->m_pParent->m_Items.size())
+			*pszName=SysAllocString(m_pOwner->m_pParent->m_Items[m_pOwner->m_ParentIndex].name);
+		else
+			*pszName=SysAllocString(L"Start");
+		return *pszName?S_OK:E_OUTOFMEMORY;
+	}
 	int index=varChild.lVal-1;
 	if (index<0 || index>=(int)m_pOwner->m_Items.size()) return S_FALSE;
 	if (m_pOwner->m_Items[index].id==MENU_SEPARATOR) return S_FALSE;
@@ -105,7 +112,10 @@ HRESULT STDMETHODCALLTYPE CMenuAccessible::get_accState( VARIANT varChild, VARIA
 		if (m_pOwner->m_HotItem==index)
 			flags|=STATE_SYSTEM_FOCUSED;
 		if (item.bFolder)
+		{
 			flags|=STATE_SYSTEM_HASPOPUP;
+			flags|=(m_pOwner->m_Submenu==index)?STATE_SYSTEM_EXPANDED:STATE_SYSTEM_COLLAPSED;
+		}
 		if (item.id==MENU_SEPARATOR)
 			flags=0;
 		RECT rc;
@@ -167,7 +177,12 @@ HRESULT STDMETHODCALLTYPE CMenuAccessible::get_accDefaultAction( VARIANT varChil
 		return S_FALSE;
 	const CMenuContainer::MenuItem &item=m_pOwner->m_Items[index];
 	if (item.id!=MENU_SEPARATOR && item.id!=MENU_EMPTY && item.id!=MENU_EMPTY_TOP)
-		*pszDefaultAction=SysAllocString(item.bFolder?FindTranslation(L"Menu.ActionOpen",L"Open"):FindTranslation(L"Menu.ActionExecute",L"Execute"));
+	{
+		if (item.bFolder)
+			*pszDefaultAction=SysAllocString(m_pOwner->m_Submenu==index?FindTranslation(L"Menu.ActionClose",L"Close"):FindTranslation(L"Menu.ActionOpen",L"Open"));
+		else
+			*pszDefaultAction=SysAllocString(FindTranslation(L"Menu.ActionExecute",L"Execute"));
+	}
 	return S_OK;
 }

@@ -3337,19 +3337,19 @@ void CItemManager::LoadCacheFile( void )
 				info.iconColor=data.iconColor;
 				info.iconIndex=data.iconIndex;

-				info.smallIcon=data.smallIcon<(int)remapIcons.size()?remapIcons[data.smallIcon]:NULL;
+				info.smallIcon=data.smallIcon>=0 && (size_t)data.smallIcon<remapIcons.size()?remapIcons[data.smallIcon]:NULL;
 				if (!info.smallIcon)
 				{
 					info.validFlags&=~INFO_SMALL_ICON;
 					info.smallIcon=m_DefaultSmallIcon;
 				}
-				info.largeIcon=data.largeIcon<(int)remapIcons.size()?remapIcons[data.largeIcon]:NULL;
+				info.largeIcon=data.largeIcon>=0 && (size_t)data.largeIcon<remapIcons.size()?remapIcons[data.largeIcon]:NULL;
 				if (!info.largeIcon)
 				{
 					info.validFlags&=~INFO_LARGE_ICON;
 					info.largeIcon=m_DefaultLargeIcon;
 				}
-				info.extraLargeIcon=data.extraLargeIcon<(int)remapIcons.size()?remapIcons[data.extraLargeIcon]:NULL;
+				info.extraLargeIcon=data.extraLargeIcon>=0 && (size_t)data.extraLargeIcon<remapIcons.size()?remapIcons[data.extraLargeIcon]:NULL;
 				if (!info.extraLargeIcon)
 				{
 					info.validFlags&=~INFO_EXTRA_LARGE_ICON;
@@ -3422,7 +3422,7 @@ DWORD CALLBACK CItemManager::SaveCacheFileThread( void *param )
 		RWLock lock(pThis,false,RWLOCK_ICONS);
 		for (std::multimap<unsigned int,IconInfo>::const_iterator it=pThis->m_IconInfos.begin();it!=pThis->m_IconInfos.end();++it)
 		{
-			if (!it->second.PATH.IsEmpty() && it->second.PATH[1]!='#' && it->first!=0)
+			if (!it->second.bTemp && !it->second.bMetro && !it->second.PATH.IsEmpty() && it->second.PATH[1]!='#' && it->first!=0)
 				iconInfos.push_back(&*it);
 		}
 	}
@@ -3433,7 +3433,7 @@ DWORD CALLBACK CItemManager::SaveCacheFileThread( void *param )
 		RWLock lock(pThis,false,RWLOCK_ITEMS);
 		for (std::multimap<unsigned int,ItemInfo>::const_iterator it=pThis->m_ItemInfos.begin();it!=pThis->m_ItemInfos.end();++it)
 		{
-			if (it->first!=0)
+			if (!it->second.bTemp && it->first!=0)
 				itemInfos.push_back(&*it);
 		}
 		for (std::set<unsigned int>::const_iterator it=pThis->m_BlackListInfos10.begin();it!=pThis->m_BlackListInfos10.end();++it)
@@ -3566,6 +3566,15 @@ void CItemManager::SaveCacheFile( void )

 void CItemManager::ClearCache( void )
 {
+	// The save thread keeps pointers to persistent cache entries while serializing them.
+	// Let it finish before clearing the containers those pointers refer to.
+	if (m_SaveCacheThread)
+	{
+		WaitForSingleObject(m_SaveCacheThread,INFINITE);
+		CloseHandle(m_SaveCacheThread);
+		m_SaveCacheThread=NULL;
+	}
+
 	Lock cleanupLock(this,LOCK_CLEANUP);
 	RWLock itemLock(this,true,RWLOCK_ITEMS);
 	RWLock iconLock(this,true,RWLOCK_ICONS);
@@ -383,7 +383,7 @@ private:
 	static DWORD CALLBACK StaticRefreshInfoThread( void *param );
 	static DWORD CALLBACK SaveCacheFileThread( void *param );

-	// all paths are in caps and end with \ 
+	// all paths are in caps and end with backslash
 	CString m_RootStartMenu1;
 	CString m_RootStartMenu2;
 	CString m_RootStartMenu3;
@@ -24,6 +24,52 @@
 #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 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;
@@ -935,7 +981,7 @@ static bool ExecuteShutdownCommand(TMenuID menuCommand)
 		if (!ProceedWithShutdown(flags))
 			return true;

-		flags |= SHUTDOWN_FORCE_OTHERS;
+		flags |= SHUTDOWN_FORCE_OTHERS | SHUTDOWN_ARSO;

 		if (SetShutdownPrivileges())
 		{
@@ -1379,6 +1425,19 @@ 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)
@@ -2871,7 +2930,7 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
 		}
 		else
 		{
-			SHOpenFolderAndSelectItems(pItemPidl1,0,NULL,0);
+			SHOpenFolderAndSelectItemsSafe(pItemPidl1,0,NULL,0);
 		}
 		res=0;
 	}
@@ -3113,7 +3172,15 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
 			}
 			else
 			{
-				HRESULT hr=pInvokeMenu->InvokeCommand((LPCMINVOKECOMMANDINFO)&info);
+				HRESULT hr{};
+				auto verb = GetContextMenuItemVerb(pInvokeMenu, (UINT_PTR)info.lpVerbW);
+				// "opencontaining" may block the UI thread on recent Windows 11 versions.
+				// Use the shell API on a worker STA for that operation, without passing
+				// the apartment-bound IContextMenu interface to another thread.
+				if (verb.CompareNoCase(L"opencontaining") == 0)
+					hr = SHOpenFolderAndSelectItemsSafe(pItemPidl1, 0, NULL, 0);
+				else
+					hr = pInvokeMenu->InvokeCommand((LPCMINVOKECOMMANDINFO)&info);
 				LOG_MENU(LOG_EXECUTE,L"Invoke command, ptr=%p, res=%d",this,hr);
 				executeSuccess=SUCCEEDED(hr);
 			}
@@ -2537,10 +2537,11 @@ void CMenuContainer::InitItems( void )
 			}
 	}

-	if (m_Items.empty() && m_Path1[0] && m_pDropFolder[0])
+	if (!m_bSubMenu && m_Items.empty() && m_Path1[0] && m_pDropFolder[0])
 	{
-		// add (Empty) item to the empty submenus
-		MenuItem item(m_bSubMenu?MENU_EMPTY:MENU_EMPTY_TOP);
+		// Keep the top-level drop target placeholder. Submenus defer their
+		// empty-state decision until after custom/standard items are appended.
+		MenuItem item(MENU_EMPTY_TOP);
 		item.name=FindTranslation(L"Menu.Empty",L"(Empty)");
 		m_Items.push_back(item);
 	}
@@ -207,6 +207,10 @@ LRESULT CSkinSettingsDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam,
 	EnableThemeDialogTexture(m_hWnd,ETDT_ENABLETAB);

 	m_Tree=GetDlgItem(IDC_SKINOPTIONS);
+	EnableSettingsTreeAccessibility(m_Tree);
+	CString optionsName;
+	GetDlgItemText(IDC_STATICOPT,optionsName);
+	SetSettingsTreeAccessibleName(m_Tree,optionsName);
 	SetWindowSubclass(m_Tree,SubclassTreeProc,'CLSH',0);
 	TreeView_SetImageList(m_Tree,GetSettingsImageList(m_Tree),TVSIL_NORMAL);
 	m_Tree.SendMessage(TVM_SETEXTENDEDSTYLE,TVS_EX_DOUBLEBUFFER,TVS_EX_DOUBLEBUFFER);
@@ -290,6 +294,7 @@ LRESULT CSkinSettingsDlg::OnDestroy( UINT uMsg, WPARAM wParam, LPARAM lParam, BO
 void CSkinSettingsDlg::InitSkinUI( void )
 {
 	m_Tree.SetRedraw(FALSE);
+	ClearSettingsTreeItemAccessibility(m_Tree);
 	TreeView_DeleteAllItems(m_Tree);
 	m_VariationIndex=-1;
 	m_EditItemIndex=-1;
@@ -396,10 +401,12 @@ void CSkinSettingsDlg::UpdateSkinSettings( void )
 			{
 				item.iImage=item.iSelectedImage=image;
 				TreeView_SetItem(m_Tree,&item);
+				NotifyWinEvent(EVENT_OBJECT_STATECHANGE,m_Tree,OBJID_CLIENT,TreeView_MapHTREEITEMToAccID(m_Tree,hVar));
 				RECT rc;
 				TreeView_GetItemRect(m_Tree,hVar,&rc,FALSE);
 				m_Tree.InvalidateRect(&rc);
 			}
+			SetSettingsTreeItemAccessibleRole(m_Tree,hVar,ROLE_SYSTEM_RADIOBUTTON);
 		}
 		hItem=TreeView_GetNextSibling(m_Tree,hItem);
 	}
@@ -442,6 +449,8 @@ void CSkinSettingsDlg::UpdateSkinSettings( void )
 			item.iImage=item.iSelectedImage=image;
 			item.mask|=TVIF_TEXT;
 			TreeView_SetItem(m_Tree,&item);
+			NotifyWinEvent(EVENT_OBJECT_STATECHANGE,m_Tree,OBJID_CLIENT,TreeView_MapHTREEITEMToAccID(m_Tree,hItem));
+			SetSettingsTreeItemAccessibleRole(m_Tree,hItem,option.groupId>=0?ROLE_SYSTEM_RADIOBUTTON:ROLE_SYSTEM_CHECKBUTTON);
 			item.mask&=~TVIF_TEXT;
 			RECT rc;
 			TreeView_GetItemRect(m_Tree,hItem,&rc,FALSE);
@@ -4456,6 +4465,7 @@ CSetting g_Settings[]={
 		{L"CustomButton",CSetting::TYPE_RADIO,IDS_CUSTOM_BUTTON,IDS_CUSTOM_BUTTON_TIP},
 	{L"StartButtonPath",CSetting::TYPE_BITMAP,IDS_BUTTON_IMAGE,IDS_BUTTON_IMAGE_TIP,L"",0,L"#StartButtonType=2",L"CustomButton"},
 	{L"StartButtonSize",CSetting::TYPE_INT,IDS_BUTTON_SIZE,IDS_BUTTON_SIZE_TIP2,0,0,L"#StartButtonType=2",L"CustomButton"},
+	{L"StartButtonOffset",CSetting::TYPE_INT,IDS_BUTTON_OFFSET,IDS_BUTTON_OFFSET_TIP,0,0,L"#StartButtonType=2",L"CustomButton"},
 	{L"StartButtonAlign",CSetting::TYPE_BOOL,IDS_BUTTON_ALIGN,IDS_BUTTON_ALIGN_TIP,0,0,L"#StartButtonType=2",L"CustomButton"},
 	{L"StartButtonIcon",CSetting::TYPE_ICON,IDS_BUTTON_ICON,IDS_BUTTON_ICON_TIP,L",1",0,L"#StartButtonType=1",L"ClasicButton"},
 	{L"StartButtonIconSize",CSetting::TYPE_INT,IDS_BUTTON_ICON_SIZE,IDS_BUTTON_ICON_SIZE_TIP,0,0,L"#StartButtonType=1",L"ClasicButton"},
@@ -5157,7 +5167,7 @@ void InitSettings( void )
 	InitSettings(g_Settings,COMPONENT_MENU,&g_CustomSettings);
 }

-static int g_ButtonPath, g_ButtonSize, g_ButtonIcon, g_ButtonIconSize, g_ButtonText, g_ButtonTip;
+static int g_ButtonPath, g_ButtonSize, g_ButtonIcon, g_ButtonOffset, g_ButtonIconSize, g_ButtonText, g_ButtonTip;
 static bool g_bButtonEnable, g_bTaskbarsChanged, g_bTaskbarsUpdated;

 static void StoreButtonSettings( void )
@@ -5175,6 +5185,7 @@ static void StoreButtonSettings( void )
 	if (g_ButtonPath==START_BUTTON_CUSTOM)
 		g_ButtonPath=CalcFNVHash(GetSettingString(L"StartButtonPath"));
 	g_ButtonSize=GetSettingInt(L"StartButtonSize");
+	g_ButtonOffset=GetSettingInt(L"StartButtonOffset");
 	g_ButtonIconSize=GetSettingInt(L"StartButtonIconSize");
 }

@@ -5191,7 +5202,7 @@ static void UpdateButtons( bool bForce )
 	}
 	if (path==START_BUTTON_CUSTOM)
 		path=CalcFNVHash(GetSettingString(L"StartButtonPath"));
-	bool bRecreate=(g_bButtonEnable!=GetSettingBool(L"EnableStartButton") || path!=g_ButtonPath || g_ButtonSize!=GetSettingInt(L"StartButtonSize")
+	bool bRecreate=(g_bButtonEnable!=GetSettingBool(L"EnableStartButton") || path!=g_ButtonPath || g_ButtonSize!=GetSettingInt(L"StartButtonSize") || g_ButtonOffset!=GetSettingInt(L"StartButtonOffset")
 		|| g_ButtonIcon!=icon || g_ButtonIconSize!=GetSettingInt(L"StartButtonIconSize") || g_ButtonText!=text || g_ButtonTip!=tip);
 	if ((g_bTaskbarsChanged && !g_bTaskbarsUpdated) || bForce || bRecreate)
 	{
@@ -2918,6 +2918,28 @@ bool MenuSkin::LoadSkin( HMODULE hMod, const wchar_t *variation, const wchar_t *
 	ItemSettings[COLUMN2_INLINE].bmpIconFrame.bIsOwned=false;
 	ItemSettings[COLUMN2_INLINE].bmpSeparator.bIsOwned=false;

+	// A skin's "new item" colors must not override the user's High Contrast
+	// palette. This only changes the highlighted-new variants while High
+	// Contrast is active; normal themed rendering remains untouched.
+	HIGHCONTRAST contrast={sizeof(contrast)};
+	if (SystemParametersInfo(SPI_GETHIGHCONTRAST,sizeof(contrast),&contrast,0) && (contrast.dwFlags&HCF_HIGHCONTRASTON))
+	{
+		const int newItems[]={COLUMN1_NEW,COLUMN2_NEW,SUBMENU_NEW,PROGRAMS_TREE_NEW,PROGRAMS_BUTTON_NEW,PROGRAMS_CASCADING_NEW};
+		for (int i=0;i<_countof(newItems);i++)
+		{
+			ItemDrawSettings &settings=ItemSettings[newItems[i]];
+			settings.bmpSelection.Reset(true);
+			settings.bmpSelection=GetSysColor(COLOR_HIGHLIGHT);
+			settings.glowSize=0;
+			for (int j=0;j<_countof(settings.textColors);j++)
+			{
+				settings.textColors[j]=GetSysColor(COLOR_HIGHLIGHTTEXT);
+				settings.textShadowColors[j]=GetSysColor(COLOR_HIGHLIGHT);
+			}
+			settings.arrColors[0]=settings.arrColors[1]=GetSysColor(COLOR_HIGHLIGHTTEXT);
+		}
+	}
+
 	HDC hdc=CreateCompatibleDC(NULL);
 	HGDIOBJ font0=GetCurrentObject(hdc,OBJ_FONT);
 	for (int i=0;i<_countof(ItemSettings);i++)
@@ -22,6 +22,7 @@
 #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
@@ -1346,6 +1347,9 @@ static void UpdateStartButtonPosition(const TaskbarInfo* taskBar, const WINDOWPO
 		// We will shift our Aero button to cover original button
 		if (IsWin11() && (x == info.rcMonitor.left) && (GetStartButtonType() == START_BUTTON_AERO) && !g_epTaskbar)
 			x += ScaleForDpi(taskBar->taskBar, 6);
+
+		if (GetStartButtonType() == START_BUTTON_CUSTOM)
+			x += ScaleForDpi(taskBar->taskBar, GetSettingInt(L"StartButtonOffset"));
 	}

 	RECT rcButton = { x, y, x + taskBar->startButtonSize.cx, y + taskBar->startButtonSize.cy };
@@ -2936,6 +2940,35 @@ 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;
@@ -2979,10 +3012,7 @@ static void InitStartMenuDLL( void )
 		auto module=GetModuleHandle(L"taskbar.dll");
 		if (!module)
 		{
-			module = GetModuleHandle(L"ep_taskbar.5.dll");
-			if (!module)
-				module = GetModuleHandle(L"ep_taskbar.2.dll");
-
+			module = GetModuleHandleByPrefix(L"ep_taskbar");
 			if (module)
 				g_epTaskbar = true;
 		}
@@ -1073,6 +1073,8 @@ BEGIN
    IDS_MENU_GLASS          "Enable Aero Glass (requires Aero Glass mod)"
    IDS_MENU_GLASS_TIP      "Check this to use glass transparency (requires the Aero Glass mod to be installed)"
    IDS_MAIN_MENU_SETTINGS  "Main Menu"
+	IDS_BUTTON_OFFSET		"Button offset"
+	IDS_BUTTON_OFFSET_TIP	"Offset the start button horizontally by the amount of pixels specified"
 END

 STRINGTABLE 
@@ -1081,9 +1083,9 @@ BEGIN
    IDS_RIGHT_SHIFT_TIP     "When this is checked, right-click on the start button will open the standard Windows context menu instead of the Open-Shell menu. Otherwise Shift+right-click will open it"
    IDS_RIGHT_SHIFTX        "Right click opens Win+X menu"
    IDS_RIGHT_SHIFTX_TIP    "When this is checked, right-click on the start button will open the Win+X power menu instead of the Open-Shell menu. Otherwise Shift+right-click will open it"
-    IDS_STARTSCREEN_ITEM    "Show Start screen shortcut"
+    IDS_STARTSCREEN_ITEM    "Show Start Menu/Screen shortcut"
    IDS_STARTSCREEN_ITEM_TIP 
-                            "When this is checked, the main menu will contain a shortcut to open the Start screen"
+                            "When this is checked, the main menu will contain a shortcut to open original Start menu/screen"
    IDS_MIN_HEIGHT          "Minimum menu height"
    IDS_MIN_HEIGHT_TIP      "The main menu will be at least as tall as this many search results"
    IDS_GLASS_OVERRIDE      "Override glass color"
@@ -47,7 +47,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <UseOfAtl>Static</UseOfAtl>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
@@ -786,6 +786,8 @@
 #define IDS_ENABLE_ACCELERATORS_TIP     3687
 #define IDS_ALT_ACCELERATORS            3688
 #define IDS_ALT_ACCELERATORS_TIP        3689
+#define IDS_BUTTON_OFFSET				3690
+#define IDS_BUTTON_OFFSET_TIP			3691
 #define IDS_STRING7001                  7001
 #define IDS_STRING7002                  7002
 #define IDS_STRING7003                  7003
@@ -55,8 +55,8 @@ END_COM_MAP()
 	STDMETHODIMP InvokeCommand( CMINVOKECOMMANDINFO *pInfo );
 	STDMETHODIMP GetCommandString( UINT_PTR idCmd, UINT uFlags, UINT* pwReserved, LPSTR pszName, UINT cchMax );

-	wchar_t m_PinFolder1[_MAX_PATH]; // ending with \ 
-	wchar_t m_PinFolder2[_MAX_PATH]; // ending with \ 
+	wchar_t m_PinFolder1[_MAX_PATH]; // ending with backslash
+	wchar_t m_PinFolder2[_MAX_PATH]; // ending with backslash
 	wchar_t m_FileName[_MAX_PATH];
 	LPITEMIDLIST m_FilePidl;
 	bool m_bInPinFolder1, m_bInPinFolder2;
@@ -59,7 +59,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <UseOfAtl>Static</UseOfAtl>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
@@ -20,7 +20,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
  </PropertyGroup>
@@ -19,7 +19,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <UseOfAtl>Static</UseOfAtl>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization Condition="'$(Configuration)'!='Debug'">true</WholeProgramOptimization>
Author	SHA1	Message	Date
YellowNest	88e8cd8653	Restore Explorer shell if setup leaves it stopped (#2552 ) Restore Explorer shell after successful setup	2026-10-05 08:52:18 +02:00
YellowNest	ef61ce1dc0	Fix false empty entry in custom submenus (#2551 ) Fix empty placeholder in custom submenus	2026-10-05 08:14:13 +02:00
YellowNest	2e2f681c5b	Prevent cache writer use-after-free during cleanup (#2550 ) Protect cache save snapshots from concurrent cleanup	2026-10-04 17:47:53 +02:00
YellowNest	523ff4b9f4	Validate cached icon indices before remapping (#2549 )	2026-10-04 17:45:54 +02:00
YellowNest	1e7a52a5ab	Fix context menu command thread affinity (#2546 )	2026-10-04 17:41:09 +02:00
jbgrimsbyandjbgrimsby	1384d4eb04	Improve screen reader, keyboard, and High Contrast accessibility (#2518 ) * Improve screen reader and keyboard accessibility * Fix settings page repaint regression --------- Co-authored-by: jbgrimsby <314385300+jbgrimsby@users.noreply.github.com>	2026-09-15 13:56:16 +02:00
hamid	da73edf4ea	Added setting to horizontally offset start button (#2524 )	2026-08-30 14:06:16 +02:00
ge0rdi	f66d5ce50b	Fix source indexing `actions/checkout@v6` clones repo from URL that doesn't contain `.git` at the end. We were removing last 4 characters of the URL which resulted in wrong `REPO_URL` in source index and debugger was thus unable to fetch sources. The fix is to remove last 4 characters of URL only if there is `.git` at the end.	2026-08-30 13:27:52 +02:00
ge0rdi	c9e791fc79	Update README with code signing section	2026-07-24 19:42:41 +02:00
ge0rdi	fe6b144058	Delete temporary artefacts during official build They are needed only for signing.	2026-07-19 12:10:03 +02:00
ge0rdi	97bae48048	Use VS2022 toolset (due to Win7 support) VS2022 is the last VS that does support Windows 7. It seems we have some Win7 users, so for now we will use this toolset to make sure binaries are compatible with Win7.	2026-07-19 11:09:29 +02:00
ge0rdi	9a274c1297	Revert "Use VS2026" This reverts commit `8502d4bd7b`. VS2026 dropped support for Windows 7. Most of binaries produced by VS2026 don't work on Win7 because the use API that doesn't exist on Win7.	2026-07-19 10:59:58 +02:00
ge0rdi	462a8709b2	Fix "properties" command It seems that "Properties" context menu command is handled directly by shell and it requires to be invoked on the same thread that created actual context menu object. So we will distinguish this case and invoke command directly. For the rest we will use separate thread to not block main UI thread. Fixes #2502	2026-07-18 21:42:49 +02:00
ge0rdi	95bbb17faf	Allow automatic restart sign-on (ARSO)	2026-07-17 19:19:10 +02:00
ge0rdi	37fdea7964	Use C++20 by default	2026-07-17 16:37:56 +02:00
ge0rdi	8502d4bd7b	Use VS2026	2026-07-17 16:37:24 +02:00
ge0rdi	8713a69200	Sign with SignPath Fixes #1732	2026-07-15 14:25:37 +02:00
ge0rdi	b264f96525	Split build steps into binaries, installers, archives	2026-07-15 14:25:37 +02:00
ge0rdi	07ead0baf8	Utility: Fix clash with windows API	2026-07-15 14:25:36 +02:00
ge0rdi	566bb81c7e	Fix "Explore" getting stuck after Windows 11 update	2026-07-15 14:14:10 +02:00
ge0rdi	4fd5545485	Fix "Open file location" getting stuck after Windows 11 update We will run InvokeCommand API on separate STA thread and pump messages while waiting for them to finish. Fixes #2303 Fixes #2321 Fixes #2375	2026-07-15 14:14:10 +02:00
ge0rdi	86e8a24b16	[ExplorerPatcher] Improved EP taskbar detection (#2493 ) EP changed their `ep_taskbar*.dll` naming scheme. We will look for module whose name starts with `ep_taskbar` which should be compatible with both old and new naming. Fixes #2474	2026-07-15 14:12:25 +02:00
ge0rdi	9518c3b650	Make sure to run `release` step only on manual builds from master	2026-05-30 22:00:09 +02:00
ge0rdi	f15a0fbd75	Adjust wording of IDS_STARTSCREEN_ITEM Fixes #2472	2026-05-29 20:09:03 +02:00
ge0rdi	7baba47baf	Add github build badge	2026-05-16 08:27:14 +02:00
ge0rdi	f5fa8f0ea3	Add github build workflow	2026-05-16 08:20:47 +02:00
ge0rdi	dfb307b3b7	Fix C++23 warnings warning C5333: backslash and newline separated by space is treated as a line continuation in C++23 and later	2026-05-13 20:07:54 +02:00