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

6.3.9600.18708 x86/x64

4 files changed, 101 insertions, 2 deletions

diff --git a/README.md b/README.md
index 79e5040..784fcc8 100644
--- a/README.md
+++ b/README.md
@@ -287,6 +287,7 @@ Visit [issues](https://github.com/stascorp/rdpwrap/issues) section, and check wh
 - 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.3.9600.18708 (Windows 8.1 with KB4025335)
 - 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 49634e9..dd8ad51 100644
--- a/res/rdpwrap-ini-kb.txt
+++ b/res/rdpwrap-ini-kb.txt
@@ -1,6 +1,6 @@
 [Main]
 ; Last updated date
-Updated=2017-06-10
+Updated=2017-07-30
 ; Address to log file (RDP Wrapper will write it, if exists)
 LogFile=\rdpwrap.txt
 ; Hook SLPolicy API on Windows NT 6.0
@@ -1155,6 +1155,36 @@ SLInitHook.x64=1
 SLInitOffset.x64=5DBD0
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[6.3.9600.18708]
+; Patch CEnforcementCore::GetInstanceOfTSLicense
+LocalOnlyPatch.x86=1
+LocalOnlyOffset.x86=B35D8
+LocalOnlyCode.x86=jmpshort
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=8B376
+LocalOnlyCode.x64=nopjmp
+; Patch CSessionArbitrationHelper::IsSingleSessionPerUserEnabled
+SingleUserPatch.x86=1
+SingleUserOffset.x86=370F5
+SingleUserCode.x86=nop
+SingleUserPatch.x64=1
+SingleUserOffset.x64=36FE9
+SingleUserCode.x64=Zero
+; Patch CDefPolicy::Query
+DefPolicyPatch.x86=1
+DefPolicyOffset.x86=3CFD9
+DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=457D5
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+; Hook CSLQuery::Initialize
+SLInitHook.x86=1
+SLInitOffset.x86=18308
+SLInitFunc.x86=New_CSLQuery_Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=5DB70
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [6.4.9841.0]
 ; Patch CEnforcementCore::GetInstanceOfTSLicense
 ; .text:1009569B          call    sub_100B7EE5
@@ -3249,6 +3279,25 @@ bServerSku.x64        =F9068
 ulMaxDebugSessions.x64=F906C
 bRemoteConnAllowed.x64=F9070
 
+[6.3.9600.18708-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       =FA054
+lMaxUserSessions.x64  =FA058
+bAppServerAllowed.x64 =FA05C
+bInitialized.x64      =FA060
+bMultimonAllowed.x64  =FA064
+bServerSku.x64        =FA068
+ulMaxDebugSessions.x64=FA06C
+bRemoteConnAllowed.x64=FA070
+
 [6.4.9841.0-SLInit]
 bFUSEnabled.x86       =BF9F0
 lMaxUserSessions.x86  =BF9F4
diff --git a/res/rdpwrap.ini b/res/rdpwrap.ini
index ea7ed71..cd6bf76 100644
--- a/res/rdpwrap.ini
+++ b/res/rdpwrap.ini
@@ -2,7 +2,7 @@
 ; Do not modify without special knowledge
 
 [Main]
-Updated=2017-06-29
+Updated=2017-07-30
 LogFile=\rdpwrap.txt
 SLPolicyHookNT60=1
 SLPolicyHookNT61=1
@@ -454,6 +454,32 @@ SLInitHook.x64=1
 SLInitOffset.x64=5DBD0
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[6.3.9600.18708]
+LocalOnlyPatch.x86=1
+LocalOnlyOffset.x86=B35D8
+LocalOnlyCode.x86=jmpshort
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=8B376
+LocalOnlyCode.x64=nopjmp
+SingleUserPatch.x86=1
+SingleUserOffset.x86=370F5
+SingleUserCode.x86=nop
+SingleUserPatch.x64=1
+SingleUserOffset.x64=36FE9
+SingleUserCode.x64=Zero
+DefPolicyPatch.x86=1
+DefPolicyOffset.x86=3CFD9
+DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=457D5
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+SLInitHook.x86=1
+SLInitOffset.x86=18308
+SLInitFunc.x86=New_CSLQuery_Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=5DB70
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [6.4.9841.0]
 LocalOnlyPatch.x86=1
 LocalOnlyOffset.x86=956A8
@@ -2123,6 +2149,25 @@ bServerSku.x64        =F9068
 ulMaxDebugSessions.x64=F906C
 bRemoteConnAllowed.x64=F9070
 
+[6.3.9600.18708-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       =FA054
+lMaxUserSessions.x64  =FA058
+bAppServerAllowed.x64 =FA05C
+bInitialized.x64      =FA060
+bMultimonAllowed.x64  =FA064
+bServerSku.x64        =FA068
+ulMaxDebugSessions.x64=FA06C
+bRemoteConnAllowed.x64=FA070
+
 [6.4.9841.0-SLInit]
 bFUSEnabled.x86       =BF9F0
 lMaxUserSessions.x86  =BF9F4
diff --git a/technical.txt b/technical.txt
index 5d75566..359edb2 100644
--- a/technical.txt
+++ b/technical.txt
@@ -54,6 +54,7 @@ Terminal Services supported versions
 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.3.9600.18708   (Windows 8.1 with KB4025335)                   [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]
@@ -124,6 +125,9 @@ Terminal Services supported versions
 
 Source code changelog (rdpwrap library):
 
+2017.07.30 :
+- added support for termsrv.dll 6.3.9600.18708
+
 2017.06.29 :
 - added support for termsrv.dll 6.3.9600.18692