Merge branch 'valinet:master' into master

deep-soft · Aug 2, 2024 · 28fdd73 · 28fdd73
2 parents b0d5f2a + 3c50ea3
commit 28fdd73
Show file tree

Hide file tree

Showing 113 changed files with 4,077 additions and 2,720 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -91,32 +91,32 @@ jobs:
         run: |
           BuildDependencies%BUILD_CONFIGURATION%.bat
 
-      # - name: Download ep_taskbar
-      #   uses: robinraju/release-downloader@v1
-      #   with:
-      #     repository: ExplorerPatcher/ep_taskbar_releases
-      #     fileName: ep_taskbar.*.dll
-      #     latest: true
-      #     out-file-path: build/Release
+      - name: Download ep_taskbar
+        uses: robinraju/release-downloader@v1
+        with:
+          repository: ExplorerPatcher/ep_taskbar_releases
+          fileName: ep_taskbar.*.dll
+          latest: true
+          out-file-path: build/Release
 
       # build/Release/ep_taskbar.*.amd64.dll -> build/Release/x64/ep_taskbar.*.dll
       # build/Release/ep_taskbar.*.arm64.dll -> build/Release/ARM64/ep_taskbar.*.dll
-      # - name: Move ep_taskbar
-      #   shell: bash
-      #   run: |
-      #     if ls build/Release/ep_taskbar.*.amd64.dll 1> /dev/null 2>&1; then
-      #       mkdir -p build/Release/x64
-      #       for file in build/Release/ep_taskbar.*.amd64.dll; do
-      #         mv "$file" "build/Release/x64/$(basename "$file" .amd64.dll).dll"
-      #       done
-      #     fi
-      #     
-      #     if ls build/Release/ep_taskbar.*.arm64.dll 1> /dev/null 2>&1; then
-      #       mkdir -p build/Release/ARM64
-      #       for file in build/Release/ep_taskbar.*.arm64.dll; do
-      #         mv "$file" "build/Release/ARM64/$(basename "$file" .arm64.dll).dll"
-      #       done
-      #     fi
+      - name: Move ep_taskbar
+        shell: bash
+        run: |
+          if ls build/Release/ep_taskbar.*.amd64.dll 1> /dev/null 2>&1; then
+            mkdir -p build/Release/x64
+            for file in build/Release/ep_taskbar.*.amd64.dll; do
+              mv "$file" "build/Release/x64/$(basename "$file" .amd64.dll).dll"
+            done
+          fi
+          
+          if ls build/Release/ep_taskbar.*.arm64.dll 1> /dev/null 2>&1; then
+            mkdir -p build/Release/ARM64
+            for file in build/Release/ep_taskbar.*.arm64.dll; do
+              mv "$file" "build/Release/ARM64/$(basename "$file" .arm64.dll).dll"
+            done
+          fi
 
       - name: Build EP IA-32
         if: github.event.inputs.config == ''
@@ -179,7 +179,7 @@ jobs:
             build/Release/
 
       # build/Release/x64/ep_setup.exe -> build/Release/ep_setup.exe
-      # build/Release/ARM64/ep_setup.exe -> build/Release/ep_setup.arm64.exe
+      # build/Release/ARM64/ep_setup.exe -> build/Release/ep_setup_arm64.exe
       - name: Stage files for release
         if: github.ref == 'refs/heads/master' && github.event.inputs.ref == ''
         shell: bash
@@ -188,7 +188,7 @@ jobs:
             cp build/Release/x64/ep_setup.exe build/Release/ep_setup.exe
           fi
           if [ -d "build/Release/ARM64" ] && ls build/Release/ARM64/ep_setup.exe 1> /dev/null 2>&1; then
-            cp build/Release/ARM64/ep_setup.exe build/Release/ep_setup.arm64.exe
+            cp build/Release/ARM64/ep_setup.exe build/Release/ep_setup_arm64.exe
           fi
 
       - name: Generate release name
@@ -221,7 +221,7 @@ jobs:
           body: ${{ steps.release_description.outputs.data }}
           files: |
             build/Release/ep_setup.exe
-            build/Release/ep_setup.arm64.exe
+            build/Release/ep_setup_arm64.exe
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
 
@@ -237,6 +237,6 @@ jobs:
           body: ${{ steps.release_description.outputs.data }}
           files: |
             build/Release/ep_setup.exe
-            build/Release/ep_setup.arm64.exe
+            build/Release/ep_setup_arm64.exe
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,18 +15,46 @@ Tested on OS builds 19045.4598, 22621.3296, 22621.3810, 26120.961, and 26244.500
 
 ##### 2
 
+<details>
+
 * Taskbar10: Due to false positive antivirus detections, the new taskbar implementation is no longer bundled in the setup program. (48c2a75)
   * If you want to use the new taskbar implementation, you can download the appropriate DLL for your system from the [Releases](https://github.com/ExplorerPatcher/ep_taskbar_releases/releases/latest) page of its releases repository, and then manually putting it in `C:\Program Files\ExplorerPatcher` without the architecture specifier.
   * For example, for 226xx builds on x64-based systems, download `ep_taskbar.2.amd64.dll`, rename to `ep_taskbar.2.dll`, and lastly put it in `C:\Program Files\ExplorerPatcher`.
 
+</details>
+
 ##### 3
 
 * Introduced support for ARM64 devices. (992b3a6, 2e4e4f5, b76c0e4, c9884b2, 57f63ad, 78788ec, 4799b4b, 5d0d218)
   * These builds are only tested on and made to work with 24H2 ARM64 builds. Older ARM64 Windows versions than 24H2 may not work as expected.
-  * An ARM64 device to support the making and testing of ARM64 builds is not cheap, so please consider [donating @Amrsatrio via Ko-fi](https://ko-fi.com/amrsatrio) to recoup the costs.
 * Added an "Update now" button into update notifications for easier updating. (2b9c747, 8c16a9a)
 * Revised how files are packed in ep_setup for smaller size and easier maintenance. (30579b0, b253625, 04fd2b7, db54ce9, 126c024, c0201ff)
-* ⚠️ **Note for users with the pre-release versions enabled:** Versions before this one will not be able to update to this version or later versions due to the updater code of previous versions not supporting multiple binaries in one GitHub release. Please manually update by downloading the appropriate binary from this page.
+* EP's taskbar implementation for 24H2 is now available in [its releases repository](https://github.com/ExplorerPatcher/ep_taskbar_releases/releases/latest), as `ep_taskbar.5.dll`. If you want to try this out, follow the steps explained above.
+
+##### 4
+
+With this update, ExplorerPatcher is now officially compatible and supported on Windows 11 24H2 🥳🎉
+
+* Start10: Now works again on 24H2 and 226xx.3930+. (755f101, 7e0f7eb, b473114)
+* Taskbar10: EP's taskbar DLLs are now included again in the setup files. (d9595fc)
+* Taskbar10: Network icon now shows again on 24H2. (7e0f7eb, b473114)
+* Start10: Fixed positioning when the taskbar is not placed at the bottom, on 24H2 and latest 22H2/23H2 builds. (de2532d, ea5881f)
+* Taskbar10: Fixed taskbar jump list flyout positioning when the taskbar is not placed at the bottom, on latest 22H2/23H2/24H2 builds. (39609e4)
+* Setup: Updated the code for dealing with locked files, this should reduce the chances of getting setup failures due to locked files. (7e0f7eb)
+* ep_taskbar: Fixed tray icons not being saved.
+* ep_taskbar: Removed the Copilot button on 22H2.
+
+ℹ️ **Important note:** Please include the following folders in your antivirus' exclusion list to prevent issues due to false positive detections:
+* `C:\Program Files\ExplorerPatcher`
+* `%APPDATA%\ExplorerPatcher`
+
+For Defender, you can run the following script in PowerShell as an administrator:
+```ps1
+Add-MpPreference -ExclusionPath "C:\Program Files\ExplorerPatcher"
+Add-MpPreference -ExclusionPath "$env:APPDATA\ExplorerPatcher"
+```
+
+**A little request from us:** Because the development of EP's taskbar implementation took a lot of effort for 8 consecutive months, and that an ARM64 device to support the making and testing of ARM64 builds is not cheap, it would be really, really appreciated if you can [donate @Amrsatrio via Ko-fi](https://ko-fi.com/amrsatrio) 🙏
 
 ## 22621.3527.65
 

diff --git a/ExplorerPatcher-L10N b/ExplorerPatcher-L10N
diff --git a/ExplorerPatcher/ArchiveMenu.h b/ExplorerPatcher/ArchiveMenu.h
@@ -4,6 +4,10 @@
 #include <Windows.h>
 #include <Shlobj_core.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define OPEN_NAME L"&Open archive"
 #define EXTRACT_NAME L"&Extract to \"%s\\\""
 #define OPEN_CMD L"\"C:\\Program Files\\7-Zip\\7zFM.exe\" %s"
@@ -51,4 +55,8 @@ LRESULT CALLBACK ArchiveMenuWndProc(
     void(*ImmersiveContextMenuHelper_RemoveOwnerDrawFromMenuFunc)(HMENU hMenu, HWND hWnd)
 );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/ExplorerPatcher/ExplorerPatcher.vcxproj b/ExplorerPatcher/ExplorerPatcher.vcxproj
@@ -256,6 +256,9 @@
     <ClCompile Include="TaskbarCenter.c">
       <ExcludedFromBuild Condition="'$(WithMainPatcher)'!='true'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="TwinUIPatches.cpp">
+      <ExcludedFromBuild Condition="'$(WithMainPatcher)'!='true'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="updates.cpp">
       <ExcludedFromBuild Condition="'$(WithMainPatcher)'!='true'">true</ExcludedFromBuild>
     </ClCompile>

diff --git a/ExplorerPatcher/StartMenu.h b/ExplorerPatcher/StartMenu.h
@@ -179,42 +179,6 @@ interface IImmersiveLauncher10RS
     CONST_VTBL struct IImmersiveLauncher10RSVtbl* lpVtbl;
 };
 
-DEFINE_GUID(IID_ILauncherTipContextMenu,
-    0xb8c1db5f,
-    0xcbb3, 0x48bc, 0xaf, 0xd9,
-    0xce, 0x6b, 0x88, 0x0c, 0x79, 0xed
-);
-
-typedef interface ILauncherTipContextMenu ILauncherTipContextMenu;
-
-typedef struct ILauncherTipContextMenuVtbl
-{
-    BEGIN_INTERFACE
-
-        HRESULT(STDMETHODCALLTYPE* QueryInterface)(
-            ILauncherTipContextMenu* This,
-            /* [in] */ REFIID riid,
-            /* [annotation][iid_is][out] */
-            _COM_Outptr_  void** ppvObject);
-
-    ULONG(STDMETHODCALLTYPE* AddRef)(
-        ILauncherTipContextMenu* This);
-
-    ULONG(STDMETHODCALLTYPE* Release)(
-        ILauncherTipContextMenu* This);
-
-    HRESULT(STDMETHODCALLTYPE* ShowLauncherTipContextMenu)(
-        ILauncherTipContextMenu* This,
-        /* [in] */ POINT* pt);
-
-    END_INTERFACE
-} ILauncherTipContextMenuVtbl;
-
-interface ILauncherTipContextMenu
-{
-    CONST_VTBL struct ILauncherTipContextMenuVtbl* lpVtbl;
-};
-
 void OpenStartOnMonitor(HMONITOR monitor);
 
 // Slightly tweaked version of function available in Open Shell
+2 −2		resources/lang/ep_gui.ru-RU.rc
+2 −2		resources/lang/ep_gui.zh-TW.rc
+1 −1		resources/lang/ep_setup.pl-PL.rc
+1 −1		resources/lang/ep_setup.ru-RU.rc
+1 −1		resources/lang/ep_setup.zh-TW.rc