III/VC cross-compile fixes

DDraw/DDraw.def

@@ -1,3 +1,3 @@
 LIBRARY DDRAW
 EXPORTS
-	DirectDrawCreateEx=_DirectDrawCreateEx@16 @10
+	DirectDrawCreateEx = DirectDrawCreateEx@16

DDraw/DDraw.vcxproj

@@ -83,7 +83,6 @@
       <AdditionalOptions>/Zc:threadSafeInit- /Zc:strictStrings %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <ModuleDefinitionFile>ddraw.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
       <DelayLoadDLLs>shell32.dll;shlwapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <LargeAddressAware>true</LargeAddressAware>
@@ -113,7 +112,6 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>ddraw.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
       <DelayLoadDLLs>shell32.dll;shlwapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <LargeAddressAware>true</LargeAddressAware>
@@ -143,7 +141,6 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>ddraw.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
       <DelayLoadDLLs>shell32.dll;shlwapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <LargeAddressAware>true</LargeAddressAware>
@@ -172,4 +169,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

DDraw/dllmain.cpp

@@ -4,8 +4,8 @@
 
 #include <windows.h>
 #include <stdio.h>
-#include <Shlwapi.h>
-#include <ShlObj.h>
+#include <shlwapi.h>
+#include <shlobj.h>
 #include "Utils/MemoryMgr.h"
 #include "Utils/Patterns.h"
 #include "Utils/ScopedUnprotect.hpp"
@@ -14,6 +14,7 @@
 #include "Desktop.h"
 
 #pragma comment(lib, "shlwapi.lib")
+#pragma comment(linker, "/EXPORT:DirectDrawCreateEx=_DirectDrawCreateEx@16")
 
 extern "C" HRESULT WINAPI DirectDrawCreateEx(GUID FAR *lpGUID, LPVOID *lplpDD, REFIID iid, IUnknown FAR *pUnkOuter)
 {
@@ -199,7 +200,7 @@ static bool PatchIAT_ByPointers()
 	using namespace Memory::VP;
 
 	pOrgSystemParametersInfoA = SystemParametersInfoA;
-	memcpy( orgCode, pOrgSystemParametersInfoA, sizeof(orgCode) );
+	memcpy( orgCode, reinterpret_cast<void*>(pOrgSystemParametersInfoA), sizeof(orgCode) );
 	InjectHook( pOrgSystemParametersInfoA, SystemParametersInfoA_OverwritingHook, HookType::Jump );
 	return true;
 }
@@ -232,4 +233,4 @@ extern "C" __declspec(dllexport)
 uint32_t GetBuildNumber()
 {
 	return (SILENTPATCH_REVISION_ID << 8) | SILENTPATCH_BUILD_ID;
-}
+}

SilentPatch/Common.cpp

@@ -34,7 +34,7 @@ namespace HandlingNameLoadFix
 // ============= Corona lines rendering fix =============
 namespace CoronaLinesFix
 {
-	static decltype(RwIm2DRenderLine)* orgRwIm2DRenderLine;
+	static RwIm2DRenderLineFunction orgRwIm2DRenderLine;
 	static RwBool RenderLine_SetRecipZ( RwIm2DVertex *vertices, RwInt32 numVertices, RwInt32 vert1, RwInt32 vert2 )
 	{
 		const RwReal nearScreenZ = RwIm2DGetNearScreenZ();
@@ -379,4 +379,4 @@ namespace Common {
 			TXN_CATCH();
 		}
 	}
-}
+}

SilentPatch/Common.h

@@ -2,6 +2,13 @@
 
 #include <cstdint>
 
+// Workaround for old MSVC inline function bugs
+#if defined(_MSC_VER) && _MSC_VER < 1930
+#define STATIC_INLINE static
+#else
+#define STATIC_INLINE static inline
+#endif
+
 namespace ExtraCompSpecularity
 {
 	void ReadExtraCompSpecularityExceptions(const wchar_t* pPath);
@@ -15,4 +22,4 @@ namespace Common
 		void III_VC_Common();
 		void III_VC_SetDelayedPatchesFunc( void(*func)() );
 	}
-};
+};

SilentPatch/Common_ddraw.cpp

@@ -1,22 +1,20 @@
-#include "Common_ddraw.h"
-
 #define WIN32_LEAN_AND_MEAN
 
 #define WINVER 0x0501
 #define _WIN32_WINNT 0x0501
 #define NOMINMAX
 
+#include "Common_ddraw.h"
+
 #include <windows.h>
 
-#include <Shlwapi.h>
-#include <ShlObj.h>
+#include <shlwapi.h>
+#include <shlobj.h>
 #include "Utils/MemoryMgr.h"
 #include "Utils/Patterns.h"
 
 #pragma comment(lib, "shlwapi.lib")
 
-extern char** ppUserFilesDir;
-
 namespace Common {
 	char* GetMyDocumentsPath()
 	{

SilentPatch/Common_ddraw.h

@@ -2,6 +2,8 @@
 
 #include <cstdint>
 
+extern char** ppUserFilesDir;
+
 namespace Common
 {
 	namespace Patches
@@ -18,4 +20,4 @@ namespace Common
 
 		void DDraw_Common();
 	}
-};
+};

SilentPatch/Desktop.cpp

@@ -1,11 +1,11 @@
-#include "Desktop.h"
-
 #define WIN32_LEAN_AND_MEAN
 
 #define WINVER 0x0501
 #define _WIN32_WINNT 0x0501
 #define NOMINMAX
 
+#include "Desktop.h"
+
 #include <windows.h>
 
 std::pair<uint32_t, uint32_t> GetDesktopResolution()
@@ -21,4 +21,4 @@ std::pair<uint32_t, uint32_t> GetDesktopResolution()
 		result.second = displaySettings.dmPelsHeight;
 	}
 	return result;
-}
+}

SilentPatch/FriendlyMonitorNames.cpp

@@ -1,12 +1,12 @@
-#include "FriendlyMonitorNames.h"
-
 // This API is Win7 only, so make sure we use dynamic imports
 #define WIN32_LEAN_AND_MEAN
 
 #define NOMINMAX
 #define WINVER 0x0602
 #define _WIN32_WINNT 0x0602
 
+#include "FriendlyMonitorNames.h"
+
 #include <windows.h>
 
 #include <memory>

SilentPatch/Maths.h

@@ -6,6 +6,15 @@
 
 #include <rwcore.h>
 
+// FIXME: Common.h might be a better place for this (but SA doesn't include it)
+#ifdef _MSC_VER
+#define NOBUFFERCHECKS __declspec(safebuffers)
+#elif defined(__GNUC__) && !defined(__clang__)
+#define NOBUFFERCHECKS __attribute__((optimize("-fno-stack-protector")))
+#else
+#define NOBUFFERCHECKS __attribute__((no_stack_protector))
+#endif
+
 constexpr double RAD_TO_DEG (180.0/M_PI);
 constexpr double DEG_TO_RAD (M_PI/180.0);
 
@@ -570,4 +579,4 @@ class CGeneral
 		return angle;
 	}
 
-};
+};

SilentPatch/ParseUtils.cpp

@@ -1,8 +1,9 @@
-#include "ParseUtils.hpp"
-
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#include <Windows.h>
+
+#include "ParseUtils.hpp"
+
+#include <windows.h>
 
 static std::string WcharToUTF8(std::wstring_view str)
 {

SilentPatch/RWGTA.cpp

@@ -1,8 +1,6 @@
 #include "Utils/MemoryMgr.h"
 #include "Utils/Patterns.h"
 
-#define RwEngineInstance (*rwengine)
-
 #include <rwcore.h>
 #include "RWGTA.h"
 
@@ -52,6 +50,7 @@ void RwD3D8GetRenderState(RwUInt32 state, void* value)
 	fnRwD3D8GetRenderState(state, value);
 }
 
+#ifndef RwIm2DGetNearScreenZ
 RwReal RwIm2DGetNearScreenZ()
 {
 	return RWSRCGLOBAL(dOpenDevice).zBufferNear;
@@ -66,6 +65,7 @@ RwBool RwRenderStateSet(RwRenderState state, void *value)
 {
 	return RWSRCGLOBAL(dOpenDevice).fpRenderStateSet(state, value);
 }
+#endif
 
 // Unreachable stub
 RwBool RwMatrixDestroy(RwMatrix* /*mpMat*/) { assert(!"Unreachable!"); return TRUE; }
@@ -78,19 +78,19 @@ bool RWGTA::Patches::TryLocateRwD3D8() try
 	auto pfnRwD3D8SetRenderState = [] {
 		try {
 			// Everything except for III Steam
-			return static_cast<decltype(RwD3D8SetRenderState)*>(get_pattern("39 0C C5 ? ? ? ? 74 31", -8));
+			return reinterpret_cast<decltype(RwD3D8SetRenderState)*>(get_pattern("39 0C C5 ? ? ? ? 74 31", -8));
 		} catch (const hook::txn_exception&) {
 			// III Steam
-			return static_cast<decltype(RwD3D8SetRenderState)*>(get_pattern("8B 0C C5 ? ? ? ? 3B CA", -8));
+			return reinterpret_cast<decltype(RwD3D8SetRenderState)*>(get_pattern("8B 0C C5 ? ? ? ? 3B CA", -8));
 		}
 	}();
 	auto pfnRwD3D8GetRenderState = [] {
 		try {
 			// Everything except for III Steam
-			return static_cast<decltype(RwD3D8GetRenderState)*>(get_pattern("8B 0C C5 ? ? ? ? 89 0A C3", -8));
+			return reinterpret_cast<decltype(RwD3D8GetRenderState)*>(get_pattern("8B 0C C5 ? ? ? ? 89 0A C3", -8));
 		} catch (const hook::txn_exception&) {
 			// III Steam
-			return static_cast<decltype(RwD3D8GetRenderState)*>(get_pattern("8B 04 C5 ? ? ? ? 89 02 C3", -8));
+			return reinterpret_cast<decltype(RwD3D8GetRenderState)*>(get_pattern("8B 04 C5 ? ? ? ? 89 02 C3", -8));
 		}
 	}();
 
@@ -101,4 +101,4 @@ bool RWGTA::Patches::TryLocateRwD3D8() try
 catch (const hook::txn_exception&)
 {
 	return false;
-}
+}

SilentPatch/RWGTA.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#define RwEngineInstance (*rwengine)
+
+extern void** rwengine;
+
 namespace RWGTA::Patches
 {
 	bool TryLocateRwD3D8();

SilentPatch/RWUtils.hpp

@@ -3,6 +3,10 @@
 #include <rwcore.h>
 #include <rpworld.h>
 
+#define RwEngineInstance (*rwengine)
+
+extern void** rwengine;
+
 template<RwRenderState State>
 class RwScopedRenderState
 {
@@ -68,4 +72,4 @@ Pred RpGeometryForAllMaterials(RpGeometry* geometry, Pred callback)
 			break;
 	}
 	return callback;
-}
+}

SilentPatch/SVF.cpp

@@ -1,9 +1,13 @@
 #include "SVF.h"
 
-#include <cstdint>
 #include <algorithm>
 #include <map>
 
+#ifndef _MSC_VER
+#include <cstring>
+#define _stricmp strcasecmp
+#endif
+
 namespace SVF
 {
 	Feature GetFeatureFromName( const char* featureName )
@@ -233,4 +237,4 @@ __declspec(dllexport) void DisableStockVehiclesForSpecialVehicleFeature( const c
 	SVF::DisableStockVehiclesForFeature( SVF::GetFeatureFromName(featureName) );
 }
 
-}
+}

SilentPatch/SVF.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <functional>
 #include <string>
 
@@ -60,4 +61,4 @@ namespace SVF
 
 	void RegisterGetModelInfoCB(void*(*func)(const char*, int*));
 	void MarkModelNamesReady();
-};
+};

SilentPatch/TheFLAUtils.cpp

@@ -1,7 +1,7 @@
 #include "TheFLAUtils.h"
 
 #define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
 
 #include "Utils/ModuleList.hpp"
 
@@ -39,4 +39,4 @@ bool FLAUtils::UsesEnhancedIMGs()
 	const auto func = reinterpret_cast<bool(*)()>(GetProcAddress( flaModule, "IsHandlingOfEnhancedIMGarchivesEnabled" ));
 	if ( func == nullptr ) return false;
 	return func();
-}
+}

SilentPatch/Timer.h

@@ -1,6 +1,8 @@
 #ifndef __TIMER
 #define __TIMER
 
+#include <cmath>
+
 class CTimer
 {
 public:
@@ -16,4 +18,4 @@ class CTimer
 	static void				Update_SilentPatch();
 };
 
-#endif
+#endif