refactor: 减少全局包含文件

src/Magpie/AppSettings.cpp

@@ -16,6 +16,7 @@
 #include "resource.h"
 #include "App.h"
 #include "MainWindow.h"
+#include <ShlObj.h>
 
 using namespace winrt;
 using namespace winrt::Magpie;  

src/Magpie/AppXReader.cpp

@@ -9,6 +9,7 @@
 #include <wincodec.h>
 #include <parallel_hashmap/phmap.h>
 #include <AppxPackaging.h>
+#include <propsys.h>
 
 using namespace winrt;
 using namespace Windows::Graphics::Imaging;

src/Magpie/AutoStartHelper.cpp

@@ -6,8 +6,7 @@
 #include "StrHelper.h"
 #include "Win32Helper.h"
 #include <propkey.h>
-
-#pragma comment(lib, "Taskschd.lib")
+#include <ShlObj.h>
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/Magpie/FileDialogHelper.h

@@ -1,4 +1,5 @@
 #pragma once
+#include <ShlObj.h>
 
 namespace Magpie {
 

src/Magpie/IconHelper.cpp

@@ -4,6 +4,7 @@
 #include "Win32Helper.h"
 #include "StrHelper.h"
 #include "resource.h"
+#include <Shlobj.h>
 
 using namespace winrt;
 using namespace Windows::Graphics::Imaging;

src/Magpie/Magpie.vcxproj

@@ -64,7 +64,7 @@
     <Link>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>Gdi32.lib;Dwmapi.lib;Shell32.lib;Ole32.lib;Imagehlp.lib;Comctl32.lib;Shlwapi.lib;Magnification.lib;bcp47mrm.lib;Shcore.lib;Uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Gdi32.lib;Dwmapi.lib;Shell32.lib;Ole32.lib;Imagehlp.lib;Comctl32.lib;Shlwapi.lib;Magnification.lib;bcp47mrm.lib;Shcore.lib;Uxtheme.lib;Taskschd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>d3dcompiler_47.dll;Magnification.dll;Imagehlp.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>

src/Magpie/NewProfileViewModel.cpp

@@ -10,6 +10,7 @@
 #include "AppXReader.h"
 #include "CommonSharedConstants.h"
 #include "CandidateWindowItem.h"
+#include <dwmapi.h>
 
 using namespace Magpie;
 

src/Magpie/NotifyIconService.cpp

@@ -4,6 +4,7 @@
 #include "Logger.h"
 #include "resource.h"
 #include "App.h"
+#include <CommCtrl.h>
 
 using namespace winrt::Magpie::implementation;
 

src/Magpie/ThemeHelper.cpp

@@ -1,6 +1,7 @@
 #include "pch.h"
 #include "ThemeHelper.h"
 #include "Win32Helper.h"
+#include <dwmapi.h>
 
 namespace Magpie {
 
@@ -14,17 +15,24 @@ enum class PreferredAppMode {
 	Max
 };
 
-using fnSetPreferredAppMode = PreferredAppMode (WINAPI*)(PreferredAppMode appMode);
-using fnAllowDarkModeForWindow = bool (WINAPI*)(HWND hWnd, bool allow);
-using fnRefreshImmersiveColorPolicyState = void (WINAPI*)();
-using fnFlushMenuThemes = void (WINAPI*)();
+using fnSetPreferredAppMode = PreferredAppMode(WINAPI*)(PreferredAppMode appMode);
+using fnAllowDarkModeForWindow = bool(WINAPI*)(HWND hWnd, bool allow);
+using fnRefreshImmersiveColorPolicyState = void(WINAPI*)();
+using fnFlushMenuThemes = void(WINAPI*)();
 
 static fnSetPreferredAppMode SetPreferredAppMode = nullptr;
 static fnAllowDarkModeForWindow AllowDarkModeForWindow = nullptr;
 static fnRefreshImmersiveColorPolicyState RefreshImmersiveColorPolicyState = nullptr;
 static fnFlushMenuThemes FlushMenuThemes = nullptr;
 
+[[maybe_unused]]
+static bool IsInitialized() noexcept {
+	return SetPreferredAppMode;
+}
+
 void ThemeHelper::Initialize() noexcept {
+	assert(!IsInitialized());
+
 	HMODULE hUxtheme = LoadLibraryEx(L"uxtheme.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
 	assert(hUxtheme);
 
@@ -38,6 +46,8 @@ void ThemeHelper::Initialize() noexcept {
 }
 
 void ThemeHelper::SetWindowTheme(HWND hWnd, bool darkBorder, bool darkMenu) noexcept {
+	assert(IsInitialized());
+
 	SetPreferredAppMode(darkMenu ? PreferredAppMode::ForceDark : PreferredAppMode::ForceLight);
 	AllowDarkModeForWindow(hWnd, darkMenu);
 

src/Magpie/ToastPage.cpp

@@ -8,6 +8,7 @@
 #include "LocalizationService.h"
 #include "XamlHelper.h"
 #include "App.h"
+#include <dwmapi.h>
 
 using namespace ::Magpie;
 using namespace winrt::Magpie::implementation;

src/Magpie/TouchHelper.cpp

@@ -5,6 +5,7 @@
 #include "Logger.h"
 #include "Win32Helper.h"
 #include "CommonSharedConstants.h"
+#include <Shlobj.h>
 
 namespace Magpie {
 

src/Magpie/XamlWindow.h

@@ -8,6 +8,7 @@
 #include "Logger.h"
 #include "Event.h"
 #include "WindowBase.h"
+#include <dwmapi.h>
 
 namespace Magpie {
 

src/Magpie/pch.h

@@ -10,8 +10,6 @@
 #include <SDKDDKVer.h>
 #include <windows.h>
 #include <windowsx.h>
-#include <dwmapi.h>
-#include <ShlObj.h>
 #include <shellapi.h>
 #include <Shlwapi.h>