From 1e93d3ca2024d129f72f83ec68c18fd101fa2e64 Mon Sep 17 00:00:00 2001
From: binarymaster <x86corez@gmail.com>
Date: Fri, 3 Feb 2017 01:53:42 +0300
Subject: [PATCH] INI: Add support for new builds (fix #204)

10.0.15025.1000 (x64 only)
---
 README.md              |  1 +
 res/rdpwrap-ini-kb.txt | 30 +++++++++++++++++++++++++++++-
 res/rdpwrap.ini        | 26 +++++++++++++++++++++++++-
 technical.txt          |  4 ++++
 4 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ae1ae87..44ce24b 100644
--- a/README.md
+++ b/README.md
@@ -322,6 +322,7 @@ Visit [issues](https://github.com/stascorp/rdpwrap/issues) section, and check wh
 - 10.0.15007.1000 (Windows 10 Build 160101.0800)
 - 10.0.15014.1000 (Windows 10 Build 160101.0800)
 - 10.0.15019.1000 (Windows 10 RS Pre-Release 170121-1513)
+- 10.0.15025.1000 (Windows 10 RS Pre-Release 170127-1750)
 
 #### 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 38e7680..0609bc7 100644
--- a/res/rdpwrap-ini-kb.txt
+++ b/res/rdpwrap-ini-kb.txt
@@ -1,6 +1,6 @@
 [Main]
 ; Last updated date
-Updated=2017-01-28
+Updated=2017-02-03
 ; Address to log file (RDP Wrapper will write it, if exists)
 LogFile=\rdpwrap.txt
 ; Hook SLPolicy API on Windows NT 6.0
@@ -2647,6 +2647,24 @@ SLInitHook.x64=1
 SLInitOffset.x64=24480
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[10.0.15025.1000]
+; Patch CEnforcementCore::GetInstanceOfTSLicense
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=9259B
+LocalOnlyCode.x64=jmpshort
+; Patch CSessionArbitrationHelper::IsSingleSessionPerUserEnabled
+SingleUserPatch.x64=1
+SingleUserOffset.x64=2C08D
+SingleUserCode.x64=Zero
+; Patch CDefPolicy::Query
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=1DD0E
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+; Hook CSLQuery::Initialize
+SLInitHook.x64=1
+SLInitOffset.x64=E5B8
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [SLInit]
 ; Is server
 bServerSku=1
@@ -3621,3 +3639,13 @@ bRemoteConnAllowed.x64=F0494
 bMultimonAllowed.x64  =F0498
 ulMaxDebugSessions.x64=F049C
 bFUSEnabled.x64       =F04A0
+
+[10.0.15025.1000-SLInit]
+bServerSku.x64        =EE3E0
+lMaxUserSessions.x64  =EE3E4
+bAppServerAllowed.x64 =EE3E8
+bInitialized.x64      =EF488
+bRemoteConnAllowed.x64=EF48C
+bMultimonAllowed.x64  =EF490
+ulMaxDebugSessions.x64=EF494
+bFUSEnabled.x64       =EF498
diff --git a/res/rdpwrap.ini b/res/rdpwrap.ini
index 3280615..8c416c9 100644
--- a/res/rdpwrap.ini
+++ b/res/rdpwrap.ini
@@ -2,7 +2,7 @@
 ; Do not modify without special knowledge
 
 [Main]
-Updated=2017-01-28
+Updated=2017-02-03
 LogFile=\rdpwrap.txt
 SLPolicyHookNT60=1
 SLPolicyHookNT61=1
@@ -1612,6 +1612,20 @@ SLInitHook.x64=1
 SLInitOffset.x64=24480
 SLInitFunc.x64=New_CSLQuery_Initialize
 
+[10.0.15025.1000]
+LocalOnlyPatch.x64=1
+LocalOnlyOffset.x64=9259B
+LocalOnlyCode.x64=jmpshort
+SingleUserPatch.x64=1
+SingleUserOffset.x64=2C08D
+SingleUserCode.x64=Zero
+DefPolicyPatch.x64=1
+DefPolicyOffset.x64=1DD0E
+DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+SLInitHook.x64=1
+SLInitOffset.x64=E5B8
+SLInitFunc.x64=New_CSLQuery_Initialize
+
 [SLInit]
 bServerSku=1
 bRemoteConnAllowed=1
@@ -2562,3 +2576,13 @@ bRemoteConnAllowed.x64=F0494
 bMultimonAllowed.x64  =F0498
 ulMaxDebugSessions.x64=F049C
 bFUSEnabled.x64       =F04A0
+
+[10.0.15025.1000-SLInit]
+bServerSku.x64        =EE3E0
+lMaxUserSessions.x64  =EE3E4
+bAppServerAllowed.x64 =EE3E8
+bInitialized.x64      =EF488
+bRemoteConnAllowed.x64=EF48C
+bMultimonAllowed.x64  =EF490
+ulMaxDebugSessions.x64=EF494
+bFUSEnabled.x64       =EF498
diff --git a/technical.txt b/technical.txt
index 557217e..23ec30f 100644
--- a/technical.txt
+++ b/technical.txt
@@ -104,9 +104,13 @@ Terminal Services supported versions
 10.0.15007.1000  (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 10.0.15014.1000  (Windows 10 WinBuild.160101.0800)              [init hook + extended patch]
 10.0.15019.1000  (Windows 10 rs_prerelease.170121-1513)         [init hook + extended patch]
+10.0.15025.1000  (Windows 10 rs_prerelease.170127-1750)         [init hook + extended patch]
 
 Source code changelog (rdpwrap library):
 
+2017.02.03 :
+- added support for termsrv.dll 10.0.15025.1000 x64
+
 2017.01.28 :
 - added support for termsrv.dll 10.0.15019.1000