From 5cabfb56e0caa4fb17e90809cd5927e906957ebf Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 13 Nov 2023 22:27:31 +0400 Subject: [PATCH] Fix "small" undef in Windows includes. --- Telegram/SourceFiles/platform/win/integration_win.h | 3 +-- Telegram/SourceFiles/platform/win/launcher_win.cpp | 2 +- Telegram/SourceFiles/platform/win/main_window_win.h | 3 ++- .../SourceFiles/platform/win/notifications_manager_win.cpp | 1 + Telegram/SourceFiles/platform/win/specific_win.cpp | 2 +- Telegram/SourceFiles/platform/win/specific_win.h | 3 ++- Telegram/SourceFiles/platform/win/windows_app_user_model_id.h | 2 -- Telegram/SourceFiles/platform/win/windows_dlls.h | 4 ++-- Telegram/SourceFiles/platform/win/windows_toast_activator.h | 2 ++ Telegram/lib_base | 2 +- Telegram/lib_storage | 2 +- Telegram/lib_ui | 2 +- Telegram/lib_webview | 2 +- 13 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Telegram/SourceFiles/platform/win/integration_win.h b/Telegram/SourceFiles/platform/win/integration_win.h index 5e559b69a..dae978411 100644 --- a/Telegram/SourceFiles/platform/win/integration_win.h +++ b/Telegram/SourceFiles/platform/win/integration_win.h @@ -7,13 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +#include "base/platform/win/base_windows_shlobj_h.h" #include "base/platform/win/base_windows_winrt.h" #include "platform/platform_integration.h" #include -#include - namespace Platform { class WindowsIntegration final diff --git a/Telegram/SourceFiles/platform/win/launcher_win.cpp b/Telegram/SourceFiles/platform/win/launcher_win.cpp index 5b19892bf..d6bf912ba 100644 --- a/Telegram/SourceFiles/platform/win/launcher_win.cpp +++ b/Telegram/SourceFiles/platform/win/launcher_win.cpp @@ -9,8 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/crash_reports.h" #include "core/update_checker.h" -#include "base/platform/win/base_windows_h.h" +#include #include #include diff --git a/Telegram/SourceFiles/platform/win/main_window_win.h b/Telegram/SourceFiles/platform/win/main_window_win.h index 9459fe50f..856bee773 100644 --- a/Telegram/SourceFiles/platform/win/main_window_win.h +++ b/Telegram/SourceFiles/platform/win/main_window_win.h @@ -8,9 +8,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "platform/platform_main_window.h" -#include "base/platform/win/base_windows_h.h" #include "base/flags.h" +#include + namespace Ui { class PopupMenu; } // namespace Ui diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp index 41bf5f786..be0840636 100644 --- a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp +++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/notifications_utilities.h" #include "window/window_session_controller.h" #include "base/platform/win/base_windows_co_task_mem.h" +#include "base/platform/win/base_windows_rpcndr_h.h" #include "base/platform/win/base_windows_winrt.h" #include "base/platform/base_platform_info.h" #include "base/platform/win/wrl/wrl_module_h.h" diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp index 3f504357d..77cc18de5 100644 --- a/Telegram/SourceFiles/platform/win/specific_win.cpp +++ b/Telegram/SourceFiles/platform/win/specific_win.cpp @@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/win/windows_autostart_task.h" #include "base/platform/base_platform_info.h" #include "base/platform/win/base_windows_co_task_mem.h" +#include "base/platform/win/base_windows_shlobj_h.h" #include "base/platform/win/base_windows_winrt.h" #include "base/call_delayed.h" #include "ui/boxes/confirm_box.h" @@ -41,7 +42,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include -#include #include #include #include diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h index acb2eda92..56f73a1b4 100644 --- a/Telegram/SourceFiles/platform/win/specific_win.h +++ b/Telegram/SourceFiles/platform/win/specific_win.h @@ -8,7 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "platform/platform_specific.h" -#include "base/platform/win/base_windows_h.h" + +#include namespace Data { class LocationPoint; diff --git a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.h b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.h index 4f69019eb..76a7a3312 100644 --- a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.h +++ b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.h @@ -7,8 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "base/platform/win/base_windows_h.h" - #include namespace Platform { diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.h b/Telegram/SourceFiles/platform/win/windows_dlls.h index d97eeab92..26f478376 100644 --- a/Telegram/SourceFiles/platform/win/windows_dlls.h +++ b/Telegram/SourceFiles/platform/win/windows_dlls.h @@ -7,10 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "base/platform/win/base_windows_h.h" +#include "base/platform/win/base_windows_shlobj_h.h" +#include #include -#include #include #include #include diff --git a/Telegram/SourceFiles/platform/win/windows_toast_activator.h b/Telegram/SourceFiles/platform/win/windows_toast_activator.h index ba6c2b32c..0c859421f 100644 --- a/Telegram/SourceFiles/platform/win/windows_toast_activator.h +++ b/Telegram/SourceFiles/platform/win/windows_toast_activator.h @@ -7,7 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +#include "base/platform/win/base_windows_rpcndr_h.h" #include "windows_toastactivator_h.h" + #include "base/platform/win/wrl/wrl_implements_h.h" // {F11932D3-6110-4BBC-9B02-B2EC07A1BD19} diff --git a/Telegram/lib_base b/Telegram/lib_base index fe4f0a72d..5432626ef 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit fe4f0a72d2041a860c67a81a70f2e4b6f845d9fb +Subproject commit 5432626ef2af59f55110c3bf17556d16c48a4ac3 diff --git a/Telegram/lib_storage b/Telegram/lib_storage index 1dfd1c186..de7318851 160000 --- a/Telegram/lib_storage +++ b/Telegram/lib_storage @@ -1 +1 @@ -Subproject commit 1dfd1c186dd67e8de5f0721e6fae487a05f3ea94 +Subproject commit de731885163bc1b3fe3095413453777ee89a8561 diff --git a/Telegram/lib_ui b/Telegram/lib_ui index f9b24c755..fee301f94 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit f9b24c75512bc5f73b9ec5e6612858394582a328 +Subproject commit fee301f94197d3351f2f20671c329b81540e63e2 diff --git a/Telegram/lib_webview b/Telegram/lib_webview index aab27269f..3495eb8dd 160000 --- a/Telegram/lib_webview +++ b/Telegram/lib_webview @@ -1 +1 @@ -Subproject commit aab27269ff8aad5dfaf7372db10bff700fdb5fe9 +Subproject commit 3495eb8dd8f4e2dab9493b4a698e5006fadbca47