ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Created support folder

This commit is contained in:
ergo720 2018-12-15 18:48:19 +01:00
parent 19f5829d28
commit ef70b6a33d
62 changed files with 119 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build/win32/Cxbx.vcxproj
View File

@ -230,12 +230,12 @@
<ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\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" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuFS.h" />
<ClInclude Include="..\..\src\core\kernel\support\EmuFile.h" />
<ClInclude Include="..\..\src\core\kernel\support\EmuFS.h" />
<ClInclude Include="..\..\src\core\kernel\exports\EmuKrnlAvModes.h" />
<ClInclude Include="..\..\src\core\kernel\exports\EmuKrnlKi.h" />
<ClInclude Include="..\..\src\core\kernel\exports\EmuKrnlLogging.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuNtDll.h" />
<ClInclude Include="..\..\src\core\kernel\support\EmuNtDll.h" />
<ClInclude Include="..\..\src\common\crypto\EmuRsa.h" />
<ClInclude Include="..\..\src\common\crypto\EmuSha.h" />
<ClInclude Include="..\..\src\devices\x86\EmuX86.h" />
@ -244,7 +244,7 @@
<ClInclude Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.h" />
<ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\XInput.h" />
<ClInclude Include="..\..\src\core\HLE\XONLINE\XOnline.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuXTL.h" />
<ClInclude Include="..\..\src\core\kernel\support\EmuXTL.h" />
<ClInclude Include="..\..\src\common\util\gloffscreen\glextensions.h" />
<ClInclude Include="..\..\src\common\util\gloffscreen\gloffscreen.h" />
<ClInclude Include="..\..\src\core\HLE\Intercept.hpp" />
@ -252,7 +252,7 @@
<ClInclude Include="..\..\src\common\crypto\LibRc4.h" />
<ClInclude Include="..\..\src\core\kernel\memory-manager\PhysicalMemory.h" />
<ClInclude Include="..\..\src\core\kernel\memory-manager\PoolManager.h" />
<ClInclude Include="..\..\src\CxbxKrnl\ReservedMemory.h" />
<ClInclude Include="..\..\src\common\ReservedMemory.h" />
<ClInclude Include="..\..\src\CxbxKrnl\ResourceTracker.h" />
<ClInclude Include="..\..\src\devices\usb\Timer.h" />
<ClInclude Include="..\..\src\core\kernel\memory-manager\VMManager.h" />
@ -264,7 +264,7 @@
<ClInclude Include="..\..\src\gui\DlgEepromConfig.h" />
<ClInclude Include="..\..\src\gui\DlgLoggingConfig.h" />
<ClInclude Include="..\..\src\gui\DlgVideoConfig.h" />
<ClInclude Include="..\..\src\CxbxKrnl\Emu.h" />
<ClInclude Include="..\..\src\core\kernel\support\Emu.h" />
<ClInclude Include="..\..\src\common\win32\EmuShared.h" />
<ClInclude Include="..\..\src\common\Error.h" />
<ClInclude Include="..\..\src\common\win32\Mutex.h" />
@ -377,7 +377,7 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\Emu.cpp">
<ClCompile Include="..\..\src\core\kernel\support\Emu.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>
@ -392,13 +392,13 @@
<ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexShader.cpp" />
<ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.cpp" />
<ClCompile Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\EmuFile.cpp">
<ClCompile Include="..\..\src\core\kernel\support\EmuFile.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\EmuFS.cpp">
<ClCompile Include="..\..\src\core\kernel\support\EmuFS.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>
@ -428,7 +428,7 @@
<ClCompile Include="..\..\src\core\kernel\exports\EmuKrnlXbox.cpp" />
<ClCompile Include="..\..\src\core\kernel\exports\EmuKrnlXc.cpp" />
<ClCompile Include="..\..\src\core\kernel\exports\EmuKrnlXe.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\EmuNtDll.cpp">
<ClCompile Include="..\..\src\core\kernel\support\EmuNtDll.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>

20
build/win32/Cxbx.vcxproj.filters
View File

@ -103,7 +103,7 @@
<ClCompile Include="..\..\src\gui\DbgConsole.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\Emu.cpp">
<ClCompile Include="..\..\src\core\kernel\support\Emu.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.cpp">
@ -115,13 +115,13 @@
<ClCompile Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.cpp">
<Filter>core\HLE\DSOUND\DirectSound</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuFile.cpp">
<ClCompile Include="..\..\src\core\kernel\support\EmuFile.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuFS.cpp">
<ClCompile Include="..\..\src\core\kernel\support\EmuFS.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuNtDll.cpp">
<ClCompile Include="..\..\src\core\kernel\support\EmuNtDll.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\crypto\EmuSha.cpp">
@ -356,7 +356,7 @@
<ClInclude Include="..\..\src\Cxbx.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\Emu.h">
<ClInclude Include="..\..\src\core\kernel\support\Emu.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\win32\EmuShared.h">
@ -392,13 +392,13 @@
<ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.hpp">
<Filter>core\HLE\DSOUND\DirectSound</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuFile.h">
<ClInclude Include="..\..\src\core\kernel\support\EmuFile.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuFS.h">
<ClInclude Include="..\..\src\core\kernel\support\EmuFS.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuNtDll.h">
<ClInclude Include="..\..\src\core\kernel\support\EmuNtDll.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\crypto\EmuSha.h">
@ -419,7 +419,7 @@
<ClInclude Include="..\..\src\core\HLE\XONLINE\XOnline.h">
<Filter>core\HLE\XONLINE</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuXTL.h">
<ClInclude Include="..\..\src\core\kernel\support\EmuXTL.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\Intercept.hpp">
@ -434,7 +434,7 @@
<ClInclude Include="..\..\src\CxbxKrnl\ResourceTracker.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\ReservedMemory.h">
<ClInclude Include="..\..\src\common\ReservedMemory.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\win32\AlignPosfix1.h">

2
src/common/EmuEEPROM.cpp
View File

@ -48,7 +48,7 @@ namespace xboxkrnl
#include "Cxbx.h" // For DBG_PRINTF_EX
#include "EmuEEPROM.h" // For EEPROMInfo, EEPROMInfos
#include "..\CxbxKrnl\Emu.h" // For EmuWarning
#include "core\kernel\support\Emu.h" // For EmuWarning
#include "..\..\src\devices\LED.h" // For SetLEDSequence
#include "..\core\kernel\init\CxbxKrnl.h"

2
src/common/Settings.cpp
View File

@ -36,7 +36,7 @@
// ******************************************************************
#include "Settings.hpp"
#include "CxbxKrnl/Emu.h"
#include "core\kernel\support\Emu.h"
#include "EmuShared.h"
#include <experimental/filesystem>

2
src/common/crypto/EmuRsa.cpp
View File

@ -39,7 +39,7 @@
#define LOG_PREFIX CXBXR_MODULE::RSA
#include "EmuRsa.h"
#include "CxbxKrnl\Emu.h" // For EmuLog
#include "core\kernel\support\Emu.h" // For EmuLog
#include <cstring>
#include <assert.h>

2
src/common/win32/DInputController.cpp
View File

@ -40,7 +40,7 @@
#include "DInputController.h"
#include "EmuShared.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\EmuXTL.h"
// This is ridiculous
#define FIELD_OFFSET(type,field) ((ULONG)&(((type *)0)->field))

2
src/common/win32/DInputController.h
View File

@ -42,7 +42,7 @@
#include <cstring>
#include <windows.h>
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\EmuXTL.h"
#include "Common/Settings.hpp"
/*
// ******************************************************************

2
src/common/win32/EmuShared.cpp
View File

@ -36,7 +36,7 @@
#define _XBOXKRNL_DEFEXTRN_
#include "core\kernel\init\CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "core\kernel\support\Emu.h"
#include "EmuShared.h"
#undef FIELD_OFFSET // prevent macro redefinition warnings

2
src/common/xbe/Xbe.cpp
View File

@ -49,7 +49,7 @@ namespace xboxkrnl
#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlPrintUEM
#include "common\crypto\EmuSha.h" // For the SHA functions
#include "common\crypto\EmuRsa.h" // For the RSA functions
#include "CxbxKrnl/EmuXTL.h" // For LDT_FROM_DASHBOARD and CxbxInitWindow
#include "core\kernel\support\EmuXTL.h" // For LDT_FROM_DASHBOARD and CxbxInitWindow
namespace fs = std::experimental::filesystem;

6
src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp
View File

@ -48,13 +48,13 @@ namespace xboxkrnl
#include "common\util\CxbxUtil.h"
#include "CxbxVersion.h"
#include "core\kernel\init\CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuFS.h"
#include "EmuShared.h"
#include "gui/DbgConsole.h"
#include "CxbxKrnl/ResourceTracker.h"
#include "core\kernel\memory-manager\VMManager.h" // for g_VMManager
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\EmuXTL.h"
#include "Logging.h"
#include "../XbD3D8Logging.h"
#include "core/HLE/Intercept.hpp" // for bLLE_GPU

2
src/core/HLE/D3D8/Direct3D9/Direct3D9.h
View File

@ -37,7 +37,7 @@
#include "../XbD3D8Types.h"
#include "core\kernel\init\CxbxKrnl.h"
#include "common\xbe\Xbe.h"
#include "CxbxKrnl/Emu.h"
#include "core\kernel\support\Emu.h"
#define DIRECTDRAW_VERSION 0x0700
#include <ddraw.h>

4
src/core/HLE/D3D8/XbConvert.cpp
View File

@ -38,8 +38,8 @@
#define LOG_PREFIX CXBXR_MODULE::D3DCVT
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuXTL.h"
#include "XbConvert.h"
// About format color components:

6
src/core/HLE/D3D8/XbPixelShader.cpp
View File

@ -73,9 +73,9 @@
#define LOG_PREFIX CXBXR_MODULE::PXSH
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuFS.h"
#include "core\kernel\support\EmuXTL.h"
//#include <CxbxKrnl/EmuD3D8Types.h> // X_PSH_COMBINECOUNT

4
src/core/HLE/D3D8/XbPushBuffer.cpp
View File

@ -39,8 +39,8 @@
#include <assert.h> // For assert()
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuXTL.h"
#include "XbD3D8Types.h" // For X_D3DFORMAT
#include "CxbxKrnl/ResourceTracker.h"
#include "devices/video/nv2a.h" // For g_NV2A, PGRAPHState

4
src/core/HLE/D3D8/XbState.cpp
View File

@ -36,8 +36,8 @@
#define _XBOXKRNL_DEFEXTRN_
#define LOG_PREFIX CXBXR_MODULE::D3DST
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuXTL.h"
// deferred state lookup tables
DWORD *XTL::EmuD3DDeferredRenderState = nullptr;

4
src/core/HLE/D3D8/XbVertexBuffer.cpp
View File

@ -39,8 +39,8 @@
#include "core\kernel\memory-manager\VMManager.h"
#include "common\util\xxhash32.h" // For XXHash32::hash()
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuXTL.h"
#include "CxbxKrnl/ResourceTracker.h"
#include <ctime>

6
src/core/HLE/D3D8/XbVertexShader.cpp
View File

@ -40,9 +40,9 @@
#define _DEBUG_TRACK_VS
#include "core\kernel\init\CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuFS.h"
#include "core\kernel\support\EmuXTL.h"
#include "XbD3D8Types.h" // For X_D3DVSDE_*
#include <sstream>
#include <unordered_map>

6
src/core/HLE/DSOUND/DirectSound/DirectSound.cpp
View File

@ -46,10 +46,10 @@ namespace xboxkrnl {
#include <dsound.h>
#include <thread>
#include "core\kernel\init\CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuFS.h"
#include "EmuShared.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\EmuXTL.h"
#include "Common/Settings.hpp"

6
src/core/HLE/Intercept.cpp
View File

@ -44,9 +44,9 @@
#include <cmath>
#include <iomanip> // For std::setfill and std::setw
#include "core\kernel\init\CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuFS.h"
#include "core\kernel\support\EmuXTL.h"
#include "EmuShared.h"
#include "Common/CxbxDebugger.h"
#include "Logging.h"

4
src/core/HLE/Patches.cpp
View File

@ -36,8 +36,8 @@
// ******************************************************************
#include "core\kernel\init\CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuXTL.h"
#include "Patches.hpp"
#include "Intercept.hpp"

6
src/core/HLE/XACTENG/XactEng.cpp
View File

@ -45,10 +45,10 @@ namespace xboxkrnl
#include "core\kernel\init\/CxbxKrnl.h"
#include "Common/Logging.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuFS.h"
#include "EmuShared.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\EmuXTL.h"
#include "core\kernel\memory-manager\VMManager.h"
#include <mmreg.h>

4
src/core/HLE/XAPI/OHCI/XInput/DInput.cpp
View File

@ -37,8 +37,8 @@
#define LOG_PREFIX CXBXR_MODULE::DINP
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuXTL.h"
#include "EmuShared.h"
#include "Common/Win32/DInputController.h"
#include "Logging.h"

4
src/core/HLE/XAPI/OHCI/XInput/XInput.cpp
View File

@ -37,8 +37,8 @@
#define LOG_PREFIX CXBXR_MODULE::XINP
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuXTL.h"
#include "EmuShared.h"
#include "XInput.h"

8
src/core/HLE/XAPI/Xapi.cpp
View File

@ -47,11 +47,11 @@ namespace xboxkrnl
#include <Shlwapi.h>
#include "core\kernel\init\CxbxKrnl.h"
#include "Logging.h"
#include "CxbxKrnl/Emu.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\exports\EmuKrnl.h" // For DefaultLaunchDataPage
#include "CxbxKrnl/EmuFile.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\EmuFile.h"
#include "core\kernel\support\EmuFS.h"
#include "core\kernel\support\EmuXTL.h"
#include "EmuShared.h"
#include "../Common/Win32/XBPortMapping.h"
#include "core/HLE/Intercept.hpp"

6
src/core/HLE/XGRAPHIC/XGraphic.cpp
View File

@ -40,10 +40,10 @@
#undef FIELD_OFFSET // prevent macro redefinition warnings
#include <windows.h>
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuFS.h"
#include "Common/Logging.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\EmuXTL.h"
#include "core/HLE/D3D8/XbD3D8Logging.h" // for log rendering of X_D3DFORMAT, etc.
// ******************************************************************

6
src/core/HLE/XONLINE/XOnline.cpp
View File

@ -37,10 +37,10 @@
#define LOG_PREFIX CXBXR_MODULE::XONLINE
#include "CxbxKrnl/Emu.h"
#include "core\kernel\support\Emu.h"
#include "Common/Logging.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\EmuFS.h"
#include "core\kernel\support\EmuXTL.h"
/*
// ******************************************************************

4
src/core/kernel/exports/EmuKrnl.cpp
View File

@ -53,12 +53,12 @@ namespace xboxkrnl
#include "EmuKrnl.h" // for HalSystemInterrupts
#include "EmuKrnlKi.h" // for KiLockDispatcherDatabase
#include "core\kernel\init\CxbxKrnl.h"
#include "CxbxKrnl\EmuXTL.h"
#include "core\kernel\support\EmuXTL.h"
// prevent name collisions
namespace NtDll
{
#include "CxbxKrnl\EmuNtDll.h"
#include "core\kernel\support\EmuNtDll.h"
};
// See also :

2
src/core/kernel/exports/EmuKrnl.h
View File

@ -35,7 +35,7 @@
#define EMUKRNL_H
#include "core\kernel\init\CxbxKrnl.h"
#include "CxbxKrnl\Emu.h"
#include "core\kernel\support\Emu.h"
// CONTAINING_RECORD macro
// Gets the value of structure member (field - num1),given the type(MYSTRUCT, in this code) and the List_Entry head(temp, in this code)

6
src/core/kernel/exports/EmuKrnlAv.cpp
View File

@ -50,11 +50,11 @@ namespace xboxkrnl
// prevent name collisions
namespace NtDll
{
#include "CxbxKrnl\EmuNtDll.h"
#include "core\kernel\support\EmuNtDll.h"
};
#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "CxbxKrnl\EmuXTL.h"
#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "core\kernel\support\EmuXTL.h"
#include "devices\x86\EmuX86.h"
#include "EmuKrnlAvModes.h"

4
src/core/kernel/exports/EmuKrnlDbg.cpp
View File

@ -50,11 +50,11 @@ namespace xboxkrnl
// prevent name collisions
namespace NtDll
{
#include "CxbxKrnl\EmuNtDll.h"
#include "core\kernel\support\EmuNtDll.h"
};
#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
// ******************************************************************
// * 0x0005 - DbgBreakPoint()

4
src/core/kernel/exports/EmuKrnlEx.cpp
View File

@ -52,11 +52,11 @@ namespace xboxkrnl
// prevent name collisions
namespace NtDll
{
#include "CxbxKrnl\EmuNtDll.h" // For NtDelayExecution(), etc.
#include "core\kernel\support\EmuNtDll.h" // For NtDelayExecution(), etc.
};
#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup
#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "EmuKrnl.h" // For InsertHeadList, InsertTailList, RemoveHeadList
#include <atomic> // for std::atomic

4
src/core/kernel/exports/EmuKrnlFs.cpp
View File

@ -50,10 +50,10 @@ namespace xboxkrnl
// prevent name collisions
namespace NtDll
{
#include "CxbxKrnl\EmuNtDll.h"
#include "core\kernel\support\EmuNtDll.h"
};
#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#define FSCACHE_MAXIMUM_NUMBER_OF_CACHE_PAGES 2048

4
src/core/kernel/exports/EmuKrnlHal.cpp
View File

@ -49,11 +49,11 @@ namespace xboxkrnl
#include "EmuKrnl.h" // For InitializeListHead(), etc.
#include "EmuKrnlLogging.h"
#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup, CxbxConvertArgToString, and CxbxExec
#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "EmuKrnl.h"
#include "devices\x86\EmuX86.h" // HalReadWritePciSpace needs this
#include "EmuShared.h"
#include "CxbxKrnl\EmuFile.h" // For FindNtSymbolicLinkObjectByDriveLetter
#include "core\kernel\support\EmuFile.h" // For FindNtSymbolicLinkObjectByDriveLetter
#include "Common\EmuEEPROM.h" // For EEPROM
#include "devices\Xbox.h" // For g_SMBus, SMBUS_ADDRESS_SYSTEM_MICRO_CONTROLLER
#include "devices\SMCDevice.h" // For SMC_COMMAND_SCRATCH

4
src/core/kernel/exports/EmuKrnlIo.cpp
View File

@ -47,8 +47,8 @@ namespace xboxkrnl
#include "Logging.h" // For LOG_FUNC()
#include "EmuKrnlLogging.h"
#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup
#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "CxbxKrnl\EmuFile.h" // For CxbxCreateSymbolicLink(), etc.
#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "core\kernel\support\EmuFile.h" // For CxbxCreateSymbolicLink(), etc.
#include "CxbxDebugger.h"
// ******************************************************************

6
src/core/kernel/exports/EmuKrnlKe.cpp
View File

@ -50,14 +50,14 @@ namespace xboxkrnl
// prevent name collisions
namespace NtDll
{
#include "CxbxKrnl\EmuNtDll.h" // For NtDelayExecution(), etc.
#include "core\kernel\support\EmuNtDll.h" // For NtDelayExecution(), etc.
};
#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup
#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "EmuKrnl.h" // For InitializeListHead(), etc.
#include "EmuKrnlKi.h" // For KiRemoveTreeTimer(), KiInsertTreeTimer()
#include "CxbxKrnl\EmuFile.h" // For IsEmuHandle(), NtStatusToString()
#include "core\kernel\support\EmuFile.h" // For IsEmuHandle(), NtStatusToString()
#include <chrono>
#include <thread>

4
src/core/kernel/exports/EmuKrnlMm.cpp
View File

@ -49,7 +49,7 @@ namespace xboxkrnl
#include "EmuKrnl.h" // For DefaultLaunchDataPage
#include "EmuKrnlLogging.h"
#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup
#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "core\kernel\memory-manager\VMManager.h"
#include "EmuShared.h"
#include <assert.h>
@ -57,7 +57,7 @@ namespace xboxkrnl
// prevent name collisions
namespace NtDll
{
#include "CxbxKrnl\EmuNtDll.h" // For NtAllocateVirtualMemory(), etc.
#include "core\kernel\support\EmuNtDll.h" // For NtAllocateVirtualMemory(), etc.
};
// ******************************************************************

6
src/core/kernel/exports/EmuKrnlNt.cpp
View File

@ -50,12 +50,12 @@ namespace xboxkrnl
// prevent name collisions
namespace NtDll
{
#include "CxbxKrnl\EmuNtDll.h"
#include "core\kernel\support\EmuNtDll.h"
};
#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup
#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "CxbxKrnl\EmuFile.h" // For EmuNtSymbolicLinkObject, NtStatusToString(), etc.
#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "core\kernel\support\EmuFile.h" // For EmuNtSymbolicLinkObject, NtStatusToString(), etc.
#include "core\kernel\memory-manager\VMManager.h" // For g_VMManager
#include "CxbxDebugger.h"

2
src/core/kernel/exports/EmuKrnlOb.cpp
View File

@ -48,7 +48,7 @@ namespace xboxkrnl
#include "EmuKrnlLogging.h"
#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup
#include "EmuKrnl.h" // For OBJECT_TO_OBJECT_HEADER()
#include "CxbxKrnl\EmuFile.h" // For EmuNtSymbolicLinkObject, NtStatusToString(), etc.
#include "core\kernel\support\EmuFile.h" // For EmuNtSymbolicLinkObject, NtStatusToString(), etc.
#include <cassert>
#pragma warning(disable:4005) // Ignore redefined status values

8
src/core/kernel/exports/EmuKrnlPs.cpp
View File

@ -50,14 +50,14 @@ namespace xboxkrnl
#include "Logging.h" // For LOG_FUNC()
#include "EmuKrnlLogging.h"
#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnl_TLS
#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "CxbxKrnl\EmuFS.h" // For EmuGenerateFS
#include "CxbxKrnl\EmuXTL.h"
#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "core\kernel\support\EmuFS.h" // For EmuGenerateFS
#include "core\kernel\support\EmuXTL.h"
// prevent name collisions
namespace NtDll
{
#include "CxbxKrnl\EmuNtDll.h"
#include "core\kernel\support\EmuNtDll.h"
};
#define PSP_MAX_CREATE_THREAD_NOTIFY 16 /* TODO : Should be 8 */

4
src/core/kernel/exports/EmuKrnlRtl.cpp
View File

@ -51,11 +51,11 @@ namespace xboxkrnl
// prevent name collisions
namespace NtDll
{
#include "CxbxKrnl\EmuNtDll.h"
#include "core\kernel\support\EmuNtDll.h"
};
#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup()
#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, )
#include <assert.h>
#ifdef _WIN32

2
src/core/kernel/exports/EmuKrnlXc.cpp
View File

@ -52,7 +52,7 @@ namespace xboxkrnl
// prevent name collisions
namespace NtDll
{
#include "CxbxKrnl\EmuNtDll.h"
#include "core\kernel\support\EmuNtDll.h"
};

2
src/core/kernel/exports/KernelThunk.cpp
View File

@ -439,7 +439,7 @@ uint32 CxbxKrnl_KernelThunkTable[379] =
/* prevent name collisions */
namespace NtDll
{
#include "CxbxKrnl\EmuNtDll.h"
#include "core\kernel\support\EmuNtDll.h"
};
// Virtual memory location of KUSER_SHARED_DATA :

8
src/core/kernel/init/CxbxKrnl.cpp
View File

@ -48,14 +48,14 @@ namespace xboxkrnl
#include "core\kernel\init\CxbxKrnl.h"
#include "common\xbdm\CxbxXbdm.h" // For Cxbx_LibXbdmThunkTable
#include "CxbxVersion.h"
#include "CxbxKrnl\Emu.h"
#include "core\kernel\support\Emu.h"
#include "devices\x86\EmuX86.h"
#include "CxbxKrnl\EmuFile.h"
#include "CxbxKrnl\EmuFS.h"
#include "core\kernel\support\EmuFile.h"
#include "core\kernel\support\EmuFS.h"
#include "EmuEEPROM.h" // For CxbxRestoreEEPROM, EEPROM, XboxFactoryGameRegion
#include "core\kernel\exports\EmuKrnl.h"
#include "EmuShared.h"
#include "CxbxKrnl\EmuXTL.h"
#include "core\kernel\support\EmuXTL.h"
#include "core/HLE/Intercept.hpp"
#include "ReservedMemory.h" // For virtual_memory_placeholder
#include "core\kernel\memory-manager\VMManager.h"

2
src/core/kernel/memory-manager/PhysicalMemory.h
View File

@ -44,7 +44,7 @@ namespace xboxkrnl
#include <xboxkrnl/xboxkrnl.h>
};
#include "CxbxKrnl\Emu.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\init\CxbxKrnl.h"
#include <windows.h>
#include <map>

0
src/CxbxKrnl/Emu.cpp → src/core/kernel/support/Emu.cpp
View File

0
src/CxbxKrnl/Emu.h → src/core/kernel/support/Emu.h
View File

0
src/CxbxKrnl/EmuFS.cpp → src/core/kernel/support/EmuFS.cpp
View File

0
src/CxbxKrnl/EmuFS.h → src/core/kernel/support/EmuFS.h
View File

0
src/CxbxKrnl/EmuFile.cpp → src/core/kernel/support/EmuFile.cpp
View File

0
src/CxbxKrnl/EmuFile.h → src/core/kernel/support/EmuFile.h
View File

0
src/CxbxKrnl/EmuNtDll.cpp → src/core/kernel/support/EmuNtDll.cpp
View File

0
src/CxbxKrnl/EmuNtDll.h → src/core/kernel/support/EmuNtDll.h
View File

0
src/CxbxKrnl/EmuXTL.h → src/core/kernel/support/EmuXTL.h
View File

2
src/devices/ADM1032Device.cpp
View File

@ -37,7 +37,7 @@
#define LOG_PREFIX CXBXR_MODULE::ADM
#include "ADM1032Device.h"
#include "..\CxbxKrnl\Emu.h" // For EmuLog
#include "core\kernel\support\Emu.h" // For EmuLog
void ADM1032Device::Init()
{

2
src/devices/EmuNVNet.cpp
View File

@ -50,7 +50,7 @@ namespace xboxkrnl
};
#include "core\kernel\init\CxbxKrnl.h"
#include "CxbxKrnl\Emu.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\exports\EmuKrnl.h"
#include "EmuNVNet.h"

4
src/devices/video/nv2a.cpp
View File

@ -64,8 +64,8 @@ namespace xboxkrnl
#include <process.h> // For __beginthreadex(), etc.
#include "core\kernel\init\CxbxKrnl.h" // For XBOX_MEMORY_SIZE, DWORD, etc
#include "CxbxKrnl\Emu.h"
#include "CxbxKrnl\EmuFS.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuFS.h"
#include "core\kernel\exports\EmuKrnl.h"
#include "core/HLE/Intercept.hpp"
#include "Logging.h"

2
src/devices/x86/EmuX86.cpp
View File

@ -48,7 +48,7 @@
#include "mnemonics.h"
#include "core\kernel\init\CxbxKrnl.h"
#include "CxbxKrnl\Emu.h" // For EmuLog
#include "core\kernel\support\Emu.h" // For EmuLog
#include "devices\x86\EmuX86.h"
#include "core/HLE/Intercept.hpp" // for bLLE_GPU

4
src/gui/DbgConsole.cpp
View File

@ -37,10 +37,10 @@
#define _XBOXKRNL_DEFEXTRN_
#include "core\kernel\init\CxbxKrnl.h"
#include "CxbxKrnl\Emu.h"
#include "core\kernel\support\Emu.h"
#include "DbgConsole.h"
#include "CxbxKrnl\ResourceTracker.h"
#include "CxbxKrnl\EmuXTL.h"
#include "core\kernel\support\EmuXTL.h"
#include <conio.h>

2
src/gui/DlgVideoConfig.cpp
View File

@ -42,7 +42,7 @@
#include "DlgVideoConfig.h"
#include "ResCxbx.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\EmuXTL.h"
/*! windows dialog procedure */
static INT_PTR CALLBACK DlgVideoConfigProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

2
src/gui/DlgXboxControllerPortMapping.cpp
View File

@ -43,7 +43,7 @@
#include "../Common/Win32/XBPortMapping.h"
#include "Windowsx.h"
#include "ResCxbx.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\EmuXTL.h"
/*! windows dialog procedure */

2
src/gui/WinMain.cpp
View File

@ -37,7 +37,7 @@
#include "WndMain.h"
#include "core\kernel\init\CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "core\kernel\support\Emu.h"
#include "EmuShared.h"
#include "Common/Settings.hpp"
#include <commctrl.h>

2
src/gui/WndMain.cpp
View File

@ -49,7 +49,7 @@
#include "DlgXboxControllerPortMapping.h"
#include "common\xbe\XbePrinter.h" // For DumpInformation
#include "EmuShared.h"
#include "CxbxKrnl/EmuXTL.h"
#include "core\kernel\support\EmuXTL.h"
#include "Common/Settings.hpp"
#include "core\kernel\init\CxbxKrnl.h" // For CxbxConvertArgToString and CxbxExec