From b442c6fadc5d58a83deee5694096bb211619942e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 15 Nov 2022 21:09:14 +0100
Subject: [PATCH] Move RTSSSharedMemoryNET to `CommonHelpers`

---
 CommonHelpers/CommonHelpers.csproj            |   9 ++++++
 CommonHelpers/OSDHelpers.cs                   |  26 ++++++++++++++++++
 .../RTSSSharedMemoryNET.dll                   | Bin
 PerformanceOverlay/PerformanceOverlay.csproj  |   5 +---
 PowerControl/PowerControl.csproj              |   5 +---
 5 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 CommonHelpers/OSDHelpers.cs
 rename {PerformanceOverlay => CommonHelpers}/RTSSSharedMemoryNET.dll (100%)

diff --git a/CommonHelpers/CommonHelpers.csproj b/CommonHelpers/CommonHelpers.csproj
index 19b440a..fa385ec 100644
--- a/CommonHelpers/CommonHelpers.csproj
+++ b/CommonHelpers/CommonHelpers.csproj
@@ -12,10 +12,19 @@
     <PackageReference Include="TaskScheduler" Version="2.10.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="RTSSSharedMemoryNET">
+      <HintPath>RTSSSharedMemoryNET.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="inpoutx64.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="RTSSSharedMemoryNET.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/CommonHelpers/OSDHelpers.cs b/CommonHelpers/OSDHelpers.cs
new file mode 100644
index 0000000..422675f
--- /dev/null
+++ b/CommonHelpers/OSDHelpers.cs
@@ -0,0 +1,26 @@
+using RTSSSharedMemoryNET;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CommonHelpers
+{
+    public static class OSDHelpers
+    {
+        public static uint OSDIndex(this OSD? osd)
+        {
+            if (osd is null)
+                return uint.MaxValue;
+
+            var osdSlot = typeof(OSD).GetField("m_osdSlot",
+                System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+            var value = osdSlot.GetValue(osd);
+            if (value is null)
+                return uint.MaxValue;
+
+            return (uint)value;
+        }
+    }
+}
diff --git a/PerformanceOverlay/RTSSSharedMemoryNET.dll b/CommonHelpers/RTSSSharedMemoryNET.dll
similarity index 100%
rename from PerformanceOverlay/RTSSSharedMemoryNET.dll
rename to CommonHelpers/RTSSSharedMemoryNET.dll
diff --git a/PerformanceOverlay/PerformanceOverlay.csproj b/PerformanceOverlay/PerformanceOverlay.csproj
index b88a21f..50d944e 100644
--- a/PerformanceOverlay/PerformanceOverlay.csproj
+++ b/PerformanceOverlay/PerformanceOverlay.csproj
@@ -33,7 +33,7 @@
 
   <ItemGroup>
     <Reference Include="RTSSSharedMemoryNET">
-      <HintPath>RTSSSharedMemoryNET.dll</HintPath>
+      <HintPath>..\CommonHelpers\RTSSSharedMemoryNET.dll</HintPath>
     </Reference>
   </ItemGroup>
 
@@ -58,9 +58,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="RTSSSharedMemoryNET.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/PowerControl/PowerControl.csproj b/PowerControl/PowerControl.csproj
index d07f1dd..00b420c 100644
--- a/PowerControl/PowerControl.csproj
+++ b/PowerControl/PowerControl.csproj
@@ -35,11 +35,8 @@
     <Reference Include="hidapi.net">
       <HintPath>hidapi.net.dll</HintPath>
     </Reference>
-    <Reference Include="neptune-hidapi.net">
-      <HintPath>NeptuneHid\neptune-hidapi.net.dll</HintPath>
-    </Reference>
     <Reference Include="RTSSSharedMemoryNET">
-      <HintPath>..\PerformanceOverlay\RTSSSharedMemoryNET.dll</HintPath>
+      <HintPath>..\CommonHelpers\RTSSSharedMemoryNET.dll</HintPath>
     </Reference>
   </ItemGroup>