[ci] use rolling cache keys for xmake dependency caches

.github/workflows/build.yml

@@ -115,7 +115,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: ~/.xmake/packages
-          key: ${{ runner.os }}-xmake-deps-${{ matrix.cache-key }}-${{ github.sha }}
+          key: "${{ runner.os }}-xmake-deps-${{ matrix.cache-key }}-${{ github.run_id }}"
           restore-keys: |
             ${{ runner.os }}-xmake-deps-${{ matrix.cache-key }}-
 
@@ -172,7 +172,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: D:\xmake_global\.xmake\packages
-          key: ${{ runner.os }}-xmake-deps-intel-${{ github.sha }}
+          key: "${{ runner.os }}-xmake-deps-intel-${{ github.run_id }}"
           restore-keys: |
             ${{ runner.os }}-xmake-deps-intel-
 

scripts/windows/crossdesk.rc

@@ -1,2 +1,2 @@
-// Application icon (IDI_ICON1 = 1, which is the default app icon resource ID)
+// Application icon resource; load by the resource name IDI_ICON1.
 IDI_ICON1 ICON "..\\..\\icons\\windows\\crossdesk.ico"

src/gui/render.cpp

@@ -7,8 +7,8 @@
 #include <X11/Xlib.h>
 #endif
 
-#include <cstdlib>
 #include <cmath>
+#include <cstdlib>
 #include <cstring>
 #include <filesystem>
 #include <fstream>
@@ -28,6 +28,7 @@
 #include "screen_capturer_factory.h"
 #include "version_checker.h"
 
+
 #if defined(__APPLE__)
 #include "window_util_mac.h"
 #endif
@@ -63,6 +64,19 @@ bool CanReadFontFile(const char* font_path) {
   return font_file.good();
 }
 
+#if _WIN32
+HICON LoadTrayIcon() {
+  HMODULE module = GetModuleHandleW(nullptr);
+  HICON icon = reinterpret_cast<HICON>(
+      LoadImageW(module, L"IDI_ICON1", IMAGE_ICON, 0, 0, LR_DEFAULTSIZE));
+  if (icon) {
+    return icon;
+  }
+
+  return LoadIconW(nullptr, IDI_APPLICATION);
+}
+#endif
+
 #if defined(__linux__) && !defined(__APPLE__)
 inline bool X11GetDisplayAndWindow(SDL_Window* window, Display** display_out,
                                    ::Window* x11_window_out) {
@@ -975,8 +989,9 @@ void Render::UpdateInteractions() {
       screen_capturer_is_started_ && !start_mouse_controller_ &&
       mouse_controller_is_started_;
   if (stop_wayland_mouse_before_screen) {
-    LOG_INFO("Stopping Wayland mouse controller before screen capturer to "
+    LOG_INFO(
-             "cleanly release the shared portal session");
+        "Stopping Wayland mouse controller before screen capturer to "
+        "cleanly release the shared portal session");
     StopMouseController();
     mouse_controller_is_started_ = false;
   }
@@ -1087,8 +1102,7 @@ int Render::CreateMainWindow() {
   HWND main_hwnd = (HWND)SDL_GetPointerProperty(
       props, SDL_PROP_WINDOW_WIN32_HWND_POINTER, NULL);
 
-  HICON tray_icon = (HICON)LoadImageW(NULL, L"crossdesk.ico", IMAGE_ICON, 0, 0,
+  HICON tray_icon = LoadTrayIcon();
-                                      LR_LOADFROMFILE | LR_DEFAULTSIZE);
   tray_ = std::make_unique<WinTray>(main_hwnd, tray_icon, L"CrossDesk",
                                     localization_language_index_);
 #endif
@@ -2311,7 +2325,8 @@ void Render::UpdateRenderRect() {
       rect_f.h = render_area_width * video_ratio_reverse;
     } else if (render_area_width > render_area_height * video_ratio) {
       rect_f.x =
-          std::abs(render_area_width - render_area_height * video_ratio) / 2.0f +
+          std::abs(render_area_width - render_area_height * video_ratio) /
+              2.0f +
           props->render_window_x_;
       rect_f.y = props->render_window_y_;
       rect_f.w = render_area_height * video_ratio;

src/screen_capturer/windows/wgc_plugin_entry.cpp

@@ -1,9 +1,26 @@
+#include <mutex>
+
+#include "path_manager.h"
+#include "rd_log.h"
 #include "screen_capturer_wgc.h"
 #include "wgc_plugin_api.h"
 
+namespace {
+
+void InitializePluginLogger() {
+  static std::once_flag once;
+  std::call_once(once, []() {
+    crossdesk::PathManager path_manager("CrossDesk");
+    crossdesk::InitLogger(path_manager.GetLogPath().string());
+  });
+}
+
+}  // namespace
+
 extern "C" {
 
 crossdesk::ScreenCapturer* CrossDeskCreateWgcCapturer() {
+  InitializePluginLogger();
   return new crossdesk::ScreenCapturerWgc();
 }
 

xmake/targets.lua

@@ -155,7 +155,7 @@ function setup_targets()
         target("wgc_plugin")
             set_kind("shared")
             add_packages("libyuv")
-            add_deps("rd_log")
+            add_deps("rd_log", "path_manager")
             add_defines("CROSSDESK_WGC_PLUGIN_BUILD=1")
             add_links("windowsapp")
             add_files("src/screen_capturer/windows/screen_capturer_wgc.cpp",