Loader updated for working fine. New options added in settings

Author: darkfoxdeveloper

ConquerHook/CSV3Hook.cpp

@@ -47,6 +47,8 @@ BYTE pattern_OLD[] = { 0x85, 0xC0, 0x75, 0x00, 0x8B, 0x4E, 0x00, 0xE8, 0x00, 0x0
 BYTE pattern2_OLD[] = { 0x85, 0xC9, 0x00, 0x00, 0xFF, 0x75, 0x00, 0x57, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x89, 0x45 }; // Version = Old Clients
 BYTE pattern_56XX[] = { 0x85, 0xC0, 0x75, 0x00, 0x8B, 0x4F, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x83, 0x4D, 0x00, 0x00, 0x8B, 0x00, 0x00 }; // Version = 56XX
 BYTE pattern2_56XX[] = { 0x85, 0xC9, 0x00, 0x00, 0xFF, 0x75, 0x00, 0x57, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x89, 0x45 }; // Version = 56XX
+//BYTE pattern_55XX[] = { 0x85, 0xC0, 0x74, 0x0E, 0x8B, 0x45, 0x20, 0xC7, 0x00, 0x01, 0x00, 0x00, 0x00, 0xE9, 0xA2, 0x00, 0x00, 0x00, 0x00 }; // Version = 55XX
+//BYTE pattern2_55XX[] = { 0x85, 0xC9, 0x00, 0x00, 0xFF, 0x75, 0x00, 0x57, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x89, 0x45 }; // Version = 55XX
 
 extern LPVOID FindMemoryPattern(PBYTE pattern, bool* wildCards, int len);
 
@@ -209,8 +211,11 @@ void csv3_init(HMODULE hModule)
 		}
 	}
 	strcat(szConfig, "OpenConquerHook.ini");
+
 	// Find the correct version of client based in user config
-	ClientVersion = GetPrivateProfileIntA(HeaderConfig, "SERVER_VERSION", 0, szConfig);
+	char szVersionValue[5];
+	GetPrivateProfileStringA(HeaderConfig, "SERVER_VERSION", "0", szVersionValue, 5, szConfig);
+	ClientVersion = atoi(szVersionValue);
 
 	if (ClientVersion >= 5600) {
 		//
@@ -231,8 +236,7 @@ void csv3_init(HMODULE hModule)
 
 		if (match == NULL)
 		{
-			//sprintf(szDebug, "Failed to find correct pattern1", (DWORD)match);
-			sprintf(szDebug, HeaderConfig, (DWORD)match);
+			sprintf(szDebug, "Failed to find correct pattern1", (DWORD)match);
 			MessageBoxA(NULL, szDebug, "ERROR", MB_OK);
 			return;
 		}

ConquerLoader/ConquerLoader/ConquerLoader.csproj

@@ -20,9 +20,10 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -37,15 +38,19 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>conquer.ico</ApplicationIcon>
+    <ApplicationIcon>ConquerLoaderLogo.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup />
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Costura, Version=4.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
       <HintPath>..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll</HintPath>
     </Reference>
+    <Reference Include="INIFileParser, Version=2.5.2.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
+      <HintPath>..\packages\ini-parser.2.5.2\lib\net20\INIFileParser.dll</HintPath>
+    </Reference>
     <Reference Include="MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a, processorArchitecture=MSIL">
       <HintPath>..\packages\MetroModernUI.1.4.0.0\lib\net\MetroFramework.dll</HintPath>
     </Reference>
@@ -121,7 +126,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="conquer.ico" />
+    <Content Include="ConquerLoaderLogo.ico" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CLCore\CLCore.csproj">

ConquerLoader/ConquerLoader/ConquerLoaderLogo.ico

@@ -1,5 +1,7 @@
 using ConquerLoader.CLCore;
 using ConquerLoader.Models;
+using IniParser;
+using IniParser.Model;
 using MetroFramework.Controls;
 using System;
 using System.Diagnostics;
@@ -29,8 +31,6 @@ public Main()
         /*
          * 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
-         * Create a page with wordpress and storefront theme for anounce the ConquerLoader with the domain conquerloader.com (Simple page only for now, in future have complements for sell and implement in this loader)
-         * Premium Features (Control with IP of servername in some AccessList, json or via Database) with the features are payed for the user (User = Server IP)
          * */
 
         private void Main_Load(object sender, EventArgs e)
@@ -64,6 +64,7 @@ private void LoadConfigInForm()
             {
                 cbxServers.Items.Add(server.ServerName);
             }
+            RefreshServerList();
         }
 
         private void RefreshServerList(bool CheckServerStatus = true)
@@ -125,6 +126,27 @@ private void BtnStart_Click(object sender, EventArgs e)
                     + 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");
+                var parser = new FileIniDataParser();
+                IniData data = parser.ReadFile(SetupIniPath);
+                if (LoaderConfig.HighResolution)
+                {
+                    /*
+                     * ScreenModeRecord
+                     *  0 = 800x600, windowed
+                        1 = 800x600, full-screen
+                        2 = 1024x768, windowed
+                        3 = 1024x768, full-screen
+                     * */
+                    data["ScreenMode"]["ScreenModeRecord"] = LoaderConfig.FullScreen ? "3" : "2";
+                    parser.WriteFile(SetupIniPath, data);
+                }
+                if (LoaderConfig.FullScreen)
+                {
+                    data["ScreenMode"]["FullScrType"] = LoaderConfig.FullScreen ? "1" : "0";
+                    parser.WriteFile(SetupIniPath, data);
+                }
                 worker.RunWorkerAsync();
             }
         }
@@ -145,6 +167,12 @@ private void Worker_DoWork(object sender, System.ComponentModel.DoWorkEventArgs
                     Core.LogWritter.Write("Found Env_DX8 Folder. Setting the folder for run executable...");
                     PathToConquerExe = CheckPathEnvDX8;
                     WorkingDir = Path.GetDirectoryName(PathToConquerExe);
+                    string OutputCopyDll = Path.Combine(Application.StartupPath, "Env_DX8", HookINI);
+                    if (File.Exists(OutputCopyDll))
+                    {
+                        File.Delete(OutputCopyDll);
+                    }
+                    File.Copy(Path.Combine(Application.StartupPath, HookINI), OutputCopyDll);
                 }
                 if (SelectedServer.UseDirectX9)
                 {
@@ -153,6 +181,12 @@ private void Worker_DoWork(object sender, System.ComponentModel.DoWorkEventArgs
                         Core.LogWritter.Write("Found Env_DX9 Folder. Setting the folder for run executable...");
                         PathToConquerExe = CheckPathEnvDX9;
                         WorkingDir = Path.GetDirectoryName(PathToConquerExe);
+                        string OutputCopyDll = Path.Combine(Application.StartupPath, "Env_DX9", HookINI);
+                        if (File.Exists(OutputCopyDll))
+                        {
+                            File.Delete(OutputCopyDll);
+                        }
+                        File.Copy(Path.Combine(Application.StartupPath, HookINI), OutputCopyDll);
                     }
                 }
                 Process conquerProc = Process.Start(new ProcessStartInfo() { FileName = PathToConquerExe, WorkingDirectory = WorkingDir, Arguments = "blacknull" });