diff options
| author | pg9182 <96569817+pg9182@users.noreply.github.com> | 2022-08-08 06:12:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-08 11:12:11 +0100 |
| commit | 5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f (patch) | |
| tree | 6c55b909fd258251c238bfad9caf83113fd88f33 /NorthstarDedicatedTest/sourceinterface.cpp | |
| parent | 286cea5f6280e568f5cb4c953d93993c98625ce4 (diff) | |
| download | NorthstarLauncher-5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f.tar.gz NorthstarLauncher-5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f.zip | |
Fix most clang/mingw issues (#226)
- Fix include case.
- Replace MSVC-specific align with standard alignas.
- Type fixes.
- Delete operator noexcept.
- A few other minor issues.
- clang-format everything.
- Use c++20 instead of c++17.
- Rewrite ERROR macro for launcher_wsock32_proxy.
- Use a plain ifstream for the audio.cpp wavStream.
Note: When compiling with clang, you'll need -municode.
Related to #212.
Diffstat (limited to 'NorthstarDedicatedTest/sourceinterface.cpp')
| -rw-r--r-- | NorthstarDedicatedTest/sourceinterface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/NorthstarDedicatedTest/sourceinterface.cpp b/NorthstarDedicatedTest/sourceinterface.cpp index 2cc4733d..56020e5e 100644 --- a/NorthstarDedicatedTest/sourceinterface.cpp +++ b/NorthstarDedicatedTest/sourceinterface.cpp @@ -47,7 +47,7 @@ void HookClientCreateInterface(HMODULE baseAddress) HookEnabler hook; ENABLER_CREATEHOOK( hook, - GetProcAddress(baseAddress, "CreateInterface"), + reinterpret_cast<void*>(GetProcAddress(baseAddress, "CreateInterface")), &ClientCreateInterfaceHook, reinterpret_cast<LPVOID*>(&clientCreateInterfaceOriginal)); } @@ -57,7 +57,7 @@ void HookServerCreateInterface(HMODULE baseAddress) HookEnabler hook; ENABLER_CREATEHOOK( hook, - GetProcAddress(baseAddress, "CreateInterface"), + reinterpret_cast<void*>(GetProcAddress(baseAddress, "CreateInterface")), &ServerCreateInterfaceHook, reinterpret_cast<LPVOID*>(&serverCreateInterfaceOriginal)); } @@ -67,7 +67,7 @@ void HookEngineCreateInterface(HMODULE baseAddress) HookEnabler hook; ENABLER_CREATEHOOK( hook, - GetProcAddress(baseAddress, "CreateInterface"), + reinterpret_cast<void*>(GetProcAddress(baseAddress, "CreateInterface")), &EngineCreateInterfaceHook, reinterpret_cast<LPVOID*>(&engineCreateInterfaceOriginal)); } @@ -79,4 +79,4 @@ void InitialiseInterfaceCreationHooks() // not used atm // AddDllLoadCallback("server.dll", HookServerCreateInterface); // AddDllLoadCallback("engine.dll", HookEngineCreateInterface); -}
\ No newline at end of file +} |