INI: Add support for new builds (fix #269)

6.3.9600.18692 x86/x64

4 files changed, 100 insertions, 1 deletions

diff --git a/README.md b/README.md
index 8ee1604..79e5040 100644
--- a/README.md
+++ b/README.md
@@ -286,6 +286,7 @@ Visit [issues](https://github.com/stascorp/rdpwrap/issues) section, and check wh
 - 6.3.9600.16384 (Windows 8.1 / Server 2012 R2)
 - 6.3.9600.17095 (Windows 8.1 with KB2959626)
 - 6.3.9600.17415 (Windows 8.1 with KB3000850)
+- 6.3.9600.18692 (Windows 8.1 with KB4022720)
 - 6.4.9841.0 (Windows 10 Technical Preview)
 - 6.4.9860.0 (Windows 10 Technical Preview Update 1)
 - 6.4.9879.0 (Windows 10 Technical Preview Update 2)
diff --git a/res/rdpwrap-ini-kb.txt b/res/rdpwrap-ini-kb.txt
index 0871c9f..49634e9 100644
--- a/res/rdpwrap-ini-kb.txt
+++ b/res/rdpwrap-ini-kb.txt
@@ -1125,6 +1125,36 @@ SLInitHook.x64=1
 SLInitOffset.x64=5DBC0
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[6.3.9600.18692]
+; Patch CEnforcementCore::GetInstanceOfTSLicense
+LocalOnlyPatch.x86=1
+LocalOnlyOffset.x86=B3458
+LocalOnlyCode.x86=jmpshort
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=8B2E9
+LocalOnlyCode.x64=nopjmp
+; Patch CSessionArbitrationHelper::IsSingleSessionPerUserEnabled
+SingleUserPatch.x86=1
+SingleUserOffset.x86=37105
+SingleUserCode.x86=nop
+SingleUserPatch.x64=1
+SingleUserOffset.x64=37039
+SingleUserCode.x64=Zero
+; Patch CDefPolicy::Query
+DefPolicyPatch.x86=1
+DefPolicyOffset.x86=3CFE9
+DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=45835
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+; Hook CSLQuery::Initialize
+SLInitHook.x86=1
+SLInitOffset.x86=18488
+SLInitFunc.x86=New_CSLQuery_Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=5DBD0
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [6.4.9841.0]
 ; Patch CEnforcementCore::GetInstanceOfTSLicense
 ; .text:1009569B          call    sub_100B7EE5
@@ -3200,6 +3230,25 @@ bServerSku.x64        =F9068
 ulMaxDebugSessions.x64=F906C
 bRemoteConnAllowed.x64=F9070
 
+[6.3.9600.18692-SLInit]
+bFUSEnabled.x86       =D3068
+lMaxUserSessions.x86  =D306C
+bAppServerAllowed.x86 =D3070
+bInitialized.x86      =D3074
+bMultimonAllowed.x86  =D3078
+bServerSku.x86        =D307C
+ulMaxDebugSessions.x86=D3080
+bRemoteConnAllowed.x86=D3084
+
+bFUSEnabled.x64       =F9054
+lMaxUserSessions.x64  =F9058
+bAppServerAllowed.x64 =F905C
+bInitialized.x64      =F9060
+bMultimonAllowed.x64  =F9064
+bServerSku.x64        =F9068
+ulMaxDebugSessions.x64=F906C
+bRemoteConnAllowed.x64=F9070
+
 [6.4.9841.0-SLInit]
 bFUSEnabled.x86       =BF9F0
 lMaxUserSessions.x86  =BF9F4
diff --git a/res/rdpwrap.ini b/res/rdpwrap.ini
index b120c96..ea7ed71 100644
--- a/res/rdpwrap.ini
+++ b/res/rdpwrap.ini
@@ -2,7 +2,7 @@
 ; Do not modify without special knowledge
 
 [Main]
-Updated=2017-06-10
+Updated=2017-06-29
 LogFile=\rdpwrap.txt
 SLPolicyHookNT60=1
 SLPolicyHookNT61=1
@@ -428,6 +428,32 @@ SLInitHook.x64=1
 SLInitOffset.x64=5DBC0
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[6.3.9600.18692]
+LocalOnlyPatch.x86=1
+LocalOnlyOffset.x86=B3458
+LocalOnlyCode.x86=jmpshort
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=8B2E9
+LocalOnlyCode.x64=nopjmp
+SingleUserPatch.x86=1
+SingleUserOffset.x86=37105
+SingleUserCode.x86=nop
+SingleUserPatch.x64=1
+SingleUserOffset.x64=37039
+SingleUserCode.x64=Zero
+DefPolicyPatch.x86=1
+DefPolicyOffset.x86=3CFE9
+DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=45835
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+SLInitHook.x86=1
+SLInitOffset.x86=18488
+SLInitFunc.x86=New_CSLQuery_Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=5DBD0
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [6.4.9841.0]
 LocalOnlyPatch.x86=1
 LocalOnlyOffset.x86=956A8
@@ -2078,6 +2104,25 @@ bServerSku.x64        =F9068
 ulMaxDebugSessions.x64=F906C
 bRemoteConnAllowed.x64=F9070
 
+[6.3.9600.18692-SLInit]
+bFUSEnabled.x86       =D3068
+lMaxUserSessions.x86  =D306C
+bAppServerAllowed.x86 =D3070
+bInitialized.x86      =D3074
+bMultimonAllowed.x86  =D3078
+bServerSku.x86        =D307C
+ulMaxDebugSessions.x86=D3080
+bRemoteConnAllowed.x86=D3084
+
+bFUSEnabled.x64       =F9054
+lMaxUserSessions.x64  =F9058
+bAppServerAllowed.x64 =F905C
+bInitialized.x64      =F9060
+bMultimonAllowed.x64  =F9064
+bServerSku.x64        =F9068
+ulMaxDebugSessions.x64=F906C
+bRemoteConnAllowed.x64=F9070
+
 [6.4.9841.0-SLInit]
 bFUSEnabled.x86       =BF9F0
 lMaxUserSessions.x86  =BF9F4
diff --git a/technical.txt b/technical.txt
index f015525..5d75566 100644
--- a/technical.txt
+++ b/technical.txt
@@ -53,6 +53,7 @@ Terminal Services supported versions
 6.3.9600.16384   (Windows 8.1)                                  [init hook + extended patch]
 6.3.9600.17095   (Windows 8.1 with KB2959626)                   [init hook + extended patch]
 6.3.9600.17415   (Windows 8.1 with KB3000850)                   [init hook + extended patch]
+6.3.9600.18692   (Windows 8.1 with KB4022720)                   [init hook + extended patch]
 6.4.9841.0       (Windows 10 Technical Preview)                 [init hook + extended patch]
 6.4.9860.0       (Windows 10 Technical Preview UP1)             [init hook + extended patch]
 6.4.9879.0       (Windows 10 Technical Preview UP2)             [init hook + extended patch]
@@ -123,6 +124,9 @@ Terminal Services supported versions
 
 Source code changelog (rdpwrap library):
 
+2017.06.29 :
+- added support for termsrv.dll 6.3.9600.18692
+
 2017.06.10 :
 - added support for termsrv.dll 10.0.15063.296
 - added support for termsrv.dll 10.0.16215.1000