diff --git a/bin/bin64/libwim-15.dll b/bin/bin64/libwim-15.dll index e255fa1..10e2620 100644 Binary files a/bin/bin64/libwim-15.dll and b/bin/bin64/libwim-15.dll differ diff --git a/bin/bin64/wimlib-imagex.exe b/bin/bin64/wimlib-imagex.exe index 19dcdcb..937c3c0 100644 Binary files a/bin/bin64/wimlib-imagex.exe and b/bin/bin64/wimlib-imagex.exe differ diff --git a/bin/libwim-15.dll b/bin/libwim-15.dll index a1a3643..606d464 100644 Binary files a/bin/libwim-15.dll and b/bin/libwim-15.dll differ diff --git a/bin/main.ps1 b/bin/main.ps1 index b0b88ab..df4c73a 100644 --- a/bin/main.ps1 +++ b/bin/main.ps1 @@ -20,7 +20,7 @@ Write-Host 'Loading utilities module...' New-Enum iso.filenametype Partner Consumer Windows7 New-Enum wim.extensiontype WIM ESD -function Menu-Select($displayoptions, $arrayofoptions) { +function Menu-Select ($displayoptions, $arrayofoptions) { Do { $counter = 0 foreach ($item in $displayoptions) { @@ -40,17 +40,17 @@ function Get-ScriptDirectory { } #Is this a Wow64 powershell host -function Test-Wow64() { +function Test-Wow64 { return (Test-Win32) -and (test-path env:\PROCESSOR_ARCHITEW6432) } #Is this a 64 bit process -function Test-Win64() { +function Test-Win64 { return [IntPtr]::size -eq 8 } #Is this a 32 bit process -function Test-Win32() { +function Test-Win32 { return [IntPtr]::size -eq 4 } @@ -775,7 +775,8 @@ function Convert-ESD ( if ($operationname -eq $null) { $operationname = $_ } - $progress = [regex]::match($_,'\(([^\)]+)\%').Groups[1].Value + $global:lastprogress = $progress + $global:progress = [regex]::match($_,'\(([^\)]+)\%').Groups[1].Value if ($progress -match "[0-9]") { $total = $_.split(' ')[0] $totalsize = $_.split(' ')[3] @@ -786,8 +787,10 @@ function Convert-ESD ( } else { [long]$secsleft = 0 } - Write-host Exporting to install.esd... $progress% - $operationname - Time remaining: $secsleft - $_ - Update-Window ConvertProgress Value $progress + #Write-host Exporting to install.esd... $progress% - $operationname - Time remaining: $secsleft - $_ + if ($lastprogress -ne $progress) { + Update-Window ConvertProgress Value $progress + } } if ($WIMInfo.$indexcounter.EditionID -eq 'ProfessionalWMC') { cmd /c ($wimlib + ' update "$($Output)\sources\install.esd" $($indexcount)