uup-dump/api
8
0
Fork 2
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Add support for OOBE updates #2

Open
abbodi1406 wants to merge 4 commits from abbodi1406/api:master into master
pull from: abbodi1406/api:master
merge into: uup-dump:master
Conversation 0 Commits 4 Files Changed 2 +50 -21
2 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
fetchupd.php
View File

@@ -301,32 +301,40 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
return array('error' => 'EMPTY_FILELIST'); return array('error' => 'EMPTY_FILELIST');
} }
preg_match('/ProductReleaseInstalled Name\="(.*?)\..*\.(.*?)" Version\="10\.0\.(.*?)"/', $updateInfo, $info); preg_match('/ProductReleaseInstalled Name\="(.*?)" Version\="(.*?)"/', $updateInfo, $info);
$foundType = @strtolower($info[1]); if(!isset($info[0]) || empty($info[0])) {
$foundArch = @strtolower($info[2]); $infoExt = preg_grep('/<ExtendedProperties .*?>/', $updateMeta);
$foundBuild = @$info[3]; preg_match('/ProductName\="(.*?)" ReleaseVersion\="(.*?)"/', $infoExt[0], $info);
}
$matchName = @strtolower($info[1]);
$matchVersion = @$info[2];
if(!isset($foundArch) || empty($foundArch)) { if($matchVersion == '1.0.0.0' || $matchVersion == '10.0.0.0') {
preg_match('/ProductReleaseInstalled Name\="(.*?)\.(.*?)" Version\="10\.0\.(.*?)"/', $updateInfo, $info); preg_match('/"BuildFlightVersion":"(.*?)"/', $updateInfo, $infoVer);
$foundType = @strtolower($info[1]); $matchVersion = @$infoVer[1];
$foundArch = @strtolower($info[2]);
$foundBuild = @$info[3];
} }
if(!isset($foundArch) || empty($foundArch)) { $arrayName = explode('.', $matchName);
preg_match('/ProductReleaseInstalled Name\="(.*?)\.(.*?)" Version\="(.*?)"/', $updateInfo, $info); $arrayVersion = explode('.', $matchVersion);
$foundType = @strtolower($info[1]);
$foundArch = @strtolower($info[2]); $foundArch = $arrayName[count($arrayName)-1];
$foundBuild = @$info[3]; $foundType = $arrayName[0];
} if($foundType == 'windows' || $foundType == 'microsoft')
$foundType = $arrayName[1];
$isNet = 0; $isNet = 0;
if(strpos($foundArch, 'netfx') !== false) { if(strpos($matchVersion, '10.0.') !== false) {
$foundBuild = $arrayVersion[2].'.'.$arrayVersion[3];
} elseif($foundType == 'netfx') {
$foundBuild = $arrayVersion[1].'.'.$arrayVersion[2];
$isNet = 1; $isNet = 1;
preg_match('/ProductReleaseInstalled Name\=".*\.(.*?)\.(.*?)" Version\=".*\.\d{5}\.(.*?)"/', $updateInfo, $info); } else {
$foundType = @strtolower($info[1]); $foundBuild = $matchVersion;
$foundArch = @strtolower($info[2]); }
$foundBuild = @$info[3];
$addKB = 0;
if($isNet || $foundType == 'oobe') {
$addKB = 1;
} }
$updateTitle = preg_grep('/<Title>.*<\/Title>/', $updateMeta); $updateTitle = preg_grep('/<Title>.*<\/Title>/', $updateMeta);
@@ -345,6 +353,8 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
if($foundType == 'hololens' || $foundType == 'wcosdevice0') if($foundType == 'hololens' || $foundType == 'wcosdevice0')
$updateTitle = preg_replace('/ for .{3,5}-based/i', ' for', $updateTitle); $updateTitle = preg_replace('/ for .{3,5}-based/i', ' for', $updateTitle);
preg_match('/\((KB.*?)\)/', $updateTitle, $updateKB);
$isCumulativeUpdate = 0; $isCumulativeUpdate = 0;
if(preg_match('/\d{4}-\d{2}.+Update|(Cumulative|Security|Preview) Update|Microsoft Edge|Windows Feature Experience Pack|Cumulative security Hotpatch/i', $updateTitle)) { if(preg_match('/\d{4}-\d{2}.+Update|(Cumulative|Security|Preview) Update|Microsoft Edge|Windows Feature Experience Pack|Cumulative security Hotpatch/i', $updateTitle)) {
$isCumulativeUpdate = 1; $isCumulativeUpdate = 1;
@@ -368,6 +378,10 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
$updateTitle = str_replace('Update', "Update for $osName", $updateTitle); $updateTitle = str_replace('Update', "Update for $osName", $updateTitle);
} }
if($foundType == 'oobe' && !preg_match("/OOBE|Out of Box/i", $updateTitle)) {
$updateTitle = str_replace('Update', 'OOBE Update', $updateTitle);
}
if($sku == 406) if($sku == 406)
$updateTitle = str_replace('Microsoft server operating system', 'Azure Stack HCI', $updateTitle); $updateTitle = str_replace('Microsoft server operating system', 'Azure Stack HCI', $updateTitle);
@@ -377,6 +391,9 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
if($foundType == 'hololens' || $foundType == 'wcosdevice0') if($foundType == 'hololens' || $foundType == 'wcosdevice0')
$updateTitle = $updateTitle.' - '.$type; $updateTitle = $updateTitle.' - '.$type;
if($addKB && isset($updateKB[0]))
$updateTitle = $updateTitle.' - '.$updateKB[1];
if(!str_contains($updateTitle, $foundBuild)) if(!str_contains($updateTitle, $foundBuild))
$updateTitle = $updateTitle.' ('.$foundBuild.')'; $updateTitle = $updateTitle.' ('.$foundBuild.')';

14
shared/requests.php
View File

@@ -116,7 +116,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
$attrib = array( $attrib = array(
'App=WU_OS', 'App=WU_OS',
'AppVer='.$build, 'AppVer='.$build,
'AttrDataVer=331', 'AttrDataVer=352',
'AllowInPlaceUpgrade=1', 'AllowInPlaceUpgrade=1',
'AllowOptionalContent=1', 'AllowOptionalContent=1',
'AllowUpgradesWithUnsupportedTPMOrCPU=1', 'AllowUpgradesWithUnsupportedTPMOrCPU=1',
@@ -174,6 +174,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
'IsDeviceRetailDemo=0', 'IsDeviceRetailDemo=0',
'IsFlightingEnabled='.$flightEnabled, 'IsFlightingEnabled='.$flightEnabled,
'IsRetailOS='.$isRetail, 'IsRetailOS='.$isRetail,
'LaunchUserOOBE=1',
'LCUVer=0.0.0.0', 'LCUVer=0.0.0.0',
'MediaBranch=', 'MediaBranch=',
'MediaVersion='.$build, 'MediaVersion='.$build,
@@ -317,10 +318,12 @@ function branchFromBuild($build) {
case 26100: case 26100:
case 26120: case 26120:
case 26200: case 26200:
case 26300:
$branch = 'ge_release'; $branch = 'ge_release';
break; break;
case 28000: case 28000:
case 28100:
$branch = 'br_release'; $branch = 'br_release';
break; break;
@@ -474,6 +477,8 @@ function composeFetchUpdRequest($arch, $flight, $ring, $build, $sku = 48, $type
$products[] = "PN=Windows.FeatureExperiencePack.$currArch&Repairable=1&V=0.0.0.0"; $products[] = "PN=Windows.FeatureExperiencePack.$currArch&Repairable=1&V=0.0.0.0";
$products[] = "PN=Windows.ManagementOOBE.$currArch&IsWindowsManagementOOBE=1&Repairable=1&V=$build"; $products[] = "PN=Windows.ManagementOOBE.$currArch&IsWindowsManagementOOBE=1&Repairable=1&V=$build";
$products[] = "PN=Windows.OOBE.$currArch&IsWindowsOOBE=1&Repairable=1&V=$build"; $products[] = "PN=Windows.OOBE.$currArch&IsWindowsOOBE=1&Repairable=1&V=$build";
$products[] = "PN=Windows.OOBE.Cumulative.$currArch&V=0.0.0.0";
$products[] = "PN=Windows.OOBE.Standalone.$currArch&V=0.0.0.0";
$products[] = "PN=Windows.UpdateStackPackage.$currArch&Name=Update Stack Package&Repairable=1&V=$build"; $products[] = "PN=Windows.UpdateStackPackage.$currArch&Name=Update Stack Package&Repairable=1&V=$build";
$products[] = "PN=Hammer.$currArch&Source=UpdateOrchestrator&V=0.0.0.0"; $products[] = "PN=Hammer.$currArch&Source=UpdateOrchestrator&V=0.0.0.0";
$products[] = "PN=MSRT.$currArch&Source=UpdateOrchestrator&V=0.0.0.0"; $products[] = "PN=MSRT.$currArch&Source=UpdateOrchestrator&V=0.0.0.0";
@@ -590,6 +595,13 @@ function composeFetchUpdRequest($arch, $flight, $ring, $build, $sku = 48, $type
<int>3</int> <int>3</int>
<int>30077688</int> <int>30077688</int>
<int>30486944</int> <int>30486944</int>
<int>316003061</int>
<int>326686062</int>
<int>326686063</int>
<int>327065581</int>
<int>327072300</int>
<int>327072305</int>
<int>327100345</int>
<int>5143990</int> <int>5143990</int>
<int>5169043</int> <int>5169043</int>
<int>5169044</int> <int>5169044</int>