The WoW console will now be disabled by default, but may be opened wi…

…th a configuration setting which is given in the example configuration file
namreeb · Jun 18, 2018 · df6e129 · df6e129
1 parent 5cf4e6b
commit df6e129
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 4 deletions.
diff --git a/example_config.xml b/example_config.xml
@@ -9,6 +9,9 @@
     <!--- Hostname or IP address to use.  This is accomplished by replacing value of the realmList console variable after all other loading is finished. -->
     <AuthServer Host="logon.lightshope.org" />
 
+    <!--- Optionally enable the WoW console.  To not enable the console, either remove this or set the value to "0". -->
+    <Console Value="1" />
+
     <!--- Optional setting to override the DirectX field of view parameter.  If you don't know what this is, do not use it. -->
     <Fov Value="3.14159" />
 

diff --git a/wowreeb/Config.cpp b/wowreeb/Config.cpp
@@ -133,6 +133,7 @@ void Config::Reload()
             ins.OurDll = _ourDll;
             ins.OurMethod = "Load";
             ZeroMemory(&ins.SHA256, sizeof(ins.SHA256));
+            ins.Console = false;
             ins.Fov = 0.f;
 
             for (auto r = n->first_attribute(); !!r; r = r->next_attribute())
@@ -202,6 +203,30 @@ void Config::Reload()
                         }
                     }
                 }
+                else if (cname == "Console")
+                {
+                    std::string consoleValue;
+
+                    for (auto r = c->first_attribute(); !!r; r = r->next_attribute())
+                    {
+                        const std::string rname(r->name());
+
+                        if (rname == "Value")
+                        {
+                            consoleValue = std::string(r->value());
+
+                            std::transform(consoleValue.begin(), consoleValue.end(), consoleValue.begin(), ::toupper);
+                        }
+                        else
+                        {
+                            std::stringstream str;
+                            str << "Unexpected " << cname << " attribute \"" << rname << "\"";
+                            throw std::runtime_error(str.str().c_str());
+                        }
+                    }
+
+                    ins.Console = consoleValue == "1" || consoleValue == "TRUE";
+                }
                 else if (cname == "Fov")
                 {
                     for (auto r = c->first_attribute(); !!r; r = r->next_attribute())
@@ -294,6 +319,12 @@ void Config::Reload()
 
                     std::transform(configValue.begin(), configValue.end(), configValue.begin(), ::toupper);
                 }
+                else
+                {
+                    std::stringstream str;
+                    str << "Unexpected " << name << " attribute \"" << name << "\"";
+                    throw std::runtime_error(str.str().c_str());
+                }
             }
 
             if (configName == "ClearWDB")

diff --git a/wowreeb/Config.hpp b/wowreeb/Config.hpp
@@ -52,6 +52,8 @@ class Config
 
         std::string AuthServer;
 
+        bool Console;
+
         float Fov;
 
         fs::path OurDll;

diff --git a/wowreeb/Injector.cpp b/wowreeb/Injector.cpp
@@ -97,11 +97,14 @@ void EjectionPoll(hadesmem::Process process, HMODULE dll, PVOID remoteBuffer, si
 unsigned int Inject(
     const fs::path &exe,
     const fs::path &ourDll, const std::string &ourMethod,
-    const std::string &authServer, float fov,
+    const std::string &authServer, bool console, float fov,
     const fs::path &nativeDll, const std::string &nativeMethod,
     const fs::path &clrDll, const std::wstring &clrTypeName, const std::wstring &clrMethodName)
 {
-    const std::vector<std::wstring> createArgs { L"-console" };
+    std::vector<std::wstring> createArgs;
+
+    if (console)
+        createArgs.emplace_back(L"-console");
 
     try
     {

diff --git a/wowreeb/Injector.hpp b/wowreeb/Injector.hpp
@@ -33,6 +33,6 @@ namespace fs = std::experimental::filesystem;
 unsigned int Inject(
     const fs::path &exe,
     const fs::path &ourDll, const std::string &ourMethod,
-    const std::string &authServer, float fov,
+    const std::string &authServer, bool console, float fov,
     const fs::path &nativeDll, const std::string &nativeMethod,
     const fs::path &clrDll, const std::wstring &clrTypeName, const std::wstring &clrMethodName);
diff --git a/wowreeb/main.cpp b/wowreeb/main.cpp
@@ -127,7 +127,7 @@ void Launch(const Config::ConfigEntry &entry, bool clearWDB, bool verifyChecksum
     {
         ::Inject(entry.Path,
             entry.OurDll, entry.OurMethod,
-            entry.AuthServer, entry.Fov,
+            entry.AuthServer, entry.Console, entry.Fov,
             entry.NativeDll, entry.NativeMethod,
             entry.CLRDll, make_wstring(entry.CLRTypeName), make_wstring(entry.CLRMethodName));
         return;