Update README.md

most dont use mercury for 1.8 so no reason to include this in a zip

MercuryInjector/dllmain.cpp

@@ -39,7 +39,8 @@ void SetSubGameHook(void* thisref, uint8_t SubGame)
 
     if (!write)
     {
-        std::cerr << "DLL failed to inject (WriteProcessMemory failed).\n";
+        MessageBoxA(NULL, "DLL failed to inject (WriteProcessMemory failed).", NULL, MB_OK);
+        std::cerr << "\nDLL failed to inject (WriteProcessMemory failed).\n";
 
         MH_DisableHook(Offset<uintptr_t>(SetSubGameOffset));
         SetSubGame(thisref, SubGame);
@@ -51,7 +52,8 @@ void SetSubGameHook(void* thisref, uint8_t SubGame)
 
     if (!thread)
     {
-        std::cerr << "DLL failed to inject (CreateRemoteThread failed).\n";
+        MessageBoxA(NULL, "DLL failed to inject (CreateRemoteThread failed).", NULL, MB_OK);
+        std::cerr << "\nDLL failed to inject (CreateRemoteThread failed).\n";
 
         MH_DisableHook(Offset<uintptr_t>(SetSubGameOffset));
         SetSubGame(thisref, SubGame);

MercuryLauncher/MercuryLauncher.cpp

@@ -24,11 +24,14 @@
 #define PAKS_PATH_1_8 L".\\FortniteGame\\Content\\Paks\\"
 #define PRODUCT_VERSION_1_8 L"3724489"
 #define DLL_URL "https://github.com/absoluteSpacehead/MercuryLauncher-Assets/raw/refs/heads/main/Mercury-1.8.dll"
+#define INJECTOR_URL "https://github.com/absoluteSpacehead/MercuryLauncher/releases/latest/download/MercuryInjector.dll"
 #define PAK_URL_18 "https://github.com/absoluteSpacehead/MercuryLauncher-Assets/raw/refs/heads/main/zzz_LawinServer.pak"
 #define SIG_URL_18 "https://github.com/absoluteSpacehead/MercuryLauncher-Assets/raw/refs/heads/main/zzz_LawinServer.sig"
 
 HANDLE job;
 
+bool verbosecURL;
+
 void Exit()
 {
     std::cout << "Press any key to exit.\n";
@@ -52,7 +55,7 @@ int DownloadFile(const char* URL, const wchar_t outName[FILENAME_MAX])
 
     if (!curl)
     {
-        std::cout << "cURL init failed.\n";
+        std::cout << "\ncURL init failed.\n";
         return 1;
     }
 
@@ -61,7 +64,7 @@ int DownloadFile(const char* URL, const wchar_t outName[FILENAME_MAX])
     {
         char out[128];
         strerror_s(out, fpOpen);
-        std::cout << "_wfopen_s failed (" << out << ") .\n";
+        std::cout << "\n_wfopen_s failed (" << out << ") .\n";
         return 2;
     }
     
@@ -69,11 +72,15 @@ int DownloadFile(const char* URL, const wchar_t outName[FILENAME_MAX])
     curl_easy_setopt(curl, CURLOPT_URL, URL);
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteData);
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
+
+    if (verbosecURL)
+        curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+
     res = curl_easy_perform(curl);
 
     if (res != 0)
     {
-        std::cout << "cURL failed (" << curl_easy_strerror(res) << ").\n";
+        std::cout << "\ncURL failed (" << curl_easy_strerror(res) << ").\n";
         return 3;
     }
 
@@ -125,7 +132,7 @@ int RunLawin()
 
         if (DownloadFile(LAWIN_URL, (localAppData + L"\\LawinServer.zip").c_str()) != 0)
         {
-            std::cerr << "LawinServer failed to download.\n";
+            std::cerr << "\nLawinServer failed to download.\n";
             return 1;
         }
 
@@ -138,14 +145,14 @@ int RunLawin()
         zip_source_t* src = zip_source_win32w_create((localAppData + L"\\LawinServer.zip").c_str(), 0, -1, &err);
         if (!src)
         {
-            std::cerr << "Source creation failed (" << zip_error_strerror(&err) << ").\n";
+            std::cerr << "\nSource creation failed (" << zip_error_strerror(&err) << ").\n";
             return 2;
         }
 
         zip* file = zip_open_from_source(src, 0, &err);
         if (!file)
         {
-            std::cerr << "File opening failed (" << zip_error_strerror(&err) << ").\n";
+            std::cerr << "\nFile opening failed (" << zip_error_strerror(&err) << ").\n";
             zip_source_free(src);
             return 3;
         }
@@ -178,7 +185,7 @@ int RunLawin()
             zip_file* zFile = zip_fopen_index(file, i, 0);
             if (!zFile)
             {
-                std::cerr << "Failed to open file " << name << " (file may be corrupt).\n";
+                std::cerr << "\nFailed to open file " << name << " (file may be corrupt).\n";
                 return 4;
             }
 
@@ -186,7 +193,7 @@ int RunLawin()
 
             if (fileHandle == INVALID_HANDLE_VALUE)
             {
-                std::wcerr << "Failed to create file " << targ << ".\n";
+                std::wcerr << "\nFailed to create file " << targ << ".\n";
                 return 5;
             }
 
@@ -197,7 +204,7 @@ int RunLawin()
             {
                 if (!WriteFile(fileHandle, buf, (DWORD)read, &written, nullptr))
                 {
-                    std::wcerr << "Error writing file " << targ << ".\n";
+                    std::wcerr << "\nError writing file " << targ << ".\n";
                     return 6;
                 }
             }
@@ -223,7 +230,7 @@ int RunLawin()
     startupInfo.cb = sizeof(STARTUPINFO);
     PROCESS_INFORMATION processInformation = { 0 };
     std::wstring cmd = L"cmd /c npm i";
-    CreateProcessW(nullptr, &cmd[0], nullptr, nullptr, FALSE, CREATE_NO_WINDOW, nullptr, (localAppData + L"\\LawinServer").c_str(), &startupInfo, &processInformation);
+    CreateProcessW(nullptr, &cmd[0], nullptr, nullptr, FALSE, 0x0, nullptr, (localAppData + L"\\LawinServer").c_str(), &startupInfo, &processInformation);
 
     WaitForSingleObject(processInformation.hProcess, INFINITE);
 
@@ -233,7 +240,7 @@ int RunLawin()
     // make sure that it actually. installed the packages
     if (!std::filesystem::exists(localAppData + L"\\LawinServer\\node_modules"))
     {
-        std::cerr << "Packages were not installed correctly (node_modules doesn't exist).\n";
+        std::cerr << "\nPackages were not installed correctly (node_modules doesn't exist).\n\nnpm may either not be installed or not be added to PATH. Ensure node.js and npm have been installed correctly.\nIf node.js has not yet been installed, visit https://nodejs.org to download and install it.\n";
         return 7;
     }
 
@@ -245,7 +252,11 @@ int RunLawin()
     startupInfo.cb = sizeof(STARTUPINFO);
     processInformation = { 0 };
     cmd = L"node index.js";
-    CreateProcessW(nullptr, &cmd[0], nullptr, nullptr, FALSE, 0x0, nullptr, (localAppData + L"\\LawinServer").c_str(), &startupInfo, &processInformation);
+    if (!CreateProcessW(nullptr, &cmd[0], nullptr, nullptr, FALSE, 0x0, nullptr, (localAppData + L"\\LawinServer").c_str(), &startupInfo, &processInformation))
+    {
+        std::cerr << "\nLawinServer failed to start.\n\nnode.js may either not be installed or not be added to PATH. Ensure node.js and npm have been installed correctly.\nIf node.js has not yet been installed, visit https://nodejs.org to download and install it.\n";
+        return 7;
+    }
 
     AssignProcessToJobObject(job, processInformation.hProcess);
 
@@ -272,7 +283,7 @@ int SetupOTPak()
 
         if (DownloadFile(PAK_URL_OT, (pathAsWstring + L"FortniteGame-WindowsClient_p.pak").c_str()) != 0)
         {
-            std::cerr << "Failed to download FortniteGame-WindowsClient_p.pak.\n";
+            std::cerr << "\nFailed to download FortniteGame-WindowsClient_p.pak.\n";
             return 3;
         }
 
@@ -294,32 +305,32 @@ int SetupOTPakless()
         pathAsWstring = CONFIG_PATH_OT;
         if (DownloadFile(DEFAULTENGINE_URL, (pathAsWstring + L"DefaultEngine.ini").c_str()) != 0)
         {
-            std::cerr << "Failed to download DefaultEngine.ini.\n";
+            std::cerr << "\nFailed to download DefaultEngine.ini.\n";
             return 3;
         }
 
         if (DownloadFile(DEFAULTGAME_URL, (pathAsWstring + L"DefaultGame.ini").c_str()) != 0)
         {
-            std::cerr << "Failed to download DefaultGame.ini.\n";
+            std::cerr << "\nFailed to download DefaultGame.ini.\n";
             return 3;
         }
 
         pathAsWstring = CONTENT_PATH_OT;
         if (DownloadFile(ABILITIES_URL, (pathAsWstring + L"GE_AllAbilities.uasset").c_str()) != 0)
         {
-            std::cerr << "Failed to download GE_AllAbilities.uasset.\n";
+            std::cerr << "\nFailed to download GE_AllAbilities.uasset.\n";
             return 3;
         }
 
         if (DownloadFile(ACTOR_URL, (pathAsWstring + L"InGame_Actor.uasset").c_str()) != 0)
         {
-            std::cerr << "Failed to download InGame_Actor.uasset.\n";
+            std::cerr << "\nFailed to download InGame_Actor.uasset.\n";
             return 3;
         }
 
         if (DownloadFile(GAMEMODE_URL, (pathAsWstring + L"InGame_Gamemode.uasset").c_str()) != 0)
         {
-            std::cerr << "Failed to download InGame_Gamemode.uasset.\n";
+            std::cerr << "\nFailed to download InGame_Gamemode.uasset.\n";
             return 3;
         }
 
@@ -349,7 +360,7 @@ int SetupOT()
     {
         if (SetupOTPak() != 0)
         {
-            std::cerr << "Failed to set up Mercury. (OT6.5 pakked)\n";
+            std::cerr << "\nFailed to set up Mercury. (OT6.5 pakked)\n";
             return 2;
         }
     }
@@ -357,7 +368,7 @@ int SetupOT()
     {
         if (SetupOTPakless() != 0)
         {
-            std::cerr << "Failed to set up Mercury. (OT6.5 pakless)\n";
+            std::cerr << "\nFailed to set up Mercury. (OT6.5 pakless)\n";
             return 2;
         }
     }
@@ -369,7 +380,14 @@ int SetupOT()
     PROCESS_INFORMATION processInformation = { 0 };
     std::wstring cmd(BINARY_PATH_OT);
     cmd += L" -log -AUTH_LOGIN=unknown -AUTH_PASSWORD=5001 -AUTH_TYPE=exchangecode";
-    CreateProcessW(BINARY_PATH_OT, &cmd[0], nullptr, nullptr, FALSE, 0x0, nullptr, nullptr, &startupInfo, &processInformation);
+
+    bool success = CreateProcessW(BINARY_PATH_OT, &cmd[0], nullptr, nullptr, FALSE, 0x0, nullptr, nullptr, &startupInfo, &processInformation);
+
+    if (!success)
+    {
+        std::cerr << "\nFailed to launch Fortnite. (" << GetLastError() << ")\n";
+        return 3;
+    }
 
     AssignProcessToJobObject(job, processInformation.hProcess);
 
@@ -388,37 +406,36 @@ int Setup18()
         return 1;
 
     std::wstring localAppData;
-
     GetLocalAppData(localAppData);
 
-    // check that we have our dll. this isn't required for OT so it's not linked, means you only need one file in the OT dir
-    if (!std::filesystem::exists(".\\MercuryInjector.dll"))
-    {
-        std::cerr << "Required DLL (MercuryInjector.dll) is missing. Ensure all files were extracted properly.\n";
-        return 4;
-    }
-
-    // check that we have the mercury dll AND the sig. someone could be using the same build folder but have wiped their appdata, etc
+    // check that we have the mercury dlls AND the sig. someone could be using the same build folder but have wiped their appdata, etc
+    // check for injector for backcomp
     std::wstring pathAsWstring(PAKS_PATH_1_8);
-    if (!std::filesystem::exists(localAppData + L"\\Mercury-1.8.dll") || !std::filesystem::exists(pathAsWstring + L"zzz_LawinServer.sig"))
+    if (!std::filesystem::exists(localAppData + L"\\Mercury-1.8.dll") || !std::filesystem::exists(localAppData + L"\\MercuryInjector.dll") || !std::filesystem::exists(pathAsWstring + L"zzz_LawinServer.sig"))
     {
         std::cout << "Required Mercury files are missing. Downloading...\n";
 
         if (DownloadFile(DLL_URL, (localAppData + L"\\Mercury-1.8.dll").c_str()) != 0)
         {
-            std::cerr << "Failed to download Mercury-1.8.dll.\n";
+            std::cerr << "\nFailed to download Mercury-1.8.dll.\n";
+            return 2;
+        }
+
+        if (DownloadFile(INJECTOR_URL, (localAppData + L"\\MercuryInjector.dll").c_str()) != 0)
+        {
+            std::cerr << "\nFailed to download MercuryInjector.dll.\n";
             return 2;
         }
 
         if (DownloadFile(PAK_URL_18, (pathAsWstring + L"zzz_LawinServer.pak").c_str()) != 0)
         {
-            std::cerr << "Failed to download zzz_LawinServer.pak.\n";
+            std::cerr << "\nFailed to download zzz_LawinServer.pak.\n";
             return 2;
         }
 
         if (DownloadFile(SIG_URL_18, (pathAsWstring + L"zzz_LawinServer.sig").c_str()) != 0)
         {
-            std::cerr << "Failed to download zzz_LawinServer.sig.\n";
+            std::cerr << "\nFailed to download zzz_LawinServer.sig.\n";
             return 2;
         }
         
@@ -436,12 +453,17 @@ int Setup18()
     std::wstring cmdl(BINARY_PATH_1_8);
     cmdl += L" -skippatchcheck -epicportal -HTTP=WinInet -log";
 
-    CreateProcessW(BINARY_PATH_1_8, &cmdl[0], nullptr, nullptr, FALSE, 0x0, nullptr, nullptr, &startupInfo, &processInformation);
+    bool success = CreateProcessW(BINARY_PATH_1_8, &cmdl[0], nullptr, nullptr, FALSE, 0x0, nullptr, nullptr, &startupInfo, &processInformation);
+
+    if (!success)
+    {
+        std::cerr << "\nFailed to launch Fortnite. (" << GetLastError() << ")\n";
+        return 5;
+    }
 
     AssignProcessToJobObject(job, processInformation.hProcess);
 
-    std::wstring dllPath(std::filesystem::current_path().c_str());
-    dllPath += L"\\MercuryInjector.dll";
+    std::wstring dllPath((localAppData + L"\\MercuryInjector.dll").c_str());
 
     // reference https://github.com/ZeroMemoryEx/Dll-Injector/blob/master/DLL-Injector/Dll-Injector.cpp#L43
     HANDLE fnHandle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, processInformation.dwProcessId);
@@ -450,7 +472,7 @@ int Setup18()
 
     if (!write)
     {
-        std::cerr << "DLL failed to inject (WriteProcessMemory failed).\n";
+        std::cerr << "\nDLL failed to inject (WriteProcessMemory failed).\n";
 
         TerminateProcess(processInformation.hProcess, 0);
         return 3;
@@ -460,7 +482,7 @@ int Setup18()
 
     if (!thread)
     {
-        std::cerr << "DLL failed to inject (CreateRemoteThread failed).\n";
+        std::cerr << "\nDLL failed to inject (CreateRemoteThread failed).\n";
 
         TerminateProcess(processInformation.hProcess, 0);
         return 3;
@@ -481,31 +503,21 @@ int Setup18()
 }
 
 
-int main()
+int main(int argc, char* argv[])
 {
+    for (int i = 0; i < argc; i++)
+    {
+        if (_stricmp(argv[i], "-verbosecurl") == 0)
+        {
+            verbosecURL = true;
+        }
+    }
+
     job = CreateJobObjectW(nullptr, nullptr);
     JOBOBJECT_EXTENDED_LIMIT_INFORMATION jobInfo = { 0 };
     jobInfo.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
     SetInformationJobObject(job, JobObjectExtendedLimitInformation, &jobInfo, sizeof(jobInfo));
 
-    // a lil hacky i dont care.
-    std::wstring cmd = L"cmd /c npm --version";
-    STARTUPINFOW startupInfo = { 0 };
-    startupInfo.cb = sizeof(STARTUPINFO);
-    PROCESS_INFORMATION processInformation = { 0 };
-
-    if (!CreateProcessW(nullptr, &cmd[0], nullptr, nullptr, FALSE, CREATE_NO_WINDOW, nullptr, nullptr, &startupInfo, &processInformation))
-    {
-        std::cerr << "npm is either not installed or has not been added to PATH. Ensure node.js and npm have been installed correctly.\nIf node.js has not yet been installed, visit https://nodejs.org to download and install it.\n";
-        CloseHandle(processInformation.hProcess);
-        CloseHandle(processInformation.hThread);
-        Exit();
-        return 3;
-    }
-
-    CloseHandle(processInformation.hProcess);
-    CloseHandle(processInformation.hThread);
-
     if (std::filesystem::exists(BINARY_PATH_OT) || std::filesystem::exists(BINARY_PATH_OT_FUCKBLK))
     {
         // we only have 1 32bit build lol
@@ -540,14 +552,14 @@ int main()
         }
         else
         {
-            std::wcerr << "Binary ProductVersion is wrong (got " << version << ", expected " << PRODUCT_VERSION_1_8 << "). Ensure you're using Fortnite 1.8.\n";
+            std::wcerr << "\nBinary ProductVersion is wrong (got " << version << ", expected " << PRODUCT_VERSION_1_8 << "). Ensure you're using Fortnite 1.8.\n";
             Exit();
             return 2;
         }
     }
     else
     {
-        std::cerr << "No binaries could be found. Ensure the launcher is placed alongside the FortniteGame and Engine folders.\n";
+        std::cerr << "\nNo binaries could be found. Ensure the launcher is placed alongside the FortniteGame and Engine folders.\n";
         Exit();
         return 1;
     }

README.md

@@ -1,6 +1,6 @@
-Temporary, sloppily written Mercury launcher designed to keep things simple until the next update (eventually) releases.
+Temporary, sloppily written Mercury launcher designed to keep things simple until the next update (never) releases.
 
 Uses a bunch of libraries that I'm too lazy to write here, notably MinHook, libcurl & libzip
 
 # Usage
-![image](https://github.com/user-attachments/assets/ee3285e7-213e-4c05-82f6-2fd320ee0244)
+<img src="https://github.com/user-attachments/assets/3e063e39-95a5-43df-b942-7bf90f1496e4" />