[Microwin] dedicated Function folder

config/autounattend.xml

@@ -113,7 +113,7 @@
                 </RunSynchronousCommand>
                 <RunSynchronousCommand wcm:action="add">
                     <Order>19</Order>
-                    <Path>powershell.exe -NoProfile -Command "Get-Content -LiteralPath 'C:\Windows\Temp\remove-packages.ps1' -Raw | Invoke-Expression;"</Path>
+                    <Path>powershell.exe -NoProfile -Command "Get-Content -LiteralPath 'C:\Windows\Temp\Microwin-RemovePackages.ps1' -Raw | Invoke-Expression;"</Path>
                 </RunSynchronousCommand>
                 <RunSynchronousCommand wcm:action="add">
                     <Order>20</Order>
@@ -312,7 +312,7 @@ foreach( $file in $Document.unattend.Extensions.File ) {
     [System.IO.File]::WriteAllBytes( $path, ( $encoding.GetPreamble() + $encoding.GetBytes( $file.InnerText.Trim() ) ) );
 }
         </ExtractScript>
-        <File path="C:\Windows\Temp\remove-packages.ps1">
+        <File path="C:\Windows\Temp\Microwin-RemovePackages.ps1">
 $selectors = @(
     'Microsoft.Microsoft3DViewer';
     'Microsoft.BingSearch';
@@ -359,7 +359,7 @@ $removeCommand = {
   }
 };
 $type = 'Package';
-$logfile = 'C:\Windows\Temp\remove-packages.log';
+$logfile = 'C:\Windows\Temp\Microwin-RemovePackages.log';
 &amp; {
     $installed = &amp; $getCommand;
     foreach( $selector in $selectors ) {

functions/public/Invoke-WPFMicrowin.ps1 → functions/microwin/Invoke-Microwin.ps1

@@ -1,4 +1,4 @@
-function Invoke-WPFMicrowin {
+function Invoke-Microwin {
     <#
         .DESCRIPTION
         Invoke MicroWin routines...
@@ -78,7 +78,7 @@ public class PowerManagement {
     $imgVersion = (Get-WindowsImage -ImagePath $mountDir\sources\install.wim -Index $index).Version
 
     # Detect image version to avoid performing MicroWin processing on Windows 8 and earlier
-    if ((Test-CompatibleImage $imgVersion $([System.Version]::new(10,0,10240,0))) -eq $false) {
+    if ((Microwin-TestCompatibleImage $imgVersion $([System.Version]::new(10,0,10240,0))) -eq $false) {
         $msg = "This image is not compatible with MicroWin processing. Make sure it isn't a Windows 8 or earlier image."
         $dlg_msg = $msg + "`n`nIf you want more information, the version of the image selected is $($imgVersion)`n`nIf an image has been incorrectly marked as incompatible, report an issue to the developers."
         Write-Host $msg
@@ -88,7 +88,7 @@ public class PowerManagement {
     }
 
     # Detect whether the image to process contains Windows 10 and show warning
-    if ((Test-CompatibleImage $imgVersion $([System.Version]::new(10,0,21996,1))) -eq $false) {
+    if ((Microwin-TestCompatibleImage $imgVersion $([System.Version]::new(10,0,21996,1))) -eq $false) {
         $msg = "Windows 10 has been detected in the image you want to process. While you can continue, Windows 10 is not a recommended target for MicroWin, and you may not get the full experience."
         $dlg_msg = $msg
         Write-Host $msg
@@ -155,28 +155,22 @@ public class PowerManagement {
         }
 
         Write-Host "Remove Features from the image"
-        Remove-Features
+        Microwin-RemoveFeatures
         Write-Host "Removing features complete!"
         Write-Host "Removing OS packages"
-        Remove-Packages
+        Microwin-RemovePackages
         Write-Host "Removing Appx Bloat"
-        Remove-ProvisionedPackages
+        Microwin-RemoveProvisionedPackages
 
         # Detect Windows 11 24H2 and add dependency to FileExp to prevent Explorer look from going back - thanks @WitherOrNot and @thecatontheceiling
-        if ((Test-CompatibleImage $imgVersion $([System.Version]::new(10,0,26100,1))) -eq $true)
-        {
-            try
-            {
-                if (Test-Path "$scratchDir\Windows\SystemApps\MicrosoftWindows.Client.FileExp_cw5n1h2txyewy\appxmanifest.xml" -PathType Leaf)
-                {
+        if ((Test-CompatibleImage $imgVersion $([System.Version]::new(10,0,26100,1))) -eq $true) {
+            try {
+                if (Test-Path "$scratchDir\Windows\SystemApps\MicrosoftWindows.Client.FileExp_cw5n1h2txyewy\appxmanifest.xml" -PathType Leaf) {
                     # Found the culprit. Do the following:
-
                     # 1. Take ownership of the file, from TrustedInstaller to Administrators
                     takeown /F "$scratchDir\Windows\SystemApps\MicrosoftWindows.Client.FileExp_cw5n1h2txyewy\appxmanifest.xml" /A
-
                     # 2. Set ACLs so that we can write to it
-                    icacls "$scratchDir\Windows\SystemApps\MicrosoftWindows.Client.FileExp_cw5n1h2txyewy\appxmanifest.xml" /grant "$(Get-LocalizedUsers -admins $true):(M)" | Out-Host
-
+                    icacls "$scratchDir\Windows\SystemApps\MicrosoftWindows.Client.FileExp_cw5n1h2txyewy\appxmanifest.xml" /grant "$(Microwin-GetLocalizedUsers -admins $true):(M)" | Out-Host
                     # 3. Open the file and do the modification
                     $appxManifest = Get-Content -Path "$scratchDir\Windows\SystemApps\MicrosoftWindows.Client.FileExp_cw5n1h2txyewy\appxmanifest.xml"
                     $originalLine = $appxManifest[13]
@@ -185,46 +179,45 @@ public class PowerManagement {
                     Set-Content -Path "$scratchDir\Windows\SystemApps\MicrosoftWindows.Client.FileExp_cw5n1h2txyewy\appxmanifest.xml" -Value $appxManifest -Force -Encoding utf8
                 }
             }
-            catch
-            {
-
+            catch {
+                # Do nothing
             }
         }
 
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\LogFiles\WMI\RtBackup" -Directory
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\DiagTrack" -Directory
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\InboxApps" -Directory
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\LocationNotificationWindows.exe"
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Photo Viewer" -Directory
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Photo Viewer" -Directory
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Media Player" -Directory
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Media Player" -Directory
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Mail" -Directory
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Mail" -Directory
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Internet Explorer" -Directory
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Internet Explorer" -Directory
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\GameBarPresenceWriter"
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\OneDriveSetup.exe"
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\OneDrive.ico"
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*narratorquickstart*" -Directory
-        Remove-FileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*ParentalControls*" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\LogFiles\WMI\RtBackup" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Windows\DiagTrack" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Windows\InboxApps" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\LocationNotificationWindows.exe"
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Photo Viewer" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Photo Viewer" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Media Player" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Media Player" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Mail" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Mail" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Internet Explorer" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Internet Explorer" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Windows\GameBarPresenceWriter"
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\OneDriveSetup.exe"
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\OneDrive.ico"
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*narratorquickstart*" -Directory
+        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Windows\SystemApps" -mask "*ParentalControls*" -Directory
         Write-Host "Removal complete!"
 
         Write-Host "Create unattend.xml"
-        #New-Unattend
+        #Microwin-NewUnattend
         if ($sync.MicrowinUserName.Text -eq "")
         {
-            New-Unattend -userName "User"
+            Microwin-NewUnattend -userName "User"
         }
         else
         {
             if ($sync.MicrowinUserPassword.Password -eq "")
             {
-                New-Unattend -userName "$($sync.MicrowinUserName.Text)"
+                Microwin-NewUnattend -userName "$($sync.MicrowinUserName.Text)"
             }
             else
             {
-                New-Unattend -userName "$($sync.MicrowinUserName.Text)" -userPassword "$($sync.MicrowinUserPassword.Password)"
+                Microwin-NewUnattend -userName "$($sync.MicrowinUserName.Text)" -userPassword "$($sync.MicrowinUserPassword.Password)"
             }
         }
         Write-Host "Done Create unattend.xml"
@@ -237,7 +230,7 @@ public class PowerManagement {
         Write-Host "Done Copy unattend.xml"
 
         Write-Host "Create FirstRun"
-        New-FirstRun
+        Microwin-NewFirstRun
         Write-Host "Done create FirstRun"
         Write-Host "Copy FirstRun.ps1 into the ISO"
         Copy-Item "$env:temp\FirstStartup.ps1" "$($scratchDir)\Windows\FirstStartup.ps1" -force
@@ -249,7 +242,7 @@ public class PowerManagement {
         dism /English /image:$($scratchDir) /set-profilepath:"$($scratchDir)\Windows\Users\Default"
 
         Write-Host "Copy checkinstall.cmd into the ISO"
-        New-CheckInstall
+        Microwin-NewCheckInstall
         Copy-Item "$env:temp\checkinstall.cmd" "$($scratchDir)\Windows\checkinstall.cmd" -force
         Write-Host "Done copy checkinstall.cmd"
 
@@ -325,7 +318,7 @@ public class PowerManagement {
         reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize" /v "AppsUseLightTheme" /t REG_DWORD /d 0 /f
         reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize" /v "SystemUsesLightTheme" /t REG_DWORD /d 0 /f
 
-        if ((Test-CompatibleImage $imgVersion $([System.Version]::new(10,0,21996,1))) -eq $false) {
+        if ((Microwin-TestCompatibleImage $imgVersion $([System.Version]::new(10,0,21996,1))) -eq $false) {
             # We're dealing with Windows 10. Configure sane desktop settings. NOTE: even though stuff to disable News and Interests is there,
             # it doesn't seem to work, and I don't want to waste more time dealing with an operating system that will lose support in a year (2025)
 
@@ -437,7 +430,7 @@ public class PowerManagement {
 
         if ($copyToUSB) {
             Write-Host "Copying target ISO to the USB drive"
-            Copy-ToUSB("$($SaveDialog.FileName)")
+            Microwin-CopyToUSB("$($SaveDialog.FileName)")
             if ($?) { Write-Host "Done Copying target ISO to USB drive!" } else { Write-Host "ISO copy failed." }
         }
 

functions/public/Invoke-WPFGetIso.ps1 → functions/microwin/Invoke-MicrowinGetIso.ps1

@@ -1,4 +1,4 @@
-function Invoke-WPFGetIso {
+function Invoke-MicrowinGetIso {
     <#
     .DESCRIPTION
     Function to get the path to Iso file for MicroWin, unpack that isom=, read basic information and populate the UI Options
@@ -50,7 +50,7 @@ function Invoke-WPFGetIso {
             return
         } else {
             [System.Windows.MessageBox]::Show("oscdimge.exe is not found on the system, winutil will now attempt do download and install it from github. This might take a long time.")
-            Get-Oscdimg -oscdimgPath $oscdimgPath
+            Microwin-GetOscdimg -oscdimgPath $oscdimgPath
             $oscdImgFound = Test-Path $oscdimgPath -PathType Leaf
             if (!$oscdImgFound) {
                 $msg = "oscdimg was not downloaded can not proceed"
@@ -100,7 +100,7 @@ function Invoke-WPFGetIso {
         Set-Location -Path $env:temp
         # Detect if the first option ("System language") has been selected and get a Fido-approved language from the current culture
         $lang = if ($sync["ISOLanguage"].SelectedIndex -eq 0) {
-            Get-FidoLangFromCulture -langName (Get-Culture).Name
+            Microwin-GetLangFromCulture -langName (Get-Culture).Name
         } else {
             $sync["ISOLanguage"].SelectedItem
         }

functions/microwin/Microwin-Classes.ps1

@@ -0,0 +1,10 @@
+class ErroredPackage {
+    [string]$PackageName
+    [string]$ErrorMessage
+    ErroredPackage() { $this.Init(@{} )}
+    # Constructor for packages that have errored out
+    ErroredPackage([string]$pkgName, [string]$reason) {
+        $this.PackageName = $pkgName
+        $this.ErrorMessage = $reason
+    }
+}

functions/microwin/Microwin-CopyToUSB.ps1

@@ -0,0 +1,23 @@
+function Microwin-CopyToUSB([string]$fileToCopy) {
+    foreach ($volume in Get-Volume) {
+        if ($volume -and $volume.FileSystemLabel -ieq "ventoy") {
+            $destinationPath = "$($volume.DriveLetter):\"
+            #Copy-Item -Path $fileToCopy -Destination $destinationPath -Force
+            # Get the total size of the file
+            $totalSize = (Get-Item "$fileToCopy").length
+
+            Copy-Item -Path "$fileToCopy" -Destination "$destinationPath" -Verbose -Force -Recurse -Container -PassThru |
+                ForEach-Object {
+                    # Calculate the percentage completed
+                    $completed = ($_.BytesTransferred / $totalSize) * 100
+
+                    # Display the progress bar
+                    Write-Progress -Activity "Copying File" -Status "Progress" -PercentComplete $completed -CurrentOperation ("{0:N2} MB / {1:N2} MB" -f ($_.BytesTransferred / 1MB), ($totalSize / 1MB))
+                }
+
+            Write-Host "File copied to Ventoy drive $($volume.DriveLetter)"
+            return
+        }
+    }
+    Write-Host "Ventoy USB Key is not inserted"
+}

functions/microwin/Microwin-GetLangFromCulture.ps1

@@ -0,0 +1,49 @@
+function Microwin-GetLangFromCulture {
+
+    param (
+        [Parameter(Mandatory, Position = 0)] [string]$langName
+    )
+
+    switch -Wildcard ($langName)
+    {
+        "ar*" { return "Arabic" }
+        "pt-BR" { return "Brazilian Portuguese" }
+        "bg*" { return "Bulgarian" }
+        {($_ -eq "zh-CH") -or ($_ -like "zh-Hans*") -or ($_ -eq "zh-SG") -or ($_ -eq "zh-CHS")} { return "Chinese (Simplified)" }
+        {($_ -eq "zh") -or ($_ -eq "zh-Hant") -or ($_ -eq "zh-HK") -or ($_ -eq "zh-MO") -or ($_ -eq "zh-TW") -or ($_ -eq "zh-CHT")} { return "Chinese (Traditional)" }
+        "hr*" { return "Croatian" }
+        "cs*" { return "Czech" }
+        "da*" { return "Danish" }
+        "nl*" { return "Dutch" }
+        "en-US" { return "English" }
+        {($_ -like "en*") -and ($_ -ne "en-US")} { return "English International" }
+        "et*" { return "Estonian" }
+        "fi*" { return "Finnish" }
+        {($_ -like "fr*") -and ($_ -ne "fr-CA")} { return "French" }
+        "fr-CA" { return "French Canadian" }
+        "de*" { return "German" }
+        "el*" { return "Greek" }
+        "he*" { return "Hebrew" }
+        "hu*" { return "Hungarian" }
+        "it*" { return "Italian" }
+        "ja*" { return "Japanese" }
+        "ko*" { return "Korean" }
+        "lv*" { return "Latvian" }
+        "lt*" { return "Lituanian" }
+        "nb*" { return "Norwegian" }
+        "pl*" { return "Polish" }
+        {($_ -like "pt*") -and ($_ -ne "pt-BR")} { return "Portuguese" }
+        "ro*" { return "Romanian" }
+        "ru*" { return "Russian" }
+        "sr-Latn*" { return "Serbian Latin" }
+        "sk*" { return "Slovak" }
+        "sl*" { return "Slovenian" }
+        {($_ -like "es*") -and ($_ -ne "es-MX")} { return "Spanish" }
+        "es-MX" { return "Spanish (Mexico)" }
+        "sv*" { return "Swedish" }
+        "th*" { return "Thai" }
+        "tr*" { return "Turkish" }
+        "uk*" { return "Ukrainian" }
+        default { return "English" }
+    }
+}

functions/microwin/Microwin-GetLocalizedUsers.ps1

@@ -0,0 +1,21 @@
+function Microwin-GetLocalizedUsers
+{
+    <#
+        .SYNOPSIS
+            Gets a localized user group representation for ICACLS commands (Port from DISMTools PE Helper)
+        .PARAMETER admins
+            Determines whether to get a localized user group representation for the Administrators user group
+        .OUTPUTS
+            A string containing the localized user group
+        .EXAMPLE
+            Microwin-GetLocalizedUsers -admins $true
+    #>
+    param (
+        [Parameter(Mandatory = $true, Position = 0)] [bool]$admins
+    )
+    if ($admins) {
+        return (Get-LocalGroup | Where-Object { $_.SID.Value -like "S-1-5-32-544" }).Name
+    } else {
+        return (Get-LocalGroup | Where-Object { $_.SID.Value -like "S-1-5-32-545" }).Name
+    }
+}

functions/private/Get-Oscdimg.ps1 → functions/microwin/Microwin-GetOscdimg.ps1

@@ -1,10 +1,10 @@
-function Get-Oscdimg {
+function Microwin-GetOscdimg {
     <#
         .DESCRIPTION
         This function will download oscdimg file from github Release folders and put it into env:temp folder
 
         .EXAMPLE
-        Get-Oscdimg
+        Microwin-GetOscdimg
     #>
 
     param(