[GEN][ZH] Fix of missing includes

zzambers · zzambers · commit c5759bce3b30 · 2025-04-12T21:52:22.000+02:00
diff --git a/Generals/Code/GameEngine/Include/Common/Debug.h b/Generals/Code/GameEngine/Include/Common/Debug.h
@@ -216,6 +216,8 @@ DEBUG_EXTERN_C void ReleaseCrashLocalized(const AsciiString& p, const AsciiStrin
 
 #ifdef DEBUG_PROFILE
 
+#include <stdlib.h>
+
 class SimpleProfiler
 {
 private:
diff --git a/Generals/Code/GameEngine/Include/Common/simpleplayer.h b/Generals/Code/GameEngine/Include/Common/simpleplayer.h
@@ -21,6 +21,7 @@
 #define SIMPLEPLAYER_H
 
 #include "wmsdk.h"
+#include <tchar.h>
 
 //
 // we preserve a list of "ready-to-free" list of wave headers for the
diff --git a/Generals/Code/GameEngine/Include/Common/urllaunch.h b/Generals/Code/GameEngine/Include/Common/urllaunch.h
@@ -20,6 +20,8 @@
 #ifndef URLLAUNCH_H
 #define URLLAUNCH_H
 
+#include <windows.h>
+
 HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL );
 
 HRESULT LaunchURL( LPCWSTR pszURL );
diff --git a/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h b/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h
@@ -63,6 +63,7 @@
 #endif
 
 #include <dinput.h>
+#include <Lib/BaseType.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 
diff --git a/Generals/Code/GameEngine/Source/Common/Audio/simpleplayer.cpp b/Generals/Code/GameEngine/Source/Common/Audio/simpleplayer.cpp
@@ -19,6 +19,9 @@
 
 #include "Common/simpleplayer.h"
 #include "Common/urllaunch.h"
+#include "Common/Debug.h"
+#include <nserror.h>
+#include <wchar.h>
 
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Source/Common/Audio/urllaunch.cpp b/Generals/Code/GameEngine/Source/Common/Audio/urllaunch.cpp
@@ -18,6 +18,8 @@
 
 
 #include "Common/urllaunch.h"
+#include <tchar.h>
+#include <wchar.h>
 
 #define FILE_PREFIX     L"file://"
 
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
@@ -40,6 +40,7 @@
 
 #include "mutex.h"
 #include "thread.h"
+#include <eh.h>
 
 #ifdef _INTERNAL
 // for occasional debugging...
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
@@ -33,6 +33,7 @@
 #include "GameNetwork/GameSpy/GameResultsThread.h"
 #include "mutex.h"
 #include "thread.h"
+#include <eh.h>
 
 #include "Common/StackDump.h"
 #include "Common/SubsystemInterface.h"
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
@@ -45,6 +45,7 @@
 #include "strtok_r.h"
 #include "mutex.h"
 #include "thread.h"
+#include <eh.h>
 
 #include "Common/MiniLog.h"
 
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
@@ -37,6 +37,7 @@
 
 #include "mutex.h"
 #include "thread.h"
+#include <eh.h>
 
 #include "Common/StackDump.h"
 #include "Common/SubsystemInterface.h"
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp
@@ -33,6 +33,7 @@
 #include "GameNetwork/GameSpy/PingThread.h"
 #include "mutex.h"
 #include "thread.h"
+#include <eh.h>
 
 #include "Common/StackDump.h"
 #include "Common/SubsystemInterface.h"
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h
@@ -36,6 +36,7 @@
 #include "WWLib/refcount.h"
 #include "WWMath/vector3.h"
 #include "W3DDevice/GameClient/TileData.h"
+#include "W3DDevice/GameClient/TerrainTex.h"
 #include "../../GameEngine/Include/Common/MapObject.h"
 
 #include "Common/STLTypedefs.h"
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp
@@ -48,6 +48,8 @@
  *   Make_W3D_Filename -- Converts a W3D object name into a W3D filename.                      *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
+#include <stddef.h>
+
 //-----------------------------------------------------------------------------
 // srj sez: hack festival :-(
 class STLSpecialAlloc
diff --git a/Generals/Code/Libraries/Source/WWVegas/WWDebug/wwmemlog.h b/Generals/Code/Libraries/Source/WWVegas/WWDebug/wwmemlog.h
@@ -44,6 +44,8 @@
 #ifndef WWMEMLOG_H
 #define WWMEMLOG_H
 
+#include <stddef.h>
+
 class MemLogClass;
 
 /**
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Debug.h b/GeneralsMD/Code/GameEngine/Include/Common/Debug.h
@@ -220,6 +220,8 @@ DEBUG_EXTERN_C void ReleaseCrashLocalized(const AsciiString& p, const AsciiStrin
 
 #ifdef DEBUG_PROFILE
 
+#include <stdlib.h>
+
 class SimpleProfiler
 {
 private:
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/simpleplayer.h b/GeneralsMD/Code/GameEngine/Include/Common/simpleplayer.h
@@ -21,6 +21,7 @@
 #define SIMPLEPLAYER_H
 
 #include "wmsdk.h"
+#include <tchar.h>
 
 //
 // we preserve a list of "ready-to-free" list of wave headers for the
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/urllaunch.h b/GeneralsMD/Code/GameEngine/Include/Common/urllaunch.h
@@ -20,6 +20,8 @@
 #ifndef URLLAUNCH_H
 #define URLLAUNCH_H
 
+#include <windows.h>
+
 HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL );
 
 HRESULT LaunchURL( LPCWSTR pszURL );
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h b/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h
@@ -63,6 +63,7 @@
 #endif
 
 #include <dinput.h>
+#include <Lib/BaseType.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/simpleplayer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/simpleplayer.cpp
@@ -19,6 +19,9 @@
 
 #include "Common/simpleplayer.h"
 #include "Common/urllaunch.h"
+#include "Common/Debug.h"
+#include <nserror.h>
+#include <wchar.h>
 
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Audio/urllaunch.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Audio/urllaunch.cpp
@@ -18,6 +18,8 @@
 
 
 #include "Common/urllaunch.h"
+#include <tchar.h>
+#include <wchar.h>
 
 #define FILE_PREFIX     L"file://"
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
@@ -40,6 +40,7 @@
 
 #include "mutex.h"
 #include "thread.h"
+#include <eh.h>
 
 #ifdef _INTERNAL
 // for occasional debugging...
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
@@ -33,6 +33,7 @@
 #include "GameNetwork/GameSpy/GameResultsThread.h"
 #include "mutex.h"
 #include "thread.h"
+#include <eh.h>
 
 #include "Common/StackDump.h"
 #include "Common/SubsystemInterface.h"
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
@@ -45,6 +45,7 @@
 #include "strtok_r.h"
 #include "mutex.h"
 #include "thread.h"
+#include <eh.h>
 
 #include "Common/MiniLog.h"
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
@@ -38,6 +38,7 @@
 
 #include "mutex.h"
 #include "thread.h"
+#include <eh.h>
 
 #include "Common/StackDump.h"
 #include "Common/SubsystemInterface.h"
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp
@@ -33,6 +33,7 @@
 #include "GameNetwork/GameSpy/PingThread.h"
 #include "mutex.h"
 #include "thread.h"
+#include <eh.h>
 
 #include "Common/StackDump.h"
 #include "Common/SubsystemInterface.h"
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h
@@ -36,6 +36,7 @@
 #include "WWLib/refcount.h"
 #include "WWMath/vector3.h"
 #include "W3DDevice/GameClient/TileData.h"
+#include "W3DDevice/GameClient/TerrainTex.h"
 #include "../../GameEngine/Include/Common/MapObject.h"
 
 #include "Common/STLTypedefs.h"
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp
@@ -48,6 +48,8 @@
  *   Make_W3D_Filename -- Converts a W3D object name into a W3D filename.                      *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
+#include <stddef.h>
+
 //-----------------------------------------------------------------------------
 // srj sez: hack festival :-(
 class STLSpecialAlloc
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWDebug/wwmemlog.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WWDebug/wwmemlog.h
@@ -44,6 +44,8 @@
 #ifndef WWMEMLOG_H
 #define WWMEMLOG_H
 
+#include <stddef.h>
+
 #define LOG_MEMORY	// Comment this out to disable memlog compiling in
 
 class MemLogClass;
diff --git a/GeneralsMD/Code/Libraries/Source/debug/debug_debug.cpp b/GeneralsMD/Code/Libraries/Source/debug/debug_debug.cpp
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <new>      // needed for placement new prototype
+#include <eh.h>
 
 // a little dummy variable that makes the linker actually include
 // us...
diff --git a/GeneralsMD/Code/Libraries/Source/debug/debug_debug.h b/GeneralsMD/Code/Libraries/Source/debug/debug_debug.h
@@ -32,6 +32,8 @@
 #ifndef DEBUG_DEBUG_H // Include guard
 #define DEBUG_DEBUG_H
 
+#include <stdlib.h>
+
 /**
   \class Debug debug.h <rts/debug.h>
   
diff --git a/GeneralsMD/Code/Libraries/Source/profile/internal.h b/GeneralsMD/Code/Libraries/Source/profile/internal.h
@@ -37,6 +37,7 @@
 #include "internal_highlevel.h"
 #include "internal_cmd.h"
 #include "internal_result.h"
+#include <stdlib.h>
 
 #if !(defined(_MSC_VER) && _MSC_VER < 1300)
 #include <atomic>
diff --git a/GeneralsMD/Code/Libraries/Source/profile/internal_funclevel.h b/GeneralsMD/Code/Libraries/Source/profile/internal_funclevel.h
@@ -32,6 +32,8 @@
 #ifndef INTERNAL_FUNCLEVEL_H // Include guard
 #define INTERNAL_FUNCLEVEL_H
 
+#include <stdlib.h>
+
 class ProfileFuncLevelTracer
 {
   friend class ProfileCmdInterface;
diff --git a/GeneralsMD/Code/Libraries/Source/profile/profile_funclevel.h b/GeneralsMD/Code/Libraries/Source/profile/profile_funclevel.h
@@ -32,6 +32,8 @@
 #ifndef PROFILE_FUNCLEVEL_H // Include guard
 #define PROFILE_FUNCLEVEL_H
 
+#include <stdlib.h>
+
 /**
   \brief The function level profiler.
 
diff --git a/GeneralsMD/Code/Libraries/Source/profile/profile_highlevel.h b/GeneralsMD/Code/Libraries/Source/profile/profile_highlevel.h
@@ -32,6 +32,8 @@
 #ifndef PROFILE_HIGHLEVEL_H // Include guard
 #define PROFILE_HIGHLEVEL_H
 
+#include <stdlib.h>
+
 /// \internal internal Id representation
 class ProfileId;
 

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,8 @@ DEBUG_EXTERN_C void ReleaseCrashLocalized(const AsciiString& p, const AsciiStrin`
`216`	`216`
`217`	`217`	`#ifdef DEBUG_PROFILE`
`218`	`218`
	`219`	`+#include <stdlib.h>`
	`220`	`+`
`219`	`221`	`class SimpleProfiler`
`220`	`222`	`{`
`221`	`223`	`private:`
Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,8 @@ DEBUG_EXTERN_C void ReleaseCrashLocalized(const AsciiString& p, const AsciiStrin`
`220`	`220`
`221`	`221`	`#ifdef DEBUG_PROFILE`
`222`	`222`
	`223`	`+#include <stdlib.h>`
	`224`	`+`
`223`	`225`	`class SimpleProfiler`
`224`	`226`	`{`
`225`	`227`	`private:`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@`
`32`	`32`	`#ifndef INTERNAL_FUNCLEVEL_H // Include guard`
`33`	`33`	`#define INTERNAL_FUNCLEVEL_H`
`34`	`34`
	`35`	`+#include <stdlib.h>`
	`36`	`+`
`35`	`37`	`class ProfileFuncLevelTracer`
`36`	`38`	`{`
`37`	`39`	`friend class ProfileCmdInterface;`