BackLightControl: Add new HidKbdData class and additional code to sup…

…port updated Keyboard_Core.dll
JooJooBee666 · Jan 3, 2021 · 286ac72 · 286ac72
1 parent 2da83af
commit 286ac72
Show file tree

Hide file tree

Showing 13 changed files with 200 additions and 150 deletions.
diff --git a/Installer.exe b/Installer.exe
diff --git a/LBCService/App.config b/LBCService/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/LBCService/BacklightControls.cs b/LBCService/BacklightControls.cs
@@ -5,15 +5,27 @@
 
 namespace LBCService
 {
+    public class HidKbdData
+    {
+        public string strProductId;
+        public string strVendorId;
+        public string GetHidUsagePage;
+        public string GetHidUsage;
+        public string SetHidUsagePage;
+        public string SetHidUsage;
+    }
+
     public class BacklightControls
     {
         public void ActivateBacklight(int lightValue)
         {
+            FileVersionInfo kbcver = null;
             if (System.IO.File.Exists(LenovoBacklightControl.KBCorePath))
             {
                 try
                 {
                     Keyboard_Core = Assembly.LoadFile(LenovoBacklightControl.KBCorePath);
+                    kbcver = FileVersionInfo.GetVersionInfo(LenovoBacklightControl.KBCorePath);
                 }
                 catch (Exception e)
                 {
@@ -37,10 +49,32 @@ public void ActivateBacklight(int lightValue)
             KCInstance = Activator.CreateInstance(AssemblyType);
 
             //get internal method info for changing the KB Backlight status
-            var setKeyboardBackLightStatusInfo = GetRuntimeMethodsExt(AssemblyType, "SetKeyboardBackLightStatus");
-
-            object[] lightLevel = { lightValue };
-            var output = (UInt32)setKeyboardBackLightStatusInfo.Invoke(KCInstance, lightLevel);
+            try
+            {
+                object[] lightLevel = { };
+                var setKeyboardBackLightStatusInfo = GetRuntimeMethodsExt(AssemblyType, "SetKeyboardBackLightStatus");
+                if (kbcver.FileVersion == "2.0.0.15")
+                {
+                    //set with new method
+                    HidKbdData hkbData = null;
+                    object[] llObjects = { lightValue, hkbData };
+                    lightLevel = llObjects;
+                }
+                else
+                {
+                    //set with old method
+                    object[] llObjects = { lightValue };
+                    lightLevel = llObjects;
+                }
+                var output = (UInt32)setKeyboardBackLightStatusInfo.Invoke(KCInstance, lightLevel);
+            }
+            catch (Exception e)
+            {
+                const string error = "Unable to load Keyboard_Core.dll. Service will stop.";
+                EventLog.WriteEntry("LenovoBacklightControl", error, EventLogEntryType.Error, 50917);
+                LenovoBacklightControl.WriteToDebugLog(error);
+                LenovoBacklightControl.LBCServiceBase.Stop();
+            }
         }
 
         private Assembly Keyboard_Core;

diff --git a/LBCService/LBCService.csproj b/LBCService/LBCService.csproj
@@ -8,10 +8,11 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>LBCService</RootNamespace>
     <AssemblyName>LBCService</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/LBCService/LenovoBacklightControl.cs b/LBCService/LenovoBacklightControl.cs
@@ -21,6 +21,8 @@ public partial class LenovoBacklightControl : ServiceBase
 
         public LenovoBacklightControl()
         {
+            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
+
             InitializeComponent();
             DebugMode();
             DebugLogPath = AppDomain.CurrentDomain.BaseDirectory + "DebugLog.txt";
@@ -127,5 +129,11 @@ protected override void OnStop()
             NamedPipeThread.Join();
             WriteToDebugLog("Stop complete.");
         }
+
+        static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
+            // Log the exception, display it, etc
+            Debug.WriteLine((e.ExceptionObject as Exception).Message);
+        }
     }
 }