From 03046b7515bbe1a6de375165a26502ca3dc9dcd9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 4 Dec 2024 14:19:16 +0000 Subject: [PATCH] deploy: 1c07c82111a8cfb4c2a1757f702e598172570193 --- catalog.json | 7 +- .../explorer-details-better-file-sizes.md | 6 + .../explorer-details-better-file-sizes.wh.cpp | 123 +++++++++++++++--- updates.atom | 32 ++--- 4 files changed, 131 insertions(+), 37 deletions(-) diff --git a/catalog.json b/catalog.json index d71dbcc2d..e14d3a21c 100644 --- a/catalog.json +++ b/catalog.json @@ -1132,7 +1132,7 @@ "published": 1730231151000, "rating": 10, "ratingUsers": 105, - "updated": 1731243474000, + "updated": 1733321929000, "users": 5920 }, "metadata": { @@ -1141,7 +1141,8 @@ "description": "Optional improvements: show folder sizes, use MB/GB for large files (by default, all sizes are shown in KBs), use IEC terms (such as KiB instead of KB)", "exclude": [ "conhost.exe", - "plex.exe" + "Plex.exe", + "Plex Media Server.exe" ], "github": "https://github.com/m417z", "homepage": "https://m417z.com/", @@ -1150,7 +1151,7 @@ ], "name": "Better file sizes in Explorer details", "twitter": "https://twitter.com/m417z", - "version": "1.4.4" + "version": "1.4.5" } }, "explorer-frame-classic": { diff --git a/changelogs/explorer-details-better-file-sizes.md b/changelogs/explorer-details-better-file-sizes.md index 7e2c634ab..e73073ff5 100644 --- a/changelogs/explorer-details-better-file-sizes.md +++ b/changelogs/explorer-details-better-file-sizes.md @@ -1,3 +1,9 @@ +## 1.4.5 ([Dec 4, 2024](https://github.com/ramensoftware/windhawk-mods/blob/1c07c82111a8cfb4c2a1757f702e598172570193/mods/explorer-details-better-file-sizes.wh.cpp)) + +* Fixed Explorer hanging when Open Path is used in Everything. +* Excluded Plex Media Server which is incompatible, a proper fix will be implemented later. +* Added support for older Windows 10 versions. + ## 1.4.4 ([Nov 10, 2024](https://github.com/ramensoftware/windhawk-mods/blob/f396f78d645dc57089bf4805a63b0bd82f50d745/mods/explorer-details-better-file-sizes.wh.cpp)) * Fixed the "Mix files and folders when sorting by size" option that stopped working in version 1.4.2. diff --git a/mods/explorer-details-better-file-sizes.wh.cpp b/mods/explorer-details-better-file-sizes.wh.cpp index 4e1349cab..c0e2f5f53 100644 --- a/mods/explorer-details-better-file-sizes.wh.cpp +++ b/mods/explorer-details-better-file-sizes.wh.cpp @@ -2,14 +2,15 @@ // @id explorer-details-better-file-sizes // @name Better file sizes in Explorer details // @description Optional improvements: show folder sizes, use MB/GB for large files (by default, all sizes are shown in KBs), use IEC terms (such as KiB instead of KB) -// @version 1.4.4 +// @version 1.4.5 // @author m417z // @github https://github.com/m417z // @twitter https://twitter.com/m417z // @homepage https://m417z.com/ // @include * // @exclude conhost.exe -// @exclude plex.exe +// @exclude Plex.exe +// @exclude Plex Media Server.exe // @compilerOptions -lole32 -loleaut32 -lpropsys // ==/WindhawkMod== @@ -449,28 +450,13 @@ DWORD WINAPI Everything4Wh_Thread(void* parameter) { return 0; } -LPCITEMIDLIST PIDLNext(LPCITEMIDLIST pidl) { - return reinterpret_cast(reinterpret_cast(pidl) + - pidl->mkid.cb); -} - -size_t PIDLSize(LPCITEMIDLIST pidl) { - size_t s = 0; - while (pidl->mkid.cb > 0) { - s += pidl->mkid.cb; - pidl = PIDLNext(pidl); - } - // We add 2 because an LPITEMIDLIST is terminated by two NULL bytes. - return 2 + s; -} - std::vector PIDLToVector(const ITEMIDLIST* pidl) { if (!pidl) { return {}; } const BYTE* ptr = reinterpret_cast(pidl); - size_t size = PIDLSize(pidl); + size_t size = ILGetSize(pidl); return std::vector(ptr, ptr + size); } @@ -789,6 +775,97 @@ HRESULT WINAPI CFSFolder_CompareIDs_Hook(void* pCFSFolder, } } +using SHOpenFolderAndSelectItems_t = decltype(&SHOpenFolderAndSelectItems); +SHOpenFolderAndSelectItems_t SHOpenFolderAndSelectItems_Original; +HRESULT WINAPI SHOpenFolderAndSelectItems_Hook(LPCITEMIDLIST pidlFolder, + UINT cidl, + LPCITEMIDLIST* apidl, + DWORD dwFlags) { + Wh_Log(L">"); + + // If the current thread is the UI thread, run the function in a new thread + // to prevent a deadlock. See: + // https://voidtools.com/forum/viewtopic.php?p=71433#p71433 + + bool isUiThread = false; + + EnumThreadWindows( + GetCurrentThreadId(), + [](HWND hWnd, LPARAM lParam) WINAPI -> BOOL { + constexpr WCHAR kClassNamePrefix[] = + L"EVERYTHING_TASKBAR_NOTIFICATION"; + constexpr size_t kClassNameLen = ARRAYSIZE(kClassNamePrefix) - 1; + + bool& isUiThread = *(bool*)lParam; + + WCHAR szClassName[64]; + if (GetClassName(hWnd, szClassName, ARRAYSIZE(szClassName)) == 0) { + return TRUE; + } + + if (_wcsnicmp(kClassNamePrefix, szClassName, kClassNameLen) == 0) { + isUiThread = true; + return FALSE; + } + + return TRUE; + }, + (LPARAM)&isUiThread); + + if (!isUiThread) { + return SHOpenFolderAndSelectItems_Original(pidlFolder, cidl, apidl, + dwFlags); + } + + struct ThreadParam { + LPITEMIDLIST pidlFolder; + std::vector apidl; + DWORD dwFlags; + }; + + auto threadParam = std::make_unique(); + + threadParam->pidlFolder = ILClone(pidlFolder); + + if (cidl) { + threadParam->apidl.reserve(cidl); + for (UINT i = 0; i < cidl; i++) { + threadParam->apidl.push_back(ILClone(apidl[i])); + } + } + + threadParam->dwFlags = dwFlags; + + HANDLE thread = CreateThread( + nullptr, 0, + [](LPVOID lpParam) WINAPI -> DWORD { + Wh_Log(L">"); + + std::unique_ptr threadParam{(ThreadParam*)lpParam}; + + CoInitializeEx(nullptr, COINIT_MULTITHREADED); + + SHOpenFolderAndSelectItems_Original( + threadParam->pidlFolder, threadParam->apidl.size(), + (LPCITEMIDLIST*)threadParam->apidl.data(), + threadParam->dwFlags); + + ILFree(threadParam->pidlFolder); + for (auto pidl : threadParam->apidl) { + ILFree(pidl); + } + + CoUninitialize(); + return 0; + }, + threadParam.release(), 0, nullptr); + if (thread) { + CloseHandle(thread); + } + + return S_OK; +} + using PSFormatForDisplayAlloc_t = decltype(&PSFormatForDisplayAlloc); PSFormatForDisplayAlloc_t PSFormatForDisplayAlloc_Original; HRESULT WINAPI PSFormatForDisplayAlloc_Hook(const PROPERTYKEY& key, @@ -922,8 +999,14 @@ bool HookWindowsStorageSymbols() { { #ifdef _WIN64 LR"(public: virtual long __cdecl CDefItem::GetValue(enum VALUE_ACCESS_MODE,struct _tagpropertykey const &,struct tagPROPVARIANT *,enum VALUE_STATE *))", + + // Older Win10 versions. + LR"(public: virtual long __cdecl CDefItem::GetValue(enum tagACCESS_MODE,struct _tagpropertykey const &,struct tagPROPVARIANT *,enum tagVALUE_STATE *))", #else LR"(public: virtual long __stdcall CDefItem::GetValue(enum VALUE_ACCESS_MODE,struct _tagpropertykey const &,struct tagPROPVARIANT *,enum VALUE_STATE *))", + + // Older Win10 versions. + LR"(public: virtual long __stdcall CDefItem::GetValue(enum tagACCESS_MODE,struct _tagpropertykey const &,struct tagPROPVARIANT *,enum tagVALUE_STATE *))", #endif }, &CDefItem_GetValue_Original, @@ -1215,6 +1298,10 @@ BOOL Wh_ModInit() { Wh_Log(L"Failed hooking Windows Storage symbols"); return false; } + + WindhawkUtils::Wh_SetFunctionHookT( + SHOpenFolderAndSelectItems, SHOpenFolderAndSelectItems_Hook, + &SHOpenFolderAndSelectItems_Original); } if (g_settings.disableKbOnlySizes) { diff --git a/updates.atom b/updates.atom index f4c3e3482..e2d4b60ef 100644 --- a/updates.atom +++ b/updates.atom @@ -2,12 +2,27 @@ https://windhawk.net/ Windhawk Mod Updates - 2024-12-04T13:58:49.000Z + 2024-12-04T14:18:49.000Z https://github.com/jpmonette/feed Updates in the official collection of Windhawk mods https://windhawk.net/favicon.ico Ramen Software + + <![CDATA[Better file sizes in Explorer details 1.4.5]]> + https://windhawk.net/mods/explorer-details-better-file-sizes#1c07c82111a8cfb4c2a1757f702e598172570193 + + 2024-12-04T14:18:49.000Z + +
  • Fixed Explorer hanging when Open Path is used in Everything.
    • +
  • Excluded Plex Media Server which is incompatible, a proper fix will be implemented later.
    • +
  • Added support for older Windows 10 versions.
    • +]]>     + + m417z + https://github.com/m417z + +     <![CDATA[Taskbar Labels for Windows 11 1.3.3]]> https://windhawk.net/mods/taskbar-labels#b0179b2e31ee74e302077bfb2de1b7cdfc6092d7 @@ -283,21 +298,6 @@ center, etc. to another monitor.

    2024-11-10T12:57:54.000Z
  • Fixed the "Mix files and folders when sorting by size" option that stopped working in version 1.4.2.
    • -]]>     - - m417z - https://github.com/m417z - -     - - <![CDATA[Better file sizes in Explorer details 1.4.3]]> - https://windhawk.net/mods/explorer-details-better-file-sizes#49e105f33c5fef9363a0dae4f6e12a9b5ec31746 - - 2024-11-10T12:29:58.000Z - -
  • Excluded Plex which is incompatible, a proper fix will be implemented later.
    • -
  • Excluded conhost to reduce possible conflicts, the mod isn't relevant for it anyway.
    • -
  • Improved the workaround to the error message that says "Runtime Error - Not Enough space for thread Data" to cover more (hopefully all) cases.
    • ]]>     m417z