⚒️ Finalize Driver Injection

valnoxy · Mar 13, 2023 · ac2ceb2 · ac2ceb2
1 parent 419c352
commit ac2ceb2
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@
 <p align="center">
     Easy Deployment for Windows
     <br />
-    <strong>Version: </strong>1.0.0.289 (Beta 4)
+    <strong>Version: </strong>1.0.0.362 (Beta 5)
     <br/>
-    <strong>Core: </strong>12.0.0.426
+    <strong>Core: </strong>12.0.0.452
     <br />
     <br />
     <a href="https://github.com/valnoxy/dive/releases"><strong>Download now »</strong></a>
@@ -20,14 +20,16 @@
   </p>
 </p>
 
-![-----------------------------------------------------](https://dl.exploitox.de/t440p-oc/rainbow.png)
+![-----------------------------------------------------](https://raw.githubusercontent.com/valnoxy/valnoxy/main/assets/bar.gif)
 
 ## 🔔 Information
 Dive (formally deploya) is a little application for deploying Windows on a machine. 
 
 - Deploy WIM-Files on any drive
 - Mass deploy Windows with AutoDive (W.I.P)
 - Bypass Windows 11 Microsoft-Account compulsion
+- Configure Windows with OEM & Local Accound settings 
+- Inject multiple drivers
 - Capture Windows installation
 - Install Windows from the Cloud
 

diff --git a/deploya/deployaCore/Action/Apply.cs b/deploya/deployaCore/Action/Apply.cs
@@ -37,7 +37,8 @@ internal static void AddDriverToDisk(string windowsDrive, List<string> driverPat
             Bw = worker;
             try
             {
-                Output.WriteLine("[Driver] Entering Injection process ...");
+                var driverCount = driverPath.Count;
+                Output.WriteLine($"[Driver] Entering Injection process with {driverCount} drivers ...");
                 Output.WriteLine("[Driver] Initialize Dism API ...");
                 DismApi.Initialize(DismLogLevel.LogErrors);
                 Output.WriteLine("[Driver] Open offline session ...");
@@ -52,14 +53,15 @@ internal static void AddDriverToDisk(string windowsDrive, List<string> driverPat
                 catch (Exception ex)
                 {
                     Output.WriteLine("[Driver] Failed to open offline session: " + ex.Message);
-                    Output.WriteLine("[Driver] Shutdown Dism API ...");
+                    Output.WriteLine("[Driver] Shutting down API ...");
                     DismApi.Shutdown();
                     return;
                 }
 
                 var currentDriverCount = 0;
-                foreach (var driver in driverPath.Where(File.Exists))
+                foreach (var driver in driverPath)
                 {
+                    Output.WriteLine("[Driver] Begin driver installation ...");
                     try
                     {
                         currentDriverCount++;
@@ -74,8 +76,12 @@ internal static void AddDriverToDisk(string windowsDrive, List<string> driverPat
                     }
                 }
 
+                Output.WriteLine("[Driver] Closing session ...");
                 session.Close();
+                Output.WriteLine("[Driver] Shutting down API ...");
                 DismApi.Shutdown();
+                Output.WriteLine("[Driver] Job completed. Returning now ...");
+                return;
             }
             catch (Exception ex)
             {

diff --git a/deploya/deployaCore/deployaCore.csproj b/deploya/deployaCore/deployaCore.csproj
@@ -18,7 +18,7 @@
 		<DebugType>embedded</DebugType>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
 		<PackageId>deploya</PackageId>
-		<Version>12.0.0.448</Version>
+		<Version>12.0.0.452</Version>
 		<Authors>valnoxy</Authors>
 		<Company>Exploitox</Company>
 		<Product>deploya</Product>

diff --git a/deploya/deployaUI/Pages/ApplyPages/DeploymentSettingsStep.xaml b/deploya/deployaUI/Pages/ApplyPages/DeploymentSettingsStep.xaml
@@ -200,7 +200,7 @@
                                     <TextBlock
                                         FontSize="12"
                                         Foreground="{DynamicResource TextFillColorTertiaryBrush}"
-                                        Text="Load and inject multiple drivers." />
+                                        Text="Load and inject multiple drivers. (Vista and up)" />
                                 </StackPanel>
                                 <TextBlock
                                     FontSize="12"

diff --git a/deploya/deployaUI/Pages/ApplyPages/DeploymentSettingsStep.xaml.cs b/deploya/deployaUI/Pages/ApplyPages/DeploymentSettingsStep.xaml.cs
@@ -255,15 +255,19 @@ private void Source_OpenFolderClick(object sender, RoutedEventArgs e)
             {
                 TbDrvPath.Text = dialog.SelectedPath;
 
-                List<string> infFiles = Directory.GetFiles(dialog.SelectedPath, "*.inf")
-                    .Select(Path.GetFileName)
+                var infFiles = Directory.GetFiles(dialog.SelectedPath, "*.inf", SearchOption.AllDirectories)
+                    .Select(Path.GetFullPath)
                     .ToList();
 
                 switch (infFiles.Count)
                 {
                     case > 0:
-                        var driverWindow = new LoadDriversLiveSystem(infFiles);
-                        driverWindow.ShowDialog();
+                        if (File.Exists("X:\\Windows\\System32\\wpeutil.exe"))
+                        {
+                            var driverWindow = new LoadDriversLiveSystem(infFiles);
+                            driverWindow.ShowDialog();
+                        }
+                        Common.Debug.WriteLine($"Found {infFiles.Count} drivers.");
                         Common.ApplyDetails.DriverList = infFiles;
                         break;
                     case 0:

diff --git a/deploya/deployaUI/Pages/TweaksPages/TweaksDashboard.xaml b/deploya/deployaUI/Pages/TweaksPages/TweaksDashboard.xaml
@@ -12,6 +12,7 @@
         <wpfui:CardAction
             Margin="0,0,0,8"
             Click="SwitchToMigratePage"
+            IsEnabled="false"
             Icon="ArrowCircleRight28">
             <StackPanel>
                 <TextBlock
@@ -27,6 +28,7 @@
         <wpfui:CardAction
             Margin="0,0,0,8"
             Click="SwitchToRepairPage"
+            IsEnabled="false"
             Icon="WrenchScrewdriver20">
             <StackPanel>
                 <TextBlock

diff --git a/deploya/deployaUI/deployaUI.csproj b/deploya/deployaUI/deployaUI.csproj
@@ -16,7 +16,7 @@
 		<AssemblyName>Dive</AssemblyName>
 		<Company>Exploitox</Company>
 		<Authors>valnoxy</Authors>
-		<Version>1.0.0.359</Version>
+		<Version>1.0.0.362</Version>
 		<Copyright>Copyright (c) 2018 - 2023 Exploitox. All rights reserved.</Copyright>
 		<PackageProjectUrl>https://github.com/valnoxy/dive</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/valnoxy/dive</RepositoryUrl>