From 340eedd997c0b722df6585c861f32510e8678a66 Mon Sep 17 00:00:00 2001 From: James Forshaw Date: Mon, 10 Feb 2020 19:34:01 -0800 Subject: [PATCH] Updated version and NtApiDotNet to v1.1.27. --- OleViewDotNet.Main/OleViewDotNet.Main.csproj | 2 +- OleViewDotNet.Main/Properties/AssemblyInfo.cs | 2 +- OleViewDotNet.Main/packages.config | 2 +- .../OleViewDotNet.PowerShell.csproj | 2 +- OleViewDotNet.PowerShell/OleViewDotNet.psd1 | 11 ++---- OleViewDotNet.PowerShell/OleViewDotNet.psm1 | 38 +++++++++---------- .../Properties/AssemblyInfo.cs | 2 +- OleViewDotNet.PowerShell/packages.config | 2 +- 8 files changed, 29 insertions(+), 32 deletions(-) diff --git a/OleViewDotNet.Main/OleViewDotNet.Main.csproj b/OleViewDotNet.Main/OleViewDotNet.Main.csproj index 206cc457..099bfee8 100644 --- a/OleViewDotNet.Main/OleViewDotNet.Main.csproj +++ b/OleViewDotNet.Main/OleViewDotNet.Main.csproj @@ -75,7 +75,7 @@ True - ..\packages\NtApiDotNet.1.1.26\lib\net45\NtApiDotNet.dll + ..\packages\NtApiDotNet.1.1.27\lib\net45\NtApiDotNet.dll diff --git a/OleViewDotNet.Main/Properties/AssemblyInfo.cs b/OleViewDotNet.Main/Properties/AssemblyInfo.cs index ea47be2a..b9dfa877 100644 --- a/OleViewDotNet.Main/Properties/AssemblyInfo.cs +++ b/OleViewDotNet.Main/Properties/AssemblyInfo.cs @@ -16,4 +16,4 @@ [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.9")] +[assembly: AssemblyInformationalVersion("1.10")] diff --git a/OleViewDotNet.Main/packages.config b/OleViewDotNet.Main/packages.config index 082308d1..09e3de4f 100644 --- a/OleViewDotNet.Main/packages.config +++ b/OleViewDotNet.Main/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/OleViewDotNet.PowerShell/OleViewDotNet.PowerShell.csproj b/OleViewDotNet.PowerShell/OleViewDotNet.PowerShell.csproj index e73f6171..a3e03b4d 100644 --- a/OleViewDotNet.PowerShell/OleViewDotNet.PowerShell.csproj +++ b/OleViewDotNet.PowerShell/OleViewDotNet.PowerShell.csproj @@ -31,7 +31,7 @@ - ..\packages\NtApiDotNet.1.1.26\lib\net45\NtApiDotNet.dll + ..\packages\NtApiDotNet.1.1.27\lib\net45\NtApiDotNet.dll diff --git a/OleViewDotNet.PowerShell/OleViewDotNet.psd1 b/OleViewDotNet.PowerShell/OleViewDotNet.psd1 index 929906c4..f8de5411 100644 --- a/OleViewDotNet.PowerShell/OleViewDotNet.psd1 +++ b/OleViewDotNet.PowerShell/OleViewDotNet.psd1 @@ -20,7 +20,7 @@ RootModule = 'OleViewDotNet.psm1' # Version number of this module. -ModuleVersion = '1.9' +ModuleVersion = '1.10' # Supported PSEditions # CompatiblePSEditions = @() @@ -35,7 +35,7 @@ Author = 'James Forshaw' CompanyName = 'None' # Copyright statement for this module -Copyright = 'James Forshaw (c) 2018' +Copyright = 'James Forshaw (c) 2020' # Description of the functionality provided by this module Description = 'PowerShell module for OleViewDotNet' @@ -88,12 +88,9 @@ PrivateData = @{ ProjectUri = 'https://github.com/tyranid/oleviewdotnet' # ReleaseNotes of this module - ReleaseNotes = 'v1.9 + ReleaseNotes = 'v1.10 ---- -* Updated NtApiDotNet to v1.1.23. -* Create objref from bytes option. -* Bug fix for issue #15 -* Added Get-ComGuid function. +* Updated NtApiDotNet to v1.1.27. ' } # End of PSData hashtable diff --git a/OleViewDotNet.PowerShell/OleViewDotNet.psm1 b/OleViewDotNet.PowerShell/OleViewDotNet.psm1 index 207fe397..72f8f862 100644 --- a/OleViewDotNet.PowerShell/OleViewDotNet.psm1 +++ b/OleViewDotNet.PowerShell/OleViewDotNet.psm1 @@ -1325,7 +1325,7 @@ function Get-ComObjRef { [object]$Object, [Parameter(Mandatory, Position = 0, ParameterSetName = "FromPath")] [string]$Path, - [Parameter(Mandatory, Position = 0, ParameterSetName = "FromBytes")] + [Parameter(Mandatory, Position = 0, ParameterSetName = "FromBytes")] [byte[]]$Bytes, [ComObjRefOutput]$Output = "Object", [Parameter(ParameterSetName = "FromObject", ValueFromPipelineByPropertyName)] @@ -1354,7 +1354,7 @@ function Get-ComObjRef { $ba = Get-Content -Path $Path -Encoding Byte [OleViewDotNet.COMObjRef]::FromArray($ba) | Out-ObjRef -Output $Output } - "FromBytes" { + "FromBytes" { [OleViewDotNet.COMObjRef]::FromArray($Bytes) | Out-ObjRef -Output $Output } } @@ -2880,9 +2880,9 @@ None System.Guid #> function Get-ComGuid { - [CmdletBinding(DefaultParameterSetName="FromComGuid")] + [CmdletBinding(DefaultParameterSetName="FromComGuid")] Param( - [parameter(Mandatory, ParameterSetName = "FromComGuid", Position = 0, ValueFromPipeline)] + [parameter(Mandatory, ParameterSetName = "FromComGuid", Position = 0, ValueFromPipeline)] [OleViewDotNet.IComGuid[]]$ComGuid, [parameter(Mandatory, ParameterSetName = "FromBytes")] [byte[]]$Bytes, @@ -2890,19 +2890,19 @@ function Get-ComGuid { [int[]]$Ints ) - PROCESS { - switch($PSCmdlet.ParameterSetName) { - "FromBytes" { - [guid]::new($Bytes) | Write-Output - } - "FromInts" { - [OleViewDotNet.PowerShell.PowerShellUtils]::GuidFromInts($Ints) | Write-Output - } - "FromComGuid" { - foreach($obj in $Object) { - $Object.ComGuid | Write-Output - } - } - } - } + PROCESS { + switch($PSCmdlet.ParameterSetName) { + "FromBytes" { + [guid]::new($Bytes) | Write-Output + } + "FromInts" { + [OleViewDotNet.PowerShell.PowerShellUtils]::GuidFromInts($Ints) | Write-Output + } + "FromComGuid" { + foreach($obj in $Object) { + $Object.ComGuid | Write-Output + } + } + } + } } diff --git a/OleViewDotNet.PowerShell/Properties/AssemblyInfo.cs b/OleViewDotNet.PowerShell/Properties/AssemblyInfo.cs index 3ba5394c..fa116cc4 100644 --- a/OleViewDotNet.PowerShell/Properties/AssemblyInfo.cs +++ b/OleViewDotNet.PowerShell/Properties/AssemblyInfo.cs @@ -16,4 +16,4 @@ [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.9")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.10")] \ No newline at end of file diff --git a/OleViewDotNet.PowerShell/packages.config b/OleViewDotNet.PowerShell/packages.config index ea981dd0..ecbcf363 100644 --- a/OleViewDotNet.PowerShell/packages.config +++ b/OleViewDotNet.PowerShell/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file