[Mp-plugins-svn] SF.net SVN: mp-plugins: [1110] trunk/plugins/IR Server Suite/ IR Server Plugins

[<an...@us...>]

Revision: 1110
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1110&view=rev
Author:   and-81
Date:     2007-11-30 03:59:17 -0800 (Fri, 30 Nov 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs
    trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Configure.Designer.cs
    trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Configure.cs
    trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.cs

Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs	2007-11-30 11:09:23 UTC (rev 1109)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs	2007-11-30 11:59:17 UTC (rev 1110)
@@ -94,25 +94,25 @@
 
     #region Structures
 
-    [StructLayout(LayoutKind.Sequential)]
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct DeviceInfoData
     {
       public int Size;
       public Guid Class;
-      public uint DevInst;
+      public int DevInst;
       public IntPtr Reserved;
     }
 
-    [StructLayout(LayoutKind.Sequential)]
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct DeviceInterfaceData
     {
       public int Size;
       public Guid Class;
-      public uint Flags;
-      public uint Reserved;
+      public int Flags;
+      public IntPtr Reserved;
     }
 
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
     struct DeviceInterfaceDetailData
     {
       public int Size;
@@ -322,8 +322,12 @@
         }
 
         DeviceInterfaceDetailData deviceInterfaceDetailData = new DeviceInterfaceDetailData();
-        deviceInterfaceDetailData.Size = 5;
+        if (IntPtr.Size == 8)
+          deviceInterfaceDetailData.Size = 8;
+        else
+          deviceInterfaceDetailData.Size = 5;
 
+
         if (!SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, ref deviceInterfaceDetailData, cbData, IntPtr.Zero, IntPtr.Zero))
         {
           SetupDiDestroyDeviceInfoList(handle);

Modified: trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Configure.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Configure.Designer.cs	2007-11-30 11:09:23 UTC (rev 1109)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Configure.Designer.cs	2007-11-30 11:59:17 UTC (rev 1110)
@@ -1,4 +1,4 @@
-namespace SerialIRBlaster
+namespace RedEyeBlaster
 {
   partial class Configure
   {

Modified: trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Configure.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Configure.cs	2007-11-30 11:09:23 UTC (rev 1109)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/Configure.cs	2007-11-30 11:59:17 UTC (rev 1110)
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Windows.Forms;
 
-namespace SerialIRBlaster
+namespace RedEyeBlaster
 {
 
   partial class Configure : Form

Modified: trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.cs	2007-11-30 11:09:23 UTC (rev 1109)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.cs	2007-11-30 11:59:17 UTC (rev 1110)
@@ -50,9 +50,9 @@
 
     static readonly string[] Ports = new string[] { "Default" };
 
-    static const string BlastModeIRDA = "%";
-    static const string BlastModeRC5  = "&";
-    static const string BlastModeSky  = "$";
+    const string BlastModeIRDA = "%";
+    const string BlastModeRC5  = "&";
+    const string BlastModeSky  = "$";
 
     #endregion Constants
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.