From 4248689d755ef2c8a72b3cd4e2ad0cfa0c3a1d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=B6ller?= <mmoeller@openhardwaremonitor.org>
Date: Mon, 22 Feb 2010 20:54:49 +0000
Subject: [PATCH] NVAPI interop struct packing improved.

---
 Hardware/Nvidia/NVAPI.cs   | 12 ++++++------
 Properties/AssemblyInfo.cs |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Hardware/Nvidia/NVAPI.cs b/Hardware/Nvidia/NVAPI.cs
index 9f31088..a45c561 100644
--- a/Hardware/Nvidia/NVAPI.cs
+++ b/Hardware/Nvidia/NVAPI.cs
@@ -122,7 +122,7 @@ namespace OpenHardwareMonitor.Hardware.Nvidia {
     UNKNOWN = -1
   };
 
-  [StructLayout(LayoutKind.Sequential, Pack = 1)]
+  [StructLayout(LayoutKind.Sequential, Pack = 8)]
   public struct NvSensor {
     public NvThermalController Controller;
     public int DefaultMinTemp;
@@ -131,7 +131,7 @@ namespace OpenHardwareMonitor.Hardware.Nvidia {
     public NvThermalTarget Target;     
   }
 
-  [StructLayout(LayoutKind.Sequential, Pack = 1)]
+  [StructLayout(LayoutKind.Sequential, Pack = 8)]
   public struct NvGPUThermalSettings {
     public int Version;
     public int Count;
@@ -140,14 +140,14 @@ namespace OpenHardwareMonitor.Hardware.Nvidia {
     public NvSensor[] Sensor;
   }
 
-  [StructLayout(LayoutKind.Sequential, Pack = 1)]
+  [StructLayout(LayoutKind.Sequential)]
   public struct NvDisplayHandle {
-    private int handle;
+    private IntPtr ptr;
   }
 
-  [StructLayout(LayoutKind.Sequential, Pack = 1)]
+  [StructLayout(LayoutKind.Sequential)]
   public struct NvPhysicalGpuHandle {
-    private int handle;
+    private IntPtr ptr;
   }
 
   public class NVAPI {
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index c055159..8a5f86c 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -69,5 +69,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.23.1")]
-[assembly: AssemblyFileVersion("0.1.23.1")]
+[assembly: AssemblyVersion("0.1.23.2")]
+[assembly: AssemblyFileVersion("0.1.23.2")]