From a650e1e4f3cb857f02727c820c8bf22087e431b7 Mon Sep 17 00:00:00 2001
From: RadWolfie <RadWolfie@users.noreply.github.com>
Date: Wed, 29 Aug 2018 14:14:52 -0500
Subject: [PATCH] Move Xapi, XInput, and DInput into their own folder

Both XInput and DInput are migrated together. It's best to keep them in XInput folder.

As for Xapi files, may not require any plugin? Or possible put into their own folder?
---
 build/win32/Cxbx.vcxproj                      | 22 ++++----------
 build/win32/Cxbx.vcxproj.filters              | 30 +++++++++++--------
 src/CxbxKrnl/EmuXTL.h                         |  6 ++--
 .../HLE/XAPI/XInput/DInput.cpp}               |  8 ++---
 .../HLE/XAPI/XInput/DInput.h}                 |  0
 .../HLE/XAPI/XInput/XInput.cpp}               | 10 +++----
 .../HLE/XAPI/XInput/XInput.h}                 |  0
 .../EmuXapi.cpp => core/HLE/XAPI/Xapi.cpp}    | 14 ++++-----
 .../EmuXapi.h => core/HLE/XAPI/Xapi.h}        |  0
 9 files changed, 43 insertions(+), 47 deletions(-)
 rename src/{CxbxKrnl/EmuDInput.cpp => core/HLE/XAPI/XInput/DInput.cpp} (97%)
 rename src/{CxbxKrnl/EmuDInput.h => core/HLE/XAPI/XInput/DInput.h} (100%)
 rename src/{CxbxKrnl/EmuXInput.cpp => core/HLE/XAPI/XInput/XInput.cpp} (98%)
 rename src/{CxbxKrnl/EmuXInput.h => core/HLE/XAPI/XInput/XInput.h} (100%)
 rename src/{CxbxKrnl/EmuXapi.cpp => core/HLE/XAPI/Xapi.cpp} (99%)
 rename src/{CxbxKrnl/EmuXapi.h => core/HLE/XAPI/Xapi.h} (100%)

diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj
index e8b74e273..499262bd0 100644
--- a/build/win32/Cxbx.vcxproj
+++ b/build/win32/Cxbx.vcxproj
@@ -227,7 +227,7 @@
     <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\State.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuDInput.h" />
+    <ClInclude Include="..\..\src\core\HLE\XAPI\XInput\DInput.h" />
     <ClInclude Include="..\..\src\core\HLE\DSound\DirectSound\DirectSound.hpp" />
     <ClInclude Include="..\..\src\core\HLE\DSound\DirectSound\DirectSoundInline.hpp" />
     <ClInclude Include="..\..\src\CxbxKrnl\EmuFile.h" />
@@ -240,9 +240,9 @@
     <ClInclude Include="..\..\src\CxbxKrnl\EmuSha.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\EmuX86.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\EmuXactEng.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuXapi.h" />
+    <ClInclude Include="..\..\src\core\HLE\XAPI\Xapi.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\EmuXG.h" />
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuXInput.h" />
+    <ClInclude Include="..\..\src\core\HLE\XAPI\XInput\XInput.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\EmuXOnline.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\EmuXTL.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\gloffscreen\glextensions.h" />
@@ -419,12 +419,7 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuDInput.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
+    <ClCompile Include="..\..\src\core\HLE\XAPI\XInput\DInput.cpp" />
     <ClCompile Include="..\..\src\core\HLE\DSound\DirectSound\DirectSound.cpp" />
     <ClCompile Include="..\..\src\CxbxKrnl\EmuFile.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -472,19 +467,14 @@
     <ClCompile Include="..\..\src\CxbxKrnl\EmuSha.cpp" />
     <ClCompile Include="..\..\src\CxbxKrnl\EmuX86.cpp" />
     <ClCompile Include="..\..\src\CxbxKrnl\EmuXactEng.cpp" />
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuXapi.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
+    <ClCompile Include="..\..\src\core\HLE\XAPI\Xapi.cpp" />
     <ClCompile Include="..\..\src\CxbxKrnl\EmuXG.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuXInput.cpp" />
+    <ClCompile Include="..\..\src\core\HLE\XAPI\XInput\XInput.cpp" />
     <ClCompile Include="..\..\src\CxbxKrnl\EmuXOnline.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters
index d87ae0004..6eaea4125 100644
--- a/build/win32/Cxbx.vcxproj.filters
+++ b/build/win32/Cxbx.vcxproj.filters
@@ -109,8 +109,8 @@
     <ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8.cpp">
       <Filter>Emulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuDInput.cpp">
-      <Filter>Emulator</Filter>
+    <ClCompile Include="..\..\src\core\HLE\XAPI\XInput\DInput.cpp">
+      <Filter>core\HLE\XAPI\XInput</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\core\HLE\DSound\DirectSound\DirectSound.cpp">
       <Filter>core\HLE\DSound\DirectSound</Filter>
@@ -133,14 +133,14 @@
     <ClCompile Include="..\..\src\CxbxKrnl\EmuXactEng.cpp">
       <Filter>Emulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuXapi.cpp">
-      <Filter>Emulator</Filter>
+    <ClCompile Include="..\..\src\core\HLE\XAPI\Xapi.cpp">
+      <Filter>core\HLE\XAPI</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\CxbxKrnl\EmuXG.cpp">
       <Filter>Emulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\CxbxKrnl\EmuXInput.cpp">
-      <Filter>Emulator</Filter>
+    <ClCompile Include="..\..\src\core\HLE\XAPI\XInput\XInput.cpp">
+      <Filter>core\HLE\XAPI\XInput</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\CxbxKrnl\EmuXOnline.cpp">
       <Filter>Emulator</Filter>
@@ -386,8 +386,8 @@
     <ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8Types.h">
       <Filter>Emulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuDInput.h">
-      <Filter>Emulator</Filter>
+    <ClInclude Include="..\..\src\core\HLE\XAPI\XInput\DInput.h">
+      <Filter>core\HLE\XAPI\XInput</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\core\HLE\DSound\DirectSound\DirectSound.hpp">
       <Filter>core\HLE\DSound\DirectSound</Filter>
@@ -407,14 +407,14 @@
     <ClInclude Include="..\..\src\CxbxKrnl\EmuXactEng.h">
       <Filter>Emulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuXapi.h">
-      <Filter>Emulator</Filter>
+    <ClInclude Include="..\..\src\core\HLE\XAPI\Xapi.h">
+      <Filter>core\HLE\XAPI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\CxbxKrnl\EmuXG.h">
       <Filter>Emulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\CxbxKrnl\EmuXInput.h">
-      <Filter>Emulator</Filter>
+    <ClInclude Include="..\..\src\core\HLE\XAPI\XInput\XInput.h">
+      <Filter>core\HLE\XAPI\XInput</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\CxbxKrnl\EmuXOnline.h">
       <Filter>Emulator</Filter>
@@ -777,6 +777,12 @@
     <Filter Include="core\HLE\DSound\DirectSound">
       <UniqueIdentifier>{9b3e7b4d-161e-4eeb-9338-3368e134b439}</UniqueIdentifier>
     </Filter>
+    <Filter Include="core\HLE\XAPI">
+      <UniqueIdentifier>{6f4e7159-1112-4a80-9e76-11963812811e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="core\HLE\XAPI\XInput">
+      <UniqueIdentifier>{69e32fa9-3fcd-400a-8d45-66b7ec3d555c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\resource\Cxbx.rc">
diff --git a/src/CxbxKrnl/EmuXTL.h b/src/CxbxKrnl/EmuXTL.h
index 3ae2c96a8..324a8f789 100644
--- a/src/CxbxKrnl/EmuXTL.h
+++ b/src/CxbxKrnl/EmuXTL.h
@@ -38,7 +38,7 @@
 
 namespace XTL
 {
-    #include "EmuXapi.h"
+    #include "core/HLE/XAPI/Xapi.h"
     #include "EmuD3D8.h"
     #include "EmuD3D8\Convert.h"
     #include "EmuD3D8\VertexBuffer.h"
@@ -46,12 +46,12 @@ namespace XTL
     #include "EmuD3D8\VertexShader.h"
 	#include "EmuD3D8\PixelShader.h"
     #include "EmuD3D8\State.h"
-    #include "EmuDInput.h"
+    #include "core/HLE/XAPI/XInput/DInput.h"
     #include "core/HLE/DSound/DirectSound/DirectSound.hpp"
     #include "EmuXOnline.h"
     #include "EmuXG.h"
 	#include "EmuXactEng.h"
-	#include "EmuXInput.h"
+	#include "core/HLE/XAPI/XInput/XInput.h"
 }
 
 extern XTL::IDirect3DDevice    *g_pD3DDevice;
diff --git a/src/CxbxKrnl/EmuDInput.cpp b/src/core/HLE/XAPI/XInput/DInput.cpp
similarity index 97%
rename from src/CxbxKrnl/EmuDInput.cpp
rename to src/core/HLE/XAPI/XInput/DInput.cpp
index 8016ad9e7..7e361c2ad 100644
--- a/src/CxbxKrnl/EmuDInput.cpp
+++ b/src/core/HLE/XAPI/XInput/DInput.cpp
@@ -37,10 +37,10 @@
 
 #define LOG_PREFIX CXBXR_MODULE::DINP
 
-#include "Emu.h"
-#include "EmuXTL.h"
-#include "EmuShared.h"
-#include "Common/Win32/DInputController.h"
+#include "CxbxKrnl/Emu.h"
+#include "CxbxKrnl/EmuXTL.h"
+#include "CxbxKrnl/EmuShared.h"
+#include "Common/Win32/DInputController.h"
 #include "Logging.h"
 
 // ******************************************************************
diff --git a/src/CxbxKrnl/EmuDInput.h b/src/core/HLE/XAPI/XInput/DInput.h
similarity index 100%
rename from src/CxbxKrnl/EmuDInput.h
rename to src/core/HLE/XAPI/XInput/DInput.h
diff --git a/src/CxbxKrnl/EmuXInput.cpp b/src/core/HLE/XAPI/XInput/XInput.cpp
similarity index 98%
rename from src/CxbxKrnl/EmuXInput.cpp
rename to src/core/HLE/XAPI/XInput/XInput.cpp
index 0d4b5bf0c..c35461bd4 100644
--- a/src/CxbxKrnl/EmuXInput.cpp
+++ b/src/core/HLE/XAPI/XInput/XInput.cpp
@@ -37,12 +37,12 @@
 
 #define LOG_PREFIX CXBXR_MODULE::XINP
 
-#include "Emu.h"
-#include "EmuXTL.h"
-#include "EmuShared.h"
-#include "EmuXInput.h"
+#include "CxbxKrnl/Emu.h"
+#include "CxbxKrnl/EmuXTL.h"
+#include "CxbxKrnl/EmuShared.h"
+#include "XInput.h"
 
-#include <xinput.h>
+#include <xinput.h>
 #include "Logging.h"
 
 
diff --git a/src/CxbxKrnl/EmuXInput.h b/src/core/HLE/XAPI/XInput/XInput.h
similarity index 100%
rename from src/CxbxKrnl/EmuXInput.h
rename to src/core/HLE/XAPI/XInput/XInput.h
diff --git a/src/CxbxKrnl/EmuXapi.cpp b/src/core/HLE/XAPI/Xapi.cpp
similarity index 99%
rename from src/CxbxKrnl/EmuXapi.cpp
rename to src/core/HLE/XAPI/Xapi.cpp
index f4af31186..a8eddc8ef 100644
--- a/src/CxbxKrnl/EmuXapi.cpp
+++ b/src/core/HLE/XAPI/Xapi.cpp
@@ -45,14 +45,14 @@ namespace xboxkrnl
 };
 
 #include <Shlwapi.h>
-#include "CxbxKrnl.h"
+#include "CxbxKrnl/CxbxKrnl.h"
 #include "Logging.h"
-#include "Emu.h"
-#include "EmuKrnl.h" // For DefaultLaunchDataPage
-#include "EmuFile.h"
-#include "EmuFS.h"
-#include "EmuXTL.h"
-#include "EmuShared.h"
+#include "CxbxKrnl/Emu.h"
+#include "CxbxKrnl/EmuKrnl.h" // For DefaultLaunchDataPage
+#include "CxbxKrnl/EmuFile.h"
+#include "CxbxKrnl/EmuFS.h"
+#include "CxbxKrnl/EmuXTL.h"
+#include "CxbxKrnl/EmuShared.h"
 #include "../Common/Win32/XBPortMapping.h"
 #include "core/HLE/Intercept.hpp"
 #include "CxbxVSBC/CxbxVSBC.h"
diff --git a/src/CxbxKrnl/EmuXapi.h b/src/core/HLE/XAPI/Xapi.h
similarity index 100%
rename from src/CxbxKrnl/EmuXapi.h
rename to src/core/HLE/XAPI/Xapi.h