forked from uup-dump/api
Compare commits
10 Commits
5000b4c4b9
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 287a25a353 | |||
| 1e07081a0e | |||
| 2ddfdfc9f4 | |||
| a433e40841 | |||
| 22e344bdf2 | |||
| 0774988365 | |||
| e7fddd4e43 | |||
| 2231d65edb | |||
| 0da5532141 | |||
| 6b5a6885f8 |
106
fetchupd.php
106
fetchupd.php
@@ -34,20 +34,31 @@ function uupApiPrivateParseFlags($str) {
|
||||
}
|
||||
|
||||
function uupApiPrivateGetLatestBuild() {
|
||||
$builds = array('22000.1');
|
||||
|
||||
$ids = uupListIds();
|
||||
if(isset($ids['error'])) {
|
||||
$ids['builds'] = array();
|
||||
|
||||
if(!isset($ids['builds']) || empty($ids['builds'])) {
|
||||
return '26100.1';
|
||||
}
|
||||
|
||||
if(empty($ids['builds'])) {
|
||||
$build = $builds[0];
|
||||
} else {
|
||||
$build = $ids['builds'][0]['build'];
|
||||
return $ids['builds'][0]['build'];
|
||||
}
|
||||
|
||||
return $build;
|
||||
function uupApiPrivateGetLatestPatch($build) {
|
||||
$ids = uupListIds();
|
||||
|
||||
if(!isset($ids['builds']) || empty($ids['builds'])) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
foreach($ids['builds'] as $val) {
|
||||
$valBuild = explode('.', $val['build']);
|
||||
|
||||
if($valBuild[0] == $build && isset($valBuild[1])) {
|
||||
return intval($valBuild[1]);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
function uupApiPrivateIsAcceptableBranch($branch) {
|
||||
@@ -83,7 +94,7 @@ function uupApiPrivateNormalizeFetchParams($params) {
|
||||
'arch' => 'amd64',
|
||||
'ring' => 'WIF',
|
||||
'flight' => 'Active',
|
||||
'branch' => 'ge_release',
|
||||
'branch' => 'auto',
|
||||
'build' => 'latest',
|
||||
'minor' => 0,
|
||||
'sku' => 48,
|
||||
@@ -154,9 +165,15 @@ function uupFetchUpd2($params, $cacheRequests = 0) {
|
||||
}
|
||||
|
||||
$build = explode('.', $build);
|
||||
if(isset($build[1])) $minor = intval($build[1]);
|
||||
if(isset($build[1])) $minor = $build[1];
|
||||
$build = intval($build[0]);
|
||||
|
||||
if($minor == 'latest') {
|
||||
$minor = uupApiPrivateGetLatestPatch($build);
|
||||
} else {
|
||||
$minor = intval($minor);
|
||||
}
|
||||
|
||||
if(!($arch == 'amd64' || $arch == 'x86' || $arch == 'arm64' || $arch == 'arm' || $arch == 'all')) {
|
||||
return array('error' => 'UNKNOWN_ARCH');
|
||||
}
|
||||
@@ -284,32 +301,40 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
|
||||
return array('error' => 'EMPTY_FILELIST');
|
||||
}
|
||||
|
||||
preg_match('/ProductReleaseInstalled Name\="(.*?)\..*\.(.*?)" Version\="10\.0\.(.*?)"/', $updateInfo, $info);
|
||||
$foundType = @strtolower($info[1]);
|
||||
$foundArch = @strtolower($info[2]);
|
||||
$foundBuild = @$info[3];
|
||||
preg_match('/ProductReleaseInstalled Name\="(.*?)" Version\="(.*?)"/', $updateInfo, $info);
|
||||
if(!isset($info[0]) || empty($info[0])) {
|
||||
$infoExt = preg_grep('/<ExtendedProperties .*?>/', $updateMeta);
|
||||
preg_match('/ProductName\="(.*?)" ReleaseVersion\="(.*?)"/', $infoExt[0], $info);
|
||||
}
|
||||
$matchName = @strtolower($info[1]);
|
||||
$matchVersion = @$info[2];
|
||||
|
||||
if(!isset($foundArch) || empty($foundArch)) {
|
||||
preg_match('/ProductReleaseInstalled Name\="(.*?)\.(.*?)" Version\="10\.0\.(.*?)"/', $updateInfo, $info);
|
||||
$foundType = @strtolower($info[1]);
|
||||
$foundArch = @strtolower($info[2]);
|
||||
$foundBuild = @$info[3];
|
||||
if($matchVersion == '1.0.0.0' || $matchVersion == '10.0.0.0') {
|
||||
preg_match('/"BuildFlightVersion":"(.*?)"/', $updateInfo, $infoVer);
|
||||
$matchVersion = @$infoVer[1];
|
||||
}
|
||||
|
||||
if(!isset($foundArch) || empty($foundArch)) {
|
||||
preg_match('/ProductReleaseInstalled Name\="(.*?)\.(.*?)" Version\="(.*?)"/', $updateInfo, $info);
|
||||
$foundType = @strtolower($info[1]);
|
||||
$foundArch = @strtolower($info[2]);
|
||||
$foundBuild = @$info[3];
|
||||
}
|
||||
$arrayName = explode('.', $matchName);
|
||||
$arrayVersion = explode('.', $matchVersion);
|
||||
|
||||
$foundArch = $arrayName[count($arrayName)-1];
|
||||
$foundType = $arrayName[0];
|
||||
if($foundType == 'windows' || $foundType == 'microsoft')
|
||||
$foundType = $arrayName[1];
|
||||
|
||||
$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;
|
||||
preg_match('/ProductReleaseInstalled Name\=".*\.(.*?)\.(.*?)" Version\=".*\.\d{5}\.(.*?)"/', $updateInfo, $info);
|
||||
$foundType = @strtolower($info[1]);
|
||||
$foundArch = @strtolower($info[2]);
|
||||
$foundBuild = @$info[3];
|
||||
} else {
|
||||
$foundBuild = $matchVersion;
|
||||
}
|
||||
|
||||
$addKB = 0;
|
||||
if($isNet || $foundType == 'oobe') {
|
||||
$addKB = 1;
|
||||
}
|
||||
|
||||
$updateTitle = preg_grep('/<Title>.*<\/Title>/', $updateMeta);
|
||||
@@ -328,9 +353,12 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
|
||||
if($foundType == 'hololens' || $foundType == 'wcosdevice0')
|
||||
$updateTitle = preg_replace('/ for .{3,5}-based/i', ' for', $updateTitle);
|
||||
|
||||
preg_match('/\((KB.*?)\)/', $updateTitle, $updateKB);
|
||||
|
||||
$isCumulativeUpdate = 0;
|
||||
if(preg_match('/\d{4}-\d{2}.+Update|Cumulative 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;
|
||||
|
||||
if($isNet) {
|
||||
$updateTitle = preg_replace("/3.5 and 4.8.1 |3.5 and 4.8 | for $foundArch| for x64| \(KB.*?\)/i", '', $updateTitle);
|
||||
} else {
|
||||
@@ -345,6 +373,15 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
|
||||
$updateTitle = str_replace('Windows 11', 'Windows Server', $updateTitle);
|
||||
}
|
||||
|
||||
if(preg_match('/Windows 1\d|Server|Azure Stack HCI|Windows CPC OS/i', $updateTitle) !== 1) {
|
||||
$osName = $foundType != 'server' ? 'Windows 11' : 'Microsoft server operating system';
|
||||
$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)
|
||||
$updateTitle = str_replace('Microsoft server operating system', 'Azure Stack HCI', $updateTitle);
|
||||
|
||||
@@ -354,7 +391,10 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
|
||||
if($foundType == 'hololens' || $foundType == 'wcosdevice0')
|
||||
$updateTitle = $updateTitle.' - '.$type;
|
||||
|
||||
if(!preg_match("/$foundBuild/i", $updateTitle))
|
||||
if($addKB && isset($updateKB[0]))
|
||||
$updateTitle = $updateTitle.' - '.$updateKB[1];
|
||||
|
||||
if(!str_contains($updateTitle, $foundBuild))
|
||||
$updateTitle = $updateTitle.' ('.$foundBuild.')';
|
||||
|
||||
preg_match('/UpdateID=".*?"/', $updateInfo, $updateId);
|
||||
|
||||
@@ -116,7 +116,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
|
||||
$attrib = array(
|
||||
'App=WU_OS',
|
||||
'AppVer='.$build,
|
||||
'AttrDataVer=331',
|
||||
'AttrDataVer=352',
|
||||
'AllowInPlaceUpgrade=1',
|
||||
'AllowOptionalContent=1',
|
||||
'AllowUpgradesWithUnsupportedTPMOrCPU=1',
|
||||
@@ -174,6 +174,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
|
||||
'IsDeviceRetailDemo=0',
|
||||
'IsFlightingEnabled='.$flightEnabled,
|
||||
'IsRetailOS='.$isRetail,
|
||||
'LaunchUserOOBE=1',
|
||||
'LCUVer=0.0.0.0',
|
||||
'MediaBranch=',
|
||||
'MediaVersion='.$build,
|
||||
@@ -317,9 +318,15 @@ function branchFromBuild($build) {
|
||||
case 26100:
|
||||
case 26120:
|
||||
case 26200:
|
||||
case 26300:
|
||||
$branch = 'ge_release';
|
||||
break;
|
||||
|
||||
case 28000:
|
||||
case 28100:
|
||||
$branch = 'br_release';
|
||||
break;
|
||||
|
||||
default:
|
||||
$branch = 'rs_prerelease';
|
||||
break;
|
||||
@@ -470,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.ManagementOOBE.$currArch&IsWindowsManagementOOBE=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=Hammer.$currArch&Source=UpdateOrchestrator&V=0.0.0.0";
|
||||
$products[] = "PN=MSRT.$currArch&Source=UpdateOrchestrator&V=0.0.0.0";
|
||||
@@ -586,6 +595,13 @@ function composeFetchUpdRequest($arch, $flight, $ring, $build, $sku = 48, $type
|
||||
<int>3</int>
|
||||
<int>30077688</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>5169043</int>
|
||||
<int>5169044</int>
|
||||
|
||||
Reference in New Issue
Block a user