From 052a9fc250dd3eefdc6a7834fb0bfbc1654db22c Mon Sep 17 00:00:00 2001 From: YellowNest <59575587+YellowNest@users.noreply.github.com> Date: Sat, 3 Oct 2026 16:13:46 +0200 Subject: [PATCH 1/7] Hide native Windows 11 Start button when using a replacement --- Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp | 5 + .../StartMenuDLL/StartMenuDLL.vcxproj | 2 + .../StartMenuDLL/StartMenuDLL.vcxproj.filters | 6 + .../StartMenuDLL/Win11StartButton.cpp | 745 ++++++++++++++++++ Src/StartMenu/StartMenuDLL/Win11StartButton.h | 8 + 5 files changed, 766 insertions(+) create mode 100644 Src/StartMenu/StartMenuDLL/Win11StartButton.cpp create mode 100644 Src/StartMenu/StartMenuDLL/Win11StartButton.h diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp index 3a6b18770..088569e08 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp @@ -14,6 +14,7 @@ #include "ResourceHelper.h" #include "LogManager.h" #include "TouchHelper.h" +#include "Win11StartButton.h" #include "IatHookHelper.h" #include "dllmain.h" #include @@ -2643,6 +2644,7 @@ void UpdateTaskBars( TUpdateTaskbar update ) InvalidateRect(taskBar.taskBar,NULL,TRUE); PostMessage(taskBar.taskBar,WM_THEMECHANGED,0,0); } + UpdateWin11StartButtonMonitor(); } /////////////////////////////////////////////////////////////////////////////// @@ -3227,6 +3229,7 @@ if (!g_bTrimHooks) UpdateTaskBars(TASKBAR_RECREATE_BUTTONS); UpdateTaskBars(TASKBAR_UPDATE_TEXTURE); + StartWin11StartButtonMonitor(); } static void RecreateStartButton( size_t taskbarId ) @@ -3288,6 +3291,8 @@ static DWORD WINAPI ExitThreadProc( void *param ) static void CleanStartMenuDLL( void ) { + StopWin11StartButtonMonitor(); + ClearIatHook(g_DwmpBTRHook); g_DwmpBTRHook=NULL; ClearIatHook(g_DwmpTWWRHook); diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj b/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj index 0412e588c..416c5a52f 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj @@ -89,6 +89,7 @@ Create + @@ -110,6 +111,7 @@ + diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj.filters b/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj.filters index fc2bd40cb..bfb839860 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj.filters +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj.filters @@ -72,6 +72,9 @@ Source Files + + Source Files + @@ -128,6 +131,9 @@ Header Files + + Header Files + Resource Files diff --git a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp new file mode 100644 index 000000000..1bb94cb35 --- /dev/null +++ b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp @@ -0,0 +1,745 @@ +// Windows 11 native Start button suppression. +// +// Open-Shell's replacement button is a separate layered window. Windows 11 +// renders its own Start button in XAML, so the old HWND hiding logic cannot +// remove the native glyph. This file uses the public XAML diagnostics API to +// suppress only the native Start glyph and its hit target. The XAML element is +// left in layout, so centered taskbar positioning remains owned by Windows. + +#include "stdafx.h" +#include "Win11StartButton.h" +#include "Settings.h" +#include "LogManager.h" +#include "ResourceHelper.h" + +#include +#include +#include +#include +#include + +static const GUID CLSID_OpenShellStartButtonTap = +{ 0x7d15741f, 0x2f3b, 0x4971, { 0xb8, 0x91, 0x6a, 0x5d, 0x42, 0xd7, 0x1a, 0x34 } }; + +static const UINT WM_OS_STARTBUTTON_APPLY = WM_APP + 0x35B; + +static volatile LONG g_StartButtonActive = 0; +static volatile LONG g_ConnectStarted = 0; + +static HMODULE GetThisModule( void ) +{ + HMODULE module = NULL; + GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + (LPCTSTR)&GetThisModule, &module); + return module; +} + +struct StartElement +{ + InstanceHandle parent; + CString type; + CString name; + bool visibilityOverride; + bool hitTestOverride; + + StartElement( void ) + { + parent = 0; + visibilityOverride = false; + hitTestOverride = false; + } +}; + +class CWin11StartButtonTap; +static CWin11StartButtonTap *g_Tap = NULL; +static SRWLOCK g_TapLock = SRWLOCK_INIT; + +static bool ContainsText( const CString &text, const wchar_t *part ) +{ + return text.Find(part) >= 0; +} + +static bool IsStartControl( const StartElement &element ) +{ + if (!ContainsText(element.type, L"ExperienceToggleButton")) + return false; + return element.name == L"LaunchListButton" || element.name == L"StartButton"; +} + +static bool IsStartGlyph( const StartElement &element ) +{ + if (element.name == L"Icon") + return true; + if (ContainsText(element.type, L"AnimatedVisualPlayer") || ContainsText(element.type, L"AepAnimatedIcon")) + return true; + if (ContainsText(element.type, L"FontIcon") || ContainsText(element.type, L"PathIcon") || + ContainsText(element.type, L"ImageIcon") || ContainsText(element.type, L"BitmapIcon") || + ContainsText(element.type, L"SymbolIcon")) + return true; + return false; +} + +class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCallback2 +{ +public: + CWin11StartButtonTap( void ) + { + m_Refs = 1; + m_Advised = false; + m_Dispatch = NULL; + m_PrimaryStart = 0; + InitializeCriticalSection(&m_Lock); + } + + ~CWin11StartButtonTap( void ) + { + if (m_Visual && m_Advised) + m_Visual->UnadviseVisualTreeChange(static_cast(this)); + if (m_Dispatch && GetWindowThreadProcessId(m_Dispatch, NULL) == GetCurrentThreadId()) + DestroyWindow(m_Dispatch); + + AcquireSRWLockExclusive(&g_TapLock); + if (g_Tap == this) + g_Tap = NULL; + ReleaseSRWLockExclusive(&g_TapLock); + + InterlockedExchange(&g_ConnectStarted, 0); + DeleteCriticalSection(&m_Lock); + } + + STDMETHODIMP QueryInterface( REFIID riid, void **ppv ) + { + if (!ppv) + return E_POINTER; + *ppv = NULL; + + if (riid == IID_IUnknown || riid == IID_IObjectWithSite) + *ppv = static_cast(this); + else if (riid == __uuidof(IVisualTreeServiceCallback) || riid == __uuidof(IVisualTreeServiceCallback2)) + *ppv = static_cast(this); + else + return E_NOINTERFACE; + + AddRef(); + return S_OK; + } + + STDMETHODIMP_(ULONG) AddRef( void ) + { + return (ULONG)InterlockedIncrement(&m_Refs); + } + + STDMETHODIMP_(ULONG) Release( void ) + { + LONG refs = InterlockedDecrement(&m_Refs); + if (!refs) + delete this; + return (ULONG)refs; + } + + STDMETHODIMP SetSite( IUnknown *site ) + { + if (m_Visual && m_Advised) + { + ApplyState(false); + m_Visual->UnadviseVisualTreeChange(static_cast(this)); + m_Advised = false; + } + m_Visual.Release(); + m_Site.Release(); + + if (!site) + { + AcquireSRWLockExclusive(&g_TapLock); + if (g_Tap == this) + g_Tap = NULL; + ReleaseSRWLockExclusive(&g_TapLock); + InterlockedExchange(&g_ConnectStarted, 0); + return S_OK; + } + + EnterCriticalSection(&m_Lock); + m_Elements.clear(); + m_PrimaryStart = 0; + LeaveCriticalSection(&m_Lock); + + m_Site = site; + HRESULT hr = site->QueryInterface(__uuidof(IVisualTreeService), (void**)&m_Visual); + if (FAILED(hr) || !m_Visual) + return hr; + + if (!CreateDispatchWindow()) + return HRESULT_FROM_WIN32(GetLastError()); + + AcquireSRWLockExclusive(&g_TapLock); + g_Tap = this; + ReleaseSRWLockExclusive(&g_TapLock); + + // Advise replays the existing tree. OnVisualTreeChange only records + // element handles; all property access is dispatched afterwards. + hr = m_Visual->AdviseVisualTreeChange(static_cast(this)); + if (SUCCEEDED(hr)) + { + m_Advised = true; + RequestApply(false); + } + LogToFile(STARTUP_LOG, L"Win11StartButton: visual tree advise 0x%08X", hr); + return hr; + } + + STDMETHODIMP GetSite( REFIID riid, void **ppv ) + { + if (!ppv) + return E_POINTER; + *ppv = NULL; + if (!m_Site) + return E_FAIL; + return m_Site->QueryInterface(riid, ppv); + } + + STDMETHODIMP OnVisualTreeChange( ParentChildRelation relation, VisualElement element, VisualMutationType mutationType ) + { + bool interesting = false; + + EnterCriticalSection(&m_Lock); + if (mutationType == Remove) + { + auto it = m_Elements.find(element.Handle); + if (it != m_Elements.end()) + { + interesting = it->second.visibilityOverride || it->second.hitTestOverride || IsStartControl(it->second); + bool wasPrimary = element.Handle == m_PrimaryStart; + m_Elements.erase(it); + if (wasPrimary) + { + m_PrimaryStart = 0; + for (auto candidate = m_Elements.begin(); candidate != m_Elements.end(); ++candidate) + { + if (IsStartControl(candidate->second)) + { + m_PrimaryStart = candidate->first; + break; + } + } + } + } + } + else if (mutationType == Add) + { + StartElement record; + record.parent = relation.Parent; + record.type = element.Type ? element.Type : L""; + record.name = element.Name ? element.Name : L""; + + auto previous = m_Elements.find(element.Handle); + if (previous != m_Elements.end()) + { + record.visibilityOverride = previous->second.visibilityOverride; + record.hitTestOverride = previous->second.hitTestOverride; + } + m_Elements[element.Handle] = record; + if (IsStartControl(record) && !m_PrimaryStart) + m_PrimaryStart = element.Handle; + + interesting = IsStartControl(record) || IsStartGlyph(record) || IsUnderStartButtonLocked(record.parent); + } + LeaveCriticalSection(&m_Lock); + + if (interesting) + RequestApply(false); + return S_OK; + } + + STDMETHODIMP OnElementStateChanged( InstanceHandle, VisualElementState, LPCWSTR ) + { + return S_OK; + } + + void RequestApply( bool synchronous ) + { + if (!m_Dispatch) + return; + if (synchronous) + SendMessage(m_Dispatch, WM_OS_STARTBUTTON_APPLY, 0, 0); + else + PostMessage(m_Dispatch, WM_OS_STARTBUTTON_APPLY, 0, 0); + } + +private: + static LRESULT CALLBACK DispatchProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) + { + CWin11StartButtonTap *tap = (CWin11StartButtonTap*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + if (msg == WM_NCCREATE) + { + CREATESTRUCT *create = (CREATESTRUCT*)lParam; + tap = (CWin11StartButtonTap*)create->lpCreateParams; + SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)tap); + } + if (msg == WM_OS_STARTBUTTON_APPLY && tap) + { + bool enabled = InterlockedCompareExchange(&g_StartButtonActive, 0, 0) != 0 && + GetSettingBool(L"EnableStartButton"); + tap->ApplyState(enabled); + return 0; + } + return DefWindowProc(hwnd, msg, wParam, lParam); + } + + bool CreateDispatchWindow( void ) + { + if (m_Dispatch) + return true; + + static const wchar_t CLASS_NAME[] = L"OpenShell.Win11StartButtonTap"; + WNDCLASS wc = {}; + HMODULE module = GetThisModule(); + if (!module) + return false; + + wc.lpfnWndProc = DispatchProc; + wc.hInstance = module; + wc.lpszClassName = CLASS_NAME; + if (!RegisterClass(&wc) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) + return false; + + m_Dispatch = CreateWindowEx(0, CLASS_NAME, L"", 0, 0, 0, 0, 0, + HWND_MESSAGE, NULL, module, this); + return m_Dispatch != NULL; + } + + bool IsUnderStartButtonLocked( InstanceHandle parent ) const + { + for (int depth = 0; depth < 24 && parent; depth++) + { + auto it = m_Elements.find(parent); + if (it == m_Elements.end()) + break; + if (IsStartControl(it->second)) + return true; + parent = it->second.parent; + } + return false; + } + + InstanceHandle GetStartAncestor( InstanceHandle handle ) + { + InstanceHandle result = 0; + EnterCriticalSection(&m_Lock); + auto it = m_Elements.find(handle); + if (it != m_Elements.end()) + { + InstanceHandle parent = it->second.parent; + for (int depth = 0; depth < 24 && parent; depth++) + { + auto pit = m_Elements.find(parent); + if (pit == m_Elements.end()) + break; + if (IsStartControl(pit->second)) + { + result = parent; + break; + } + parent = pit->second.parent; + } + } + LeaveCriticalSection(&m_Lock); + return result; + } + + static void FreeProperties( PropertyChainSource *sources, unsigned int sourceCount, + PropertyChainValue *values, unsigned int valueCount ) + { + if (sources) + { + for (unsigned int i = 0; i < sourceCount; i++) + { + SysFreeString(sources[i].TargetType); + SysFreeString(sources[i].Name); + SysFreeString(sources[i].SrcInfo.FileName); + SysFreeString(sources[i].SrcInfo.Hash); + } + CoTaskMemFree(sources); + } + if (values) + { + for (unsigned int i = 0; i < valueCount; i++) + { + SysFreeString(values[i].Type); + SysFreeString(values[i].DeclaringType); + SysFreeString(values[i].ValueType); + SysFreeString(values[i].ItemType); + SysFreeString(values[i].Value); + SysFreeString(values[i].PropertyName); + } + CoTaskMemFree(values); + } + } + + HRESULT FindProperty( InstanceHandle handle, const wchar_t *name, unsigned int *index, CString *typeName ) + { + unsigned int sourceCount = 0; + unsigned int valueCount = 0; + PropertyChainSource *sources = NULL; + PropertyChainValue *values = NULL; + HRESULT hr = m_Visual->GetPropertyValuesChain(handle, &sourceCount, &sources, &valueCount, &values); + if (FAILED(hr)) + { + FreeProperties(sources, sourceCount, values, valueCount); + return hr; + } + + bool found = false; + for (unsigned int i = 0; i < valueCount; i++) + { + if (!values[i].PropertyName || wcscmp(values[i].PropertyName, name) != 0) + continue; + if (values[i].MetadataBits & 0x2) // IsPropertyReadOnly + continue; + + *index = values[i].Index; + if (typeName) + *typeName = values[i].Type ? values[i].Type : L""; + found = true; + break; + } + FreeProperties(sources, sourceCount, values, valueCount); + return found ? S_OK : HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + } + + HRESULT SetPropertyText( InstanceHandle handle, const wchar_t *name, const wchar_t *valueText ) + { + unsigned int index = 0; + CString typeName; + HRESULT hr = FindProperty(handle, name, &index, &typeName); + if (FAILED(hr) || typeName.IsEmpty()) + return FAILED(hr) ? hr : E_FAIL; + + CComBSTR type(typeName); + CComBSTR value(valueText); + InstanceHandle created = 0; + hr = m_Visual->CreateInstance(type, value, &created); + if (FAILED(hr)) + return hr; + return m_Visual->SetProperty(handle, created, index); + } + + HRESULT ClearPropertyByName( InstanceHandle handle, const wchar_t *name ) + { + unsigned int index = 0; + HRESULT hr = FindProperty(handle, name, &index, NULL); + if (FAILED(hr)) + return hr; + return m_Visual->ClearProperty(handle, index); + } + + void SetOverrideFlags( InstanceHandle handle, bool *visibility, bool *hitTest ) + { + EnterCriticalSection(&m_Lock); + auto it = m_Elements.find(handle); + if (it != m_Elements.end()) + { + if (visibility) + it->second.visibilityOverride = *visibility; + if (hitTest) + it->second.hitTestOverride = *hitTest; + } + LeaveCriticalSection(&m_Lock); + } + + void ApplyState( bool enabled ) + { + if (!m_Visual) + return; + + std::vector> elements; + InstanceHandle primaryStart = 0; + EnterCriticalSection(&m_Lock); + primaryStart = m_PrimaryStart; + for (auto it = m_Elements.begin(); it != m_Elements.end(); ++it) + elements.push_back(*it); + LeaveCriticalSection(&m_Lock); + + const bool allTaskbars = GetSettingBool(L"AllTaskbars"); + + for (size_t i = 0; i < elements.size(); i++) + { + InstanceHandle handle = elements[i].first; + StartElement record = elements[i].second; + + if (IsStartControl(record)) + { + bool target = allTaskbars || !primaryStart || handle == primaryStart; + if (enabled && target) + { + if (!record.hitTestOverride) + { + HRESULT hr = SetPropertyText(handle, L"IsHitTestVisible", L"False"); + if (SUCCEEDED(hr)) + { + bool value = true; + SetOverrideFlags(handle, NULL, &value); + } + } + } + else if (record.hitTestOverride) + { + HRESULT hr = ClearPropertyByName(handle, L"IsHitTestVisible"); + if (SUCCEEDED(hr)) + { + bool value = false; + SetOverrideFlags(handle, NULL, &value); + } + } + continue; + } + + if (!IsStartGlyph(record)) + continue; + + InstanceHandle startAncestor = GetStartAncestor(handle); + if (!startAncestor) + continue; + bool target = allTaskbars || !primaryStart || startAncestor == primaryStart; + + if (enabled && target) + { + if (!record.visibilityOverride) + { + HRESULT hr = SetPropertyText(handle, L"Visibility", L"Collapsed"); + if (SUCCEEDED(hr)) + { + bool value = true; + SetOverrideFlags(handle, &value, NULL); + } + } + } + else if (record.visibilityOverride) + { + HRESULT hr = ClearPropertyByName(handle, L"Visibility"); + if (SUCCEEDED(hr)) + { + bool value = false; + SetOverrideFlags(handle, &value, NULL); + } + } + } + } + + LONG m_Refs; + bool m_Advised; + HWND m_Dispatch; + CRITICAL_SECTION m_Lock; + CComPtr m_Site; + CComPtr m_Visual; + InstanceHandle m_PrimaryStart; + std::unordered_map m_Elements; +}; + +static CWin11StartButtonTap *GetTapRef( void ) +{ + CWin11StartButtonTap *tap = NULL; + AcquireSRWLockShared(&g_TapLock); + tap = g_Tap; + if (tap) + tap->AddRef(); + ReleaseSRWLockShared(&g_TapLock); + return tap; +} + +class CStartButtonTapFactory: public IClassFactory +{ +public: + CStartButtonTapFactory( void ) { m_Refs = 1; } + + STDMETHODIMP QueryInterface( REFIID riid, void **ppv ) + { + if (!ppv) + return E_POINTER; + *ppv = NULL; + if (riid != IID_IUnknown && riid != IID_IClassFactory) + return E_NOINTERFACE; + *ppv = static_cast(this); + AddRef(); + return S_OK; + } + + STDMETHODIMP_(ULONG) AddRef( void ) { return (ULONG)InterlockedIncrement(&m_Refs); } + STDMETHODIMP_(ULONG) Release( void ) { return (ULONG)InterlockedDecrement(&m_Refs); } + + STDMETHODIMP CreateInstance( IUnknown *outer, REFIID riid, void **ppv ) + { + if (!ppv) + return E_POINTER; + *ppv = NULL; + if (outer) + return CLASS_E_NOAGGREGATION; + + CWin11StartButtonTap *tap = new CWin11StartButtonTap(); + if (!tap) + return E_OUTOFMEMORY; + HRESULT hr = tap->QueryInterface(riid, ppv); + tap->Release(); + return hr; + } + + STDMETHODIMP LockServer( BOOL ) { return S_OK; } + +private: + LONG m_Refs; +}; + +static CStartButtonTapFactory g_Factory; + +// xamlom.h declares DllGetClassObject through the platform headers, so export +// our implementation under that name via a linker alias. +extern "C" HRESULT STDMETHODCALLTYPE OpenShellStartButtonDllGetClassObject( REFCLSID clsid, REFIID riid, LPVOID *ppv ) +{ + if (!IsEqualGUID(clsid, CLSID_OpenShellStartButtonTap)) + return CLASS_E_CLASSNOTAVAILABLE; + return g_Factory.QueryInterface(riid, ppv); +} + +#ifdef _M_IX86 +#pragma comment(linker, "/EXPORT:DllGetClassObject=_OpenShellStartButtonDllGetClassObject@12,PRIVATE") +#else +#pragma comment(linker, "/EXPORT:DllGetClassObject=OpenShellStartButtonDllGetClassObject,PRIVATE") +#endif + +typedef HRESULT (WINAPI *InitXamlDiagnosticsEx_t)( LPCWSTR, DWORD, LPCWSTR, LPCWSTR, CLSID, LPCWSTR ); + +struct ConnectAttempt +{ + InitXamlDiagnosticsEx_t init; + const wchar_t *endpoint; + wchar_t dllPath[MAX_PATH]; + HRESULT hr; +}; + +static DWORD WINAPI ConnectAttemptThread( LPVOID param ) +{ + ConnectAttempt *attempt = (ConnectAttempt*)param; + attempt->hr = attempt->init(attempt->endpoint, GetCurrentProcessId(), NULL, + attempt->dllPath, CLSID_OpenShellStartButtonTap, NULL); + return 0; +} + +static DWORD WINAPI ConnectThread( LPVOID ) +{ + HMODULE runtime = LoadLibraryEx(L"Windows.UI.Xaml.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); + if (!runtime) + { + InterlockedExchange(&g_ConnectStarted, 0); + return 0; + } + + InitXamlDiagnosticsEx_t init = (InitXamlDiagnosticsEx_t)GetProcAddress(runtime, "InitializeXamlDiagnosticsEx"); + if (!init) + { + FreeLibrary(runtime); + InterlockedExchange(&g_ConnectStarted, 0); + return 0; + } + + HMODULE module = GetThisModule(); + wchar_t dllPath[MAX_PATH]; + if (!module || !GetModuleFileName(module, dllPath, _countof(dllPath))) + { + FreeLibrary(runtime); + InterlockedExchange(&g_ConnectStarted, 0); + return 0; + } + + const wchar_t *endpoints[] = { L"VisualDiagConnection1", L"VisualDiagConnection2" }; + HRESULT last = E_FAIL; + for (int retry = 0; retry < 8 && InterlockedCompareExchange(&g_StartButtonActive, 0, 0); retry++) + { + for (int i = 0; i < _countof(endpoints); i++) + { + ConnectAttempt attempt = {}; + attempt.init = init; + attempt.endpoint = endpoints[i]; + Strcpy(attempt.dllPath, _countof(attempt.dllPath), dllPath); + attempt.hr = E_FAIL; + + HANDLE thread = CreateThread(NULL, 0, ConnectAttemptThread, &attempt, 0, NULL); + if (!thread) + continue; + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + last = attempt.hr; + if (SUCCEEDED(last)) + { + LogToFile(STARTUP_LOG, L"Win11StartButton: connected using %s", endpoints[i]); + FreeLibrary(runtime); + return 0; + } + } + Sleep(500); + } + + LogToFile(STARTUP_LOG, L"Win11StartButton: connection failed 0x%08X", last); + FreeLibrary(runtime); + InterlockedExchange(&g_ConnectStarted, 0); + return 0; +} + +static void EnsureConnection( void ) +{ + if (InterlockedCompareExchange(&g_ConnectStarted, 1, 0) != 0) + return; + + HANDLE thread = CreateThread(NULL, 0, ConnectThread, NULL, 0, NULL); + if (thread) + CloseHandle(thread); + else + InterlockedExchange(&g_ConnectStarted, 0); +} + +void StartWin11StartButtonMonitor( void ) +{ + if (!IsWin11()) + return; + + InterlockedExchange(&g_StartButtonActive, 1); + CWin11StartButtonTap *tap = GetTapRef(); + if (tap) + { + tap->RequestApply(false); + tap->Release(); + return; + } + EnsureConnection(); +} + +void UpdateWin11StartButtonMonitor( void ) +{ + if (!IsWin11()) + return; + + CWin11StartButtonTap *tap = GetTapRef(); + if (tap) + { + tap->RequestApply(false); + tap->Release(); + } + else if (InterlockedCompareExchange(&g_StartButtonActive, 0, 0)) + { + EnsureConnection(); + } +} + +void StopWin11StartButtonMonitor( void ) +{ + if (!IsWin11()) + return; + + InterlockedExchange(&g_StartButtonActive, 0); + CWin11StartButtonTap *tap = GetTapRef(); + if (tap) + { + // Synchronous restore: don't let Open-Shell exit while the native + // Start button is still carrying our XAML overrides. + tap->RequestApply(true); + tap->Release(); + } +} diff --git a/Src/StartMenu/StartMenuDLL/Win11StartButton.h b/Src/StartMenu/StartMenuDLL/Win11StartButton.h new file mode 100644 index 000000000..b4bc15b56 --- /dev/null +++ b/Src/StartMenu/StartMenuDLL/Win11StartButton.h @@ -0,0 +1,8 @@ +#pragma once + +// Windows 11 draws the native Start button in XAML. These helpers hide only +// the native glyph/hit target while Open-Shell's replacement button is active. +// They never move or resize either button. +void StartWin11StartButtonMonitor( void ); +void UpdateWin11StartButtonMonitor( void ); +void StopWin11StartButtonMonitor( void ); From 9f572bb07419216a6b3fe61f6ff64d828b52dd33 Mon Sep 17 00:00:00 2001 From: YellowNest <59575587+YellowNest@users.noreply.github.com> Date: Sun, 4 Oct 2026 18:35:40 +0200 Subject: [PATCH 2/7] Fix Win11 TAP control matching and shutdown --- .../StartMenuDLL/Win11StartButton.cpp | 215 ++++++++++++++++-- 1 file changed, 191 insertions(+), 24 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp index 1bb94cb35..01f4a2df0 100644 --- a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp +++ b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp @@ -22,6 +22,7 @@ static const GUID CLSID_OpenShellStartButtonTap = { 0x7d15741f, 0x2f3b, 0x4971, { 0xb8, 0x91, 0x6a, 0x5d, 0x42, 0xd7, 0x1a, 0x34 } }; static const UINT WM_OS_STARTBUTTON_APPLY = WM_APP + 0x35B; +static const UINT WM_OS_STARTBUTTON_DESTROY = WM_APP + 0x35C; static volatile LONG g_StartButtonActive = 0; static volatile LONG g_ConnectStarted = 0; @@ -41,12 +42,18 @@ struct StartElement CString name; bool visibilityOverride; bool hitTestOverride; + bool startControlResolved; + bool isStartControl; + unsigned int discoveryOrder; StartElement( void ) { parent = 0; visibilityOverride = false; hitTestOverride = false; + startControlResolved = false; + isStartControl = false; + discoveryOrder = 0; } }; @@ -59,7 +66,7 @@ static bool ContainsText( const CString &text, const wchar_t *part ) return text.Find(part) >= 0; } -static bool IsStartControl( const StartElement &element ) +static bool IsStartControlCandidate( const StartElement &element ) { if (!ContainsText(element.type, L"ExperienceToggleButton")) return false; @@ -88,6 +95,8 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal m_Advised = false; m_Dispatch = NULL; m_PrimaryStart = 0; + m_NextDiscoveryOrder = 0; + m_InjectionReferenceBalanced = false; InitializeCriticalSection(&m_Lock); } @@ -161,9 +170,33 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal EnterCriticalSection(&m_Lock); m_Elements.clear(); m_PrimaryStart = 0; + m_NextDiscoveryOrder = 0; LeaveCriticalSection(&m_Lock); m_Site = site; + + // InitializeXamlDiagnosticsEx loads the TAP DLL by path even though + // StartMenuDLL is already loaded. Balance that injection reference so + // Open-Shell can unload and initialize the DLL again after an explicit Exit. + if (!m_InjectionReferenceBalanced) + { + HMODULE module = GetThisModule(); + if (module) + { + FreeLibrary(module); + m_InjectionReferenceBalanced = true; + } + } + + // Exit may race a connection attempt. Do not attach a new callback after + // shutdown has already begun. + if (!InterlockedCompareExchange(&g_StartButtonActive, 0, 0)) + { + m_Site.Release(); + InterlockedExchange(&g_ConnectStarted, 0); + return S_OK; + } + HRESULT hr = site->QueryInterface(__uuidof(IVisualTreeService), (void**)&m_Visual); if (FAILED(hr) || !m_Visual) return hr; @@ -207,21 +240,12 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal auto it = m_Elements.find(element.Handle); if (it != m_Elements.end()) { - interesting = it->second.visibilityOverride || it->second.hitTestOverride || IsStartControl(it->second); + interesting = it->second.visibilityOverride || it->second.hitTestOverride || + it->second.isStartControl || IsStartControlCandidate(it->second); bool wasPrimary = element.Handle == m_PrimaryStart; m_Elements.erase(it); if (wasPrimary) - { - m_PrimaryStart = 0; - for (auto candidate = m_Elements.begin(); candidate != m_Elements.end(); ++candidate) - { - if (IsStartControl(candidate->second)) - { - m_PrimaryStart = candidate->first; - break; - } - } - } + m_PrimaryStart = FindPrimaryStartLocked(); } } else if (mutationType == Add) @@ -236,12 +260,18 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal { record.visibilityOverride = previous->second.visibilityOverride; record.hitTestOverride = previous->second.hitTestOverride; + record.startControlResolved = previous->second.startControlResolved; + record.isStartControl = previous->second.isStartControl; + record.discoveryOrder = previous->second.discoveryOrder; + } + else + { + record.discoveryOrder = ++m_NextDiscoveryOrder; } m_Elements[element.Handle] = record; - if (IsStartControl(record) && !m_PrimaryStart) - m_PrimaryStart = element.Handle; - interesting = IsStartControl(record) || IsStartGlyph(record) || IsUnderStartButtonLocked(record.parent); + interesting = IsStartControlCandidate(record) || IsStartGlyph(record) || + IsUnderStartButtonLocked(record.parent); } LeaveCriticalSection(&m_Lock); @@ -265,6 +295,43 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal PostMessage(m_Dispatch, WM_OS_STARTBUTTON_APPLY, 0, 0); } + void Shutdown( void ) + { + // Prevent new users of the TAP while teardown is in progress. The caller + // holds a reference, so UnadviseVisualTreeChange cannot destroy this object + // out from under the shutdown sequence. + AcquireSRWLockExclusive(&g_TapLock); + if (g_Tap == this) + g_Tap = NULL; + ReleaseSRWLockExclusive(&g_TapLock); + + // Restore the native XAML state before detaching the callback. + RequestApply(true); + + if (m_Visual && m_Advised) + { + HRESULT hr = m_Visual->UnadviseVisualTreeChange(static_cast(this)); + if (FAILED(hr)) + { + // Keep the DLL resident rather than leave XAML with a callback into + // unloaded code. Explorer restart remains the safe recovery path. + HMODULE module = NULL; + GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (LPCTSTR)&GetThisModule, &module); + LogToFile(STARTUP_LOG, L"Win11StartButton: visual tree unadvise failed 0x%08X", hr); + return; + } + m_Advised = false; + } + + m_Visual.Release(); + m_Site.Release(); + InterlockedExchange(&g_ConnectStarted, 0); + + if (m_Dispatch) + SendMessage(m_Dispatch, WM_OS_STARTBUTTON_DESTROY, 0, 0); + } + private: static LRESULT CALLBACK DispatchProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { @@ -282,6 +349,13 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal tap->ApplyState(enabled); return 0; } + if (msg == WM_OS_STARTBUTTON_DESTROY && tap) + { + tap->m_Dispatch = NULL; + SetWindowLongPtr(hwnd, GWLP_USERDATA, 0); + DestroyWindow(hwnd); + return 0; + } return DefWindowProc(hwnd, msg, wParam, lParam); } @@ -314,7 +388,7 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal auto it = m_Elements.find(parent); if (it == m_Elements.end()) break; - if (IsStartControl(it->second)) + if (it->second.isStartControl) return true; parent = it->second.parent; } @@ -334,7 +408,7 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal auto pit = m_Elements.find(parent); if (pit == m_Elements.end()) break; - if (IsStartControl(pit->second)) + if (pit->second.isStartControl) { result = parent; break; @@ -375,6 +449,78 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal } } + InstanceHandle FindPrimaryStartLocked( void ) const + { + InstanceHandle primary = 0; + unsigned int bestOrder = 0; + for (auto it = m_Elements.begin(); it != m_Elements.end(); ++it) + { + if (!it->second.isStartControl) + continue; + if (!primary || it->second.discoveryOrder < bestOrder) + { + primary = it->first; + bestOrder = it->second.discoveryOrder; + } + } + return primary; + } + + HRESULT ResolveStartControl( InstanceHandle handle, const StartElement &element, bool *isStartControl ) + { + *isStartControl = false; + if (!IsStartControlCandidate(element)) + return S_OK; + + // Older taskbar implementations may expose a distinct x:Name. + if (element.name.CompareNoCase(L"StartButton") == 0) + { + *isStartControl = true; + return S_OK; + } + + unsigned int sourceCount = 0; + unsigned int valueCount = 0; + PropertyChainSource *sources = NULL; + PropertyChainValue *values = NULL; + HRESULT hr = m_Visual->GetPropertyValuesChain(handle, &sourceCount, &sources, &valueCount, &values); + if (FAILED(hr)) + { + FreeProperties(sources, sourceCount, values, valueCount); + return hr; + } + + for (unsigned int i = 0; i < valueCount; i++) + { + if (!values[i].PropertyName || !values[i].Value) + continue; + if (_wcsicmp(values[i].PropertyName, L"AutomationId") != 0 && + _wcsicmp(values[i].PropertyName, L"AutomationProperties.AutomationId") != 0) + continue; + if (_wcsicmp(values[i].Value, L"StartButton") == 0) + { + *isStartControl = true; + break; + } + } + + FreeProperties(sources, sourceCount, values, valueCount); + return S_OK; + } + + void SetControlClassification( InstanceHandle handle, bool isStartControl ) + { + EnterCriticalSection(&m_Lock); + auto it = m_Elements.find(handle); + if (it != m_Elements.end()) + { + it->second.startControlResolved = true; + it->second.isStartControl = isStartControl; + m_PrimaryStart = FindPrimaryStartLocked(); + } + LeaveCriticalSection(&m_Lock); + } + HRESULT FindProperty( InstanceHandle handle, const wchar_t *name, unsigned int *index, CString *typeName ) { unsigned int sourceCount = 0; @@ -452,13 +598,34 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal return; std::vector> elements; - InstanceHandle primaryStart = 0; EnterCriticalSection(&m_Lock); - primaryStart = m_PrimaryStart; for (auto it = m_Elements.begin(); it != m_Elements.end(); ++it) elements.push_back(*it); LeaveCriticalSection(&m_Lock); + // Start and Task View share ExperienceToggleButton#LaunchListButton on + // current Windows 11 builds. Resolve the attached AutomationId on the XAML + // UI thread before changing any control or descendant. + for (size_t i = 0; i < elements.size(); i++) + { + StartElement &record = elements[i].second; + if (!IsStartControlCandidate(record) || record.startControlResolved) + continue; + + bool isStartControl = false; + if (SUCCEEDED(ResolveStartControl(elements[i].first, record, &isStartControl))) + { + record.startControlResolved = true; + record.isStartControl = isStartControl; + SetControlClassification(elements[i].first, isStartControl); + } + } + + InstanceHandle primaryStart = 0; + EnterCriticalSection(&m_Lock); + primaryStart = m_PrimaryStart; + LeaveCriticalSection(&m_Lock); + const bool allTaskbars = GetSettingBool(L"AllTaskbars"); for (size_t i = 0; i < elements.size(); i++) @@ -466,7 +633,7 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal InstanceHandle handle = elements[i].first; StartElement record = elements[i].second; - if (IsStartControl(record)) + if (record.isStartControl) { bool target = allTaskbars || !primaryStart || handle == primaryStart; if (enabled && target) @@ -532,6 +699,8 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal CComPtr m_Site; CComPtr m_Visual; InstanceHandle m_PrimaryStart; + unsigned int m_NextDiscoveryOrder; + bool m_InjectionReferenceBalanced; std::unordered_map m_Elements; }; @@ -737,9 +906,7 @@ void StopWin11StartButtonMonitor( void ) CWin11StartButtonTap *tap = GetTapRef(); if (tap) { - // Synchronous restore: don't let Open-Shell exit while the native - // Start button is still carrying our XAML overrides. - tap->RequestApply(true); + tap->Shutdown(); tap->Release(); } } From 3a9869845c43421fef700e2e7f7dbd90a9265b3c Mon Sep 17 00:00:00 2001 From: YellowNest <59575587+YellowNest@users.noreply.github.com> Date: Sun, 4 Oct 2026 20:42:56 +0200 Subject: [PATCH 3/7] Fix Win11 TAP teardown ordering --- .../StartMenuDLL/Win11StartButton.cpp | 159 ++++++++++++------ 1 file changed, 105 insertions(+), 54 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp index 01f4a2df0..abed3e766 100644 --- a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp +++ b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp @@ -22,7 +22,7 @@ static const GUID CLSID_OpenShellStartButtonTap = { 0x7d15741f, 0x2f3b, 0x4971, { 0xb8, 0x91, 0x6a, 0x5d, 0x42, 0xd7, 0x1a, 0x34 } }; static const UINT WM_OS_STARTBUTTON_APPLY = WM_APP + 0x35B; -static const UINT WM_OS_STARTBUTTON_DESTROY = WM_APP + 0x35C; +static const UINT WM_OS_STARTBUTTON_SHUTDOWN = WM_APP + 0x35C; static volatile LONG g_StartButtonActive = 0; static volatile LONG g_ConnectStarted = 0; @@ -175,38 +175,41 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal m_Site = site; - // InitializeXamlDiagnosticsEx loads the TAP DLL by path even though - // StartMenuDLL is already loaded. Balance that injection reference so - // Open-Shell can unload and initialize the DLL again after an explicit Exit. - if (!m_InjectionReferenceBalanced) - { - HMODULE module = GetThisModule(); - if (module) - { - FreeLibrary(module); - m_InjectionReferenceBalanced = true; - } - } - + // Keep the module reference acquired by InitializeXamlDiagnosticsEx for + // the whole TAP session. It is balanced only after the callback and all + // XAML/COM references have been released. StartMenuDLL has its own module + // reference while Open-Shell is active, so balancing the diagnostics + // reference during teardown cannot unload code that is still executing. + // // Exit may race a connection attempt. Do not attach a new callback after // shutdown has already begun. if (!InterlockedCompareExchange(&g_StartButtonActive, 0, 0)) { m_Site.Release(); + BalanceInjectionReference(); InterlockedExchange(&g_ConnectStarted, 0); return S_OK; } HRESULT hr = site->QueryInterface(__uuidof(IVisualTreeService), (void**)&m_Visual); if (FAILED(hr) || !m_Visual) + { + m_Visual.Release(); + m_Site.Release(); + BalanceInjectionReference(); + InterlockedExchange(&g_ConnectStarted, 0); return hr; + } if (!CreateDispatchWindow()) - return HRESULT_FROM_WIN32(GetLastError()); - - AcquireSRWLockExclusive(&g_TapLock); - g_Tap = this; - ReleaseSRWLockExclusive(&g_TapLock); + { + DWORD error = GetLastError(); + m_Visual.Release(); + m_Site.Release(); + BalanceInjectionReference(); + InterlockedExchange(&g_ConnectStarted, 0); + return HRESULT_FROM_WIN32(error); + } // Advise replays the existing tree. OnVisualTreeChange only records // element handles; all property access is dispatched afterwards. @@ -214,8 +217,30 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal if (SUCCEEDED(hr)) { m_Advised = true; + + // Publish the TAP only after the subscription is fully established. + // Otherwise an Advise failure can leave g_Tap pointing at an object + // that the XAML runtime is about to release. + AcquireSRWLockExclusive(&g_TapLock); + g_Tap = this; + ReleaseSRWLockExclusive(&g_TapLock); + RequestApply(false); } + else + { + if (m_Dispatch) + { + HWND dispatch = m_Dispatch; + m_Dispatch = NULL; + SetWindowLongPtr(dispatch, GWLP_USERDATA, 0); + DestroyWindow(dispatch); + } + m_Visual.Release(); + m_Site.Release(); + BalanceInjectionReference(); + InterlockedExchange(&g_ConnectStarted, 0); + } LogToFile(STARTUP_LOG, L"Win11StartButton: visual tree advise 0x%08X", hr); return hr; } @@ -295,41 +320,26 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal PostMessage(m_Dispatch, WM_OS_STARTBUTTON_APPLY, 0, 0); } - void Shutdown( void ) + HRESULT Shutdown( void ) { - // Prevent new users of the TAP while teardown is in progress. The caller - // holds a reference, so UnadviseVisualTreeChange cannot destroy this object - // out from under the shutdown sequence. + // SetSite creates the dispatch window on the XAML thread. Run the complete + // XAML/COM teardown on that same thread rather than releasing apartment- + // sensitive interfaces from whichever thread initiated Open-Shell Exit. + if (!m_Dispatch) + return E_UNEXPECTED; + + HRESULT hr = (HRESULT)SendMessage(m_Dispatch, WM_OS_STARTBUTTON_SHUTDOWN, 0, 0); + if (FAILED(hr)) + return hr; + AcquireSRWLockExclusive(&g_TapLock); if (g_Tap == this) g_Tap = NULL; ReleaseSRWLockExclusive(&g_TapLock); - // Restore the native XAML state before detaching the callback. - RequestApply(true); - - if (m_Visual && m_Advised) - { - HRESULT hr = m_Visual->UnadviseVisualTreeChange(static_cast(this)); - if (FAILED(hr)) - { - // Keep the DLL resident rather than leave XAML with a callback into - // unloaded code. Explorer restart remains the safe recovery path. - HMODULE module = NULL; - GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (LPCTSTR)&GetThisModule, &module); - LogToFile(STARTUP_LOG, L"Win11StartButton: visual tree unadvise failed 0x%08X", hr); - return; - } - m_Advised = false; - } - - m_Visual.Release(); - m_Site.Release(); InterlockedExchange(&g_ConnectStarted, 0); - - if (m_Dispatch) - SendMessage(m_Dispatch, WM_OS_STARTBUTTON_DESTROY, 0, 0); + BalanceInjectionReference(); + return S_OK; } private: @@ -349,14 +359,53 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal tap->ApplyState(enabled); return 0; } - if (msg == WM_OS_STARTBUTTON_DESTROY && tap) + if (msg == WM_OS_STARTBUTTON_SHUTDOWN && tap) + return tap->ShutdownOnDispatchThread(); + return DefWindowProc(hwnd, msg, wParam, lParam); + } + + HRESULT ShutdownOnDispatchThread( void ) + { + // The window is owned by the same thread on which SetSite ran. Keep all + // operations touching the XAML diagnostics interfaces on this thread. + ApplyState(false); + + if (m_Visual && m_Advised) { - tap->m_Dispatch = NULL; - SetWindowLongPtr(hwnd, GWLP_USERDATA, 0); - DestroyWindow(hwnd); - return 0; + HRESULT hr = m_Visual->UnadviseVisualTreeChange(static_cast(this)); + if (FAILED(hr)) + { + LogToFile(STARTUP_LOG, L"Win11StartButton: visual tree unadvise failed 0x%08X", hr); + return hr; + } + m_Advised = false; + } + + m_Visual.Release(); + m_Site.Release(); + + if (m_Dispatch) + { + HWND dispatch = m_Dispatch; + m_Dispatch = NULL; + SetWindowLongPtr(dispatch, GWLP_USERDATA, 0); + DestroyWindow(dispatch); + } + return S_OK; + } + + void BalanceInjectionReference( void ) + { + if (m_InjectionReferenceBalanced) + return; + + HMODULE module = GetThisModule(); + if (module) + { + // Mark first: FreeLibrary can run loader callbacks before it returns. + m_InjectionReferenceBalanced = true; + FreeLibrary(module); } - return DefWindowProc(hwnd, msg, wParam, lParam); } bool CreateDispatchWindow( void ) @@ -906,7 +955,9 @@ void StopWin11StartButtonMonitor( void ) CWin11StartButtonTap *tap = GetTapRef(); if (tap) { - tap->Shutdown(); + HRESULT hr = tap->Shutdown(); + if (FAILED(hr)) + LogToFile(STARTUP_LOG, L"Win11StartButton: TAP shutdown failed 0x%08X", hr); tap->Release(); } } From 192b2e3a42bc7121c28cfd7ba3acae3cfe359b23 Mon Sep 17 00:00:00 2001 From: YellowNest <59575587+YellowNest@users.noreply.github.com> Date: Sun, 4 Oct 2026 20:48:22 +0200 Subject: [PATCH 4/7] Keep Win11 TAP connection worker resident --- .../StartMenuDLL/Win11StartButton.cpp | 55 ++++++++++++------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp index abed3e766..edb68920d 100644 --- a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp +++ b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp @@ -841,31 +841,35 @@ static DWORD WINAPI ConnectAttemptThread( LPVOID param ) return 0; } -static DWORD WINAPI ConnectThread( LPVOID ) +static DWORD FinishConnectThread( HMODULE moduleReference, HMODULE runtime, bool resetConnectionState ) { + if (runtime) + FreeLibrary(runtime); + if (resetConnectionState) + InterlockedExchange(&g_ConnectStarted, 0); + + // The connection worker executes from StartMenuDLL and can outlive the normal + // Open-Shell unload path. Release its private module reference and terminate + // atomically so the DLL cannot disappear underneath the thread's return path. + FreeLibraryAndExitThread(moduleReference, 0); + return 0; +} + +static DWORD WINAPI ConnectThread( LPVOID param ) +{ + HMODULE moduleReference = (HMODULE)param; HMODULE runtime = LoadLibraryEx(L"Windows.UI.Xaml.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); if (!runtime) - { - InterlockedExchange(&g_ConnectStarted, 0); - return 0; - } + return FinishConnectThread(moduleReference, NULL, true); InitXamlDiagnosticsEx_t init = (InitXamlDiagnosticsEx_t)GetProcAddress(runtime, "InitializeXamlDiagnosticsEx"); if (!init) - { - FreeLibrary(runtime); - InterlockedExchange(&g_ConnectStarted, 0); - return 0; - } + return FinishConnectThread(moduleReference, runtime, true); HMODULE module = GetThisModule(); wchar_t dllPath[MAX_PATH]; if (!module || !GetModuleFileName(module, dllPath, _countof(dllPath))) - { - FreeLibrary(runtime); - InterlockedExchange(&g_ConnectStarted, 0); - return 0; - } + return FinishConnectThread(moduleReference, runtime, true); const wchar_t *endpoints[] = { L"VisualDiagConnection1", L"VisualDiagConnection2" }; HRESULT last = E_FAIL; @@ -888,17 +892,14 @@ static DWORD WINAPI ConnectThread( LPVOID ) if (SUCCEEDED(last)) { LogToFile(STARTUP_LOG, L"Win11StartButton: connected using %s", endpoints[i]); - FreeLibrary(runtime); - return 0; + return FinishConnectThread(moduleReference, runtime, false); } } Sleep(500); } LogToFile(STARTUP_LOG, L"Win11StartButton: connection failed 0x%08X", last); - FreeLibrary(runtime); - InterlockedExchange(&g_ConnectStarted, 0); - return 0; + return FinishConnectThread(moduleReference, runtime, true); } static void EnsureConnection( void ) @@ -906,11 +907,23 @@ static void EnsureConnection( void ) if (InterlockedCompareExchange(&g_ConnectStarted, 1, 0) != 0) return; - HANDLE thread = CreateThread(NULL, 0, ConnectThread, NULL, 0, NULL); + HMODULE moduleReference = NULL; + if (!GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCTSTR)&ConnectThread, &moduleReference)) + { + InterlockedExchange(&g_ConnectStarted, 0); + return; + } + + HANDLE thread = CreateThread(NULL, 0, ConnectThread, moduleReference, 0, NULL); if (thread) + { CloseHandle(thread); + } else + { + FreeLibrary(moduleReference); InterlockedExchange(&g_ConnectStarted, 0); + } } void StartWin11StartButtonMonitor( void ) From 3216d1b0e32015f7be17682e69f17fbe5d2fb465 Mon Sep 17 00:00:00 2001 From: YellowNest <59575587+YellowNest@users.noreply.github.com> Date: Sun, 4 Oct 2026 23:18:01 +0200 Subject: [PATCH 5/7] Prepare direct XAML automation lookup --- Src/StartMenu/StartMenuDLL/Win11StartButton.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp index edb68920d..446b6e52e 100644 --- a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp +++ b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp @@ -13,8 +13,12 @@ #include "ResourceHelper.h" #include +#include #include #include +#include + +#pragma comment(lib, "runtimeobject.lib") #include #include From 88048a9993f58d88fa85c945441ce54f81177ed0 Mon Sep 17 00:00:00 2001 From: YellowNest <59575587+YellowNest@users.noreply.github.com> Date: Sun, 4 Oct 2026 23:18:19 +0200 Subject: [PATCH 6/7] Hold XAML diagnostics objects for Start classification --- Src/StartMenu/StartMenuDLL/Win11StartButton.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp index 446b6e52e..c565d0902 100644 --- a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp +++ b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp @@ -159,6 +159,8 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal m_Advised = false; } m_Visual.Release(); + m_Diagnostics.Release(); + m_AutomationProperties.Release(); m_Site.Release(); if (!site) @@ -205,10 +207,14 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal return hr; } + site->QueryInterface(__uuidof(IXamlDiagnostics), (void**)&m_Diagnostics); + if (!CreateDispatchWindow()) { DWORD error = GetLastError(); m_Visual.Release(); + m_Diagnostics.Release(); + m_AutomationProperties.Release(); m_Site.Release(); BalanceInjectionReference(); InterlockedExchange(&g_ConnectStarted, 0); @@ -241,6 +247,8 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal DestroyWindow(dispatch); } m_Visual.Release(); + m_Diagnostics.Release(); + m_AutomationProperties.Release(); m_Site.Release(); BalanceInjectionReference(); InterlockedExchange(&g_ConnectStarted, 0); @@ -386,6 +394,8 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal } m_Visual.Release(); + m_Diagnostics.Release(); + m_AutomationProperties.Release(); m_Site.Release(); if (m_Dispatch) @@ -751,6 +761,8 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal CRITICAL_SECTION m_Lock; CComPtr m_Site; CComPtr m_Visual; + CComPtr m_Diagnostics; + CComPtr m_AutomationProperties; InstanceHandle m_PrimaryStart; unsigned int m_NextDiscoveryOrder; bool m_InjectionReferenceBalanced; From e183d71c9c050ed298ae831f1f61da7604059a31 Mon Sep 17 00:00:00 2001 From: YellowNest <59575587+YellowNest@users.noreply.github.com> Date: Sun, 4 Oct 2026 23:18:36 +0200 Subject: [PATCH 7/7] Resolve Start with AutomationProperties API --- .../StartMenuDLL/Win11StartButton.cpp | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp index c565d0902..44c3b23df 100644 --- a/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp +++ b/Src/StartMenu/StartMenuDLL/Win11StartButton.cpp @@ -529,6 +529,59 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal return primary; } + HRESULT EnsureAutomationProperties( void ) + { + if (m_AutomationProperties) + return S_OK; + + HSTRING className = NULL; + const wchar_t runtimeClass[] = L"Windows.UI.Xaml.Automation.AutomationProperties"; + HRESULT hr = WindowsCreateString(runtimeClass, (UINT32)_countof(runtimeClass)-1, &className); + if (FAILED(hr)) + return hr; + + hr = RoGetActivationFactory(className, + __uuidof(ABI::Windows::UI::Xaml::Automation::IAutomationPropertiesStatics), + (void**)&m_AutomationProperties); + WindowsDeleteString(className); + return hr; + } + + HRESULT GetAutomationIdDirect( InstanceHandle handle, CString &automationId ) + { + automationId.Empty(); + if (!m_Diagnostics) + return E_NOINTERFACE; + + CComPtr inspectable; + HRESULT hr = m_Diagnostics->GetIInspectableFromHandle(handle, &inspectable); + if (FAILED(hr) || !inspectable) + return FAILED(hr) ? hr : E_FAIL; + + CComPtr dependencyObject; + hr = inspectable->QueryInterface(__uuidof(ABI::Windows::UI::Xaml::IDependencyObject), + (void**)&dependencyObject); + if (FAILED(hr) || !dependencyObject) + return FAILED(hr) ? hr : E_NOINTERFACE; + + hr = EnsureAutomationProperties(); + if (FAILED(hr)) + return hr; + + HSTRING value = NULL; + hr = m_AutomationProperties->GetAutomationId(dependencyObject, &value); + if (SUCCEEDED(hr) && value) + { + UINT32 length = 0; + const wchar_t *text = WindowsGetStringRawBuffer(value, &length); + if (text && length) + automationId.SetString(text, (int)length); + } + if (value) + WindowsDeleteString(value); + return hr; + } + HRESULT ResolveStartControl( InstanceHandle handle, const StartElement &element, bool *isStartControl ) { *isStartControl = false; @@ -542,6 +595,15 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal return S_OK; } + CString automationId; + HRESULT directHr = GetAutomationIdDirect(handle, automationId); + if (SUCCEEDED(directHr)) + { + *isStartControl = automationId.CompareNoCase(L"StartButton") == 0; + return S_OK; + } + + // Fallback for older/partial diagnostics implementations. unsigned int sourceCount = 0; unsigned int valueCount = 0; PropertyChainSource *sources = NULL;