Changes for v1.0.0.2. Allowed use licenses for premium plugins

darkfoxdeveloper · darkfoxdeveloper · commit 70beabe3c4cd · 2020-10-24T13:09:25.000+02:00
diff --git a/ConquerHook/CSV3Hook.cpp b/ConquerHook/CSV3Hook.cpp
@@ -39,7 +39,10 @@ int ClientVersion = 0, EnableHostName = 0, UpdatedIPS = 0;
 BYTE patternDynamic = 0x4F;
 char HostName[32] = "";
 LPCSTR HeaderConfig = "OpenConquerHook";
-DWORD_PTR ServerNameMemoryAddress = 0x005726DC;
+// Variables of Settings from .ini file
+char ServerName[16] = "ConquerOnline";
+DWORD ServerNameMemoryAddress = 0x005726DC;
+// Patterns for working connection
 BYTE pattern_66XX[] = { 0x85, 0xC0, 0x75, 0x2F, 0x8B, 0x4F, 0x14, 0xE8, 0x0D, 0xF1, 0xFF, 0xFF, 0x83, 0x4D, 0xFC, 0xFF, 0x8B, 0x4D, 0xF4 }; // Version = 66XX
 BYTE pattern2_66XX[] = { 0x85, 0xC9, 0x74, 0x0C, 0xFF, 0x75, 0x0C, 0x57, 0xE8, 0x53, 0xF2, 0xFF, 0xFF, 0x89, 0x45 }; // Version = 66XX
 BYTE pattern_60XX[] = { 0x85, 0xC0, 0x75, 0x00, 0x8B, 0x4F, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x83, 0x4D, 0x00, 0x00, 0x8B, 0x00, 0x00 }; // Version = 60XX
@@ -131,17 +134,10 @@ int __stdcall csv3_connect(SOCKET s, sockaddr_in* name, int len)
 	}
 
 	//Servername Changer By DaRkFox
-	string input = "ConquerOnline";
-	GetPrivateProfileStringA(HeaderConfig, "SERVERNAME", "ConquerOnline", (LPSTR)input.c_str(), 128, szConfig);
-	char buffer[128];
+	char buffer[16];
 	if (ServerNameMemoryAddress != 0) {
-		if (ReadProcessMemory(GetCurrentProcess(), (LPCVOID)ServerNameMemoryAddress, &buffer, sizeof(buffer), NULL)) {
-			//Input Servername
-			if (!WriteProcessMemory(GetCurrentProcess(), (LPVOID)ServerNameMemoryAddress, input.c_str(), sizeof(buffer), NULL))
-			{
-				//MessageBoxA(NULL, "Error cannot WriteProcessMemory!", "Error", MB_OK + MB_ICONERROR);
-			}
-		}
+		//Input Servername
+		WriteProcessMemory(GetCurrentProcess(), (LPVOID)ServerNameMemoryAddress, ServerName, sizeof(buffer), NULL);
 	}
 	//END Servername Changer
 
@@ -233,27 +229,27 @@ void csv3_init(HMODULE hModule)
 	GetPrivateProfileStringA(HeaderConfig, "SERVER_VERSION", "0", szVersionValue, 5, szConfig);
 	ClientVersion = atoi(szVersionValue);
 
+	// Get the servername
+	GetPrivateProfileStringA(HeaderConfig, "SERVERNAME", "ConquerOnline", ServerName, 16, szConfig);
+	ServerNameMemoryAddress = GetPrivateProfileIntA(HeaderConfig, "SERVERNAME_MEMORYADDRESS", 0, szConfig);
+
 	if (ClientVersion >= 5600) {
 		//
 		//	hook packet processor
 		//
 
 		bool wildcards[] = { 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1 };
 		PBYTE match = (PBYTE)FindMemoryPattern(pattern_OLD, wildcards, 19);
-		ServerNameMemoryAddress = 0x0097FAB8;
+
 		if (ClientVersion >= 5700) {
 			match = (PBYTE)FindMemoryPattern(pattern_56XX, wildcards, 19);
-			ServerNameMemoryAddress = 0;
 		}
 		if (ClientVersion >= 6000) {
 			match = (PBYTE)FindMemoryPattern(pattern_60XX, wildcards, 19);
-			ServerNameMemoryAddress = 0;
-			//ServerNameMemoryAddress = 0x00C67FD0;
 		}
 		if (ClientVersion >= 6600) {
 			match = (PBYTE)FindMemoryPattern(pattern_66XX, wildcards, 19);
-			ServerNameMemoryAddress = 0;
-			//ServerNameMemoryAddress = 0x00CD7240;
+
 		}
 
 		if (match == NULL)
diff --git a/ConquerLoader/CLCore/Models/LoaderConfig.cs b/ConquerLoader/CLCore/Models/LoaderConfig.cs
@@ -10,6 +10,7 @@ public class LoaderConfig
         public bool CloseOnFinish { get; set; }
         public bool HighResolution { get; set; }
         public bool FullScreen { get; set; }
+        public bool ServernameChange { get; set; }
         public string Title { get; set; }
         public string LicenseKey { get; set; }
 
diff --git a/ConquerLoader/CLCore/Models/ServerConfiguration.cs b/ConquerLoader/CLCore/Models/ServerConfiguration.cs
@@ -12,5 +12,6 @@ public class ServerConfiguration
         public bool EnableHostName { get; set; }
         public bool UseDirectX9 { get; set; }
         public string Hostname { get; set; }
+        public string ServerNameMemoryAddress { get; set; }
     }
 }
diff --git a/ConquerLoader/CLCore/PluginSystem/PluginLoader.cs b/ConquerLoader/CLCore/PluginSystem/PluginLoader.cs
@@ -47,7 +47,7 @@ public void LoadPluginsFromAPI(LoaderConfig LoaderConfig)
 			Plugins = new List<IPlugin>();
 
 			HttpClient client = new HttpClient();
-			HttpResponseMessage response = client.GetAsync("http://localhost/api/v1/167635d839c027b0c965cfa0f995dc43$/GetUserModules/" + LoaderConfig.LicenseKey).Result;
+			HttpResponseMessage response = client.GetAsync("https://conquerloader.com/api/v1/167635d839c027b0c965cfa0f995dc43$/GetUserModules/" + LoaderConfig.LicenseKey).Result;
 			if (response.IsSuccessStatusCode)
 			{
 				string result = response.Content.ReadAsStringAsync().Result;
diff --git a/ConquerLoader/ConquerLoader/Main.cs b/ConquerLoader/ConquerLoader/Main.cs
@@ -27,11 +27,6 @@ public Main()
             this.Theme = MetroFramework.MetroThemeStyle.Light;
         }
 
-        /*
-         * TODO LIST
-         * Change servername on new clients with encrypted Server.dat (Maybe the best option is find the String of first Server in Server.dat (Decrypting it with the tool in the oc forum) in memory and remplace this with the custom string of LoaderConfig.SelectedServer.ServerName
-         * */
-
         private void Main_Load(object sender, EventArgs e)
         {
             LoaderConfig = Core.GetLoaderConfig();
@@ -100,64 +95,106 @@ private void SetServerStatus()
 
         private void BtnStart_Click(object sender, EventArgs e)
         {
-            if (LoaderConfig == null) return;
-            if (cbxServers.SelectedItem == null) return;
-            SelectedServer = LoaderConfig.Servers.Where(x => x.ServerName == cbxServers.SelectedItem.ToString()).FirstOrDefault();
-            if (SelectedServer != null)
+            try
             {
-                // Save Last Selected
+                if (LoaderConfig == null) return;
+                if (cbxServers.SelectedItem == null) return;
                 SelectedServer = LoaderConfig.Servers.Where(x => x.ServerName == cbxServers.SelectedItem.ToString()).FirstOrDefault();
-                LoaderConfig.DefaultServer = SelectedServer;
-                Core.SaveLoaderConfig(LoaderConfig);
-                if (File.Exists(HookINI))
-                {
-                    File.Delete(HookINI);
-                }
-                // Create first the config used by DLL
-                File.WriteAllText(HookINI, "[OpenConquerHook]"
-                    + Environment.NewLine + "HOST=" + SelectedServer.LoginHost
-                    + Environment.NewLine + "GAMEHOST=" + SelectedServer.GameHost
-                    + Environment.NewLine + "PORT=" + SelectedServer.LoginPort
-                    + Environment.NewLine + "GAMEPORT=" + SelectedServer.GamePort
-                    + Environment.NewLine + "SERVERNAME=" + SelectedServer.ServerName
-                    + Environment.NewLine + "ENABLE_HOSTNAME=" + (SelectedServer.EnableHostName ? "1" : "0")
-                    + Environment.NewLine + "HOSTNAME=" + SelectedServer.Hostname
-                    + Environment.NewLine + "SERVER_VERSION=" + SelectedServer.ServerVersion
-                    );
-                Core.LogWritter.Write("Created the Hook Configuration");
-                // Modify Setup of client
-                string SetupIniPath = Path.Combine(Directory.GetCurrentDirectory(), "ini", "GameSetup.ini");
-                IniManager parser = new IniManager(SetupIniPath, "ScreenMode");
-                parser.Write("ScreenMode", "FullScrType", LoaderConfig.FullScreen ? "0" : "1");
-                if (LoaderConfig.HighResolution)
+                if (SelectedServer != null)
                 {
-                    parser.Write("ScreenMode", "ScrWidth", "1024");
-                    parser.Write("ScreenMode", "ScrHeight", "768");
-                    /*
-                     * ScreenModeRecord
-                     *  0 = 800x600, windowed
-                        1 = 800x600, full-screen
-                        2 = 1024x768, windowed
-                        3 = 1024x768, full-screen
-                     * */
-                    parser.Write("ScreenMode", "ScreenModeRecord", LoaderConfig.FullScreen ? "3" : "2");
-                }
-                else
-                {
-                    parser.Write("ScreenMode", "ScrWidth", "800");
-                    parser.Write("ScreenMode", "ScrHeight", "600");
-                    /*
-                     * ScreenModeRecord
-                     *  0 = 800x600, windowed
-                        1 = 800x600, full-screen
-                        2 = 1024x768, windowed
-                        3 = 1024x768, full-screen
-                     * */
-                    parser.Write("ScreenMode", "ScreenModeRecord", LoaderConfig.FullScreen ? "1" : "0");
+                    // Save Last Selected
+                    SelectedServer = LoaderConfig.Servers.Where(x => x.ServerName == cbxServers.SelectedItem.ToString()).FirstOrDefault();
+                    LoaderConfig.DefaultServer = SelectedServer;
+                    Core.SaveLoaderConfig(LoaderConfig);
+                    if (File.Exists(HookINI))
+                    {
+                        File.Delete(HookINI);
+                    }
+                    if (LoaderConfig.ServernameChange)
+                    {
+                        if (SelectedServer.ServerNameMemoryAddress != null && SelectedServer.ServerNameMemoryAddress.Length >= 8) // Detect valid memory address
+                        {
+                            // Nothing to do. Using the specified custom memory address 
+                        }
+                        else
+                        {
+                            // Set default recommended for each range of versions
+                            if (SelectedServer.ServerVersion < 5600)
+                            {
+                                SelectedServer.ServerNameMemoryAddress = "0x005726DC";
+                            }
+                            if (SelectedServer.ServerVersion >= 5600)
+                            {
+                                SelectedServer.ServerNameMemoryAddress = "0x0097FAB8";
+                            }
+                            if (SelectedServer.ServerVersion >= 5700)
+                            {
+                                SelectedServer.ServerNameMemoryAddress = "0x009BEA00";
+                            }
+                            if (SelectedServer.ServerVersion >= 6000)
+                            {
+                                SelectedServer.ServerNameMemoryAddress = "0x00A56348";
+                            }
+                            if (SelectedServer.ServerVersion >= 6600)
+                            {
+                                SelectedServer.ServerNameMemoryAddress = "0x00CD7240";
+                            }
+                        }
+                    }
+                    else
+                    {
+                        SelectedServer.ServerNameMemoryAddress = "0";
+                    }
+                    // Create first the config used by DLL
+                    File.WriteAllText(HookINI, "[OpenConquerHook]"
+                        + Environment.NewLine + "HOST=" + SelectedServer.LoginHost
+                        + Environment.NewLine + "GAMEHOST=" + SelectedServer.GameHost
+                        + Environment.NewLine + "PORT=" + SelectedServer.LoginPort
+                        + Environment.NewLine + "GAMEPORT=" + SelectedServer.GamePort
+                        + Environment.NewLine + "SERVERNAME=" + SelectedServer.ServerName
+                        + Environment.NewLine + "ENABLE_HOSTNAME=" + (SelectedServer.EnableHostName ? "1" : "0")
+                        + Environment.NewLine + "HOSTNAME=" + SelectedServer.Hostname
+                        + Environment.NewLine + "SERVER_VERSION=" + SelectedServer.ServerVersion
+                        + Environment.NewLine + "SERVERNAME_MEMORYADDRESS=" + SelectedServer.ServerNameMemoryAddress
+                        );
+                    Core.LogWritter.Write("Created the Hook Configuration");
+                    // Modify Setup of client
+                    string SetupIniPath = Path.Combine(Directory.GetCurrentDirectory(), "ini", "GameSetup.ini");
+                    IniManager parser = new IniManager(SetupIniPath, "ScreenMode");
+                    parser.Write("ScreenMode", "FullScrType", LoaderConfig.FullScreen ? "0" : "1");
+                    if (LoaderConfig.HighResolution)
+                    {
+                        parser.Write("ScreenMode", "ScrWidth", "1024");
+                        parser.Write("ScreenMode", "ScrHeight", "768");
+                        /*
+                         * ScreenModeRecord
+                         *  0 = 800x600, windowed
+                            1 = 800x600, full-screen
+                            2 = 1024x768, windowed
+                            3 = 1024x768, full-screen
+                         * */
+                        parser.Write("ScreenMode", "ScreenModeRecord", LoaderConfig.FullScreen ? "3" : "2");
+                    }
+                    else
+                    {
+                        parser.Write("ScreenMode", "ScrWidth", "800");
+                        parser.Write("ScreenMode", "ScrHeight", "600");
+                        /*
+                         * ScreenModeRecord
+                         *  0 = 800x600, windowed
+                            1 = 800x600, full-screen
+                            2 = 1024x768, windowed
+                            3 = 1024x768, full-screen
+                         * */
+                        parser.Write("ScreenMode", "ScreenModeRecord", LoaderConfig.FullScreen ? "1" : "0");
+                    }
+                    worker.RunWorkerAsync();
                 }
-                worker.RunWorkerAsync();
+            } catch(Exception ex)
+            {
+                Core.LogWritter.Write("Error found: " + ex);
             }
-        }
+}
 
         private void Worker_DoWork(object sender, System.ComponentModel.DoWorkEventArgs e)
         {
diff --git a/ConquerLoader/ConquerLoader/Settings.Designer.cs b/ConquerLoader/ConquerLoader/Settings.Designer.cs
diff --git a/ConquerLoader/ConquerLoader/Settings.cs b/ConquerLoader/ConquerLoader/Settings.cs

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@ public class ServerConfiguration`
`12`	`12`	`public bool EnableHostName { get; set; }`
`13`	`13`	`public bool UseDirectX9 { get; set; }`
`14`	`14`	`public string Hostname { get; set; }`
	`15`	`+ public string ServerNameMemoryAddress { get; set; }`
`15`	`16`	`}`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void LoadPluginsFromAPI(LoaderConfig LoaderConfig)`
`47`	`47`	`Plugins = new List<IPlugin>();`
`48`	`48`
`49`	`49`	`HttpClient client = new HttpClient();`
`50`		`- HttpResponseMessage response = client.GetAsync("http://localhost/api/v1/167635d839c027b0c965cfa0f995dc43$/GetUserModules/" + LoaderConfig.LicenseKey).Result;`
	`50`	`+ HttpResponseMessage response = client.GetAsync("https://conquerloader.com/api/v1/167635d839c027b0c965cfa0f995dc43$/GetUserModules/" + LoaderConfig.LicenseKey).Result;`
`51`	`51`	`if (response.IsSuccessStatusCode)`
`52`	`52`	`{`
`53`	`53`	`string result = response.Content.ReadAsStringAsync().Result;`