Skip to content

Commit e2878b1

Browse files
CodingWondersCodingWonders
authored
Merge pull request #30 from CodingWonders/dt_preview
DISMTools 0.3.1
2 parents 04f8628 + 4c0f1e4 commit e2878b1

File tree

73 files changed

+14271
-2173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+14271
-2173
lines changed

‎7z/README.MD‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# 7-Zip executables
2+
3+
To fix the 7-Zip issue spotted by [abbodi1406](https://github.com/abbodi1406/) on the MDL forums, DISMTools 0.3.1 includes both the x64 and x86 versions of `7z.exe` and `7z.dll`.
4+
5+
7-Zip comes with a license, which you can read either [here](https://7-zip.org/license.txt) or in the Licenses section of the About dialog.
6+
7+
Some components used by 7-Zip come with different licenses, which are mentioned in the aforementioned ways to view the license file.

‎7z/amd64/7z.dll‎

1.76 MB
Binary file not shown.

‎7z/amd64/7z.exe‎

544 KB
Binary file not shown.

‎7z/i386/7z.dll‎

1.19 MB
Binary file not shown.

‎7z/i386/7z.exe‎

336 KB
Binary file not shown.

‎DISMTools.vbproj‎

Lines changed: 74 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
<Compile Include="Actions\Validation\Actions.Validation.vb">
132132
<SubType>Form</SubType>
133133
</Compile>
134+
<Compile Include="Elements\AppxPackage.vb" />
134135
<Compile Include="Help\Help_RegisteredAppxPkgsDlg.Designer.vb">
135136
<DependentUpon>Help_RegisteredAppxPkgsDlg.vb</DependentUpon>
136137
</Compile>
@@ -159,6 +160,18 @@
159160
<DependentUpon>Settings.settings</DependentUpon>
160161
<DesignTimeSharedInput>True</DesignTimeSharedInput>
161162
</Compile>
163+
<Compile Include="Panels\ConfigLists\AddListEntryDlg.Designer.vb">
164+
<DependentUpon>AddListEntryDlg.vb</DependentUpon>
165+
</Compile>
166+
<Compile Include="Panels\ConfigLists\AddListEntryDlg.vb">
167+
<SubType>Form</SubType>
168+
</Compile>
169+
<Compile Include="Panels\ConfigLists\WimScriptEditor.Designer.vb">
170+
<DependentUpon>WimScriptEditor.vb</DependentUpon>
171+
</Compile>
172+
<Compile Include="Panels\ConfigLists\WimScriptEditor.vb">
173+
<SubType>Form</SubType>
174+
</Compile>
162175
<Compile Include="Panels\DoWork\ProgressPanel.Designer.vb">
163176
<DependentUpon>ProgressPanel.vb</DependentUpon>
164177
</Compile>
@@ -213,6 +226,30 @@
213226
<Compile Include="Panels\FirstUse\PrgSetup.vb">
214227
<SubType>Form</SubType>
215228
</Compile>
229+
<Compile Include="Panels\Get_Ops\AppxPkgs\GetAppxPkgInfo.Designer.vb">
230+
<DependentUpon>GetAppxPkgInfo.vb</DependentUpon>
231+
</Compile>
232+
<Compile Include="Panels\Get_Ops\AppxPkgs\GetAppxPkgInfo.vb">
233+
<SubType>Form</SubType>
234+
</Compile>
235+
<Compile Include="Panels\Get_Ops\Capabilities\GetCapabilityInfo.Designer.vb">
236+
<DependentUpon>GetCapabilityInfo.vb</DependentUpon>
237+
</Compile>
238+
<Compile Include="Panels\Get_Ops\Capabilities\GetCapabilityInfo.vb">
239+
<SubType>Form</SubType>
240+
</Compile>
241+
<Compile Include="Panels\Get_Ops\Drivers\GetDriverInfo.Designer.vb">
242+
<DependentUpon>GetDriverInfo.vb</DependentUpon>
243+
</Compile>
244+
<Compile Include="Panels\Get_Ops\Drivers\GetDriverInfo.vb">
245+
<SubType>Form</SubType>
246+
</Compile>
247+
<Compile Include="Panels\Get_Ops\Features\GetFeatureInfo.Designer.vb">
248+
<DependentUpon>GetFeatureInfo.vb</DependentUpon>
249+
</Compile>
250+
<Compile Include="Panels\Get_Ops\Features\GetFeatureInfo.vb">
251+
<SubType>Form</SubType>
252+
</Compile>
216253
<Compile Include="Panels\Get_Ops\GetImgInfoDlg.Designer.vb">
217254
<DependentUpon>GetImgInfoDlg.vb</DependentUpon>
218255
</Compile>
@@ -563,6 +600,12 @@
563600
<CustomToolNamespace>My.Resources</CustomToolNamespace>
564601
<SubType>Designer</SubType>
565602
</EmbeddedResource>
603+
<EmbeddedResource Include="Panels\ConfigLists\AddListEntryDlg.resx">
604+
<DependentUpon>AddListEntryDlg.vb</DependentUpon>
605+
</EmbeddedResource>
606+
<EmbeddedResource Include="Panels\ConfigLists\WimScriptEditor.resx">
607+
<DependentUpon>WimScriptEditor.vb</DependentUpon>
608+
</EmbeddedResource>
566609
<EmbeddedResource Include="Panels\DoWork\ProgressPanel.resx">
567610
<DependentUpon>ProgressPanel.vb</DependentUpon>
568611
</EmbeddedResource>
@@ -590,6 +633,18 @@
590633
<EmbeddedResource Include="Panels\FirstUse\PrgSetup.resx">
591634
<DependentUpon>PrgSetup.vb</DependentUpon>
592635
</EmbeddedResource>
636+
<EmbeddedResource Include="Panels\Get_Ops\AppxPkgs\GetAppxPkgInfo.resx">
637+
<DependentUpon>GetAppxPkgInfo.vb</DependentUpon>
638+
</EmbeddedResource>
639+
<EmbeddedResource Include="Panels\Get_Ops\Capabilities\GetCapabilityInfo.resx">
640+
<DependentUpon>GetCapabilityInfo.vb</DependentUpon>
641+
</EmbeddedResource>
642+
<EmbeddedResource Include="Panels\Get_Ops\Drivers\GetDriverInfo.resx">
643+
<DependentUpon>GetDriverInfo.vb</DependentUpon>
644+
</EmbeddedResource>
645+
<EmbeddedResource Include="Panels\Get_Ops\Features\GetFeatureInfo.resx">
646+
<DependentUpon>GetFeatureInfo.vb</DependentUpon>
647+
</EmbeddedResource>
593648
<EmbeddedResource Include="Panels\Get_Ops\GetImgInfoDlg.resx">
594649
<DependentUpon>GetImgInfoDlg.vb</DependentUpon>
595650
</EmbeddedResource>
@@ -856,6 +911,10 @@
856911
<None Include="Resources\icons8_code_32px.png" />
857912
</ItemGroup>
858913
<ItemGroup>
914+
<Content Include="7z\amd64\7z.dll" />
915+
<Content Include="7z\amd64\7z.exe" />
916+
<Content Include="7z\i386\7z.dll" />
917+
<Content Include="7z\i386\7z.exe" />
859918
<Content Include="Installer\dt.iss" />
860919
<Content Include="Installer\ISCC.exe" />
861920
<Content Include="Installer\ISCmplr.dll" />
@@ -876,6 +935,18 @@
876935
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
877936
</None>
878937
<None Include="Resources\startup\dt_branding.png" />
938+
<None Include="Resources\get_drv_info.png" />
939+
<None Include="Resources\drv_info_from_image.png" />
940+
<None Include="Resources\info_from_drv_file.png" />
941+
<None Include="Resources\next_element.png" />
942+
<None Include="Resources\next_element_dark.png" />
943+
<None Include="Resources\prev_element.png" />
944+
<None Include="Resources\prev_element_dark.png" />
945+
<None Include="Resources\jumpto_dark.png" />
946+
<None Include="Resources\jumpto.png" />
947+
<None Include="Resources\pkg_info_from_image.png" />
948+
<None Include="Resources\info_from_pkg_file.png" />
949+
<None Include="Resources\get_appxpkg_info.png" />
879950
<Content Include="ThemeVS2012\Resources\Dockindicator_PaneDiamond_Hotspot.png" />
880951
<Content Include="ThemeVS2012\Resources\DockIndicator_PaneDiamond_HotspotIndex.png" />
881952
<Content Include="ThemeVS2012\Resources\MaskArrowBottom.png" />
@@ -1189,9 +1260,9 @@ IF NOT EXIST bin (
11891260
) ELSE (
11901261
echo A bin folder already exists
11911262
)
1192-
IF EXIST "\Program Files\7-Zip" (
1193-
COPY "\Program Files\7-Zip\7z.exe" $(TargetDir)bin\utils\7z.exe
1194-
COPY "\Program Files\7-Zip\7z.dll" $(TargetDir)bin\utils\7z.dll
1263+
IF EXIST "$(SolutionDir)7z" (
1264+
XCOPY "$(SolutionDir)7z\amd64\*" "$(TargetDir)bin\utils\x64" /cehyi
1265+
XCOPY "$(SolutionDir)7z\i386\*" "$(TargetDir)bin\utils\x86" /cehyi
11951266
)
11961267
IF NOT EXIST logs (
11971268
md logs

‎Elements/AppxPackage.vb‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
Imports System.Xml.Serialization
2+
3+
Namespace Elements
4+
5+
''' <summary>
6+
''' Class for AppX package files
7+
''' </summary>
8+
''' <remarks></remarks>
9+
<Serializable(), XmlRoot("Identity")>
10+
Public Class AppxPackage
11+
''' <summary>
12+
''' The package file, in APPX, MSIX, APPXBUNDLE, or MSIXBUNDLE format
13+
''' </summary>
14+
''' <remarks></remarks>
15+
Public Property PackageFile As String
16+
17+
''' <summary>
18+
''' The name of the AppX package
19+
''' </summary>
20+
''' <remarks></remarks>
21+
<XmlAttribute("Name")>
22+
Public Property PackageName As String
23+
24+
''' <summary>
25+
''' The publisher of the application, usually in "CN=..., O=..., L=..., S=..., C=..." or in "CN=..." forms
26+
''' </summary>
27+
''' <remarks></remarks>
28+
<XmlAttribute("Publisher")>
29+
Public Property PackagePublisher As String
30+
31+
''' <summary>
32+
''' The version string of the application
33+
''' </summary>
34+
''' <remarks></remarks>
35+
<XmlAttribute("Version")>
36+
Public Property PackageVersion As String
37+
38+
<XmlAttribute("ProcessorArchitecture")>
39+
Public Property PackageArchitecture As String
40+
41+
''' <summary>
42+
''' The dependencies required by the application and specified in its manifest file
43+
''' </summary>
44+
''' <remarks></remarks>
45+
Public Property PackageRequiredDependencies As New List(Of AppxDependency)
46+
47+
''' <summary>
48+
''' The dependency packages specified by the user
49+
''' </summary>
50+
''' <remarks></remarks>
51+
Public Property PackageSpecifiedDependencies As New List(Of AppxDependency)
52+
53+
Public Property PackageLicenseFile As String
54+
55+
Public Property PackageCustomDataFile As String
56+
57+
Public Property PackageRegions As String
58+
End Class
59+
60+
''' <summary>
61+
''' Class for AppX package dependency files
62+
''' </summary>
63+
''' <remarks></remarks>
64+
<Serializable(), XmlRoot("Dependencies")>
65+
Public Class AppxDependency
66+
67+
''' <summary>
68+
''' The dependency file specified by the user
69+
''' </summary>
70+
''' <remarks></remarks>
71+
Public Property DependencyFile As String
72+
73+
''' <summary>
74+
''' The name of the AppX dependency
75+
''' </summary>
76+
''' <remarks></remarks>
77+
Public Property DependencyName As String
78+
79+
''' <summary>
80+
''' The version of the AppX dependency
81+
''' </summary>
82+
''' <remarks></remarks>
83+
Public Property DependencyVersion As String
84+
End Class
85+
End Namespace
86+

‎Helpers/dthelper.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
:: DISMTools Helper Script - version 0.3
1+
:: DISMTools Helper Script - version 0.3.1
22
@echo off
33

44

55
:init
66
:: Set initial vars
7-
set script_ver=v0.3
7+
set script_ver=v0.3.1
88
set outputmode=0
99
:: outputmode=0 (output to file)
1010
:: 1 (output to console)

‎Helpers/extps1/extappx.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DISMTools 0.3 - Extended AppX package getter for online installations
1+
# DISMTools 0.3.1 - Extended AppX package getter for online installations
22

33
Import-Module Appx
44

‎Helpers/extps1/mImgMgr.ps1‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# .'^""""""^.
33
# '^`'. '^"""""""^.
44
# .^"""""`' .^"""""""^. ------------------------------------------------------
5-
# .^""""""` ^"""""""` | DISMTools 0.3 |
5+
# .^""""""` ^"""""""` | DISMTools 0.3.1 |
66
# ."""""""^. `""""""""' `,` | Open-source Windows image management, evolved |
77
# '`""""""`. """""""""^ `,,," ------------------------------------------------------
88
# '^"""""`. ^""""""""""'. .`,,,,,^ | Mounted image manager (CLI version) |
@@ -29,12 +29,22 @@
2929
# Detect PS version first, as some parameters require PowerShell 5 or newer
3030
if ($PSVersionTable.PSVersion.Major -lt 5)
3131
{
32-
Write-Host "You need to run this script in PowerShell 5 or newer. Press ENTER to continue..."
32+
Write-Host "You need to run this script in PowerShell 5 or newer. Press ENTER to exit..."
3333
Read-Host | Out-Null
3434
$host.UI.RawUI.WindowTitle = "DISMTools Command Console"
3535
exit 1
3636
}
3737

38+
# Detect if admin privileges are present, and stop the script from running any further if they aren't present
39+
if (([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator) -eq $false)
40+
{
41+
Write-Host "This script must be run with administrative privileges. Press ENTER to exit..."
42+
Read-Host | Out-Null
43+
$host.UI.RawUI.WindowTitle = "DISMTools Command Console"
44+
exit 1
45+
}
46+
47+
3848
# Import the DISM module
3949
Import-Module Dism
4050

@@ -45,7 +55,7 @@ $global:selImage = 0
4555
$global:imgInfo = ''
4656
$newImg = 0
4757
$selImgPath = ''
48-
$ver = '0.3'
58+
$ver = '0.3.1'
4959
$global:img_removalIndexes = New-Object System.Collections.ArrayList
5060
$global:img_remIndexesBck = New-Object System.Collections.ArrayList
5161

0 commit comments

Comments
 (0)