From 9517de76c2dea05cb8835b665ca5699ca9232b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Wed, 24 Oct 2018 20:55:23 +0200 Subject: [PATCH] Fixed visibility levels --- DerpingDrivers/Util/OSVersionInfo.cs | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/DerpingDrivers/Util/OSVersionInfo.cs b/DerpingDrivers/Util/OSVersionInfo.cs index 69de1ca..5578f07 100644 --- a/DerpingDrivers/Util/OSVersionInfo.cs +++ b/DerpingDrivers/Util/OSVersionInfo.cs @@ -138,8 +138,6 @@ namespace DerpingDrivers.Util { var pbits = SoftwareArchitecture.Unknown; - var test = Environment.GetEnvironmentVariables(); - switch (IntPtr.Size * 8) { case 64: @@ -570,8 +568,7 @@ namespace DerpingDrivers.Util var name = "unknown"; var osVersion = Environment.OSVersion; - var osVersionInfo = new OSVERSIONINFOEX(); - osVersionInfo.dwOSVersionInfoSize = Marshal.SizeOf(typeof(OSVERSIONINFOEX)); + var osVersionInfo = new OSVERSIONINFOEX {dwOSVersionInfoSize = Marshal.SizeOf(typeof(OSVERSIONINFOEX))}; if (GetVersionEx(ref osVersionInfo)) { @@ -768,7 +765,7 @@ namespace DerpingDrivers.Util #region PRODUCT INFO [DllImport("Kernel32.dll")] - internal static extern bool GetProductInfo( + private static extern bool GetProductInfo( int osMajorVersion, int osMinorVersion, int spMajorVersion, @@ -787,17 +784,17 @@ namespace DerpingDrivers.Util #region SYSTEMMETRICS [DllImport("user32")] - public static extern int GetSystemMetrics(int nIndex); + private static extern int GetSystemMetrics(int nIndex); #endregion SYSTEMMETRICS #region SYSTEMINFO [DllImport("kernel32.dll")] - public static extern void GetSystemInfo([MarshalAs(UnmanagedType.Struct)] ref SYSTEM_INFO lpSystemInfo); + private static extern void GetSystemInfo([MarshalAs(UnmanagedType.Struct)] ref SYSTEM_INFO lpSystemInfo); [DllImport("kernel32.dll")] - public static extern void GetNativeSystemInfo([MarshalAs(UnmanagedType.Struct)] ref SYSTEM_INFO lpSystemInfo); + private static extern void GetNativeSystemInfo([MarshalAs(UnmanagedType.Struct)] ref SYSTEM_INFO lpSystemInfo); #endregion SYSTEMINFO @@ -829,7 +826,7 @@ namespace DerpingDrivers.Util #region SYSTEM_INFO [StructLayout(LayoutKind.Sequential)] - public struct SYSTEM_INFO + private struct SYSTEM_INFO { internal _PROCESSOR_INFO_UNION uProcessorInfo; public uint dwPageSize; @@ -848,7 +845,7 @@ namespace DerpingDrivers.Util #region _PROCESSOR_INFO_UNION [StructLayout(LayoutKind.Explicit)] - public struct _PROCESSOR_INFO_UNION + private struct _PROCESSOR_INFO_UNION { [FieldOffset(0)] internal uint dwOemId; [FieldOffset(0)] internal ushort wProcessorArchitecture; @@ -860,10 +857,10 @@ namespace DerpingDrivers.Util #region 64 BIT OS DETECTION [DllImport("kernel32", SetLastError = true, CallingConvention = CallingConvention.Winapi)] - public static extern IntPtr LoadLibrary(string libraryName); + private static extern IntPtr LoadLibrary(string libraryName); [DllImport("kernel32", SetLastError = true, CallingConvention = CallingConvention.Winapi)] - public static extern IntPtr GetProcAddress(IntPtr hwnd, string procedureName); + private static extern IntPtr GetProcAddress(IntPtr hwnd, string procedureName); #endregion 64 BIT OS DETECTION