Infrastructure Preparation 278

Taiizor · Jun 6, 2024 · 7677af2 · 7677af2
1 parent 413dc28
commit 7677af2
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/...rk.WinForms.Demo/WinFormsDemoWallpaper/WinFormsDemoWallpaper/WinFormsDemoWallpaper.csproj b/...rk.WinForms.Demo/WinFormsDemoWallpaper/WinFormsDemoWallpaper/WinFormsDemoWallpaper.csproj
@@ -13,6 +13,6 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Skylark" Version="3.1.4.2" />
-        <PackageReference Include="Skylark.Wing" Version="3.1.5.2" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.5.3" />
     </ItemGroup>
 </Project>
diff --git a/src/Skylark.Wing/Helper/SystemInfo.cs b/src/Skylark.Wing/Helper/SystemInfo.cs
@@ -166,7 +166,7 @@ public static long GetTotalInstalledMemory()
         {
             SWNM.GetPhysicallyInstalledSystemMemory(out long memKb);
 
-            return memKb / 1024;
+            return memKb;
         }
 
         /// <summary>

diff --git a/src/Skylark.Wing/Native/Methods.cs b/src/Skylark.Wing/Native/Methods.cs
@@ -460,6 +460,9 @@ public struct OSVERSIONINFOEX
             public byte Reserved;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
         [StructLayout(LayoutKind.Sequential)]
         public struct SYSTEM_INFO
         {
@@ -476,6 +479,9 @@ public struct SYSTEM_INFO
             public ushort processorRevision;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
         [StructLayout(LayoutKind.Sequential)]
         public struct LASTINPUTINFO
         {
@@ -487,6 +493,25 @@ public struct LASTINPUTINFO
             public uint dwTime;
         }
 
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public class MEMORYSTATUSEX
+        {
+            public uint dwLength;
+            public uint dwMemoryLoad;
+            public ulong ullTotalPhys;
+            public ulong ullAvailPhys;
+            public ulong ullTotalPageFile;
+            public ulong ullAvailPageFile;
+            public ulong ullTotalVirtual;
+            public ulong ullAvailVirtual;
+            public ulong ullAvailExtendedVirtual;
+
+            public MEMORYSTATUSEX()
+            {
+                dwLength = (uint)Marshal.SizeOf<MEMORYSTATUSEX>();
+            }
+        }
+
         /// <remarks>
         /// 
         /// </remarks>
@@ -1550,6 +1575,10 @@ public enum WM : uint
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
         public static extern int GetWindowTextLength(IntPtr hWnd);
 
+        [return: MarshalAs(UnmanagedType.Bool)]
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern bool GlobalMemoryStatusEx([In, Out] MEMORYSTATUSEX lpBuffer);
+
         [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
         public static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
 
@@ -1561,6 +1590,7 @@ public enum WM : uint
         public static extern bool GetPhysicallyInstalledSystemMemory(out long TotalMemoryInKilobytes);
 
         #region Window_Style
+
         [DllImport("user32.dll")]
         public static extern IntPtr GetMenu(IntPtr hWnd);
 
@@ -1617,6 +1647,7 @@ public enum SendMessageTimeoutFlags : uint
             SMTO_NOTIMEOUTIFNOTHUNG = 0x8,
             SMTO_ERRORONEXIT = 0x20
         }
+
         public enum AnimateWindowFlags : uint
         {
             AW_HOR_POSITIVE = 0x00000001,

diff --git a/src/Skylark.Wing/Skylark.Wing.cs b/src/Skylark.Wing/Skylark.Wing.cs
@@ -22,7 +22,7 @@
 //     Website: www.Vegalya.com
 //     Created: 17.Jun.2023
 //     Changed: 06.Jun.2024
-//     Version: 3.1.5.3
+//     Version: 3.1.5.4
 //
 // |---------DO-NOT-REMOVE---------|
 

diff --git a/src/Skylark.Wing/Skylark.Wing.csproj b/src/Skylark.Wing/Skylark.Wing.csproj
@@ -12,7 +12,7 @@
 
     <PropertyGroup>
         <ApplicationIcon>Resources\Skylark.Wing.ico</ApplicationIcon>
-        <Version>3.1.5.3</Version>
+        <Version>3.1.5.4</Version>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Title>Skylark.Wing</Title>