Skip to content

Commit 1574a6c

Browse files
DISMTools 0.6.2 Update 2 (#264)
* Update assembly information * [Fix] Prevent user writes to console control * [Fix] Fixed image edition tasks never finishing * [DynaLog] Allow logging of additional, non-DISM related exceptions for bgprocs * [ISO Creator] Bump default resolution * Update assembly information * [PE Helper] Add packages from the Storage module * [PE Helper] Detect drive letters in conflict Attempt 1 of tackling #262 * [PE Helper] More consistency for ESP references * [PE Helper] Slightly improve disk conflict detection - We now make sure volume info is output to host console - Redundant code was removed * [Library] Update Markdig and DISM API * [PE Helper] Update HotInstall (06/23/2025) Updated HotInstall to its latest commit: CodingWonders/DT-HotInstall@084c5da * [Enhance] Detect Safe Mode on startup * [PE Helper] Update all fixed WinPE paths to envvar * [DynaLog] Add process ID to event logs * [Library] Update Markdig to 0.41.3 * [REL] Update What's New section
1 parent 873e78e commit 1574a6c

Some content is hidden

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

47 files changed

+1535
-184
lines changed

DISMTools.vbproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@
7878
<HintPath>packages\DarkUI.2.0.2\lib\DarkUI.dll</HintPath>
7979
</Reference>
8080
<Reference Include="Markdig, Version=0.41.0.0, Culture=neutral, processorArchitecture=MSIL">
81-
<HintPath>packages\Markdig.0.41.0\lib\net462\Markdig.dll</HintPath>
81+
<HintPath>packages\Markdig.0.41.3\lib\net462\Markdig.dll</HintPath>
8282
</Reference>
8383
<Reference Include="Microsoft.Dism, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5bba90053b345501, processorArchitecture=MSIL">
84-
<HintPath>packages\Microsoft.Dism.3.3.0\lib\net40\Microsoft.Dism.dll</HintPath>
84+
<HintPath>packages\Microsoft.Dism.3.3.12\lib\net40\Microsoft.Dism.dll</HintPath>
8585
</Reference>
8686
<Reference Include="Microsoft.WindowsAPICodePack.Core, Version=8.0.6.0, Culture=neutral, PublicKeyToken=8afb38e9204fc0a9, processorArchitecture=MSIL">
8787
<HintPath>packages\WindowsAPICodePack.8.0.6\lib\net48\Microsoft.WindowsAPICodePack.Core.dll</HintPath>

Helpers/extps1/PE_Helper/PE_Helper.ps1

Lines changed: 155 additions & 44 deletions
Large diffs are not rendered by default.
1.47 KB
Binary file not shown.

MainForm.vb

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,19 @@ Public Class MainForm
921921
End Try
922922
End If
923923
End If
924+
925+
DynaLog.LogMessage("Checking boot mode...")
926+
DynaLog.LogMessage(SystemInformation.BootMode)
927+
If SystemInformation.BootMode <> BootMode.Normal Then
928+
DynaLog.LogMessage("This system is in limp home mode. Offering choice to enter online installation management mode...")
929+
Dim safeModeMessage As String = "This computer has booted into Safe Mode. This mode is designed for live operating system recovery." & CrLf & CrLf &
930+
"DISMTools can automatically load the online installation management mode so that you can start attempting repairs." & CrLf & CrLf &
931+
"Do you want to load the online installation management mode?"
932+
If MsgBox(safeModeMessage, vbYesNo + vbQuestion, "Windows is in Safe Mode") = MsgBoxResult.Yes Then
933+
DynaLog.LogMessage("It is official. We are entering online installation management mode to (try to) save this installation...")
934+
BeginOnlineManagement(False)
935+
End If
936+
End If
924937
End Sub
925938

926939
Function GetItemThumbnail(videoId As String) As Image
@@ -3975,7 +3988,7 @@ Public Class MainForm
39753988
imgPackageRelType = imgPackageRelTypeList.ToArray()
39763989
imgPackageInstTime = imgPackageInstTimeList.ToArray()
39773990
End Using
3978-
Catch ex As DismException
3991+
Catch ex As Exception
39793992
DynaLog.LogMessage("Could not get package information. Error: " & ex.Message)
39803993
ThrowAPIException(ex)
39813994
Finally
@@ -4132,7 +4145,7 @@ Public Class MainForm
41324145
imgFeatureNames = imgFeatureNameList.ToArray()
41334146
imgFeatureState = imgFeatureStateList.ToArray()
41344147
End Using
4135-
Catch ex As DismException
4148+
Catch ex As Exception
41364149
DynaLog.LogMessage("Could not get package information. Error: " & ex.Message)
41374150
ThrowAPIException(ex)
41384151
Finally
@@ -4315,7 +4328,7 @@ Public Class MainForm
43154328
imgAppxResourceIds = imgAppxResourceIdList.ToArray()
43164329
imgAppxVersions = imgAppxVersionList.ToArray()
43174330
End Using
4318-
Catch ex As DismException
4331+
Catch ex As Exception
43194332
DynaLog.LogMessage("Could not get package information. Error: " & ex.Message)
43204333
ThrowAPIException(ex)
43214334
Finally
@@ -4551,7 +4564,7 @@ Public Class MainForm
45514564
imgCapabilityIds = imgCapabilityNameList.ToArray()
45524565
imgCapabilityState = imgCapabilityStateList.ToArray()
45534566
End Using
4554-
Catch ex As DismException
4567+
Catch ex As Exception
45554568
DynaLog.LogMessage("Could not get capability information. Error: " & ex.Message)
45564569
ThrowAPIException(ex)
45574570
Finally
@@ -4731,7 +4744,7 @@ Public Class MainForm
47314744
imgDrvVersions = imgDrvVersionList.ToArray()
47324745
imgDrvBootCriticalStatus = imgDrvBootCriticalStatusList.ToArray()
47334746
End Using
4734-
Catch ex As DismException
4747+
Catch ex As Exception
47354748
DynaLog.LogMessage("Could not get package information. Error: " & ex.Message)
47364749
ThrowAPIException(ex)
47374750
Finally

My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' mediante el asterisco ('*'), como se muestra a continuación:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("0.6.2.25052")>
35-
<Assembly: AssemblyFileVersion("0.6.2.25052")>
34+
<Assembly: AssemblyVersion("0.6.2.25063")>
35+
<Assembly: AssemblyFileVersion("0.6.2.25063")>

My Project/Resources.Designer.vb

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

My Project/Resources.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ GPT ATTRIBUTES=0x8000000000000001</value>
914914
<data name="WhatsNew" xml:space="preserve">
915915
<value>To get more information about what's new in this release, check out the release notes over at:
916916

917-
https://github.com/CodingWonders/DISMTools/releases/tag/v0.6.2_upd1</value>
917+
https://github.com/CodingWonders/DISMTools/releases/tag/v0.6.2_upd2</value>
918918
</data>
919919
<data name="exit_full_screen_glyph" type="System.Resources.ResXFileRef, System.Windows.Forms">
920920
<value>..\Resources\menus\exit_full_screen_glyph.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

Panels/DoWork/ProgressPanel.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5041,7 +5041,7 @@ Public Class ProgressPanel
50415041
"- New edition: " & imgEditionNewEdition & CrLf &
50425042
"- Will the EULA be copied? " & If(imgEditionCopyEula, "Yes, to the following destination: " & imgEditionEulaDestination, "No") & CrLf &
50435043
"- Will the EULA be accepted? " & If(imgEditionAcceptEula, "Yes, with the following product key: " & imgEditionEditionKey, "No") & CrLf)
5044-
CommandArgs &= If(OnlineMgmt, " /online", " /image=" & targetImage) & " /set-edition=" & imgEditionNewEdition
5044+
CommandArgs &= If(OnlineMgmt, " /online", " /image=" & targetImage) & " /norestart /set-edition=" & imgEditionNewEdition
50455045
DynaLog.LogMessage("Checking if the active installation is being managed...")
50465046
If OnlineMgmt Then
50475047
DynaLog.LogMessage("The active installation is being managed. Taking into account other settings the user may have specified...")
@@ -5076,7 +5076,7 @@ Public Class ProgressPanel
50765076
LogView.AppendText(CrLf & "Setting the new product key..." & CrLf &
50775077
"Options:" & CrLf &
50785078
"- New product key: " & pkSetNewProductKey & CrLf)
5079-
CommandArgs &= " /image=" & targetImage & " /set-productkey=" & pkSetNewProductKey
5079+
CommandArgs &= " /image=" & targetImage & " /norestart /set-productkey=" & pkSetNewProductKey
50805080
RunProcess(DismProgram, CommandArgs)
50815081
LogView.AppendText(CrLf & "Getting error level...")
50825082
If Hex(DismExitCode).Length < 8 Then

0 commit comments

Comments
 (0)