clang support

Author: oltolm

CMakeLists.txt

@@ -1,4 +1,5 @@
-# cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+# cmake --preset <clang|gcc>
+# cmake --build --preset <clang|gcc>
 #
 # ninja
 # ninja install
@@ -105,14 +106,22 @@ target_compile_options(dsfix
   -msse2
   -msse
   -Wall
-  -Werror
+  # -Werror
   -Wno-array-bounds
-  -Wextra
+  # -Wextra
   -Wno-cast-function-type
   -Wno-unused-parameter
   -Wno-unused-but-set-variable
 )
 endif()
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+message(STATUS "CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
+  target_compile_options(dsfix
+    PRIVATE
+    -Wno-microsoft-exception-spec
+    -Wno-missing-exception-spec
+  )
+endif()
 target_compile_definitions(dsfix
   PRIVATE
   -DUNICODE
@@ -127,13 +136,15 @@ set_target_properties(dsfix
 )
 
 if(MSVC)
-  find_path(d3dx9_include_dir "d3dx9.h"
-    REQUIRED
-    PATH_SUFFIXES "dxsdk-d3dx"
-  )
-  target_include_directories(dsfix PRIVATE ${d3dx9_include_dir})
-  find_library(d3dx9_library "d3dx9.lib" REQUIRED)
-  target_link_libraries(dsfix PRIVATE ${d3dx9_library})
+  # find_path(d3dx9_include_dir "d3dx9.h"
+  #   REQUIRED
+  #   PATH_SUFFIXES "dxsdk-d3dx"
+  # )
+  # target_include_directories(dsfix PRIVATE ${d3dx9_include_dir})
+  # find_library(d3dx9_library "d3dx9.lib" REQUIRED)
+  # target_link_libraries(dsfix PRIVATE ${d3dx9_library})
+  target_include_directories(dsfix PRIVATE "$ENV{d3dx_path}\\include")
+  target_link_libraries(dsfix PRIVATE "$ENV{d3dx_path}\\release\\lib\\x86\\d3dx9.lib")
 endif()
 
 install(

CMakePresets.json

@@ -0,0 +1,32 @@
+{
+    "version": 2,
+    "configurePresets": [
+        {
+            "name": "gcc",
+            "generator": "Ninja",
+            "binaryDir": "build",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+            }
+        },
+        {
+            "name": "clang",
+            "generator": "Ninja",
+            "binaryDir": "build-clang",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+                "CMAKE_C_COMPILER": "clang",
+                "CMAKE_CXX_COMPILER": "clang++",
+                "CMAKE_CXX_FLAGS": "-stdlib=libc++",
+                "CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=lld",
+                "CMAKE_EXE_LINKER_FLAGS": "-fuse-ld=lld"
+            }
+        },
+        {
+            "name": "msvc",
+            "generator": "Visual Studio 17 2022",
+            "binaryDir": "build-msvc",
+            "architecture": "win32"
+        }
+    ]
+}

DATA/DSfix.ini

@@ -147,6 +147,12 @@ captureCursor 0
 # skip the intro logos
 skipIntro 0
 
+# override the in-game language
+# none = no override
+# en-GB = English, fr = French, it = Italian, de = German, es = Spanish
+# ko = Korean, zh-tw = Chinese, pl = Polish, ru = Russian
+overrideLanguage none
+
 # D3D adapter override
 # -1 = no override
 # N = use adapter N

Detouring.cpp

@@ -1,21 +1,55 @@
 #include "Detouring.h"
+#include "Settings.h"
 #include "d3d9.h"
 #include <MinHook.h>
 #include <spdlog/spdlog.h>
 
 decltype(Direct3DCreate9)* oDirect3DCreate9;
+decltype(GetUserDefaultLangID)* oGetUserDefaultLangID;
 
 namespace {
 void* Direct3DCreate9Handle;
+void* GetUserDefaultLangIDHandle;
 } // namespace
 
+// en-GB = English, fr = French, it = Italian, de = German, es = Spanish
+// ko = Korean, zh-tw = Chinese, pl = Polish, ru = Russian
+LANGID hkGetUserDefaultLangID() {
+  const auto& lang = Settings::get().getOverrideLanguage();
+  if (lang == "en-GB")
+    return MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK);
+  else if (lang == "fr")
+    return MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT);
+  else if (lang == "it")
+    return MAKELANGID(LANG_ITALIAN, SUBLANG_DEFAULT);
+  else if (lang == "de")
+    return MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT);
+  else if (lang == "es")
+    return MAKELANGID(LANG_SPANISH, SUBLANG_DEFAULT);
+  else if (lang == "ko")
+    return MAKELANGID(LANG_KOREAN, SUBLANG_DEFAULT);
+  else if (lang == "zh-tw")
+    return MAKELANGID(LANG_CHINESE_TRADITIONAL, SUBLANG_DEFAULT);
+  else if (lang == "pl")
+    return MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT);
+  else if (lang == "ru")
+    return MAKELANGID(LANG_RUSSIAN, SUBLANG_DEFAULT);
+  else
+    return oGetUserDefaultLangID();
+}
+
 void startDetour() {
   MH_Initialize();
   Direct3DCreate9Handle =
       reinterpret_cast<void*>(::GetProcAddress(GetModuleHandleW(L"d3d9.dll"), "Direct3DCreate9"));
   MH_CreateHook(Direct3DCreate9Handle, reinterpret_cast<void*>(&hkDirect3DCreate9),
                 reinterpret_cast<void**>(&oDirect3DCreate9));
   MH_EnableHook(Direct3DCreate9Handle);
+  GetUserDefaultLangIDHandle = reinterpret_cast<void*>(
+      ::GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "GetUserDefaultLangID"));
+  MH_CreateHook(GetUserDefaultLangIDHandle, reinterpret_cast<void*>(&hkGetUserDefaultLangID),
+                reinterpret_cast<void**>(&oGetUserDefaultLangID));
+  MH_EnableHook(GetUserDefaultLangIDHandle);
 }
 
 void endDetour() {

RenderstateManager.cpp

@@ -20,7 +20,7 @@ unsigned int getDOFResolution() {
 }
 } // namespace
 
-RSManager RSManager::instance;
+RSManager::RSManager(IDirect3DDevice9* pDevice) : m_pDevice(pDevice) { onReset(); }
 
 void RSManager::setupAA() {
   unsigned int rw = Settings::get().getRenderWidth();
@@ -35,7 +35,9 @@ void RSManager::setupAA() {
           new FXAA(m_pDevice.Get(), rw, rh, (FXAA::Quality)(Settings::get().getAAQuality() - 1)));
       smaa = nullptr;
     }
+    doAA = true;
   } else {
+    doAA = false;
     fxaa = nullptr;
     smaa = nullptr;
   }
@@ -53,17 +55,22 @@ void RSManager::setupSSAO() {
     unsigned int rw = Settings::get().getRenderWidth();
     unsigned int rh = Settings::get().getRenderHeight();
     ssao.reset(new SSAO(m_pDevice.Get(), rw, rh, Settings::get().getSsaoStrength() - 1, ssaoType));
+    doSsao = true;
   } else {
     ssao = nullptr;
+    doSsao = false;
   }
 }
 
 void RSManager::setupDoF() {
   unsigned int dofRes = getDOFResolution();
-  if (Settings::get().getDOFBlurAmount())
+  if (Settings::get().getDOFBlurAmount()) {
     gauss.reset(new GAUSS(m_pDevice.Get(), dofRes * 16 / 9, dofRes));
-  else
+    doDofGauss = true;
+  } else {
     gauss = nullptr;
+    doDofGauss = false;
+  }
 }
 
 void RSManager::onReset() {

RenderstateManager.h

@@ -10,10 +10,10 @@
 
 class RSManager {
 private:
-  D3DVIEWPORT9 viewport;
+  D3DVIEWPORT9 viewport = {};
   Microsoft::WRL::ComPtr<IDirect3DDevice9> m_pDevice;
   double lastPresentTime = 0;
-  bool doAA = false;
+  bool doAA = true;
   std::unique_ptr<SMAA> smaa;
   std::unique_ptr<FXAA> fxaa;
   bool doSsao = true;
@@ -36,7 +36,7 @@ class RSManager {
   unsigned int nrts = 0;
   // Count the number of times the 2 upper DoF rendertargets were set in doft[1]
   // & doft[2]
-  std::array<unsigned int, 3> doft;
+  std::array<unsigned int, 3> doft = {};
   // main rendertarget for this frame
   Microsoft::WRL::ComPtr<IDirect3DSurface9> mainRT;
   unsigned int mainRTuses = 0;
@@ -48,16 +48,10 @@ class RSManager {
   unsigned int isDof(unsigned int width, unsigned int height);
   void measureOcclusionScale();
   void frameTimeManagement();
-  static RSManager instance;
 
 public:
   ~RSManager() = default;
-  RSManager() = default;
-
-  static RSManager& get() { return instance; }
-
-  // DI
-  void setD3DDevice(IDirect3DDevice9* pDevice) { m_pDevice = pDevice; }
+  RSManager(IDirect3DDevice9* pDevice);
 
   void setupAA();
   void setupSSAO();

Settings.inc

@@ -25,6 +25,9 @@ SETTING(unsigned int, LogLevel, "logLevel", 0);
 SETTING(bool, DisableCursor, "disableCursor", false);
 SETTING(bool, CaptureCursor, "captureCursor", false);
 
+// Language Options
+SETTING(std::string, OverrideLanguage, "overrideLanguage", "");
+
 // Skipping Options
 SETTING(bool, SkipIntro, "skipIntro", false);
 

d3d9dev.cpp

@@ -16,8 +16,7 @@ HRESULT APIENTRY hkIDirect3DDevice9::Present(CONST RECT* pSourceRect, CONST RECT
                                              HWND hDestWindowOverride,
                                              CONST RGNDATA* pDirtyRegion) {
   WindowManager::get().toggleCursorCapture();
-  return RSManager::get().redirectPresent(pSourceRect, pDestRect, hDestWindowOverride,
-                                          pDirtyRegion);
+  return m_pRSManager->redirectPresent(pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion);
 }
 
 HRESULT APIENTRY hkIDirect3DDevice9::SetVertexShaderConstantF(UINT StartRegister,
@@ -31,7 +30,7 @@ HRESULT APIENTRY hkIDirect3DDevice9::SetRenderTarget(DWORD RenderTargetIndex,
   if (RenderTargetIndex != 0)
     return D3D_OK; // rendertargets > 0 are not actually used by the game - this
                    // makes the log shorter
-  return RSManager::get().redirectSetRenderTarget(RenderTargetIndex, pRenderTarget);
+  return m_pRSManager->redirectSetRenderTarget(RenderTargetIndex, pRenderTarget);
 }
 
 HRESULT APIENTRY hkIDirect3DDevice9::SetVertexShader(IDirect3DVertexShader9* pvShader) {
@@ -40,7 +39,7 @@ HRESULT APIENTRY hkIDirect3DDevice9::SetVertexShader(IDirect3DVertexShader9* pvS
 
 HRESULT APIENTRY hkIDirect3DDevice9::SetViewport(CONST D3DVIEWPORT9* pViewport) {
   Settings::get().init();
-  RSManager::get().setViewport(*pViewport);
+  m_pRSManager->setViewport(*pViewport);
   return m_pD3Ddev->SetViewport(pViewport);
 }
 
@@ -91,7 +90,7 @@ HRESULT APIENTRY hkIDirect3DDevice9::GetBackBuffer(UINT iSwapChain, UINT iBackBu
 }
 
 HRESULT APIENTRY hkIDirect3DDevice9::EndScene() {
-  Ui::get().onEndScene();
+  m_pUi->onEndScene();
   return m_pD3Ddev->EndScene();
 }
 
@@ -476,8 +475,8 @@ ULONG APIENTRY hkIDirect3DDevice9::Release() { return m_pD3Ddev->Release(); }
 HRESULT APIENTRY hkIDirect3DDevice9::Reset(D3DPRESENT_PARAMETERS* pPresentationParameters) {
   HRESULT hRet = m_pD3Ddev->Reset(pPresentationParameters);
   if (SUCCEEDED(hRet)) {
-    Ui::get().onReset();
-    RSManager::get().onReset();
+    m_pUi->onReset();
+    m_pRSManager->onReset();
   } else {
     spdlog::error(L"ERROR: Reset failed: code: {}, description: {}", DXGetErrorString9W(hRet),
                   DXGetErrorDescription9W(hRet));
@@ -611,7 +610,7 @@ HRESULT APIENTRY hkIDirect3DDevice9::SetScissorRect(CONST RECT* pRect) {
   // SetScissorRect RECT[1024/   0/2048/1024]
   // SetScissorRect RECT[   0/1024/1024/2048]
   // SetScissorRect RECT[1024/1024/2048/2048]
-  if (RSManager::get().isViewport(*pRect) ||
+  if (m_pRSManager->isViewport(*pRect) ||
       (pRect->left == 0 && pRect->top == 0 && pRect->right == 1024 && pRect->bottom == 1024) ||
       (pRect->left == 1024 && pRect->top == 0 && pRect->right == 2048 && pRect->bottom == 1024) ||
       (pRect->left == 0 && pRect->top == 1024 && pRect->right == 1024 && pRect->bottom == 2048) ||
@@ -637,7 +636,7 @@ HRESULT APIENTRY hkIDirect3DDevice9::SetStreamSourceFreq(UINT StreamNumber, UINT
 }
 
 HRESULT APIENTRY hkIDirect3DDevice9::SetTexture(DWORD Stage, IDirect3DBaseTexture9* pTexture) {
-  return RSManager::get().redirectSetTexture(Stage, pTexture);
+  return m_pRSManager->redirectSetTexture(Stage, pTexture);
 }
 
 HRESULT APIENTRY hkIDirect3DDevice9::SetTextureStageState(DWORD Stage,
@@ -696,3 +695,11 @@ HRESULT APIENTRY hkIDirect3DDevice9::UpdateTexture(IDirect3DBaseTexture9* pSourc
 HRESULT APIENTRY hkIDirect3DDevice9::ValidateDevice(DWORD* pNumPasses) {
   return m_pD3Ddev->ValidateDevice(pNumPasses);
 }
+
+float hkIDirect3DDevice9::getOcclusionScale() { return m_pRSManager->getOcclusionScale(); }
+
+void hkIDirect3DDevice9::setUi(Ui* pUi) { m_pUi = pUi; }
+
+IDirect3DDevice9* hkIDirect3DDevice9::getDevice() { return m_pD3Ddev.Get(); }
+
+void hkIDirect3DDevice9::setRSManager(RSManager* pRSManager) { m_pRSManager = pRSManager; }

d3d9dev.h

@@ -3,11 +3,16 @@
 #include <wrl.h>
 #include "d3d9int.h"
 
+class RSManager;
+class Ui;
+
 interface hkIDirect3DDevice9 : public IDirect3DDevice9 {
 private:
   // callback interface
   Microsoft::WRL::ComPtr<IDirect3DDevice9> m_pD3Ddev;
   Microsoft::WRL::ComPtr<IDirect3D9> m_pD3D9;
+  RSManager* m_pRSManager;
+  Ui* m_pUi;
 
 public:
   // original interface
@@ -199,10 +204,12 @@ interface hkIDirect3DDevice9 : public IDirect3DDevice9 {
   (UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo);
   STDMETHOD(DeletePatch)(UINT Handle);
   STDMETHOD(CreateQuery)(D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery);
-
+  
   hkIDirect3DDevice9(IDirect3DDevice9* pIDirect3DDevice9, IDirect3D9* pD3D9);
-
-  IDirect3DDevice9* getDevice() { return m_pD3Ddev.Get(); };
+  IDirect3DDevice9* getDevice();
+  void setRSManager(RSManager* pRSManager);
+  float getOcclusionScale();
+  void setUi(Ui* pUi);
 
   virtual ~hkIDirect3DDevice9() = default;
 };

d3d9int.cpp

@@ -8,7 +8,7 @@
 
 using namespace Microsoft;
 
-class hkIDirect3DDevice9;
+struct hkIDirect3DDevice9;
 
 WRL::ComPtr<hkIDirect3DDevice9> g_pD3DDevice;