From 742f946198c58351310af0c31ed328c55224fbaa Mon Sep 17 00:00:00 2001
From: Valentin Radu <valentin.radu@valinet.ro>
Date: Tue, 9 Nov 2021 23:19:06 +0200
Subject: [PATCH] Built-in support for build 22000.318

---
 CHANGELOG.md                       | 8 ++++++++
 ExplorerPatcher/ExplorerPatcher.rc | 8 ++++----
 ExplorerPatcher/symbols.c          | 7 +++++--
 ExplorerPatcher/symbols.h          | 6 +++---
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2da5e7..66da591 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 This document includes the same release notes as in the [Releases](https://github.com/valinet/ExplorerPatcher/releases) section on GitHub.
 
+## 22000.318.34
+
+Tested on build 22000.318.
+
+#### Feature enhancements
+
+* Built-in support for build 22000.318
+
 ## 22000.282.33
 
 Tested on build 22000.282.
diff --git a/ExplorerPatcher/ExplorerPatcher.rc b/ExplorerPatcher/ExplorerPatcher.rc
index b195709..0351ad6 100644
--- a/ExplorerPatcher/ExplorerPatcher.rc
+++ b/ExplorerPatcher/ExplorerPatcher.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22000,282,33,0
- PRODUCTVERSION 22000,282,33,0
+ FILEVERSION 22000,318,34,0
+ PRODUCTVERSION 22000,318,34,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "VALINET Solutions SRL"
             VALUE "FileDescription", "ExplorerPatcher"
-            VALUE "FileVersion", "22000.282.33.0"
+            VALUE "FileVersion", "22000.318.34.0"
             VALUE "InternalName", "ExplorerPatcher.dll"
             VALUE "LegalCopyright", "Copyright (C) 2006-2021 VALINET Solutions SRL. All rights reserved."
             VALUE "OriginalFilename", "ExplorerPatcher.dll"
             VALUE "ProductName", "ExplorerPatcher"
-            VALUE "ProductVersion", "22000.282.33.0"
+            VALUE "ProductVersion", "22000.318.34.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/ExplorerPatcher/symbols.c b/ExplorerPatcher/symbols.c
index da2b45d..3337b41 100644
--- a/ExplorerPatcher/symbols.c
+++ b/ExplorerPatcher/symbols.c
@@ -539,7 +539,7 @@ BOOL LoadSymbols(symbols_addr* symbols_PTRS, HMODULE hModule)
         ubr
     );
 
-    if (IsBuild22000_282(rovi, ubr))
+    if (IsBuild(rovi, ubr, 22000, 282) || IsBuild(rovi, ubr, 22000, 318))
     {
         symbols_PTRS->twinui_pcshell_PTRS[0] = 0x217CE6;
         symbols_PTRS->twinui_pcshell_PTRS[1] = 0x5CC570;
@@ -728,7 +728,10 @@ BOOL LoadSymbols(symbols_addr* symbols_PTRS, HMODULE hModule)
         &dwSize
     );
     RegCloseKey(hKey);
-    if (!bNeedToDownload && !IsBuild22000_282(rovi, ubr))
+    if (!bNeedToDownload &&
+        !IsBuild(rovi, ubr, 22000, 282) &&
+        !IsBuild(rovi, ubr, 22000, 318)
+        )
     {
         bNeedToDownload = wcscmp(szReportedVersion, szStoredVersion);
     }
diff --git a/ExplorerPatcher/symbols.h b/ExplorerPatcher/symbols.h
index 8c9b830..8d4b03d 100644
--- a/ExplorerPatcher/symbols.h
+++ b/ExplorerPatcher/symbols.h
@@ -42,11 +42,11 @@ DWORD DownloadSymbols(DownloadSymbolsParams* params);
 
 BOOL LoadSymbols(symbols_addr* symbols_PTRS, HMODULE hModule);
 
-inline BOOL IsBuild22000_282(RTL_OSVERSIONINFOW rovi, DWORD32 ubr)
+inline BOOL IsBuild(RTL_OSVERSIONINFOW rovi, DWORD32 ubr, DWORD BuildNumber, DWORD BuildMinor)
 {
     return (rovi.dwMajorVersion == 10 &&
         rovi.dwMinorVersion == 0 &&
-        rovi.dwBuildNumber == 22000 &&
-        ubr == 282);
+        rovi.dwBuildNumber == BuildNumber &&
+        ubr == BuildMinor);
 }
 #endif
\ No newline at end of file