Skip to content

Commit bfa942d

Browse files
CodingWondersCodingWonders
committed
[Enhance] Add image edition tasks (part 2)
1 parent 89f1469 commit bfa942d

10 files changed

+675
-12
lines changed

‎DISMTools.vbproj

+18
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,12 @@
422422
<Compile Include="Panels\Get_Ops\WinPE\GetWinPESettings.vb">
423423
<SubType>Form</SubType>
424424
</Compile>
425+
<Compile Include="Panels\ImageTaskHeader.Designer.vb">
426+
<DependentUpon>ImageTaskHeader.vb</DependentUpon>
427+
</Compile>
428+
<Compile Include="Panels\ImageTaskHeader.vb">
429+
<SubType>UserControl</SubType>
430+
</Compile>
425431
<Compile Include="Panels\Img_Ops\ActiveInstAccessWarn.Designer.vb">
426432
<DependentUpon>ActiveInstAccessWarn.vb</DependentUpon>
427433
</Compile>
@@ -524,6 +530,12 @@
524530
<Compile Include="Panels\Img_Ops\Drivers\RemDrivers.vb">
525531
<SubType>Form</SubType>
526532
</Compile>
533+
<Compile Include="Panels\Img_Ops\Editions\SetProductKey.Designer.vb">
534+
<DependentUpon>SetProductKey.vb</DependentUpon>
535+
</Compile>
536+
<Compile Include="Panels\Img_Ops\Editions\SetProductKey.vb">
537+
<SubType>Form</SubType>
538+
</Compile>
527539
<Compile Include="Panels\Img_Ops\Features\DisableFeat.Designer.vb">
528540
<DependentUpon>DisableFeat.vb</DependentUpon>
529541
</Compile>
@@ -921,6 +933,9 @@
921933
<EmbeddedResource Include="Panels\Get_Ops\WinPE\GetWinPESettings.resx">
922934
<DependentUpon>GetWinPESettings.vb</DependentUpon>
923935
</EmbeddedResource>
936+
<EmbeddedResource Include="Panels\ImageTaskHeader.resx">
937+
<DependentUpon>ImageTaskHeader.vb</DependentUpon>
938+
</EmbeddedResource>
924939
<EmbeddedResource Include="Panels\Img_Ops\ActiveInstAccessWarn.resx">
925940
<DependentUpon>ActiveInstAccessWarn.vb</DependentUpon>
926941
</EmbeddedResource>
@@ -972,6 +987,9 @@
972987
<EmbeddedResource Include="Panels\Img_Ops\Drivers\RemDrivers.resx">
973988
<DependentUpon>RemDrivers.vb</DependentUpon>
974989
</EmbeddedResource>
990+
<EmbeddedResource Include="Panels\Img_Ops\Editions\SetProductKey.resx">
991+
<DependentUpon>SetProductKey.vb</DependentUpon>
992+
</EmbeddedResource>
975993
<EmbeddedResource Include="Panels\Img_Ops\Features\DisableFeat.resx">
976994
<DependentUpon>DisableFeat.vb</DependentUpon>
977995
</EmbeddedResource>

‎MainForm.resx

-12
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,6 @@
197197
/gfq1uDNCGhXRAAAAABJRU5ErkJggg==
198198
</value>
199199
</data>
200-
<metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
201-
<value>249, 17</value>
202-
</metadata>
203-
<metadata name="StatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
204-
<value>356, 17</value>
205-
</metadata>
206200
<data name="Button24.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
207201
<value>
208202
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAABJ1JREFUWEft
@@ -548,12 +542,6 @@
548542
<metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
549543
<value>727, 17</value>
550544
</metadata>
551-
<metadata name="prjTreeStatus.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
552-
<value>132, 17</value>
553-
</metadata>
554-
<metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
555-
<value>727, 17</value>
556-
</metadata>
557545
<data name="RefreshViewTSB.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
558546
<value>
559547
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

‎MainForm.vb

+19
Original file line numberDiff line numberDiff line change
@@ -19792,4 +19792,23 @@ Public Class MainForm
1979219792
If Not MountedImageDetectorBW.IsBusy Then Call MountedImageDetectorBW.RunWorkerAsync()
1979319793
WatcherTimer.Enabled = True
1979419794
End Sub
19795+
19796+
Private Sub SetProductKey_Click(sender As Object, e As EventArgs) Handles SetProductKey.Click
19797+
MountedImageDetectorBWRestarterTimer.Enabled = False
19798+
If MountedImageDetectorBW.IsBusy Then MountedImageDetectorBW.CancelAsync()
19799+
While MountedImageDetectorBW.IsBusy
19800+
Application.DoEvents()
19801+
Thread.Sleep(500)
19802+
End While
19803+
WatcherTimer.Enabled = False
19804+
If WatcherBW.IsBusy Then WatcherBW.CancelAsync()
19805+
While WatcherBW.IsBusy
19806+
Application.DoEvents()
19807+
Thread.Sleep(100)
19808+
End While
19809+
SetImageKey.ShowDialog()
19810+
DynaLog.LogMessage("Restarting mounted image detector...")
19811+
If Not MountedImageDetectorBW.IsBusy Then Call MountedImageDetectorBW.RunWorkerAsync()
19812+
WatcherTimer.Enabled = True
19813+
End Sub
1979519814
End Class

‎Panels/DoWork/ProgressPanel.vb

+33
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,9 @@ Public Class ProgressPanel
458458
Public capSuccessfulRemovals As Integer ' Number of successful capability removals
459459
Public capFailedRemovals As Integer ' Number of failed capability removals
460460

461+
' OperationNum: 72
462+
Public pkSetNewProductKey As String ' The new product key to set in the Windows image or installation
463+
461464
' OperationNum: 75
462465
Public drvAdditionPkgs(65535) As String ' Array used to store all drivers to add, whether they are in specified folders or not
463466
Public drvAdditionLastPkg As String ' Last driver package specified for addition
@@ -861,6 +864,8 @@ Public Class ProgressPanel
861864
AddCapabilities(targetImage)
862865
Case 68
863866
RemoveCapabilities(targetImage)
867+
Case 72
868+
SetImageProductKey(targetImage)
864869
Case 75
865870
AddDrivers(targetImage)
866871
Case 76
@@ -5018,6 +5023,34 @@ Public Class ProgressPanel
50185023

50195024
#End Region
50205025

5026+
#Region "Edition Management Tasks"
5027+
5028+
Private Sub SetImageProductKey(targetImage As String)
5029+
DynaLog.LogMessage("Preparing to set the product key...")
5030+
DynaLog.LogMessage("- New Product Key: " & pkSetNewProductKey)
5031+
allTasks.Text = "Setting the product key..."
5032+
currentTask.Text = "Setting the new product key..."
5033+
LogView.AppendText(CrLf & "Setting the new product key..." & CrLf &
5034+
"Options:" & CrLf &
5035+
"- New product key: " & pkSetNewProductKey & CrLf)
5036+
CommandArgs &= " /image=" & targetImage & " /set-productkey=" & pkSetNewProductKey
5037+
RunProcess(DismProgram, CommandArgs)
5038+
LogView.AppendText(CrLf & "Getting error level...")
5039+
If Hex(DismExitCode).Length < 8 Then
5040+
errCode = DismExitCode
5041+
Else
5042+
errCode = Hex(DismExitCode)
5043+
End If
5044+
If errCode.Length >= 8 Then
5045+
LogView.AppendText(" Error level : 0x" & errCode)
5046+
Else
5047+
LogView.AppendText(" Error level : " & errCode)
5048+
End If
5049+
GetErrorCode(False)
5050+
End Sub
5051+
5052+
#End Region
5053+
50215054
#Region "Driver Management Tasks"
50225055

50235056
Private Sub AddDrivers(targetImage As String)

‎Panels/ImageTaskHeader.Designer.vb

+72
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Panels/ImageTaskHeader.resx

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎Panels/ImageTaskHeader.vb

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
Public Class ImageTaskHeader
2+
3+
Public Enum ColorMode
4+
Dark
5+
Light
6+
End Enum
7+
8+
Public Property ItemText As String
9+
Get
10+
Return ItemTitle.Text
11+
End Get
12+
Set(value As String)
13+
ItemTitle.Text = Value
14+
End Set
15+
End Property
16+
17+
Public Property ItemPicture As Image
18+
Get
19+
Return ItemPictureBox.Image
20+
End Get
21+
Set(value As Image)
22+
ItemPictureBox.Image = Value
23+
End Set
24+
End Property
25+
26+
Public Property ItemColor As ColorMode
27+
Get
28+
If BackColor = Color.FromArgb(48, 48, 48) Then
29+
Return ColorMode.Dark
30+
Else
31+
Return ColorMode.Light
32+
End If
33+
End Get
34+
Set(value As ColorMode)
35+
If value = ColorMode.Dark Then
36+
BackColor = Color.FromArgb(48, 48, 48)
37+
ForeColor = Color.White
38+
Else
39+
BackColor = Color.White
40+
ForeColor = Color.Black
41+
End If
42+
End Set
43+
End Property
44+
End Class

0 commit comments

Comments
 (0)