diff --git a/ioctlpus.sln b/ioctlpus.sln
index 2b41a47..5f26205 100644
--- a/ioctlpus.sln
+++ b/ioctlpus.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2042
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31605.320
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ioctlpus", "ioctlpus\ioctlpus.csproj", "{D1B74F9A-055F-4D4F-8649-3991C041838B}"
EndProject
diff --git a/ioctlpus/AboutForm.cs b/ioctlpus/AboutForm.cs
index 04c77a4..4e553fd 100644
--- a/ioctlpus/AboutForm.cs
+++ b/ioctlpus/AboutForm.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
using System.Windows.Forms;
namespace ioctlpus
diff --git a/ioctlpus/FodyWeavers.xml b/ioctlpus/FodyWeavers.xml
deleted file mode 100644
index 633e853..0000000
--- a/ioctlpus/FodyWeavers.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/ioctlpus/MainForm.cs b/ioctlpus/MainForm.cs
index 7c09479..8a123b1 100644
--- a/ioctlpus/MainForm.cs
+++ b/ioctlpus/MainForm.cs
@@ -3,13 +3,12 @@
using Microsoft.Win32.SafeHandles;
using System;
using System.Collections.Generic;
+using System.Drawing;
using System.IO;
-using System.Linq;
using System.Runtime.InteropServices;
using System.Windows.Forms;
-using static ioctlpus.Utilities.NativeMethods;
using static ioctlpus.Utilities.IOCTL;
-using System.Drawing;
+using static ioctlpus.Utilities.NativeMethods;
namespace ioctlpus
{
@@ -168,7 +167,7 @@ private void btnSend_Click(object sender, EventArgs e)
{
uint fa_mask = Convert.ToUInt32(tbAccessMask.Text, 16);
SafeFileHandle sfh = CreateFile(
- tbDevicePath.Text,
+ tbDevicePath.Text.Trim(),
(FileAccess)fa_mask,
FileShare.ReadWrite,
IntPtr.Zero,
@@ -178,13 +177,13 @@ private void btnSend_Click(object sender, EventArgs e)
int errorCode = 0;
- uint ioctl = Convert.ToUInt32(tbIOCTL.Text, 16);
+ uint ioctl = Convert.ToUInt32(tbIOCTL.Text.Trim(), 16);
uint returnedBytes = 0;
uint inputSize = (uint)nudInputSize.Value;
uint outputSize = (uint)nudOutputSize.Value;
byte[] outputBuffer = new byte[outputSize];
byte[] inputBuffer = new byte[inputSize];
-
+
if (sfh.IsInvalid)
{
diff --git a/ioctlpus/Program.cs b/ioctlpus/Program.cs
index c99d9cc..dcb623c 100644
--- a/ioctlpus/Program.cs
+++ b/ioctlpus/Program.cs
@@ -1,17 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Diagnostics;
-using CommandLine;
-using static ioctlpus.Utilities.NativeMethods;
-using static ioctlpus.Utilities.IOCTL;
+using CommandLine;
using Microsoft.Win32.SafeHandles;
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
-using System.Text;
-using System.ComponentModel;
+using System.Windows.Forms;
+using static ioctlpus.Utilities.NativeMethods;
namespace ioctlpus
{
@@ -32,7 +27,7 @@ public static byte[] StringToByteArray(string hex)
public static string ByteArrayToString(byte[] ba)
{
- string hex = "0x"+BitConverter.ToString(ba).Replace("-", " 0x");
+ string hex = "0x" + BitConverter.ToString(ba).Replace("-", " 0x");
return hex;
}
@@ -44,7 +39,7 @@ class Options
[Option("guid", HelpText = "Path/GUID of the driver to interact with.", Default = null)]
public string Guid { get; set; }
-
+
[Option("ioctl", HelpText = "IOCTL code.", Default = null)]
public string Ioctl { get; set; }
@@ -53,7 +48,7 @@ class Options
[Option('o', "output-size", HelpText = "Output Size (decimal).", Default = 32)]
public int Output_size { get; set; }
-
+
[Option("input", HelpText = "Input buffer.", Default = null)]
public string Input_buffer { get; set; }
@@ -97,7 +92,7 @@ static void Main(string[] args)
// if we gathered every parameter we can proceed and perform the IOCTL request printing out the result
uint fa_mask = Convert.ToUInt32(opts.Access_mask, 16);
SafeFileHandle sfh = CreateFile(
- opts.Guid,
+ opts.Guid.Trim(),
(FileAccess)fa_mask,
FileShare.ReadWrite,
IntPtr.Zero,
@@ -107,7 +102,7 @@ static void Main(string[] args)
int errorCode = 0;
- uint ioctl = Convert.ToUInt32(opts.Ioctl, 16);
+ uint ioctl = Convert.ToUInt32(opts.Ioctl.Trim(), 16);
uint returnedBytes = 0;
uint inputSize = (uint)opts.Input_size;
uint outputSize = (uint)opts.Output_size;
diff --git a/ioctlpus/Properties/AssemblyInfo.cs b/ioctlpus/Properties/AssemblyInfo.cs
index 0f14e55..8f5c8f4 100644
--- a/ioctlpus/Properties/AssemblyInfo.cs
+++ b/ioctlpus/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
@@ -32,5 +31,5 @@
// 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.2.1.0")]
-[assembly: AssemblyFileVersion("0.2.1.0")]
+[assembly: AssemblyVersion("0.2.1.1")]
+[assembly: AssemblyFileVersion("0.2.1.1")]
diff --git a/ioctlpus/Request.cs b/ioctlpus/Request.cs
index 5562f95..8a30087 100644
--- a/ioctlpus/Request.cs
+++ b/ioctlpus/Request.cs
@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace ioctlpus
{
diff --git a/ioctlpus/Utilities.cs b/ioctlpus/Utilities.cs
index d378e9b..31e073d 100644
--- a/ioctlpus/Utilities.cs
+++ b/ioctlpus/Utilities.cs
@@ -1,12 +1,7 @@
using Microsoft.Win32.SafeHandles;
using System;
-using System.Collections.Generic;
using System.IO;
-using System.Linq;
using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace ioctlpus
{
@@ -67,7 +62,7 @@ public class NativeMethods
public const int EM_SETCUEBANNER = 0x1501;
[DllImport("user32.dll", CharSet = CharSet.Auto)]
- public static extern Int32 SendMessage(IntPtr hWnd, int msg, int wParam, [MarshalAs(UnmanagedType.LPWStr)]string lParam);
+ public static extern Int32 SendMessage(IntPtr hWnd, int msg, int wParam, [MarshalAs(UnmanagedType.LPWStr)] string lParam);
public const Int32 DIGCF_PRESENT = 2;
public const Int32 DIGCF_DEVICEINTERFACE = 0x10;
@@ -138,7 +133,7 @@ public static extern bool DeviceIoControl(
uint nOutBufferSize,
ref uint pBytesReturned,
IntPtr overlapped);
-
+
[DllImport("kernel32.dll")]
public static extern bool CloseHandle(SafeFileHandle hObject);
diff --git a/ioctlpus/ioctlpus.csproj b/ioctlpus/ioctlpus.csproj
index 1732ae4..0b75c5e 100644
--- a/ioctlpus/ioctlpus.csproj
+++ b/ioctlpus/ioctlpus.csproj
@@ -1,6 +1,5 @@
-
Debug
@@ -76,6 +75,16 @@
true
+
+ bin\x86\
+ TRACE
+ true
+ pdbonly
+ AnyCPU
+ 7.3
+ prompt
+ true
+
..\packages\Be.Windows.Forms.HexBox.1.6.1\lib\net40\Be.Windows.Forms.HexBox.dll
@@ -83,9 +92,6 @@
..\packages\CommandLineParser.2.8.0\lib\net45\CommandLine.dll
-
- ..\packages\Costura.Fody.5.3.0\lib\netstandard1.0\Costura.dll
-
..\packages\ObjectListView.2.7.1.5\lib\ListViewPrinter.dll
@@ -299,24 +305,16 @@
false
-
-
-
-
Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.
-
-
-
-