aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorp0358 <p0358@users.noreply.github.com>2022-01-02 09:51:35 +0100
committerp0358 <p0358@users.noreply.github.com>2022-01-02 09:51:35 +0100
commit92add9355edbe7a9b639e48077518ee4419e3d4c (patch)
treed34147cd01caf8da98267be1c72dc513b26fcb92
parent6b46d5a0617ce2c87aa1428bcd25c304f94a2749 (diff)
downloadNorthstarLauncher-92add9355edbe7a9b639e48077518ee4419e3d4c.tar.gz
NorthstarLauncher-92add9355edbe7a9b639e48077518ee4419e3d4c.zip
make wsock32 proxy opt-in
-rw-r--r--loader_wsock32_proxy/dllmain.cpp4
-rw-r--r--loader_wsock32_proxy/loader.cpp11
-rw-r--r--loader_wsock32_proxy/loader.h1
3 files changed, 12 insertions, 4 deletions
diff --git a/loader_wsock32_proxy/dllmain.cpp b/loader_wsock32_proxy/dllmain.cpp
index 8e3dcd72..0b518dbe 100644
--- a/loader_wsock32_proxy/dllmain.cpp
+++ b/loader_wsock32_proxy/dllmain.cpp
@@ -36,6 +36,7 @@ BOOL WINAPI DllMain(HINSTANCE hInst, DWORD reason, LPVOID)
if (!ProvisionNorthstar()) // does not call InitialiseNorthstar yet, will do it on LauncherMain hook
return 1;
+ // copy the original library for system to our local directory, with changed name so that we can load it
swprintf_s(dllPath, L"%s\\bin\\x64_retail\\wsock32.org.dll", exePath);
GetSystemDirectoryW(dllPath2, 4096);
swprintf_s(dllPath2, L"%s\\wsock32.dll", dllPath2);
@@ -54,6 +55,9 @@ BOOL WINAPI DllMain(HINSTANCE hInst, DWORD reason, LPVOID)
hL = LoadLibraryExW(dllPath, 0, LOAD_WITH_ALTERED_SEARCH_PATH);
if (!hL) return false;
+ // load the functions to proxy
+ // it's only some of them, because in case of wsock32 most of the functions can actually be natively redirected
+ // (see wsock32.def and https://source.winehq.org/WineAPI/wsock32.html)
p[1] = GetProcAddress(hL, "EnumProtocolsA");
p[2] = GetProcAddress(hL, "EnumProtocolsW");
p[4] = GetProcAddress(hL, "GetAddressByNameA");
diff --git a/loader_wsock32_proxy/loader.cpp b/loader_wsock32_proxy/loader.cpp
index 49096bb0..907caa9d 100644
--- a/loader_wsock32_proxy/loader.cpp
+++ b/loader_wsock32_proxy/loader.cpp
@@ -16,9 +16,9 @@ void LibraryLoadError(DWORD dwMessageId, const wchar_t* libName, const wchar_t*
bool ShouldLoadNorthstar()
{
- bool loadNorthstar = !strstr(GetCommandLineA(), "-vanilla");
+ bool loadNorthstar = strstr(GetCommandLineA(), "-northstar");
- if (!loadNorthstar)
+ if (loadNorthstar)
return loadNorthstar;
auto runNorthstarFile = std::ifstream("run_northstar.txt");
@@ -27,8 +27,8 @@ bool ShouldLoadNorthstar()
std::stringstream runNorthstarFileBuffer;
runNorthstarFileBuffer << runNorthstarFile.rdbuf();
runNorthstarFile.close();
- if (runNorthstarFileBuffer.str()._Starts_with("0"))
- loadNorthstar = false;
+ if (!runNorthstarFileBuffer.str()._Starts_with("0"))
+ loadNorthstar = true;
}
return loadNorthstar;
}
@@ -63,6 +63,9 @@ int LauncherMainHook(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
bool ProvisionNorthstar()
{
+ if (!ShouldLoadNorthstar())
+ return true;
+
if (MH_Initialize() != MH_OK)
{
MessageBoxA(GetForegroundWindow(), "MH_Initialize failed\nThe game cannot continue and has to exit.", "Northstar Wsock32 Proxy Error", 0);
diff --git a/loader_wsock32_proxy/loader.h b/loader_wsock32_proxy/loader.h
index 02ccb97d..9a14b2e7 100644
--- a/loader_wsock32_proxy/loader.h
+++ b/loader_wsock32_proxy/loader.h
@@ -4,4 +4,5 @@ extern wchar_t exePath[4096];
extern wchar_t dllPath[8192];
extern wchar_t dllPath2[4096];
+bool ShouldLoadNorthstar();
bool ProvisionNorthstar();