Updated few ATF files

lcd5 · Jul 29, 2014 · d9ae991 · d9ae991
1 parent 5c9e0a0
commit d9ae991
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/ATF/Framework/Atf.Core/AtfUsageLogger.cs b/ATF/Framework/Atf.Core/AtfUsageLogger.cs
@@ -84,7 +84,7 @@ private static void _SendAtfUsageInfo(object unusedState)
                 bool appIs64Bit = (IntPtr.Size == 8);
                 string osVersion = GetOSFullName();
                 string clrVersion = Environment.Version.ToString();
-                int physicalMb = GetPhysicalMemoryMB();
+                int physicalMb = Kernel32.GetPhysicalMemoryMB();
 
                 // Analyze all loaded assemblies
                 StringBuilder loadedAssemblies = new StringBuilder();
@@ -171,31 +171,6 @@ private static void ParseAssemblyName(string fullName, out string name, out stri
                 version = parts[1].Trim();
         }
 
-        [StructLayout(LayoutKind.Sequential)]
-        private class MEMORYSTATUSEX
-        {
-            public uint dwLength = 64;
-            public uint dwMemoryLoad;
-            public ulong ullTotalPhys; //The amount of actual physical memory, in bytes.
-            public ulong ullAvailPhys;
-            public ulong ullTotalPageFile;
-            public ulong ullAvailPageFile;
-            public ulong ullTotalVirtual;
-            public ulong ullAvailVirtual;
-            public ulong ullAvailExtendedVirtual;
-        }
-
-        [DllImport("Kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        private static extern bool GlobalMemoryStatusEx(MEMORYSTATUSEX lpBuffer);
-
-        private static int GetPhysicalMemoryMB()
-        {
-            // Available from Windows 2000 and onward; i.e., Environment.OSVersion.Version.Major >= 5 .
-            var memoryStatus = new MEMORYSTATUSEX();
-            GlobalMemoryStatusEx(memoryStatus);
-            return (int)(memoryStatus.ullTotalPhys / (1024 * 1024));// convert bytes to megabytes
-        }
-
         private static string GetInstalledVisualStudioVersions()
         {
             var versionSet = new HashSet<string>();

diff --git a/ATF/Framework/Atf.Core/Kernel32.cs b/ATF/Framework/Atf.Core/Kernel32.cs
@@ -22,6 +22,32 @@ public static extern uint QueryDosDeviceW(
             [In] [MarshalAsAttribute(UnmanagedType.LPWStr)] string lpDeviceName,
             [Out] [MarshalAsAttribute(UnmanagedType.LPWStr)] System.Text.StringBuilder lpTargetPath,
             uint ucchMax);
+
+
+        [StructLayout(LayoutKind.Sequential)]
+        private class MEMORYSTATUSEX
+        {
+            public uint dwLength = 64;
+            public uint dwMemoryLoad;
+            public ulong ullTotalPhys; //The amount of actual physical memory, in bytes.
+            public ulong ullAvailPhys;
+            public ulong ullTotalPageFile;
+            public ulong ullAvailPageFile;
+            public ulong ullTotalVirtual;
+            public ulong ullAvailVirtual;
+            public ulong ullAvailExtendedVirtual;
+        }
+
+        [DllImport("Kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        private static extern bool GlobalMemoryStatusEx(MEMORYSTATUSEX lpBuffer);
+
+        public static int GetPhysicalMemoryMB()
+        {
+            // Available from Windows 2000 and onward; i.e., Environment.OSVersion.Version.Major >= 5 .
+            var memoryStatus = new MEMORYSTATUSEX();
+            GlobalMemoryStatusEx(memoryStatus);
+            return (int)(memoryStatus.ullTotalPhys / (1024 * 1024));// convert bytes to megabytes
+        }
     }
 }