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

10.0.10586.589 x86/x64

README.md

@@ -268,6 +268,7 @@ Visit [issues](https://github.com/stascorp/rdpwrap/issues) section, and check wh
 - 10.0.10041.0 (Windows 10 Pro Technical Preview Update 1)
 - 10.0.10240.16384 (Windows 10 RTM)
 - 10.0.10586.0 (Windows 10 TH2 Release 151029-1700)
+- 10.0.10586.589 (Windows 10 TH2 Release 160906-1759 with KB3185614)
 - 10.0.11082.1000 (Windows 10 RS1 Release 151210-2021)
 - 10.0.11102.1000 (Windows 10 RS1 Release 160113-1800)
 - 10.0.14251.1000 (Windows 10 RS1 Release 160124-1059)

res/rdpwrap-ini-kb.txt

@@ -1,6 +1,6 @@
 [Main]
 ; Last updated date
-Updated=2016-09-03
+Updated=2016-09-14
 ; Address to log file (RDP Wrapper will write it, if exists)
 LogFile=\rdpwrap.txt
 ; Hook SLPolicy API on Windows NT 6.0
@@ -1486,6 +1486,36 @@ SLInitHook.x64=1
 SLInitOffset.x64=25220
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[10.0.10586.589]
+; Patch CEnforcementCore::GetInstanceOfTSLicense
+LocalOnlyPatch.x86=1
+LocalOnlyOffset.x86=A7BE8
+LocalOnlyCode.x86=jmpshort
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=96A51
+LocalOnlyCode.x64=jmpshort
+; Patch CSessionArbitrationHelper::IsSingleSessionPerUserEnabled
+SingleUserPatch.x86=1
+SingleUserOffset.x86=353B5
+SingleUserCode.x86=nop
+SingleUserPatch.x64=1
+SingleUserOffset.x64=190D4
+SingleUserCode.x64=Zero
+; Patch CDefPolicy::Query
+DefPolicyPatch.x86=1
+DefPolicyOffset.x86=30B69
+DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=229A5
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+; Hook CSLQuery::Initialize
+SLInitHook.x86=1
+SLInitOffset.x86=469DE
+SLInitFunc.x86=New_CSLQuery_Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=25220
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [10.0.11082.1000]
 ; Patch CEnforcementCore::GetInstanceOfTSLicense
 LocalOnlyPatch.x86=1
@@ -2408,6 +2438,25 @@ bMultimonAllowed.x64  =F3468
 ulMaxDebugSessions.x64=F346C
 bRemoteConnAllowed.x64=F3470
 
+[10.0.10586.589-SLInit]
+bFUSEnabled.x86       =C3F60
+lMaxUserSessions.x86  =C3F64
+bAppServerAllowed.x86 =C3F68
+bInitialized.x86      =C3F6C
+bMultimonAllowed.x86  =C3F70
+bServerSku.x86        =C3F74
+ulMaxDebugSessions.x86=C3F78
+bRemoteConnAllowed.x86=C3F7C
+
+lMaxUserSessions.x64  =F23B0
+bAppServerAllowed.x64 =F23B4
+bServerSku.x64        =F23B8
+bFUSEnabled.x64       =F3460
+bInitialized.x64      =F3464
+bMultimonAllowed.x64  =F3468
+ulMaxDebugSessions.x64=F346C
+bRemoteConnAllowed.x64=F3470
+
 [10.0.11082.1000-SLInit]
 bFUSEnabled.x86       =C3F60
 lMaxUserSessions.x86  =C3F64

res/rdpwrap.ini

@@ -2,7 +2,7 @@
 ; Do not modify without special knowledge
 
 [Main]
-Updated=2016-09-03
+Updated=2016-09-14
 LogFile=\rdpwrap.txt
 SLPolicyHookNT60=1
 SLPolicyHookNT61=1
@@ -609,6 +609,32 @@ SLInitHook.x64=1
 SLInitOffset.x64=25220
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[10.0.10586.589]
+LocalOnlyPatch.x86=1
+LocalOnlyOffset.x86=A7BE8
+LocalOnlyCode.x86=jmpshort
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=96A51
+LocalOnlyCode.x64=jmpshort
+SingleUserPatch.x86=1
+SingleUserOffset.x86=353B5
+SingleUserCode.x86=nop
+SingleUserPatch.x64=1
+SingleUserOffset.x64=190D4
+SingleUserCode.x64=Zero
+DefPolicyPatch.x86=1
+DefPolicyOffset.x86=30B69
+DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=229A5
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+SLInitHook.x86=1
+SLInitOffset.x86=469DE
+SLInitFunc.x86=New_CSLQuery_Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=25220
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [10.0.11082.1000]
 LocalOnlyPatch.x86=1
 LocalOnlyOffset.x86=A7C98
@@ -1414,6 +1440,25 @@ bMultimonAllowed.x64  =F3468
 ulMaxDebugSessions.x64=F346C
 bRemoteConnAllowed.x64=F3470
 
+[10.0.10586.589-SLInit]
+bFUSEnabled.x86       =C3F60
+lMaxUserSessions.x86  =C3F64
+bAppServerAllowed.x86 =C3F68
+bInitialized.x86      =C3F6C
+bMultimonAllowed.x86  =C3F70
+bServerSku.x86        =C3F74
+ulMaxDebugSessions.x86=C3F78
+bRemoteConnAllowed.x86=C3F7C
+
+lMaxUserSessions.x64  =F23B0
+bAppServerAllowed.x64 =F23B4
+bServerSku.x64        =F23B8
+bFUSEnabled.x64       =F3460
+bInitialized.x64      =F3464
+bMultimonAllowed.x64  =F3468
+ulMaxDebugSessions.x64=F346C
+bRemoteConnAllowed.x64=F3470
+
 [10.0.11082.1000-SLInit]
 bFUSEnabled.x86       =C3F60
 lMaxUserSessions.x86  =C3F64

technical.txt

@@ -65,6 +65,7 @@ Terminal Services supported versions
 10.0.10532.0     (Windows 10 th2_release.150822-1406)           [todo]
 10.0.10547.0     (Windows 10 th2_release.150913-1511)           [todo]
 10.0.10586.0     (Windows 10 th2_release.151029-1700)           [init hook + extended patch]
+10.0.10586.589   (Windows 10 th2_release.160906-1759)           [init hook + extended patch]
 10.0.11082.1000  (Windows 10 rs1_release.151210-2021)           [init hook + extended patch]
 10.0.11102.1000  (Windows 10 rs1_release.160113-1800)           [init hook + extended patch]
 10.0.14251.1000  (Windows 10 rs1_release.160124-1059)           [init hook + extended patch]
@@ -91,6 +92,9 @@ Terminal Services supported versions
 
 Source code changelog (rdpwrap library):
 
+2016.09.14 :
+- added support for termsrv.dll 10.0.10586.589
+
 2016.09.03 :
 - added support for termsrv.dll 10.0.14915.1000