WinGui: Some initial work to make the HandBrake.ApplicationServices library more portable.

4 files changed, 2 insertions, 320 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 8d023b901..14ba10545 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -189,7 +189,6 @@
     <Compile Include="Services\Logging\Model\LogMessageType.cs" />

     <Compile Include="Utilities\SystemInfo.cs" />

     <Compile Include="Utilities\VersionHelper.cs" />

-    <Compile Include="Utilities\Win32.cs" />

     <Compile Include="Properties\Resources.Designer.cs">

       <AutoGen>True</AutoGen>

       <DesignTime>True</DesignTime>

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs b/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
index 12665c062..49c1c488d 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
@@ -234,34 +234,9 @@ namespace HandBrake.ApplicationServices.Utilities
         /// The user languages.

         /// </param>

         /// <returns>

-        /// The <see cref="IList"/>.

-        /// </returns>

-        public static List<string> GetLanguageCodes(StringCollection userLanguages)

-        {

-            // Translate to Iso Codes

-            List<string> iso6392Codes = new List<string>();

-            foreach (var item in userLanguages)

-            {

-                string isoCode;

-                if (LanguageUtilities.MapLanguages().TryGetValue(item, out isoCode))

-                {

-                    iso6392Codes.Add(isoCode);

-                }

-            }

-

-            return iso6392Codes;

-        }

-

-        /// <summary>

-        /// The get language codes.

-        /// </summary>

-        /// <param name="userLanguages">

-        /// The user languages.

-        /// </param>

-        /// <returns>

         /// The <see cref="List"/>.

         /// </returns>

-        public static List<string> GetLanguageCodes(IList<string> userLanguages)

+        public static List<string> GetLanguageCodes(IEnumerable<string> userLanguages)

         {

             // Translate to Iso Codes

             List<string> iso6392Codes = new List<string>();

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs b/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs
index ce5e5506f..8ccf04462 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs
@@ -10,13 +10,8 @@
 namespace HandBrake.ApplicationServices.Utilities

 {

     using System;

-    using System.Collections.Generic;

-    using System.Management;

-    using System.Windows.Forms;

 

-    using HandBrake.ApplicationServices.Interop.HbLib;

-

-    using Microsoft.Win32;

+    using Interop.HbLib;

 

     /// <summary>

     /// The System Information.

@@ -24,45 +19,6 @@ namespace HandBrake.ApplicationServices.Utilities
     public class SystemInfo

     {

         /// <summary>

-        /// Gets the total physical ram in a system

-        /// </summary>

-        /// <returns>The total memory in the system</returns>

-        public static ulong TotalPhysicalMemory

-        {

-            get

-            {

-                Win32.MEMORYSTATUSEX memStat = new Win32.MEMORYSTATUSEX { dwLength = 64 };

-                Win32.GlobalMemoryStatusEx(ref memStat);

-

-                ulong value = memStat.ullTotalPhys / 1024 / 1024;

-                return value;

-            }

-        }

-

-        /// <summary>

-        /// Gets the number of CPU Cores

-        /// </summary>

-        /// <returns>Object</returns>

-        public static object GetCpuCount

-        {

-            get

-            {

-                RegistryKey regKey = Registry.LocalMachine;

-                regKey = regKey.OpenSubKey("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0");

-                return regKey == null ? 0 : regKey.GetValue("ProcessorNameString");

-            }

-        }

-

-        /// <summary>

-        /// Gets the System screen size information.

-        /// </summary>

-        /// <returns>System.Windows.Forms.Scree</returns>

-        public static Screen ScreenBounds

-        {

-            get { return Screen.PrimaryScreen; }

-        }

-

-        /// <summary>

         /// Gets a value indicating whether is qsv available.

         /// </summary>

         public static bool IsQsvAvailable

@@ -118,54 +74,5 @@ namespace HandBrake.ApplicationServices.Utilities
                 }

             }

         }

-

-        /// <summary>

-        /// Gets the get gpu driver version.

-        /// </summary>

-        public static List<string> GetGPUInfo

-        {

-            get

-            {

-                List<string> gpuInfo = new List<string>();

-

-                try

-                {

-                    ManagementObjectSearcher searcher =

-                        new ManagementObjectSearcher("select * from " + "Win32_VideoController");

-

-                    foreach (ManagementObject share in searcher.Get())

-                    {

-                        string gpu = string.Empty, version = string.Empty;

-

-                        foreach (PropertyData PC in share.Properties)

-                        {

-                            if (!string.IsNullOrEmpty(PC.Name) && PC.Value != null)

-                            {

-                                if (PC.Name.Equals("DriverVersion")) version = PC.Value.ToString();

-                                if (PC.Name.Equals("Name")) gpu = PC.Value.ToString();

-                            }

-                        }

-

-                        if (string.IsNullOrEmpty(gpu))

-                        {

-                            gpu = "Unknown GPU";

-                        }

-

-                        if (string.IsNullOrEmpty(version))

-                        {

-                            version = "Unknown Driver Version";

-                        }

-

-                        gpuInfo.Add(string.Format("{0} - {1}", gpu, version));

-                    }

-                }

-                catch (Exception)

-                {

-                    // Do Nothing. We couldn't get GPU Information.

-                }

-

-                return gpuInfo;

-            }

-        }

     }

 }

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Win32.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Win32.cs
deleted file mode 100644
index 8a870adfb..000000000
--- a/win/CS/HandBrake.ApplicationServices/Utilities/Win32.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="Win32.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   Win32 API calls

-// </summary>

-// <auto-generated>Disable Stylecop for this file </auto-generated>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrake.ApplicationServices.Utilities

-{

-    using System;

-    using System.Runtime.InteropServices;

-    using System.Windows.Threading;

-

-    /// <summary>

-    /// Win32 API calls

-    /// </summary>

-    public class Win32

-    {

-        /// <summary>

-        /// Used to force UI Thread.

-        /// </summary>

-        private static Action<Action> executor = action => action();

-

-        /// <summary>

-        /// Set the Forground Window

-        /// </summary>

-        /// <param name="hWnd">

-        /// The h wnd.

-        /// </param>

-        /// <returns>

-        /// A Boolean true when complete.

-        /// </returns>

-        [DllImport("user32.dll")]

-        public static extern bool SetForegroundWindow(int hWnd);

-

-        /// <summary>

-        /// Lock the workstation

-        /// </summary>

-        [DllImport("user32.dll")]

-        public static extern void LockWorkStation();

-

-        /// <summary>

-        /// Exit Windows

-        /// </summary>

-        /// <param name="uFlags">

-        /// The u flags.

-        /// </param>

-        /// <param name="dwReason">

-        /// The dw reason.

-        /// </param>

-        /// <returns>

-        /// an integer

-        /// </returns>

-        [DllImport("user32.dll")]

-        public static extern int ExitWindowsEx(int uFlags, int dwReason);

-

-        /// <summary>

-        /// Memory Status EX Struct

-        /// </summary>

-        public struct MEMORYSTATUSEX

-        {

-            public int dwLength;

-

-            public int dwMemoryLoad;

-

-            public ulong ullTotalPhys;

-

-            public ulong ullAvailPhys;

-

-            public ulong ullTotalPageFile;

-

-            public ulong ullAvailPageFile;

-

-            public ulong ullTotalVirtual;

-

-            public ulong ullAvailVirtual;

-

-            public ulong ullAvailExtendedVirtual;

-        }

-

-        /// <summary>

-        /// Get the System Memory information

-        /// </summary>

-        /// <param name="lpBuffer">

-        /// The lp buffer.

-        /// </param>

-        /// <returns>

-        /// A boolean.

-        /// </returns>

-        [DllImport("kernel32.dll", SetLastError = true)]

-        public static extern bool GlobalMemoryStatusEx(ref MEMORYSTATUSEX lpBuffer);

-

-        /// <summary>

-        /// Generate a Console Ctrl Event

-        /// </summary>

-        /// <param name="sigevent">

-        /// The sigevent.

-        /// </param>

-        /// <param name="dwProcessGroupId">

-        /// The dw process group id.

-        /// </param>

-        /// <returns>

-        /// Bool true is sucess

-        /// </returns>

-        [DllImport("kernel32.dll", SetLastError = true)]

-        public static extern bool GenerateConsoleCtrlEvent(ConsoleCtrlEvent sigevent, int dwProcessGroupId);

-

-        /// <summary>

-        /// Console Ctrl Event

-        /// </summary>

-        public enum ConsoleCtrlEvent

-        {

-            /// <summary>

-            /// Ctrl - C

-            /// </summary>

-            CTRL_C = 0,

-

-            /// <summary>

-            /// Ctrl - Break

-            /// </summary>

-            CTRL_BREAK = 1,

-

-            /// <summary>

-            /// Ctrl - Close

-            /// </summary>

-            CTRL_CLOSE = 2,

-        }

-

-        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]

-        private static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);

-

-        /// <summary>

-        /// Execution State

-        /// </summary>

-        [Flags]

-        public enum EXECUTION_STATE : uint

-        {

-            ES_SYSTEM_REQUIRED = 0x00000001,

-

-            ES_CONTINUOUS = 0x80000000,

-

-            ES_AWAYMODE_REQUIRED = 0x00000040

-        }

-

-        /// <summary>

-        /// Initializes static members of the <see cref="Win32"/> class.

-        /// </summary>

-        static Win32()

-        {

-            InitializeWithDispatcher();

-        }

-

-        /// <summary>

-        /// Prevent the system from sleeping

-        /// </summary>

-        public static void PreventSleep()

-        {

-            executor(

-                () => SetThreadExecutionState(

-                    EXECUTION_STATE.ES_CONTINUOUS | EXECUTION_STATE.ES_SYSTEM_REQUIRED

-                    | EXECUTION_STATE.ES_AWAYMODE_REQUIRED));

-        }

-

-        /// <summary>

-        ///  Allow the system to sleep.

-        /// </summary>

-        public static void AllowSleep()

-        {

-            executor(() => SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS));

-        }

-

-        /// <summary>

-        ///   Initializes the framework using the current dispatcher.

-        /// </summary>

-        public static void InitializeWithDispatcher()

-        {

-            var dispatcher = Dispatcher.CurrentDispatcher;

-

-            SetUIThreadMarshaller(action =>

-            {

-                if (dispatcher.CheckAccess())

-                    action();

-                else dispatcher.Invoke(action);

-            });

-        }

-

-        /// <summary>

-        /// Sets a custom UI thread marshaller.

-        /// </summary>

-        /// <param name="marshaller">The marshaller.</param>

-        public static void SetUIThreadMarshaller(Action<Action> marshaller)

-        {

-            executor = marshaller;

-        }

-    }

-}