Skip to content

Commit

Permalink
Updated version and NtApiDotNet to v1.1.27.
Browse files Browse the repository at this point in the history
  • Loading branch information
tyranid committed Feb 11, 2020
1 parent 47f6992 commit 340eedd
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 32 deletions.
2 changes: 1 addition & 1 deletion OleViewDotNet.Main/OleViewDotNet.Main.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<Private>True</Private>
</Reference>
<Reference Include="NtApiDotNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NtApiDotNet.1.1.26\lib\net45\NtApiDotNet.dll</HintPath>
<HintPath>..\packages\NtApiDotNet.1.1.27\lib\net45\NtApiDotNet.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Expand Down
2 changes: 1 addition & 1 deletion OleViewDotNet.Main/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.9")]
[assembly: AssemblyInformationalVersion("1.10")]
2 changes: 1 addition & 1 deletion OleViewDotNet.Main/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<package id="DockPanelSuite" version="3.0.6" targetFramework="net46" />
<package id="ICSharpCode.TextEditor" version="3.2.1.6466" targetFramework="net40-Client" />
<package id="NDesk.Options" version="0.2.1" targetFramework="net40-client" />
<package id="NtApiDotNet" version="1.1.26" targetFramework="net46" />
<package id="NtApiDotNet" version="1.1.27" targetFramework="net46" />
</packages>
2 changes: 1 addition & 1 deletion OleViewDotNet.PowerShell/OleViewDotNet.PowerShell.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="NtApiDotNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NtApiDotNet.1.1.26\lib\net45\NtApiDotNet.dll</HintPath>
<HintPath>..\packages\NtApiDotNet.1.1.27\lib\net45\NtApiDotNet.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
11 changes: 4 additions & 7 deletions OleViewDotNet.PowerShell/OleViewDotNet.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
RootModule = 'OleViewDotNet.psm1'

# Version number of this module.
ModuleVersion = '1.9'
ModuleVersion = '1.10'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand All @@ -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'
Expand Down Expand Up @@ -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
Expand Down
38 changes: 19 additions & 19 deletions OleViewDotNet.PowerShell/OleViewDotNet.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -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
}
}
Expand Down Expand Up @@ -2880,29 +2880,29 @@ 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,
[parameter(Mandatory, ParameterSetName = "FromInts")]
[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
}
}
}
}
}
2 changes: 1 addition & 1 deletion OleViewDotNet.PowerShell/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.9")]
[assembly: AssemblyInformationalVersion("1.10")]
2 changes: 1 addition & 1 deletion OleViewDotNet.PowerShell/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NtApiDotNet" version="1.1.26" targetFramework="net46" />
<package id="NtApiDotNet" version="1.1.27" targetFramework="net46" />
</packages>

0 comments on commit 340eedd

Please sign in to comment.