Improved support for Windows 10 build 15007 (resolved RFG conflict)

rwfpl · Jan 17, 2017 · fd28b57 · fd28b57
1 parent 97e1073
commit fd28b57
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,14 @@
 *.opensdf
 *.sdf
 *.suo
+*.obj
+*.ilk
+*.db
+*.user
+*.opendb
+*.pdb
 src/Release/*
+src/Debug/*
+sample/*.exe
+sample/*.dll
+sample/*.lib
diff --git a/bin/wow64ext.dll b/bin/wow64ext.dll
diff --git a/bin/wow64ext.lib b/bin/wow64ext.lib
diff --git a/doc/wow64ext.txt b/doc/wow64ext.txt
@@ -2,8 +2,8 @@
 Name....: WOW64Ext Library
 Author..: ReWolf
 Rel.Date: 12.I.2012
-Update..: 11.XII.2015
-Version.: 1.0.0.8
+Update..: 18.I.2017
+Version.: 1.0.0.9
 
 
 e.mail..: [email protected]

diff --git a/src/wow64ext.cpp b/src/wow64ext.cpp
@@ -21,6 +21,7 @@
  */
 
 #include <Windows.h>
+#include <cstddef>
 #include "internal.h"
 #include "wow64ext.h"
 #include "CMemPtr.h"
@@ -89,9 +90,15 @@ extern "C" __declspec(dllexport) DWORD64 __cdecl X64Call(DWORD64 func, int argC,
     // conversion to QWORD for easier use in inline assembly
     reg64 _argC = { (DWORD64)argC };
     DWORD back_esp = 0;
+	WORD back_fs = 0;
 
     __asm
     {
+        ;// reset FS segment, to properly handle RFG
+        mov    back_fs, fs
+        mov    eax, 0x2B
+        mov    fs, ax
+
         ;// keep original esp in back_esp variable
         mov    back_esp, esp
 
@@ -157,9 +164,13 @@ _ls_e:                                                  ;//
 
         X64_End();
 
-		mov    ax, ds
-		mov    ss, ax
+        mov    ax, ds
+        mov    ss, ax
         mov    esp, back_esp
+
+        ;// restore FS segment
+        mov    ax, back_fs
+        mov    fs, ax
     }
     return _rax.v;
 }

diff --git a/src/wow64ext.rc b/src/wow64ext.rc
diff --git a/src/wow64ext.vcxproj b/src/wow64ext.vcxproj
@@ -28,7 +28,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -45,6 +45,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>