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

10.0.15061.0 x86/x64

4 files changed, 101 insertions, 2 deletions

diff --git a/README.md b/README.md
index 9935023..56e2051 100644
--- a/README.md
+++ b/README.md
@@ -339,6 +339,7 @@ Visit [issues](https://github.com/stascorp/rdpwrap/issues) section, and check wh
 - 10.0.15048.0 (Windows 10 Build 160101.0800)
 - 10.0.15055.0 (Windows 10 Build 160101.0800)
 - 10.0.15058.0 (Windows 10 Build 160101.0800)
+- 10.0.15061.0 (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 f4138fd..cabbe22 100644
--- a/res/rdpwrap-ini-kb.txt
+++ b/res/rdpwrap-ini-kb.txt
@@ -1,6 +1,6 @@
 [Main]
 ; Last updated date
-Updated=2017-03-16
+Updated=2017-03-21
 ; Address to log file (RDP Wrapper will write it, if exists)
 LogFile=\rdpwrap.txt
 ; Hook SLPolicy API on Windows NT 6.0
@@ -2845,6 +2845,36 @@ SLInitHook.x64=1
 SLInitOffset.x64=D1EC
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[10.0.15061.0]
+; Patch CEnforcementCore::GetInstanceOfTSLicense
+LocalOnlyPatch.x86=1
+LocalOnlyOffset.x86=A5D68
+LocalOnlyCode.x86=jmpshort
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=8CAA1
+LocalOnlyCode.x64=jmpshort
+; Patch CSessionArbitrationHelper::IsSingleSessionPerUserEnabled
+SingleUserPatch.x86=1
+SingleUserOffset.x86=35075
+SingleUserCode.x86=nop
+SingleUserPatch.x64=1
+SingleUserOffset.x64=24E74
+SingleUserCode.x64=Zero
+; Patch CDefPolicy::Query
+DefPolicyPatch.x86=1
+DefPolicyOffset.x86=2FCD9
+DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=2DD65
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+; Hook CSLQuery::Initialize
+SLInitHook.x86=1
+SLInitOffset.x86=4549D
+SLInitFunc.x86=New_CSLQuery_Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=D1EC
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [SLInit]
 ; Is server
 bServerSku=1
@@ -3943,3 +3973,22 @@ bFUSEnabled.x64       =E9478
 bServerSku.x64        =E9484
 lMaxUserSessions.x64  =E9488
 bAppServerAllowed.x64 =E948C
+
+[10.0.15061.0-SLInit]
+bInitialized.x86      =C2F70
+bServerSku.x86        =C2F74
+lMaxUserSessions.x86  =C2F78
+bAppServerAllowed.x86 =C2F7C
+bRemoteConnAllowed.x86=C2F80
+bMultimonAllowed.x86  =C2F84
+ulMaxDebugSessions.x86=C2F88
+bFUSEnabled.x86       =C2F8C
+
+bInitialized.x64      =E9468
+bRemoteConnAllowed.x64=E946C
+bMultimonAllowed.x64  =E9470
+ulMaxDebugSessions.x64=E9474
+bFUSEnabled.x64       =E9478
+bServerSku.x64        =E9484
+lMaxUserSessions.x64  =E9488
+bAppServerAllowed.x64 =E948C
diff --git a/res/rdpwrap.ini b/res/rdpwrap.ini
index e14bce7..1079695 100644
--- a/res/rdpwrap.ini
+++ b/res/rdpwrap.ini
@@ -2,7 +2,7 @@
 ; Do not modify without special knowledge
 
 [Main]
-Updated=2017-03-16
+Updated=2017-03-21
 LogFile=\rdpwrap.txt
 SLPolicyHookNT60=1
 SLPolicyHookNT61=1
@@ -1782,6 +1782,32 @@ SLInitHook.x64=1
 SLInitOffset.x64=D1EC
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[10.0.15061.0]
+LocalOnlyPatch.x86=1
+LocalOnlyOffset.x86=A5D68
+LocalOnlyCode.x86=jmpshort
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=8CAA1
+LocalOnlyCode.x64=jmpshort
+SingleUserPatch.x86=1
+SingleUserOffset.x86=35075
+SingleUserCode.x86=nop
+SingleUserPatch.x64=1
+SingleUserOffset.x64=24E74
+SingleUserCode.x64=Zero
+DefPolicyPatch.x86=1
+DefPolicyOffset.x86=2FCD9
+DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=2DD65
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+SLInitHook.x86=1
+SLInitOffset.x86=4549D
+SLInitFunc.x86=New_CSLQuery_Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=D1EC
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [SLInit]
 bServerSku=1
 bRemoteConnAllowed=1
@@ -2856,3 +2882,22 @@ bFUSEnabled.x64       =E9478
 bServerSku.x64        =E9484
 lMaxUserSessions.x64  =E9488
 bAppServerAllowed.x64 =E948C
+
+[10.0.15061.0-SLInit]
+bInitialized.x86      =C2F70
+bServerSku.x86        =C2F74
+lMaxUserSessions.x86  =C2F78
+bAppServerAllowed.x86 =C2F7C
+bRemoteConnAllowed.x86=C2F80
+bMultimonAllowed.x86  =C2F84
+ulMaxDebugSessions.x86=C2F88
+bFUSEnabled.x86       =C2F8C
+
+bInitialized.x64      =E9468
+bRemoteConnAllowed.x64=E946C
+bMultimonAllowed.x64  =E9470
+ulMaxDebugSessions.x64=E9474
+bFUSEnabled.x64       =E9478
+bServerSku.x64        =E9484
+lMaxUserSessions.x64  =E9488
+bAppServerAllowed.x64 =E948C
diff --git a/technical.txt b/technical.txt
index 277e241..354f3f6 100644
--- a/technical.txt
+++ b/technical.txt
@@ -111,9 +111,13 @@ Terminal Services supported versions
 10.0.15048.0     (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 10.0.15055.0     (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 10.0.15058.0     (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
+10.0.15061.0     (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 
 Source code changelog (rdpwrap library):
 
+2017.03.21 :
+- added support for termsrv.dll 10.0.15061.0
+
 2017.03.16 :
 - added support for termsrv.dll 10.0.15058.0