Merge branch 'master' into reverse_xyzrhw_new

elishacloud · Mar 2, 2024 · 11e1db3 · 11e1db3
2 parents 80dfe72 + 289e652
commit 11e1db3
Show file tree

Hide file tree

Showing 110 changed files with 1,272 additions and 1,049 deletions.
diff --git a/DDrawCompat/DDrawCompatExternal.cpp b/DDrawCompat/DDrawCompatExternal.cpp
@@ -6,8 +6,8 @@
 #include "v0.2.1\DllMain.h"
 #include "v0.3.1\Dll\DllMain.h"
 
-#define DDrawCompatDefault Compat31
-#define DDrawCompatForDd7to9 Compat31
+#define DDrawCompatDefault Compat32
+#define DDrawCompatForDd7to9 Compat32
 
 #define INITIALIZE_WRAPPED_PROC(procName) \
 	volatile FARPROC procName ## _in = nullptr; \
@@ -38,7 +38,7 @@ namespace DDrawCompat
 	{
 		// DDrawCompat v0.3.1
 #ifdef DDRAWCOMPAT_31
-		PREPARE_DDRAWCOMPAT(Compat31);
+		PREPARE_DDRAWCOMPAT(Compat32);
 #endif
 
 		// DDrawCompat v0.2.1
@@ -67,7 +67,7 @@ namespace DDrawCompat
 
 		// DDrawCompat v0.3.1
 #ifdef DDRAWCOMPAT_31
-		START_DDRAWCOMPAT(Compat31);
+		START_DDRAWCOMPAT(Compat32);
 #endif
 
 		// DDrawCompat v0.2.1
@@ -97,9 +97,9 @@ namespace DDrawCompat
 	}
 
 	// Used for hooking with dd7to9
-	void InstallHooks()
+	void InstallDd7to9Hooks()
 	{
 		// Dd7to9 DDrawCompat version
-		return DDrawCompatForDd7to9::InstallHooks();
+		return DDrawCompatForDd7to9::InstallDd7to9Hooks();
 	}
 }
diff --git a/DDrawCompat/DDrawCompatExternal.h b/DDrawCompat/DDrawCompatExternal.h
@@ -19,5 +19,5 @@ namespace DDrawCompat
 	void Prepare();
 	void Start(HINSTANCE, DWORD);
 	bool IsEnabled();
-	void InstallHooks();
+	void InstallDd7to9Hooks();
 }
diff --git a/DDrawCompat/DDrawLog.h b/DDrawCompat/DDrawLog.h
@@ -60,7 +60,7 @@ namespace Compat21
 	}
 }
 
-namespace Compat31
+namespace Compat32
 {
 	using namespace Logging;
 }
diff --git a/DDrawCompat/v0.3.1/Common/CompatPtr.h b/DDrawCompat/v0.3.1/Common/CompatPtr.h
@@ -12,7 +12,7 @@ class CompatPtr : public CompatWeakPtr<Intf>
 	template <typename OtherIntf>
 	static CompatPtr from(OtherIntf* other)
 	{
-		return CompatPtr(Compat31::queryInterface<Intf>(other));
+		return CompatPtr(Compat32::queryInterface<Intf>(other));
 	}
 
 	CompatPtr(std::nullptr_t = nullptr)
@@ -25,13 +25,13 @@ class CompatPtr : public CompatWeakPtr<Intf>
 
 	CompatPtr(const CompatPtr& other)
 	{
-		m_intf = Compat31::queryInterface<Intf>(other.get());
+		m_intf = Compat32::queryInterface<Intf>(other.get());
 	}
 
 	template <typename OtherIntf>
 	CompatPtr(const CompatPtr<OtherIntf>& other)
 	{
-		m_intf = Compat31::queryInterface<Intf>(other.get());
+		m_intf = Compat32::queryInterface<Intf>(other.get());
 	}
 
 	~CompatPtr()

diff --git a/DDrawCompat/v0.3.1/Common/CompatQueryInterface.h b/DDrawCompat/v0.3.1/Common/CompatQueryInterface.h
@@ -6,7 +6,7 @@
 
 #include <DDrawCompat/v0.3.1/Common/CompatVtable.h>
 
-namespace Compat31
+namespace Compat32
 {
 	template <typename Intf>
 	struct GetBaseIntf

diff --git a/DDrawCompat/v0.3.1/Common/Hook.cpp b/DDrawCompat/v0.3.1/Common/Hook.cpp
@@ -113,16 +113,16 @@ namespace
 		HRESULT result = g_debugDataSpaces->WriteVirtual(g_debugBase, instruction, MAX_INSTRUCTION_SIZE, nullptr);
 		if (FAILED(result))
 		{
-			LOG_ONCE("ERROR: DbgEng: WriteVirtual failed: " << Compat31::hex(result));
+			LOG_ONCE("ERROR: DbgEng: WriteVirtual failed: " << Compat32::hex(result));
 			return 0;
 		}
 
 		ULONG64 endOffset = 0;
 		result = g_debugControl->Disassemble(g_debugBase, 0, nullptr, 0, nullptr, &endOffset);
 		if (FAILED(result))
 		{
-			LOG_ONCE("ERROR: DbgEng: Disassemble failed: " << Compat31::hex(result) << " "
-				<< Compat31::hexDump(instruction, MAX_INSTRUCTION_SIZE));
+			LOG_ONCE("ERROR: DbgEng: Disassemble failed: " << Compat32::hex(result) << " "
+				<< Compat32::hexDump(instruction, MAX_INSTRUCTION_SIZE));
 			return 0;
 		}
 
@@ -135,7 +135,7 @@ namespace
 
 		std::ostringstream oss;
 #ifdef DEBUGLOGS
-		oss << Compat31::funcPtrToStr(targetFunc) << ' ';
+		oss << Compat32::funcPtrToStr(targetFunc) << ' ';
 
 		char origFuncPtrStr[20] = {};
 		if (!funcName)
@@ -164,7 +164,7 @@ namespace
 			{
 				instructionSize = 6;
 				auto candidateTargetFunc = **reinterpret_cast<BYTE***>(targetFunc + 2);
-				if (Compat31::getModuleHandleFromAddress(candidateTargetFunc) == Compat31::getModuleHandleFromAddress(targetFunc))
+				if (Compat32::getModuleHandleFromAddress(candidateTargetFunc) == Compat32::getModuleHandleFromAddress(targetFunc))
 				{
 					break;
 				}
@@ -175,14 +175,14 @@ namespace
 				break;
 			}
 #ifdef DEBUGLOGS
-			oss << Compat31::hexDump(prevTargetFunc, instructionSize) << " -> " << Compat31::funcPtrToStr(targetFunc) << ' ';
+			oss << Compat32::hexDump(prevTargetFunc, instructionSize) << " -> " << Compat32::funcPtrToStr(targetFunc) << ' ';
 			prevTargetFunc = targetFunc;
 #endif
 		}
 
-		if (Compat31::getModuleHandleFromAddress(targetFunc) == Dll::g_currentModule)
+		if (Compat32::getModuleHandleFromAddress(targetFunc) == Dll::g_currentModule)
 		{
-			Compat31::Log() << "ERROR: Target function is already hooked: " << funcName;
+			Compat32::Log() << "ERROR: Target function is already hooked: " << funcName;
 			return;
 		}
 
@@ -203,7 +203,7 @@ namespace
 		}
 
 		LOG_DEBUG << "Hooking function: " << funcName
-			<< " (" << oss.str() << Compat31::hexDump(targetFunc, totalInstructionSize) << ')';
+			<< " (" << oss.str() << Compat32::hexDump(targetFunc, totalInstructionSize) << ')';
 
 		BYTE* trampoline = static_cast<BYTE*>(
 			VirtualAlloc(nullptr, totalInstructionSize + 5, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE));
@@ -266,15 +266,15 @@ namespace
 			// Hook function and get process address
 			if (dll && GetProcAddress(dll, "DebugCreate"))
 			{
-				Compat31::hookIatFunction(dll, "GetProcAddress", dbgEngGetProcAddress);
+				Compat32::hookIatFunction(dll, "GetProcAddress", dbgEngGetProcAddress);
 
 				pDebugCreate = (PFN_DebugCreate)GetProcAddress(dll, "DebugCreate");
 			}
 			RunOnce = false;
 		}
 		if (!pDebugCreate)
 		{
-			Compat31::Log() << "ERROR: DbgEng: failed to get proc address!";
+			Compat32::Log() << "ERROR: DbgEng: failed to get proc address!";
 			return false;
 		}
 		//********** End Edit ***************
@@ -285,46 +285,46 @@ namespace
 			FAILED(result = g_debugClient->QueryInterface(IID_IDebugSymbols, reinterpret_cast<void**>(&g_debugSymbols))) ||
 			FAILED(result = g_debugClient->QueryInterface(IID_IDebugDataSpaces4, reinterpret_cast<void**>(&g_debugDataSpaces))))
 		{
-			Compat31::Log() << "ERROR: DbgEng: object creation failed: " << Compat31::hex(result);
+			Compat32::Log() << "ERROR: DbgEng: object creation failed: " << Compat32::hex(result);
 			return false;
 		}
 
-		result = g_debugClient->OpenDumpFileWide(Compat31::getModulePath(Dll::g_currentModule).c_str(), 0);
+		result = g_debugClient->OpenDumpFileWide(Compat32::getModulePath(Dll::g_currentModule).c_str(), 0);
 		if (FAILED(result))
 		{
-			Compat31::Log() << "ERROR: DbgEng: OpenDumpFile failed: " << Compat31::hex(result);
+			Compat32::Log() << "ERROR: DbgEng: OpenDumpFile failed: " << Compat32::hex(result);
 			return false;
 		}
 
 		g_debugControl->SetEngineOptions(DEBUG_ENGOPT_DISABLE_MODULE_SYMBOL_LOAD);
 		result = g_debugControl->WaitForEvent(0, INFINITE);
 		if (FAILED(result))
 		{
-			Compat31::Log() << "ERROR: DbgEng: WaitForEvent failed: " << Compat31::hex(result);
+			Compat32::Log() << "ERROR: DbgEng: WaitForEvent failed: " << Compat32::hex(result);
 			return false;
 		}
 
 		DEBUG_MODULE_PARAMETERS dmp = {};
 		result = g_debugSymbols->GetModuleParameters(1, 0, 0, &dmp);
 		if (FAILED(result))
 		{
-			Compat31::Log() << "ERROR: DbgEng: GetModuleParameters failed: " << Compat31::hex(result);
+			Compat32::Log() << "ERROR: DbgEng: GetModuleParameters failed: " << Compat32::hex(result);
 			return false;
 		}
 
 		ULONG size = 0;
 		result = g_debugDataSpaces->GetValidRegionVirtual(dmp.Base, dmp.Size, &g_debugBase, &size);
 		if (FAILED(result) || 0 == g_debugBase)
 		{
-			Compat31::Log() << "ERROR: DbgEng: GetValidRegionVirtual failed: " << Compat31::hex(result);
+			Compat32::Log() << "ERROR: DbgEng: GetValidRegionVirtual failed: " << Compat32::hex(result);
 			return false;
 		}
 
 		return true;
 	}
 }
 
-namespace Compat31
+namespace Compat32
 {
 	void closeDbgEng()
 	{
@@ -360,10 +360,10 @@ namespace Compat31
 	std::string funcPtrToStr(void* funcPtr)
 	{
 		std::ostringstream oss;
-		HMODULE module = Compat31::getModuleHandleFromAddress(funcPtr);
+		HMODULE module = Compat32::getModuleHandleFromAddress(funcPtr);
 		if (module)
 		{
-			oss << Compat31::getModulePath(module).u8string() << "+0x" << std::hex <<
+			oss << Compat32::getModulePath(module).u8string() << "+0x" << std::hex <<
 				reinterpret_cast<DWORD>(funcPtr) - reinterpret_cast<DWORD>(module);
 		}
 		else

diff --git a/DDrawCompat/v0.3.1/Common/Hook.h b/DDrawCompat/v0.3.1/Common/Hook.h
@@ -4,14 +4,14 @@
 
 #include <Windows.h>
 
-#define CALL_ORIG_FUNC(func) Compat31::g_origFuncPtr<&func>
+#define CALL_ORIG_FUNC(func) Compat32::g_origFuncPtr<&func>
 
 #define HOOK_FUNCTION(module, func, newFunc) \
-	Compat31::hookFunction<&func>(#module, #func, &newFunc)
+	Compat32::hookFunction<&func>(#module, #func, &newFunc)
 #define HOOK_SHIM_FUNCTION(func, newFunc) \
-	Compat31::hookFunction(reinterpret_cast<void*&>(Compat31::g_origFuncPtr<&func>), newFunc, #func)
+	Compat32::hookFunction(reinterpret_cast<void*&>(Compat32::g_origFuncPtr<&func>), newFunc, #func)
 
-namespace Compat31
+namespace Compat32
 {
 	void closeDbgEng();
 	std::string funcPtrToStr(void* funcPtr);

diff --git a/DDrawCompat/v0.3.1/Common/Path.cpp b/DDrawCompat/v0.3.1/Common/Path.cpp
@@ -1,6 +1,6 @@
 #include <DDrawCompat/v0.3.1/Common/Path.h>
 
-namespace Compat31
+namespace Compat32
 {
 	std::filesystem::path getModulePath(HMODULE module)
 	{

diff --git a/DDrawCompat/v0.3.1/Common/Path.h b/DDrawCompat/v0.3.1/Common/Path.h
@@ -4,7 +4,7 @@
 
 #include <Windows.h>
 
-namespace Compat31
+namespace Compat32
 {
 	std::filesystem::path getModulePath(HMODULE module);
 	std::filesystem::path getSystemPath();

diff --git a/DDrawCompat/v0.3.1/Common/ScopedCriticalSection.h b/DDrawCompat/v0.3.1/Common/ScopedCriticalSection.h
@@ -2,7 +2,7 @@
 
 #include <Windows.h>
 
-namespace Compat31
+namespace Compat32
 {
 	class CriticalSection : public CRITICAL_SECTION
 	{

diff --git a/DDrawCompat/v0.3.1/Common/ScopedSrwLock.h b/DDrawCompat/v0.3.1/Common/ScopedSrwLock.h
@@ -2,7 +2,7 @@
 
 #include <Windows.h>
 
-namespace Compat31
+namespace Compat32
 {
 	class SrwLock : public SRWLOCK
 	{

diff --git a/DDrawCompat/v0.3.1/Common/VtableHookVisitor.h b/DDrawCompat/v0.3.1/Common/VtableHookVisitor.h
@@ -58,8 +58,8 @@ class VtableHookVisitor
 			{
 #ifdef DEBUGLOGS
 				s_funcName<memberPtr> = s_vtableTypeName + "::" + funcName;
-				Compat31::Log() << "Hooking function: " << s_funcName<memberPtr>
-					<< " (" << Compat31::funcPtrToStr(m_vtable.*memberPtr) << ')';
+				Compat32::Log() << "Hooking function: " << s_funcName<memberPtr>
+					<< " (" << Compat32::funcPtrToStr(m_vtable.*memberPtr) << ')';
 #endif
 				m_vtable.*memberPtr = &hookFunc<memberPtr>;
 			}

diff --git a/DDrawCompat/v0.3.1/D3dDdi/Device.cpp b/DDrawCompat/v0.3.1/D3dDdi/Device.cpp
@@ -27,7 +27,7 @@ namespace
 		oss << "Checking source color key support: failed (" << reason;
 		if (resultCode)
 		{
-			oss << ": " << Compat31::hex(resultCode);
+			oss << ": " << Compat32::hex(resultCode);
 		}
 		oss << ')';
 

diff --git a/DDrawCompat/v0.3.1/D3dDdi/DeviceState.cpp b/DDrawCompat/v0.3.1/D3dDdi/DeviceState.cpp
@@ -45,7 +45,7 @@ namespace D3dDdi
 		D3DDDIARG_CREATEVERTEXSHADERDECL* data,
 		const D3DDDIVERTEXELEMENT* vertexElements)
 	{
-		LOG_DEBUG << Compat31::array(vertexElements, data->NumVertexElements);
+		LOG_DEBUG << Compat32::array(vertexElements, data->NumVertexElements);
 		HRESULT result = m_device.getOrigVtable().pfnCreateVertexShaderDecl(m_device, data, vertexElements);
 		if (SUCCEEDED(result))
 		{

diff --git a/DDrawCompat/v0.3.1/D3dDdi/Hooks.cpp b/DDrawCompat/v0.3.1/D3dDdi/Hooks.cpp
@@ -15,12 +15,12 @@
 
 std::ostream& operator<<(std::ostream& os, const D3DDDIARG_OPENADAPTER& data)
 {
-	return Compat31::LogStruct(os)
+	return Compat32::LogStruct(os)
 		<< data.hAdapter
 		<< data.Interface
 		<< data.Version
 		<< data.pAdapterCallbacks
-		<< Compat31::out(data.pAdapterFuncs)
+		<< Compat32::out(data.pAdapterFuncs)
 		<< data.DriverVersion;
 }
 
@@ -41,7 +41,7 @@ namespace
 				static std::set<HMODULE> hookedModules;
 				if (hookedModules.find(hModule) == hookedModules.end())
 				{
-					Compat31::Log() << "Hooking user mode display driver: " << Compat31::funcPtrToStr(g_origOpenAdapter);
+					Compat32::Log() << "Hooking user mode display driver: " << Compat32::funcPtrToStr(g_origOpenAdapter);
 					Dll::pinModule(hModule);
 					hookedModules.insert(hModule);
 				}
@@ -70,7 +70,7 @@ namespace D3dDdi
 {
 	void installHooks()
 	{
-		Compat31::hookIatFunction(Dll::g_origDDrawModule, "GetProcAddress", getProcAddress);
+		Compat32::hookIatFunction(Dll::g_origDDrawModule, "GetProcAddress", getProcAddress);
 
 		KernelModeThunks::installHooks();
 	}