Fix "small" undef in Windows includes.

telegramdesktop · Nov 14, 2023 · 5cabfb5 · 5cabfb5
1 parent 8a19fab
commit 5cabfb5
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 14 deletions.
diff --git a/Telegram/SourceFiles/platform/win/integration_win.h b/Telegram/SourceFiles/platform/win/integration_win.h
@@ -7,13 +7,12 @@ For license and copyright information please follow this link:
 */
 #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 <QAbstractNativeEventFilter>
 
-#include <ShlObj.h>
-
 namespace Platform {
 
 class WindowsIntegration final

diff --git a/Telegram/SourceFiles/platform/win/launcher_win.cpp b/Telegram/SourceFiles/platform/win/launcher_win.cpp
@@ -9,8 +9,8 @@ For license and copyright information please follow this link:
 
 #include "core/crash_reports.h"
 #include "core/update_checker.h"
-#include "base/platform/win/base_windows_h.h"
 
+#include <windows.h>
 #include <shellapi.h>
 #include <VersionHelpers.h>
 

diff --git a/Telegram/SourceFiles/platform/win/main_window_win.h b/Telegram/SourceFiles/platform/win/main_window_win.h
@@ -8,9 +8,10 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "platform/platform_main_window.h"
-#include "base/platform/win/base_windows_h.h"
 #include "base/flags.h"
 
+#include <windows.h>
+
 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
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #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
@@ -14,6 +14,7 @@ For license and copyright information please follow this link:
 #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 @@ For license and copyright information please follow this link:
 #include <openssl/err.h>
 
 #include <dbghelp.h>
-#include <shlobj.h>
 #include <Shlwapi.h>
 #include <Strsafe.h>
 #include <Windowsx.h>

diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -8,7 +8,8 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "platform/platform_specific.h"
-#include "base/platform/win/base_windows_h.h"
+
+#include <windows.h>
 
 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
@@ -7,8 +7,6 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "base/platform/win/base_windows_h.h"
-
 #include <wtypes.h>
 
 namespace Platform {

diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.h b/Telegram/SourceFiles/platform/win/windows_dlls.h
@@ -7,10 +7,10 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "base/platform/win/base_windows_h.h"
+#include "base/platform/win/base_windows_shlobj_h.h"
 
+#include <windows.h>
 #include <shellapi.h>
-#include <shlobj.h>
 #include <dwmapi.h>
 #include <RestartManager.h>
 #include <psapi.h>

diff --git a/Telegram/SourceFiles/platform/win/windows_toast_activator.h b/Telegram/SourceFiles/platform/win/windows_toast_activator.h
@@ -7,7 +7,9 @@ For license and copyright information please follow this link:
 */
 #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
diff --git a/Telegram/lib_storage b/Telegram/lib_storage
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
diff --git a/Telegram/lib_webview b/Telegram/lib_webview