Merge pull request #14 from lonemeow/hook-version-check

Check for outdated hook DLL version.

.github/workflows/build.yaml

@@ -19,6 +19,9 @@ jobs:
                 submodules: 'true'
             - name: Setup MSBuild
               uses: microsoft/setup-msbuild@v2
+            - name: Update DLL version
+              run: |
+                client-hooks/makever.ps1 ${{ inputs.app_version }} client-hooks/version.h
             - name: Build app
               run: |
                 msbuild /t:publish /restore /p:PublishProfile=FolderProfile /property:Configuration=Release

client-gui/ACCHook.cs

@@ -95,6 +95,16 @@ public static bool IsHookInstalled(string accInstallPath) {
             return File.Exists(InstallPathToDllPath(accInstallPath));
         }
 
+        public static bool IsHookOutdated(string accInstallPath) {
+            if (IsHookInstalled(accInstallPath)) {
+                var myInfo = FileVersionInfo.GetVersionInfo(FindHookDLL());
+                var verInfo = FileVersionInfo.GetVersionInfo(InstallPathToDllPath(accInstallPath));
+                Trace.WriteLine($"Installed hook version: {verInfo.ProductVersion} my version {myInfo.ProductVersion}");
+                return myInfo.ProductVersion != verInfo.ProductVersion;
+            }
+            return false;
+        }
+
         private static string InstallPathToDllPath(string accInstallPath) {
             return Path.Join(accInstallPath, "AC2", "Binaries", "Win64", "hid.dll");
         }
@@ -107,7 +117,7 @@ public static void RemoveHook(string accInstallPath) {
 
         public static void InstallHook(string accInstallPath) {
             var dllPath = InstallPathToDllPath(accInstallPath);
-            File.Copy(FindHookDLL(), dllPath);
+            File.Copy(FindHookDLL(), dllPath, true);
             Trace.WriteLine($"Copied hook DLL to {dllPath}");
         }
     }

client-gui/MainWindow.cs

@@ -1,5 +1,4 @@
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
 using Win32;
@@ -20,6 +19,7 @@ protected override void OnLoad(EventArgs e) {
             User32.SetWindowLongPtr(Handle, User32.GWLP_USERDATA, Constants.TAG);
 
             base.OnLoad(e);
+            CheckHookVersion();
             UpdateHookButton();
         }
 
@@ -49,6 +49,31 @@ protected override void WndProc(ref Message m) {
             }
         }
 
+        private void CheckHookVersion() {
+            if (ACCHook.IsHookOutdated(settings.AccInstallPath)) {
+                var msg = """
+                    Hook from a different version of ACC Connector seems to be installed.
+                    Do you want to replace it with the hook from this version?
+                    """;
+                if (MessageBox.Show(msg, "ACC Connector", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes) {
+                    InstallHook();
+                }
+            }
+        }
+
+        private void InstallHook() {
+            if (ACCHook.IsACCRunning()) {
+                var message = """
+                        ACC seems to be running.
+                        The hook may fail to install, and even if it succceeds it won't take effect until you restart the game.
+                        """;
+                if (MessageBox.Show(message, "ACC Connector", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) == DialogResult.Cancel) {
+                    return;
+                }
+            }
+            ACCHook.InstallHook(settings.AccInstallPath);
+        }
+
         private void UpdateHookButton() {
             if (ACCHook.IsHookInstalled(settings.AccInstallPath)) {
                 hookButton.Text = "Remove\nhook";
@@ -70,6 +95,7 @@ private void SettingsButton_Click(object sender, EventArgs e) {
             if (settingsDialog.ShowDialog() == DialogResult.OK) {
                 settings = tempSettings;
                 Settings.Save(settings);
+                UpdateHookButton();
             }
         }
 
@@ -94,16 +120,7 @@ private void HookButton_Click(object sender, EventArgs e) {
             if (ACCHook.IsHookInstalled(settings.AccInstallPath)) {
                 ACCHook.RemoveHook(settings.AccInstallPath);
             } else {
-                if (ACCHook.IsACCRunning()) {
-                    var message = """
-                        ACC seems to be running.
-                        The hook may fail to install, and even if it succceeds it won't take effect until you restart the game.
-                        """;
-                    if (MessageBox.Show(message, "ACC Connector", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) == DialogResult.Cancel) {
-                        return;
-                    }
-                }
-                ACCHook.InstallHook(settings.AccInstallPath);
+                InstallHook();
             }
             UpdateHookButton();
         }

client-hooks/makever.ps1

@@ -0,0 +1,8 @@
+param($ver, $file)
+
+$major, $minor = $ver -split "\."
+
+@"
+#define VERSION_BIN $major,$minor,0,0
+#define VERSION_STR "$major.$minor.0.0"
+"@ | Out-File -Encoding ASCII $file

client-hooks/version.h

@@ -0,0 +1,2 @@
+#define VERSION_BIN 0,0,0,0
+#define VERSION_STR "0.0.0.0"