Upstream fixes

Optimizer/Forms/MainForm.cs

@@ -513,7 +513,7 @@ namespace Optimizer
         }
 
         //INIT
-        public MainForm(SplashForm _splashForm)
+        public MainForm(SplashForm _splashForm, bool disableIndicium = false, bool disableHostsEditor = false, bool disableCommonApps = false, bool disableUWPApps = false)
         {
             InitializeComponent();
 
@@ -591,7 +591,14 @@ namespace Optimizer
 
                 tabCollection.TabPages.Remove(windows10Tab);
 
-                GetModernApps(false);
+                if (!disableUWPApps)
+                {
+                    GetModernApps(false);
+                }
+                else
+                {
+                    tabCollection.TabPages.Remove(modernAppsTab);
+                }
             }
 
             if (Utilities.CurrentWindowsVersion == WindowsVersion.Windows10)
@@ -602,7 +609,14 @@ namespace Optimizer
                 tabCollection.TabPages.Remove(windows8Tab);
                 this.Controls.Remove(panelWin11Tweaks);
 
-                GetModernApps(false);
+                if (!disableUWPApps)
+                {
+                    GetModernApps(false);
+                }
+                else
+                {
+                    tabCollection.TabPages.Remove(modernAppsTab);
+                }
 
                 txtOS.Text += string.Format(" ({0})", Utilities.GetWindows10Build());
             }
@@ -619,7 +633,14 @@ namespace Optimizer
                 actionSw.Visible = false;
                 oldMixerSw.Visible = false;
 
-                GetModernApps(false);
+                if (!disableUWPApps)
+                {
+                    GetModernApps(false);
+                }
+                else
+                {
+                    tabCollection.TabPages.Remove(modernAppsTab);
+                }
 
                 txtOS.Text += string.Format(" ({0})", Utilities.GetWindows10Build());
             }
@@ -632,17 +653,41 @@ namespace Optimizer
             specsTree.ImageList = imagesHw;
 
             GetStartupItems();
-            GetHostsEntries();
+            if (!disableHostsEditor)
+            {
+                GetHostsEntries();
+            }
+            else
+            {
+                tabCollection.TabPages.Remove(hostsEditorTab);
+                launcherMenu.Items.RemoveByKey("trayHosts");
+            }
 
             GetDesktopItems();
             GetCustomCommands();
 
             _splashForm.LoadingStatus.Text = "getting feed ...";
-            GetFeed();
+            if (!disableCommonApps)
+            {
+                GetFeed();
+            }
+            else
+            {
+                tabCollection.TabPages.Remove(appsTab);
+                launcherMenu.Items.RemoveByKey("trayAD");
+            }
             GetFootprint();
 
             _splashForm.LoadingStatus.Text = "loading hardware specifications ...";
-            GetHardwareSpecs();
+            if (!disableIndicium)
+            {
+                GetHardwareSpecs();
+            }
+            else
+            {
+                tabCollection.TabPages.Remove(indiciumTab);
+                launcherMenu.Items.RemoveByKey("trayHW");
+            }
 
             LoadSettings();
 
@@ -706,7 +751,7 @@ namespace Optimizer
             if (Options.CurrentOptions.EnableTray) 
             {
                 _networkMonitor.StartMonitoring();
-                NetworkMonitoring();
+                NetworkLiveMonitoring();
             }
         }
 
@@ -1236,12 +1281,13 @@ namespace Optimizer
             }
         }
 
-        private void NetworkMonitoring()
+        private void NetworkLiveMonitoring()
         {
             Task.Factory.StartNew(() =>
             {
                 while (Options.CurrentOptions.EnableTray)
                 {
+                    // in BYTES
                     downloadSpeed = 0;
                     uploadSpeed = 0;
 
@@ -3750,7 +3796,7 @@ namespace Optimizer
                 if (_networkMonitor != null)
                 {
                     _networkMonitor.StartMonitoring();
-                    NetworkMonitoring();
+                    NetworkLiveMonitoring();
                 }
             }
             else

Optimizer/IndiciumHelper.cs

@@ -22,36 +22,43 @@ namespace Optimizer
             List<CPU> CPUs = new List<CPU>();
             CPU cpu;
 
-            ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_Processor");
-            foreach (ManagementObject mo in searcher.Get())
+            try
             {
-                cpu = new CPU();
-
-                cpu.Name = Convert.ToString(mo.Properties["Name"].Value);
-                cpu.L2CacheSize = ByteSize.FromKiloBytes(Convert.ToDouble(mo.Properties["L2CacheSize"].Value));
-                cpu.L3CacheSize = ByteSize.FromKiloBytes(Convert.ToDouble(mo.Properties["L3CacheSize"].Value));
-                cpu.Cores = Convert.ToUInt32(mo.Properties["NumberOfCores"].Value);
-                cpu.Threads = Convert.ToUInt32(mo.Properties["ThreadCount"].Value);
-                cpu.LogicalCpus = Convert.ToUInt32(mo.Properties["NumberOfLogicalProcessors"].Value);
-                bool temp = Convert.ToBoolean(mo.Properties["VirtualizationFirmwareEnabled"].Value);
-                cpu.Virtualization = (temp) ? "Yes" : "No";
-                cpu.Stepping = Convert.ToString(mo.Properties["Description"].Value);
-                cpu.Revision = Convert.ToString(mo.Properties["Revision"].Value);
-
-                try
+                ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_Processor");
+                foreach (ManagementObject mo in searcher.Get())
                 {
-                    ManagementObjectSearcher searcher2 = new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem");
-                    foreach (ManagementObject mo2 in searcher2.Get())
+                    cpu = new CPU();
+
+                    cpu.Name = Convert.ToString(mo.Properties["Name"].Value);
+                    cpu.L2CacheSize = ByteSize.FromKiloBytes(Convert.ToDouble(mo.Properties["L2CacheSize"].Value));
+                    cpu.L3CacheSize = ByteSize.FromKiloBytes(Convert.ToDouble(mo.Properties["L3CacheSize"].Value));
+                    cpu.Cores = Convert.ToUInt32(mo.Properties["NumberOfCores"].Value);
+                    cpu.Threads = Convert.ToUInt32(mo.Properties["ThreadCount"].Value);
+                    cpu.LogicalCpus = Convert.ToUInt32(mo.Properties["NumberOfLogicalProcessors"].Value);
+                    bool temp = Convert.ToBoolean(mo.Properties["VirtualizationFirmwareEnabled"].Value);
+                    cpu.Virtualization = (temp) ? "Yes" : "No";
+                    cpu.Stepping = Convert.ToString(mo.Properties["Description"].Value);
+                    cpu.Revision = Convert.ToString(mo.Properties["Revision"].Value);
+
+                    try
                     {
-                        bool temp2 = Convert.ToBoolean(mo2.Properties["DataExecutionPrevention_Available"].Value);
-                        cpu.DataExecutionPrevention = (temp2) ? "Yes" : "No";
+                        ManagementObjectSearcher searcher2 = new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem");
+                        foreach (ManagementObject mo2 in searcher2.Get())
+                        {
+                            bool temp2 = Convert.ToBoolean(mo2.Properties["DataExecutionPrevention_Available"].Value);
+                            cpu.DataExecutionPrevention = (temp2) ? "Yes" : "No";
+                        }
                     }
-                }
-                catch { }
+                    catch { }
 
-                if (string.IsNullOrEmpty(cpu.Name)) cpu.Name = GetCPUNameAlternative();
+                    if (string.IsNullOrEmpty(cpu.Name)) cpu.Name = GetCPUNameAlternative();
 
-                CPUs.Add(cpu);
+                    CPUs.Add(cpu);
+                }
+            }
+            catch (Exception ex)
+            {
+                ErrorLogger.LogError("IndiciumHelper.GetCPUs", ex.Message, ex.StackTrace);
             }
 
             return CPUs;
@@ -69,12 +76,19 @@ namespace Optimizer
         {
             VirtualMemory vm = new VirtualMemory();
 
-            ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem");
-            foreach (ManagementObject mo in searcher.Get())
+            try
             {
-                vm.TotalVirtualMemory = ByteSize.FromKiloBytes(Convert.ToUInt64(mo.Properties["TotalVirtualMemorySize"].Value));
-                vm.AvailableVirtualMemory = ByteSize.FromKiloBytes(Convert.ToUInt64(mo.Properties["FreeVirtualMemory"].Value));
-                vm.UsedVirtualMemory = vm.TotalVirtualMemory.Subtract(vm.AvailableVirtualMemory);
+                ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem");
+                foreach (ManagementObject mo in searcher.Get())
+                {
+                    vm.TotalVirtualMemory = ByteSize.FromKiloBytes(Convert.ToUInt64(mo.Properties["TotalVirtualMemorySize"].Value));
+                    vm.AvailableVirtualMemory = ByteSize.FromKiloBytes(Convert.ToUInt64(mo.Properties["FreeVirtualMemory"].Value));
+                    vm.UsedVirtualMemory = vm.TotalVirtualMemory.Subtract(vm.AvailableVirtualMemory);
+                }
+            }
+            catch (Exception ex)
+            {
+                ErrorLogger.LogError("IndiciumHelper.GetVM", ex.Message, ex.StackTrace);
             }
 
             return vm;
@@ -85,21 +99,28 @@ namespace Optimizer
             List<RAM> modules = new List<RAM>();
             RAM module;
 
-            ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_PhysicalMemory");
-            foreach (ManagementObject mo in searcher.Get())
+            try
+            {
+                ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_PhysicalMemory");
+                foreach (ManagementObject mo in searcher.Get())
+                {
+                    module = new RAM();
+
+                    module.BankLabel = Convert.ToString(mo.Properties["BankLabel"].Value);
+                    module.Capacity = ByteSize.FromBytes(Convert.ToDouble(mo.Properties["Capacity"].Value));
+                    module.Manufacturer = Convert.ToString(mo.Properties["Manufacturer"].Value);
+                    module.Speed = Convert.ToUInt32(mo.Properties["Speed"].Value);
+                    UInt16 memorytype = Convert.ToUInt16(mo.Properties["MemoryType"].Value);
+                    UInt16 formfactor = Convert.ToUInt16(mo.Properties["FormFactor"].Value);
+                    module.MemoryType = SanitizeMemoryType(memorytype);
+                    module.FormFactor = SanitizeFormFactor(formfactor);
+
+                    modules.Add(module);
+                }
+            }
+            catch (Exception ex)
             {
-                module = new RAM();
-
-                module.BankLabel = Convert.ToString(mo.Properties["BankLabel"].Value);
-                module.Capacity = ByteSize.FromBytes(Convert.ToDouble(mo.Properties["Capacity"].Value));
-                module.Manufacturer = Convert.ToString(mo.Properties["Manufacturer"].Value);
-                module.Speed = Convert.ToUInt32(mo.Properties["Speed"].Value);
-                UInt16 memorytype = Convert.ToUInt16(mo.Properties["MemoryType"].Value);
-                UInt16 formfactor = Convert.ToUInt16(mo.Properties["FormFactor"].Value);
-                module.MemoryType = SanitizeMemoryType(memorytype);
-                module.FormFactor = SanitizeFormFactor(formfactor);
-
-                modules.Add(module);
+                ErrorLogger.LogError("IndiciumHelper.GetRAM", ex.Message, ex.StackTrace);
             }
 
             return modules;
@@ -109,57 +130,64 @@ namespace Optimizer
         {
             List<Motherboard> mobos = new List<Motherboard>();
 
-            ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_BaseBoard");
-            foreach (ManagementObject mo in searcher.Get())
+            try
             {
-                Motherboard mobo = new Motherboard();
+                ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_BaseBoard");
+                foreach (ManagementObject mo in searcher.Get())
+                {
+                    Motherboard mobo = new Motherboard();
 
-                mobo.Model = Convert.ToString(mo.Properties["Model"].Value);
-                mobo.Manufacturer = Convert.ToString(mo.Properties["Manufacturer"].Value);
-                mobo.Product = Convert.ToString(mo.Properties["Product"].Value);
-                mobo.Version = Convert.ToString(mo.Properties["Version"].Value);
+                    mobo.Model = Convert.ToString(mo.Properties["Model"].Value);
+                    mobo.Manufacturer = Convert.ToString(mo.Properties["Manufacturer"].Value);
+                    mobo.Product = Convert.ToString(mo.Properties["Product"].Value);
+                    mobo.Version = Convert.ToString(mo.Properties["Version"].Value);
 
-                try
-                {
-                    ManagementObjectSearcher searcher2 = new ManagementObjectSearcher("SELECT * FROM Win32_IDEController");
-                    foreach (ManagementObject mo2 in searcher2.Get())
+                    try
                     {
-                        mobo.Chipset = Convert.ToString(mo2.Properties["Description"].Value);
+                        ManagementObjectSearcher searcher2 = new ManagementObjectSearcher("SELECT * FROM Win32_IDEController");
+                        foreach (ManagementObject mo2 in searcher2.Get())
+                        {
+                            mobo.Chipset = Convert.ToString(mo2.Properties["Description"].Value);
+                        }
                     }
-                }
-                catch { }
+                    catch { }
 
-                try
-                {
-                    ManagementObjectSearcher searcher3 = new ManagementObjectSearcher("SELECT * FROM Win32_IDEController");
-                    foreach (ManagementObject mo3 in searcher3.Get())
+                    try
                     {
-                        mobo.Revision = Convert.ToString(mo3.Properties["RevisionNumber"].Value);
+                        ManagementObjectSearcher searcher3 = new ManagementObjectSearcher("SELECT * FROM Win32_IDEController");
+                        foreach (ManagementObject mo3 in searcher3.Get())
+                        {
+                            mobo.Revision = Convert.ToString(mo3.Properties["RevisionNumber"].Value);
+                        }
                     }
-                }
-                catch { }
+                    catch { }
 
-                try
-                {
-                    ManagementObjectSearcher searcher4 = new ManagementObjectSearcher("SELECT * FROM Win32_ComputerSystem");
-                    foreach (ManagementObject mo4 in searcher4.Get())
+                    try
                     {
-                        mobo.SystemModel = Convert.ToString(mo4.Properties["Model"].Value);
+                        ManagementObjectSearcher searcher4 = new ManagementObjectSearcher("SELECT * FROM Win32_ComputerSystem");
+                        foreach (ManagementObject mo4 in searcher4.Get())
+                        {
+                            mobo.SystemModel = Convert.ToString(mo4.Properties["Model"].Value);
+                        }
                     }
-                }
-                catch { }
+                    catch { }
 
-                ManagementObjectSearcher searcher5 = new ManagementObjectSearcher("SELECT * FROM Win32_BIOS");
-                foreach (ManagementObject mo5 in searcher5.Get())
-                {
-                    mobo.BIOSName = Convert.ToString(mo5.Properties["Name"].Value);
-                    mobo.BIOSManufacturer = Convert.ToString(mo5.Properties["Manufacturer"].Value);
-                    mobo.BIOSVersion = Convert.ToString(mo5.Properties["Version"].Value);
-                    mobo.BIOSBuildNumber = Convert.ToString(mo5.Properties["BuildNumber"].Value);
-                    //ReleaseDate = DateTime.Parse(mo.Properties["ReleaseDate"].Value.ToString());
-                }
+                    ManagementObjectSearcher searcher5 = new ManagementObjectSearcher("SELECT * FROM Win32_BIOS");
+                    foreach (ManagementObject mo5 in searcher5.Get())
+                    {
+                        mobo.BIOSName = Convert.ToString(mo5.Properties["Name"].Value);
+                        mobo.BIOSManufacturer = Convert.ToString(mo5.Properties["Manufacturer"].Value);
+                        mobo.BIOSVersion = Convert.ToString(mo5.Properties["Version"].Value);
+                        mobo.BIOSBuildNumber = Convert.ToString(mo5.Properties["BuildNumber"].Value);
+                        //ReleaseDate = DateTime.Parse(mo.Properties["ReleaseDate"].Value.ToString());
+                    }
 
-                mobos.Add(mobo);
+                    mobos.Add(mobo);
+                }
+            }
+            catch (Exception ex)
+            {
+                ErrorLogger.LogError("IndiciumHelper.GetMotherboards", ex.Message, ex.StackTrace);
             }
 
             return mobos;
@@ -169,18 +197,25 @@ namespace Optimizer
         {
             List<Disk> disks = new List<Disk>();
 
-            ManagementObjectSearcher searcher2 = new ManagementObjectSearcher("SELECT * FROM Win32_DiskDrive");
-            foreach (ManagementObject mo2 in searcher2.Get())
+            try
             {
-                Disk disk = new Disk();
+                ManagementObjectSearcher searcher2 = new ManagementObjectSearcher("SELECT * FROM Win32_DiskDrive");
+                foreach (ManagementObject mo2 in searcher2.Get())
+                {
+                    Disk disk = new Disk();
 
-                disk.Model = Convert.ToString(mo2.Properties["Model"].Value);
-                disk.BytesPerSector = Convert.ToUInt32(mo2.Properties["BytesPerSector"].Value);
-                disk.FirmwareRevision = Convert.ToString(mo2.Properties["FirmwareRevision"].Value);
-                disk.MediaType = Convert.ToString(mo2.Properties["MediaType"].Value);
-                disk.Capacity = ByteSize.FromBytes(Convert.ToDouble(mo2.Properties["Size"].Value));
+                    disk.Model = Convert.ToString(mo2.Properties["Model"].Value);
+                    disk.BytesPerSector = Convert.ToUInt32(mo2.Properties["BytesPerSector"].Value);
+                    disk.FirmwareRevision = Convert.ToString(mo2.Properties["FirmwareRevision"].Value);
+                    disk.MediaType = Convert.ToString(mo2.Properties["MediaType"].Value);
+                    disk.Capacity = ByteSize.FromBytes(Convert.ToDouble(mo2.Properties["Size"].Value));
 
-                disks.Add(disk);
+                    disks.Add(disk);
+                }
+            }
+            catch (Exception ex)
+            {
+                ErrorLogger.LogError("IndiciumHelper.GetDisks", ex.Message, ex.StackTrace);
             }
 
             return disks;
@@ -188,75 +223,96 @@ namespace Optimizer
 
         public static void GetVolumes()
         {
-            ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_Volume");
-            foreach (ManagementObject mo in searcher.Get())
+            try
             {
-                Volume volume = new Volume();
-
-                volume.BlockSize = Convert.ToUInt64(mo.Properties["BlockSize"].Value);
-                volume.Capacity = ByteSize.FromBytes(Convert.ToDouble(mo.Properties["Capacity"].Value));
-                bool temp = Convert.ToBoolean(mo.Properties["Compressed"].Value);
-                volume.Compressed = (temp) ? "Yes" : "No";
-                volume.DriveLetter = Convert.ToString(mo.Properties["DriveLetter"].Value);
-                UInt32 i = Convert.ToUInt32(mo.Properties["DriveType"].Value);
-                volume.DriveType = SanitizeDriveType(i);
-                volume.FileSystem = Convert.ToString(mo.Properties["FileSystem"].Value);
-                volume.FreeSpace = ByteSize.FromBytes(Convert.ToDouble(mo.Properties["FreeSpace"].Value));
-                volume.UsedSpace = volume.Capacity.Subtract(volume.FreeSpace);
-                bool temp2 = Convert.ToBoolean(mo.Properties["IndexingEnabled"].Value);
-                volume.Indexing = (temp2) ? "Yes" : "No";
-                volume.Label = Convert.ToString(mo.Properties["Label"].Value);
-
-                if (i == 2)
-                {
-                    Removables.Add(volume);
-                }
-                else if (i == 5)
-                {
-                    Opticals.Add(volume);
-                }
-                else
+                ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_Volume");
+                foreach (ManagementObject mo in searcher.Get())
                 {
-                    Volumes.Add(volume);
+                    Volume volume = new Volume();
+
+                    volume.BlockSize = Convert.ToUInt64(mo.Properties["BlockSize"].Value);
+                    volume.Capacity = ByteSize.FromBytes(Convert.ToDouble(mo.Properties["Capacity"].Value));
+                    bool temp = Convert.ToBoolean(mo.Properties["Compressed"].Value);
+                    volume.Compressed = (temp) ? "Yes" : "No";
+                    volume.DriveLetter = Convert.ToString(mo.Properties["DriveLetter"].Value);
+                    UInt32 i = Convert.ToUInt32(mo.Properties["DriveType"].Value);
+                    volume.DriveType = SanitizeDriveType(i);
+                    volume.FileSystem = Convert.ToString(mo.Properties["FileSystem"].Value);
+                    volume.FreeSpace = ByteSize.FromBytes(Convert.ToDouble(mo.Properties["FreeSpace"].Value));
+                    volume.UsedSpace = volume.Capacity.Subtract(volume.FreeSpace);
+                    bool temp2 = Convert.ToBoolean(mo.Properties["IndexingEnabled"].Value);
+                    volume.Indexing = (temp2) ? "Yes" : "No";
+                    volume.Label = Convert.ToString(mo.Properties["Label"].Value);
+
+                    if (i == 2)
+                    {
+                        Removables.Add(volume);
+                    }
+                    else if (i == 5)
+                    {
+                        Opticals.Add(volume);
+                    }
+                    else
+                    {
+                        Volumes.Add(volume);
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                ErrorLogger.LogError("IndiciumHelper.GetVolumes", ex.Message, ex.StackTrace);
+            }
         }
 
         public static void GetPeripherals()
         {
-            ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_Keyboard");
-            foreach (ManagementObject mo in searcher.Get())
+            try
             {
-                Keyboard keyboard = new Keyboard();
+                ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_Keyboard");
+                foreach (ManagementObject mo in searcher.Get())
+                {
+                    Keyboard keyboard = new Keyboard();
 
-                keyboard.Name = Convert.ToString(mo.Properties["Description"].Value);
-                keyboard.Layout = Convert.ToString(mo.Properties["Layout"].Value);
-                keyboard.Status = Convert.ToString(mo.Properties["Status"].Value);
-                keyboard.FunctionKeys = Convert.ToUInt16(mo.Properties["NumberOfFunctionKeys"].Value);
-                bool temp = Convert.ToBoolean(mo.Properties["IsLocked"].Value);
-                keyboard.Locked = (temp) ? "Yes" : "No";
+                    keyboard.Name = Convert.ToString(mo.Properties["Description"].Value);
+                    keyboard.Layout = Convert.ToString(mo.Properties["Layout"].Value);
+                    keyboard.Status = Convert.ToString(mo.Properties["Status"].Value);
+                    keyboard.FunctionKeys = Convert.ToUInt16(mo.Properties["NumberOfFunctionKeys"].Value);
+                    bool temp = Convert.ToBoolean(mo.Properties["IsLocked"].Value);
+                    keyboard.Locked = (temp) ? "Yes" : "No";
 
-                Keyboards.Add(keyboard);
+                    Keyboards.Add(keyboard);
+                }
+            }
+            catch (Exception ex)
+            {
+                ErrorLogger.LogError("IndiciumHelper.GetKeyboards", ex.Message, ex.StackTrace);
             }
 
-            ManagementObjectSearcher searcher2 = new ManagementObjectSearcher("SELECT * FROM Win32_PointingDevice");
-            foreach (ManagementObject mo2 in searcher2.Get())
+            try
+            {
+                ManagementObjectSearcher searcher2 = new ManagementObjectSearcher("SELECT * FROM Win32_PointingDevice");
+                foreach (ManagementObject mo2 in searcher2.Get())
+                {
+                    PointingDevice pointingDevice = new PointingDevice();
+
+                    pointingDevice.Name = Convert.ToString(mo2.Properties["Description"].Value);
+                    pointingDevice.Manufacturer = Convert.ToString(mo2.Properties["Manufacturer"].Value);
+                    pointingDevice.Status = Convert.ToString(mo2.Properties["Status"].Value);
+                    pointingDevice.Buttons = Convert.ToUInt16(mo2.Properties["NumberOfButtons"].Value);
+                    bool temp = Convert.ToBoolean(mo2.Properties["IsLocked"].Value);
+                    pointingDevice.Locked = (temp) ? "Yes" : "No";
+                    pointingDevice.HardwareType = Convert.ToString(mo2.Properties["HardwareType"].Value);
+                    UInt16 i = Convert.ToUInt16(mo2.Properties["PointingType"].Value);
+                    pointingDevice.PointingType = SanitizePointingType(i);
+                    UInt16 i2 = Convert.ToUInt16(mo2.Properties["DeviceInterface"].Value);
+                    pointingDevice.DeviceInterface = SanitizeDeviceInterface(i2);
+
+                    PointingDevices.Add(pointingDevice);
+                }
+            }
+            catch (Exception ex)
             {
-                PointingDevice pointingDevice = new PointingDevice();
-
-                pointingDevice.Name = Convert.ToString(mo2.Properties["Description"].Value);
-                pointingDevice.Manufacturer = Convert.ToString(mo2.Properties["Manufacturer"].Value);
-                pointingDevice.Status = Convert.ToString(mo2.Properties["Status"].Value);
-                pointingDevice.Buttons = Convert.ToUInt16(mo2.Properties["NumberOfButtons"].Value);
-                bool temp = Convert.ToBoolean(mo2.Properties["IsLocked"].Value);
-                pointingDevice.Locked = (temp) ? "Yes" : "No";
-                pointingDevice.HardwareType = Convert.ToString(mo2.Properties["HardwareType"].Value);
-                UInt16 i = Convert.ToUInt16(mo2.Properties["PointingType"].Value);
-                pointingDevice.PointingType = SanitizePointingType(i);
-                UInt16 i2 = Convert.ToUInt16(mo2.Properties["DeviceInterface"].Value);
-                pointingDevice.DeviceInterface = SanitizeDeviceInterface(i2);
-
-                PointingDevices.Add(pointingDevice);
+                ErrorLogger.LogError("IndiciumHelper.GetPointingDevices", ex.Message, ex.StackTrace);
             }
         }
 
@@ -264,21 +320,28 @@ namespace Optimizer
         {
             List<GPU> GPUs = new List<GPU>();
 
-            ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_VideoController");
-            foreach (ManagementObject mo in searcher.Get())
+            try
+            {
+                ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_VideoController");
+                foreach (ManagementObject mo in searcher.Get())
+                {
+                    GPU gpu = new GPU();
+
+                    gpu.Name = Convert.ToString(mo.Properties["Name"].Value);
+                    gpu.Memory = ByteSize.FromBytes(Convert.ToDouble(mo.Properties["AdapterRAM"].Value));
+                    gpu.ResolutionX = Convert.ToUInt32(mo.Properties["CurrentHorizontalResolution"].Value);
+                    gpu.ResolutionY = Convert.ToUInt32(mo.Properties["CurrentVerticalResolution"].Value);
+                    gpu.RefreshRate = Convert.ToUInt32(mo.Properties["CurrentRefreshRate"].Value);
+                    gpu.DACType = Convert.ToString(mo.Properties["AdapterDACType"].Value);
+                    UInt16 vtype = Convert.ToUInt16(mo.Properties["VideoMemoryType"].Value);
+                    gpu.VideoMemoryType = SanitizeVideoMemoryType(vtype);
+
+                    GPUs.Add(gpu);
+                }
+            }
+            catch (Exception ex)
             {
-                GPU gpu = new GPU();
-
-                gpu.Name = Convert.ToString(mo.Properties["Name"].Value);
-                gpu.Memory = ByteSize.FromBytes(Convert.ToDouble(mo.Properties["AdapterRAM"].Value));
-                gpu.ResolutionX = Convert.ToUInt32(mo.Properties["CurrentHorizontalResolution"].Value);
-                gpu.ResolutionY = Convert.ToUInt32(mo.Properties["CurrentVerticalResolution"].Value);
-                gpu.RefreshRate = Convert.ToUInt32(mo.Properties["CurrentRefreshRate"].Value);
-                gpu.DACType = Convert.ToString(mo.Properties["AdapterDACType"].Value);
-                UInt16 vtype = Convert.ToUInt16(mo.Properties["VideoMemoryType"].Value);
-                gpu.VideoMemoryType = SanitizeVideoMemoryType(vtype);
-
-                GPUs.Add(gpu);
+                ErrorLogger.LogError("IndiciumHelper.GetGPUs", ex.Message, ex.StackTrace);
             }
 
             return GPUs;
@@ -286,46 +349,60 @@ namespace Optimizer
 
         public static void GetNetworkAdapters()
         {
-            ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_NetworkAdapter");
-            foreach (ManagementObject mo in searcher.Get())
+            try
             {
-                NetworkDevice adapter = new NetworkDevice();
+                ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_NetworkAdapter");
+                foreach (ManagementObject mo in searcher.Get())
+                {
+                    NetworkDevice adapter = new NetworkDevice();
 
-                adapter.AdapterType = Convert.ToString(mo.Properties["AdapterType"].Value);
-                adapter.Manufacturer = Convert.ToString(mo.Properties["Manufacturer"].Value);
-                adapter.ProductName = Convert.ToString(mo.Properties["ProductName"].Value);
-                bool temp = Convert.ToBoolean(mo.Properties["PhysicalAdapter"].Value);
-                adapter.PhysicalAdapter = (temp) ? "Yes" : "No";
-                adapter.MacAddress = Convert.ToString(mo.Properties["MacAddress"].Value);
-                adapter.ServiceName = Convert.ToString(mo.Properties["ServiceName"].Value);
+                    adapter.AdapterType = Convert.ToString(mo.Properties["AdapterType"].Value);
+                    adapter.Manufacturer = Convert.ToString(mo.Properties["Manufacturer"].Value);
+                    adapter.ProductName = Convert.ToString(mo.Properties["ProductName"].Value);
+                    bool temp = Convert.ToBoolean(mo.Properties["PhysicalAdapter"].Value);
+                    adapter.PhysicalAdapter = (temp) ? "Yes" : "No";
+                    adapter.MacAddress = Convert.ToString(mo.Properties["MacAddress"].Value);
+                    adapter.ServiceName = Convert.ToString(mo.Properties["ServiceName"].Value);
 
-                if (temp)
-                {
-                    PhysicalAdapters.Add(adapter);
-                }
-                else
-                {
-                    VirtualAdapters.Add(adapter);
+                    if (temp)
+                    {
+                        PhysicalAdapters.Add(adapter);
+                    }
+                    else
+                    {
+                        VirtualAdapters.Add(adapter);
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                ErrorLogger.LogError("IndiciumHelper.GetNetworkAdapters", ex.Message, ex.StackTrace);
+            }
         }
 
         public static List<AudioDevice> GetAudioDevices()
         {
             List<AudioDevice> audioDevices = new List<AudioDevice>();
 
-            ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_SoundDevice");
-            foreach (ManagementObject mo in searcher.Get())
+            try
             {
-                AudioDevice device = new AudioDevice();
+                ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT * FROM Win32_SoundDevice");
+                foreach (ManagementObject mo in searcher.Get())
+                {
+                    AudioDevice device = new AudioDevice();
 
-                device.ProductName = Convert.ToString(mo.Properties["ProductName"].Value);
-                device.Manufacturer = Convert.ToString(mo.Properties["Manufacturer"].Value);
-                device.Status = Convert.ToString(mo.Properties["Status"].Value);
+                    device.ProductName = Convert.ToString(mo.Properties["ProductName"].Value);
+                    device.Manufacturer = Convert.ToString(mo.Properties["Manufacturer"].Value);
+                    device.Status = Convert.ToString(mo.Properties["Status"].Value);
 
-                audioDevices.Add(device);
+                    audioDevices.Add(device);
+                }
             }
-
+            catch (Exception ex)
+            {
+                ErrorLogger.LogError("IndiciumHelper.GetAudioDevices", ex.Message, ex.StackTrace);
+            }
+            
             return audioDevices;
         }
 

Optimizer/Program.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Windows.Forms;
@@ -11,10 +12,10 @@ namespace Optimizer
         /* VERSION PROPERTIES */
         /* DO NOT LEAVE THEM EMPTY */
 
-        internal readonly static float Major = 11;
-        internal readonly static float Minor = 4;
+        internal readonly static float Major = 0;
+        internal readonly static float Minor = 0;
 
-        internal readonly static bool EXPERIMENTAL_BUILD = false;
+        internal readonly static bool EXPERIMENTAL_BUILD = true;
 
         internal static string GetCurrentVersionTostring()
         {
@@ -150,6 +151,26 @@ namespace Optimizer
                                     return;
                                 }
 
+                                // other options 
+                                if (arg.StartsWith("/disable="))
+                                {
+                                    string x = arg.Replace("/disable=", string.Empty);
+                                    string[] opts = x.Split(',');
+
+                                    bool disableIndicium = opts.Contains("indicium");
+                                    bool disableUWPTool = opts.Contains("uwp");
+                                    bool disableAppsTool = opts.Contains("apps");
+                                    bool disableHostsEditor = opts.Contains("hosts");
+
+                                    StartSplashForm();
+
+                                    _MainForm = new MainForm(_SplashForm, disableIndicium, disableHostsEditor, disableAppsTool, disableUWPTool);
+                                    _MainForm.Load += MainForm_Load;
+                                    Application.Run(_MainForm);
+
+                                    return;
+                                }
+
                                 // disables Defender in SAFE MODE (for Windows 10 1903+ / works in Windows 11 as well)
                                 if (arg == "/disabledefender")
                                 {