Skip to content

Commit d03157c

Browse files
committed
Moved out forms code into a separate assembly.
1 parent 5a035db commit d03157c

17 files changed

Lines changed: 773 additions & 667 deletions
File renamed without changes.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public void SetAcl(Acl acl, Type access_type, GenericMapping mapping, AccessMask
167167
{
168168
access = ace.Mask.ToMandatoryLabelPolicy().ToString();
169169
}
170-
else if (ace.Flags.HasFlagSet(AceFlags.InheritOnly))
170+
else if (ace.Flags.HasFlag(AceFlags.InheritOnly))
171171
{
172172
access = ace.Mask.ToSpecificAccess(access_type).ToString();
173173
}
@@ -261,7 +261,7 @@ private void listViewAcl_SelectedIndexChanged(object sender, EventArgs e)
261261
access_type = typeof(MandatoryLabelPolicy);
262262
valid_access = 0x7;
263263
}
264-
else if (ace.Flags.HasFlagSet(AceFlags.InheritOnly))
264+
else if (ace.Flags.HasFlag(AceFlags.InheritOnly))
265265
{
266266
mapped_mask = ace.Mask;
267267
generic_access_mask = true;
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{FD4CB5F2-24ED-4561-B0E1-BB397AE5C636}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<RootNamespace>NtApiDotNet.Forms</RootNamespace>
10+
<AssemblyName>NtApiDotNet.Forms</AssemblyName>
11+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<FileAlignment>512</FileAlignment>
13+
<Deterministic>true</Deterministic>
14+
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<DebugSymbols>true</DebugSymbols>
17+
<DebugType>full</DebugType>
18+
<Optimize>false</Optimize>
19+
<OutputPath>bin\Debug\</OutputPath>
20+
<DefineConstants>DEBUG;TRACE</DefineConstants>
21+
<ErrorReport>prompt</ErrorReport>
22+
<WarningLevel>4</WarningLevel>
23+
</PropertyGroup>
24+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25+
<DebugType>pdbonly</DebugType>
26+
<Optimize>true</Optimize>
27+
<OutputPath>bin\Release\</OutputPath>
28+
<DefineConstants>TRACE</DefineConstants>
29+
<ErrorReport>prompt</ErrorReport>
30+
<WarningLevel>4</WarningLevel>
31+
</PropertyGroup>
32+
<ItemGroup>
33+
<Reference Include="System" />
34+
<Reference Include="System.Core" />
35+
<Reference Include="Microsoft.CSharp" />
36+
<Reference Include="System.Drawing" />
37+
<Reference Include="System.Windows.Forms" />
38+
</ItemGroup>
39+
<ItemGroup>
40+
<Compile Include="AclViewerControl.cs">
41+
<SubType>UserControl</SubType>
42+
</Compile>
43+
<Compile Include="AclViewerControl.Designer.cs">
44+
<DependentUpon>AclViewerControl.cs</DependentUpon>
45+
</Compile>
46+
<Compile Include="Properties\AssemblyInfo.cs" />
47+
<Compile Include="SecurityDescriptorViewerControl.cs">
48+
<SubType>UserControl</SubType>
49+
</Compile>
50+
<Compile Include="SecurityDescriptorViewerControl.Designer.cs">
51+
<DependentUpon>SecurityDescriptorViewerControl.cs</DependentUpon>
52+
</Compile>
53+
<Compile Include="SecurityDescriptorViewerForm.cs">
54+
<SubType>Form</SubType>
55+
</Compile>
56+
<Compile Include="SecurityDescriptorViewerForm.Designer.cs">
57+
<DependentUpon>SecurityDescriptorViewerForm.cs</DependentUpon>
58+
</Compile>
59+
<Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
60+
</ItemGroup>
61+
<ItemGroup>
62+
<EmbeddedResource Include="AclViewerControl.resx">
63+
<DependentUpon>AclViewerControl.cs</DependentUpon>
64+
</EmbeddedResource>
65+
<EmbeddedResource Include="SecurityDescriptorViewerControl.resx">
66+
<DependentUpon>SecurityDescriptorViewerControl.cs</DependentUpon>
67+
</EmbeddedResource>
68+
<EmbeddedResource Include="SecurityDescriptorViewerForm.resx">
69+
<DependentUpon>SecurityDescriptorViewerForm.cs</DependentUpon>
70+
</EmbeddedResource>
71+
</ItemGroup>
72+
<ItemGroup>
73+
<ProjectReference Include="..\NtApiDotNet\NtApiDotNet.csproj">
74+
<Project>{6aeb5004-6093-4c23-aeae-911d64cacc58}</Project>
75+
<Name>NtApiDotNet</Name>
76+
</ProjectReference>
77+
</ItemGroup>
78+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
79+
</Project>
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("NtApiDotNet.Forms")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("Google Inc.")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("NtApiDotNet.Forms")]
13+
[assembly: AssemblyCopyright("Copyright © Google Inc. 2016-2020")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// The following GUID is for the ID of the typelib if this project is exposed to COM
23+
[assembly: Guid("fd4cb5f2-24ed-4561-b0e1-bb397ae5c636")]
24+
25+
// Version information for an assembly consists of the following four values:
26+
//
27+
// Major Version
28+
// Minor Version
29+
// Build Number
30+
// Revision
31+
//
32+
// You can specify all the values or you can default the Build and Revision Numbers
33+
// by using the '*' as shown below:
34+
// [assembly: AssemblyVersion("1.0.*")]
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.1.28.0")]
37+
[assembly: AssemblyInformationalVersion("1.1.28")]

NtApiDotNet/Forms/SecurityDescriptorViewerControl.Designer.cs renamed to NtApiDotNet.Forms/SecurityDescriptorViewerControl.Designer.cs

File renamed without changes.
File renamed without changes.

NtApiDotNet/Forms/SecurityDescriptorViewerControl.resx renamed to NtApiDotNet.Forms/SecurityDescriptorViewerControl.resx

File renamed without changes.

NtApiDotNet/Forms/SecurityDescriptorViewerForm.Designer.cs renamed to NtApiDotNet.Forms/SecurityDescriptorViewerForm.Designer.cs

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)