diff options
| author | Jan <sentrycraft123@gmail.com> | 2023-06-29 04:22:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-28 23:22:33 -0400 |
| commit | efd907105cf7906c78253631f75bf4fd83f769db (patch) | |
| tree | 0516853204106852adb06ee1d69a74e8994309a0 /loader_wsock32_proxy | |
| parent | b5c4e4e7ed81394070b05296ed087b6043d27667 (diff) | |
| download | NorthstarLauncher-efd907105cf7906c78253631f75bf4fd83f769db.tar.gz NorthstarLauncher-efd907105cf7906c78253631f75bf4fd83f769db.zip | |
Code cleanup (#478)v1.16.0-rc1v1.15.1-rc1v1.15.11.15.X
* turn implicit type casts into standard compliant explicit type casts
* correct includes and library names
* correct implicit use of std-namespaced functions
* turn incomplete virtual implementations into pure virtuals (this also follows what the Source SDK tier0 header does)
* define SqRecurseArgs ahead of implementation to fix templating problems
* switch out removed getentity with getthisentity
* fix calls to curl_easy_escape with wrong types
* replace winapi-specific function with std starts_with function
* format squirrel header
Diffstat (limited to 'loader_wsock32_proxy')
| -rw-r--r-- | loader_wsock32_proxy/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | loader_wsock32_proxy/loader.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/loader_wsock32_proxy/CMakeLists.txt b/loader_wsock32_proxy/CMakeLists.txt index c2616874..f663f342 100644 --- a/loader_wsock32_proxy/CMakeLists.txt +++ b/loader_wsock32_proxy/CMakeLists.txt @@ -14,7 +14,7 @@ target_link_libraries(loader_wsock32_proxy PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/MinHook.x64.lib mswsock.lib ws2_32.lib - Shlwapi.lib + ShLwApi.lib imagehlp.lib dbghelp.lib kernel32.lib diff --git a/loader_wsock32_proxy/loader.cpp b/loader_wsock32_proxy/loader.cpp index 4af4daa1..dedc461a 100644 --- a/loader_wsock32_proxy/loader.cpp +++ b/loader_wsock32_proxy/loader.cpp @@ -36,7 +36,7 @@ bool ShouldLoadNorthstar() std::stringstream runNorthstarFileBuffer; runNorthstarFileBuffer << runNorthstarFile.rdbuf(); runNorthstarFile.close(); - if (!runNorthstarFileBuffer.str()._Starts_with("0")) + if (!runNorthstarFileBuffer.str().starts_with("0")) loadNorthstar = true; } return loadNorthstar; @@ -94,8 +94,8 @@ bool ProvisionNorthstar() return false; } - LPVOID pTarget = GetProcAddress(launcherHandle, "LauncherMain"); - if (MH_CreateHook(pTarget, &LauncherMainHook, reinterpret_cast<LPVOID*>(&LauncherMainOriginal)) != MH_OK || + LPVOID pTarget = (LPVOID)GetProcAddress(launcherHandle, "LauncherMain"); + if (MH_CreateHook(pTarget, (LPVOID)&LauncherMainHook, reinterpret_cast<LPVOID*>(&LauncherMainOriginal)) != MH_OK || MH_EnableHook(pTarget) != MH_OK) MessageBoxA(GetForegroundWindow(), "Hook creation failed for function LauncherMain.", "Northstar Wsock32 Proxy Error", 0); |