Merge pull request #52963 from Pineapple/WIN32_LEAN_AND_MEAN_master

drivers/unix/ip_unix.cpp

@@ -36,9 +36,9 @@
 
 #ifdef WINDOWS_ENABLED
 #include <stdio.h>
-#include <winsock2.h>
-// Needs to be included after winsocks2.h
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <winsock2.h>
 #include <ws2tcpip.h>
 #ifndef UWP_ENABLED
 #include <iphlpapi.h>

drivers/wasapi/audio_driver_wasapi.h

@@ -39,6 +39,7 @@
 
 #include <audioclient.h>
 #include <mmdeviceapi.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 class AudioDriverWASAPI : public AudioDriver {

drivers/windows/dir_access_windows.cpp

@@ -37,6 +37,7 @@
 
 #include <stdio.h>
 #include <wchar.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 /*

drivers/windows/file_access_windows.cpp

@@ -37,6 +37,7 @@
 
 #include <share.h> // _SH_DENYNO
 #include <shlwapi.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #include <errno.h>

drivers/winmidi/midi_driver_winmidi.h

@@ -37,6 +37,7 @@
 #include "core/templates/vector.h"
 
 #include <stdio.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #include <mmsystem.h>

drivers/xaudio2/audio_driver_xaudio2.h

@@ -36,6 +36,7 @@
 #include "servers/audio_server.h"
 
 #include <mmsystem.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <wrl/client.h>
 #include <xaudio2.h>

modules/mono/utils/mono_reg_utils.cpp

@@ -35,7 +35,7 @@
 
 #include "core/os/os.h"
 
-// Here, after os/os.h
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 namespace MonoRegUtils {

modules/mono/utils/path_utils.cpp

@@ -36,6 +36,7 @@
 #include "core/os/os.h"
 
 #ifdef WINDOWS_ENABLED
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #define ENV_PATH_SEP ";"

platform/uwp/os_uwp.cpp

@@ -28,14 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-// Must include Winsock before windows.h (included by os_uwp.h)
-#include "drivers/unix/net_socket_posix.h"
-
 #include "os_uwp.h"
 
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
 #include "drivers/unix/ip_unix.h"
+#include "drivers/unix/net_socket_posix.h"
 #include "drivers/windows/dir_access_windows.h"
 #include "drivers/windows/file_access_windows.h"
 #include "drivers/windows/mutex_windows.h"

platform/uwp/os_uwp.h

@@ -45,6 +45,7 @@
 #include <fcntl.h>
 #include <io.h>
 #include <stdio.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 class OS_UWP : public OS {

platform/windows/context_gl_windows.h

@@ -38,6 +38,7 @@
 #include "core/error/error_list.h"
 #include "core/os/os.h"
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 typedef bool(APIENTRY *PFNWGLSWAPINTERVALEXTPROC)(int interval);

platform/windows/crash_handler_windows.h

@@ -31,6 +31,7 @@
 #ifndef CRASH_HANDLER_WINDOWS_H
 #define CRASH_HANDLER_WINDOWS_H
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 // Crash handler exception only enabled with MSVC

platform/windows/display_server_windows.h

@@ -63,6 +63,7 @@
 #include <fcntl.h>
 #include <io.h>
 #include <stdio.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <windowsx.h>
 

platform/windows/key_mapping_windows.h

@@ -33,8 +33,8 @@
 
 #include "core/os/keyboard.h"
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-
 #include <winuser.h>
 
 class KeyMappingWindows {

platform/windows/os_windows.cpp

@@ -28,15 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-// Must include Winsock before windows.h (included by os_windows.h)
-#include "drivers/unix/net_socket_posix.h"
-
 #include "os_windows.h"
 
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
 #include "core/io/marshalls.h"
 #include "core/version_generated.gen.h"
+#include "drivers/unix/net_socket_posix.h"
 #include "drivers/windows/dir_access_windows.h"
 #include "drivers/windows/file_access_windows.h"
 #include "joypad_windows.h"

platform/windows/os_windows.h

@@ -57,7 +57,9 @@
 
 #include <fcntl.h>
 #include <io.h>
+#include <shellapi.h>
 #include <stdio.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <windowsx.h>
 

platform/windows/vulkan_context_win.h

@@ -32,6 +32,8 @@
 #define VULKAN_DEVICE_WIN_H
 
 #include "drivers/vulkan/vulkan_context.h"
+
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 class VulkanContextWindows : public VulkanContext {

platform/windows/windows_terminal_logger.cpp

@@ -33,6 +33,7 @@
 #ifdef WINDOWS_ENABLED
 
 #include <stdio.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 void WindowsTerminalLogger::logv(const char *p_format, va_list p_list, bool p_err) {