From 698e77a00ef7533b0d35e91653e5cfa5a8071bb7 Mon Sep 17 00:00:00 2001 From: dahall Date: Thu, 30 Sep 2021 18:02:15 -0600 Subject: [PATCH 1/2] Converted projects to SDK style, rolled version to 1.1.0 and upgraded NuGet packages. --- OleViewDotNet.Main/COMSecurity.cs | 2 + OleViewDotNet.Main/OleViewDotNet.Main.csproj | 559 +++--------------- OleViewDotNet.Main/Properties/AssemblyInfo.cs | 6 +- .../OleViewDotNet.PowerShell.csproj | 63 +- .../Properties/AssemblyInfo.cs | 8 +- OleViewDotNet/OleViewDotNet.csproj | 121 +--- OleViewDotNet/Properties/AssemblyInfo.cs | 6 +- 7 files changed, 102 insertions(+), 663 deletions(-) diff --git a/OleViewDotNet.Main/COMSecurity.cs b/OleViewDotNet.Main/COMSecurity.cs index 7a8b19e0..7a61afa8 100644 --- a/OleViewDotNet.Main/COMSecurity.cs +++ b/OleViewDotNet.Main/COMSecurity.cs @@ -49,11 +49,13 @@ public static void ViewSecurity(COMRegistry registry, string name, string sddl, SecurityDescriptor sd = new SecurityDescriptor(sddl); AccessMask valid_access = access ? 0x7 : 0x1F; +#pragma warning disable CA1416 // Validate platform compatibility SecurityDescriptorViewerControl control = new SecurityDescriptorViewerControl(); EntryPoint.GetMainForm(registry).HostControl(control, name); control.SetSecurityDescriptor(sd, typeof(COMAccessRights), new GenericMapping() { GenericExecute = valid_access, GenericRead = valid_access, GenericWrite = valid_access, GenericAll = valid_access }, valid_access); +#pragma warning restore CA1416 // Validate platform compatibility } } diff --git a/OleViewDotNet.Main/OleViewDotNet.Main.csproj b/OleViewDotNet.Main/OleViewDotNet.Main.csproj index 7959a684..55836106 100644 --- a/OleViewDotNet.Main/OleViewDotNet.Main.csproj +++ b/OleViewDotNet.Main/OleViewDotNet.Main.csproj @@ -1,24 +1,10 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {81F5C6AA-AC60-4F6E-9467-426997BB9D80} + net48 Library - Properties OleViewDotNet - OleViewDotNet.Main - v4.6 - 512 oleview.ico false - - - - - 3.5 publish\ true Disk @@ -30,601 +16,190 @@ false true 0 - 1.0.0.%2a + 1.1.0 false true - - + false + true + true - - - - - true - bin\Debug\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - false - false - false - - - ..\bin\Release\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - false - - .\Be.Windows.Forms.HexBox.dll - - ..\packages\ICSharpCode.TextEditor.3.2.1.6466\lib\Net20\ICSharpCode.TextEditor.dll - - - - ..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll - True - - - ..\packages\NtApiDotNet.1.1.28\lib\net45\NtApiDotNet.dll - - - - - - - - - - ..\packages\DockPanelSuite.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.dll - - - - Form - - - AboutForm.cs - - - - - Form - - - TextAreaInputForm.cs - - - - - - Form - - - BuildMonikerForm.cs - - - - - - - - - - - - - - - - Form - - - SettingsForm.cs - - + UserControl - - CustomMarshalEditorControl.cs - - - Form - - - DiffRegistryForm.cs - - + UserControl - - ElevatedFactoryServerTypeViewer.cs - - + UserControl - - SelectProcessControl.cs - - - Form - - - SelectProcessForm.cs - - - Form - - - SelectSecurityCheckForm.cs - - + UserControl - - MarshalEditorControl.cs - - + UserControl - - ObjectHexEditor.cs - - - Form - - - QueryInterfacesOptionsForm.cs - - - + UserControl - - RegistryPropertiesControl.cs - - + UserControl - - StandardMarshalEditorControl.cs - - - + UserControl - - StorageViewer.cs - - + UserControl - - ViewFilterControl.cs - - - Form - - - ViewFilterForm.cs - - - + UserControl - - ClassFactoryTypeViewer.cs - - - - - - - - - - - Form - - - CreateCLSIDForm.cs - - - Form - - - DocumentForm.cs - - + UserControl - - HexEditorControl.cs - - + Component - - - - - + UserControl - - COMRegistryViewer.cs - - - - - Form - - - CreateIStreamForm.cs - - - Form - - - GetTextForm.cs - - - Form - - - GetTypeForm.cs - - - - - Form - - - InvokeForm.cs - - - - Form - - - WaitingDialog.cs - - - Form - - - MainForm.cs - - + UserControl - - ObjectContainer.cs - - + UserControl - - PersistStreamTypeViewer.cs - - + UserControl - - PropertiesControl.cs - - - - + UserControl - - TypedObjectViewer.cs - - + UserControl - - ObjectInformation.cs - - - - + UserControl - - TypeLibControl.cs - - - AboutForm.cs - - - BuildMonikerForm.cs - - - ClassFactoryTypeViewer.cs - - - COMRegistryViewer.cs - - - SettingsForm.cs - - - CreateCLSIDForm.cs - - - CreateIStreamForm.cs - - - CustomMarshalEditorControl.cs - - - DiffRegistryForm.cs - - - DocumentForm.cs - - - ElevatedFactoryServerTypeViewer.cs - - - SelectProcessControl.cs - - - SelectProcessForm.cs - - - SelectSecurityCheckForm.cs - - - GetTextForm.cs - - - GetTypeForm.cs - - - HexEditorControl.cs - - - InvokeForm.cs - - - MarshalEditorControl.cs - - - ObjectHexEditor.cs - - - QueryInterfacesOptionsForm.cs - - - RegistryPropertiesControl.cs - - - StandardMarshalEditorControl.cs - - - StorageViewer.cs - - - TextAreaInputForm.cs - - - ViewFilterControl.cs - - - ViewFilterForm.cs - - - WaitingDialog.cs - - - MainForm.cs - - - ObjectContainer.cs - - - PersistStreamTypeViewer.cs - - - PropertiesControl.cs - - - TypedObjectViewer.cs - - - ObjectInformation.cs - - - ROTViewer.cs - - - TypeLibControl.cs - - - Designer - - - Designer - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - + UserControl - - ROTViewer.cs - - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Microsoft Visual Basic PowerPacks 10.0 - true - + - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/OleViewDotNet.Main/Properties/AssemblyInfo.cs b/OleViewDotNet.Main/Properties/AssemblyInfo.cs index 5b72bd00..7db169e2 100644 --- a/OleViewDotNet.Main/Properties/AssemblyInfo.cs +++ b/OleViewDotNet.Main/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany(".")] [assembly: AssemblyProduct("OleViewDotNet")] -[assembly: AssemblyCopyright("Copyright © James Forshaw 2014-2018")] +[assembly: AssemblyCopyright("Copyright © James Forshaw 2014-2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -14,6 +14,6 @@ [assembly: Guid("42d50bbd-cbed-42c5-98c3-707174b413ac")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] [assembly: AssemblyInformationalVersion("1.11")] diff --git a/OleViewDotNet.PowerShell/OleViewDotNet.PowerShell.csproj b/OleViewDotNet.PowerShell/OleViewDotNet.PowerShell.csproj index 0da2266a..301dbbf3 100644 --- a/OleViewDotNet.PowerShell/OleViewDotNet.PowerShell.csproj +++ b/OleViewDotNet.PowerShell/OleViewDotNet.PowerShell.csproj @@ -1,41 +1,10 @@ - - - + - Debug - AnyCPU - {AE69DC09-EF09-455C-8779-3A705E5BE205} + net48 Library - Properties - OleViewDotNet.PowerShell - OleViewDotNet.PowerShell - v4.6 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\bin\Release\ - TRACE - prompt - 4 + false - - ..\packages\NtApiDotNet.1.1.28\lib\net45\NtApiDotNet.dll - - - - False ..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\WindowsPowerShell\3.0\System.Management.Automation.dll @@ -43,32 +12,24 @@ - - - - - + - - {81f5c6aa-ac60-4f6e-9467-426997bb9d80} - OleViewDotNet.Main - - - - + Always - + Always - + Always - - + Always - + + + + \ No newline at end of file diff --git a/OleViewDotNet.PowerShell/Properties/AssemblyInfo.cs b/OleViewDotNet.PowerShell/Properties/AssemblyInfo.cs index 60138f6c..78576d78 100644 --- a/OleViewDotNet.PowerShell/Properties/AssemblyInfo.cs +++ b/OleViewDotNet.PowerShell/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany(".")] [assembly: AssemblyProduct("OleViewDotNet")] -[assembly: AssemblyCopyright("Copyright © James Forshaw 2014-2018")] +[assembly: AssemblyCopyright("Copyright © James Forshaw 2014-2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -14,6 +14,6 @@ [assembly: Guid("ae69dc09-ef09-455c-8779-3a705e5be205")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.11")] \ No newline at end of file +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] +[assembly: AssemblyInformationalVersion("1.11")] diff --git a/OleViewDotNet/OleViewDotNet.csproj b/OleViewDotNet/OleViewDotNet.csproj index 8aca2a9e..b7e75452 100644 --- a/OleViewDotNet/OleViewDotNet.csproj +++ b/OleViewDotNet/OleViewDotNet.csproj @@ -1,125 +1,26 @@ - - - + - Debug - AnyCPU - {60072CB0-B13F-4578-9993-940265B6E156} + net48 WinExe - Properties - OleViewDotNet - OleViewDotNet - v4.6 - 512 - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - AnyCPU - pdbonly - true - ..\bin\Release\ - TRACE - prompt - 4 - false - - + false + true oleview.ico - - - app.manifest - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - ..\bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - - - - - - - - - - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - + Designer - - Designer - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - {81f5c6aa-ac60-4f6e-9467-426997bb9d80} - OleViewDotNet.Main - + - - - - - - + + + + + \ No newline at end of file diff --git a/OleViewDotNet/Properties/AssemblyInfo.cs b/OleViewDotNet/Properties/AssemblyInfo.cs index dfc2030a..95da1a51 100644 --- a/OleViewDotNet/Properties/AssemblyInfo.cs +++ b/OleViewDotNet/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany(".")] [assembly: AssemblyProduct("OleViewDotNet")] -[assembly: AssemblyCopyright("Copyright © James Forshaw 2014-2018")] +[assembly: AssemblyCopyright("Copyright © James Forshaw 2014-2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -14,6 +14,6 @@ [assembly: Guid("0861C14D-ED53-41A8-8063-C26C6D28B09D")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] [assembly: AssemblyInformationalVersion("1.7")] From 32350f60f05a17ff301caf998af61c4cf3db3ca3 Mon Sep 17 00:00:00 2001 From: dahall Date: Sat, 9 Oct 2021 10:08:20 -0600 Subject: [PATCH 2/2] Added VS2015 theme for more modern look --- OleViewDotNet.Main/Forms/MainForm.cs | 1 + OleViewDotNet.Main/OleViewDotNet.Main.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/OleViewDotNet.Main/Forms/MainForm.cs b/OleViewDotNet.Main/Forms/MainForm.cs index b97a993c..3ade37d4 100644 --- a/OleViewDotNet.Main/Forms/MainForm.cs +++ b/OleViewDotNet.Main/Forms/MainForm.cs @@ -73,6 +73,7 @@ public MainForm(COMRegistry registry) m_dockPanel.ActiveAutoHideContent = null; m_dockPanel.Dock = DockStyle.Fill; m_dockPanel.Name = "dockPanel"; + m_dockPanel.Theme = new VS2015LightTheme(); Controls.Add(m_dockPanel); m_dockPanel.BringToFront(); CreatePropertyGrid(true); diff --git a/OleViewDotNet.Main/OleViewDotNet.Main.csproj b/OleViewDotNet.Main/OleViewDotNet.Main.csproj index 55836106..7c9864e1 100644 --- a/OleViewDotNet.Main/OleViewDotNet.Main.csproj +++ b/OleViewDotNet.Main/OleViewDotNet.Main.csproj @@ -192,6 +192,7 @@ +