INI: Add support for new builds

- 6.1.7601.24234 (fix #572)
- 10.0.15063.994 (fix #455)
- 10.0.17723.1000 (fix #537)
- 10.0.17763.1 (fix #578)

4 files changed, 232 insertions, 3 deletions

diff --git a/README.md b/README.md
index 77d9f52..8b53236 100644
--- a/README.md
+++ b/README.md
@@ -293,6 +293,7 @@ Visit [issues](https://github.com/stascorp/rdpwrap/issues) section, and check wh
 - 6.1.7601.18637 (Windows 7 SP1 with KB3003743 GDR)
 - 6.1.7601.22843 (Windows 7 SP1 with KB3003743 LDR)
 - 6.1.7601.23403 (Windows 7 SP1 with KB3125574)
+- 6.1.7601.24234 (Windows 7 SP1 with unknown KB)
 - 6.2.8102.0 (Windows 8 Developer Preview)
 - 6.2.8250.0 (Windows 8 Consumer Preview)
 - 6.2.8400.0 (Windows 8 Release Preview)
@@ -367,6 +368,7 @@ Visit [issues](https://github.com/stascorp/rdpwrap/issues) section, and check wh
 - 10.0.15061.0 (Windows 10 Build 160101.0800)
 - 10.0.15063.0 (Windows 10 Build 160101.0800)
 - 10.0.15063.296 (Windows 10 Build 160101.0800)
+- 10.0.15063.994 (Windows 10 Build 160101.0800)
 - 10.0.15063.1155 (Windows 10 Build 160101.0800)
 - 10.0.16179.1000 (Windows 10 Build 160101.0800)
 - 10.0.16184.1001 (Windows 10 Build 160101.0800)
@@ -401,6 +403,8 @@ Visit [issues](https://github.com/stascorp/rdpwrap/issues) section, and check wh
 - 10.0.17128.1 (Windows 10 Build 160101.0800)
 - 10.0.17133.1 (Windows 10 Build 160101.0800)
 - 10.0.17134.1 (Windows 10 Build 160101.0800)
+- 10.0.17723.1000 (Windows 10 Build 160101.0800)
+- 10.0.17763.1 (Windows 10 Build 160101.0800)
 
 #### Confirmed working on:
 - Windows Vista Starter (x86 - Service Pack 1 and higher)
diff --git a/res/rdpwrap-ini-kb.txt b/res/rdpwrap-ini-kb.txt
index 34d3d0b..bb6ced3 100644
--- a/res/rdpwrap-ini-kb.txt
+++ b/res/rdpwrap-ini-kb.txt
@@ -1,6 +1,6 @@
 [Main]
 ; Last updated date
-Updated=2018-09-10
+Updated=2018-10-03
 ; Address to log file (RDP Wrapper will write it, if exists)
 LogFile=\rdpwrap.txt
 ; Hook SLPolicy API on Windows NT 6.0
@@ -654,6 +654,16 @@ DefPolicyPatch.x64=1
 DefPolicyOffset.x64=17CE2
 DefPolicyCode.x64=CDefPolicy_Query_eax_rdi
 
+[6.1.7601.24234]
+; Patch CSessionArbitrationHelper::IsSingleSessionPerUserEnabled
+SingleUserPatch.x64=1
+SingleUserOffset.x64=17F56
+SingleUserCode.x64=Zero
+; Patch CDefPolicy::Query
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=17D2E
+DefPolicyCode.x64=CDefPolicy_Query_eax_rdi
+
 [6.2.8102.0]
 ; Patch CSessionArbitrationHelper::IsSingleSessionPerUserEnabled
 ; .text:1000F7E5          lea     eax, [esp+150h+VersionInformation]
@@ -3220,6 +3230,24 @@ SLInitHook.x64=1
 SLInitOffset.x64=D1EC
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[10.0.15063.994]
+; Patch CEnforcementCore::GetInstanceOfTSLicense
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=8CB01
+LocalOnlyCode.x64=jmpshort
+; Patch CSessionArbitrationHelper::IsSingleSessionPerUserEnabled
+SingleUserPatch.x64=1
+SingleUserOffset.x64=15EA4
+SingleUserCode.x64=Zero
+; Patch CDefPolicy::Query
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=FAE5
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+; Hook CSLQuery::Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=234DC
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [10.0.15063.1155]
 ; Patch CEnforcementCore::GetInstanceOfTSLicense
 LocalOnlyPatch.x64=1
@@ -4228,6 +4256,54 @@ SLInitHook.x64=1
 SLInitOffset.x64=22E6C
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[10.0.17723.1000]
+; Patch CEnforcementCore::GetInstanceOfTSLicense
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=75D91
+LocalOnlyCode.x64=jmpshort
+; Patch CSessionArbitrationHelperMgr::IsSingleSessionPerUserEnabled
+SingleUserPatch.x64=1
+SingleUserOffset.x64=1296C
+SingleUserCode.x64=Zero
+; Patch CDefPolicy::Query
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=17A45
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+; Hook CSLQuery::Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=1B10C
+SLInitFunc.x64=New_CSLQuery_Initialize
+
+[10.0.17763.1]
+; Patch CEnforcementCore::GetInstanceOfTSLicense
+LocalOnlyPatch.x86=1
+LocalOnlyOffset.x86=AF8E4
+LocalOnlyCode.x86=jmpshort
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=77941
+LocalOnlyCode.x64=jmpshort
+; Patch CSessionArbitrationHelperMgr::IsSingleSessionPerUserEnabled
+SingleUserPatch.x86=1
+SingleUserOffset.x86=4D505
+SingleUserCode.x86=nop
+SingleUserPatch.x64=1
+SingleUserOffset.x64=1322C
+SingleUserCode.x64=Zero
+; Patch CDefPolicy::Query
+DefPolicyPatch.x86=1
+DefPolicyOffset.x86=4BD09
+DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=17F45
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+; Hook CSLQuery::Initialize
+SLInitHook.x86=1
+SLInitOffset.x86=5B02A
+SLInitFunc.x86=New_CSLQuery_Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=1ABFC
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [SLInit]
 ; Is server
 bServerSku=1
@@ -5509,6 +5585,16 @@ bServerSku.x64        =E9484
 lMaxUserSessions.x64  =E9488
 bAppServerAllowed.x64 =E948C
 
+[10.0.15063.994-SLInit]
+bInitialized.x64      =E9468
+bRemoteConnAllowed.x64=E946C
+bMultimonAllowed.x64  =E9470
+ulMaxDebugSessions.x64=E9474
+bFUSEnabled.x64       =E9478
+bServerSku.x64        =E9484
+lMaxUserSessions.x64  =E9488
+bAppServerAllowed.x64 =E948C
+
 [10.0.15063.1155-SLInit]
 bInitialized.x64      =E9468
 bRemoteConnAllowed.x64=E946C
@@ -6145,3 +6231,32 @@ bRemoteConnAllowed.x64=F2434
 bMultimonAllowed.x64  =F2438
 ulMaxDebugSessions.x64=F243C
 bFUSEnabled.x64       =F2440
+
+[10.0.17723.1000-SLInit]
+bInitialized.x64      =E9AB0
+bServerSku.x64        =E9AB4
+lMaxUserSessions.x64  =E9AB8
+bAppServerAllowed.x64 =E9AC0
+bRemoteConnAllowed.x64=E9AC4
+bMultimonAllowed.x64  =E9AC8
+ulMaxDebugSessions.x64=E9ACC
+bFUSEnabled.x64       =E9AD0
+
+[10.0.17763.1-SLInit]
+bInitialized.x86      =CD798
+bServerSku.x86        =CD79C
+lMaxUserSessions.x86  =CD7A0
+bAppServerAllowed.x86 =CD7A8
+bRemoteConnAllowed.x86=CD7AC
+bMultimonAllowed.x86  =CD7B0
+ulMaxDebugSessions.x86=CD7B4
+bFUSEnabled.x86       =CD7B8
+
+bInitialized.x64      =ECAB0
+bServerSku.x64        =ECAB4
+lMaxUserSessions.x64  =ECAB8
+bAppServerAllowed.x64 =ECAC0
+bRemoteConnAllowed.x64=ECAC4
+bMultimonAllowed.x64  =ECAC8
+ulMaxDebugSessions.x64=ECACC
+bFUSEnabled.x64       =ECAD0
diff --git a/res/rdpwrap.ini b/res/rdpwrap.ini
index f68c671..b33455c 100644
--- a/res/rdpwrap.ini
+++ b/res/rdpwrap.ini
@@ -2,7 +2,7 @@
 ; Do not modify without special knowledge
 
 [Main]
-Updated=2018-09-10
+Updated=2018-10-03
 LogFile=\rdpwrap.txt
 SLPolicyHookNT60=1
 SLPolicyHookNT61=1
@@ -275,6 +275,14 @@ DefPolicyPatch.x64=1
 DefPolicyOffset.x64=17CE2
 DefPolicyCode.x64=CDefPolicy_Query_eax_rdi
 
+[6.1.7601.24234]
+SingleUserPatch.x64=1
+SingleUserOffset.x64=17F56
+SingleUserCode.x64=Zero
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=17D2E
+DefPolicyCode.x64=CDefPolicy_Query_eax_rdi
+
 [6.2.8102.0]
 SingleUserPatch.x86=1
 SingleUserOffset.x86=F7E9
@@ -2103,6 +2111,20 @@ SLInitHook.x64=1
 SLInitOffset.x64=D1EC
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[10.0.15063.994]
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=8CB01
+LocalOnlyCode.x64=jmpshort
+SingleUserPatch.x64=1
+SingleUserOffset.x64=15EA4
+SingleUserCode.x64=Zero
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=FAE5
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+SLInitHook.x64=1
+SLInitOffset.x64=234DC
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [10.0.15063.1155]
 LocalOnlyPatch.x64=1
 LocalOnlyOffset.x64=8CB01
@@ -2975,6 +2997,46 @@ SLInitHook.x64=1
 SLInitOffset.x64=22E6C
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[10.0.17723.1000]
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=75D91
+LocalOnlyCode.x64=jmpshort
+SingleUserPatch.x64=1
+SingleUserOffset.x64=1296C
+SingleUserCode.x64=Zero
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=17A45
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+SLInitHook.x64=1
+SLInitOffset.x64=1B10C
+SLInitFunc.x64=New_CSLQuery_Initialize
+
+[10.0.17763.1]
+LocalOnlyPatch.x86=1
+LocalOnlyOffset.x86=AF8E4
+LocalOnlyCode.x86=jmpshort
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=77941
+LocalOnlyCode.x64=jmpshort
+SingleUserPatch.x86=1
+SingleUserOffset.x86=4D505
+SingleUserCode.x86=nop
+SingleUserPatch.x64=1
+SingleUserOffset.x64=1322C
+SingleUserCode.x64=Zero
+DefPolicyPatch.x86=1
+DefPolicyOffset.x86=4BD09
+DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=17F45
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+SLInitHook.x86=1
+SLInitOffset.x86=5B02A
+SLInitFunc.x86=New_CSLQuery_Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=1ABFC
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [SLInit]
 bServerSku=1
 bRemoteConnAllowed=1
@@ -4232,6 +4294,16 @@ bServerSku.x64        =E9484
 lMaxUserSessions.x64  =E9488
 bAppServerAllowed.x64 =E948C
 
+[10.0.15063.994-SLInit]
+bInitialized.x64      =E9468
+bRemoteConnAllowed.x64=E946C
+bMultimonAllowed.x64  =E9470
+ulMaxDebugSessions.x64=E9474
+bFUSEnabled.x64       =E9478
+bServerSku.x64        =E9484
+lMaxUserSessions.x64  =E9488
+bAppServerAllowed.x64 =E948C
+
 [10.0.15063.1155-SLInit]
 bInitialized.x64      =E9468
 bRemoteConnAllowed.x64=E946C
@@ -4868,3 +4940,32 @@ bRemoteConnAllowed.x64=F2434
 bMultimonAllowed.x64  =F2438
 ulMaxDebugSessions.x64=F243C
 bFUSEnabled.x64       =F2440
+
+[10.0.17723.1000-SLInit]
+bInitialized.x64      =E9AB0
+bServerSku.x64        =E9AB4
+lMaxUserSessions.x64  =E9AB8
+bAppServerAllowed.x64 =E9AC0
+bRemoteConnAllowed.x64=E9AC4
+bMultimonAllowed.x64  =E9AC8
+ulMaxDebugSessions.x64=E9ACC
+bFUSEnabled.x64       =E9AD0
+
+[10.0.17763.1-SLInit]
+bInitialized.x86      =CD798
+bServerSku.x86        =CD79C
+lMaxUserSessions.x86  =CD7A0
+bAppServerAllowed.x86 =CD7A8
+bRemoteConnAllowed.x86=CD7AC
+bMultimonAllowed.x86  =CD7B0
+ulMaxDebugSessions.x86=CD7B4
+bFUSEnabled.x86       =CD7B8
+
+bInitialized.x64      =ECAB0
+bServerSku.x64        =ECAB4
+lMaxUserSessions.x64  =ECAB8
+bAppServerAllowed.x64 =ECAC0
+bRemoteConnAllowed.x64=ECAC4
+bMultimonAllowed.x64  =ECAC8
+ulMaxDebugSessions.x64=ECACC
+bFUSEnabled.x64       =ECAD0
diff --git a/technical.txt b/technical.txt
index a7f7405..57ac9aa 100644
--- a/technical.txt
+++ b/technical.txt
@@ -43,6 +43,7 @@ Terminal Services supported versions
 6.1.7601.18637   (Windows 7 SP1 with KB3003743 GDR)             [policy hook + extended patch]
 6.1.7601.22843   (Windows 7 SP1 with KB3003743 LDR)             [policy hook + extended patch]
 6.1.7601.23403   (Windows 7 SP1 with KB3125574)                 [policy hook + extended patch]
+6.1.7601.24234   (Windows 7 SP1 with unknown KB)                [policy hook + extended patch]
 6.2.8102.0       (Windows 8 Developer Preview)                  [policy hook + extended patch]
 6.2.8250.0       (Windows 8 Consumer Preview)                   [policy hook + extended patch]
 6.2.8400.0       (Windows 8 Release Preview)                    [policy hook + extended patch]
@@ -122,7 +123,7 @@ Terminal Services supported versions
 10.0.15061.0     (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 10.0.15063.0     (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 10.0.15063.296   (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
-10.0.15063.994   (Windows 10 WinBuild.160101.0800)              [todo]
+10.0.15063.994   (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 10.0.15063.1155  (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 10.0.16179.1000  (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 10.0.16184.1001  (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
@@ -160,9 +161,17 @@ Terminal Services supported versions
 10.0.17128.1     (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 10.0.17133.1     (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 10.0.17134.1     (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
+10.0.17723.1000  (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
+10.0.17763.1     (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 
 Source code changelog (rdpwrap library):
 
+2018.10.03 :
+- added support for termsrv.dll 6.1.7601.24234 x64
+- added support for termsrv.dll 10.0.15063.994 x64
+- added support for termsrv.dll 10.0.17723.1000 x64
+- added support for termsrv.dll 10.0.17763.1
+
 2018.09.10 :
 - added support for termsrv.dll 6.1.7600.20890
 - added support for termsrv.dll 6.1.7600.21316