* Added missing code comments

* Minor code changes

Author: CodeDead

MemPlus/Business/Classes/RAM/RamAnalyzer.cs

@@ -1,17 +1,57 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
+using System.Management;
 using System.Security.Principal;
-using System.Text;
-using System.Threading.Tasks;
+using MemPlus.Business.Classes.RAM;
 
 namespace MemPlus.Business.Classes.UTILS
 {
+    /// <summary>
+    /// Static class containing utility code that can be used by different objects
+    /// </summary>
     internal static class Utils
     {
+        /// <summary>
+        /// Check if the application is running with Administrative rights
+        /// </summary>
+        /// <returns>True if the application has Administrative rights, otherwise false</returns>
         internal static bool IsAdministrator()
         {
             return new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator);
         }
+
+        /// <summary>
+        /// Retrieve RAM information
+        /// </summary>
+        /// <returns>A list of RAM information</returns>
+        internal static List<RamStick> GetRamSticks()
+        {
+            List<RamStick> ramSticks = new List<RamStick>();
+
+            ConnectionOptions connection = new ConnectionOptions { Impersonation = ImpersonationLevel.Impersonate };
+
+            ManagementScope scope = new ManagementScope("\\root\\CIMV2", connection);
+            scope.Connect();
+
+            ObjectQuery query = new ObjectQuery("SELECT * FROM Win32_PhysicalMemory");
+
+            ManagementObjectSearcher searcher = new ManagementObjectSearcher(scope, query);
+
+            // ReSharper disable once PossibleInvalidCastExceptionInForeachLoop
+            foreach (ManagementObject queryObj in searcher.Get())
+            {
+                RamStick stick = new RamStick();
+                foreach (PropertyData data in queryObj.Properties)
+                {
+                    if (data.Value != null)
+                    {
+                        stick.AddRamData(new RamData(data.Name, data.Value.ToString()));
+                    }
+                }
+
+                ramSticks.Add(stick);
+            }
+
+            return ramSticks;
+        }
     }
 }

MemPlus/Business/Classes/UTILS/Utils.cs

@@ -87,7 +87,6 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Business\Classes\EXPORT\ExportTypes.cs" />
-    <Compile Include="Business\Classes\RAM\RamAnalyzer.cs" />
     <Compile Include="Business\Classes\RAM\RamData.cs" />
     <Compile Include="Business\Classes\RAM\RamSticksExporter.cs" />
     <Compile Include="Business\Classes\RAM\RamStick.cs" />

MemPlus/MemPlus.csproj

@@ -6,6 +6,7 @@
 using MemPlus.Business.Classes.GUI;
 using MemPlus.Business.Classes.LOG;
 using MemPlus.Business.Classes.RAM;
+using MemPlus.Business.Classes.UTILS;
 using Microsoft.Win32;
 
 namespace MemPlus.Views.Windows
@@ -51,7 +52,7 @@ private void RefreshRamData()
             try
             {
                 TrvRam.Items.Clear();
-                List<RamStick> ramSticks = RamAnalyzer.GetRamSticks();
+                List<RamStick> ramSticks = Utils.GetRamSticks();
 
                 if (ramSticks == null || ramSticks.Count == 0)
                 {
@@ -159,16 +160,16 @@ private void BtnExport_OnClick(object sender, RoutedEventArgs e)
                 {
                     //Filterindex starts at 1
                     case 1:
-                        RamDataExporter.ExportText(sfd.FileName, RamAnalyzer.GetRamSticks());
+                        RamDataExporter.ExportText(sfd.FileName, Utils.GetRamSticks());
                         break;
                     case 2:
-                        RamDataExporter.ExportHtml(sfd.FileName, RamAnalyzer.GetRamSticks());
+                        RamDataExporter.ExportHtml(sfd.FileName, Utils.GetRamSticks());
                         break;
                     case 3:
-                        RamDataExporter.ExportCsv(sfd.FileName, RamAnalyzer.GetRamSticks());
+                        RamDataExporter.ExportCsv(sfd.FileName, Utils.GetRamSticks());
                         break;
                     case 4:
-                        RamDataExporter.ExportExcel(sfd.FileName, RamAnalyzer.GetRamSticks());
+                        RamDataExporter.ExportExcel(sfd.FileName, Utils.GetRamSticks());
                         break;
                 }
                 MessageBox.Show("Exported all data!", "MemPlus", MessageBoxButton.OK, MessageBoxImage.Information);

MemPlus/Views/Windows/AnalyzerWindow.xaml.cs

@@ -600,16 +600,16 @@ private void ExportRamAnalyzerDataMenuItem_OnClick(object sender, RoutedEventArg
                 {
                     //Filterindex starts at 1
                     case 1:
-                        RamDataExporter.ExportText(sfd.FileName, RamAnalyzer.GetRamSticks());
+                        RamDataExporter.ExportText(sfd.FileName, Utils.GetRamSticks());
                         break;
                     case 2:
-                        RamDataExporter.ExportHtml(sfd.FileName, RamAnalyzer.GetRamSticks());
+                        RamDataExporter.ExportHtml(sfd.FileName, Utils.GetRamSticks());
                         break;
                     case 3:
-                        RamDataExporter.ExportCsv(sfd.FileName, RamAnalyzer.GetRamSticks());
+                        RamDataExporter.ExportCsv(sfd.FileName, Utils.GetRamSticks());
                         break;
                     case 4:
-                        RamDataExporter.ExportExcel(sfd.FileName, RamAnalyzer.GetRamSticks());
+                        RamDataExporter.ExportExcel(sfd.FileName, Utils.GetRamSticks());
                         break;
                 }
                 MessageBox.Show("All data has been exported!", "MemPlus", MessageBoxButton.OK, MessageBoxImage.Information);