add support for kb4019265, kb4019217

.gitignore

@@ -1,4 +1,4 @@
 *.exe
 *.rar
 *.zip
-patch_scripts/aio/COPYING.txt
+patch_scripts/*/COPYING.txt

README.md

@@ -1,8 +1,8 @@
-### [Click here if you are looking for the latest patch files!](https://github.com/zeffy/kb4012218-19/releases)
+### [Click here if you are looking for the latest patch files!](https://github.com/zeffy/kb4012218-19/releases/latest)  [<img src="https://img.shields.io/github/downloads/zeffy/kb4012218-19/total.svg"/>](https://github.com/zeffy/kb4012218-19/releases/latest)
 
 ---
 
-### [Click here for a list of Windows updates supported by this patch](docs/Supported_Updates.md)
+### [Click here for a list of Windows updates supported by this patch](docs/Patch_Offsets.md)
 
 ---
 
@@ -14,7 +14,7 @@ After reading [this article on gHacks](https://www.ghacks.net/2017/03/22/kb40122
 
 This update marked the implementation of a [policy change](https://blogs.windows.com/windowsexperience/2016/01/15/windows-10-embracing-silicon-innovation/) they announced some time ago, where Microsoft stated that they would not be supporting Windows 7 or 8.1 on next-gen Intel, AMD and Qualcomm processors. 
 
-That is essentially a giant middle finger to anyone who dare not "upgrade" to the steaming pile of garbage known as Windows 10. Especially considering the extended support periods for Windows 7 and 8.1 still have a few years left, and will be ending in 2020 and 2024 respectively.
+That is essentially a giant middle finger to anyone who dare not "upgrade" to the steaming pile of garbage known as Windows 10. Especially considering the extended support periods for Windows 7 and 8.1 still have a few years left, and will be ending on January 4, 2020 and January 10, 2023 respectively.
 
 There have even been people with older Intel and AMD systems who have been locked out of Windows Update because of these updates (see [#7](/../../issues/7) and [this](https://answers.microsoft.com/en-us/windows/forum/windows8_1-update/amd-carrizo-ddr4-unsupported-hardware-message-on/f3fb2326-f413-41c9-a24b-7c14e6d51b0c?tab=question&status=AllReplies)).
 

docs/Patch_Offsets.md

@@ -1,14 +1,34 @@
+## Windows 7
+
 Hotfix ID | Architecture | wuaueng.dll version | File offset | Original value | Patched value
 --------- | ------------ | ------------------- | ----------- | -------------- | -------------
-KB4012218 | x64 | 7.6.7601.23714 | `0x26C948` | `0x01` | `0x00`
+[KB4012218] | x64 | 7.6.7601.23714 | `0x26C948` | `0x01` | `0x00`
-KB4012218 | x86 | 7.6.7601.23714 | `0x1E4638` | `0x01` | `0x00`
+[KB4012218] | x86 | 7.6.7601.23714 | `0x1E4638` | `0x01` | `0x00`
-KB4012219 | x64 | 7.9.9600.18621 | `0x34D3BC` | `0x01` | `0x00`
+[KB4015546], [KB4015549], [KB4015552], [KB4019264] | x64 | 7.6.7601.23735 | `0x26C948` | `0x01` | `0x00`
-KB4012219 | x86 | 7.9.9600.18621 | `0x2BFA50` | `0x01` | `0x00`
+[KB4015546], [KB4015549], [KB4015552], [KB4019264] | x86 | 7.6.7601.23735 | `0x1E4838` | `0x01` | `0x00`
-KB4015546 and KB4015549 | x64 | 7.6.7601.23735 | `0x26C948` | `0x01` | `0x00`
+[KB4019265] | x64 | 7.6.7601.23775 | `0x26C948` | `0x01` | `0x00`
-KB4015546 and KB4015549 | x86 | 7.6.7601.23735 | `0x1E4838` | `0x01` | `0x00`
+[KB4019265] | x86 | 7.6.7601.23775 | `0x1E4838` | `0x01` | `0x00`
-KB4015547 and KB4015550 | x64 | 7.9.9600.18628 | `0x34D5BC` | `0x01` | `0x00`
+
-KB4015547 and KB4015550 | x86 | 7.9.9600.18628 | `0x2BFA50` | `0x01` | `0x00`
+## Windows 8.1
-KB4015552 | x64 | 7.6.7601.23735 | `0x26C948` | `0x01` | `0x00`
+
-KB4015552 | x86 | 7.6.7601.23735 | `0x1E4838` | `0x01` | `0x00`
+Hotfix ID | Architecture | wuaueng.dll version | File offset | Original value | Patched value
-KB4015553 | x64 | 7.9.9600.18628 | `0x34D5BC` | `0x01` | `0x00`
+--------- | ------------ | ------------------- | ----------- | -------------- | -------------
-KB4015553 | x86 | 7.9.9600.18628 | `0x2BFA50` | `0x01` | `0x00`
+[KB4012219] | x64 | 7.9.9600.18621 | `0x34D3BC` | `0x01` | `0x00`
+[KB4012219] | x86 | 7.9.9600.18621 | `0x2BFA50` | `0x01` | `0x00`
+[KB4015547], [KB4015550], [KB4015553], [KB4019215], [KB4019217] | x64 | 7.9.9600.18628 | `0x34D5BC` | `0x01` | `0x00`
+[KB4015547], [KB4015550], [KB4015553], [KB4019215], [KB4019217] | x86 | 7.9.9600.18628 | `0x2BFA50` | `0x01` | `0x00`
+
+
+[KB4012218]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4012218
+[KB4015546]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015546
+[KB4015549]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015549
+[KB4015552]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015552
+[KB4019264]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4019264
+[KB4019265]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4019265
+
+[KB4012219]: https://www.catalog.update.microsoft.com/search.aspx?q=kb4012219
+[KB4015547]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015547
+[KB4015550]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015550
+[KB4015553]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015553
+[KB4019215]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4019215
+[KB4019217]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4019217

docs/Supported_Updates.md

@@ -1,35 +0,0 @@
-Title | Products | Classification | Last Updated | Version | Size
------ | -------- | -------------- | ------------ | ------- | ----
-March, 2017 Preview of Monthly Quality Rollup for Windows 7 ([KB4012218]) | Windows 7 | Updates | 3/16/2017 | n/a | 93.4 MB
-March, 2017 Preview of Monthly Quality Rollup for Windows 7 for x64-based Systems ([KB4012218]) | Windows 7 | Updates | 3/16/2017 | n/a | 153.9 MB
-March, 2017 Preview of Monthly Quality Rollup for Windows Server 2008 R2 x64 Edition ([KB4012218]) | Windows Server 2008 R2 | Updates | 3/16/2017 | n/a | 153.9 MB
-March, 2017 Preview of Monthly Quality Rollup for Windows 8.1 ([KB4012219]) | Windows 8.1 | Updates | 3/16/2017 | n/a | 121.2 MB
-March, 2017 Preview of Monthly Quality Rollup for Windows 8.1 for x64-based Systems ([KB4012219]) | Windows 8.1 | Updates | 3/16/2017 | n/a | 218.0 MB
-March, 2017 Preview of Monthly Quality Rollup for Windows Server 2012 R2 ([KB4012219]) | Windows Server 2012 R2 | Updates | 3/16/2017 | n/a | 218.0 MB
-April, 2017 Security Only Quality Update for Windows 7 ([KB4015546]) | Windows 7 | Security Updates | 4/8/2017 | n/a | 23.2 MB
-April, 2017 Security Only Quality Update for Windows 7 for x64-based Systems ([KB4015546]) | Windows 7 | Security Updates | 4/8/2017 | n/a | 37.5 MB
-April, 2017 Security Only Quality Update for Windows Server 2008 R2 for x64-based Systems ([KB4015546]) | Windows Server 2008 R2 | Security Updates | 4/8/2017 | n/a | 37.5 MB
-April, 2017 Security Only Quality Update for Windows 8.1 for x64-based Systems ([KB4015547]) | Windows 8.1 | Security Updates | 4/8/2017 | n/a | 15.6 MB
-April, 2017 Security Only Quality Update for Windows 8.1 ([KB4015547]) | Windows 8.1 | Security Updates | 4/8/2017 | n/a | 10.1 MB
-April, 2017 Security Only Quality Update for Windows Server 2012 R2 ([KB4015547]) | Windows Server 2012 R2 | Security Updates | 4/8/2017 | n/a | 15.6 MB
-April, 2017 Security Monthly Quality Rollup for Windows 7 for x64-based Systems ([KB4015549]) | Windows 7 | Security Updates | 4/8/2017 | n/a | 159.9 MB
-April, 2017 Security Monthly Quality Rollup for Windows Server 2008 R2 for x64-based Systems ([KB4015549]) | Windows Server 2008 R2 | Security Updates | 4/8/2017 | n/a | 159.9 MB
-April, 2017 Security Monthly Quality Rollup for Windows 7 ([KB4015549]) | Windows 7 | Security Updates | 4/8/2017 | n/a | 97.6 MB
-April, 2017 Security Monthly Quality Rollup for Windows 8.1 for x64-based Systems ([KB4015550]) | Windows 8.1 | Security Updates | 4/10/2017 | n/a | 220.9 MB
-April, 2017 Security Monthly Quality Rollup for Windows Server 2012 R2 ([KB4015550]) | Windows Server 2012 R2 | Security Updates | 4/10/2017 | n/a | 220.9 MB
-April, 2017 Security Monthly Quality Rollup for Windows 8.1 ([KB4015550]) | Windows 8.1 | Security Updates | 4/10/2017 | n/a | 122.4 MB
-April, 2017 Preview of Monthly Quality Rollup for Windows Server 2008 R2 x64 Edition ([KB4015552]) | Windows Server 2008 R2 | Updates | 4/13/2017 | n/a | 160.9 MB
-April, 2017 Preview of Monthly Quality Rollup for Windows 7 for x64-based Systems ([KB4015552]) | Windows 7 | Updates | 4/13/2017 | n/a | 160.9 MB
-April, 2017 Preview of Monthly Quality Rollup for Windows 7 ([KB4015552]) | Windows 7 | Updates | 4/13/2017 | n/a | 98.1 MB
-April, 2017 Preview of Monthly Quality Rollup for Windows Server 2012 R2 ([KB4015553]) | Windows Server 2012 R2 | Updates | 4/13/2017 | n/a | 224.0 MB
-April, 2017 Preview of Monthly Quality Rollup for Windows 8.1 ([KB4015553]) | Windows 8.1 | Updates | 4/13/2017 | n/a | 124.6 MB
-April, 2017 Preview of Monthly Quality Rollup for Windows 8.1 for x64-based Systems ([KB4015553]) | Windows 8.1 | Updates | 4/13/2017 | n/a | 224.0 MB
-
-[KB4012218]: https://www.catalog.update.microsoft.com/search.aspx?q=kb4012218
-[KB4012219]: https://www.catalog.update.microsoft.com/search.aspx?q=kb4012219
-[KB4015546]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015546
-[KB4015547]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015547
-[KB4015549]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015549
-[KB4015550]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015550
-[KB4015552]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015552
-[KB4015553]: https://www.catalog.update.microsoft.com/search.aspx?q=KB4015553

patch_scripts/aio/aio-wuaueng.dll-patch.bat

@@ -59,13 +59,13 @@ if not exist "%XDELTA3_EXE%" (
 
 wmic /output:stdout os get version | findstr "^6\.1\." >nul && (
     set "WINDOWS_VER=6.1"
-    set "SUPPORTED_HOTFIXES=KB4015552 KB4015549 KB4015546 KB4012218"
+    set "SUPPORTED_HOTFIXES=KB4019265 KB4019264 KB4015552 KB4015549 KB4015546 KB4012218"
     echo Detected supported operating system: Windows 7 %WINDOWS_ARCHITECTURE%
     goto :check_hotfix
 )
 wmic /output:stdout os get version | findstr "^6\.3\." >nul && (
     set "WINDOWS_VER=8.1"
-    set "SUPPORTED_HOTFIXES=KB4015553 KB4015550 KB4015547 KB4012219"
+    set "SUPPORTED_HOTFIXES=KB4019217 KB4019215 KB4015553 KB4015550 KB4015547 KB4012219"
     echo Detected supported operating system: Windows 8.1 %WINDOWS_ARCHITECTURE%
     goto :check_hotfix
 )
@@ -211,34 +211,44 @@ echo Gathering debugging information, please wait...
 call :set_timestamp_var
 set "DEBUG_LOG_FILE=%temp%\%~nx0-debuginfo_%TIMESTAMP%.log"
 
+set "WMI_OS_VALUES=BuildNumber,Caption,MUILanguages,OSArchitecture,OSLanguage,Version"
+set "WMI_CPU_VALUES=Description,Family,Manufacturer,Name,NumberOfCores,NumberOfLogicalProcessors,ProcessorId,Revision"
+set "WMI_QFE_VALUES=HotFixID,InstalledOn"
+set "WMI_DATAFILE_VALUES=CreationDate,FileSize,InstallDate,LastAccessed,LastModified,Version"
+set "CERTUTIL_HASH_ALGS=MD5 SHA1 SHA256"
+
 echo.>"%DEBUG_LOG_FILE%"
 echo ^<details^>>>"%DEBUG_LOG_FILE%"
 echo.>>"%DEBUG_LOG_FILE%"
 echo ## Operating System>>"%DEBUG_LOG_FILE%"
 echo.>>"%DEBUG_LOG_FILE%"
 echo ```>>"%DEBUG_LOG_FILE%"
-wmic os get BuildNumber,Caption,MUILanguages,OSArchitecture,OSLanguage,Version /value | findstr /V "^$" >>"%DEBUG_LOG_FILE%"
+wmic /output:stdout os get %WMI_OS_VALUES% /value | findstr /V "^$" >>"%DEBUG_LOG_FILE%"
+echo ```>>"%DEBUG_LOG_FILE%"
+echo.>>"%DEBUG_LOG_FILE%"
+
+echo ## Processor>>"%DEBUG_LOG_FILE%"
+echo.>>"%DEBUG_LOG_FILE%"
+echo ```>>"%DEBUG_LOG_FILE%"
+wmic /output:stdout cpu get %WMI_CPU_VALUES% /value | findstr /V "^$" >>"%DEBUG_LOG_FILE%"
 echo ```>>"%DEBUG_LOG_FILE%"
 echo.>>"%DEBUG_LOG_FILE%"
 
 echo ## Installed Hotfixes>>"%DEBUG_LOG_FILE%"
 echo.>>"%DEBUG_LOG_FILE%"
 echo ```>>"%DEBUG_LOG_FILE%"
-wmic qfe get HotFixID,InstalledOn /value | findstr /V "^$" >>"%DEBUG_LOG_FILE%"
+wmic /output:stdout qfe get %WMI_QFE_VALUES% /value | findstr /V "^$" >>"%DEBUG_LOG_FILE%"
 echo ```>>"%DEBUG_LOG_FILE%"
 echo.>>"%DEBUG_LOG_FILE%"
 
 echo ## wuaueng.dll Properties>>"%DEBUG_LOG_FILE%"
 echo.>>"%DEBUG_LOG_FILE%"
 echo ```>>"%DEBUG_LOG_FILE%"
-certutil -hashfile "%WUAUENG_DLL%" MD5 | find /V "CertUtil" >>"%DEBUG_LOG_FILE%"
+for %%a in (%CERTUTIL_HASH_ALGS%) do (
-echo.>>"%DEBUG_LOG_FILE%"
+    certutil -hashfile "%WUAUENG_DLL%" "%%a" | find /V "CertUtil" >>"%DEBUG_LOG_FILE%"
-certutil -hashfile "%WUAUENG_DLL%" SHA1 | find /V "CertUtil" >>"%DEBUG_LOG_FILE%"
+    echo.>>"%DEBUG_LOG_FILE%"
-echo.>>"%DEBUG_LOG_FILE%"
+)
-certutil -hashfile "%WUAUENG_DLL%" SHA256 | find /V "CertUtil" >>"%DEBUG_LOG_FILE%"
+wmic /output:stdout datafile where "name='%WUAUENG_DLL:\=\\%'" get %WMI_DATAFILE_VALUES% /value | findstr /V "^$" >>"%DEBUG_LOG_FILE%"
-echo.>>"%DEBUG_LOG_FILE%"
-
-wmic datafile where "name='%WUAUENG_DLL:\=\\%'" get CreationDate,FileSize,InstallDate,LastAccessed,LastModified,Version /value | findstr /V "^$" >>"%DEBUG_LOG_FILE%"
 echo ```>>"%DEBUG_LOG_FILE%"
 echo ^</details^>>>"%DEBUG_LOG_FILE%"
 
@@ -250,7 +260,7 @@ start "" notepad "%DEBUG_LOG_FILE%"
 exit /b
 
 :set_timestamp_var
-for /f "delims=" %%a in ('wmic os get localdatetime ^| find "."') do set dt=%%a
+for /f "delims=" %%a in ('wmic /output:stdout os get localdatetime ^| find "."') do set dt=%%a
 set "TIMESTAMP=%dt:~0,4%-%dt:~4,2%-%dt:~6,2%_%dt:~8,2%-%dt:~10,2%-%dt:~12,2%_%dt:~15,6%"
 exit /b