Cool_Tools/ExplorerPatcher
1
0
Fork 0
mirror of https://github.com/valinet/ExplorerPatcher.git synced 2024-11-15 11:33:16 +01:00
Code Releases Wiki Activity

Bugfix: Access violation on log off when EP runs alongside 7+TT (#894)

Browse Source
This commit is contained in:
Valentin Radu 2022-02-25 00:18:55 +02:00
parent d344cef35f
commit 43adf91203
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ExplorerPatcher/dllmain.c
View File

@ -1526,7 +1526,7 @@ LONG_PTR __stdcall CTaskBtnGroup_GetIdealSpanHook(ITaskBtnGroup* _this, LONG_PTR
void explorer_QISearch(void* that, LPCQITAB pqit, REFIID riid, void** ppv) void explorer_QISearch(void* that, LPCQITAB pqit, REFIID riid, void** ppv)
{ {
HRESULT hr = QISearch(that, pqit, riid, ppv); HRESULT hr = QISearch(that, pqit, riid, ppv);
if (SUCCEEDED(hr) && IsEqualGUID(pqit[0].piid, &IID_ITaskGroup)) if (SUCCEEDED(hr) && IsEqualGUID(pqit[0].piid, &IID_ITaskGroup) && bPinnedItemsActAsQuickLaunch)
{ {
ITaskGroup* pTaskGroup = (char*)that + pqit[0].dwOffset; ITaskGroup* pTaskGroup = (char*)that + pqit[0].dwOffset;
DWORD flOldProtect = 0; DWORD flOldProtect = 0;
@ -1540,7 +1540,7 @@ void explorer_QISearch(void* that, LPCQITAB pqit, REFIID riid, void** ppv)
VirtualProtect(pTaskGroup->lpVtbl, sizeof(ITaskGroupVtbl), flOldProtect, &flOldProtect); VirtualProtect(pTaskGroup->lpVtbl, sizeof(ITaskGroupVtbl), flOldProtect, &flOldProtect);
} }
} }
else if (SUCCEEDED(hr) && IsEqualGUID(pqit[0].piid, &IID_ITaskBtnGroup)) else if (SUCCEEDED(hr) && IsEqualGUID(pqit[0].piid, &IID_ITaskBtnGroup) && bRemoveExtraGapAroundPinnedItems)
{ {
ITaskBtnGroup* pTaskBtnGroup = (char*)that + pqit[0].dwOffset; ITaskBtnGroup* pTaskBtnGroup = (char*)that + pqit[0].dwOffset;
DWORD flOldProtect = 0; DWORD flOldProtect = 0;
@ -6245,7 +6245,7 @@ void WINAPI LoadSettings(LPARAM lParam)
if (dwRefreshUIMask & REFRESHUI_TASKBAR) if (dwRefreshUIMask & REFRESHUI_TASKBAR)
{ {
// this is mostly a hack... // this is mostly a hack...
DWORD dwGlomLevel = 2, dwSize = sizeof(DWORD), dwNewGlomLevel; /*DWORD dwGlomLevel = 2, dwSize = sizeof(DWORD), dwNewGlomLevel;
RegGetValueW(HKEY_CURRENT_USER, IsWindows11() ? TEXT(REGPATH) : L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"TaskbarGlomLevel", RRF_RT_DWORD, NULL, &dwGlomLevel, &dwSize); RegGetValueW(HKEY_CURRENT_USER, IsWindows11() ? TEXT(REGPATH) : L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"TaskbarGlomLevel", RRF_RT_DWORD, NULL, &dwGlomLevel, &dwSize);
Sleep(100); Sleep(100);
dwNewGlomLevel = 0; dwNewGlomLevel = 0;
@ -6257,7 +6257,7 @@ void WINAPI LoadSettings(LPARAM lParam)
Explorer_RefreshUI(0); Explorer_RefreshUI(0);
Sleep(100); Sleep(100);
RegSetKeyValueW(HKEY_CURRENT_USER, IsWindows11() ? TEXT(REGPATH) : L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"TaskbarGlomLevel", REG_DWORD, &dwGlomLevel, sizeof(DWORD)); RegSetKeyValueW(HKEY_CURRENT_USER, IsWindows11() ? TEXT(REGPATH) : L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"TaskbarGlomLevel", REG_DWORD, &dwGlomLevel, sizeof(DWORD));
Explorer_RefreshUI(0); Explorer_RefreshUI(0);*/
} }
} }
} }

26
ExplorerPatcher/settings.reg
View File

@ -168,11 +168,16 @@
;T Start menu ;T Start menu
[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
;z 2 Start menu style
;x 0 Windows 11 (default)
;x 1 Windows 10
"Start_ShowClassicMode"=dword:00000000
;y More Start menu options in the Settings app 🡕
;ms-settings:personalization-start
[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\StartPage] [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\StartPage]
;b Open Start at logon ;b Open Start at logon
"OpenAtLogon"=dword:00000000 "OpenAtLogon"=dword:00000000
;b Open Start in All apps by default
"MakeAllAppsDefault"=dword:00000000
[HKEY_CURRENT_USER\Software\ExplorerPatcher] [HKEY_CURRENT_USER\Software\ExplorerPatcher]
;c 22 Maximum number of frequent apps to show ;c 22 Maximum number of frequent apps to show
;x 0 None ;x 0 None
@ -198,11 +203,6 @@
;x 20 20 ;x 20 20
;x 99999 Unlimited ;x 99999 Unlimited
;"Virtualized_{D17F1E1A-5919-4427-8F89-A1A8503CA3EB}_Start_MaximumFrequentApps"=dword:00000006 ;"Virtualized_{D17F1E1A-5919-4427-8F89-A1A8503CA3EB}_Start_MaximumFrequentApps"=dword:00000006
[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
;c 2 Position on screen
;x 0 Left
;x 1 Center (default)
"TaskbarAl"=dword:00000001
[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\StartPage] [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\StartPage]
;a When using multiple displays, open Start on this monitor when invoked using ;a When using multiple displays, open Start on this monitor when invoked using
;c 10 the keyboard: ;c 10 the keyboard:
@ -217,7 +217,15 @@
;x 8 Monitor #8 ;x 8 Monitor #8
;x 9 Monitor #9 ;x 9 Monitor #9
"MonitorOverride"=dword:00000001 "MonitorOverride"=dword:00000001
;a If the selected monitor is not available, Start will open on the primary display. ;t The following settings only apply to the Windows 11 Start menu:
[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\StartPage]
;b Open Start in All apps by default
"MakeAllAppsDefault"=dword:00000000
[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
;c 2 Position on screen
;x 0 Left
;x 1 Center (default)
"TaskbarAl"=dword:00000001
;T Window switcher ;T Window switcher
@ -538,7 +546,7 @@
;t The following settings only apply to the Windows 10 taskbar: ;t The following settings only apply to the Windows 10 taskbar:
;b Pinned items act as quick launch (don't group pinned items with active apps) * ;b Pinned items act as quick launch (don't group pinned items with active apps) *
"PinnedItemsActAsQuickLaunch"=dword:00000000 "PinnedItemsActAsQuickLaunch"=dword:00000000
;b When the taskbar shows button labels, remove the extra gap around pinned items ;b When the taskbar shows button labels, remove the extra gap around pinned items *
"RemoveExtraGapAroundPinnedItems"=dword:00000000 "RemoveExtraGapAroundPinnedItems"=dword:00000000

2
ExplorerPatcher/settings10.reg
View File

@ -457,7 +457,7 @@
"EnableSymbolDownload"=dword:00000001 "EnableSymbolDownload"=dword:00000001
;b Pinned items act as quick launch (don't group pinned items with active apps) * ;b Pinned items act as quick launch (don't group pinned items with active apps) *
"PinnedItemsActAsQuickLaunch"=dword:00000000 "PinnedItemsActAsQuickLaunch"=dword:00000000
;b When the taskbar shows button labels, remove the extra gap around pinned items ;b When the taskbar shows button labels, remove the extra gap around pinned items *
"RemoveExtraGapAroundPinnedItems"=dword:00000000 "RemoveExtraGapAroundPinnedItems"=dword:00000000