FIX V29F

werasik2aa · Jan 15, 2024 · 025a6dc · 025a6dc
1 parent 767e2f5
commit 025a6dc
Show file tree

Hide file tree

Showing 25 changed files with 1,019 additions and 1,027 deletions.
diff --git a/HuaweiUnlock/DIAGNOS/Bootloader.cs b/HuaweiUnlock/DIAGNOS/Bootloader.cs
@@ -28,7 +28,8 @@ private bool Validate()
                     return true;
                 }
 
-                using (var stream = File.OpenRead(Path)) {
+                using (var stream = File.OpenRead(Path))
+                {
                     using (var sha1 = SHA1.Create())
                     {
                         stream.Position = 0;

diff --git a/HuaweiUnlock/DIAGNOS/CRC.cs b/HuaweiUnlock/DIAGNOS/CRC.cs
@@ -1,12 +1,10 @@
 using Microsoft.VisualBasic;
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Globalization;
 using System.Linq;
 using System.Security.Cryptography;
-using System.IO;
-using System.Security.Cryptography.X509Certificates;
-using System.Globalization;
+using System.Text;
 
 namespace HuaweiUnlocker.DIAGNOS
 {

diff --git a/HuaweiUnlock/DIAGNOS/LibCrypt.cs b/HuaweiUnlock/DIAGNOS/LibCrypt.cs
@@ -1,14 +1,11 @@
 using Base62;
-using Microsoft.Win32.SafeHandles;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using System.Windows.Input;
 using static HuaweiUnlocker.LangProc;
 namespace HuaweiUnlocker.DIAGNOS
 {

diff --git a/HuaweiUnlock/DIAGNOS/OemInfoTool.cs b/HuaweiUnlock/DIAGNOS/OemInfoTool.cs
@@ -1,9 +1,6 @@
-using Microsoft.VisualBasic.Logging;
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Forms;
 using static HuaweiUnlocker.LangProc;
 namespace HuaweiUnlocker.DIAGNOS
 {
@@ -28,7 +25,8 @@ public static void Decompile(string path, string Header = "4F454D5F494E464F06")
             for (var i = 0; i < Offsets.Count; i++)
                 data.Add("OEM_INFO_" + Offsets[i] + ".header");
             File.WriteAllBytes("UnlockFiles/OemInfoData/OEM_INFO_" + 0 + ".header", FileAll.Take(Offsets[0]).ToArray());
-            for (int i = 0; i < Offsets.Count; i++) {
+            for (int i = 0; i < Offsets.Count; i++)
+            {
                 int curof = Offsets[i];
                 LOG(0, "Writting: OEM_INFO_" + curof + ".header");
                 if (Offsets.Count > i + 1)

diff --git a/HuaweiUnlock/FlashTool/FlashToolQClegacy.cs b/HuaweiUnlock/FlashTool/FlashToolQClegacy.cs
@@ -1,13 +1,9 @@
 using System;
-using static HuaweiUnlocker.LangProc;
 using System.Collections.Generic;
-using HuaweiUnlocker.DIAGNOS;
 using System.IO;
-using System.Collections.Concurrent;
-using System.Threading.Tasks;
-using System.Security.Cryptography.Xml;
-using System.Threading;
 using System.Linq;
+using System.Threading.Tasks;
+using static HuaweiUnlocker.LangProc;
 
 namespace HuaweiUnlocker.FlashTool
 {

diff --git a/HuaweiUnlock/FlashTool/MTKFlash.cs b/HuaweiUnlock/FlashTool/MTKFlash.cs
@@ -1,6 +1,4 @@
-using HuaweiUnlocker.DIAGNOS;
-using System;
-using static HuaweiUnlocker.LangProc;
+using static HuaweiUnlocker.LangProc;
 namespace HuaweiUnlocker.FlashTool
 {
     public class MTKFlash

diff --git a/HuaweiUnlock/LangProc.cs b/HuaweiUnlock/LangProc.cs
@@ -1,22 +1,18 @@
-using System;
+using HuaweiUnlocker.DIAGNOS;
+using HuaweiUnlocker.FlashTool;
+using HuaweiUnlocker.UI;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Windows.Forms;
 using System.IO;
-using System.Management;
-using HuaweiUnlocker.UI;
-using HuaweiUnlocker.FlashTool;
 using System.Linq;
-using System.Threading;
-using HuaweiUnlocker.DIAGNOS;
-using System.Globalization;
+using System.Management;
+using System.Reflection;
 using System.Text;
-using System.Security.Cryptography;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
-using Base62;
-using System.Runtime.CompilerServices;
-using System.Reflection;
+using System.Windows.Forms;
 
 namespace HuaweiUnlocker
 {
@@ -317,15 +313,15 @@ public static Dictionary<string, Partition> GET_GPT_FROM_FILE(string GPT_File, i
                 if (!string.IsNullOrEmpty(bsa) && !string.IsNullOrEmpty(bea))
                 {
                     uint blocks_count = Convert.ToUInt32(bea, 16) - Convert.ToUInt32(bsa, 16) + 1;
-                    if(!GPT.ContainsKey(bn.ToString()) & !bn.ToString().Contains("userdata") & !string.IsNullOrEmpty(bn.ToString()))
-                    GPT.Add(bn.ToString().Replace(".img", ""), new Partition()
-                    {
-                        BlockStart = Convert.ToInt32(bsa, 16).ToString(),
-                        BlockEnd = Convert.ToInt32(bea, 16).ToString(),
-                        BlockBytes = (blocks_count * block_size).ToString(),
-                        BlockNumSectors = blocks_count.ToString(),
-                        BlockLength = (blocks_count / 2).ToString(),
-                    });
+                    if (!GPT.ContainsKey(bn.ToString()) & !bn.ToString().Contains("userdata") & !string.IsNullOrEmpty(bn.ToString()))
+                        GPT.Add(bn.ToString().Replace(".img", ""), new Partition()
+                        {
+                            BlockStart = Convert.ToInt32(bsa, 16).ToString(),
+                            BlockEnd = Convert.ToInt32(bea, 16).ToString(),
+                            BlockBytes = (blocks_count * block_size).ToString(),
+                            BlockNumSectors = blocks_count.ToString(),
+                            BlockLength = (blocks_count / 2).ToString(),
+                        });
                 }
             }
             return GPT;
@@ -399,7 +395,7 @@ public static bool WriteGPT_TO_XML(string papthto, Dictionary<string, Partition>
             writer.Dispose();
             return partbI.Count > 0;
         }
-        public static void Progress(int v, int max=100)
+        public static void Progress(int v, int max = 100)
         {
             action = () => { PRG.Value = v; PRG.ValueMaximum = max; };
             if (PRG.InvokeRequired)
@@ -410,7 +406,7 @@ public static void Progress(int v, int max=100)
         }
         public static string GuessMbn()
         {
-            if(!string.IsNullOrEmpty(wndw.LoaderBox.Text))
+            if (!string.IsNullOrEmpty(wndw.LoaderBox.Text))
                 return PickLoader(wndw.LoaderBox.Text);
             if (wndw.AutoLdr.Checked & DeviceInfo.HWID.Contains("NaN"))
                 return LOG(0, "NoDEVICEAnsw").ToString();

diff --git a/HuaweiUnlock/Program.cs b/HuaweiUnlock/Program.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.Windows.Forms;
-using static HuaweiUnlocker.LangProc;
 
 namespace HuaweiUnlocker
 {

diff --git a/HuaweiUnlock/TOOLS/Fastboot.cs b/HuaweiUnlock/TOOLS/Fastboot.cs
@@ -1,14 +1,11 @@
-using System;
-using System.Collections.Generic;
+using LibUsbDotNet;
+using LibUsbDotNet.Main;
+using System;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Windows.Forms;
-using LibUsbDotNet;
-using LibUsbDotNet.Main;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 using static HuaweiUnlocker.LangProc;
 namespace HuaweiUnlocker.TOOLS
 {

diff --git a/HuaweiUnlock/TOOLS/HISI.cs b/HuaweiUnlock/TOOLS/HISI.cs
@@ -1,12 +1,9 @@
 using HuaweiUnlocker.DIAGNOS;
-using Microsoft.VisualBasic.Logging;
 using System;
 using System.Collections.Generic;
-using System.Runtime.Remoting.Messaging;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Windows.Forms;
 using static HuaweiUnlocker.LangProc;
 namespace HuaweiUnlocker.TOOLS
 {
@@ -53,7 +50,8 @@ public static void FlashBootloader(Bootloader bootloader, string port)
 
                 LOG(0, "EwPS", image.Role);
 
-                flasher.Write(image.Path, (int)image.Address, x => {
+                flasher.Write(image.Path, (int)image.Address, x =>
+                {
                     Progress(dsize, asize);
                 });
 
@@ -145,7 +143,7 @@ public static void SetNVMEProp(string prop, byte[] value)
 
             var res = fb.Command(cmd.ToArray());
 
-            LOG(0, "", res.Payload) ;
+            LOG(0, "", res.Payload);
 
             if (!res.Payload.Contains("set nv ok"))
             {
@@ -155,7 +153,7 @@ public static void SetNVMEProp(string prop, byte[] value)
 
         public static byte[] GetSHA256(string str)
         {
-                return SHA256.Create().ComputeHash(Encoding.ASCII.GetBytes(str));
+            return SHA256.Create().ComputeHash(Encoding.ASCII.GetBytes(str));
         }
 
         public static void SetHWDogState(byte state)
@@ -312,7 +310,7 @@ public static void StartUnlockPRCS(bool frp, bool rb, string key, Bootloader d,
                         LOG(1, "Unlocker", "(KIRIN FRP)");
                         UnlockFRP();
                     }
-                    if(rb) Reboot();
+                    if (rb) Reboot();
                     fb.Disconnect();
                 }
                 else LOG(1, "NoDEVICEAnsw", " [HISI] Maybe hisi Loaders Wont boot");

diff --git a/HuaweiUnlock/TOOLS/UpdateApp.cs b/HuaweiUnlock/TOOLS/UpdateApp.cs
@@ -1,12 +1,10 @@
 using HuaweiUnlocker.Core;
 using HuaweiUnlocker.FlashTool;
-using HuaweiUnlocker.UI;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Windows.Forms;
 using static HuaweiUnlocker.LangProc;
 
 namespace HuaweiUnlocker.TOOLS
@@ -44,7 +42,7 @@ public static async void Unpack(string path, int state)
                     }
                     //Set 0
                     unpacked = true;
-                    if(state != 3) 
+                    if (state != 3)
                         CreateRWProgram0xml();
                     else
                         ReadFilesInDirAsPartitions();
@@ -108,7 +106,8 @@ public static void ReadFilesInDirAsPartitions()
             DirectoryInfo hdDirectoryInWhichToSearch = new DirectoryInfo("UnlockFiles/UpdateAPP/");
             FileInfo[] filesInDir = hdDirectoryInWhichToSearch.GetFiles();
             foreach (var a in filesInDir)
-                gpttable.Add(a.FullName.Split('\\').Last(),new Partition() {
+                gpttable.Add(a.FullName.Split('\\').Last(), new Partition()
+                {
                     BlockLength = new FileInfo(a.FullName).Length.ToString(),
                 });
             DeviceInfo.Partitions = gpttable;

diff --git a/HuaweiUnlock/TOOLS/UpdateUtil/EventStream.cs b/HuaweiUnlock/TOOLS/UpdateUtil/EventStream.cs
@@ -42,7 +42,7 @@ public class ReadEventArgs : EventArgs
             /// <summary>
             /// Read buffer
             /// </summary>
-            public byte []Buffer;
+            public byte[] Buffer;
         }
 
         /// <summary>

diff --git a/HuaweiUnlock/TOOLS/UpdateUtil/FileHeader.cs b/HuaweiUnlock/TOOLS/UpdateUtil/FileHeader.cs
@@ -24,7 +24,7 @@ internal struct FileHeader
         public UInt16 HeaderChecksum;
         public UInt16 BlockSize;
         public UInt16 Blank2;
-        public static readonly int Size = Marshal.SizeOf(typeof (FileHeader));
+        public static readonly int Size = Marshal.SizeOf(typeof(FileHeader));
         public static FileHeader Create()
         {
             var result = new FileHeader

diff --git a/HuaweiUnlock/TOOLS/UpdateUtil/PartialStream.cs b/HuaweiUnlock/TOOLS/UpdateUtil/PartialStream.cs
@@ -25,8 +25,8 @@ public class PartialStream : Stream
     {
         private readonly Stream _baseStream;
         private readonly long _basePosition;
-        private readonly long _size;
-        
+        private readonly long _size;
+
         /// <summary>
         /// Wrapper around <see cref="Stream"/> to work with a part of a stream
         /// </summary>
@@ -36,8 +36,8 @@ public class PartialStream : Stream
         public PartialStream(Stream baseStream, long size)
         {
             _baseStream = baseStream;
-            _basePosition = baseStream.Position;
-            
+            _basePosition = baseStream.Position;
+
             if (_basePosition + _size > _baseStream.Length)
                 throw new ArgumentOutOfRangeException("size", _basePosition + _size, "Invalid size");
             _size = size;
@@ -109,7 +109,7 @@ public override int Read(byte[] buffer, int offset, int count)
             if (currentPosition + count > _size)
             {
                 var rc = _size - currentPosition;
-                count = (rc > int.MaxValue) ? int.MaxValue : (int) rc;
+                count = (rc > int.MaxValue) ? int.MaxValue : (int)rc;
             }
 
             return _baseStream.Read(buffer, offset, count);

diff --git a/HuaweiUnlock/TOOLS/UpdateUtil/UpdateEntry.cs b/HuaweiUnlock/TOOLS/UpdateUtil/UpdateEntry.cs
@@ -1,7 +1,7 @@
-using HuaweiUnlocker.Streams;
-using System.IO;
+using HuaweiUnlocker.DIAGNOS;
+using HuaweiUnlocker.Streams;
 using System;
-using HuaweiUnlocker.DIAGNOS;
+using System.IO;
 
 namespace HuaweiUnlocker.Core
 {

diff --git a/HuaweiUnlock/TOOLS/UpdateUtil/Utilities.cs b/HuaweiUnlock/TOOLS/UpdateUtil/Utilities.cs
@@ -7,8 +7,8 @@ namespace HuaweiUnlocker.Core
 {
     internal static class Utilities
     {
-        public const Int32 UintSize = sizeof (UInt32);
-        public const Int32 UshortSize = sizeof (ushort);
+        public const Int32 UintSize = sizeof(UInt32);
+        public const Int32 UshortSize = sizeof(ushort);
 
         public static bool ByteToType<T>(BinaryReader reader, out T result)
         {
@@ -64,7 +64,7 @@ public static void SetCharArray(string source, byte[] destination)
         public static string GetString(byte[] source)
         {
             var index = Array.FindIndex(source, b => b == 0);
-            if (index == -1) 
+            if (index == -1)
                 index = source.Length;
             return Encoding.ASCII.GetString(source, 0, index);
         }

diff --git a/HuaweiUnlock/UI/Animation/Animation.cs b/HuaweiUnlock/UI/Animation/Animation.cs
@@ -42,17 +42,17 @@ private float Step()
             float basicStep = Math.Abs(Volume) / StepDivider; // Math.Abs - превращает числа 0< в >0
             float resultStep = 0;
 
-            if(Reverse == false)
+            if (Reverse == false)
             {
-                if(Value <= p15 || Value >= p85)
+                if (Value <= p15 || Value >= p85)
                 {
                     resultStep = basicStep / 3.5f;
                 }
                 else if (Value <= p30 || Value >= p70)
                 {
                     resultStep = basicStep / 2f;
                 }
-                else if(Value > p30 && Value < p70)
+                else if (Value > p30 && Value < p70)
                 {
                     resultStep = basicStep;
                 }
@@ -94,11 +94,11 @@ public void UpdateFrame()
 
             if (Reverse == false)
             {
-                if(Value <= targetValue)
+                if (Value <= targetValue)
                 {
                     Value += Step();
 
-                    if(Value >= targetValue)
+                    if (Value >= targetValue)
                     {
                         Value = targetValue;
                         Status = AnimationStatus.Completed;