From 13bd79f930a20bd8b781718475d96f4bb792aea1 Mon Sep 17 00:00:00 2001 From: ergo720 <45463469+ergo720@users.noreply.github.com> Date: Tue, 6 Oct 2020 12:33:16 +0200 Subject: [PATCH] Use fixed width types for xbox types + restructured kernel header files (#1969) * VOID -> void_xt * CHAR, CCHAR -> char_xt, cchar_xt * UCHAR -> uchar_xt * BYTE, BOOLEAN -> byte_xt, boolean_xt * Fix bogus intellisense errors in the kernel headers * SHORT, CSHORT, USHORT -> short_xt, cshort_xt, ushort_xt * LONG -> long_xt * WORD, DWORD -> word_xt, dword_xt * HRESULT -> hresult_xt * ULONG -> ulong_xt * SIZE_T, ACCESS_MASK, PHYSICAL_ADDRESS -> size_xt, access_mask_xt, physical_address_xt * UINT, INT -> uint_xt, int_xt * LONG_PTR, ULONG_PTR, INT_PTR -> long_ptr_xt, ulong_ptr_xt, int_ptr_xt * LONGLONG, ULONGLONG -> longlong_xt, ulonglong_xt * WCHAR, QUAD, BOOL, FLOAT -> wchar_xt, quad_xt, bool_xt, float_xt * Updated types in xonline.h + reverted some type changes + moved kernel header files in cxbxr source tree * Use char16_t instead of wchar_t for wchar_xt xbox type * Fixed macro redefinition warnings from ntstatus macros in types.h Fixed macro redefinition warnings from NT_SUCCESS and FIELD_OFFSET Fixed macro redefinition warnings from the REG_ macros used by the eeprom * NTSTATUS -> ntstatus_xt --- src/common/EmuEEPROM.cpp | 4 +- src/common/EmuEEPROM.h | 65 +- src/common/input/InputManager.cpp | 2 +- src/common/util/CxbxUtil.cpp | 8 +- src/common/util/CxbxUtil.h | 8 +- src/common/win32/EmuShared.cpp | 1 - src/common/xbe/Xbe.cpp | 2 +- src/common/xbox_types.h | 141 +- src/common/xdvdfs-tools/buffered_io.cpp | 6 +- src/common/xdvdfs-tools/buffered_io.h | 18 +- src/common/xdvdfs-tools/xdvdfs.cpp | 52 +- src/common/xdvdfs-tools/xdvdfs.h | 72 +- src/core/hle/D3D8/Direct3D9/Direct3D9.cpp | 636 ++++---- src/core/hle/D3D8/Direct3D9/Direct3D9.h | 976 ++++++------- src/core/hle/D3D8/Direct3D9/RenderStates.cpp | 2 +- src/core/hle/D3D8/XbD3D8Types.h | 3 + src/core/hle/D3D8/XbPixelShader.cpp | 2 +- src/core/hle/D3D8/XbPixelShader.h | 2 +- src/core/hle/D3D8/XbPushBuffer.cpp | 6 +- src/core/hle/D3D8/XbVertexBuffer.cpp | 2 +- src/core/hle/D3D8/XbVertexBuffer.h | 4 +- src/core/hle/D3D8/XbVertexShader.cpp | 24 +- .../DirectSound/DSStream_PacketManager.cpp | 2 +- .../hle/DSOUND/DirectSound/DirectSound.cpp | 128 +- .../hle/DSOUND/DirectSound/DirectSound.hpp | 637 ++++---- .../DirectSound/DirectSound3DCalculator.cpp | 20 +- .../DSOUND/DirectSound/DirectSoundBuffer.cpp | 226 +-- .../DSOUND/DirectSound/DirectSoundGlobal.cpp | 2 +- .../DSOUND/DirectSound/DirectSoundStream.cpp | 192 +-- .../DSOUND/DirectSound/XFileMediaObject.cpp | 56 +- src/core/hle/DSOUND/XbDSoundTypes.h | 188 +-- .../hle/DSOUND/common/XbInternalStruct.hpp | 12 +- src/core/hle/Intercept.cpp | 12 +- src/core/hle/Intercept.hpp | 4 +- src/core/hle/Patches.cpp | 2 +- src/core/hle/XACTENG/XactEng.cpp | 88 +- src/core/hle/XACTENG/XactEng.h | 87 +- src/core/hle/XAPI/Xapi.cpp | 133 +- src/core/hle/XAPI/Xapi.h | 258 ++-- src/core/hle/XGRAPHIC/XGraphic.cpp | 23 +- src/core/hle/XGRAPHIC/XGraphic.h | 22 +- src/core/hle/XONLINE/XOnline.h | 50 +- .../xboxkrnl => src/core/kernel/common}/dbg.h | 27 +- .../xboxkrnl => src/core/kernel/common}/ex.h | 77 +- .../xboxkrnl => src/core/kernel/common}/hal.h | 107 +- .../xboxkrnl => src/core/kernel/common}/io.h | 129 +- .../core/kernel/common}/kernel.h | 179 +-- .../xboxkrnl => src/core/kernel/common}/mm.h | 95 +- .../xboxkrnl => src/core/kernel/common}/nt.h | 219 +-- .../xboxkrnl => src/core/kernel/common}/ob.h | 64 +- .../xboxkrnl => src/core/kernel/common}/ps.h | 29 +- .../xboxkrnl => src/core/kernel/common}/rtl.h | 231 +-- .../core/kernel/common/types.h | 1290 ++++++++--------- .../core/kernel/common}/xbox.h | 215 +-- src/core/kernel/exports/EmuKrnl.cpp | 58 +- src/core/kernel/exports/EmuKrnl.h | 6 +- src/core/kernel/exports/EmuKrnlAv.cpp | 72 +- src/core/kernel/exports/EmuKrnlAvModes.h | 10 +- src/core/kernel/exports/EmuKrnlDbg.cpp | 26 +- src/core/kernel/exports/EmuKrnlEx.cpp | 80 +- src/core/kernel/exports/EmuKrnlFs.cpp | 16 +- src/core/kernel/exports/EmuKrnlHal.cpp | 124 +- src/core/kernel/exports/EmuKrnlIo.cpp | 136 +- src/core/kernel/exports/EmuKrnlKd.cpp | 6 +- src/core/kernel/exports/EmuKrnlKe.cpp | 230 +-- src/core/kernel/exports/EmuKrnlKe.h | 4 +- src/core/kernel/exports/EmuKrnlKi.cpp | 52 +- src/core/kernel/exports/EmuKrnlKi.h | 55 +- src/core/kernel/exports/EmuKrnlLogging.cpp | 32 +- src/core/kernel/exports/EmuKrnlLogging.h | 2 +- src/core/kernel/exports/EmuKrnlMm.cpp | 92 +- src/core/kernel/exports/EmuKrnlNt.cpp | 304 ++-- src/core/kernel/exports/EmuKrnlOb.cpp | 100 +- src/core/kernel/exports/EmuKrnlPhy.cpp | 12 +- src/core/kernel/exports/EmuKrnlPs.cpp | 38 +- src/core/kernel/exports/EmuKrnlRtl.cpp | 330 ++--- src/core/kernel/exports/EmuKrnlXbox.cpp | 2 +- src/core/kernel/exports/EmuKrnlXc.cpp | 130 +- src/core/kernel/exports/EmuKrnlXe.cpp | 20 +- src/core/kernel/exports/KernelThunk.cpp | 2 +- src/core/kernel/exports/xboxkrnl.h | 83 ++ src/core/kernel/init/CxbxKrnl.cpp | 39 +- src/core/kernel/init/CxbxKrnl.h | 1 - .../kernel/memory-manager/PhysicalMemory.h | 2 +- .../kernel/memory-manager/PoolManager.cpp | 16 +- src/core/kernel/memory-manager/PoolManager.h | 32 +- src/core/kernel/memory-manager/VMManager.cpp | 60 +- src/core/kernel/memory-manager/VMManager.h | 8 +- src/core/kernel/support/Emu.cpp | 10 +- src/core/kernel/support/Emu.h | 1 - src/core/kernel/support/EmuFS.cpp | 17 +- src/core/kernel/support/EmuFS.h | 1 - src/core/kernel/support/EmuFile.cpp | 80 +- src/core/kernel/support/EmuFile.h | 2 +- src/core/kernel/support/EmuNtDll.h | 2 - src/devices/EmuNVNet.cpp | 16 +- src/devices/SMCDevice.cpp | 2 +- src/devices/usb/Hub.cpp | 2 +- src/devices/usb/OHCI.cpp | 32 +- src/devices/usb/OHCI.h | 24 +- src/devices/usb/USBDevice.cpp | 2 +- src/devices/usb/XidGamepad.cpp | 2 +- src/devices/video/EmuNV2A_DEBUG.cpp | 2 +- src/devices/video/EmuNV2A_PFIFO.cpp | 4 +- src/devices/video/EmuNV2A_PGRAPH.cpp | 6 +- src/devices/video/nv2a.cpp | 16 +- src/devices/video/nv2a.h | 2 +- src/devices/video/nv2a_int.h | 44 +- src/devices/x86/EmuX86.cpp | 32 +- src/devices/x86/EmuX86.h | 8 +- src/gui/DlgAbout.cpp | 2 +- src/gui/DlgAbout.h | 2 +- src/gui/DlgAudioConfig.cpp | 6 +- src/gui/DlgAudioConfig.h | 2 +- src/gui/DlgEepromConfig.h | 2 +- src/gui/DlgInputConfig.h | 2 +- src/gui/DlgLoggingConfig.cpp | 2 +- src/gui/DlgLoggingConfig.h | 2 +- src/gui/DlgNetworkConfig.cpp | 4 +- src/gui/DlgNetworkConfig.h | 2 +- src/gui/DlgVideoConfig.cpp | 14 +- src/gui/DlgVideoConfig.h | 2 +- 122 files changed, 4719 insertions(+), 4650 deletions(-) rename {import/OpenXDK/include/xboxkrnl => src/core/kernel/common}/dbg.h (51%) rename {import/OpenXDK/include/xboxkrnl => src/core/kernel/common}/ex.h (73%) rename {import/OpenXDK/include/xboxkrnl => src/core/kernel/common}/hal.h (64%) rename {import/OpenXDK/include/xboxkrnl => src/core/kernel/common}/io.h (76%) rename {import/OpenXDK/include/xboxkrnl => src/core/kernel/common}/kernel.h (75%) rename {import/OpenXDK/include/xboxkrnl => src/core/kernel/common}/mm.h (74%) rename {import/OpenXDK/include/xboxkrnl => src/core/kernel/common}/nt.h (76%) rename {import/OpenXDK/include/xboxkrnl => src/core/kernel/common}/ob.h (80%) rename {import/OpenXDK/include/xboxkrnl => src/core/kernel/common}/ps.h (74%) rename {import/OpenXDK/include/xboxkrnl => src/core/kernel/common}/rtl.h (73%) rename import/OpenXDK/include/xboxkrnl/xboxkrnl.h => src/core/kernel/common/types.h (72%) rename {import/OpenXDK/include/xboxkrnl => src/core/kernel/common}/xbox.h (73%) create mode 100644 src/core/kernel/exports/xboxkrnl.h diff --git a/src/common/EmuEEPROM.cpp b/src/common/EmuEEPROM.cpp index ac9539eb7..43edd394e 100644 --- a/src/common/EmuEEPROM.cpp +++ b/src/common/EmuEEPROM.cpp @@ -28,7 +28,7 @@ #define LOG_PREFIX_INIT CXBXR_MODULE::INIT -#include // For XC_VALUE_INDEX and XBOX_EEPROM +#include // For XC_VALUE_INDEX and XBOX_EEPROM #include // For printf #include // For HANDLE, CreateFile, CreateFileMapping, MapViewOfFile #include @@ -41,7 +41,7 @@ xbox::XBOX_EEPROM *EEPROM = nullptr; // Set using CxbxRestoreEEPROM() // Default value (NA), overwritten with the actual content in the eeprom by CxbxRestoreEEPROM -xbox::ULONG XboxFactoryGameRegion = XC_GAME_REGION_NA; +xbox::ulong_xt XboxFactoryGameRegion = XC_GAME_REGION_NA; const EEPROMInfo* EmuFindEEPROMInfo(xbox::XC_VALUE_INDEX index) { diff --git a/src/common/EmuEEPROM.h b/src/common/EmuEEPROM.h index f2558710a..c0cc98672 100644 --- a/src/common/EmuEEPROM.h +++ b/src/common/EmuEEPROM.h @@ -27,10 +27,7 @@ #ifndef EMU_EEPROM_H #define EMU_EEPROM_H - -#undef _WIN32 // Compile-in REG_DWORD and friends, since we lack a include here -#include // For XC_VALUE_INDEX and XBOX_EEPROM -#define _WIN32 +#include // For XC_VALUE_INDEX and XBOX_EEPROM #define EEPROM_SIZE sizeof(xbox::XBOX_EEPROM) @@ -47,38 +44,38 @@ typedef struct EEPROMInfo { { xbox::XC, offsetof(xbox::XBOX_EEPROM, Member), REG_Type, sizeof(((xbox::XBOX_EEPROM *)0)->Member) } static const EEPROMInfo EEPROMInfos[] = { - EEPROM_INFO_ENTRY(XC_TIMEZONE_BIAS, UserSettings.TimeZoneBias, REG_DWORD), - EEPROM_INFO_ENTRY(XC_TZ_STD_NAME, UserSettings.TimeZoneStdName, REG_BINARY), - EEPROM_INFO_ENTRY(XC_TZ_STD_DATE, UserSettings.TimeZoneStdDate, REG_DWORD), - EEPROM_INFO_ENTRY(XC_TZ_STD_BIAS, UserSettings.TimeZoneStdBias, REG_DWORD), - EEPROM_INFO_ENTRY(XC_TZ_DLT_NAME, UserSettings.TimeZoneDltName, REG_BINARY), - EEPROM_INFO_ENTRY(XC_TZ_DLT_DATE, UserSettings.TimeZoneDltDate, REG_DWORD), - EEPROM_INFO_ENTRY(XC_TZ_DLT_BIAS, UserSettings.TimeZoneDltBias, REG_DWORD), - EEPROM_INFO_ENTRY(XC_LANGUAGE, UserSettings.Language, REG_DWORD), - EEPROM_INFO_ENTRY(XC_VIDEO, UserSettings.VideoFlags, REG_DWORD), - EEPROM_INFO_ENTRY(XC_AUDIO, UserSettings.AudioFlags, REG_DWORD), - EEPROM_INFO_ENTRY(XC_P_CONTROL_GAMES, UserSettings.ParentalControlGames, REG_DWORD), // Zapper queries this. TODO : Should this be REG_NONE? - EEPROM_INFO_ENTRY(XC_P_CONTROL_PASSWORD, UserSettings.ParentalControlPassword, REG_DWORD), - EEPROM_INFO_ENTRY(XC_P_CONTROL_MOVIES, UserSettings.ParentalControlMovies, REG_DWORD), // Xbox Dashboard queries this. - EEPROM_INFO_ENTRY(XC_ONLINE_IP_ADDRESS, UserSettings.OnlineIpAddress, REG_DWORD), - EEPROM_INFO_ENTRY(XC_ONLINE_DNS_ADDRESS, UserSettings.OnlineDnsAddress, REG_DWORD), - EEPROM_INFO_ENTRY(XC_ONLINE_DEFAULT_GATEWAY_ADDRESS, UserSettings.OnlineDefaultGatewayAddress, REG_DWORD), - EEPROM_INFO_ENTRY(XC_ONLINE_SUBNET_ADDRESS, UserSettings.OnlineSubnetMask, REG_DWORD), - EEPROM_INFO_ENTRY(XC_MISC, UserSettings.MiscFlags, REG_DWORD), - EEPROM_INFO_ENTRY(XC_DVD_REGION, UserSettings.DvdRegion, REG_DWORD), - EEPROM_INFO_ENTRY(XC_MAX_OS, UserSettings, REG_BINARY), + EEPROM_INFO_ENTRY(XC_TIMEZONE_BIAS, UserSettings.TimeZoneBias, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_TZ_STD_NAME, UserSettings.TimeZoneStdName, xbox::reg_binary), + EEPROM_INFO_ENTRY(XC_TZ_STD_DATE, UserSettings.TimeZoneStdDate, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_TZ_STD_BIAS, UserSettings.TimeZoneStdBias, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_TZ_DLT_NAME, UserSettings.TimeZoneDltName, xbox::reg_binary), + EEPROM_INFO_ENTRY(XC_TZ_DLT_DATE, UserSettings.TimeZoneDltDate, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_TZ_DLT_BIAS, UserSettings.TimeZoneDltBias, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_LANGUAGE, UserSettings.Language, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_VIDEO, UserSettings.VideoFlags, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_AUDIO, UserSettings.AudioFlags, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_P_CONTROL_GAMES, UserSettings.ParentalControlGames, xbox::reg_dword), // Zapper queries this. TODO : Should this be xbox::reg_none? + EEPROM_INFO_ENTRY(XC_P_CONTROL_PASSWORD, UserSettings.ParentalControlPassword, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_P_CONTROL_MOVIES, UserSettings.ParentalControlMovies, xbox::reg_dword), // Xbox Dashboard queries this. + EEPROM_INFO_ENTRY(XC_ONLINE_IP_ADDRESS, UserSettings.OnlineIpAddress, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_ONLINE_DNS_ADDRESS, UserSettings.OnlineDnsAddress, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_ONLINE_DEFAULT_GATEWAY_ADDRESS, UserSettings.OnlineDefaultGatewayAddress, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_ONLINE_SUBNET_ADDRESS, UserSettings.OnlineSubnetMask, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_MISC, UserSettings.MiscFlags, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_DVD_REGION, UserSettings.DvdRegion, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_MAX_OS, UserSettings, xbox::reg_binary), // XC_MAX_OS is called to return a complete XBOX_USER_SETTINGS structure // - // One example is from XapipQueryTimeZoneInformation(, REG_DWORD, sizeof(DWORD), where it is used to + // One example is from XapipQueryTimeZoneInformation(, xbox::reg_dword, sizeof(DWORD), where it is used to // detect the local timezone information. - EEPROM_INFO_ENTRY(XC_FACTORY_SERIAL_NUMBER, FactorySettings.SerialNumber, REG_BINARY), - EEPROM_INFO_ENTRY(XC_FACTORY_ETHERNET_ADDR, FactorySettings.EthernetAddr, REG_BINARY), - EEPROM_INFO_ENTRY(XC_FACTORY_ONLINE_KEY, FactorySettings.OnlineKey, REG_BINARY), - EEPROM_INFO_ENTRY(XC_FACTORY_AV_REGION, FactorySettings.AVRegion, REG_DWORD), - // Note : XC_FACTORY_GAME_REGION is linked to a separate ULONG XboxFactoryGameRegion (of type REG_DWORD) - EEPROM_INFO_ENTRY(XC_FACTORY_GAME_REGION, EncryptedSettings.GameRegion, REG_DWORD), - EEPROM_INFO_ENTRY(XC_ENCRYPTED_SECTION, EncryptedSettings, REG_BINARY), - { xbox::XC_MAX_ALL, 0, REG_BINARY, sizeof(xbox::XBOX_EEPROM) }, + EEPROM_INFO_ENTRY(XC_FACTORY_SERIAL_NUMBER, FactorySettings.SerialNumber, xbox::reg_binary), + EEPROM_INFO_ENTRY(XC_FACTORY_ETHERNET_ADDR, FactorySettings.EthernetAddr, xbox::reg_binary), + EEPROM_INFO_ENTRY(XC_FACTORY_ONLINE_KEY, FactorySettings.OnlineKey, xbox::reg_binary), + EEPROM_INFO_ENTRY(XC_FACTORY_AV_REGION, FactorySettings.AVRegion, xbox::reg_dword), + // Note : XC_FACTORY_GAME_REGION is linked to a separate ULONG XboxFactoryGameRegion (of type xbox::reg_dword) + EEPROM_INFO_ENTRY(XC_FACTORY_GAME_REGION, EncryptedSettings.GameRegion, xbox::reg_dword), + EEPROM_INFO_ENTRY(XC_ENCRYPTED_SECTION, EncryptedSettings, xbox::reg_binary), + { xbox::XC_MAX_ALL, 0, xbox::reg_binary, sizeof(xbox::XBOX_EEPROM) }, { XC_END_MARKER } }; @@ -148,7 +145,7 @@ extern const EEPROMInfo* EmuFindEEPROMInfo(xbox::XC_VALUE_INDEX index); extern xbox::XBOX_EEPROM *EEPROM; -extern xbox::ULONG XboxFactoryGameRegion; +extern xbox::ulong_xt XboxFactoryGameRegion; extern void EmuEEPROMReset(xbox::XBOX_EEPROM* eeprom); diff --git a/src/common/input/InputManager.cpp b/src/common/input/InputManager.cpp index ed96eb186..bde9a7f95 100644 --- a/src/common/input/InputManager.cpp +++ b/src/common/input/InputManager.cpp @@ -36,7 +36,7 @@ #define LOG_PREFIX CXBXR_MODULE::INPSYS -#include // For PKINTERRUPT, etc. +#include // For PKINTERRUPT, etc. #include "SdlJoystick.h" #include "XInputPad.h" #include "DInputKeyboardMouse.h" diff --git a/src/common/util/CxbxUtil.cpp b/src/common/util/CxbxUtil.cpp index 3d14cd790..edd43e0e3 100644 --- a/src/common/util/CxbxUtil.cpp +++ b/src/common/util/CxbxUtil.cpp @@ -148,7 +148,7 @@ size_t IoVecFromBuffer(const IoVec* iov, unsigned int iov_cnt, size_t offset, vo } // Read an array of DWORDs in memory -bool GetDwords(xbox::addr Paddr, uint32_t* Buffer, int Number) +bool GetDwords(xbox::addr_xt Paddr, uint32_t* Buffer, int Number) { for (int i = 0; i < Number; i++, Buffer++, Paddr += sizeof(*Buffer)) { // dropped little -> big endian conversion from XQEMU @@ -160,7 +160,7 @@ bool GetDwords(xbox::addr Paddr, uint32_t* Buffer, int Number) } // Write an array of DWORDs in memory -bool WriteDwords(xbox::addr Paddr, uint32_t* Buffer, int Number) +bool WriteDwords(xbox::addr_xt Paddr, uint32_t* Buffer, int Number) { for (int i = 0; i < Number; i++, Buffer++, Paddr += sizeof(*Buffer)) { // dropped big -> little endian conversion from XQEMU @@ -172,7 +172,7 @@ bool WriteDwords(xbox::addr Paddr, uint32_t* Buffer, int Number) } // Read an array of WORDs in memory -bool GetWords(xbox::addr Paddr, uint16_t* Buffer, int Number) +bool GetWords(xbox::addr_xt Paddr, uint16_t* Buffer, int Number) { for (int i = 0; i < Number; i++, Buffer++, Paddr += sizeof(*Buffer)) { // dropped little -> big endian conversion from XQEMU @@ -184,7 +184,7 @@ bool GetWords(xbox::addr Paddr, uint16_t* Buffer, int Number) } // Write an array of WORDs in memory -bool WriteWords(xbox::addr Paddr, uint16_t* Buffer, int Number) +bool WriteWords(xbox::addr_xt Paddr, uint16_t* Buffer, int Number) { for (int i = 0; i < Number; i++, Buffer++, Paddr += sizeof(*Buffer)) { // dropped big -> little endian conversion from XQEMU diff --git a/src/common/util/CxbxUtil.h b/src/common/util/CxbxUtil.h index 556c9c9dc..60f4fbb4d 100644 --- a/src/common/util/CxbxUtil.h +++ b/src/common/util/CxbxUtil.h @@ -56,10 +56,10 @@ void IoVecAdd(IOVector* qiov, void* base, size_t len); size_t IoVecTobuffer(const IoVec* iov, const unsigned int iov_cnt, size_t offset, void *buf, size_t bytes); size_t IoVecFromBuffer(const IoVec* iov, unsigned int iov_cnt, size_t offset, void* buf, size_t bytes); -bool WriteDwords(xbox::addr Paddr, uint32_t* Buffer, int Number); -bool GetDwords(xbox::addr Paddr, uint32_t* Buffer, int Number); -bool GetWords(xbox::addr Paddr, uint16_t* Buffer, int Number); -bool WriteWords(xbox::addr Paddr, uint16_t* Buffer, int Number); +bool WriteDwords(xbox::addr_xt Paddr, uint32_t* Buffer, int Number); +bool GetDwords(xbox::addr_xt Paddr, uint32_t* Buffer, int Number); +bool GetWords(xbox::addr_xt Paddr, uint16_t* Buffer, int Number); +bool WriteWords(xbox::addr_xt Paddr, uint16_t* Buffer, int Number); bool Memory_R(void* Addr, void* Buf, size_t Num); bool Memory_W(void* Addr, void* Buf, size_t Num); bool Memory_RW(void* Addr, void* Buf, size_t Num, bool bIsWrite); diff --git a/src/common/win32/EmuShared.cpp b/src/common/win32/EmuShared.cpp index 0f6dd5b4a..10236e19e 100644 --- a/src/common/win32/EmuShared.cpp +++ b/src/common/win32/EmuShared.cpp @@ -29,7 +29,6 @@ #include "core\kernel\support\Emu.h" #include "EmuShared.h" -#undef FIELD_OFFSET // prevent macro redefinition warnings #include #include diff --git a/src/common/xbe/Xbe.cpp b/src/common/xbe/Xbe.cpp index 127ece41d..b60684255 100644 --- a/src/common/xbe/Xbe.cpp +++ b/src/common/xbe/Xbe.cpp @@ -27,7 +27,7 @@ // ****************************************************************** -#include +#include #include "common\xbe\Xbe.h" #include "common\util\CxbxUtil.h" // For RoundUp #include // filesystem related functions available on C++ 17 diff --git a/src/common/xbox_types.h b/src/common/xbox_types.h index bf38b74bd..8c813dd10 100644 --- a/src/common/xbox_types.h +++ b/src/common/xbox_types.h @@ -27,98 +27,97 @@ #include #include +#include +#include namespace xbox { -#ifndef VOID - typedef void VOID; -#endif - - /*! addr is the type of a physical address */ - using addr = std::uint32_t; - - /*! zero is the type of null address or value */ - inline constexpr addr zero = 0; - - /*! zeroptr is the type of null pointer address */ - using zeroptr_t = std::nullptr_t; - inline constexpr zeroptr_t zeroptr = nullptr; - // ****************************************************************** - // * Basic types + // * Calling conventions // ****************************************************************** - typedef char CHAR, CCHAR; - typedef short SHORT, CSHORT; - typedef long LONG; - typedef unsigned char UCHAR; - typedef unsigned char BYTE; - typedef unsigned char BOOLEAN; - typedef unsigned short USHORT; - typedef unsigned short WORD; - typedef unsigned long ULONG; - typedef unsigned long DWORD; - typedef unsigned long SIZE_T, *PSIZE_T; - typedef unsigned long ACCESS_MASK, *PACCESS_MASK; - typedef unsigned long PHYSICAL_ADDRESS; - typedef unsigned int UINT; - typedef int INT; - typedef int INT_PTR; - typedef signed __int64 LONGLONG; - typedef unsigned __int64 ULONGLONG; - typedef wchar_t WCHAR; - typedef unsigned __int64 QUAD; // 8 byte aligned 8 byte long - typedef int BOOL; - typedef LONG HRESULT; - typedef float FLOAT; // TODO: Remove __stdcall once lib86cpu is implemented. #define XBOXAPI __stdcall #define XCALLBACK XBOXAPI + // ****************************************************************** + // * Basic types + // ****************************************************************** + using void_xt = void; + using char_xt = char; + using cchar_xt = char; + using wchar_xt = char16_t; + using short_xt = std::int16_t; + using cshort_xt = std::int16_t; + using long_xt = std::int32_t; + using uchar_xt = std::uint8_t; + using byte_xt = std::uint8_t; + using boolean_xt = std::uint8_t; + using ushort_xt = std::uint16_t; + using word_xt = std::uint16_t; + using ulong_xt = std::uint32_t; + using dword_xt = std::uint32_t; + using size_xt = ulong_xt; + using access_mask_xt = ulong_xt; + using physical_address_xt = ulong_xt; + using uint_xt = std::uint32_t; + using int_xt = std::int32_t; + using int_ptr_xt = int_xt; + using long_ptr_xt = long_xt; + using ulong_ptr_xt = ulong_xt; + using longlong_xt = std::int64_t; + using ulonglong_xt = std::uint64_t; + using quad_xt = std::uint64_t; // 8 byte aligned 8 byte long + using bool_xt = std::int32_t; + using hresult_xt = long_xt; + using ntstatus_xt = long_xt; + using float_xt = float; + /*! addr is the type of a physical address */ + using addr_xt = std::uint32_t; + /*! zero is the type of null address or value */ + inline constexpr addr_xt zero = 0; + /*! zeroptr is the type of null pointer address */ + using zeroptr_xt = std::nullptr_t; + inline constexpr zeroptr_xt zeroptr = nullptr; // ****************************************************************** // * Pointer types // ****************************************************************** - typedef CHAR *PCHAR; - typedef char *PSZ; - typedef CHAR *PCSZ; - typedef BYTE *PBYTE; - typedef BOOLEAN *PBOOLEAN; - typedef UCHAR *PUCHAR; - typedef USHORT *PUSHORT; - typedef unsigned int *PUINT; - typedef ULONG *PULONG; - typedef DWORD *PDWORD, *LPDWORD; - typedef ACCESS_MASK *PACCESS_MASK; - typedef LONG *PLONG; - typedef int *PINT_PTR; - typedef VOID *PVOID, *LPVOID; - typedef void *HANDLE; + typedef char_xt *PCHAR; + typedef char_xt *PSZ; + typedef char_xt *PCSZ; + typedef byte_xt *PBYTE; + typedef boolean_xt *PBOOLEAN; + typedef uchar_xt *PUCHAR; + typedef ushort_xt *PUSHORT; + typedef uint_xt *PUINT; + typedef ulong_xt *PULONG; + typedef dword_xt *PDWORD, *LPDWORD; + typedef long_xt *PLONG; + typedef int_ptr_xt *PINT_PTR; + typedef void_xt *PVOID, *LPVOID; + typedef void_xt *HANDLE; typedef HANDLE *PHANDLE; - - // Additional basic and pointer types : - typedef long LONG_PTR; - typedef unsigned long ULONG_PTR; - - typedef LONGLONG *PLONGLONG; - typedef QUAD *PQUAD; + typedef size_xt *PSIZE_T; + typedef access_mask_xt *PACCESS_MASK; + typedef longlong_xt *PLONGLONG; + typedef quad_xt *PQUAD; // ****************************************************************** // ANSI (Multi-byte Character) types // ****************************************************************** - typedef CHAR *PCHAR, *LPCH, *PCH; - typedef const CHAR *LPCCH, *PCCH; - typedef WCHAR *LPWSTR, *PWSTR; - - typedef /*_Null_terminated_*/ const WCHAR *LPCWSTR, *PCWSTR; + typedef char_xt *PCHAR, *LPCH, *PCH; + typedef const char_xt *LPCCH, *PCCH; + typedef wchar_xt *LPWSTR, *PWSTR; + typedef /*_Null_terminated_*/ const wchar_xt *LPCWSTR, *PCWSTR; // ****************************************************************** // Misc // ****************************************************************** typedef struct _XD3DVECTOR { - FLOAT x; - FLOAT y; - FLOAT z; + float_xt x; + float_xt y; + float_xt z; } D3DVECTOR; template @@ -128,4 +127,10 @@ namespace xbox a.y = b.y; a.z = b.z; } + + // ****************************************************************** + // Type assertions + // ****************************************************************** + static_assert(CHAR_BIT == 8); + static_assert(sizeof(char16_t) == 2); } diff --git a/src/common/xdvdfs-tools/buffered_io.cpp b/src/common/xdvdfs-tools/buffered_io.cpp index ccc1a32e9..b7714a48c 100644 --- a/src/common/xdvdfs-tools/buffered_io.cpp +++ b/src/common/xdvdfs-tools/buffered_io.cpp @@ -2,7 +2,7 @@ // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com -#include //#include +#include //#include #include "buffered_io.h" namespace xbox @@ -10,7 +10,7 @@ namespace xbox PBYTE GetSectorBuffered( PCDIO_READ This, - DWORD SectorNumber) + xbox::dword_xt SectorNumber) { int i, index; PBYTE Ptr; @@ -65,7 +65,7 @@ PBYTE GetSectorBuffered( //------------------------------------------------------------------------------ void ReleaseBufferedSector( PCDIO_READ This, - DWORD SectorNumber) + xbox::dword_xt SectorNumber) { int i; diff --git a/src/common/xdvdfs-tools/buffered_io.h b/src/common/xdvdfs-tools/buffered_io.h index bf19ad9e5..0cf546939 100644 --- a/src/common/xdvdfs-tools/buffered_io.h +++ b/src/common/xdvdfs-tools/buffered_io.h @@ -10,7 +10,7 @@ extern "C" { namespace xbox { -#define BOOL BOOLEAN +#define BOOL xbox::boolean_xt #define LPSTR LPCH // Determines how large a sector is @@ -20,10 +20,10 @@ namespace xbox #define DISK_BUFFER 64 typedef struct { - DWORD SectorList[DISK_BUFFER]; // Ring buffer for buffered disk i/o - DWORD LockList[DISK_BUFFER]; // Lock for each buffered sector - BYTE DiskBuffer[SECTOR_SIZE * DISK_BUFFER]; // Storage room for buffered sectors - DWORD WriteIndex; // Write pointer + xbox::dword_xt SectorList[DISK_BUFFER]; // Ring buffer for buffered disk i/o + xbox::dword_xt LockList[DISK_BUFFER]; // Lock for each buffered sector + xbox::byte_xt DiskBuffer[SECTOR_SIZE * DISK_BUFFER]; // Storage room for buffered sectors + xbox::dword_xt WriteIndex; // Write pointer // Pointer to arbitrary data passed at init // (usually a file or device handle) @@ -32,20 +32,20 @@ typedef struct { BOOL (*Sectors)( // Routine to get sectors PVOID Data, // Pointer to arbitrary data PVOID Buffer, // Buffer to fill - DWORD StartSector, // Start sector - DWORD ReadSize); // Number of sectors to read + xbox::dword_xt StartSector, // Start sector + xbox::dword_xt ReadSize); // Number of sectors to read } CDIO_READ, *PCDIO_READ; // Get a sector from buffer and lock it extern PBYTE GetSectorBuffered( PCDIO_READ This, - DWORD SectorNumber); + xbox::dword_xt SectorNumber); // Release a locked buffer extern void ReleaseBufferedSector( PCDIO_READ This, - DWORD SectorNumber); + xbox::dword_xt SectorNumber); }; diff --git a/src/common/xdvdfs-tools/xdvdfs.cpp b/src/common/xdvdfs-tools/xdvdfs.cpp index f8c65e848..a2920e9ee 100644 --- a/src/common/xdvdfs-tools/xdvdfs.cpp +++ b/src/common/xdvdfs-tools/xdvdfs.cpp @@ -38,19 +38,19 @@ // Directory Entry typedef struct { - WORD LeftSubTree; - WORD RightSubTree; - DWORD FileStartSector; - DWORD FileSize; - BYTE FileAttributes; - BYTE FilenameLength; - BYTE Filename[FILENAME_SIZE]; + xbox::word_xt LeftSubTree; + xbox::word_xt RightSubTree; + xbox::dword_xt FileStartSector; + xbox::dword_xt FileSize; + xbox::byte_xt FileAttributes; + xbox::byte_xt FilenameLength; + xbox::byte_xt Filename[FILENAME_SIZE]; } XDVDFS_DIRECTORY_ENTRY, *PXDVDFS_DIRECTORY_ENTRY; // XDVDFS init a session object BOOL XDVDFS_Mount( PXDVDFS_SESSION Session, - BOOL (*ReadFunc)(PVOID, PVOID, DWORD, DWORD), + BOOL (*ReadFunc)(PVOID, PVOID, xbox::dword_xt, xbox::dword_xt), PVOID Data) { Session->Read.Data = Data; @@ -98,8 +98,8 @@ BOOL XDVDFS_UnMount( PXDVDFS_SESSION Session) { // Reset ring buffer - memset(Session->Read.SectorList, 0, sizeof(DWORD) * DISK_BUFFER); - memset(Session->Read.LockList, 0, sizeof(DWORD) * DISK_BUFFER); + memset(Session->Read.SectorList, 0, sizeof(xbox::dword_xt) * DISK_BUFFER); + memset(Session->Read.LockList, 0, sizeof(xbox::dword_xt) * DISK_BUFFER); Session->Read.WriteIndex = 0; // Invalidate all open files & search structures Session->Magic++; @@ -108,7 +108,7 @@ BOOL XDVDFS_UnMount( // Initialize a search record with root dir // Note: Can return XDVDFS_NO_MORE_FILES if the image is empty -DWORD XDVDFS_GetRootDir( +xbox::dword_xt XDVDFS_GetRootDir( PXDVDFS_SESSION Session, PSEARCH_RECORD SearchRecord) { @@ -124,12 +124,12 @@ DWORD XDVDFS_GetRootDir( } // Enumerate files -DWORD XDVDFS_EnumFiles( +xbox::dword_xt XDVDFS_EnumFiles( PXDVDFS_SESSION Session, PSEARCH_RECORD SearchRecord) { PXDVDFS_DIRECTORY_ENTRY Entry; - DWORD SectorNumber, Position, i; + xbox::dword_xt SectorNumber, Position, i; PBYTE Ptr; enum_retry: @@ -200,12 +200,12 @@ enum_retry: return XDVDFS_NO_ERROR; } -DWORD XDVDFS_GetFileInfo( +xbox::dword_xt XDVDFS_GetFileInfo( PXDVDFS_SESSION Session, LPSTR Filename, PSEARCH_RECORD SearchRecord) { - DWORD Length, i, ReturnCode; + xbox::dword_xt Length, i, ReturnCode; // To begin, we will enter the root directory XDVDFS_GetRootDir(Session, SearchRecord); @@ -280,12 +280,12 @@ DWORD XDVDFS_GetFileInfo( } // Initialize a search record given a path -DWORD XDVDFS_OpenFolder( +xbox::dword_xt XDVDFS_OpenFolder( PXDVDFS_SESSION Session, LPSTR Path, PSEARCH_RECORD SearchRecord) { - DWORD ReturnCode; + xbox::dword_xt ReturnCode; // Find a file matching the given path ReturnCode = XDVDFS_GetFileInfo(Session, Path, SearchRecord); @@ -305,13 +305,13 @@ DWORD XDVDFS_OpenFolder( } // Open a file -DWORD XDVDFS_OpenFile( +xbox::dword_xt XDVDFS_OpenFile( PXDVDFS_SESSION Session, LPSTR Filename, PFILE_RECORD FileRecord) { SEARCH_RECORD SearchRecord; - DWORD ReturnCode; + xbox::dword_xt ReturnCode; // Find a file matching the given path ReturnCode = XDVDFS_GetFileInfo(Session, Filename, &SearchRecord); @@ -333,7 +333,7 @@ DWORD XDVDFS_OpenFile( } // Open a file pointed by a search rec -DWORD XDVDFS_OpenFileEx( +xbox::dword_xt XDVDFS_OpenFileEx( PXDVDFS_SESSION Session, PSEARCH_RECORD SearchRecord, PFILE_RECORD FileRecord) @@ -356,13 +356,13 @@ DWORD XDVDFS_OpenFileEx( } // Read a file -DWORD XDVDFS_FileRead( +xbox::dword_xt XDVDFS_FileRead( PXDVDFS_SESSION Session, PFILE_RECORD FileRecord, PVOID OutBuffer, - DWORD Size) + xbox::dword_xt Size) { - DWORD CurrentSector, Position, PartialRead, Readed, i; + xbox::dword_xt CurrentSector, Position, PartialRead, Readed, i; PBYTE Buffer = (PBYTE)OutBuffer; Readed = 0; @@ -460,7 +460,7 @@ DWORD XDVDFS_FileRead( return Readed; } -DWORD XDVDFS_FileClose( +xbox::dword_xt XDVDFS_FileClose( PXDVDFS_SESSION Session, PFILE_RECORD FileRecord) { @@ -473,11 +473,11 @@ DWORD XDVDFS_FileClose( return XDVDFS_NO_ERROR; } -DWORD XDVDFS_FileSeek( +xbox::dword_xt XDVDFS_FileSeek( PXDVDFS_SESSION Session, PFILE_RECORD FileRecord, int Delta, - DWORD SeekMode) + xbox::dword_xt SeekMode) { // Check structure validity if (FileRecord->Magic != Session->Magic) diff --git a/src/common/xdvdfs-tools/xdvdfs.h b/src/common/xdvdfs-tools/xdvdfs.h index ae5ecdd91..aa18832c9 100644 --- a/src/common/xdvdfs-tools/xdvdfs.h +++ b/src/common/xdvdfs-tools/xdvdfs.h @@ -3,13 +3,13 @@ #ifndef __XDVDFS_H__ #define __XDVDFS_H__ -#include //#include +#include //#include #include "buffered_io.h" using namespace xbox; -CONST CHAR *XDVDFS_Signature = "MICROSOFT*XBOX*MEDIA"; +CONST char_xt *XDVDFS_Signature = "MICROSOFT*XBOX*MEDIA"; //-- Defines ------------------------------------------------------------------ @@ -42,18 +42,18 @@ CONST CHAR *XDVDFS_Signature = "MICROSOFT*XBOX*MEDIA"; // XDVDFS Volume descriptor typedef struct { - BYTE Signature1[SIGNATURE_SIZE]; - DWORD RootDirectory; - DWORD RootDirectorySize; + xbox::byte_xt Signature1[SIGNATURE_SIZE]; + xbox::dword_xt RootDirectory; + xbox::dword_xt RootDirectorySize; FILETIME ImageCreationTime; - BYTE Unused[1992]; - BYTE Signature2[SIGNATURE_SIZE]; + xbox::byte_xt Unused[1992]; + xbox::byte_xt Signature2[SIGNATURE_SIZE]; } XDVDFS_VOLUME_DESCRIPTOR, *PXDVDFS_VOLUME_DESCRIPTOR; // XDVDFS session typedef struct { // Start sector of current session - DWORD FileSystemBaseSector; + xbox::dword_xt FileSystemBaseSector; // Volume Descriptor of the current session XDVDFS_VOLUME_DESCRIPTOR Root; @@ -63,30 +63,30 @@ typedef struct { // The dword below is incremented when the filesystem is unmounted // automatically invalidating all open files and search records - DWORD Magic; + xbox::dword_xt Magic; } XDVDFS_SESSION, *PXDVDFS_SESSION; // File Record typedef struct { - DWORD Magic; - BYTE PartialData[SECTOR_SIZE]; - DWORD PartialSector; - DWORD FileStartSector; - DWORD FileSize; - DWORD CurrentPosition; + xbox::dword_xt Magic; + xbox::byte_xt PartialData[SECTOR_SIZE]; + xbox::dword_xt PartialSector; + xbox::dword_xt FileStartSector; + xbox::dword_xt FileSize; + xbox::dword_xt CurrentPosition; } FILE_RECORD, *PFILE_RECORD; // Search Record typedef struct { - DWORD Magic; - DWORD SearchStartSector; - DWORD DirectorySize; - DWORD Position; - BYTE CurrentFilename[FILENAME_SIZE]; - DWORD CurrentFileAttributes; - DWORD CurrentFileSize; - DWORD CurrentFileStartSector; - DWORD CurrentFileEndSector; + xbox::dword_xt Magic; + xbox::dword_xt SearchStartSector; + xbox::dword_xt DirectorySize; + xbox::dword_xt Position; + xbox::byte_xt CurrentFilename[FILENAME_SIZE]; + xbox::dword_xt CurrentFileAttributes; + xbox::dword_xt CurrentFileSize; + xbox::dword_xt CurrentFileStartSector; + xbox::dword_xt CurrentFileEndSector; } SEARCH_RECORD, *PSEARCH_RECORD; //-- Exported Functions ------------------------------------------------------- @@ -94,7 +94,7 @@ typedef struct { // XDVDFS init a session object extern BOOL XDVDFS_Mount( PXDVDFS_SESSION Session, - BOOL (*ReadFunc)(PVOID, PVOID, DWORD, DWORD), + BOOL (*ReadFunc)(PVOID, PVOID, xbox::dword_xt, xbox::dword_xt), PVOID Data); // XDVDFS deinit a session object @@ -103,56 +103,56 @@ extern BOOL XDVDFS_UnMount( // Initialize a search record with root dir // Note: Can return XDVDFS_NO_MORE_FILES if the image is empty -extern DWORD XDVDFS_GetRootDir( +extern xbox::dword_xt XDVDFS_GetRootDir( PXDVDFS_SESSION Session, PSEARCH_RECORD SearchRecord); // Enumerate files -extern DWORD XDVDFS_EnumFiles( +extern xbox::dword_xt XDVDFS_EnumFiles( PXDVDFS_SESSION Session, PSEARCH_RECORD SearchRecord); // Find a file given its path -extern DWORD XDVDFS_GetFileInfo( +extern xbox::dword_xt XDVDFS_GetFileInfo( PXDVDFS_SESSION Session, LPSTR Filename, PSEARCH_RECORD SearchRecord); // Initialize a search record given a path -extern DWORD XDVDFS_OpenFolder( +extern xbox::dword_xt XDVDFS_OpenFolder( PXDVDFS_SESSION Session, LPSTR Path, PSEARCH_RECORD SearchRecord); // Open a file -extern DWORD XDVDFS_OpenFile( +extern xbox::dword_xt XDVDFS_OpenFile( PXDVDFS_SESSION Session, LPSTR Filename, PFILE_RECORD FileRecord); // Open a file pointed by a search rec -extern DWORD XDVDFS_OpenFileEx( +extern xbox::dword_xt XDVDFS_OpenFileEx( PXDVDFS_SESSION Session, PSEARCH_RECORD SearchRecord, PFILE_RECORD FileRecord); // Read a file -extern DWORD XDVDFS_FileRead( +extern xbox::dword_xt XDVDFS_FileRead( PXDVDFS_SESSION Session, PFILE_RECORD FileRecord, PVOID Buffer, - DWORD Size); + xbox::dword_xt Size); // Close file -extern DWORD XDVDFS_FileClose( +extern xbox::dword_xt XDVDFS_FileClose( PXDVDFS_SESSION Session, PFILE_RECORD FileRecord); // File seek -extern DWORD XDVDFS_FileSeek( +extern xbox::dword_xt XDVDFS_FileSeek( PXDVDFS_SESSION Session, PFILE_RECORD FileRecord, int Delta, - DWORD SeekMode); + xbox::dword_xt SeekMode); #endif // __XDVDFS_H__ diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp index 3c96390cc..4e703ae44 100644 --- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp +++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp @@ -36,7 +36,7 @@ #include -#include +#include #include "common\util\CxbxUtil.h" #include "CxbxVersion.h" #include "core\kernel\init\CxbxKrnl.h" @@ -146,7 +146,7 @@ typedef struct { // Arguments to D3DDevice_InsertCallback : xbox::X_D3DCALLBACK pCallback; xbox::X_D3DCALLBACKTYPE Type; - xbox::DWORD Context; + xbox::dword_xt Context; } s_Xbox_Callback; static std::queue g_Xbox_CallbackQueue; @@ -161,8 +161,8 @@ static std::condition_variable g_VBConditionVariable; // Used in BlockUntilVert static std::mutex g_VBConditionMutex; // Used in BlockUntilVerticalBlank static DWORD g_VBLastSwap = 0; -static xbox::DWORD g_Xbox_PresentationInterval_Default = D3DPRESENT_INTERVAL_IMMEDIATE; - xbox::DWORD g_Xbox_PresentationInterval_Override = 0; +static xbox::dword_xt g_Xbox_PresentationInterval_Default = D3DPRESENT_INTERVAL_IMMEDIATE; + xbox::dword_xt g_Xbox_PresentationInterval_Override = 0; static xbox::X_D3DSWAPDATA g_Xbox_SwapData = {0}; // current swap information static xbox::X_D3DSWAPCALLBACK g_pXbox_SwapCallback = xbox::zeroptr; // Swap/Present callback routine static xbox::X_D3DVBLANKDATA g_Xbox_VBlankData = {0}; // current vertical blank information @@ -175,8 +175,8 @@ static xbox::X_D3DSurface *g_pXbox_DepthStencil = xbox::zeroptr; xbox::X_D3DMULTISAMPLE_TYPE g_Xbox_MultiSampleType = xbox::X_D3DMULTISAMPLE_NONE; xbox::X_VERTEXSHADERCONSTANTMODE g_Xbox_VertexShaderConstantMode = X_D3DSCM_192CONSTANTS; // Set by D3DDevice_SetShaderConstantMode, TODO : Move to XbVertexShader.cpp -static xbox::DWORD g_Xbox_BaseVertexIndex = 0; // Set by D3DDevice_SetIndices, read by D3DDevice_DrawIndexedVertices : a value that's effectively added to every vertex index (as stored in an index buffer) by multiplying this by vertex stride and added to the vertex buffer start (see BaseVertexIndex in CxbxDrawIndexed) -static xbox::DWORD *g_pXbox_BeginPush_Buffer = xbox::zeroptr; // primary push buffer +static xbox::dword_xt g_Xbox_BaseVertexIndex = 0; // Set by D3DDevice_SetIndices, read by D3DDevice_DrawIndexedVertices : a value that's effectively added to every vertex index (as stored in an index buffer) by multiplying this by vertex stride and added to the vertex buffer start (see BaseVertexIndex in CxbxDrawIndexed) +static xbox::dword_xt *g_pXbox_BeginPush_Buffer = xbox::zeroptr; // primary push buffer xbox::X_PixelShader* g_pXbox_PixelShader = xbox::zeroptr; static xbox::PVOID g_pXbox_Palette_Data[xbox::X_D3DTS_STAGECOUNT] = { xbox::zeroptr, xbox::zeroptr, xbox::zeroptr, xbox::zeroptr }; // cached palette pointer @@ -187,12 +187,12 @@ static unsigned g_Xbox_Palette_Size[xbox::X_D3DTS_STAGECOUNT static xbox::X_D3DBaseTexture CxbxActiveTextureCopies[xbox::X_D3DTS_STAGECOUNT] = {}; // Set by D3DDevice_SwitchTexture. Cached active texture /* Unused : -static xbox::DWORD *g_Xbox_D3DDevice; // TODO: This should be a D3DDevice structure +static xbox::dword_xt *g_Xbox_D3DDevice; // TODO: This should be a D3DDevice structure static DWORD g_dwVertexShaderUsage = 0; // Unused. If needed, move to XbVertexShader.cpp */ - xbox::DWORD g_Xbox_VertexShader_Handle = 0; + xbox::dword_xt g_Xbox_VertexShader_Handle = 0; // Static Function(s) static BOOL WINAPI EmuEnumDisplayDevices(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR hm); @@ -215,7 +215,7 @@ typedef struct resource_key_hash { union { struct { // For non-pixel-containers, we set the Xbox resource address for now (TODO : Come up with something better) : - xbox::addr ResourceAddr; // We set this as-is + xbox::addr_xt ResourceAddr; // We set this as-is }; struct { // For xbox::X_D3DPixelContainer's we also set these fields : @@ -248,7 +248,7 @@ typedef struct resource_key_hash { struct EmuD3D8CreateDeviceProxyData { // Set by EmuD3DInit() - xbox::UINT Adapter; + xbox::uint_xt Adapter; D3DDEVTYPE DeviceType; HWND hFocusWindow; // Set byt EMUPATCH(Direct3D_CreateDevice) @@ -256,7 +256,7 @@ struct EmuD3D8CreateDeviceProxyData volatile bool bReady; volatile bool bCreate; // false : release // Set by EmuCreateDeviceProxy() - xbox::DWORD BehaviorFlags; + xbox::dword_xt BehaviorFlags; D3DPRESENT_PARAMETERS HostPresentationParameters; volatile HRESULT hRet; } @@ -264,48 +264,48 @@ g_EmuCDPD = {0}; // Declare trampolines #define XB_TRAMPOLINES(XB_MACRO) \ - XB_MACRO(HRESULT, WINAPI, D3DDevice_CreateVertexShader, (CONST DWORD*, CONST DWORD*, DWORD*, DWORD) ); \ - XB_MACRO(VOID, WINAPI, D3DDevice_DeleteVertexShader, (DWORD) ); \ - XB_MACRO(VOID, WINAPI, D3DDevice_GetBackBuffer, (INT, D3DBACKBUFFER_TYPE, xbox::X_D3DSurface**) ); \ - XB_MACRO(xbox::X_D3DSurface*, WINAPI, D3DDevice_GetBackBuffer2, (INT) ); \ - XB_MACRO(HRESULT, WINAPI, D3DDevice_GetDepthStencilSurface, (xbox::X_D3DSurface**) ); \ - XB_MACRO(xbox::X_D3DSurface*, WINAPI, D3DDevice_GetDepthStencilSurface2, (VOID) ); \ - XB_MACRO(VOID, WINAPI, D3DDevice_GetDisplayMode, (xbox::X_D3DDISPLAYMODE*) ); \ - XB_MACRO(HRESULT, WINAPI, D3DDevice_GetRenderTarget, (xbox::X_D3DSurface**) ); \ - XB_MACRO(xbox::X_D3DSurface*, WINAPI, D3DDevice_GetRenderTarget2, (VOID) ); \ - XB_MACRO(HRESULT, WINAPI, D3DDevice_LightEnable, (DWORD, BOOL) ); \ - /*XB_MACRO(VOID, WINAPI, D3DDevice_LoadVertexShader, (DWORD, DWORD) );*/\ - /*XB_MACRO(VOID, WINAPI, D3DDevice_LoadVertexShaderProgram, (CONST DWORD*, DWORD) );*/\ - /*XB_MACRO(VOID, __stdcall, D3DDevice_LoadVertexShader_0, () );*/\ - /*XB_MACRO(VOID, WINAPI, D3DDevice_LoadVertexShader_4, (DWORD) );*/\ - XB_MACRO(HRESULT, WINAPI, D3DDevice_PersistDisplay, (VOID) ); \ - XB_MACRO(HRESULT, WINAPI, D3DDevice_Reset, (xbox::X_D3DPRESENT_PARAMETERS*) ); \ - /*XB_MACRO(VOID, WINAPI, D3DDevice_SelectVertexShader, (DWORD, DWORD) );*/\ - /*XB_MACRO(VOID, __stdcall, D3DDevice_SelectVertexShader_0, () );*/\ - /*XB_MACRO(VOID, __stdcall, D3DDevice_SelectVertexShader_4, (DWORD) );*/\ - /*XB_MACRO(VOID, WINAPI, D3DDevice_SetGammaRamp, (DWORD, CONST X_D3DGAMMARAMP*) );*/\ - XB_MACRO(VOID, WINAPI, D3DDevice_SetIndices, (xbox::X_D3DIndexBuffer*, UINT) ); \ - XB_MACRO(VOID, WINAPI, D3DDevice_SetIndices_4, (UINT) ); \ - XB_MACRO(HRESULT, WINAPI, D3DDevice_SetLight, (DWORD, CONST xbox::X_D3DLIGHT8*) ); \ - XB_MACRO(VOID, WINAPI, D3DDevice_SetPixelShader, (DWORD) ); \ - XB_MACRO(VOID, WINAPI, D3DDevice_SetPixelShader_0, () ); \ - XB_MACRO(VOID, __fastcall, D3DDevice_SetRenderState_Simple, (DWORD, DWORD) ); \ - XB_MACRO(VOID, WINAPI, D3DDevice_SetRenderTarget, (xbox::X_D3DSurface*, xbox::X_D3DSurface*) ); \ - XB_MACRO(VOID, WINAPI, D3DDevice_SetStreamSource, (UINT, xbox::X_D3DVertexBuffer*, UINT) ); \ - XB_MACRO(VOID, WINAPI, D3DDevice_SetStreamSource_4, (UINT, xbox::X_D3DVertexBuffer*, UINT) ); \ - XB_MACRO(VOID, WINAPI, D3DDevice_SetStreamSource_8, (xbox::X_D3DVertexBuffer*, UINT) ); \ - XB_MACRO(VOID, WINAPI, D3DDevice_SetTexture, (DWORD, xbox::X_D3DBaseTexture*) ); \ - XB_MACRO(VOID, WINAPI, D3DDevice_SetTexture_4, (xbox::X_D3DBaseTexture*) ); \ - /*XB_MACRO(VOID, WINAPI, D3DDevice_SetVertexShader, (DWORD) );*/\ - /*XB_MACRO(VOID, WINAPI, D3DDevice_SetVertexShaderInput, (DWORD, UINT, xbox::X_STREAMINPUT*) );*/\ - XB_MACRO(VOID, WINAPI, D3DDevice_SetViewport, (CONST xbox::X_D3DVIEWPORT8*) ); \ - XB_MACRO(VOID, WINAPI, D3D_DestroyResource, (xbox::X_D3DResource*) ); \ - XB_MACRO(VOID, WINAPI, D3D_DestroyResource__LTCG, (VOID) ); \ - XB_MACRO(HRESULT, WINAPI, Direct3D_CreateDevice, (UINT, D3DDEVTYPE, HWND, DWORD, xbox::X_D3DPRESENT_PARAMETERS*, IDirect3DDevice**) ); \ - XB_MACRO(HRESULT, WINAPI, Direct3D_CreateDevice_16, (UINT, D3DDEVTYPE, HWND, xbox::X_D3DPRESENT_PARAMETERS*) ); \ - XB_MACRO(HRESULT, WINAPI, Direct3D_CreateDevice_4, (xbox::X_D3DPRESENT_PARAMETERS*) ); \ - XB_MACRO(VOID, WINAPI, Lock2DSurface, (xbox::X_D3DPixelContainer*, D3DCUBEMAP_FACES, UINT, D3DLOCKED_RECT*, RECT*, DWORD) ); \ - XB_MACRO(VOID, WINAPI, Lock3DSurface, (xbox::X_D3DPixelContainer*, UINT, D3DLOCKED_BOX*, D3DBOX*, DWORD) ); \ + XB_MACRO(xbox::hresult_xt, WINAPI, D3DDevice_CreateVertexShader, (CONST xbox::dword_xt*, CONST xbox::dword_xt*, xbox::dword_xt*, xbox::dword_xt) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_DeleteVertexShader, (xbox::dword_xt) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_GetBackBuffer, (xbox::int_xt, D3DBACKBUFFER_TYPE, xbox::X_D3DSurface**) ); \ + XB_MACRO(xbox::X_D3DSurface*, WINAPI, D3DDevice_GetBackBuffer2, (xbox::int_xt) ); \ + XB_MACRO(xbox::hresult_xt, WINAPI, D3DDevice_GetDepthStencilSurface, (xbox::X_D3DSurface**) ); \ + XB_MACRO(xbox::X_D3DSurface*, WINAPI, D3DDevice_GetDepthStencilSurface2, (xbox::void_xt) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_GetDisplayMode, (xbox::X_D3DDISPLAYMODE*) ); \ + XB_MACRO(xbox::hresult_xt, WINAPI, D3DDevice_GetRenderTarget, (xbox::X_D3DSurface**) ); \ + XB_MACRO(xbox::X_D3DSurface*, WINAPI, D3DDevice_GetRenderTarget2, (xbox::void_xt) ); \ + XB_MACRO(xbox::hresult_xt, WINAPI, D3DDevice_LightEnable, (xbox::dword_xt, xbox::bool_xt) ); \ + /*XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_LoadVertexShader, (xbox::dword_xt, xbox::dword_xt) );*/\ + /*XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_LoadVertexShaderProgram, (CONST xbox::dword_xt*, xbox::dword_xt) );*/\ + /*XB_MACRO(xbox::void_xt, __stdcall, D3DDevice_LoadVertexShader_0, () );*/\ + /*XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_LoadVertexShader_4, (xbox::dword_xt) );*/\ + XB_MACRO(xbox::hresult_xt, WINAPI, D3DDevice_PersistDisplay, (xbox::void_xt) ); \ + XB_MACRO(xbox::hresult_xt, WINAPI, D3DDevice_Reset, (xbox::X_D3DPRESENT_PARAMETERS*) ); \ + /*XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SelectVertexShader, (xbox::dword_xt, xbox::dword_xt) );*/\ + /*XB_MACRO(xbox::void_xt, __stdcall, D3DDevice_SelectVertexShader_0, () );*/\ + /*XB_MACRO(xbox::void_xt, __stdcall, D3DDevice_SelectVertexShader_4, (xbox::dword_xt) );*/\ + /*XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetGammaRamp, (xbox::dword_xt, CONST X_D3DGAMMARAMP*) );*/\ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetIndices, (xbox::X_D3DIndexBuffer*, xbox::uint_xt) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetIndices_4, (xbox::uint_xt) ); \ + XB_MACRO(xbox::hresult_xt, WINAPI, D3DDevice_SetLight, (xbox::dword_xt, CONST xbox::X_D3DLIGHT8*) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetPixelShader, (xbox::dword_xt) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetPixelShader_0, () ); \ + XB_MACRO(xbox::void_xt, __fastcall, D3DDevice_SetRenderState_Simple, (xbox::dword_xt, xbox::dword_xt) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetRenderTarget, (xbox::X_D3DSurface*, xbox::X_D3DSurface*) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetStreamSource, (xbox::uint_xt, xbox::X_D3DVertexBuffer*, xbox::uint_xt) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetStreamSource_4, (xbox::uint_xt, xbox::X_D3DVertexBuffer*, xbox::uint_xt) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetStreamSource_8, (xbox::X_D3DVertexBuffer*, xbox::uint_xt) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetTexture, (xbox::dword_xt, xbox::X_D3DBaseTexture*) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetTexture_4, (xbox::X_D3DBaseTexture*) ); \ + /*XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetVertexShader, (xbox::dword_xt) );*/\ + /*XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetVertexShaderInput, (xbox::dword_xt, xbox::uint_xt, xbox::X_STREAMINPUT*) );*/\ + XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetViewport, (CONST xbox::X_D3DVIEWPORT8*) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3D_DestroyResource, (xbox::X_D3DResource*) ); \ + XB_MACRO(xbox::void_xt, WINAPI, D3D_DestroyResource__LTCG, (xbox::void_xt) ); \ + XB_MACRO(xbox::hresult_xt, WINAPI, Direct3D_CreateDevice, (xbox::uint_xt, D3DDEVTYPE, HWND, xbox::dword_xt, xbox::X_D3DPRESENT_PARAMETERS*, IDirect3DDevice**) ); \ + XB_MACRO(xbox::hresult_xt, WINAPI, Direct3D_CreateDevice_16, (xbox::uint_xt, D3DDEVTYPE, HWND, xbox::X_D3DPRESENT_PARAMETERS*) ); \ + XB_MACRO(xbox::hresult_xt, WINAPI, Direct3D_CreateDevice_4, (xbox::X_D3DPRESENT_PARAMETERS*) ); \ + XB_MACRO(xbox::void_xt, WINAPI, Lock2DSurface, (xbox::X_D3DPixelContainer*, D3DCUBEMAP_FACES, xbox::uint_xt, D3DLOCKED_RECT*, RECT*, xbox::dword_xt) ); \ + XB_MACRO(xbox::void_xt, WINAPI, Lock3DSurface, (xbox::X_D3DPixelContainer*, xbox::uint_xt, D3DLOCKED_BOX*, D3DBOX*, xbox::dword_xt) ); \ XB_TRAMPOLINES(XB_trampoline_declare); @@ -564,7 +564,7 @@ const char *D3DErrorString(HRESULT hResult) return buffer; } -VOID CxbxInitWindow(bool bFullInit) +void CxbxInitWindow(bool bFullInit) { g_EmuShared->GetVideoSettings(&g_XBVideo); @@ -689,7 +689,7 @@ void CxbxReleaseCursor() ClipCursor(nullptr); } -inline DWORD GetXboxCommonResourceType(const xbox::DWORD XboxResource_Common) +inline DWORD GetXboxCommonResourceType(const xbox::dword_xt XboxResource_Common) { DWORD dwCommonType = XboxResource_Common & X_D3DCOMMON_TYPE_MASK; return dwCommonType; @@ -703,7 +703,7 @@ inline DWORD GetXboxCommonResourceType(const xbox::X_D3DResource* pXboxResource) return GetXboxCommonResourceType(pXboxResource->Common); } -xbox::X_D3DFORMAT GetXboxPixelContainerFormat(const xbox::DWORD XboxPixelContainer_Format) +xbox::X_D3DFORMAT GetXboxPixelContainerFormat(const xbox::dword_xt XboxPixelContainer_Format) { xbox::X_D3DFORMAT d3d_format = (xbox::X_D3DFORMAT)((XboxPixelContainer_Format & X_D3DFORMAT_FORMAT_MASK) >> X_D3DFORMAT_FORMAT_SHIFT); return d3d_format; @@ -791,7 +791,7 @@ inline bool IsResourceTypeGPUReadable(const DWORD ResourceType) return false; } -inline bool IsPaletizedTexture(const xbox::DWORD XboxPixelContainer_Format) +inline bool IsPaletizedTexture(const xbox::dword_xt XboxPixelContainer_Format) { return GetXboxPixelContainerFormat(XboxPixelContainer_Format) == xbox::X_D3DFMT_P8; } @@ -828,7 +828,7 @@ void *GetDataFromXboxResource(xbox::X_D3DResource *pXboxResource) if (pXboxResource == xbox::zeroptr) return nullptr; - xbox::addr pData = pXboxResource->Data; + xbox::addr_xt pData = pXboxResource->Data; if (pData == xbox::zero) return nullptr; @@ -856,7 +856,7 @@ typedef std::unordered_map r resource_cache_t g_Cxbx_Cached_Direct3DResources; resource_cache_t g_Cxbx_Cached_PaletizedTextures; -bool IsResourceAPixelContainer(xbox::DWORD XboxResource_Common) +bool IsResourceAPixelContainer(xbox::dword_xt XboxResource_Common) { DWORD Type = GetXboxCommonResourceType(XboxResource_Common); switch (Type) @@ -913,7 +913,7 @@ resource_key_t GetHostResourceKey(xbox::X_D3DResource* pXboxResource, int iTextu } } else { // For other resource types, do include their Xbox resource address (TODO : come up with something better) - key.ResourceAddr = (xbox::addr)pXboxResource; + key.ResourceAddr = (xbox::addr_xt)pXboxResource; } } @@ -984,7 +984,7 @@ IDirect3DResource *GetHostResource(xbox::X_D3DResource *pXboxResource, DWORD D3D // Forward declaration of CxbxGetPixelContainerMeasures to prevent // polluting the diff too much by reshuffling functions around -VOID CxbxGetPixelContainerMeasures +void CxbxGetPixelContainerMeasures ( xbox::X_D3DPixelContainer *pPixelContainer, DWORD dwMipMapLevel, @@ -1253,7 +1253,7 @@ xbox::X_D3DSurface *EmuNewD3DSurface() } */ -VOID CxbxSetPixelContainerHeader +void CxbxSetPixelContainerHeader ( xbox::X_D3DPixelContainer* pPixelContainer, DWORD Common, @@ -1356,7 +1356,7 @@ uint32_t GetPixelContainerHeight(xbox::X_D3DPixelContainer *pPixelContainer) return Result; } -VOID CxbxGetPixelContainerMeasures +void CxbxGetPixelContainerMeasures ( xbox::X_D3DPixelContainer *pPixelContainer, // TODO : Add X_D3DCUBEMAP_FACES argument @@ -1592,7 +1592,7 @@ uint8_t *ConvertD3DTextureToARGB( } // Direct3D initialization (called before emulation begins) -VOID EmuD3DInit() +void EmuD3DInit() { // create the create device proxy thread { @@ -1640,7 +1640,7 @@ VOID EmuD3DInit() } // cleanup Direct3D -VOID EmuD3DCleanup() {} +void EmuD3DCleanup() {} // enumeration procedure for locating display device GUIDs static BOOL WINAPI EmuEnumDisplayDevices(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR hm) @@ -3128,7 +3128,7 @@ void Direct3D_CreateDevice_End() // LTCG specific Direct3D_CreateDevice function... // This uses a custom calling with parameters passed in eax, ecx and the stack // Test-case: Ninja Gaiden, Halo 2 -HRESULT WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_4) +xbox::hresult_xt WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_4) ( X_D3DPRESENT_PARAMETERS *pPresentationParameters ) @@ -3147,7 +3147,7 @@ HRESULT WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_4) Direct3D_CreateDevice_Start(pPresentationParameters); - HRESULT hRet = 0; + hresult_xt hRet = 0; // Only then call Xbox CreateDevice function __asm { @@ -3166,9 +3166,9 @@ HRESULT WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_4) // LTCG specific Direct3D_CreateDevice function... // This uses a custom calling convention passed unknown parameters // Test-case: Battle Engine Aquila -HRESULT WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_16) +xbox::hresult_xt WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_16) ( - UINT Adapter, + uint_xt Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, X_D3DPRESENT_PARAMETERS *pPresentationParameters @@ -3184,7 +3184,7 @@ HRESULT WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_16) Direct3D_CreateDevice_Start(pPresentationParameters); // Only then call Xbox CreateDevice function - HRESULT hRet = XB_TRMP(Direct3D_CreateDevice_16)(Adapter, DeviceType, hFocusWindow, pPresentationParameters); + hresult_xt hRet = XB_TRMP(Direct3D_CreateDevice_16)(Adapter, DeviceType, hFocusWindow, pPresentationParameters); Direct3D_CreateDevice_End(); @@ -3197,9 +3197,9 @@ HRESULT WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_16) // This uses a custom calling convention where parameter is passed in EBX and Stack // Test Case: Conker // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetIndices_4) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetIndices_4) ( - UINT BaseVertexIndex + uint_xt BaseVertexIndex ) { X_D3DIndexBuffer *pIndexData; @@ -3222,10 +3222,10 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetIndices_4) // ****************************************************************** // * patch: D3DDevice_SetIndices // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetIndices) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetIndices) ( X_D3DIndexBuffer *pIndexData, - UINT BaseVertexIndex + uint_xt BaseVertexIndex ) { LOG_FUNC_BEGIN @@ -3242,12 +3242,12 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetIndices) // ****************************************************************** // * patch: Direct3D_CreateDevice // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(Direct3D_CreateDevice) +xbox::hresult_xt WINAPI xbox::EMUPATCH(Direct3D_CreateDevice) ( - UINT Adapter, + uint_xt Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, - DWORD BehaviorFlags, + dword_xt BehaviorFlags, X_D3DPRESENT_PARAMETERS *pPresentationParameters, IDirect3DDevice **ppReturnedDeviceInterface ) @@ -3264,7 +3264,7 @@ HRESULT WINAPI xbox::EMUPATCH(Direct3D_CreateDevice) Direct3D_CreateDevice_Start(pPresentationParameters); // Only then call Xbox CreateDevice function - HRESULT hRet = XB_TRMP(Direct3D_CreateDevice)(Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface); + hresult_xt hRet = XB_TRMP(Direct3D_CreateDevice)(Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface); Direct3D_CreateDevice_End(); @@ -3274,7 +3274,7 @@ HRESULT WINAPI xbox::EMUPATCH(Direct3D_CreateDevice) // ****************************************************************** // * patch: D3DDevice_Reset // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_Reset) +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_Reset) ( X_D3DPRESENT_PARAMETERS* pPresentationParameters ) @@ -3299,7 +3299,7 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_Reset) FreeHostResource(GetHostResourceKey(g_pXbox_DefaultDepthStencilSurface)); // Call the Xbox Reset function to do the rest of the work for us - HRESULT hRet = XB_TRMP(D3DDevice_Reset)(pPresentationParameters); + hresult_xt hRet = XB_TRMP(D3DDevice_Reset)(pPresentationParameters); // Refresh the current render target and depth stencil, to apply changes made within D3DDevice_Reset // Some XDKs do this for us, but not all do! @@ -3312,7 +3312,7 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_Reset) // ****************************************************************** // * patch: D3DDevice_GetDisplayFieldStatus // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_GetDisplayFieldStatus)(X_D3DFIELD_STATUS *pFieldStatus) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_GetDisplayFieldStatus)(X_D3DFIELD_STATUS *pFieldStatus) { // NOTE: This can be unpatched only when NV2A does it's own VBlank and HLE _Swap function is unpatched @@ -3352,7 +3352,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_GetDisplayFieldStatus)(X_D3DFIELD_STATUS *p // Starting from XDK 4531, this changed to 1 parameter only. // Is this definition incorrect, or did it change at some point? // ****************************************************************** -PDWORD WINAPI xbox::EMUPATCH(D3DDevice_BeginPush)(DWORD Count) +xbox::PDWORD WINAPI xbox::EMUPATCH(D3DDevice_BeginPush)(dword_xt Count) { LOG_FUNC_ONE_ARG(Count); @@ -3362,7 +3362,7 @@ PDWORD WINAPI xbox::EMUPATCH(D3DDevice_BeginPush)(DWORD Count) delete[] g_pXbox_BeginPush_Buffer; // prevent a memory leak } - DWORD *pRet = new DWORD[Count]; + dword_xt *pRet = new dword_xt[Count]; g_pXbox_BeginPush_Buffer = pRet; @@ -3374,7 +3374,7 @@ PDWORD WINAPI xbox::EMUPATCH(D3DDevice_BeginPush)(DWORD Count) // TODO: Find a test case and verify this: RalliSport Challenge XDK 4134 // For XDK before 4531 // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_BeginPush2)(DWORD Count, DWORD** ppPush) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_BeginPush2)(dword_xt Count, dword_xt** ppPush) { LOG_FUNC_BEGIN LOG_FUNC_ARG(Count) @@ -3387,7 +3387,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_BeginPush2)(DWORD Count, DWORD** ppPush) delete[] g_pXbox_BeginPush_Buffer; // prevent a memory leak } - DWORD *pRet = new DWORD[Count]; + dword_xt *pRet = new dword_xt[Count]; g_pXbox_BeginPush_Buffer = pRet; @@ -3397,7 +3397,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_BeginPush2)(DWORD Count, DWORD** ppPush) // ****************************************************************** // * patch: D3DDevice_EndPush // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_EndPush)(DWORD *pPush) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_EndPush)(dword_xt *pPush) { LOG_FUNC_ONE_ARG(pPush); @@ -3417,7 +3417,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_EndPush)(DWORD *pPush) // ****************************************************************** // * patch: D3DDevice_BeginVisibilityTest // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_BeginVisibilityTest)() +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_BeginVisibilityTest)() { LOG_FUNC(); @@ -3446,11 +3446,11 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_BeginVisibilityTest)() // LTCG specific D3DDevice_EndVisibilityTest function... // This uses a custom calling convention where parameter is passed in EAX // Test-case: Test Drive: Eve of Destruction -HRESULT __stdcall xbox::EMUPATCH(D3DDevice_EndVisibilityTest_0) +xbox::hresult_xt __stdcall xbox::EMUPATCH(D3DDevice_EndVisibilityTest_0) ( ) { - DWORD Index; + dword_xt Index; __asm { mov Index, eax @@ -3462,9 +3462,9 @@ HRESULT __stdcall xbox::EMUPATCH(D3DDevice_EndVisibilityTest_0) // ****************************************************************** // * patch: D3DDevice_EndVisibilityTest // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_EndVisibilityTest) +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_EndVisibilityTest) ( - DWORD Index + dword_xt Index ) { LOG_FUNC_ONE_ARG(Index); @@ -3500,7 +3500,7 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_EndVisibilityTest) // ****************************************************************** // * patch: D3DDevice_SetBackBufferScale // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetBackBufferScale)(FLOAT x, FLOAT y) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetBackBufferScale)(float_xt x, float_xt y) { LOG_FUNC_BEGIN LOG_FUNC_ARG(x) @@ -3513,11 +3513,11 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetBackBufferScale)(FLOAT x, FLOAT y) // ****************************************************************** // * patch: D3DDevice_GetVisibilityTestResult // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_GetVisibilityTestResult) +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_GetVisibilityTestResult) ( - DWORD Index, - UINT *pResult, - ULONGLONG *pTimeStamp + dword_xt Index, + uint_xt *pResult, + ulonglong_xt *pTimeStamp ) { LOG_FUNC_BEGIN @@ -3559,12 +3559,12 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_GetVisibilityTestResult) // LTCG specific D3DDevice_LoadVertexShader function... // This uses a custom calling convention where parameter is passed in EAX, ECX // Test-case: Aggressive Inline -VOID __stdcall xbox::EMUPATCH(D3DDevice_LoadVertexShader_0) +xbox::void_xt __stdcall xbox::EMUPATCH(D3DDevice_LoadVertexShader_0) ( ) { - DWORD Handle; - DWORD Address; + dword_xt Handle; + dword_xt Address; __asm { mov Address, eax @@ -3576,12 +3576,12 @@ VOID __stdcall xbox::EMUPATCH(D3DDevice_LoadVertexShader_0) // This uses a custom calling convention where parameter is passed in EAX // Test-case: Ninja Gaiden -VOID WINAPI xbox::EMUPATCH(D3DDevice_LoadVertexShader_4) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_LoadVertexShader_4) ( - DWORD Address + dword_xt Address ) { - DWORD Handle; + dword_xt Handle; __asm mov Handle, eax; LOG_FORWARD("D3DDevice_LoadVertexShader"); @@ -3591,10 +3591,10 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_LoadVertexShader_4) // ****************************************************************** // * patch: D3DDevice_LoadVertexShader // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_LoadVertexShader) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_LoadVertexShader) ( - DWORD Handle, - DWORD Address + dword_xt Handle, + dword_xt Address ) { LOG_FUNC_BEGIN @@ -3608,12 +3608,12 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_LoadVertexShader) // LTCG specific D3DDevice_SelectVertexShader function... // This uses a custom calling convention where parameter is passed in EAX, EBX // Test-case: Star Wars - Battlefront -VOID __stdcall xbox::EMUPATCH(D3DDevice_SelectVertexShader_0) +xbox::void_xt __stdcall xbox::EMUPATCH(D3DDevice_SelectVertexShader_0) ( ) { - DWORD Handle; - DWORD Address; + dword_xt Handle; + dword_xt Address; __asm { mov Handle, eax @@ -3626,12 +3626,12 @@ VOID __stdcall xbox::EMUPATCH(D3DDevice_SelectVertexShader_0) // LTCG specific D3DDevice_SelectVertexShader function... // This uses a custom calling convention where parameter is passed in EAX // Test-case: Aggressive Inline -VOID __stdcall xbox::EMUPATCH(D3DDevice_SelectVertexShader_4) +xbox::void_xt __stdcall xbox::EMUPATCH(D3DDevice_SelectVertexShader_4) ( - DWORD Address + dword_xt Address ) { - DWORD Handle; + dword_xt Handle; __asm mov Handle, eax; return EMUPATCH(D3DDevice_SelectVertexShader)(Handle, Address); @@ -3640,10 +3640,10 @@ VOID __stdcall xbox::EMUPATCH(D3DDevice_SelectVertexShader_4) // ****************************************************************** // * patch: D3DDevice_SelectVertexShader // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SelectVertexShader) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SelectVertexShader) ( - DWORD Handle, - DWORD Address + dword_xt Handle, + dword_xt Address ) { LOG_FUNC_BEGIN @@ -3657,9 +3657,9 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SelectVertexShader) // ****************************************************************** // * patch: D3DDevice_SetGammaRamp // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetGammaRamp) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetGammaRamp) ( - DWORD dwFlags, + dword_xt dwFlags, CONST X_D3DGAMMARAMP *pRamp ) { @@ -3689,7 +3689,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetGammaRamp) // ****************************************************************** // * patch: D3DDevice_GetGammaRamp // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_GetGammaRamp) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_GetGammaRamp) ( X_D3DGAMMARAMP *pRamp ) @@ -3718,7 +3718,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_GetGammaRamp) #define COPY_BACKBUFFER_TO_XBOX_SURFACE // Uncomment to enable writing Host Backbuffers back to Xbox surfaces xbox::X_D3DSurface* WINAPI xbox::EMUPATCH(D3DDevice_GetBackBuffer2) ( - INT BackBuffer + int_xt BackBuffer ) { LOG_FUNC_ONE_ARG(BackBuffer); @@ -3770,7 +3770,7 @@ xbox::X_D3DSurface* WINAPI xbox::EMUPATCH(D3DDevice_GetBackBuffer2) static X_D3DSurface *pXboxBackBuffer = EmuNewD3DSurface(); IDirect3DSurface *pCurrentHostBackBuffer = nullptr; - STATUS_SUCCESS; + xbox::status_success; if (BackBuffer == -1) { BackBuffer = 0; @@ -3852,9 +3852,9 @@ xbox::X_D3DSurface* WINAPI xbox::EMUPATCH(D3DDevice_GetBackBuffer2) // ****************************************************************** // * patch: D3DDevice_GetBackBuffer // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_GetBackBuffer) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_GetBackBuffer) ( - INT BackBuffer, + int_xt BackBuffer, D3DBACKBUFFER_TYPE Type, X_D3DSurface **ppBackBuffer ) @@ -4036,7 +4036,7 @@ void UpdateViewPortOffsetAndScaleConstants() // ****************************************************************** // * patch: D3DDevice_SetViewport // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetViewport) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetViewport) ( CONST X_D3DVIEWPORT8 *pViewport ) @@ -4113,7 +4113,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetViewport) // LTCG specific D3DDevice_SetShaderConstantMode function... // This uses a custom calling convention where parameter is passed in EAX -VOID __stdcall xbox::EMUPATCH(D3DDevice_SetShaderConstantMode_0) +xbox::void_xt __stdcall xbox::EMUPATCH(D3DDevice_SetShaderConstantMode_0) ( ) { @@ -4128,7 +4128,7 @@ VOID __stdcall xbox::EMUPATCH(D3DDevice_SetShaderConstantMode_0) // ****************************************************************** // * patch: D3DDevice_SetShaderConstantMode // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetShaderConstantMode) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetShaderConstantMode) ( xbox::X_VERTEXSHADERCONSTANTMODE Mode ) @@ -4141,12 +4141,12 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetShaderConstantMode) // ****************************************************************** // * patch: D3DDevice_CreateVertexShader // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_CreateVertexShader) +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_CreateVertexShader) ( - CONST DWORD *pDeclaration, - CONST DWORD *pFunction, - DWORD *pHandle, - DWORD Usage + CONST dword_xt *pDeclaration, + CONST dword_xt *pFunction, + dword_xt *pHandle, + dword_xt Usage ) { LOG_FUNC_BEGIN @@ -4184,13 +4184,13 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_CreateVertexShader) *pHandle = ((DWORD)malloc(sizeof(X_D3DVertexShader)) & D3DFVF_RESERVED0); } - return CxbxImpl_CreateVertexShader(pDeclaration, pFunction, pHandle, Usage); + return CxbxImpl_CreateVertexShader((DWORD *)pDeclaration, (DWORD *)pFunction, (DWORD *)pHandle, Usage); } // LTCG specific D3DDevice_SetVertexShaderConstant function... // This uses a custom calling convention where parameter is passed in EDX // Test-case: Murakumo -VOID __stdcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant_8) +xbox::void_xt __stdcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant_8) ( ) { @@ -4213,11 +4213,11 @@ VOID __stdcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant_8) // ****************************************************************** // * patch: D3DDevice_SetVertexShaderConstant // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant) ( - INT Register, + int_xt Register, CONST PVOID pConstantData, - DWORD ConstantCount + dword_xt ConstantCount ) { LOG_FUNC_BEGIN @@ -4232,9 +4232,9 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant) // ****************************************************************** // * patch: D3DDevice_SetVertexShaderConstant1 // ****************************************************************** -VOID __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant1) +xbox::void_xt __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant1) ( - INT Register, + int_xt Register, CONST PVOID pConstantData ) { @@ -4249,9 +4249,9 @@ VOID __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant1) // ****************************************************************** // * patch: D3DDevice_SetVertexShaderConstant1Fast // ****************************************************************** -VOID __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant1Fast) +xbox::void_xt __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant1Fast) ( - INT Register, + int_xt Register, CONST PVOID pConstantData ) { @@ -4266,9 +4266,9 @@ VOID __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant1Fast) // ****************************************************************** // * patch: D3DDevice_SetVertexShaderConstant4 // ****************************************************************** -VOID __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant4) +xbox::void_xt __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant4) ( - INT Register, + int_xt Register, CONST PVOID pConstantData ) { @@ -4283,11 +4283,11 @@ VOID __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstant4) // ****************************************************************** // * patch: D3DDevice_SetVertexShaderConstantNotInline // ****************************************************************** -VOID __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstantNotInline) +xbox::void_xt __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstantNotInline) ( - INT Register, + int_xt Register, CONST PVOID pConstantData, - DWORD ConstantCount + dword_xt ConstantCount ) { LOG_FORWARD("D3DDevice_SetVertexShaderConstant"); @@ -4301,11 +4301,11 @@ VOID __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstantNotInline) // ****************************************************************** // * patch: D3DDevice_SetVertexShaderConstantNotInlineFast // ****************************************************************** -VOID __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstantNotInlineFast) +xbox::void_xt __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstantNotInlineFast) ( - INT Register, + int_xt Register, CONST PVOID pConstantData, - DWORD ConstantCount + dword_xt ConstantCount ) { LOG_FORWARD("D3DDevice_SetVertexShaderConstant"); @@ -4320,12 +4320,12 @@ VOID __fastcall xbox::EMUPATCH(D3DDevice_SetVertexShaderConstantNotInlineFast) // This uses a custom calling convention where parameter is passed in EAX // TODO: XB_trampoline plus Log function is not working due lost parameter in EAX. // Test-case: Metal Wolf Chaos -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetTexture_4) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetTexture_4) ( X_D3DBaseTexture *pTexture ) { - DWORD Stage; + dword_xt Stage; __asm mov Stage, eax; //LOG_FUNC_BEGIN @@ -4343,9 +4343,9 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetTexture_4) // ****************************************************************** // * patch: D3DDevice_SetTexture // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetTexture) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetTexture) ( - DWORD Stage, + dword_xt Stage, X_D3DBaseTexture *pTexture ) { @@ -4363,11 +4363,11 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetTexture) // ****************************************************************** // * patch: D3DDevice_SwitchTexture // ****************************************************************** -VOID __fastcall xbox::EMUPATCH(D3DDevice_SwitchTexture) +xbox::void_xt __fastcall xbox::EMUPATCH(D3DDevice_SwitchTexture) ( - DWORD Method, - DWORD Data, - DWORD Format + dword_xt Method, + dword_xt Data, + dword_xt Format ) { LOG_FUNC_BEGIN @@ -4438,7 +4438,7 @@ VOID __fastcall xbox::EMUPATCH(D3DDevice_SwitchTexture) // ****************************************************************** // * patch: D3DDevice_Begin // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_Begin) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_Begin) ( X_D3DPRIMITIVETYPE PrimitiveType ) @@ -4453,11 +4453,11 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_Begin) // ****************************************************************** // * patch: D3DDevice_SetVertexData2f // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData2f) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData2f) ( int Register, - FLOAT a, - FLOAT b + float_xt a, + float_xt b ) { LOG_FORWARD("D3DDevice_SetVertexData4f"); @@ -4471,7 +4471,7 @@ static inline FLOAT DWtoF(DWORD f) { return *((FLOAT*)&f); } // ****************************************************************** // * patch: D3DDevice_SetVertexData2s // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData2s) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData2s) ( int Register, SHORT a, @@ -4501,12 +4501,12 @@ extern NV2ADevice* g_NV2A; // ****************************************************************** // * patch: D3DDevice_SetVertexData4f_16 // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData4f_16) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData4f_16) ( - FLOAT a, - FLOAT b, - FLOAT c, - FLOAT d + float_xt a, + float_xt b, + float_xt c, + float_xt d ) { // This is an LTCG specific version of SetVertexData4f where the first param is passed in edi @@ -4523,13 +4523,13 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData4f_16) // ****************************************************************** // * patch: D3DDevice_SetVertexData4f // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData4f) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData4f) ( int Register, - FLOAT a, - FLOAT b, - FLOAT c, - FLOAT d + float_xt a, + float_xt b, + float_xt c, + float_xt d ) { LOG_FUNC_BEGIN @@ -4800,13 +4800,13 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData4f) // ****************************************************************** // * patch: D3DDevice_SetVertexData4ub // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData4ub) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData4ub) ( - INT Register, - BYTE a, - BYTE b, - BYTE c, - BYTE d + int_xt Register, + byte_xt a, + byte_xt b, + byte_xt c, + byte_xt d ) { LOG_FORWARD("D3DDevice_SetVertexData4f"); @@ -4822,9 +4822,9 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData4ub) // ****************************************************************** // * patch: D3DDevice_SetVertexData4s // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData4s) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData4s) ( - INT Register, + int_xt Register, SHORT a, SHORT b, SHORT c, @@ -4850,7 +4850,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexData4s) // ****************************************************************** // * patch: D3DDevice_SetVertexDataColor // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexDataColor) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetVertexDataColor) ( int Register, D3DCOLOR Color @@ -4866,7 +4866,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexDataColor) // ****************************************************************** // * patch: D3DDevice_End // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_End)() +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_End)() { LOG_FUNC(); @@ -4881,7 +4881,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_End)() // ****************************************************************** // * patch: D3DDevice_RunPushBuffer // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_RunPushBuffer) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_RunPushBuffer) ( X_D3DPushBuffer *pPushBuffer, X_D3DFixup *pFixup @@ -4898,14 +4898,14 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_RunPushBuffer) // ****************************************************************** // * patch: D3DDevice_Clear // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_Clear) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_Clear) ( - DWORD Count, + dword_xt Count, CONST D3DRECT *pRects, - DWORD Flags, + dword_xt Flags, D3DCOLOR Color, float Z, - DWORD Stencil + dword_xt Stencil ) { LOG_FUNC_BEGIN @@ -4973,11 +4973,11 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_Clear) // ****************************************************************** // * patch: D3DDevice_CopyRects // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_CopyRects) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_CopyRects) ( X_D3DSurface* pSourceSurface, CONST RECT* pSourceRectsArray, - UINT cRects, + uint_xt cRects, X_D3DSurface* pDestinationSurface, CONST POINT* pDestPointsArray ) @@ -5083,7 +5083,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_CopyRects) // ****************************************************************** // * patch: D3DDevice_Present // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_Present) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_Present) ( CONST RECT* pSourceRect, CONST RECT* pDestRect, @@ -5107,7 +5107,7 @@ std::chrono::time_point frameStartTime; // LTCG specific swap function... // Massive hack, but could coax some more LTCG titles into booting with HLE // This uses a custom calling convention where parameter is passed in EAX -DWORD xbox::EMUPATCH(D3DDevice_Swap_0) +xbox::dword_xt xbox::EMUPATCH(D3DDevice_Swap_0) ( ) { @@ -5122,9 +5122,9 @@ DWORD xbox::EMUPATCH(D3DDevice_Swap_0) // ****************************************************************** // * patch: D3DDevice_Swap // ****************************************************************** -DWORD WINAPI xbox::EMUPATCH(D3DDevice_Swap) +xbox::dword_xt WINAPI xbox::EMUPATCH(D3DDevice_Swap) ( - DWORD Flags + dword_xt Flags ) { LOG_FUNC_ONE_ARG(Flags); @@ -5367,7 +5367,7 @@ DWORD WINAPI xbox::EMUPATCH(D3DDevice_Swap) XboxRenderStates.SetDirty(); // Check if we need to enable our frame-limiter - DWORD presentationInverval = g_Xbox_PresentationInterval_Override > 0 ? g_Xbox_PresentationInterval_Override : g_Xbox_PresentationInterval_Default; + xbox::dword_xt presentationInverval = g_Xbox_PresentationInterval_Override > 0 ? g_Xbox_PresentationInterval_Override : g_Xbox_PresentationInterval_Default; if ((presentationInverval != D3DPRESENT_INTERVAL_IMMEDIATE) && !g_bHack_UnlockFramerate) { // If the last frame completed faster than the Xbox target swap rate, wait for it @@ -6263,9 +6263,9 @@ void CreateHostResource(xbox::X_D3DResource *pResource, DWORD D3DUsage, int iTex // ****************************************************************** // * patch: D3DDevice_EnableOverlay // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_EnableOverlay) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_EnableOverlay) ( - BOOL Enable + bool_xt Enable ) { LOG_FUNC_ONE_ARG(Enable); @@ -6280,12 +6280,12 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_EnableOverlay) // ****************************************************************** // * patch: D3DDevice_UpdateOverlay // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_UpdateOverlay) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_UpdateOverlay) ( X_D3DSurface *pSurface, CONST RECT *SrcRect, CONST RECT *DstRect, - BOOL EnableColorKey, + bool_xt EnableColorKey, D3DCOLOR ColorKey ) { @@ -6323,7 +6323,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_UpdateOverlay) // ****************************************************************** // * patch: D3DDevice_GetOverlayUpdateStatus // ****************************************************************** -BOOL WINAPI xbox::EMUPATCH(D3DDevice_GetOverlayUpdateStatus)() +xbox::bool_xt WINAPI xbox::EMUPATCH(D3DDevice_GetOverlayUpdateStatus)() { LOG_FUNC(); @@ -6336,7 +6336,7 @@ BOOL WINAPI xbox::EMUPATCH(D3DDevice_GetOverlayUpdateStatus)() // ****************************************************************** // * patch: D3DDevice_BlockUntilVerticalBlank // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_BlockUntilVerticalBlank)() +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_BlockUntilVerticalBlank)() { LOG_FUNC(); @@ -6347,7 +6347,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_BlockUntilVerticalBlank)() // ****************************************************************** // * patch: D3DDevice_SetVerticalBlankCallback // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVerticalBlankCallback) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetVerticalBlankCallback) ( X_D3DVBLANKCALLBACK pCallback ) @@ -6361,10 +6361,10 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVerticalBlankCallback) // ****************************************************************** // * patch: D3DDevice_SetRenderState_Simple // ****************************************************************** -VOID __fastcall xbox::EMUPATCH(D3DDevice_SetRenderState_Simple) +xbox::void_xt __fastcall xbox::EMUPATCH(D3DDevice_SetRenderState_Simple) ( - DWORD Method, - DWORD Value + dword_xt Method, + dword_xt Value ) { LOG_FUNC_BEGIN @@ -6396,7 +6396,7 @@ VOID __fastcall xbox::EMUPATCH(D3DDevice_SetRenderState_Simple) // LTCG specific D3DDevice_SetTransform function... // This uses a custom calling convention where parameter is passed in EAX, EDX -VOID __stdcall xbox::EMUPATCH(D3DDevice_SetTransform_0) +xbox::void_xt __stdcall xbox::EMUPATCH(D3DDevice_SetTransform_0) ( ) { @@ -6414,7 +6414,7 @@ VOID __stdcall xbox::EMUPATCH(D3DDevice_SetTransform_0) // ****************************************************************** // * patch: D3DDevice_SetTransform // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetTransform) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetTransform) ( D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix @@ -6455,7 +6455,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetTransform) // ****************************************************************** // * patch: D3DDevice_MultiplyTransform // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_MultiplyTransform) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_MultiplyTransform) ( D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix @@ -6476,7 +6476,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_MultiplyTransform) // ****************************************************************** // * patch: D3DDevice_GetTransform // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_GetTransform) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_GetTransform) ( D3DTRANSFORMSTATETYPE State, D3DMATRIX *pMatrix @@ -6496,14 +6496,14 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_GetTransform) // ****************************************************************** // * patch: Lock2DSurface // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(Lock2DSurface) +xbox::void_xt WINAPI xbox::EMUPATCH(Lock2DSurface) ( X_D3DPixelContainer *pPixelContainer, D3DCUBEMAP_FACES FaceType, - UINT Level, + uint_xt Level, D3DLOCKED_RECT *pLockedRect, RECT *pRect, - DWORD Flags + dword_xt Flags ) { LOG_FUNC_BEGIN @@ -6527,13 +6527,13 @@ VOID WINAPI xbox::EMUPATCH(Lock2DSurface) // ****************************************************************** // * patch: Lock3DSurface // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(Lock3DSurface) +xbox::void_xt WINAPI xbox::EMUPATCH(Lock3DSurface) ( X_D3DPixelContainer *pPixelContainer, - UINT Level, + uint_xt Level, D3DLOCKED_BOX *pLockedVolume, D3DBOX *pBox, - DWORD Flags + dword_xt Flags ) { LOG_FUNC_BEGIN @@ -6556,9 +6556,9 @@ VOID WINAPI xbox::EMUPATCH(Lock3DSurface) // This uses a custom calling convention where parameter is passed in EBX, EAX // TODO: XB_trampoline plus Log function is not working due lost parameter in EAX. // Test-case: Ninja Gaiden -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetStreamSource_4) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetStreamSource_4) ( - UINT Stride + uint_xt Stride ) { UINT StreamNumber; @@ -6586,10 +6586,10 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetStreamSource_4) // This uses a custom calling convention where parameter is passed in EAX // TODO: XB_trampoline plus Log function is not working due lost parameter in EAX. // Test-case: Superman - The Man Of Steel -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetStreamSource_8) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetStreamSource_8) ( X_D3DVertexBuffer *pStreamData, - UINT Stride + uint_xt Stride ) { UINT StreamNumber; @@ -6615,11 +6615,11 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetStreamSource_8) // ****************************************************************** // * patch: D3DDevice_SetStreamSource // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetStreamSource) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetStreamSource) ( - UINT StreamNumber, + uint_xt StreamNumber, X_D3DVertexBuffer *pStreamData, - UINT Stride + uint_xt Stride ) { LOG_FUNC_BEGIN @@ -6638,9 +6638,9 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetStreamSource) // ****************************************************************** // * patch: D3DDevice_SetVertexShader // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexShader) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetVertexShader) ( - DWORD Handle + dword_xt Handle ) { LOG_FUNC_ONE_ARG(Handle); @@ -7158,7 +7158,7 @@ void CxbxImpl_InsertCallback ( xbox::X_D3DCALLBACKTYPE Type, xbox::X_D3DCALLBACK pCallback, - xbox::DWORD Context + xbox::dword_xt Context ) { if (Type > xbox::X_D3DCALLBACK_WRITE) { @@ -7192,7 +7192,7 @@ void CxbxImpl_InsertCallback } } -VOID __declspec(noinline) D3DDevice_SetPixelShaderCommon(DWORD Handle) +xbox::void_xt __declspec(noinline) D3DDevice_SetPixelShaderCommon(xbox::dword_xt Handle) { // Cache the active shader handle g_pXbox_PixelShader = (xbox::X_PixelShader*)Handle; @@ -7210,9 +7210,9 @@ VOID __declspec(noinline) D3DDevice_SetPixelShaderCommon(DWORD Handle) // This uses a custom calling convention where parameter is passed in EAX // Test-case: Metal Wolf Chaos // Test-case: Lord of the Rings: The Third Age -VOID WINAPI D3DDevice_SetPixelShader_0_IMPL +xbox::void_xt WINAPI D3DDevice_SetPixelShader_0_IMPL ( - DWORD Handle + xbox::dword_xt Handle ) { LOG_FUNC_ONE_ARG(Handle); @@ -7226,7 +7226,7 @@ VOID WINAPI D3DDevice_SetPixelShader_0_IMPL D3DDevice_SetPixelShaderCommon(Handle); } -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetPixelShader_0)() +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetPixelShader_0)() { __asm { push eax @@ -7238,9 +7238,9 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetPixelShader_0)() // ****************************************************************** // * patch: D3DDevice_SetPixelShader // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetPixelShader) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetPixelShader) ( - DWORD Handle + dword_xt Handle ) { LOG_FUNC_ONE_ARG(Handle); @@ -7257,7 +7257,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetPixelShader) // This uses a custom calling convention where parameter is passed in ECX, EAX and Stack // Test Case: Conker // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_DrawVertices_4) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawVertices_4) ( X_D3DPRIMITIVETYPE PrimitiveType ) @@ -7276,11 +7276,11 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_DrawVertices_4) // ****************************************************************** // * patch: D3DDevice_DrawVertices // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_DrawVertices) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawVertices) ( X_D3DPRIMITIVETYPE PrimitiveType, - UINT StartVertex, - UINT VertexCount + uint_xt StartVertex, + uint_xt VertexCount ) { LOG_FUNC_BEGIN @@ -7399,12 +7399,12 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_DrawVertices) // ****************************************************************** // * patch: D3DDevice_DrawVerticesUP // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_DrawVerticesUP) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawVerticesUP) ( X_D3DPRIMITIVETYPE PrimitiveType, - UINT VertexCount, + uint_xt VertexCount, CONST PVOID pVertexStreamZeroData, - UINT VertexStreamZeroStride + uint_xt VertexStreamZeroStride ) { LOG_FUNC_BEGIN @@ -7440,10 +7440,10 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_DrawVerticesUP) // ****************************************************************** // * patch: D3DDevice_DrawIndexedVertices // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_DrawIndexedVertices) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawIndexedVertices) ( X_D3DPRIMITIVETYPE PrimitiveType, - UINT VertexCount, + uint_xt VertexCount, CONST PWORD pIndexData ) { @@ -7485,13 +7485,13 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_DrawIndexedVertices) // ****************************************************************** // * patch: D3DDevice_DrawIndexedVerticesUP // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_DrawIndexedVerticesUP) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawIndexedVerticesUP) ( X_D3DPRIMITIVETYPE PrimitiveType, - UINT VertexCount, + uint_xt VertexCount, CONST PVOID pIndexData, CONST PVOID pVertexStreamZeroData, - UINT VertexStreamZeroStride + uint_xt VertexStreamZeroStride ) { LOG_FUNC_BEGIN @@ -7589,9 +7589,9 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_DrawIndexedVerticesUP) // ****************************************************************** // * patch: D3DDevice_SetLight // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_SetLight) +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_SetLight) ( - DWORD Index, + dword_xt Index, CONST X_D3DLIGHT8 *pLight ) { @@ -7611,7 +7611,7 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_SetLight) // ****************************************************************** // * patch: D3DDevice_SetMaterial // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetMaterial) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetMaterial) ( CONST X_D3DMATERIAL8 *pMaterial ) @@ -7625,10 +7625,10 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetMaterial) // ****************************************************************** // * patch: D3DDevice_LightEnable // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_LightEnable) +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_LightEnable) ( - DWORD Index, - BOOL bEnable + dword_xt Index, + bool_xt bEnable ) { LOG_FUNC_BEGIN @@ -7647,7 +7647,7 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_LightEnable) // ****************************************************************** // * patch: D3DDevice_SetRenderTarget // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetRenderTarget) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetRenderTarget) ( X_D3DSurface *pRenderTarget, X_D3DSurface *pNewZStencil @@ -7728,7 +7728,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetRenderTarget) // LTCG specific D3DDevice_SetPalette function... // This uses a custom calling convention where parameter is passed in EAX // Test-case: Ninja Gaiden -VOID __stdcall xbox::EMUPATCH(D3DDevice_SetPalette_4) +xbox::void_xt __stdcall xbox::EMUPATCH(D3DDevice_SetPalette_4) ( ) { @@ -7751,9 +7751,9 @@ VOID __stdcall xbox::EMUPATCH(D3DDevice_SetPalette_4) // ****************************************************************** // * patch: D3DDevice_SetPalette // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetPalette) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetPalette) ( - DWORD Stage, + dword_xt Stage, X_D3DPalette *pPalette ) { @@ -7777,11 +7777,11 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetPalette) // LTCG specific D3DDevice_SetFlickerFilter function... // This uses a custom calling convention where parameter is passed in ESI // Test-case: Metal Wolf Chaos -VOID __stdcall xbox::EMUPATCH(D3DDevice_SetFlickerFilter_0) +xbox::void_xt __stdcall xbox::EMUPATCH(D3DDevice_SetFlickerFilter_0) ( ) { - DWORD Filter; + dword_xt Filter; __asm { mov Filter, esi @@ -7795,7 +7795,7 @@ VOID __stdcall xbox::EMUPATCH(D3DDevice_SetFlickerFilter_0) // ****************************************************************** void WINAPI xbox::EMUPATCH(D3DDevice_SetFlickerFilter) ( - DWORD Filter + dword_xt Filter ) { LOG_FUNC_ONE_ARG(Filter); @@ -7808,7 +7808,7 @@ void WINAPI xbox::EMUPATCH(D3DDevice_SetFlickerFilter) // ****************************************************************** void WINAPI xbox::EMUPATCH(D3DDevice_SetSoftDisplayFilter) ( - BOOL Enable + bool_xt Enable ) { LOG_FUNC_ONE_ARG(Enable); @@ -7819,11 +7819,11 @@ void WINAPI xbox::EMUPATCH(D3DDevice_SetSoftDisplayFilter) // LTCG specific D3DDevice_DeleteVertexShader function... // This uses a custom calling convention where parameter is passed in EAX // UNTESTED - Need test-case! -VOID __stdcall xbox::EMUPATCH(D3DDevice_DeleteVertexShader_0) +xbox::void_xt __stdcall xbox::EMUPATCH(D3DDevice_DeleteVertexShader_0) ( ) { - DWORD Handle; + dword_xt Handle; __asm { mov Handle, eax @@ -7836,9 +7836,9 @@ VOID __stdcall xbox::EMUPATCH(D3DDevice_DeleteVertexShader_0) // ****************************************************************** // * patch: D3DDevice_DeleteVertexShader // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_DeleteVertexShader) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_DeleteVertexShader) ( - DWORD Handle + dword_xt Handle ) { LOG_FUNC_ONE_ARG(Handle); @@ -7851,10 +7851,10 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_DeleteVertexShader) // ****************************************************************** // * patch: D3DDevice_SelectVertexShaderDirect // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SelectVertexShaderDirect) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SelectVertexShaderDirect) ( X_VERTEXATTRIBUTEFORMAT *pVAF, - DWORD Address + dword_xt Address ) { LOG_FUNC_BEGIN @@ -7868,9 +7868,9 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SelectVertexShaderDirect) // ****************************************************************** // * patch: D3DDevice_GetShaderConstantMode // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_GetShaderConstantMode) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_GetShaderConstantMode) ( - DWORD *pMode + dword_xt *pMode ) { LOG_FUNC_ONE_ARG(pMode); @@ -7884,9 +7884,9 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_GetShaderConstantMode) // ****************************************************************** // * patch: D3DDevice_GetVertexShader // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_GetVertexShader) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_GetVertexShader) ( - DWORD *pHandle + dword_xt *pHandle ) { LOG_FUNC_ONE_ARG(pHandle); @@ -7900,11 +7900,11 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_GetVertexShader) // ****************************************************************** // * patch: D3DDevice_GetVertexShaderConstant // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_GetVertexShaderConstant) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_GetVertexShaderConstant) ( - INT Register, + int_xt Register, void *pConstantData, - DWORD ConstantCount + dword_xt ConstantCount ) { LOG_FUNC_BEGIN @@ -7930,10 +7930,10 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_GetVertexShaderConstant) // ****************************************************************** // * patch: D3DDevice_SetVertexShaderInputDirect // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexShaderInputDirect) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetVertexShaderInputDirect) ( X_VERTEXATTRIBUTEFORMAT *pVAF, - UINT StreamCount, + uint_xt StreamCount, X_STREAMINPUT *pStreamInputs ) { @@ -7953,10 +7953,10 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexShaderInputDirect) // ****************************************************************** // * patch: D3DDevice_GetVertexShaderInput // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_GetVertexShaderInput) +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_GetVertexShaderInput) ( - DWORD *pHandle, - UINT *pStreamCount, + dword_xt *pHandle, + uint_xt *pStreamCount, X_STREAMINPUT *pStreamInputs ) { @@ -7974,10 +7974,10 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_GetVertexShaderInput) // ****************************************************************** // * patch: D3DDevice_SetVertexShaderInput // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexShaderInput) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetVertexShaderInput) ( - DWORD Handle, - UINT StreamCount, + dword_xt Handle, + uint_xt StreamCount, X_STREAMINPUT *pStreamInputs ) { @@ -8003,10 +8003,10 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetVertexShaderInput) // ****************************************************************** // * patch: D3DDevice_RunVertexStateShader // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_RunVertexStateShader) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_RunVertexStateShader) ( - DWORD Address, - CONST FLOAT *pData + dword_xt Address, + CONST float_xt *pData ) { LOG_FUNC_BEGIN @@ -8023,10 +8023,10 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_RunVertexStateShader) // ****************************************************************** // * patch: D3DDevice_LoadVertexShaderProgram // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_LoadVertexShaderProgram) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_LoadVertexShaderProgram) ( - CONST DWORD *pFunction, - DWORD Address + CONST dword_xt *pFunction, + dword_xt Address ) { LOG_FUNC_BEGIN @@ -8034,17 +8034,17 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_LoadVertexShaderProgram) LOG_FUNC_ARG(Address) LOG_FUNC_END; - CxbxImpl_LoadVertexShaderProgram(pFunction, Address); + CxbxImpl_LoadVertexShaderProgram((DWORD *)pFunction, Address); } // ****************************************************************** // * patch: D3DDevice_SetDepthClipPlanes // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_SetDepthClipPlanes) +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_SetDepthClipPlanes) ( - FLOAT Near, - FLOAT Far, - DWORD Flags + float_xt Near, + float_xt Far, + dword_xt Flags ) { LOG_FUNC_BEGIN @@ -8107,12 +8107,12 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_SetDepthClipPlanes) // ****************************************************************** // * patch: D3DDevice_InsertFence // ****************************************************************** -DWORD WINAPI xbox::EMUPATCH(D3DDevice_InsertFence)() +xbox::dword_xt WINAPI xbox::EMUPATCH(D3DDevice_InsertFence)() { LOG_FUNC(); // TODO: Actually implement this - DWORD dwRet = 0x8000BEEF; + dword_xt dwRet = 0x8000BEEF; LOG_UNIMPLEMENTED(); @@ -8122,9 +8122,9 @@ DWORD WINAPI xbox::EMUPATCH(D3DDevice_InsertFence)() // ****************************************************************** // * patch: D3DDevice_IsFencePending // ****************************************************************** -BOOL WINAPI xbox::EMUPATCH(D3DDevice_IsFencePending) +xbox::bool_xt WINAPI xbox::EMUPATCH(D3DDevice_IsFencePending) ( - DWORD Fence + dword_xt Fence ) { LOG_FUNC_ONE_ARG(Fence); @@ -8138,9 +8138,9 @@ BOOL WINAPI xbox::EMUPATCH(D3DDevice_IsFencePending) // ****************************************************************** // * patch: D3DDevice_BlockOnFence // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_BlockOnFence) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_BlockOnFence) ( - DWORD Fence + dword_xt Fence ) { LOG_FUNC_ONE_ARG(Fence); @@ -8152,7 +8152,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_BlockOnFence) // ****************************************************************** // * patch: IDirect3DResource8_BlockUntilNotBusy // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DResource_BlockUntilNotBusy) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DResource_BlockUntilNotBusy) ( X_D3DResource *pThis ) @@ -8166,10 +8166,10 @@ VOID WINAPI xbox::EMUPATCH(D3DResource_BlockUntilNotBusy) // ****************************************************************** // * patch: D3DDevice_SetScreenSpaceOffset // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetScreenSpaceOffset) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetScreenSpaceOffset) ( - FLOAT x, - FLOAT y + float_xt x, + float_xt y ) { LOG_FUNC_BEGIN @@ -8184,11 +8184,11 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetScreenSpaceOffset) // ****************************************************************** // * patch: D3DDevice_InsertCallback // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_InsertCallback) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_InsertCallback) ( X_D3DCALLBACKTYPE Type, X_D3DCALLBACK pCallback, - DWORD Context + dword_xt Context ) { LOG_FUNC_BEGIN @@ -8205,10 +8205,10 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_InsertCallback) // ****************************************************************** // * patch: D3DDevice_DrawRectPatch // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_DrawRectPatch) +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawRectPatch) ( - UINT Handle, - CONST FLOAT *pNumSegs, + uint_xt Handle, + CONST float_xt *pNumSegs, CONST D3DRECTPATCH_INFO *pRectPatchInfo ) { @@ -8229,10 +8229,10 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_DrawRectPatch) // ****************************************************************** // * patch: D3DDevice_DrawTriPatch // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_DrawTriPatch) +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawTriPatch) ( - UINT Handle, - CONST FLOAT *pNumSegs, + uint_xt Handle, + CONST float_xt *pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo ) { @@ -8254,7 +8254,7 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_DrawTriPatch) // ****************************************************************** // * patch: D3DDevice_GetProjectionViewportMatrix // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_GetProjectionViewportMatrix) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_GetProjectionViewportMatrix) ( D3DXMATRIX *pProjectionViewport ) @@ -8311,7 +8311,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_GetProjectionViewportMatrix) // ****************************************************************** // * patch: D3DDevice_SetStateVB (D3D::CDevice::SetStateVB) // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetStateVB)( ULONG Unknown1 ) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetStateVB)(ulong_xt Unknown1 ) { LOG_FUNC_ONE_ARG(Unknown1); @@ -8324,7 +8324,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetStateVB)( ULONG Unknown1 ) // ****************************************************************** // * patch: D3DDevice_SetStateUP (D3D::CDevice::SetStateUP) // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetStateUP)() +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetStateUP)() { LOG_FUNC(); @@ -8338,7 +8338,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_SetStateUP)() // ****************************************************************** // * patch: D3DDevice_SetStipple // ****************************************************************** -void WINAPI xbox::EMUPATCH(D3DDevice_SetStipple)( DWORD* pPattern ) +void WINAPI xbox::EMUPATCH(D3DDevice_SetStipple)( dword_xt* pPattern ) { LOG_FUNC_ONE_ARG(pPattern); @@ -8363,7 +8363,7 @@ void WINAPI xbox::EMUPATCH(D3DDevice_SetSwapCallback) // ****************************************************************** // * patch: D3DDevice_PersistDisplay // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_PersistDisplay)() +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_PersistDisplay)() { LOG_FUNC(); @@ -8389,9 +8389,9 @@ HRESULT WINAPI xbox::EMUPATCH(D3DDevice_PersistDisplay)() // ****************************************************************** // * patch: D3DDevice_PrimeVertexCache // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_PrimeVertexCache) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_PrimeVertexCache) ( - UINT VertexCount, + uint_xt VertexCount, WORD *pIndexData ) { @@ -8407,7 +8407,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_PrimeVertexCache) // ****************************************************************** // * patch: D3DDevice_SetModelView // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetModelView) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetModelView) ( CONST D3DMATRIX *pModelView, CONST D3DMATRIX *pInverseModelView, @@ -8437,7 +8437,7 @@ void WINAPI xbox::EMUPATCH(D3DDevice_FlushVertexCache)() // ****************************************************************** // * patch: D3DDevice_GetModelView // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(D3DDevice_GetModelView)(D3DXMATRIX* pModelView) +xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_GetModelView)(D3DXMATRIX* pModelView) { LOG_FUNC_ONE_ARG(pModelView); @@ -8472,7 +8472,7 @@ void WINAPI xbox::EMUPATCH(D3D_SetCommonDebugRegisters)() // ****************************************************************** // * patch: D3DDevice_IsBusy // ****************************************************************** -BOOL WINAPI xbox::EMUPATCH(D3DDevice_IsBusy)() +xbox::bool_xt WINAPI xbox::EMUPATCH(D3DDevice_IsBusy)() { LOG_FUNC(); @@ -8485,7 +8485,7 @@ BOOL WINAPI xbox::EMUPATCH(D3DDevice_IsBusy)() // ****************************************************************** // * patch: D3D_BlockOnTime // ****************************************************************** -void WINAPI xbox::EMUPATCH(D3D_BlockOnTime)( DWORD Unknown1, int Unknown2 ) +void WINAPI xbox::EMUPATCH(D3D_BlockOnTime)( dword_xt Unknown1, int Unknown2 ) { LOG_FUNC_BEGIN LOG_FUNC_ARG(Unknown1) @@ -8574,11 +8574,11 @@ void WINAPI xbox::EMUPATCH(D3D_DestroyResource__LTCG)() // ****************************************************************** // * patch: D3DDevice_SetRenderTargetFast // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetRenderTargetFast) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetRenderTargetFast) ( X_D3DSurface *pRenderTarget, X_D3DSurface *pNewZStencil, - DWORD Flags + dword_xt Flags ) { LOG_FORWARD("D3DDevice_SetRenderTarget"); @@ -8604,7 +8604,7 @@ void WINAPI xbox::EMUPATCH(D3D_LazySetPointParams) // ****************************************************************** // * patch: D3DDevice_GetMaterial // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(D3DDevice_GetMaterial) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_GetMaterial) ( X_D3DMATERIAL8* pMaterial ) @@ -8630,7 +8630,7 @@ VOID WINAPI xbox::EMUPATCH(D3DDevice_GetMaterial) // This uses a custom calling convention where parameter is passed in ECX, EAX // TODO: Log function is not working due lost parameter in EAX. // Test-case: Otogi 2, Ninja Gaiden: Black -VOID WINAPI xbox::EMUPATCH(D3DDevice_SetPixelShaderConstant_4) +xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetPixelShaderConstant_4) ( CONST PVOID pConstantData ) diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.h b/src/core/hle/D3D8/Direct3D9/Direct3D9.h index 693139418..83306448f 100644 --- a/src/core/hle/D3D8/Direct3D9/Direct3D9.h +++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.h @@ -26,6 +26,12 @@ #define DIRECT3D9_H #include "core\hle\XAPI\Xapi.h" // For EMUPATCH + +// NOTE: this is necessary or else d3dx9mesh.h fails to compile because of undefined VOID macros +#ifndef VOID +#define VOID void +#endif + #include "core\hle\D3D8\XbD3D8Types.h" #define DIRECTDRAW_VERSION 0x0700 @@ -34,9 +40,9 @@ extern void LookupTrampolines(); // initialize render window -extern VOID CxbxInitWindow(bool bFullInit); +extern void CxbxInitWindow(bool bFullInit); -extern VOID CxbxSetPixelContainerHeader +extern void CxbxSetPixelContainerHeader ( xbox::X_D3DPixelContainer* pPixelContainer, DWORD Common, @@ -58,14 +64,14 @@ extern uint8_t *ConvertD3DTextureToARGB( void CxbxUpdateNativeD3DResources(); // initialize direct3d -extern VOID EmuD3DInit(); +extern void EmuD3DInit(); // cleanup direct3d -extern VOID EmuD3DCleanup(); +extern void EmuD3DCleanup(); extern IDirect3DDevice *g_pD3DDevice; -extern DWORD g_Xbox_VertexShader_Handle; +extern xbox::dword_xt g_Xbox_VertexShader_Handle; extern xbox::X_PixelShader *g_pXbox_PixelShader; @@ -76,25 +82,25 @@ namespace xbox { // ****************************************************************** // * patch: Direct3D_CreateDevice // ****************************************************************** -HRESULT WINAPI EMUPATCH(Direct3D_CreateDevice) +xbox::hresult_xt WINAPI EMUPATCH(Direct3D_CreateDevice) ( - UINT Adapter, + uint_xt Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, - DWORD BehaviorFlags, + dword_xt BehaviorFlags, X_D3DPRESENT_PARAMETERS *pPresentationParameters, IDirect3DDevice **ppReturnedDeviceInterface ); -HRESULT WINAPI EMUPATCH(Direct3D_CreateDevice_16) +xbox::hresult_xt WINAPI EMUPATCH(Direct3D_CreateDevice_16) ( - UINT Adapter, + uint_xt Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, X_D3DPRESENT_PARAMETERS *pPresentationParameters ); -HRESULT WINAPI EMUPATCH(Direct3D_CreateDevice_4) +xbox::hresult_xt WINAPI EMUPATCH(Direct3D_CreateDevice_4) ( X_D3DPRESENT_PARAMETERS *pPresentationParameters ); @@ -102,12 +108,12 @@ HRESULT WINAPI EMUPATCH(Direct3D_CreateDevice_4) // ****************************************************************** // * patch: IDirect3DResource8_IsBusy // ****************************************************************** -BOOL WINAPI EMUPATCH(D3DDevice_IsBusy)(); +xbox::bool_xt WINAPI EMUPATCH(D3DDevice_IsBusy)(); // ****************************************************************** // * patch: D3DDevice_GetCreationParameters // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetCreationParameters) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetCreationParameters) ( D3DDEVICE_CREATION_PARAMETERS *pParameters ); @@ -116,12 +122,12 @@ VOID WINAPI EMUPATCH(D3DDevice_GetCreationParameters) // ****************************************************************** // * patch: D3D_CheckDeviceFormat // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3D_CheckDeviceFormat) +xbox::hresult_xt WINAPI EMUPATCH(D3D_CheckDeviceFormat) ( - UINT Adapter, + uint_xt Adapter, D3DDEVTYPE DeviceType, X_D3DFORMAT AdapterFormat, - DWORD Usage, + dword_xt Usage, X_D3DRESOURCETYPE RType, X_D3DFORMAT CheckFormat ); @@ -131,7 +137,7 @@ HRESULT WINAPI EMUPATCH(D3D_CheckDeviceFormat) // ****************************************************************** // * patch: D3DDevice_GetDeviceCaps // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetDeviceCaps) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetDeviceCaps) ( X_D3DCAPS *pCaps ); @@ -140,7 +146,7 @@ VOID WINAPI EMUPATCH(D3DDevice_GetDeviceCaps) // ****************************************************************** // * patch: D3DDevice_GetDisplayFieldStatus // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetDisplayFieldStatus) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetDisplayFieldStatus) ( X_D3DFIELD_STATUS *pFieldStatus ); @@ -148,130 +154,130 @@ VOID WINAPI EMUPATCH(D3DDevice_GetDisplayFieldStatus) // ****************************************************************** // * patch: D3DDevice_BeginPush // ****************************************************************** -PDWORD WINAPI EMUPATCH(D3DDevice_BeginPush)(DWORD Count); +xbox::PDWORD WINAPI EMUPATCH(D3DDevice_BeginPush)(dword_xt Count); // ****************************************************************** // * patch: D3DDevice_BeginPush2 //two arg version for xdk before 4531 // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_BeginPush2)(DWORD Count, DWORD **ppPush); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_BeginPush2)(dword_xt Count, dword_xt **ppPush); // ****************************************************************** // * patch: D3DDevice_EndPush // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_EndPush)(DWORD *pPush); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_EndPush)(dword_xt *pPush); // ****************************************************************** // * patch: D3DDevice_BeginVisibilityTest // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_BeginVisibilityTest)(); +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_BeginVisibilityTest)(); // ****************************************************************** // * patch: D3DDevice_EndVisibilityTest // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_EndVisibilityTest) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_EndVisibilityTest) ( - DWORD Index + dword_xt Index ); -HRESULT __stdcall EMUPATCH(D3DDevice_EndVisibilityTest_0)(); +xbox::hresult_xt __stdcall EMUPATCH(D3DDevice_EndVisibilityTest_0)(); // ****************************************************************** // * patch: D3DDevice_GetVisibilityTestResult // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_GetVisibilityTestResult) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_GetVisibilityTestResult) ( - DWORD Index, - UINT *pResult, - ULONGLONG *pTimeStamp + dword_xt Index, + uint_xt *pResult, + ulonglong_xt *pTimeStamp ); // ****************************************************************** // * patch: D3DDevice_SetBackBufferScale // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetBackBufferScale)(FLOAT x, FLOAT y); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetBackBufferScale)(float_xt x, float_xt y); // ****************************************************************** // * patch: D3DDevice_LoadVertexShader // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_LoadVertexShader) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_LoadVertexShader) ( - DWORD Handle, - DWORD Address + dword_xt Handle, + dword_xt Address ); -VOID __stdcall EMUPATCH(D3DDevice_LoadVertexShader_0)(); -VOID WINAPI EMUPATCH(D3DDevice_LoadVertexShader_4) +xbox::void_xt __stdcall EMUPATCH(D3DDevice_LoadVertexShader_0)(); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_LoadVertexShader_4) ( - DWORD Address + dword_xt Address ); // ****************************************************************** // * patch: D3DDevice_SelectVertexShader // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SelectVertexShader) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SelectVertexShader) ( - DWORD Handle, - DWORD Address + dword_xt Handle, + dword_xt Address ); -VOID __stdcall EMUPATCH(D3DDevice_SelectVertexShader_0)(); -VOID __stdcall EMUPATCH(D3DDevice_SelectVertexShader_4) +xbox::void_xt __stdcall EMUPATCH(D3DDevice_SelectVertexShader_0)(); +xbox::void_xt __stdcall EMUPATCH(D3DDevice_SelectVertexShader_4) ( - DWORD Address + dword_xt Address ); // ****************************************************************** // * patch: D3D_KickOffAndWaitForIdle // ****************************************************************** -VOID WINAPI EMUPATCH(D3D_KickOffAndWaitForIdle)(); +xbox::void_xt WINAPI EMUPATCH(D3D_KickOffAndWaitForIdle)(); // ****************************************************************** // * patch: D3D_KickOffAndWaitForIdle // ****************************************************************** -VOID WINAPI EMUPATCH(D3D_KickOffAndWaitForIdle2)(DWORD dwDummy1, DWORD dwDummy2); +xbox::void_xt WINAPI EMUPATCH(D3D_KickOffAndWaitForIdle2)(dword_xt dwDummy1, dword_xt dwDummy2); // ****************************************************************** // * patch: D3DDevice_SetGammaRamp // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetGammaRamp) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetGammaRamp) ( - DWORD dwFlags, + dword_xt dwFlags, CONST X_D3DGAMMARAMP *pRamp ); // ****************************************************************** // * patch: D3DDevice_AddRef // ****************************************************************** -ULONG WINAPI EMUPATCH(D3DDevice_AddRef)(); +xbox::ulong_xt WINAPI EMUPATCH(D3DDevice_AddRef)(); // ****************************************************************** // * patch: D3DDevice_BeginStateBlock // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_BeginStateBlock)(); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_BeginStateBlock)(); // ****************************************************************** // * patch: D3DDevice_CaptureStateBlock // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_CaptureStateBlock)(DWORD Token); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_CaptureStateBlock)(dword_xt Token); // ****************************************************************** // * patch: D3DDevice_ApplyStateBlock // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_ApplyStateBlock)(DWORD Token); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_ApplyStateBlock)(dword_xt Token); // ****************************************************************** // * patch: D3DDevice_EndStateBlock // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_EndStateBlock)(DWORD *pToken); +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_EndStateBlock)(dword_xt *pToken); // ****************************************************************** // * patch: D3DDevice_CopyRects // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_CopyRects) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_CopyRects) ( X_D3DSurface *pSourceSurface, CONST RECT *pSourceRectsArray, - UINT cRects, + uint_xt cRects, X_D3DSurface *pDestinationSurface, CONST POINT *pDestPointsArray ); @@ -279,10 +285,10 @@ VOID WINAPI EMUPATCH(D3DDevice_CopyRects) // ****************************************************************** // * patch: D3DDevice_CreateImageSurface // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_CreateImageSurface) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_CreateImageSurface) ( - UINT Width, - UINT Height, + uint_xt Width, + uint_xt Height, X_D3DFORMAT Format, X_D3DSurface **ppBackBuffer ); @@ -290,7 +296,7 @@ HRESULT WINAPI EMUPATCH(D3DDevice_CreateImageSurface) // ****************************************************************** // * patch: D3DDevice_GetGammaRamp // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetGammaRamp) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetGammaRamp) ( X_D3DGAMMARAMP *pRamp ); @@ -300,15 +306,15 @@ VOID WINAPI EMUPATCH(D3DDevice_GetGammaRamp) // ****************************************************************** X_D3DSurface* WINAPI EMUPATCH(D3DDevice_GetBackBuffer2) ( - INT BackBuffer + int_xt BackBuffer ); // ****************************************************************** // * patch: D3DDevice_GetBackBuffer // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetBackBuffer) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetBackBuffer) ( - INT BackBuffer, + int_xt BackBuffer, D3DBACKBUFFER_TYPE Type, X_D3DSurface **ppBackBuffer ); @@ -316,7 +322,7 @@ VOID WINAPI EMUPATCH(D3DDevice_GetBackBuffer) // ****************************************************************** // * patch: D3DDevice_SetViewport // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetViewport) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetViewport) ( CONST X_D3DVIEWPORT8 *pViewport ); @@ -324,7 +330,7 @@ VOID WINAPI EMUPATCH(D3DDevice_SetViewport) // ****************************************************************** // * patch: D3DDevice_GetViewport // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetViewport) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetViewport) ( X_D3DVIEWPORT8 *pViewport ); @@ -332,28 +338,28 @@ VOID WINAPI EMUPATCH(D3DDevice_GetViewport) // ****************************************************************** // * patch: D3DDevice_GetViewportOffsetAndScale // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetViewportOffsetAndScale) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetViewportOffsetAndScale) ( X_D3DXVECTOR4 *pOffset, X_D3DXVECTOR4 *pScale ); -VOID __stdcall EMUPATCH(D3DDevice_GetViewportOffsetAndScale_0)(); +xbox::void_xt __stdcall EMUPATCH(D3DDevice_GetViewportOffsetAndScale_0)(); // ****************************************************************** // * patch: D3DDevice_SetShaderConstantMode // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetShaderConstantMode) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetShaderConstantMode) ( xbox::X_VERTEXSHADERCONSTANTMODE Mode ); -VOID __stdcall EMUPATCH(D3DDevice_SetShaderConstantMode_0)(); +xbox::void_xt __stdcall EMUPATCH(D3DDevice_SetShaderConstantMode_0)(); // ****************************************************************** // * patch: D3DDevice_Reset // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_Reset) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_Reset) ( X_D3DPRESENT_PARAMETERS *pPresentationParameters ); @@ -361,7 +367,7 @@ HRESULT WINAPI EMUPATCH(D3DDevice_Reset) // ****************************************************************** // * patch: D3DDevice_GetRenderTarget // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_GetRenderTarget) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_GetRenderTarget) ( X_D3DSurface **ppRenderTarget ); @@ -374,7 +380,7 @@ X_D3DSurface * WINAPI EMUPATCH(D3DDevice_GetRenderTarget2)(); // ****************************************************************** // * patch: D3DDevice_GetDepthStencilSurface // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_GetDepthStencilSurface) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_GetDepthStencilSurface) ( X_D3DSurface **ppZStencilSurface ); @@ -387,43 +393,43 @@ X_D3DSurface * WINAPI EMUPATCH(D3DDevice_GetDepthStencilSurface2)(); // ****************************************************************** // * patch: D3DDevice_GetTile // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetTile) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetTile) ( - DWORD Index, + dword_xt Index, X_D3DTILE *pTile ); // ****************************************************************** // * patch: D3DDevice_SetTile // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetTile) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetTile) ( - DWORD Index, + dword_xt Index, CONST X_D3DTILE *pTile ); // ****************************************************************** // * patch: D3DDevice_CreateVertexShader // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_CreateVertexShader) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_CreateVertexShader) ( - CONST DWORD *pDeclaration, - CONST DWORD *pFunction, - DWORD *pHandle, - DWORD Usage + CONST dword_xt *pDeclaration, + CONST dword_xt *pFunction, + dword_xt *pHandle, + dword_xt Usage ); // ****************************************************************** // * patch: D3DDevice_SetPixelShaderConstant // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetPixelShaderConstant) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetPixelShaderConstant) ( - DWORD Register, + dword_xt Register, CONST PVOID pConstantData, - DWORD ConstantCount + dword_xt ConstantCount ); -VOID WINAPI EMUPATCH(D3DDevice_SetPixelShaderConstant_4) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetPixelShaderConstant_4) ( CONST PVOID pConstantData ); @@ -431,99 +437,99 @@ VOID WINAPI EMUPATCH(D3DDevice_SetPixelShaderConstant_4) // ****************************************************************** // * patch: D3DDevice_SetVertexShaderConstant // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetVertexShaderConstant) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetVertexShaderConstant) ( - INT Register, + int_xt Register, CONST PVOID pConstantData, - DWORD ConstantCount + dword_xt ConstantCount ); -VOID __stdcall EMUPATCH(D3DDevice_SetVertexShaderConstant_8)(); +xbox::void_xt __stdcall EMUPATCH(D3DDevice_SetVertexShaderConstant_8)(); // ****************************************************************** // * patch: D3DDevice_SetVertexShaderConstant1 // ****************************************************************** -VOID __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstant1) +xbox::void_xt __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstant1) ( - INT Register, + int_xt Register, CONST PVOID pConstantData ); // ****************************************************************** // * patch: D3DDevice_SetVertexShaderConstant1Fast // ****************************************************************** -VOID __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstant1Fast) +xbox::void_xt __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstant1Fast) ( - INT Register, + int_xt Register, CONST PVOID pConstantData ); // ****************************************************************** // * patch: D3DDevice_SetVertexShaderConstant4 // ****************************************************************** -VOID __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstant4) +xbox::void_xt __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstant4) ( - INT Register, + int_xt Register, CONST PVOID pConstantData ); // ****************************************************************** // * patch: D3DDevice_SetVertexShaderConstantNotInline // ****************************************************************** -VOID __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstantNotInline) +xbox::void_xt __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstantNotInline) ( - INT Register, + int_xt Register, CONST PVOID pConstantData, - DWORD ConstantCount + dword_xt ConstantCount ); // ****************************************************************** // * patch: D3DDevice_SetVertexShaderConstantNotInlineFast // ****************************************************************** -VOID __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstantNotInlineFast) +xbox::void_xt __fastcall EMUPATCH(D3DDevice_SetVertexShaderConstantNotInlineFast) ( - INT Register, + int_xt Register, CONST PVOID pConstantData, - DWORD ConstantCount + dword_xt ConstantCount ); // ****************************************************************** // * patch: D3DDevice_DeletePixelShader // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_DeletePixelShader) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_DeletePixelShader) ( - DWORD Handle + dword_xt Handle ); // ****************************************************************** // * patch: D3DDevice_CreatePixelShader // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_CreatePixelShader) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_CreatePixelShader) ( X_D3DPIXELSHADERDEF *pPSDef, - DWORD *pHandle + dword_xt *pHandle ); // ****************************************************************** // * patch: D3DDevice_SetPixelShader // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetPixelShader) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetPixelShader) ( - DWORD Handle + dword_xt Handle ); -VOID WINAPI EMUPATCH(D3DDevice_SetPixelShader_0)(); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetPixelShader_0)(); // ****************************************************************** // * patch: D3DDevice_CreateTexture2 // ****************************************************************** X_D3DResource * WINAPI EMUPATCH(D3DDevice_CreateTexture2) ( - UINT Width, - UINT Height, - UINT Depth, - UINT Levels, - DWORD Usage, + uint_xt Width, + uint_xt Height, + uint_xt Depth, + uint_xt Levels, + dword_xt Usage, X_D3DFORMAT Format, X_D3DRESOURCETYPE D3DResource ); @@ -531,12 +537,12 @@ X_D3DResource * WINAPI EMUPATCH(D3DDevice_CreateTexture2) // ****************************************************************** // * patch: D3DDevice_CreateTexture // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_CreateTexture) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_CreateTexture) ( - UINT Width, - UINT Height, - UINT Levels, - DWORD Usage, + uint_xt Width, + uint_xt Height, + uint_xt Levels, + dword_xt Usage, X_D3DFORMAT Format, D3DPOOL Pool, X_D3DTexture **ppTexture @@ -545,13 +551,13 @@ HRESULT WINAPI EMUPATCH(D3DDevice_CreateTexture) // ****************************************************************** // * patch: D3DDevice_CreateVolumeTexture // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_CreateVolumeTexture) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_CreateVolumeTexture) ( - UINT Width, - UINT Height, - UINT Depth, - UINT Levels, - DWORD Usage, + uint_xt Width, + uint_xt Height, + uint_xt Depth, + uint_xt Levels, + dword_xt Usage, X_D3DFORMAT Format, D3DPOOL Pool, X_D3DVolumeTexture **ppVolumeTexture @@ -560,11 +566,11 @@ HRESULT WINAPI EMUPATCH(D3DDevice_CreateVolumeTexture) // ****************************************************************** // * patch: D3DDevice_CreateCubeTexture // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_CreateCubeTexture) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_CreateCubeTexture) ( - UINT EdgeLength, - UINT Levels, - DWORD Usage, + uint_xt EdgeLength, + uint_xt Levels, + dword_xt Usage, X_D3DFORMAT Format, D3DPOOL Pool, X_D3DCubeTexture **ppCubeTexture @@ -573,10 +579,10 @@ HRESULT WINAPI EMUPATCH(D3DDevice_CreateCubeTexture) // ****************************************************************** // * patch: D3DDevice_CreateIndexBuffer // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_CreateIndexBuffer) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_CreateIndexBuffer) ( - UINT Length, - DWORD Usage, + uint_xt Length, + dword_xt Usage, X_D3DFORMAT Format, D3DPOOL Pool, X_D3DIndexBuffer **ppIndexBuffer @@ -585,35 +591,35 @@ HRESULT WINAPI EMUPATCH(D3DDevice_CreateIndexBuffer) // ****************************************************************** // * patch: D3DDevice_CreateIndexBuffer2 // ****************************************************************** -X_D3DIndexBuffer * WINAPI EMUPATCH(D3DDevice_CreateIndexBuffer2)(UINT Length); +X_D3DIndexBuffer * WINAPI EMUPATCH(D3DDevice_CreateIndexBuffer2)(uint_xt Length); // ****************************************************************** // * patch: D3DDevice_SetIndices // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetIndices) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetIndices) ( X_D3DIndexBuffer *pIndexData, - UINT BaseVertexIndex + uint_xt BaseVertexIndex ); // ****************************************************************** // * patch: D3DDevice_SetIndices_4 // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetIndices_4) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetIndices_4) ( - UINT BaseVertexIndex + uint_xt BaseVertexIndex ); // ****************************************************************** // * patch: D3DDevice_SetTexture // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetTexture) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetTexture) ( - DWORD Stage, + dword_xt Stage, X_D3DBaseTexture *pTexture ); -VOID WINAPI EMUPATCH(D3DDevice_SetTexture_4) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetTexture_4) ( X_D3DBaseTexture *pTexture ); @@ -621,17 +627,17 @@ VOID WINAPI EMUPATCH(D3DDevice_SetTexture_4) // ****************************************************************** // * patch: D3DDevice_SwitchTexture // ****************************************************************** -VOID __fastcall EMUPATCH(D3DDevice_SwitchTexture) +xbox::void_xt __fastcall EMUPATCH(D3DDevice_SwitchTexture) ( - DWORD Method, - DWORD Data, - DWORD Format + dword_xt Method, + dword_xt Data, + dword_xt Format ); // ****************************************************************** // * patch: D3DDevice_GetDisplayMode // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetDisplayMode) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetDisplayMode) ( X_D3DDISPLAYMODE *pModes ); @@ -639,7 +645,7 @@ VOID WINAPI EMUPATCH(D3DDevice_GetDisplayMode) // ****************************************************************** // * patch: D3DDevice_Begin // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_Begin) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_Begin) ( X_D3DPRIMITIVETYPE PrimitiveType ); @@ -647,74 +653,74 @@ VOID WINAPI EMUPATCH(D3DDevice_Begin) // ****************************************************************** // * patch: D3DDevice_SetVertexData2f // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetVertexData2f) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetVertexData2f) ( int Register, - FLOAT a, - FLOAT b + float_xt a, + float_xt b ); // ****************************************************************** // * patch: D3DDevice_SetVertexData2s // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetVertexData2s) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetVertexData2s) ( int Register, - SHORT a, - SHORT b + short_xt a, + short_xt b ); // ****************************************************************** // * patch: D3DDevice_SetVertexData4f // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetVertexData4f) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetVertexData4f) ( int Register, - FLOAT a, - FLOAT b, - FLOAT c, - FLOAT d + float_xt a, + float_xt b, + float_xt c, + float_xt d ); // ****************************************************************** // * patch: D3DDevice_SetVertexData4f_16 // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetVertexData4f_16) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetVertexData4f_16) ( - FLOAT a, - FLOAT b, - FLOAT c, - FLOAT d + float_xt a, + float_xt b, + float_xt c, + float_xt d ); // ****************************************************************** // * patch: D3DDevice_SetVertexData4ub // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetVertexData4ub) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetVertexData4ub) ( - INT Register, - BYTE a, - BYTE b, - BYTE c, - BYTE d + int_xt Register, + byte_xt a, + byte_xt b, + byte_xt c, + byte_xt d ); // ****************************************************************** // * patch: D3DDevice_SetVertexData4s // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetVertexData4s) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetVertexData4s) ( - INT Register, - SHORT a, - SHORT b, - SHORT c, - SHORT d + int_xt Register, + short_xt a, + short_xt b, + short_xt c, + short_xt d ); // ****************************************************************** // * patch: D3DDevice_SetVertexDataColor // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetVertexDataColor) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetVertexDataColor) ( int Register, D3DCOLOR Color @@ -723,12 +729,12 @@ VOID WINAPI EMUPATCH(D3DDevice_SetVertexDataColor) // ****************************************************************** // * patch: D3DDevice_End // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_End)(); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_End)(); // ****************************************************************** // * patch: D3DDevice_RunPushBuffer // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_RunPushBuffer) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_RunPushBuffer) ( X_D3DPushBuffer *pPushBuffer, X_D3DFixup *pFixup @@ -737,20 +743,20 @@ VOID WINAPI EMUPATCH(D3DDevice_RunPushBuffer) // ****************************************************************** // * patch: D3DDevice_Clear // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_Clear) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_Clear) ( - DWORD Count, + dword_xt Count, CONST D3DRECT *pRects, - DWORD Flags, + dword_xt Flags, D3DCOLOR Color, float Z, - DWORD Stencil + dword_xt Stencil ); // ****************************************************************** // * patch: D3DDevice_Present // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_Present) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_Present) ( CONST RECT* pSourceRect, CONST RECT* pDestRect, @@ -761,17 +767,17 @@ VOID WINAPI EMUPATCH(D3DDevice_Present) // ****************************************************************** // * patch: D3DDevice_Swap // ****************************************************************** -DWORD WINAPI EMUPATCH(D3DDevice_Swap) +dword_xt WINAPI EMUPATCH(D3DDevice_Swap) ( - DWORD Flags + dword_xt Flags ); -DWORD EMUPATCH(D3DDevice_Swap_0)(); +dword_xt EMUPATCH(D3DDevice_Swap_0)(); // ****************************************************************** // * patch: IDirect3DResource8_Register // ****************************************************************** -VOID WINAPI EMUPATCH(D3DResource_Register) +xbox::void_xt WINAPI EMUPATCH(D3DResource_Register) ( X_D3DResource *pThis, PVOID pBase @@ -780,7 +786,7 @@ VOID WINAPI EMUPATCH(D3DResource_Register) // ****************************************************************** // * patch: IDirect3DResource8_Release // ****************************************************************** -ULONG WINAPI EMUPATCH(D3DResource_Release) +xbox::ulong_xt WINAPI EMUPATCH(D3DResource_Release) ( X_D3DResource *pThis ); @@ -798,7 +804,7 @@ X_D3DRESOURCETYPE WINAPI EMUPATCH(D3DResource_GetType) // ****************************************************************** // * patch: IDirect3DResource8_AddRef // ****************************************************************** -ULONG WINAPI EMUPATCH(D3DResource_AddRef) +xbox::ulong_xt WINAPI EMUPATCH(D3DResource_AddRef) ( X_D3DResource *pThis ); @@ -806,7 +812,7 @@ ULONG WINAPI EMUPATCH(D3DResource_AddRef) // ****************************************************************** // * patch: IDirect3DResource8_IsBusy // ****************************************************************** -BOOL WINAPI EMUPATCH(D3DResource_IsBusy) +xbox::bool_xt WINAPI EMUPATCH(D3DResource_IsBusy) ( X_D3DResource *pThis ); @@ -814,43 +820,43 @@ BOOL WINAPI EMUPATCH(D3DResource_IsBusy) // ****************************************************************** // * patch: Lock2DSurface // ****************************************************************** -VOID WINAPI EMUPATCH(Lock2DSurface) +xbox::void_xt WINAPI EMUPATCH(Lock2DSurface) ( X_D3DPixelContainer *pPixelContainer, D3DCUBEMAP_FACES FaceType, - UINT Level, + uint_xt Level, D3DLOCKED_RECT *pLockedRect, RECT *pRect, - DWORD Flags + dword_xt Flags ); // ****************************************************************** // * patch: Lock3DSurface // ****************************************************************** -VOID WINAPI EMUPATCH(Lock3DSurface) +xbox::void_xt WINAPI EMUPATCH(Lock3DSurface) ( X_D3DPixelContainer *pPixelContainer, - UINT Level, + uint_xt Level, D3DLOCKED_BOX *pLockedVolume, D3DBOX *pBox, - DWORD Flags + dword_xt Flags ); #if 0 // patch disabled // ****************************************************************** // * patch: Get2DSurfaceDesc // ****************************************************************** -VOID WINAPI EMUPATCH(Get2DSurfaceDesc) +xbox::void_xt WINAPI EMUPATCH(Get2DSurfaceDesc) ( X_D3DPixelContainer *pPixelContainer, - DWORD dwLevel, + dword_xt dwLevel, X_D3DSURFACE_DESC *pDesc ); // ****************************************************************** // * patch: IDirect3DSurface8_GetDesc // ****************************************************************** -VOID WINAPI EMUPATCH(D3DSurface_GetDesc) +xbox::void_xt WINAPI EMUPATCH(D3DSurface_GetDesc) ( X_D3DResource *pThis, X_D3DSURFACE_DESC *pDesc @@ -859,18 +865,18 @@ VOID WINAPI EMUPATCH(D3DSurface_GetDesc) // ****************************************************************** // * patch: IDirect3DSurface8_LockRect // ****************************************************************** -VOID WINAPI EMUPATCH(D3DSurface_LockRect) +xbox::void_xt WINAPI EMUPATCH(D3DSurface_LockRect) ( X_D3DResource *pThis, D3DLOCKED_RECT *pLockedRect, CONST RECT *pRect, - DWORD Flags + dword_xt Flags ); // ****************************************************************** // * patch: IDirect3DBaseTexture8_GetLevelCount // ****************************************************************** -DWORD WINAPI EMUPATCH(D3DBaseTexture_GetLevelCount) +xbox::dword_xt WINAPI EMUPATCH(D3DBaseTexture_GetLevelCount) ( X_D3DBaseTexture *pThis ); @@ -881,64 +887,64 @@ DWORD WINAPI EMUPATCH(D3DBaseTexture_GetLevelCount) X_D3DSurface * WINAPI EMUPATCH(D3DTexture_GetSurfaceLevel2) ( X_D3DTexture *pThis, - UINT Level + uint_xt Level ); // ****************************************************************** // * patch: IDirect3DTexture8_LockRect // ****************************************************************** -VOID WINAPI EMUPATCH(D3DTexture_LockRect) +xbox::void_xt WINAPI EMUPATCH(D3DTexture_LockRect) ( X_D3DTexture *pThis, - UINT Level, + uint_xt Level, D3DLOCKED_RECT *pLockedRect, CONST RECT *pRect, - DWORD Flags + dword_xt Flags ); // ****************************************************************** // * patch: IDirect3DTexture8_GetSurfaceLevel // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DTexture_GetSurfaceLevel) +xbox::hresult_xt WINAPI EMUPATCH(D3DTexture_GetSurfaceLevel) ( X_D3DTexture *pThis, - UINT Level, + uint_xt Level, X_D3DSurface **ppSurfaceLevel ); // ****************************************************************** // * patch: IDirect3DVolumeTexture8_LockBox // ****************************************************************** -VOID WINAPI EMUPATCH(D3DVolumeTexture_LockBox) +xbox::void_xt WINAPI EMUPATCH(D3DVolumeTexture_LockBox) ( X_D3DVolumeTexture *pThis, - UINT Level, + uint_xt Level, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, - DWORD Flags + dword_xt Flags ); // ****************************************************************** // * patch: IDirect3DCubeTexture8_LockRect // ****************************************************************** -VOID WINAPI EMUPATCH(D3DCubeTexture_LockRect) +xbox::void_xt WINAPI EMUPATCH(D3DCubeTexture_LockRect) ( X_D3DCubeTexture *pThis, D3DCUBEMAP_FACES FaceType, - UINT Level, + uint_xt Level, D3DLOCKED_RECT *pLockedBox, CONST RECT *pRect, - DWORD Flags + dword_xt Flags ); // ****************************************************************** // * patch: D3DDevice_CreateVertexBuffer // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_CreateVertexBuffer) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_CreateVertexBuffer) ( - UINT Length, - DWORD Usage, - DWORD FVF, + uint_xt Length, + dword_xt Usage, + dword_xt FVF, D3DPOOL Pool, X_D3DVertexBuffer **ppVertexBuffer ); @@ -950,44 +956,44 @@ HRESULT WINAPI EMUPATCH(D3DDevice_CreateVertexBuffer) // ****************************************************************** X_D3DVertexBuffer* WINAPI EMUPATCH(D3DDevice_CreateVertexBuffer2) ( - UINT Length + uint_xt Length ); #endif // ****************************************************************** // * patch: D3DDevice_EnableOverlay // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_EnableOverlay) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_EnableOverlay) ( - BOOL Enable + bool_xt Enable ); // ****************************************************************** // * patch: D3DDevice_UpdateOverlay // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_UpdateOverlay) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_UpdateOverlay) ( X_D3DSurface *pSurface, CONST RECT *SrcRect, CONST RECT *DstRect, - BOOL EnableColorKey, + bool_xt EnableColorKey, D3DCOLOR ColorKey ); // ****************************************************************** // * patch: D3DDevice_GetOverlayUpdateStatus // ****************************************************************** -BOOL WINAPI EMUPATCH(D3DDevice_GetOverlayUpdateStatus)(); +xbox::bool_xt WINAPI EMUPATCH(D3DDevice_GetOverlayUpdateStatus)(); // ****************************************************************** // * patch: D3DDevice_BlockUntilVerticalBlank // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_BlockUntilVerticalBlank)(); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_BlockUntilVerticalBlank)(); // ****************************************************************** // * patch: D3DDevice_SetVerticalBlankCallback // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetVerticalBlankCallback) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetVerticalBlankCallback) ( X_D3DVBLANKCALLBACK pCallback ); @@ -995,312 +1001,312 @@ VOID WINAPI EMUPATCH(D3DDevice_SetVerticalBlankCallback) // ****************************************************************** // * patch: D3DDevice_SetTextureState_TexCoordIndex // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetTextureState_TexCoordIndex) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetTextureState_TexCoordIndex) ( - DWORD Stage, - DWORD Value + dword_xt Stage, + dword_xt Value ); -VOID __stdcall EMUPATCH(D3DDevice_SetTextureState_TexCoordIndex_0)(); -VOID WINAPI EMUPATCH(D3DDevice_SetTextureState_TexCoordIndex_4) +xbox::void_xt __stdcall EMUPATCH(D3DDevice_SetTextureState_TexCoordIndex_0)(); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetTextureState_TexCoordIndex_4) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_TwoSidedLighting // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_TwoSidedLighting) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_TwoSidedLighting) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_BackFillMode // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_BackFillMode) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_BackFillMode) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetTextureState_BorderColor // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetTextureState_BorderColor) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetTextureState_BorderColor) ( - DWORD Stage, - DWORD Value + dword_xt Stage, + dword_xt Value ); -VOID EMUPATCH(D3DDevice_SetTextureState_BorderColor_0)(); -VOID WINAPI EMUPATCH(D3DDevice_SetTextureState_BorderColor_4) +xbox::void_xt EMUPATCH(D3DDevice_SetTextureState_BorderColor_0)(); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetTextureState_BorderColor_4) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetTextureState_ColorKeyColor // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetTextureState_ColorKeyColor) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetTextureState_ColorKeyColor) ( - DWORD Stage, - DWORD Value + dword_xt Stage, + dword_xt Value ); -VOID EMUPATCH(D3DDevice_SetTextureState_ColorKeyColor_0)(); -VOID __stdcall EMUPATCH(D3DDevice_SetTextureState_ColorKeyColor_4) +xbox::void_xt EMUPATCH(D3DDevice_SetTextureState_ColorKeyColor_0)(); +xbox::void_xt __stdcall EMUPATCH(D3DDevice_SetTextureState_ColorKeyColor_4) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetTextureState_BumpEnv // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetTextureState_BumpEnv) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetTextureState_BumpEnv) ( - DWORD Stage, + dword_xt Stage, X_D3DTEXTURESTAGESTATETYPE Type, - DWORD Value + dword_xt Value ); -VOID WINAPI EMUPATCH(D3DDevice_SetTextureState_BumpEnv_8) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetTextureState_BumpEnv_8) ( X_D3DTEXTURESTAGESTATETYPE Type, - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_FrontFace // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_FrontFace) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_FrontFace) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_LogicOp // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_LogicOp) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_LogicOp) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_NormalizeNormals // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_NormalizeNormals) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_NormalizeNormals) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_TextureFactor // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_TextureFactor) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_TextureFactor) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_ZBias // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_ZBias) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_ZBias) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_EdgeAntiAlias // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_EdgeAntiAlias) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_EdgeAntiAlias) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_FillMode // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_FillMode) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_FillMode) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_FogColor // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_FogColor) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_FogColor) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_Dxt1NoiseEnable // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_Dxt1NoiseEnable) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_Simple // ****************************************************************** -VOID __fastcall EMUPATCH(D3DDevice_SetRenderState_Simple) +xbox::void_xt __fastcall EMUPATCH(D3DDevice_SetRenderState_Simple) ( - DWORD Method, - DWORD Value + dword_xt Method, + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_VertexBlend // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_VertexBlend) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_VertexBlend) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_PSTextureModes // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_PSTextureModes) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_PSTextureModes) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_CullMode // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_CullMode) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_CullMode) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_LineWidth // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_LineWidth) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_LineWidth) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_StencilFail // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_StencilFail) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_StencilFail) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_OcclusionCullEnable // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_OcclusionCullEnable) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_OcclusionCullEnable) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_StencilCullEnable // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_StencilCullEnable) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_StencilCullEnable) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_RopZCmpAlwaysRead // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_RopZCmpAlwaysRead) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_RopZCmpAlwaysRead) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_RopZRead // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_RopZRead) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_RopZRead) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_DoNotCullUncompressed // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_DoNotCullUncompressed) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_DoNotCullUncompressed) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_ZEnable // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_ZEnable) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_ZEnable) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_StencilEnable // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_StencilEnable) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_StencilEnable) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_MultiSampleMask // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_MultiSampleMask) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_MultiSampleMask) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_MultiSampleMode // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_MultiSampleMode) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_MultiSampleMode) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_MultiSampleRenderTargetMode // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_MultiSampleRenderTargetMode) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_MultiSampleAntiAlias // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_MultiSampleAntiAlias) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_ShadowFunc // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderState_ShadowFunc) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_ShadowFunc) ( - DWORD Value + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_SetTransform // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetTransform) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetTransform) ( D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix ); -VOID __stdcall EMUPATCH(D3DDevice_SetTransform_0)(); +xbox::void_xt __stdcall EMUPATCH(D3DDevice_SetTransform_0)(); // ****************************************************************** // * patch: D3DDevice_MultiplyTransform // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_MultiplyTransform) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_MultiplyTransform) ( D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix @@ -1309,7 +1315,7 @@ VOID WINAPI EMUPATCH(D3DDevice_MultiplyTransform) // ****************************************************************** // * patch: D3DDevice_GetTransform // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetTransform) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetTransform) ( D3DTRANSFORMSTATETYPE State, D3DMATRIX *pMatrix @@ -1318,22 +1324,22 @@ VOID WINAPI EMUPATCH(D3DDevice_GetTransform) // ****************************************************************** // * patch: IDirect3DVertexBuffer8_Lock // ****************************************************************** -VOID WINAPI EMUPATCH(D3DVertexBuffer_Lock) +xbox::void_xt WINAPI EMUPATCH(D3DVertexBuffer_Lock) ( X_D3DVertexBuffer *pVertexBuffer, - UINT OffsetToLock, - UINT SizeToLock, - BYTE **ppbData, - DWORD Flags + uint_xt OffsetToLock, + uint_xt SizeToLock, + byte_xt **ppbData, + dword_xt Flags ); // ****************************************************************** // * patch: IDirect3DVertexBuffer8_Lock2 // ****************************************************************** -BYTE* WINAPI EMUPATCH(D3DVertexBuffer_Lock2) +byte_xt* WINAPI EMUPATCH(D3DVertexBuffer_Lock2) ( X_D3DVertexBuffer *pVertexBuffer, - DWORD Flags + dword_xt Flags ); // ****************************************************************** @@ -1341,53 +1347,53 @@ BYTE* WINAPI EMUPATCH(D3DVertexBuffer_Lock2) // ****************************************************************** xbox::X_D3DVertexBuffer* WINAPI EMUPATCH(D3DDevice_GetStreamSource2) ( - UINT StreamNumber, - UINT *pStride + uint_xt StreamNumber, + uint_xt *pStride ); // ****************************************************************** // * patch: D3DDevice_SetStreamSource // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetStreamSource) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetStreamSource) ( - UINT StreamNumber, + uint_xt StreamNumber, X_D3DVertexBuffer *pStreamData, - UINT Stride + uint_xt Stride ); -VOID WINAPI EMUPATCH(D3DDevice_SetStreamSource_4) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetStreamSource_4) ( - UINT Stride + uint_xt Stride ); -VOID WINAPI EMUPATCH(D3DDevice_SetStreamSource_8) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetStreamSource_8) ( X_D3DVertexBuffer *pStreamData, - UINT Stride + uint_xt Stride ); // ****************************************************************** // * patch: D3DDevice_SetVertexShader // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetVertexShader) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetVertexShader) ( - DWORD Handle + dword_xt Handle ); // ****************************************************************** // * patch: D3DDevice_DrawVertices // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_DrawVertices) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_DrawVertices) ( X_D3DPRIMITIVETYPE PrimitiveType, - UINT StartVertex, - UINT VertexCount + uint_xt StartVertex, + uint_xt VertexCount ); // ****************************************************************** // * patch: D3DDevice_DrawVertices_4 // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_DrawVertices_4) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_DrawVertices_4) ( X_D3DPRIMITIVETYPE PrimitiveType ); @@ -1395,58 +1401,58 @@ VOID WINAPI EMUPATCH(D3DDevice_DrawVertices_4) // ****************************************************************** // * patch: D3DDevice_DrawVerticesUP // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_DrawVerticesUP) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_DrawVerticesUP) ( X_D3DPRIMITIVETYPE PrimitiveType, - UINT VertexCount, + uint_xt VertexCount, CONST PVOID pVertexStreamZeroData, - UINT VertexStreamZeroStride + uint_xt VertexStreamZeroStride ); // ****************************************************************** // * patch: D3DDevice_DrawIndexedVertices // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_DrawIndexedVertices) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_DrawIndexedVertices) ( X_D3DPRIMITIVETYPE PrimitiveType, - UINT VertexCount, + uint_xt VertexCount, CONST PWORD pIndexData ); // ****************************************************************** // * patch: D3DDevice_DrawIndexedVerticesUP // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_DrawIndexedVerticesUP) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_DrawIndexedVerticesUP) ( X_D3DPRIMITIVETYPE PrimitiveType, - UINT VertexCount, + uint_xt VertexCount, CONST PVOID pIndexData, CONST PVOID pVertexStreamZeroData, - UINT VertexStreamZeroStride + uint_xt VertexStreamZeroStride ); // ****************************************************************** // * patch: D3DDevice_GetLight // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetLight) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetLight) ( - DWORD Index, + dword_xt Index, X_D3DLIGHT8 *pLight ); // ****************************************************************** // * patch: D3DDevice_SetLight // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_SetLight) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_SetLight) ( - DWORD Index, + dword_xt Index, CONST X_D3DLIGHT8 *pLight ); // ****************************************************************** // * patch: D3DDevice_SetMaterial // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetMaterial) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetMaterial) ( CONST X_D3DMATERIAL8 *pMaterial ); @@ -1454,21 +1460,21 @@ VOID WINAPI EMUPATCH(D3DDevice_SetMaterial) // ****************************************************************** // * patch: D3DDevice_LightEnable // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_LightEnable) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_LightEnable) ( - DWORD Index, - BOOL bEnable + dword_xt Index, + bool_xt bEnable ); // ****************************************************************** // * patch: D3DDevice_Release // ****************************************************************** -ULONG WINAPI EMUPATCH(D3DDevice_Release)(); +xbox::ulong_xt WINAPI EMUPATCH(D3DDevice_Release)(); // ****************************************************************** // * patch: D3DDevice_CreatePalette // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_CreatePalette) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_CreatePalette) ( X_D3DPALETTESIZE Size, X_D3DPalette **ppPalette @@ -1485,7 +1491,7 @@ X_D3DPalette * WINAPI EMUPATCH(D3DDevice_CreatePalette2) // ****************************************************************** // * patch: D3DDevice_SetRenderTarget // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderTarget) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderTarget) ( X_D3DSurface *pRenderTarget, X_D3DSurface *pNewZStencil @@ -1494,40 +1500,40 @@ VOID WINAPI EMUPATCH(D3DDevice_SetRenderTarget) // ****************************************************************** // * patch: D3DDevice_SetPalette // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetPalette) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetPalette) ( - DWORD Stage, + dword_xt Stage, X_D3DPalette *pPalette ); -VOID __stdcall EMUPATCH(D3DDevice_SetPalette_4)(); +xbox::void_xt __stdcall EMUPATCH(D3DDevice_SetPalette_4)(); // ****************************************************************** // * patch: D3DDevice_SetFlickerFilter // ****************************************************************** void WINAPI EMUPATCH(D3DDevice_SetFlickerFilter) ( - DWORD Filter + dword_xt Filter ); -VOID __stdcall EMUPATCH(D3DDevice_SetFlickerFilter_0)(); +xbox::void_xt __stdcall EMUPATCH(D3DDevice_SetFlickerFilter_0)(); // ****************************************************************** // * patch: D3DDevice_SetSoftDisplayFilter // ****************************************************************** void WINAPI EMUPATCH(D3DDevice_SetSoftDisplayFilter) ( - BOOL Enable + bool_xt Enable ); // ****************************************************************** // * patch: IDirect3DPalette8_Lock // ****************************************************************** -VOID WINAPI EMUPATCH(D3DPalette_Lock) +xbox::void_xt WINAPI EMUPATCH(D3DPalette_Lock) ( X_D3DPalette *pThis, D3DCOLOR **ppColors, - DWORD Flags + dword_xt Flags ); // ****************************************************************** @@ -1536,148 +1542,148 @@ VOID WINAPI EMUPATCH(D3DPalette_Lock) D3DCOLOR * WINAPI EMUPATCH(D3DPalette_Lock2) ( X_D3DPalette *pThis, - DWORD Flags + dword_xt Flags ); // ****************************************************************** // * patch: D3DDevice_GetVertexShaderSize // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetVertexShaderSize) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetVertexShaderSize) ( - DWORD Handle, - UINT* pSize + dword_xt Handle, + uint_xt* pSize ); // ****************************************************************** // * patch: D3DDevice_DeleteVertexShader // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_DeleteVertexShader) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_DeleteVertexShader) ( - DWORD Handle + dword_xt Handle ); -VOID __stdcall EMUPATCH(D3DDevice_DeleteVertexShader_0)(); +xbox::void_xt __stdcall EMUPATCH(D3DDevice_DeleteVertexShader_0)(); // ****************************************************************** // * patch: D3DDevice_SelectVertexShaderDirect // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SelectVertexShaderDirect) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SelectVertexShaderDirect) ( X_VERTEXATTRIBUTEFORMAT *pVAF, - DWORD Address + dword_xt Address ); // ****************************************************************** // * patch: D3DDevice_GetShaderConstantMode // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetShaderConstantMode) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetShaderConstantMode) ( - DWORD *pMode + dword_xt *pMode ); // ****************************************************************** // * patch: D3DDevice_GetVertexShader // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetVertexShader) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetVertexShader) ( - DWORD *pHandle + dword_xt *pHandle ); // ****************************************************************** // * patch: D3DDevice_GetVertexShaderConstant // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetVertexShaderConstant) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetVertexShaderConstant) ( - INT Register, + int_xt Register, void *pConstantData, - DWORD ConstantCount + dword_xt ConstantCount ); // ****************************************************************** // * patch: D3DDevice_SetVertexShaderInputDirect // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetVertexShaderInputDirect) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetVertexShaderInputDirect) ( X_VERTEXATTRIBUTEFORMAT *pVAF, - UINT StreamCount, + uint_xt StreamCount, X_STREAMINPUT *pStreamInputs ); // ****************************************************************** // * patch: D3DDevice_GetVertexShaderInput // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_GetVertexShaderInput) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_GetVertexShaderInput) ( - DWORD *pHandle, - UINT *pStreamCount, + dword_xt *pHandle, + uint_xt *pStreamCount, X_STREAMINPUT *pStreamInputs ); // ****************************************************************** // * patch: D3DDevice_GetVertexShaderInput // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetVertexShaderInput) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetVertexShaderInput) ( - DWORD Handle, - UINT StreamCount, + dword_xt Handle, + uint_xt StreamCount, X_STREAMINPUT *pStreamInputs ); // ****************************************************************** // * patch: D3DDevice_RunVertexStateShader // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_RunVertexStateShader) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_RunVertexStateShader) ( - DWORD Address, - CONST FLOAT *pData + dword_xt Address, + CONST float_xt *pData ); // ****************************************************************** // * patch: D3DDevice_LoadVertexShaderProgram // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_LoadVertexShaderProgram) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_LoadVertexShaderProgram) ( - CONST DWORD *pFunction, - DWORD Address + CONST dword_xt *pFunction, + dword_xt Address ); // ****************************************************************** // * patch: D3DDevice_GetVertexShaderType // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetVertexShaderType) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetVertexShaderType) ( - DWORD Handle, - DWORD *pType + dword_xt Handle, + dword_xt *pType ); // ****************************************************************** // * patch: D3DDevice_GetVertexShaderDeclaration // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_GetVertexShaderDeclaration) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_GetVertexShaderDeclaration) ( - DWORD Handle, + dword_xt Handle, PVOID pData, - DWORD *pSizeOfData + dword_xt *pSizeOfData ); // ****************************************************************** // * patch: D3DDevice_GetVertexShaderFunction // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_GetVertexShaderFunction) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_GetVertexShaderFunction) ( - DWORD Handle, + dword_xt Handle, PVOID *pData, - DWORD *pSizeOfData + dword_xt *pSizeOfData ); // ****************************************************************** // * patch: D3DDevice_SetDepthClipPlanes // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_SetDepthClipPlanes) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_SetDepthClipPlanes) ( - FLOAT Near, - FLOAT Far, - DWORD Flags + float_xt Near, + float_xt Far, + dword_xt Flags ); #if 0 // DISABLED (Just calls MmAllocateContiguousMemory) @@ -1686,8 +1692,8 @@ HRESULT WINAPI EMUPATCH(D3DDevice_SetDepthClipPlanes) // ****************************************************************** PVOID WINAPI EMUPATCH(D3D_AllocContiguousMemory) ( - SIZE_T dwSize, - DWORD dwAllocAttributes + size_xt dwSize, + dword_xt dwAllocAttributes ); #endif @@ -1695,9 +1701,9 @@ PVOID WINAPI EMUPATCH(D3D_AllocContiguousMemory) // ****************************************************************** // * patch: D3DTexture_GetLevelDesc // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DTexture_GetLevelDesc) +xbox::hresult_xt WINAPI EMUPATCH(D3DTexture_GetLevelDesc) ( - UINT Level, + uint_xt Level, X_D3DSURFACE_DESC* pDesc ); #endif @@ -1706,12 +1712,12 @@ HRESULT WINAPI EMUPATCH(D3DTexture_GetLevelDesc) // ****************************************************************** // * patch: Direct3D_CheckDeviceMultiSampleType // ****************************************************************** -HRESULT WINAPI EMUPATCH(Direct3D_CheckDeviceMultiSampleType) +xbox::hresult_xt WINAPI EMUPATCH(Direct3D_CheckDeviceMultiSampleType) ( - UINT Adapter, + uint_xt Adapter, D3DDEVTYPE DeviceType, X_D3DFORMAT SurfaceFormat, - BOOL Windowed, + bool_xt Windowed, D3DMULTISAMPLE_TYPE MultiSampleType ); #endif @@ -1720,9 +1726,9 @@ HRESULT WINAPI EMUPATCH(Direct3D_CheckDeviceMultiSampleType) // ****************************************************************** // * patch: D3D_GetDeviceCaps // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3D_GetDeviceCaps) +xbox::hresult_xt WINAPI EMUPATCH(D3D_GetDeviceCaps) ( - UINT Adapter, + uint_xt Adapter, D3DDEVTYPE DeviceType, X_D3DCAPS *pCaps ); @@ -1732,38 +1738,38 @@ HRESULT WINAPI EMUPATCH(D3D_GetDeviceCaps) // ****************************************************************** // * patch: D3D_SetPushBufferSize // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3D_SetPushBufferSize) +xbox::hresult_xt WINAPI EMUPATCH(D3D_SetPushBufferSize) ( - DWORD PushBufferSize, - DWORD KickOffSize + dword_xt PushBufferSize, + dword_xt KickOffSize ); #endif // ****************************************************************** // * patch: D3DDevice_InsertFence // ****************************************************************** -DWORD WINAPI EMUPATCH(D3DDevice_InsertFence)(); +xbox::dword_xt WINAPI EMUPATCH(D3DDevice_InsertFence)(); // ****************************************************************** // * patch: D3DDevice_IsFencePending // ****************************************************************** -BOOL WINAPI EMUPATCH(D3DDevice_IsFencePending) +xbox::bool_xt WINAPI EMUPATCH(D3DDevice_IsFencePending) ( - DWORD Fence + dword_xt Fence ); // ****************************************************************** // * patch: D3DDevice_BlockOnFence // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_BlockOnFence) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_BlockOnFence) ( - DWORD Fence + dword_xt Fence ); // ****************************************************************** // * patch: D3DResource_BlockUntilNotBusy // ****************************************************************** -VOID WINAPI EMUPATCH(D3DResource_BlockUntilNotBusy) +xbox::void_xt WINAPI EMUPATCH(D3DResource_BlockUntilNotBusy) ( X_D3DResource *pThis ); @@ -1772,7 +1778,7 @@ VOID WINAPI EMUPATCH(D3DResource_BlockUntilNotBusy) // ****************************************************************** // * patch: D3DVertexBuffer_GetDesc // ****************************************************************** -VOID WINAPI EMUPATCH(D3DVertexBuffer_GetDesc) +xbox::void_xt WINAPI EMUPATCH(D3DVertexBuffer_GetDesc) ( X_D3DVertexBuffer *pThis, X_D3DVERTEXBUFFER_DESC *pDesc @@ -1782,26 +1788,26 @@ VOID WINAPI EMUPATCH(D3DVertexBuffer_GetDesc) // ****************************************************************** // * patch: D3DDevice_SetScissors // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetScissors) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetScissors) ( - DWORD Count, - BOOL Exclusive, + dword_xt Count, + bool_xt Exclusive, CONST D3DRECT *pRects ); // ****************************************************************** // * patch: D3DDevice_SetScreenSpaceOffset // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetScreenSpaceOffset) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetScreenSpaceOffset) ( - FLOAT x, - FLOAT y + float_xt x, + float_xt y ); // ****************************************************************** // * patch: D3DDevice_SetPixelShaderProgram // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetPixelShaderProgram) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetPixelShaderProgram) ( X_D3DPIXELSHADERDEF *pPSDef ); @@ -1809,46 +1815,46 @@ VOID WINAPI EMUPATCH(D3DDevice_SetPixelShaderProgram) // ****************************************************************** // * patch: D3DDevice_CreateStateBlock // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_CreateStateBlock) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_CreateStateBlock) ( D3DSTATEBLOCKTYPE Type, - DWORD *pToken + dword_xt *pToken ); // ****************************************************************** // * patch: D3DDevice_InsertCallback // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_InsertCallback) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_InsertCallback) ( X_D3DCALLBACKTYPE Type, X_D3DCALLBACK pCallback, - DWORD Context + dword_xt Context ); // ****************************************************************** // * patch: D3DDevice_DrawRectPatch // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_DrawRectPatch) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_DrawRectPatch) ( - UINT Handle, - CONST FLOAT *pNumSegs, + uint_xt Handle, + CONST float_xt *pNumSegs, CONST D3DRECTPATCH_INFO *pRectPatchInfo ); // ****************************************************************** // * patch: D3DDevice_DrawTriPatch // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_DrawTriPatch) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_DrawTriPatch) ( - UINT Handle, - CONST FLOAT *pNumSegs, + uint_xt Handle, + CONST float_xt *pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo ); // ****************************************************************** // * patch: D3DDevice_GetProjectionViewportMatrix // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetProjectionViewportMatrix) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetProjectionViewportMatrix) ( D3DXMATRIX *pProjectionViewport ); @@ -1856,46 +1862,46 @@ VOID WINAPI EMUPATCH(D3DDevice_GetProjectionViewportMatrix) // ****************************************************************** // * patch: D3DDevice_KickOff (D3D::CDevice::KickOff) // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_KickOff)(); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_KickOff)(); // ****************************************************************** // * patch: D3DDevice_KickPushBuffer // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_KickPushBuffer)(); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_KickPushBuffer)(); // ****************************************************************** // * patch: D3DDevice_GetTexture2 // ****************************************************************** -X_D3DBaseTexture* WINAPI EMUPATCH(D3DDevice_GetTexture2)(DWORD Stage); +X_D3DBaseTexture* WINAPI EMUPATCH(D3DDevice_GetTexture2)(dword_xt Stage); // ****************************************************************** // * patch: D3DDevice_GetTexture // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetTexture) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetTexture) ( - DWORD Stage, + dword_xt Stage, X_D3DBaseTexture **pTexture ); // ****************************************************************** // * patch: D3DDevice_SetStateVB (D3D::CDevice::SetStateVB) // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetStateVB)( ULONG Unknown1 ); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetStateVB)( xbox::ulong_xt Unknown1 ); // ****************************************************************** // * patch: D3DDevice_SetStateUP (D3D::CDevice::SetStateUP) // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetStateUP)(); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetStateUP)(); // ****************************************************************** // * patch: D3DDevice_SetStipple // ****************************************************************** -void WINAPI EMUPATCH(D3DDevice_SetStipple)( DWORD* pPattern ); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetStipple)( dword_xt* pPattern ); // ****************************************************************** // * patch: D3DDevice_SetSwapCallback // ****************************************************************** -void WINAPI EMUPATCH(D3DDevice_SetSwapCallback) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetSwapCallback) ( X_D3DSWAPCALLBACK pCallback ); @@ -1903,57 +1909,57 @@ void WINAPI EMUPATCH(D3DDevice_SetSwapCallback) // ****************************************************************** // * patch: D3DDevice_PersistDisplay // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_PersistDisplay)(); +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_PersistDisplay)(); // ****************************************************************** // * patch: D3DDevice_GetPersistedSurface // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetPersistedSurface)(X_D3DSurface **ppSurface); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetPersistedSurface)(X_D3DSurface **ppSurface); X_D3DSurface* WINAPI EMUPATCH(D3DDevice_GetPersistedSurface2)(); // ****************************************************************** // * patch: D3D_CMiniport_GetDisplayCapabilities // ****************************************************************** -DWORD WINAPI EMUPATCH(D3D_CMiniport_GetDisplayCapabilities)(); +xbox::dword_xt WINAPI EMUPATCH(D3D_CMiniport_GetDisplayCapabilities)(); // ****************************************************************** // * patch: D3DDevice_PrimeVertexCache // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_PrimeVertexCache) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_PrimeVertexCache) ( - UINT VertexCount, - WORD *pIndexData + uint_xt VertexCount, + word_xt *pIndexData ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_SampleAlpha // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_SetRenderState_SampleAlpha) +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_SetRenderState_SampleAlpha) ( - DWORD dwSampleAlpha + dword_xt dwSampleAlpha ); // ****************************************************************** // * patch: D3DDevice_SetRenderState_Deferred // ****************************************************************** -VOID __fastcall EMUPATCH(D3DDevice_SetRenderState_Deferred) +xbox::void_xt __fastcall EMUPATCH(D3DDevice_SetRenderState_Deferred) ( - DWORD State, - DWORD Value + dword_xt State, + dword_xt Value ); // ****************************************************************** // * patch: D3DDevice_DeleteStateBlock // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_DeleteStateBlock) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_DeleteStateBlock) ( - DWORD Token + dword_xt Token ); // ****************************************************************** // * patch: D3DDevice_SetModelView // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetModelView) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetModelView) ( CONST D3DMATRIX *pModelView, CONST D3DMATRIX *pInverseModelView, @@ -1963,12 +1969,12 @@ VOID WINAPI EMUPATCH(D3DDevice_SetModelView) // ****************************************************************** // * patch: D3DDevice_FlushVertexCache // ****************************************************************** -void WINAPI EMUPATCH(D3DDevice_FlushVertexCache)(); +xbox::void_xt WINAPI EMUPATCH(D3DDevice_FlushVertexCache)(); // ****************************************************************** // * patch: D3DDevice_BeginPushBuffer // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_BeginPushBuffer) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_BeginPushBuffer) ( X_D3DPushBuffer *pPushBuffer ); @@ -1976,7 +1982,7 @@ VOID WINAPI EMUPATCH(D3DDevice_BeginPushBuffer) // ****************************************************************** // * patch: D3DDevice_EndPushBuffer // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_EndPushBuffer)(); +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_EndPushBuffer)(); // ****************************************************************** // * patch: XMETAL_StartPush @@ -1986,12 +1992,12 @@ PDWORD WINAPI EMUPATCH(XMETAL_StartPush)(void* Unknown); // ****************************************************************** // * patch: D3DDevice_GetModelView // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DDevice_GetModelView)(D3DXMATRIX* pModelView); +xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_GetModelView)(D3DXMATRIX* pModelView); // ****************************************************************** // * patch: D3DDevice_SetBackMaterial // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetBackMaterial) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetBackMaterial) ( X_D3DMATERIAL8* pMaterial ); @@ -2000,10 +2006,10 @@ VOID WINAPI EMUPATCH(D3DDevice_SetBackMaterial) // ****************************************************************** // * patch: D3D_GetAdapterIdentifier // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3D_GetAdapterIdentifier) +xbox::hresult_xt WINAPI EMUPATCH(D3D_GetAdapterIdentifier) ( - UINT Adapter, - DWORD Flags, + uint_xt Adapter, + dword_xt Flags, X_D3DADAPTER_IDENTIFIER *pIdentifier ); #endif @@ -2013,8 +2019,8 @@ HRESULT WINAPI EMUPATCH(D3D_GetAdapterIdentifier) // ****************************************************************** PDWORD WINAPI EMUPATCH(D3D_MakeRequestedSpace) ( - DWORD MinimumSpace, - DWORD RequestedSpace + dword_xt MinimumSpace, + dword_xt RequestedSpace ); // ****************************************************************** @@ -2030,7 +2036,7 @@ void WINAPI EMUPATCH(D3D_SetCommonDebugRegisters)(); // ****************************************************************** // * patch: D3D_BlockOnTime // ****************************************************************** -void WINAPI EMUPATCH(D3D_BlockOnTime)( DWORD Unknown1, int Unknown2 ); +void WINAPI EMUPATCH(D3D_BlockOnTime)( dword_xt Unknown1, int Unknown2 ); // ****************************************************************** // * patch: D3D_BlockOnResource @@ -2051,19 +2057,19 @@ void WINAPI EMUPATCH(D3D_DestroyResource__LTCG)(); // ****************************************************************** // * patch: D3DDevice_GetPushBufferOffset // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetPushBufferOffset) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetPushBufferOffset) ( - DWORD *pOffset + dword_xt *pOffset ); // ****************************************************************** // * patch: IDirect3DCubeTexture8_GetCubeMapSurface // ****************************************************************** -HRESULT WINAPI EMUPATCH(D3DCubeTexture_GetCubeMapSurface) +xbox::hresult_xt WINAPI EMUPATCH(D3DCubeTexture_GetCubeMapSurface) ( X_D3DCubeTexture* pThis, D3DCUBEMAP_FACES FaceType, - UINT Level, + uint_xt Level, X_D3DSurface** ppCubeMapSurface ); @@ -2074,41 +2080,41 @@ X_D3DSurface* WINAPI EMUPATCH(D3DCubeTexture_GetCubeMapSurface2) ( X_D3DCubeTexture* pThis, D3DCUBEMAP_FACES FaceType, - UINT Level + uint_xt Level ); // ****************************************************************** // * patch: D3DDevice_GetPixelShader // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetPixelShader) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetPixelShader) ( - DWORD Name, - DWORD* pHandle + dword_xt Name, + dword_xt* pHandle ); // ****************************************************************** // * patch: D3DDevice_SetRenderTargetFast // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_SetRenderTargetFast) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderTargetFast) ( X_D3DSurface *pRenderTarget, X_D3DSurface *pNewZStencil, - DWORD Flags + dword_xt Flags ); // ****************************************************************** // * patch: D3DDevice_GetScissors // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetScissors) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetScissors) ( - DWORD *pCount, - BOOL *pExclusive, + dword_xt *pCount, + bool_xt *pExclusive, D3DRECT *pRects ); // ****************************************************************** // * patch: D3DDevice_GetBackMaterial // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetBackMaterial) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetBackMaterial) ( X_D3DMATERIAL8* pMaterial ); @@ -2121,7 +2127,7 @@ void WINAPI EMUPATCH(D3D_LazySetPointParams)( void* Device ); // ****************************************************************** // * patch: D3DDevice_GetMaterial // ****************************************************************** -VOID WINAPI EMUPATCH(D3DDevice_GetMaterial) +xbox::void_xt WINAPI EMUPATCH(D3DDevice_GetMaterial) ( X_D3DMATERIAL8* pMaterial ); diff --git a/src/core/hle/D3D8/Direct3D9/RenderStates.cpp b/src/core/hle/D3D8/Direct3D9/RenderStates.cpp index b3c62940f..71782cc0d 100644 --- a/src/core/hle/D3D8/Direct3D9/RenderStates.cpp +++ b/src/core/hle/D3D8/Direct3D9/RenderStates.cpp @@ -374,7 +374,7 @@ void XboxRenderStateConverter::ApplyDeferredRenderState(uint32_t State, uint32_t // Store this as an override for our frame limiter // Games can use this to limit certain scenes to a desired target framerate for a specific scene // If this value is not set, or is set to 0, the default interval passed to CreateDevice is used - extern DWORD g_Xbox_PresentationInterval_Override; + extern xbox::dword_xt g_Xbox_PresentationInterval_Override; g_Xbox_PresentationInterval_Override = Value; } return; case xbox::X_D3DRS_WRAP0: diff --git a/src/core/hle/D3D8/XbD3D8Types.h b/src/core/hle/D3D8/XbD3D8Types.h index 2e28c3e2d..b66aadeb0 100644 --- a/src/core/hle/D3D8/XbD3D8Types.h +++ b/src/core/hle/D3D8/XbD3D8Types.h @@ -27,6 +27,9 @@ #undef UNICODE // make sure dxerr.h DXGetErrorString is aliassed to *A, not *W +// NOTE: required because XbD3D8Types.h is included in places where xbox_types.h is not, which causes compiler errors because of the undefined types +#include "xbox_types.h" + // include direct3d 9x headers #define DIRECT3D_VERSION 0x0900 #include diff --git a/src/core/hle/D3D8/XbPixelShader.cpp b/src/core/hle/D3D8/XbPixelShader.cpp index 2a0f928f5..545516697 100644 --- a/src/core/hle/D3D8/XbPixelShader.cpp +++ b/src/core/hle/D3D8/XbPixelShader.cpp @@ -5941,7 +5941,7 @@ static const std::vector g_RecompiledPixelShaders; -VOID DxbxUpdateActivePixelShader() // NOPATCH +void DxbxUpdateActivePixelShader() // NOPATCH { xbox::X_D3DPIXELSHADERDEF *pPSDef; PPSH_RECOMPILED_SHADER RecompiledPixelShader; diff --git a/src/core/hle/D3D8/XbPixelShader.h b/src/core/hle/D3D8/XbPixelShader.h index d2593ae75..f5c0edc36 100644 --- a/src/core/hle/D3D8/XbPixelShader.h +++ b/src/core/hle/D3D8/XbPixelShader.h @@ -35,6 +35,6 @@ void DumpPixelShaderDefToFile( xbox::X_D3DPIXELSHADERDEF* pPSDef, const char* ps void PrintPixelShaderDefContents(xbox::X_D3DPIXELSHADERDEF* pDSDef ); // PatrickvL's Dxbx pixel shader translation -VOID DxbxUpdateActivePixelShader(); // NOPATCH +void DxbxUpdateActivePixelShader(); // NOPATCH #endif // PIXELSHADER_H diff --git a/src/core/hle/D3D8/XbPushBuffer.cpp b/src/core/hle/D3D8/XbPushBuffer.cpp index 805107a3e..c6e9605e7 100644 --- a/src/core/hle/D3D8/XbPushBuffer.cpp +++ b/src/core/hle/D3D8/XbPushBuffer.cpp @@ -468,7 +468,7 @@ extern void EmuExecutePushBufferRaw // DMA Pusher state -- see https://envytools.readthedocs.io/en/latest/hw/fifo/dma-pusher.html#pusher-state #if 0 - static xbox::addr dma_pushbuffer; // the pushbuffer and IB DMA object + static xbox::addr_xt dma_pushbuffer; // the pushbuffer and IB DMA object #endif uint32_t *dma_limit; // pushbuffer size limit uint32_t *dma_put; // pushbuffer current end address @@ -497,8 +497,8 @@ extern void EmuExecutePushBufferRaw }; // Initialize working variables - dma_limit = (uint32_t*)((xbox::addr)pPushData + uSizeInBytes); // TODO : If this an absolute addresss? - dma_put = (uint32_t*)((xbox::addr)pPushData + uSizeInBytes); + dma_limit = (uint32_t*)((xbox::addr_xt)pPushData + uSizeInBytes); // TODO : If this an absolute addresss? + dma_put = (uint32_t*)((xbox::addr_xt)pPushData + uSizeInBytes); dma_get = (uint32_t*)pPushData; dma_state = {}; diff --git a/src/core/hle/D3D8/XbVertexBuffer.cpp b/src/core/hle/D3D8/XbVertexBuffer.cpp index 4922d5235..37814ff4f 100644 --- a/src/core/hle/D3D8/XbVertexBuffer.cpp +++ b/src/core/hle/D3D8/XbVertexBuffer.cpp @@ -831,7 +831,7 @@ void CxbxVertexBufferConverter::Apply(CxbxDrawContext *pDrawContext) } } -VOID EmuFlushIVB() +void EmuFlushIVB() { CxbxUpdateNativeD3DResources(); diff --git a/src/core/hle/D3D8/XbVertexBuffer.h b/src/core/hle/D3D8/XbVertexBuffer.h index eb7e728d4..1f9ff7012 100644 --- a/src/core/hle/D3D8/XbVertexBuffer.h +++ b/src/core/hle/D3D8/XbVertexBuffer.h @@ -125,9 +125,9 @@ extern struct _D3DIVB extern UINT g_InlineVertexBuffer_TableLength; extern UINT g_InlineVertexBuffer_TableOffset; -extern VOID EmuFlushIVB(); +extern void EmuFlushIVB(); -extern VOID EmuUpdateActiveTexture(); +extern void EmuUpdateActiveTexture(); extern DWORD g_dwPrimPerFrame; diff --git a/src/core/hle/D3D8/XbVertexShader.cpp b/src/core/hle/D3D8/XbVertexShader.cpp index 98b21e37e..8974ec05d 100644 --- a/src/core/hle/D3D8/XbVertexShader.cpp +++ b/src/core/hle/D3D8/XbVertexShader.cpp @@ -873,7 +873,7 @@ private: HostVertexElementDataType = D3DDECLTYPE_FLOAT1; HostVertexElementByteSize = 1 * sizeof(FLOAT); } - XboxVertexElementByteSize = 1 * sizeof(xbox::SHORT); + XboxVertexElementByteSize = 1 * sizeof(xbox::short_xt); NeedPatching = TRUE; break; case xbox::X_D3DVSDT_NORMSHORT2: // 0x21: @@ -886,7 +886,7 @@ private: { HostVertexElementDataType = D3DDECLTYPE_FLOAT2; HostVertexElementByteSize = 2 * sizeof(FLOAT); - XboxVertexElementByteSize = 2 * sizeof(xbox::SHORT); + XboxVertexElementByteSize = 2 * sizeof(xbox::short_xt); NeedPatching = TRUE; } break; @@ -900,7 +900,7 @@ private: HostVertexElementDataType = D3DDECLTYPE_FLOAT3; HostVertexElementByteSize = 3 * sizeof(FLOAT); } - XboxVertexElementByteSize = 3 * sizeof(xbox::SHORT); + XboxVertexElementByteSize = 3 * sizeof(xbox::short_xt); NeedPatching = TRUE; break; case xbox::X_D3DVSDT_NORMSHORT4: // 0x41: @@ -913,26 +913,26 @@ private: { HostVertexElementDataType = D3DDECLTYPE_FLOAT4; HostVertexElementByteSize = 4 * sizeof(FLOAT); - XboxVertexElementByteSize = 4 * sizeof(xbox::SHORT); + XboxVertexElementByteSize = 4 * sizeof(xbox::short_xt); NeedPatching = TRUE; } break; case xbox::X_D3DVSDT_NORMPACKED3: // 0x16: HostVertexElementDataType = D3DDECLTYPE_FLOAT3; HostVertexElementByteSize = 3 * sizeof(FLOAT); - XboxVertexElementByteSize = 1 * sizeof(xbox::DWORD); + XboxVertexElementByteSize = 1 * sizeof(xbox::dword_xt); NeedPatching = TRUE; break; case xbox::X_D3DVSDT_SHORT1: // 0x15: HostVertexElementDataType = D3DDECLTYPE_SHORT2; HostVertexElementByteSize = 2 * sizeof(SHORT); - XboxVertexElementByteSize = 1 * sizeof(xbox::SHORT); + XboxVertexElementByteSize = 1 * sizeof(xbox::short_xt); NeedPatching = TRUE; break; case xbox::X_D3DVSDT_SHORT3: // 0x35: HostVertexElementDataType = D3DDECLTYPE_SHORT4; HostVertexElementByteSize = 4 * sizeof(SHORT); - XboxVertexElementByteSize = 3 * sizeof(xbox::SHORT); + XboxVertexElementByteSize = 3 * sizeof(xbox::short_xt); NeedPatching = TRUE; break; case xbox::X_D3DVSDT_PBYTE1: // 0x14: @@ -945,7 +945,7 @@ private: HostVertexElementDataType = D3DDECLTYPE_FLOAT1; HostVertexElementByteSize = 1 * sizeof(FLOAT); } - XboxVertexElementByteSize = 1 * sizeof(xbox::BYTE); + XboxVertexElementByteSize = 1 * sizeof(xbox::byte_xt); NeedPatching = TRUE; break; case xbox::X_D3DVSDT_PBYTE2: // 0x24: @@ -958,7 +958,7 @@ private: HostVertexElementDataType = D3DDECLTYPE_FLOAT2; HostVertexElementByteSize = 2 * sizeof(FLOAT); } - XboxVertexElementByteSize = 2 * sizeof(xbox::BYTE); + XboxVertexElementByteSize = 2 * sizeof(xbox::byte_xt); NeedPatching = TRUE; break; case xbox::X_D3DVSDT_PBYTE3: // 0x34: @@ -971,7 +971,7 @@ private: HostVertexElementDataType = D3DDECLTYPE_FLOAT3; HostVertexElementByteSize = 3 * sizeof(FLOAT); } - XboxVertexElementByteSize = 3 * sizeof(xbox::BYTE); + XboxVertexElementByteSize = 3 * sizeof(xbox::byte_xt); NeedPatching = TRUE; break; case xbox::X_D3DVSDT_PBYTE4: // 0x44: @@ -985,7 +985,7 @@ private: { HostVertexElementDataType = D3DDECLTYPE_FLOAT4; HostVertexElementByteSize = 4 * sizeof(FLOAT); - XboxVertexElementByteSize = 4 * sizeof(xbox::BYTE); + XboxVertexElementByteSize = 4 * sizeof(xbox::byte_xt); NeedPatching = TRUE; } break; @@ -1513,7 +1513,7 @@ HRESULT CxbxImpl_CreateVertexShader(CONST DWORD *pDeclaration, CONST DWORD *pFun if (g_pD3DDevice == nullptr) { LOG_TEST_CASE("D3DDevice_CreateVertexShader called before Direct3D_CreateDevice"); // We lie to allow the game to continue for now, but it probably won't work well - return 0; // == STATUS_SUCCESS + return 0; // == xbox::status_success } // HACK: TODO: support this situation diff --git a/src/core/hle/DSOUND/DirectSound/DSStream_PacketManager.cpp b/src/core/hle/DSOUND/DirectSound/DSStream_PacketManager.cpp index b8e1aaf88..187760c7d 100644 --- a/src/core/hle/DSOUND/DirectSound/DSStream_PacketManager.cpp +++ b/src/core/hle/DSOUND/DirectSound/DSStream_PacketManager.cpp @@ -27,7 +27,7 @@ #define LOG_PREFIX CXBXR_MODULE::DSSTREAM -#include +#include #include #include "DirectSoundGlobal.hpp" diff --git a/src/core/hle/DSOUND/DirectSound/DirectSound.cpp b/src/core/hle/DSOUND/DirectSound/DirectSound.cpp index cafa12378..1aa2d40aa 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSound.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSound.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX CXBXR_MODULE::DSOUND -#include +#include #include #include "DirectSoundGlobal.hpp" // Global variables @@ -122,7 +122,7 @@ void CxbxInitAudio() // ****************************************************************** // * patch: DirectSoundCreate // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(DirectSoundCreate) +xbox::hresult_xt WINAPI xbox::EMUPATCH(DirectSoundCreate) ( LPVOID pguidDeviceId, OUT LPDIRECTSOUND8* ppDirectSound, @@ -252,7 +252,7 @@ HRESULT WINAPI xbox::EMUPATCH(DirectSoundCreate) // ****************************************************************** // * patch: IDirectSound_AddRef // ****************************************************************** -ULONG WINAPI xbox::EMUPATCH(IDirectSound_AddRef) +xbox::ulong_xt WINAPI xbox::EMUPATCH(IDirectSound_AddRef) ( LPDIRECTSOUND8 pThis) { @@ -270,7 +270,7 @@ ULONG WINAPI xbox::EMUPATCH(IDirectSound_AddRef) // ****************************************************************** // * patch: IDirectSound_Release // ****************************************************************** -ULONG WINAPI xbox::EMUPATCH(IDirectSound_Release) +xbox::ulong_xt WINAPI xbox::EMUPATCH(IDirectSound_Release) ( LPDIRECTSOUND8 pThis) { @@ -292,13 +292,13 @@ ULONG WINAPI xbox::EMUPATCH(IDirectSound_Release) // ****************************************************************** // * patch: DirectSoundGetSampleTime // ****************************************************************** -DWORD WINAPI xbox::EMUPATCH(DirectSoundGetSampleTime)() +xbox::dword_xt WINAPI xbox::EMUPATCH(DirectSoundGetSampleTime)() { DSoundMutexGuardLock; LOG_FUNC(); - DWORD dwRet = GetAPUTime(); + dword_xt dwRet = GetAPUTime(); return dwRet; } @@ -362,7 +362,7 @@ void WINAPI xbox::EMUPATCH(DirectSoundUseLightHRTF4Channel) // ****************************************************************** // * patch: DirectSoundDoWork // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(DirectSoundDoWork)() +xbox::void_xt WINAPI xbox::EMUPATCH(DirectSoundDoWork)() { DSoundMutexGuardLock; @@ -410,7 +410,7 @@ static void dsound_thread_worker(LPVOID nullPtr) // ****************************************************************** // * patch: CDirectSound_CommitDeferredSettings // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSound_CommitDeferredSettings) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSound_CommitDeferredSettings) ( X_CDirectSound* pThis) { @@ -429,7 +429,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSound_CommitDeferredSettings) // ****************************************************************** // * patch: IDirectSound_CommitDeferredSettings // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_CommitDeferredSettings) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_CommitDeferredSettings) ( X_CDirectSound* pThis) { @@ -444,7 +444,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_CommitDeferredSettings) // * patch: IDirectSound_CommitEffectData // ****************************************************************** // This API is used relative with DSP effect. -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_CommitEffectData) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_CommitEffectData) ( X_CDirectSound* pThis) { @@ -462,13 +462,13 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_CommitEffectData) // ****************************************************************** // * patch: IDirectSound_GetEffectData // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_GetEffectData) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_GetEffectData) ( X_CDirectSound* pThis, - DWORD dwEffectIndex, - DWORD dwOffset, + dword_xt dwEffectIndex, + dword_xt dwOffset, OUT LPVOID pvData, - DWORD dwDataSize) + dword_xt dwDataSize) { DSoundMutexGuardLock; @@ -495,14 +495,14 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_GetEffectData) // ****************************************************************** // * patch: IDirectSound_SetEffectData // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetEffectData) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_SetEffectData) ( LPVOID pThis, - DWORD dwEffectIndex, - DWORD dwOffset, + dword_xt dwEffectIndex, + dword_xt dwOffset, LPCVOID pvData, - DWORD dwDataSize, - DWORD dwApply) + dword_xt dwDataSize, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -525,11 +525,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetEffectData) // ****************************************************************** // * patch: IDirectSound_DownloadEffectsImage // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_DownloadEffectsImage) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_DownloadEffectsImage) ( LPDIRECTSOUND8 pThis, LPCVOID pvImageBuffer, - DWORD dwImageSize, + dword_xt dwImageSize, PVOID pImageLoc, // TODO: Use this param PVOID* ppImageDesc) // TODO: Use this param { @@ -553,10 +553,10 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_DownloadEffectsImage) // ****************************************************************** // * patch: IDirectSound_EnableHeadphones // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_EnableHeadphones) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_EnableHeadphones) ( LPDIRECTSOUND8 pThis, - BOOL fEnabled) + bool_xt fEnabled) { DSoundMutexGuardLock; @@ -574,7 +574,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_EnableHeadphones) // ****************************************************************** // * patch: IDirectSound_GetCaps // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_GetCaps) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_GetCaps) ( X_CDirectSound* pThis, OUT X_DSCAPS* pDSCaps) @@ -607,11 +607,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_GetCaps) // ****************************************************************** // * patch: IDirectSound_GetOutputLevels // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_GetOutputLevels) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_GetOutputLevels) ( LPDIRECTSOUND8* pThis, OUT X_DSOUTPUTLEVELS* pOutputLevels, - BOOL bResetPeakValues) + bool_xt bResetPeakValues) { DSoundMutexGuardLock; @@ -633,7 +633,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_GetOutputLevels) // ****************************************************************** // * patch: CDirectSound_GetSpeakerConfig // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSound_GetSpeakerConfig) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSound_GetSpeakerConfig) ( X_CDirectSound* pThis, OUT PDWORD pdwSpeakerConfig) @@ -658,7 +658,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSound_GetSpeakerConfig) // ****************************************************************** // * patch: IDirectSound_GetSpeakerConfig // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_GetSpeakerConfig) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_GetSpeakerConfig) ( X_CDirectSound* pThis, OUT LPDWORD* pdwSpeakerConfig) @@ -680,11 +680,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_GetSpeakerConfig) // * patch: IDirectSound_SetAllParameters // ****************************************************************** // NOTE: No conversion requirement for XB to PC. -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetAllParameters) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_SetAllParameters) ( LPDIRECTSOUND8 pThis, LPCDS3DLISTENER pDS3DListenerParameters, - DWORD dwApply) + dword_xt dwApply) { DSoundMutexGuardLock; @@ -702,11 +702,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetAllParameters) // ****************************************************************** // * patch: IDirectSound_SetDistanceFactor // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetDistanceFactor) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_SetDistanceFactor) ( LPDIRECTSOUND8 pThis, - FLOAT fDistanceFactor, - DWORD dwApply) + float_xt fDistanceFactor, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -724,11 +724,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetDistanceFactor) // ****************************************************************** // * patch: IDirectSound_SetDopplerFactor // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetDopplerFactor) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_SetDopplerFactor) ( LPDIRECTSOUND8 pThis, - FLOAT fDopplerFactor, - DWORD dwApply) + float_xt fDopplerFactor, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -746,11 +746,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetDopplerFactor) // ****************************************************************** // * patch: IDirectSound_SetI3DL2Listener // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetI3DL2Listener) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_SetI3DL2Listener) ( LPDIRECTSOUND8 pThis, X_DSI3DL2LISTENER *pds3dl, - DWORD dwApply) + dword_xt dwApply) { DSoundMutexGuardLock; @@ -770,11 +770,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetI3DL2Listener) // ****************************************************************** // * patch: IDirectSound_SetMixBinHeadroom // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetMixBinHeadroom) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_SetMixBinHeadroom) ( LPDIRECTSOUND8 pThis, - DWORD dwMixBinMask, - DWORD dwHeadroom) + dword_xt dwMixBinMask, + dword_xt dwHeadroom) { DSoundMutexGuardLock; @@ -792,16 +792,16 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetMixBinHeadroom) // ****************************************************************** // * patch: IDirectSound_SetOrientation // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetOrientation) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_SetOrientation) ( LPDIRECTSOUND8 pThis, - FLOAT xFront, - FLOAT yFront, - FLOAT zFront, - FLOAT xTop, - FLOAT yTop, - FLOAT zTop, - DWORD dwApply) + float_xt xFront, + float_xt yFront, + float_xt zFront, + float_xt xTop, + float_xt yTop, + float_xt zTop, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -834,13 +834,13 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetOrientation) // ****************************************************************** // * patch: IDirectSound_SetPosition // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetPosition) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_SetPosition) ( LPDIRECTSOUND8 pThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply) + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -860,11 +860,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetPosition) // ****************************************************************** // * patch: IDirectSound_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetRolloffFactor) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_SetRolloffFactor) ( LPDIRECTSOUND8 pThis, - FLOAT fRolloffFactor, - DWORD dwApply) + float_xt fRolloffFactor, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -882,7 +882,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetRolloffFactor) // ****************************************************************** // * patch: CDirectSound_SynchPlayback // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSound_SynchPlayback) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSound_SynchPlayback) ( LPDIRECTSOUND8 pThis) { @@ -926,7 +926,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSound_SynchPlayback) // ****************************************************************** // * patch: IDirectSound_SynchPlayback // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SynchPlayback) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_SynchPlayback) ( LPDIRECTSOUND8 pThis) { @@ -940,13 +940,13 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SynchPlayback) // ****************************************************************** // * patch: IDirectSound_SetVelocity // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_SetVelocity) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_SetVelocity) ( LPDIRECTSOUND8 pThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply) + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply) { DSoundMutexGuardLock; diff --git a/src/core/hle/DSOUND/DirectSound/DirectSound.hpp b/src/core/hle/DSOUND/DirectSound/DirectSound.hpp index b4cd1ecc2..71d1f6e43 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSound.hpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSound.hpp @@ -45,7 +45,6 @@ void CxbxInitAudio(); namespace xbox { -#undef FIELD_OFFSET // prevent macro redefinition warnings #include // TODO: FIXME after global namespace xbox issue is resolved. // ****************************************************************** @@ -165,7 +164,7 @@ class X_CMcpxStream // TODO: Function needs X_CMcpxStream "this" pointer (ecx!) // - VOID (WINAPI *Dummy_0x10)(DWORD dwDummy1, DWORD dwDummy2); // 0x10 + xbox::void_xt (WINAPI *Dummy_0x10)(xbox::dword_xt dwDummy1, xbox::dword_xt dwDummy2); // 0x10 } *pVtbl; @@ -207,31 +206,31 @@ class X_CDirectSoundStream // vtable (cached by each instance, via constructor) struct _vtbl { - ULONG (WINAPI *AddRef)(X_CDirectSoundStream *pThis); // 0x00 - ULONG (WINAPI *Release)(X_CDirectSoundStream *pThis); // 0x04 + ulong_xt (WINAPI *AddRef)(X_CDirectSoundStream *pThis); // 0x00 + ulong_xt (WINAPI *Release)(X_CDirectSoundStream *pThis); // 0x04 - HRESULT (WINAPI *GetInfo) // 0x08 + hresult_xt (WINAPI *GetInfo) // 0x08 ( X_CDirectSoundStream* pThis, XMEDIAINFO* pInfo ); - HRESULT (WINAPI *GetStatus) // 0x0C + hresult_xt (WINAPI *GetStatus) // 0x0C ( X_CDirectSoundStream* pThis, LPDWORD pdwStatus ); - HRESULT (WINAPI *Process) // 0x10 + hresult_xt (WINAPI *Process) // 0x10 ( X_CDirectSoundStream* pThis, PXMEDIAPACKET pInputBuffer, PXMEDIAPACKET pOutputBuffer ); - HRESULT (WINAPI *Discontinuity)(X_CDirectSoundStream *pThis); // 0x14 + hresult_xt (WINAPI *Discontinuity)(X_CDirectSoundStream *pThis); // 0x14 - HRESULT (WINAPI *Flush)(X_CDirectSoundStream *pThis); // 0x18 + hresult_xt (WINAPI *Flush)(X_CDirectSoundStream *pThis); // 0x18 DWORD Unknown2; // 0x1C - ??? DWORD Unknown3; // 0x20 - ??? @@ -298,39 +297,39 @@ class X_XFileMediaObject // vtable (cached by each instance, via constructor) struct _vtbl { - ULONG (WINAPI *AddRef)(X_XFileMediaObject *pThis); // 0x00 - ULONG (WINAPI *Release)(X_XFileMediaObject *pThis); // 0x04 + ulong_xt (WINAPI *AddRef)(X_XFileMediaObject *pThis); // 0x00 + ulong_xt (WINAPI *Release)(X_XFileMediaObject *pThis); // 0x04 - HRESULT (WINAPI *GetInfo) // 0x08 + hresult_xt (WINAPI *GetInfo) // 0x08 ( X_XFileMediaObject* pThis, XMEDIAINFO* pInfo ); - HRESULT (WINAPI *GetStatus) // 0x0C + hresult_xt (WINAPI *GetStatus) // 0x0C ( X_XFileMediaObject* pThis, LPDWORD pdwStatus ); - HRESULT (WINAPI *Process) // 0x10 + hresult_xt (WINAPI *Process) // 0x10 ( X_XFileMediaObject* pThis, PXMEDIAPACKET pInputBuffer, PXMEDIAPACKET pOutputBuffer ); - HRESULT (WINAPI *Discontinuity)(X_XFileMediaObject *pThis); // 0x14 + hresult_xt (WINAPI *Discontinuity)(X_XFileMediaObject *pThis); // 0x14 DWORD Unknown7; /* HRESULT (WINAPI *Flush)(X_XFileMediaObject *pThis); // 0x18 */ - HRESULT (WINAPI *Seek) // 0x1C + hresult_xt (WINAPI *Seek) // 0x1C ( X_XFileMediaObject* pThis, - LONG lOffset, - DWORD dwOrigin, + long_xt lOffset, + dword_xt dwOrigin, LPDWORD pdwAbsolute ); /* @@ -366,7 +365,7 @@ extern "C" { // ****************************************************************** // * patch: DirectSoundCreate // ****************************************************************** -HRESULT WINAPI EMUPATCH(DirectSoundCreate) +xbox::hresult_xt WINAPI EMUPATCH(DirectSoundCreate) ( LPVOID pguidDeviceId, LPDIRECTSOUND8 *ppDirectSound, @@ -376,12 +375,12 @@ HRESULT WINAPI EMUPATCH(DirectSoundCreate) // ****************************************************************** // * patch: DirectSoundDoWork // ****************************************************************** -VOID WINAPI EMUPATCH(DirectSoundDoWork)(); +xbox::void_xt WINAPI EMUPATCH(DirectSoundDoWork)(); // ****************************************************************** // * patch: IDirectSound_AddRef // ****************************************************************** -ULONG WINAPI EMUPATCH(IDirectSound_AddRef) +xbox::ulong_xt WINAPI EMUPATCH(IDirectSound_AddRef) ( LPDIRECTSOUND8 pThis ); @@ -389,7 +388,7 @@ ULONG WINAPI EMUPATCH(IDirectSound_AddRef) // ****************************************************************** // * patch: IDirectSound_Release // ****************************************************************** -ULONG WINAPI EMUPATCH(IDirectSound_Release) +xbox::ulong_xt WINAPI EMUPATCH(IDirectSound_Release) ( LPDIRECTSOUND8 pThis ); @@ -397,7 +396,7 @@ ULONG WINAPI EMUPATCH(IDirectSound_Release) // ****************************************************************** // * patch: CDirectSound_GetSpeakerConfig // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSound_GetSpeakerConfig) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSound_GetSpeakerConfig) ( X_CDirectSound* pThis, PDWORD pdwSpeakerConfig @@ -406,7 +405,7 @@ HRESULT WINAPI EMUPATCH(CDirectSound_GetSpeakerConfig) // ****************************************************************** // * patch: IDirectSound_SynchPlayback // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_SynchPlayback) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_SynchPlayback) ( LPDIRECTSOUND8 pThis ); @@ -414,11 +413,11 @@ HRESULT WINAPI EMUPATCH(IDirectSound_SynchPlayback) // ****************************************************************** // * patch: IDirectSound_DownloadEffectsImage // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_DownloadEffectsImage) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_DownloadEffectsImage) ( LPDIRECTSOUND8 pThis, LPCVOID pvImageBuffer, - DWORD dwImageSize, + dword_xt dwImageSize, PVOID pImageLoc, // TODO: Use this param PVOID *ppImageDesc // TODO: Use this param ); @@ -426,91 +425,91 @@ HRESULT WINAPI EMUPATCH(IDirectSound_DownloadEffectsImage) // ****************************************************************** // * patch: IDirectSound_SetOrientation // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_SetOrientation) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_SetOrientation) ( LPDIRECTSOUND8 pThis, - FLOAT xFront, - FLOAT yFront, - FLOAT zFront, - FLOAT xTop, - FLOAT yTop, - FLOAT zTop, - DWORD dwApply + float_xt xFront, + float_xt yFront, + float_xt zFront, + float_xt xTop, + float_xt yTop, + float_xt zTop, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSound_SetDistanceFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_SetDistanceFactor) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_SetDistanceFactor) ( LPDIRECTSOUND8 pThis, - FLOAT fDistanceFactor, - DWORD dwApply + float_xt fDistanceFactor, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSound_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_SetRolloffFactor) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_SetRolloffFactor) ( LPDIRECTSOUND8 pThis, - FLOAT fRolloffFactor, - DWORD dwApply + float_xt fRolloffFactor, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSound_SetDopplerFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_SetDopplerFactor) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_SetDopplerFactor) ( LPDIRECTSOUND8 pThis, - FLOAT fDopplerFactor, - DWORD dwApply + float_xt fDopplerFactor, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSound_SetI3DL2Listener // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_SetI3DL2Listener) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_SetI3DL2Listener) ( LPDIRECTSOUND8 pThis, X_DSI3DL2LISTENER *pds3dl, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSound_SetMixBinHeadroom // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_SetMixBinHeadroom) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_SetMixBinHeadroom) ( LPDIRECTSOUND8 pThis, - DWORD dwMixBinMask, - DWORD dwHeadroom + dword_xt dwMixBinMask, + dword_xt dwHeadroom ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetMixBins // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetMixBins) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetMixBins) ( XbHybridDSBuffer* pHybridThis, - DWORD dwMixBinMask + dword_xt dwMixBinMask ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetMixBinVolumes_12 // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes_12) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes_12) ( XbHybridDSBuffer* pHybridThis, - DWORD dwMixBinMask, - const LONG* alVolumes + dword_xt dwMixBinMask, + const long_xt* alVolumes ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetMixBinVolumes_12 // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes_8) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes_8) ( XbHybridDSBuffer* pHybridThis, X_LPDSMIXBINS pMixBins @@ -519,41 +518,41 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes_8) // ****************************************************************** // * patch: IDirectSound_SetPosition // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_SetPosition) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_SetPosition) ( LPDIRECTSOUND8 pThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSound_SetVelocity // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_SetVelocity) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_SetVelocity) ( LPDIRECTSOUND8 pThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSound_SetAllParameters // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_SetAllParameters) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_SetAllParameters) ( LPDIRECTSOUND8 pThis, LPCDS3DLISTENER pDS3DListenerParameters, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSound_CommitDeferredSettings // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSound_CommitDeferredSettings) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSound_CommitDeferredSettings) ( X_CDirectSound* pThis ); @@ -561,7 +560,7 @@ HRESULT WINAPI EMUPATCH(CDirectSound_CommitDeferredSettings) // ****************************************************************** // * patch: IDirectSound_CreateSoundBuffer // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_CreateSoundBuffer) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_CreateSoundBuffer) ( LPDIRECTSOUND8 pThis, X_DSBUFFERDESC* pdsbd, @@ -572,7 +571,7 @@ HRESULT WINAPI EMUPATCH(IDirectSound_CreateSoundBuffer) // ****************************************************************** // * patch: DirectSoundCreateBuffer // ****************************************************************** -HRESULT WINAPI EMUPATCH(DirectSoundCreateBuffer) +xbox::hresult_xt WINAPI EMUPATCH(DirectSoundCreateBuffer) ( X_DSBUFFERDESC* pdsbd, XbHybridDSBuffer** ppBuffer @@ -581,72 +580,72 @@ HRESULT WINAPI EMUPATCH(DirectSoundCreateBuffer) // ****************************************************************** // * patch: IDirectSoundBuffer_SetBufferData // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetBufferData) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetBufferData) ( XbHybridDSBuffer* pHybridThis, LPVOID pvBufferData, - DWORD dwBufferBytes + dword_xt dwBufferBytes ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetPlayRegion // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetPlayRegion) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetPlayRegion) ( XbHybridDSBuffer* pHybridThis, - DWORD dwPlayStart, - DWORD dwPlayLength + dword_xt dwPlayStart, + dword_xt dwPlayLength ); // ****************************************************************** // * patch: IDirectSoundBuffer_Lock // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_Lock) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_Lock) ( XbHybridDSBuffer* pHybridThis, - DWORD dwOffset, - DWORD dwBytes, + dword_xt dwOffset, + dword_xt dwBytes, LPVOID* ppvAudioPtr1, LPDWORD pdwAudioBytes1, LPVOID* ppvAudioPtr2, LPDWORD pdwAudioBytes2, - DWORD dwFlags + dword_xt dwFlags ); // ****************************************************************** // * patch: IDirectSoundBuffer_Unlock // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_Unlock) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_Unlock) ( XbHybridDSBuffer* pHybridThis, LPVOID ppvAudioPtr1, - DWORD pdwAudioBytes1, + dword_xt pdwAudioBytes1, LPVOID ppvAudioPtr2, - DWORD pdwAudioBytes2 + dword_xt pdwAudioBytes2 ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetHeadroom // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetHeadroom) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetHeadroom) ( XbHybridDSBuffer* pHybridThis, - DWORD dwHeadroom + dword_xt dwHeadroom ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetLoopRegion // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetLoopRegion) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetLoopRegion) ( XbHybridDSBuffer* pHybridThis, - DWORD dwLoopStart, - DWORD dwLoopLength + dword_xt dwLoopStart, + dword_xt dwLoopLength ); // ****************************************************************** // * patch: IDirectSoundBuffer_Release // ****************************************************************** -ULONG WINAPI EMUPATCH(IDirectSoundBuffer_Release) +xbox::ulong_xt WINAPI EMUPATCH(IDirectSoundBuffer_Release) ( XbHybridDSBuffer* pHybridThis ); @@ -654,16 +653,16 @@ ULONG WINAPI EMUPATCH(IDirectSoundBuffer_Release) // ****************************************************************** // * patch: IDirectSoundBuffer_SetPitch // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetPitch) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetPitch) ( XbHybridDSBuffer* pHybridThis, - LONG lPitch + long_xt lPitch ); // ****************************************************************** // * patch: IDirectSoundBuffer_GetStatus // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_GetStatus) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_GetStatus) ( XbHybridDSBuffer* pHybridThis, LPDWORD pdwStatus @@ -672,25 +671,25 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_GetStatus) // ****************************************************************** // * patch: IDirectSoundBuffer_SetVolume // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetVolume) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetVolume) ( XbHybridDSBuffer* pHybridThis, - LONG lVolume + long_xt lVolume ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetCurrentPosition // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetCurrentPosition) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetCurrentPosition) ( XbHybridDSBuffer* pHybridThis, - DWORD dwNewPosition + dword_xt dwNewPosition ); // ****************************************************************** // * patch: IDirectSoundBuffer_GetCurrentPosition // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_GetCurrentPosition) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_GetCurrentPosition) ( XbHybridDSBuffer* pHybridThis, PDWORD pdwCurrentPlayCursor, @@ -700,7 +699,7 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_GetCurrentPosition) // ****************************************************************** // * patch: IDirectSoundBuffer_Stop // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_Stop) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_Stop) ( XbHybridDSBuffer* pHybridThis ); @@ -708,56 +707,56 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_Stop) // ****************************************************************** // * patch: IDirectSoundBuffer_StopEx // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_StopEx) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_StopEx) ( XbHybridDSBuffer* pHybridThis, REFERENCE_TIME rtTimeStamp, - DWORD dwFlags + dword_xt dwFlags ); // ****************************************************************** // * patch: IDirectSoundBuffer_Play // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_Play) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_Play) ( XbHybridDSBuffer* pHybridThis, - DWORD dwReserved1, - DWORD dwReserved2, - DWORD dwFlags + dword_xt dwReserved1, + dword_xt dwReserved2, + dword_xt dwFlags ); // ****************************************************************** // * patch: IDirectSoundBuffer_PlayEx // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_PlayEx) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_PlayEx) ( XbHybridDSBuffer* pHybridThis, REFERENCE_TIME rtTimeStamp, - DWORD dwFlags + dword_xt dwFlags ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetVolume // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetVolume) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetVolume) ( XbHybridDSBuffer* pHybridThis, - LONG lVolume + long_xt lVolume ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetFrequency // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetFrequency) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetFrequency) ( XbHybridDSBuffer* pHybridThis, - DWORD dwFrequency + dword_xt dwFrequency ); // ****************************************************************** // * patch: DirectSoundCreateStream // ****************************************************************** -HRESULT WINAPI EMUPATCH(DirectSoundCreateStream) +xbox::hresult_xt WINAPI EMUPATCH(DirectSoundCreateStream) ( X_DSSTREAMDESC* pdssd, X_CDirectSoundStream** ppStream @@ -766,7 +765,7 @@ HRESULT WINAPI EMUPATCH(DirectSoundCreateStream) // ****************************************************************** // * patch: IDirectSound_CreateSoundStream // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_CreateSoundStream) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_CreateSoundStream) ( LPDIRECTSOUND8 pThis, X_DSSTREAMDESC* pdssd, @@ -777,32 +776,32 @@ HRESULT WINAPI EMUPATCH(IDirectSound_CreateSoundStream) // ****************************************************************** // * patch: CMcpxStream_Dummy_0x10 // ****************************************************************** -VOID WINAPI EMUPATCH(CMcpxStream_Dummy_0x10)(DWORD dwDummy1, DWORD dwDummy2); +xbox::void_xt WINAPI EMUPATCH(CMcpxStream_Dummy_0x10)(dword_xt dwDummy1, dword_xt dwDummy2); // ****************************************************************** // * patch: CDirectSoundStream_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetRolloffFactor) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetRolloffFactor) ( X_CDirectSoundStream *pThis, - FLOAT fRolloffFactor, - DWORD dwApply + float_xt fRolloffFactor, + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSoundStream_AddRef // ****************************************************************** -ULONG WINAPI EMUPATCH(CDirectSoundStream_AddRef)(X_CDirectSoundStream *pThis); +xbox::ulong_xt WINAPI EMUPATCH(CDirectSoundStream_AddRef)(X_CDirectSoundStream *pThis); // ****************************************************************** // * patch: CDirectSoundStream_Release // ****************************************************************** -ULONG WINAPI EMUPATCH(CDirectSoundStream_Release)(X_CDirectSoundStream *pThis); +xbox::ulong_xt WINAPI EMUPATCH(CDirectSoundStream_Release)(X_CDirectSoundStream *pThis); // ****************************************************************** // * CDirectSoundStream_GetInfo // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_GetInfo) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_GetInfo) ( X_CDirectSoundStream* pThis, LPXMEDIAINFO pInfo @@ -811,7 +810,7 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_GetInfo) // ****************************************************************** // * patch: CDirectSoundStream_GetStatus // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_GetStatus) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_GetStatus) ( X_CDirectSoundStream* pThis, LPDWORD pdwStatus @@ -820,7 +819,7 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_GetStatus) // ****************************************************************** // * patch: CDirectSoundStream_Process // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_Process) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_Process) ( X_CDirectSoundStream* pThis, PXMEDIAPACKET pInputBuffer, @@ -830,17 +829,17 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_Process) // ****************************************************************** // * patch: CDirectSoundStream_Discontinuity // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_Discontinuity)(X_CDirectSoundStream *pThis); +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_Discontinuity)(X_CDirectSoundStream *pThis); // ****************************************************************** // * patch: CDirectSoundStream_Flush // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_Flush)(X_CDirectSoundStream *pThis); +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_Flush)(X_CDirectSoundStream *pThis); // ****************************************************************** // * patch: CDirectSound_SynchPlayback // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSound_SynchPlayback) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSound_SynchPlayback) ( LPDIRECTSOUND8 pThis ); @@ -848,269 +847,269 @@ HRESULT WINAPI EMUPATCH(CDirectSound_SynchPlayback) // ****************************************************************** // * patch: CDirectSoundStream_Pause // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_Pause) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_Pause) ( X_CDirectSoundStream* pThis, - DWORD dwPause + dword_xt dwPause ); // ****************************************************************** // * patch: CDirectSoundStream_SetHeadroom // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetHeadroom) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetHeadroom) ( X_CDirectSoundStream* pThis, - DWORD dwHeadroom + dword_xt dwHeadroom ); // ****************************************************************** // * patch: CDirectSoundStream_SetAllParameters // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetAllParameters) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetAllParameters) ( X_CDirectSoundStream* pThis, X_DS3DBUFFER* pc3DBufferParameters, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSoundStream_SetConeAngles // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetConeAngles) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetConeAngles) ( X_CDirectSoundStream* pThis, - DWORD dwInsideConeAngle, - DWORD dwOutsideConeAngle, - DWORD dwApply + dword_xt dwInsideConeAngle, + dword_xt dwOutsideConeAngle, + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSoundStream_SetConeOutsideVolume // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetConeOutsideVolume) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetConeOutsideVolume) ( X_CDirectSoundStream* pThis, - LONG lConeOutsideVolume, - DWORD dwApply + long_xt lConeOutsideVolume, + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSoundStream_SetMaxDistance // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMaxDistance) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetMaxDistance) ( X_CDirectSoundStream* pThis, D3DVALUE fMaxDistance, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSoundStream_SetMinDistance // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMinDistance) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetMinDistance) ( X_CDirectSoundStream* pThis, D3DVALUE fMinDistance, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSoundStream_SetVelocity // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetVelocity) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetVelocity) ( X_CDirectSoundStream* pThis, D3DVALUE x, D3DVALUE y, D3DVALUE z, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSoundStream_SetConeOrientation // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetConeOrientation) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetConeOrientation) ( X_CDirectSoundStream* pThis, D3DVALUE x, D3DVALUE y, D3DVALUE z, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSoundStream_SetPosition // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetPosition) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetPosition) ( X_CDirectSoundStream* pThis, D3DVALUE x, D3DVALUE y, D3DVALUE z, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSoundStream_SetFrequency // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetFrequency) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetFrequency) ( X_CDirectSoundStream* pThis, - DWORD dwFrequency + dword_xt dwFrequency ); // ****************************************************************** // * patch: CDirectSoundStream_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetI3DL2Source) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetI3DL2Source) ( X_CDirectSoundStream* pThis, X_DSI3DL2BUFFER* pds3db, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSoundStream_SetMixBins // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMixBins) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetMixBins) ( X_CDirectSoundStream* pThis, - DWORD dwMixBinMask + dword_xt dwMixBinMask ); // s+ // ****************************************************************** // * patch: IDirectSoundBuffer_SetMaxDistance // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetMaxDistance) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetMaxDistance) ( XbHybridDSBuffer* pHybridThis, - FLOAT flMaxDistance, - DWORD dwApply + float_xt flMaxDistance, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetMinDistance // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetMinDistance) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetMinDistance) ( XbHybridDSBuffer* pHybridThis, - FLOAT flMaxDistance, - DWORD dwApply + float_xt flMaxDistance, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetRolloffFactor) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetRolloffFactor) ( XbHybridDSBuffer* pHybridThis, - FLOAT flRolloffFactor, - DWORD dwApply + float_xt flRolloffFactor, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetDistanceFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetDistanceFactor) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetDistanceFactor) ( XbHybridDSBuffer* pHybridThis, - FLOAT flDistanceFactor, - DWORD dwApply + float_xt flDistanceFactor, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetConeAngles // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetConeAngles) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetConeAngles) ( XbHybridDSBuffer* pHybridThis, - DWORD dwInsideConeAngle, - DWORD dwOutsideConeAngle, - DWORD dwApply + dword_xt dwInsideConeAngle, + dword_xt dwOutsideConeAngle, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetConeOrientation // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetConeOrientation) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetConeOrientation) ( XbHybridDSBuffer* pHybridThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetConeOutsideVolume // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetConeOutsideVolume) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetConeOutsideVolume) ( XbHybridDSBuffer* pHybridThis, - LONG lConeOutsideVolume, - DWORD dwApply + long_xt lConeOutsideVolume, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetPosition // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetPosition) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetPosition) ( XbHybridDSBuffer* pHybridThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetVelocity // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetVelocity) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetVelocity) ( XbHybridDSBuffer* pHybridThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetDopplerFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetDopplerFactor) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetDopplerFactor) ( XbHybridDSBuffer* pHybridThis, - FLOAT flDopplerFactor, - DWORD dwApply + float_xt flDopplerFactor, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetI3DL2Source) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetI3DL2Source) ( XbHybridDSBuffer* pHybridThis, X_DSI3DL2BUFFER* pds3db, - DWORD dwApply + dword_xt dwApply ); // +s // ****************************************************************** // * patch: IDirectSoundBuffer_SetMode // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetMode) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetMode) ( XbHybridDSBuffer* pHybridThis, - DWORD dwMode, - DWORD dwApply + dword_xt dwMode, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetFormat // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetFormat) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetFormat) ( XbHybridDSBuffer* pHybridThis, LPCWAVEFORMATEX pwfxFormat @@ -1139,7 +1138,7 @@ void WINAPI EMUPATCH(DirectSoundUseLightHRTF4Channel)(void); // ****************************************************************** // * patch: IDirectSoundBuffer_SetLFO // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetLFO) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetLFO) ( XbHybridDSBuffer* pHybridThis, LPCDSLFODESC pLFODesc @@ -1148,7 +1147,7 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetLFO) // ****************************************************************** // * patch: CDirectSoundStream_SetLFO // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetLFO) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetLFO) ( X_CDirectSoundStream *pThis, LPCDSLFODESC pLFODesc @@ -1157,46 +1156,46 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetLFO) // ****************************************************************** // * patch: XAudioCreateAdpcmFormat // NOTE: Not require to patch // ****************************************************************** -VOID WINAPI EMUPATCH(XAudioCreateAdpcmFormat) +xbox::void_xt WINAPI EMUPATCH(XAudioCreateAdpcmFormat) ( - WORD nChannels, - DWORD nSamplesPerSec, + word_xt nChannels, + dword_xt nSamplesPerSec, OUT LPXBOXADPCMWAVEFORMAT pwfx ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetRolloffCurve // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetRolloffCurve) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetRolloffCurve) ( XbHybridDSBuffer* pHybridThis, - const FLOAT* pflPoints, - DWORD dwPointCount, - DWORD dwApply + const float_xt* pflPoints, + dword_xt dwPointCount, + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSoundStream_SetVolume // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetVolume) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetVolume) ( X_CDirectSoundStream* pStream, - LONG lVolume + long_xt lVolume ); // ****************************************************************** // * patch: IDirectSound_EnableHeadphones // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_EnableHeadphones) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_EnableHeadphones) ( LPDIRECTSOUND8 pThis, - BOOL fEnabled + bool_xt fEnabled ); // ****************************************************************** // * patch: IDirectSoundBuffer_AddRef // ****************************************************************** -ULONG WINAPI EMUPATCH(IDirectSoundBuffer_AddRef) +xbox::ulong_xt WINAPI EMUPATCH(IDirectSoundBuffer_AddRef) ( XbHybridDSBuffer* pHybridThis ); @@ -1204,36 +1203,36 @@ ULONG WINAPI EMUPATCH(IDirectSoundBuffer_AddRef) // ****************************************************************** // * patch: IDirectSoundBuffer_Pause // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_Pause) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_Pause) ( XbHybridDSBuffer* pHybridThis, - DWORD dwPause + dword_xt dwPause ); // ****************************************************************** // * patch: IDirectSoundBuffer_PauseEx // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_PauseEx) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_PauseEx) ( XbHybridDSBuffer* pHybridThis, REFERENCE_TIME rtTimestamp, - DWORD dwPause + dword_xt dwPause ); // ****************************************************************** // * patch: IDirectSound_GetOutputLevels // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_GetOutputLevels) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_GetOutputLevels) ( LPDIRECTSOUND8* pThis, X_DSOUTPUTLEVELS* pOutputLevels, - BOOL bResetPeakValues + bool_xt bResetPeakValues ); // ****************************************************************** // * patch: CDirectSoundStream_SetEG // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetEG) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetEG) ( X_CDirectSoundStream* pThis, X_DSENVOLOPEDESC* pEnvelopeDesc @@ -1242,38 +1241,38 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetEG) // ****************************************************************** // * patch: CDirectSoundStream_FlushEx // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_FlushEx) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_FlushEx) ( X_CDirectSoundStream* pThis, REFERENCE_TIME rtTimeStamp, - DWORD dwFlags + dword_xt dwFlags ); // ****************************************************************** // * patch: CDirectSoundStream_SetMode // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMode) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetMode) ( X_CDirectSoundStream* pStream, - DWORD dwMode, - DWORD dwApply + dword_xt dwMode, + dword_xt dwApply ); // ****************************************************************** // * patch: XAudioDownloadEffectsImage // ****************************************************************** -HRESULT WINAPI EMUPATCH(XAudioDownloadEffectsImage) +xbox::hresult_xt WINAPI EMUPATCH(XAudioDownloadEffectsImage) ( LPCSTR pszImageName, LPVOID pImageLoc, - DWORD dwFlags, + dword_xt dwFlags, LPVOID* ppImageDesc ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetFilter // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetFilter) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetFilter) ( XbHybridDSBuffer* pHybridThis, X_DSFILTERDESC* pFilterDesc @@ -1282,7 +1281,7 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetFilter) // ****************************************************************** // * patch: CDirectSoundStream_SetFilter // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetFilter) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetFilter) ( X_CDirectSoundStream* pThis, X_DSFILTERDESC* pFilterDesc @@ -1291,7 +1290,7 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetFilter) // ****************************************************************** // * patch: IDirectSound_GetCaps // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_GetCaps) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_GetCaps) ( X_CDirectSound* pThis, X_DSCAPS* pDSCaps @@ -1300,31 +1299,31 @@ HRESULT WINAPI EMUPATCH(IDirectSound_GetCaps) // ****************************************************************** // * patch: CDirectSoundStream_SetPitch // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetPitch) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetPitch) ( X_CDirectSoundStream* pThis, - LONG lPitch + long_xt lPitch ); // ****************************************************************** // * patch: DirectSoundGetSampleTime // ****************************************************************** -DWORD WINAPI EMUPATCH(DirectSoundGetSampleTime)(); +xbox::dword_xt WINAPI EMUPATCH(DirectSoundGetSampleTime)(); // ****************************************************************** // * patch: CDirectSoundStream_SetMixBinVolumes_12 // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMixBinVolumes_12) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetMixBinVolumes_12) ( X_CDirectSoundStream* pThis, - DWORD dwMixBinMask, - const LONG* alVolumes + dword_xt dwMixBinMask, + const long_xt* alVolumes ); // ****************************************************************** // * patch: CDirectSoundStream_SetMixBinVolumes_8 // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMixBinVolumes_8) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetMixBinVolumes_8) ( X_CDirectSoundStream* pThis, X_LPDSMIXBINS pMixBins @@ -1333,27 +1332,27 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetMixBinVolumes_8) // ****************************************************************** // * patch: CDirectSoundStream_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetI3DL2Source) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetI3DL2Source) ( X_CDirectSoundStream* pThis, X_DSI3DL2BUFFER* pds3db, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetAllParameters) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetAllParameters) ( XbHybridDSBuffer* pHybridThis, X_DS3DBUFFER* pc3DBufferParameters, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * patch: CDirectSoundStream::SetFormat // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetFormat) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetFormat) ( X_CDirectSoundStream* pThis, LPCWAVEFORMATEX pwfxFormat @@ -1362,7 +1361,7 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetFormat) // ****************************************************************** // * patch: IDirectSoundBuffer_SetOutputBuffer // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetOutputBuffer) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetOutputBuffer) ( XbHybridDSBuffer* pHybridThis, XbHybridDSBuffer* pOutputBuffer @@ -1371,7 +1370,7 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetOutputBuffer) // ****************************************************************** // * patch: CDirectSoundStream_SetOutputBuffer // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetOutputBuffer) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetOutputBuffer) ( X_CDirectSoundStream* pThis, XbHybridDSBuffer* pOutputBuffer @@ -1380,7 +1379,7 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetOutputBuffer) // ****************************************************************** // * patch: XFileCreaeMediaObjectEx // ****************************************************************** -HRESULT WINAPI EMUPATCH(XFileCreateMediaObjectEx) +xbox::hresult_xt WINAPI EMUPATCH(XFileCreateMediaObjectEx) ( HANDLE hFile, void** ppMediaObject @@ -1389,7 +1388,7 @@ HRESULT WINAPI EMUPATCH(XFileCreateMediaObjectEx) // ****************************************************************** // * patch: XWaveFileCreateMediaObject // ****************************************************************** -HRESULT WINAPI EMUPATCH(XWaveFileCreateMediaObject) +xbox::hresult_xt WINAPI EMUPATCH(XWaveFileCreateMediaObject) ( LPCSTR pszFileName, LPCWAVEFORMATEX *ppwfxFormat, @@ -1399,7 +1398,7 @@ HRESULT WINAPI EMUPATCH(XWaveFileCreateMediaObject) // ****************************************************************** // * patch: IDirectSoundBuffer_SetEG // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetEG) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetEG) ( XbHybridDSBuffer* pHybridThis, X_DSENVOLOPEDESC* pEnvelopeDesc @@ -1408,53 +1407,53 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetEG) // ****************************************************************** // * patch: IDirectSound_GetEffectData // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_GetEffectData) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_GetEffectData) ( X_CDirectSound* pThis, - DWORD dwEffectIndex, - DWORD dwOffset, + dword_xt dwEffectIndex, + dword_xt dwOffset, LPVOID pvData, - DWORD dwDataSize + dword_xt dwDataSize ); // ****************************************************************** // * patch: IDirectSoundBuffer_SetNotificationPositions // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_SetNotificationPositions) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_SetNotificationPositions) ( XbHybridDSBuffer* pHybridThis, - DWORD dwNotifyCount, + dword_xt dwNotifyCount, LPCDSBPOSITIONNOTIFY paNotifies ); // ****************************************************************** // * patch: CDirectSoundStream::SetRolloffCurve // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetRolloffCurve) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetRolloffCurve) ( X_CDirectSoundStream* pThis, - const FLOAT* pflPoints, - DWORD dwPointCount, - DWORD dwApply + const float_xt* pflPoints, + dword_xt dwPointCount, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSound_SetEffectData // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_SetEffectData) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_SetEffectData) ( LPVOID pThis, - DWORD dwEffectIndex, - DWORD dwOffset, + dword_xt dwEffectIndex, + dword_xt dwOffset, LPCVOID pvData, - DWORD dwDataSize, - DWORD dwApply + dword_xt dwDataSize, + dword_xt dwApply ); // ****************************************************************** // * patch: IDirectSoundBuffer_Use3DVoiceData // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_Use3DVoiceData) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_Use3DVoiceData) ( XbHybridDSBuffer* pHybridThis, LPUNKNOWN pUnknown @@ -1463,33 +1462,33 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_Use3DVoiceData) // ****************************************************************** // * patch: XFileCreateMediaObjectAsync // ****************************************************************** -HRESULT WINAPI EMUPATCH(XFileCreateMediaObjectAsync) +xbox::hresult_xt WINAPI EMUPATCH(XFileCreateMediaObjectAsync) ( HANDLE hFile, - DWORD dwMaxPackets, + dword_xt dwMaxPackets, void **ppMediaObject ); // ****************************************************************** // * patch: XFileMediaObject_Seek // ****************************************************************** -HRESULT WINAPI EMUPATCH(XFileMediaObject_Seek) +xbox::hresult_xt WINAPI EMUPATCH(XFileMediaObject_Seek) ( X_XFileMediaObject* pThis, - LONG lOffset, - DWORD dwOrigin, + long_xt lOffset, + dword_xt dwOrigin, LPDWORD pdwAbsolute ); // ****************************************************************** // * patch: XFileMediaObject_DoWork // ****************************************************************** -VOID WINAPI EMUPATCH(XFileMediaObject_DoWork)(X_XFileMediaObject* pThis); +xbox::void_xt WINAPI EMUPATCH(XFileMediaObject_DoWork)(X_XFileMediaObject* pThis); // ****************************************************************** // * patch: XFileMediaObject_GetStatus // ****************************************************************** -HRESULT WINAPI EMUPATCH(XFileMediaObject_GetStatus) +xbox::hresult_xt WINAPI EMUPATCH(XFileMediaObject_GetStatus) ( X_XFileMediaObject* pThis, LPDWORD pdwStatus @@ -1498,7 +1497,7 @@ HRESULT WINAPI EMUPATCH(XFileMediaObject_GetStatus) // ****************************************************************** // * patch: XFileMediaObject_GetInfo // ****************************************************************** -HRESULT WINAPI EMUPATCH(XFileMediaObject_GetInfo) +xbox::hresult_xt WINAPI EMUPATCH(XFileMediaObject_GetInfo) ( X_XFileMediaObject *pThis, XMEDIAINFO *pInfo @@ -1507,7 +1506,7 @@ HRESULT WINAPI EMUPATCH(XFileMediaObject_GetInfo) // ****************************************************************** // * patch: XFileMediaObject_Process // ****************************************************************** -HRESULT WINAPI EMUPATCH(XFileMediaObject_Process) +xbox::hresult_xt WINAPI EMUPATCH(XFileMediaObject_Process) ( X_XFileMediaObject *pThis, LPXMEDIAPACKET pInputBuffer, @@ -1517,61 +1516,61 @@ HRESULT WINAPI EMUPATCH(XFileMediaObject_Process) // ****************************************************************** // * patch: XFileMediaObject_AddRef // ****************************************************************** -ULONG WINAPI EMUPATCH(XFileMediaObject_AddRef)(X_XFileMediaObject *pThis); +xbox::ulong_xt WINAPI EMUPATCH(XFileMediaObject_AddRef)(X_XFileMediaObject *pThis); // ****************************************************************** // * patch: XFileMediaObject_Release // ****************************************************************** -ULONG WINAPI EMUPATCH(XFileMediaObject_Release)(X_XFileMediaObject *pThis); +xbox::ulong_xt WINAPI EMUPATCH(XFileMediaObject_Release)(X_XFileMediaObject *pThis); // ****************************************************************** // * patch: XFileMediaObject_Discontinuity // ****************************************************************** -HRESULT WINAPI EMUPATCH(XFileMediaObject_Discontinuity)(X_XFileMediaObject *pThis); +xbox::hresult_xt WINAPI EMUPATCH(XFileMediaObject_Discontinuity)(X_XFileMediaObject *pThis); // ****************************************************************** // * patch: IDirectSound_GetSpeakerConfig // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_GetSpeakerConfig) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_GetSpeakerConfig) (X_CDirectSound* pThis, OUT LPDWORD* pdwSpeakerConfig); // ****************************************************************** // * patch: IDirectSound_CommitDeferredSettings // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_CommitDeferredSettings) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_CommitDeferredSettings) (X_CDirectSound* pThis); // ****************************************************************** // * patch: IDirectSound_CommitEffectData // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSound_CommitEffectData) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSound_CommitEffectData) (X_CDirectSound* pThis); // ****************************************************************** // * patch: CDirectSoundStream_PauseEx // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_PauseEx) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_PauseEx) ( X_CDirectSoundStream *pThis, REFERENCE_TIME rtTimestamp, - DWORD dwPause); + dword_xt dwPause); // ****************************************************************** // * patch: XFileCreaeMediaObject // ****************************************************************** -HRESULT WINAPI EMUPATCH(XFileCreateMediaObject) +xbox::hresult_xt WINAPI EMUPATCH(XFileCreateMediaObject) ( LPCSTR pstrFileName, - DWORD dwDesiredAccess, - DWORD dwShareMode, - DWORD dwCreationDisposition, - DWORD dwFlagsAndAttributes, + dword_xt dwDesiredAccess, + dword_xt dwShareMode, + dword_xt dwCreationDisposition, + dword_xt dwFlagsAndAttributes, OUT void** ppMediaObject); // ****************************************************************** // * patch: XWaveFileCreateMediaObjectEx // ****************************************************************** -HRESULT WINAPI EMUPATCH(XWaveFileCreateMediaObjectEx) +xbox::hresult_xt WINAPI EMUPATCH(XWaveFileCreateMediaObjectEx) ( LPCSTR pszFileName, HANDLE hFile, @@ -1580,34 +1579,34 @@ HRESULT WINAPI EMUPATCH(XWaveFileCreateMediaObjectEx) // ****************************************************************** // * patch: XAudioSetEffectData // ****************************************************************** -HRESULT WINAPI EMUPATCH(XAudioSetEffectData) +xbox::hresult_xt WINAPI EMUPATCH(XAudioSetEffectData) ( - DWORD dwEffectIndex, + dword_xt dwEffectIndex, void* pDesc, void* pRawDesc); // ****************************************************************** // * patch: CDirectSoundStream_SetDistanceFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetDistanceFactor) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetDistanceFactor) ( X_CDirectSoundStream* pThis, - FLOAT flDistanceFactor, - DWORD dwApply); + float_xt flDistanceFactor, + dword_xt dwApply); // ****************************************************************** // * patch: CDirectSoundStream_SetDopplerFactor // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_SetDopplerFactor) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_SetDopplerFactor) ( X_CDirectSoundStream* pThis, - FLOAT flDopplerFactor, - DWORD dwApply); + float_xt flDopplerFactor, + dword_xt dwApply); // ****************************************************************** // * patch: IDirectSoundBuffer_GetVoiceProperties // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_GetVoiceProperties) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_GetVoiceProperties) ( XbHybridDSBuffer* pHybridThis, OUT X_DSVOICEPROPS* pVoiceProps); @@ -1615,7 +1614,7 @@ HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_GetVoiceProperties) // ****************************************************************** // * patch: CDirectSoundStream_GetVoiceProperties // ****************************************************************** -HRESULT WINAPI EMUPATCH(CDirectSoundStream_GetVoiceProperties) +xbox::hresult_xt WINAPI EMUPATCH(CDirectSoundStream_GetVoiceProperties) ( X_CDirectSoundStream* pThis, OUT X_DSVOICEPROPS* pVoiceProps); @@ -1623,23 +1622,23 @@ HRESULT WINAPI EMUPATCH(CDirectSoundStream_GetVoiceProperties) // ****************************************************************** // * patch: IDirectSoundStream_SetVolume // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetVolume) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundStream_SetVolume) ( X_CDirectSoundStream* pThis, - LONG lVolume); + long_xt lVolume); // ****************************************************************** // * patch: IDirectSoundStream_SetPitch // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetPitch) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundStream_SetPitch) ( X_CDirectSoundStream* pThis, - LONG lPitch); + long_xt lPitch); // ****************************************************************** // * patch: IDirectSoundStream_SetLFO // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetLFO) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundStream_SetLFO) ( X_CDirectSoundStream* pThis, LPCDSLFODESC pLFODesc); @@ -1647,7 +1646,7 @@ HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetLFO) // ****************************************************************** // * patch: IDirectSoundStream_SetEG // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetEG) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundStream_SetEG) ( X_CDirectSoundStream* pThis, X_DSENVOLOPEDESC* pEnvelopeDesc); @@ -1655,7 +1654,7 @@ HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetEG) // ****************************************************************** // * patch: IDirectSoundStream_SetFilter // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetFilter) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundStream_SetFilter) ( X_CDirectSoundStream* pThis, X_DSFILTERDESC* pFilterDesc); @@ -1663,70 +1662,70 @@ HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetFilter) // ****************************************************************** // * patch: IDirectSoundStream_SetHeadroom // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetHeadroom) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundStream_SetHeadroom) ( X_CDirectSoundStream* pThis, - DWORD dwHeadroom); + dword_xt dwHeadroom); // ****************************************************************** // * patch: IDirectSoundStream_SetFrequency // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetFrequency) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundStream_SetFrequency) ( X_CDirectSoundStream* pThis, - DWORD dwFrequency); + dword_xt dwFrequency); // ****************************************************************** // * patch: IDirectSoundStream_SetMixBins // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundStream_SetMixBins) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundStream_SetMixBins) ( X_CDirectSoundStream* pThis, - DWORD dwMixBinMask); + dword_xt dwMixBinMask); // ****************************************************************** // * patch: CDirectSound3DCalculator_Calculate3D // ****************************************************************** -VOID WINAPI EMUPATCH(CDirectSound3DCalculator_Calculate3D) +xbox::void_xt WINAPI EMUPATCH(CDirectSound3DCalculator_Calculate3D) ( - DWORD a1, - DWORD a2); + dword_xt a1, + dword_xt a2); // ****************************************************************** // * patch: CDirectSound3DCalculator_GetVoiceData // ****************************************************************** -VOID WINAPI EMUPATCH(CDirectSound3DCalculator_GetVoiceData) +xbox::void_xt WINAPI EMUPATCH(CDirectSound3DCalculator_GetVoiceData) ( - DWORD a1, - DWORD a2, - DWORD a3, - DWORD a4, - DWORD a5); + dword_xt a1, + dword_xt a2, + dword_xt a3, + dword_xt a4, + dword_xt a5); // ****************************************************************** // * patch: IDirectSoundBuffer_Set3DVoiceData // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundBuffer_Set3DVoiceData) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundBuffer_Set3DVoiceData) ( XbHybridDSBuffer* pHybridThis, - DWORD a2); + dword_xt a2); // ****************************************************************** // * patch: IDirectSoundStream_Set3DVoiceData // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundStream_Set3DVoiceData) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundStream_Set3DVoiceData) ( X_CDirectSoundStream* pThis, - DWORD a2 + dword_xt a2 ); // ****************************************************************** // * patch: IDirectSoundStrea,_Use3DVoiceData // ****************************************************************** -HRESULT WINAPI EMUPATCH(IDirectSoundStream_Use3DVoiceData) +xbox::hresult_xt WINAPI EMUPATCH(IDirectSoundStream_Use3DVoiceData) ( X_CDirectSoundStream* pThis, - DWORD a2 + dword_xt a2 ); } // end of extern "C" diff --git a/src/core/hle/DSOUND/DirectSound/DirectSound3DCalculator.cpp b/src/core/hle/DSOUND/DirectSound/DirectSound3DCalculator.cpp index 1f4825b69..e08dedf20 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSound3DCalculator.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSound3DCalculator.cpp @@ -28,7 +28,7 @@ #define LOG_PREFIX CXBXR_MODULE::DS3DCALC -#include +#include #include #include "DirectSoundGlobal.hpp" // Global variables @@ -49,10 +49,10 @@ // ****************************************************************** // * patch: CDirectSound3DCalculator_Calculate3D // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(CDirectSound3DCalculator_Calculate3D) +xbox::void_xt WINAPI xbox::EMUPATCH(CDirectSound3DCalculator_Calculate3D) ( - DWORD a1, - DWORD a2 + dword_xt a1, + dword_xt a2 ) { DSoundMutexGuardLock; @@ -68,13 +68,13 @@ VOID WINAPI xbox::EMUPATCH(CDirectSound3DCalculator_Calculate3D) // ****************************************************************** // * patch: CDirectSound3DCalculator_GetVoiceData // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(CDirectSound3DCalculator_GetVoiceData) +xbox::void_xt WINAPI xbox::EMUPATCH(CDirectSound3DCalculator_GetVoiceData) ( - DWORD a1, - DWORD a2, - DWORD a3, - DWORD a4, - DWORD a5 + dword_xt a1, + dword_xt a2, + dword_xt a3, + dword_xt a4, + dword_xt a5 ) { DSoundMutexGuardLock; diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp index 0bf273573..f8a375c77 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX CXBXR_MODULE::DSBUFFER -#include +#include #include #include "DirectSoundGlobal.hpp" // Global variables @@ -92,7 +92,7 @@ void DirectSoundDoWork_Buffer(xbox::LARGE_INTEGER &time) // ****************************************************************** // * patch: IDirectSoundBuffer_AddRef // ****************************************************************** -ULONG WINAPI xbox::EMUPATCH(IDirectSoundBuffer_AddRef) +xbox::ulong_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_AddRef) ( XbHybridDSBuffer* pHybridThis) { @@ -133,7 +133,7 @@ xbox::EmuDirectSoundBuffer::~EmuDirectSoundBuffer() // ****************************************************************** // * patch: IDirectSoundBuffer_Release // ****************************************************************** -ULONG WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Release) +xbox::ulong_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Release) ( XbHybridDSBuffer* pHybridThis) { @@ -160,7 +160,7 @@ ULONG WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Release) // ****************************************************************** // * patch: DirectSoundCreateBuffer // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(DirectSoundCreateBuffer) +xbox::hresult_xt WINAPI xbox::EMUPATCH(DirectSoundCreateBuffer) ( X_DSBUFFERDESC* pdsbd, OUT XbHybridDSBuffer** ppBuffer) @@ -223,7 +223,7 @@ HRESULT WINAPI xbox::EMUPATCH(DirectSoundCreateBuffer) DSoundBufferRegionSetDefault(pEmuBuffer); // We have to set DSBufferDesc last due to EmuFlags must be either 0 or previously written value to preserve other flags. - GeneratePCMFormat(DSBufferDesc, pdsbd->lpwfxFormat, pdsbd->dwFlags, pEmuBuffer->EmuFlags, pdsbd->dwBufferBytes, + GeneratePCMFormat(DSBufferDesc, pdsbd->lpwfxFormat, (DWORD &)pdsbd->dwFlags, pEmuBuffer->EmuFlags, pdsbd->dwBufferBytes, &pEmuBuffer->X_BufferCache, pEmuBuffer->X_BufferCacheSize, pEmuBuffer->Xb_VoiceProperties, pdsbd->lpMixBinsOutput, pHybridBuffer->p_CDSVoice); pEmuBuffer->EmuBufferDesc = DSBufferDesc; @@ -265,7 +265,7 @@ HRESULT WINAPI xbox::EMUPATCH(DirectSoundCreateBuffer) // ****************************************************************** // * patch: IDirectSound_CreateSoundBuffer // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_CreateSoundBuffer) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_CreateSoundBuffer) ( LPDIRECTSOUND8 pThis, X_DSBUFFERDESC* pdsbd, @@ -286,7 +286,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_CreateSoundBuffer) // ****************************************************************** // * patch: IDirectSoundBuffer_GetCurrentPosition // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_GetCurrentPosition) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_GetCurrentPosition) ( XbHybridDSBuffer* pHybridThis, OUT PDWORD pdwCurrentPlayCursor, @@ -301,7 +301,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_GetCurrentPosition) LOG_FUNC_END; EmuDirectSoundBuffer* pThis = pHybridThis->emuDSBuffer; - HRESULT hRet = HybridDirectSoundBuffer_GetCurrentPosition(pThis->EmuDirectSoundBuffer8, pdwCurrentPlayCursor, pdwCurrentWriteCursor, pThis->EmuFlags); + xbox::hresult_xt hRet = HybridDirectSoundBuffer_GetCurrentPosition(pThis->EmuDirectSoundBuffer8, (::PDWORD)pdwCurrentPlayCursor, (::PDWORD)pdwCurrentWriteCursor, pThis->EmuFlags); LOG_FUNC_BEGIN_ARG_RESULT LOG_FUNC_ARG_RESULT(pdwCurrentPlayCursor) @@ -314,10 +314,10 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_GetCurrentPosition) // ****************************************************************** // * patch: IDirectSoundBuffer_SetCurrentPosition // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetCurrentPosition) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetCurrentPosition) ( XbHybridDSBuffer* pHybridThis, - DWORD dwNewPosition) + dword_xt dwNewPosition) { DSoundMutexGuardLock; @@ -342,7 +342,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetCurrentPosition) // ****************************************************************** // * patch: IDirectSoundBuffer_GetStatus // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_GetStatus) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_GetStatus) ( XbHybridDSBuffer* pHybridThis, OUT LPDWORD pdwStatus) @@ -386,7 +386,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_GetStatus) // ****************************************************************** // * patch: IDirectSoundBuffer_GetVoiceProperties // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_GetVoiceProperties) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_GetVoiceProperties) ( XbHybridDSBuffer* pHybridThis, OUT X_DSVOICEPROPS* pVoiceProps) @@ -412,16 +412,16 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_GetVoiceProperties) // ****************************************************************** // * patch: IDirectSoundBuffer_Lock // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Lock) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Lock) ( XbHybridDSBuffer* pHybridThis, - DWORD dwOffset, - DWORD dwBytes, + dword_xt dwOffset, + dword_xt dwBytes, LPVOID* ppvAudioPtr1, LPDWORD pdwAudioBytes1, LPVOID* ppvAudioPtr2, LPDWORD pdwAudioBytes2, - DWORD dwFlags) + dword_xt dwFlags) { DSoundMutexGuardLock; @@ -500,13 +500,13 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Lock) // ****************************************************************** // * patch: IDirectSoundBuffer_Unlock // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Unlock) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Unlock) ( XbHybridDSBuffer* pHybridThis, LPVOID ppvAudioPtr1, - DWORD pdwAudioBytes1, + dword_xt pdwAudioBytes1, LPVOID ppvAudioPtr2, - DWORD pdwAudioBytes2 + dword_xt pdwAudioBytes2 ) { DSoundMutexGuardLock; @@ -549,10 +549,10 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Unlock) // * patch: IDirectSoundBuffer_Pause // ****************************************************************** // Introduced in XDK 4721 revision. -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Pause) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Pause) ( XbHybridDSBuffer* pHybridThis, - DWORD dwPause) + dword_xt dwPause) { DSoundMutexGuardLock; @@ -581,11 +581,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Pause) // * patch: IDirectSoundBuffer_PauseEx // ****************************************************************** // Introduced in XDK 4721 revision. -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_PauseEx) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_PauseEx) ( XbHybridDSBuffer* pHybridThis, REFERENCE_TIME rtTimestamp, - DWORD dwPause) + dword_xt dwPause) { DSoundMutexGuardLock; @@ -605,12 +605,12 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_PauseEx) // ****************************************************************** // * patch: IDirectSoundBuffer_Play // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Play) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Play) ( XbHybridDSBuffer* pHybridThis, - DWORD dwReserved1, - DWORD dwReserved2, - DWORD dwFlags) + dword_xt dwReserved1, + dword_xt dwReserved2, + dword_xt dwFlags) { DSoundMutexGuardLock; @@ -669,11 +669,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Play) // ****************************************************************** // * patch: IDirectSoundBuffer_PlayEx // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_PlayEx) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_PlayEx) ( XbHybridDSBuffer* pThis, REFERENCE_TIME rtTimeStamp, - DWORD dwFlags) + dword_xt dwFlags) { DSoundMutexGuardLock; @@ -696,11 +696,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_PlayEx) // ****************************************************************** // * patch: IDirectSoundBuffer_SetAllParameters // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetAllParameters) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetAllParameters) ( XbHybridDSBuffer* pHybridThis, X_DS3DBUFFER* pc3DBufferParameters, - DWORD dwApply) + dword_xt dwApply) { DSoundMutexGuardLock; @@ -719,11 +719,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetAllParameters) // ****************************************************************** // * patch: IDirectSoundBuffer_SetBufferData // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetBufferData) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetBufferData) ( XbHybridDSBuffer* pHybridThis, LPVOID pvBufferData, - DWORD dwBufferBytes) + dword_xt dwBufferBytes) { DSoundMutexGuardLock; @@ -804,12 +804,12 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetBufferData) // ****************************************************************** // * patch: IDirectSoundBuffer_SetConeAngles // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetConeAngles) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetConeAngles) ( XbHybridDSBuffer* pHybridThis, - DWORD dwInsideConeAngle, - DWORD dwOutsideConeAngle, - DWORD dwApply) + dword_xt dwInsideConeAngle, + dword_xt dwOutsideConeAngle, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -829,13 +829,13 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetConeAngles) // ****************************************************************** // * patch: IDirectSoundBuffer_SetConeOrientation // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetConeOrientation) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetConeOrientation) ( XbHybridDSBuffer* pHybridThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply) + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -856,11 +856,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetConeOrientation) // ****************************************************************** // * patch: IDirectSoundBuffer_SetConeOutsideVolume // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetConeOutsideVolume) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetConeOutsideVolume) ( XbHybridDSBuffer* pHybridThis, - LONG lConeOutsideVolume, - DWORD dwApply) + long_xt lConeOutsideVolume, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -879,11 +879,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetConeOutsideVolume) // ****************************************************************** // * patch: IDirectSoundBuffer_SetDistanceFactor // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetDistanceFactor) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetDistanceFactor) ( XbHybridDSBuffer* pHybridThis, - FLOAT flDistanceFactor, - DWORD dwApply) + float_xt flDistanceFactor, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -901,11 +901,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetDistanceFactor) // ****************************************************************** // * patch: IDirectSoundBuffer_SetDopplerFactor // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetDopplerFactor) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetDopplerFactor) ( XbHybridDSBuffer* pThis, - FLOAT flDopplerFactor, - DWORD dwApply) + float_xt flDopplerFactor, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -923,7 +923,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetDopplerFactor) // ****************************************************************** // * patch: IDirectSoundBuffer_SetEG // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetEG) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetEG) ( XbHybridDSBuffer* pHybridThis, X_DSENVOLOPEDESC* pEnvelopeDesc) @@ -948,7 +948,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetEG) // ****************************************************************** // * patch: IDirectSoundBuffer_SetFilter // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetFilter) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetFilter) ( XbHybridDSBuffer* pHybridThis, X_DSFILTERDESC* pFilterDesc) @@ -971,7 +971,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetFilter) // ****************************************************************** // * patch: IDirectSoundBuffer_SetFormat // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetFormat) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetFormat) ( XbHybridDSBuffer* pHybridThis, LPCWAVEFORMATEX pwfxFormat) @@ -996,10 +996,10 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetFormat) // ****************************************************************** // * patch: IDirectSoundBuffer_SetFrequency // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetFrequency) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetFrequency) ( XbHybridDSBuffer* pHybridThis, - DWORD dwFrequency) + dword_xt dwFrequency) { DSoundMutexGuardLock; @@ -1018,10 +1018,10 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetFrequency) // ****************************************************************** // * patch: IDirectSoundBuffer_SetHeadroom // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetHeadroom) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetHeadroom) ( XbHybridDSBuffer* pHybridThis, - DWORD dwHeadroom) + dword_xt dwHeadroom) { DSoundMutexGuardLock; @@ -1041,11 +1041,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetHeadroom) // ****************************************************************** // * patch: IDirectSoundBuffer_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetI3DL2Source) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetI3DL2Source) ( XbHybridDSBuffer* pHybridThis, X_DSI3DL2BUFFER* pds3db, - DWORD dwApply) + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1067,7 +1067,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetI3DL2Source) // ****************************************************************** // * patch: IDirectSoundBuffer_SetLFO // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetLFO) //Low Frequency Oscillators +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetLFO) //Low Frequency Oscillators ( XbHybridDSBuffer* pHybridThis, LPCDSLFODESC pLFODesc) @@ -1089,11 +1089,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetLFO) //Low Frequency Oscilla // ****************************************************************** // * patch: IDirectSoundBuffer_SetLoopRegion // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetLoopRegion) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetLoopRegion) ( XbHybridDSBuffer* pHybridThis, - DWORD dwLoopStart, - DWORD dwLoopLength) + dword_xt dwLoopStart, + dword_xt dwLoopLength) { DSoundMutexGuardLock; @@ -1131,11 +1131,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetLoopRegion) // ****************************************************************** // * patch: IDirectSoundBuffer_SetMaxDistance // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMaxDistance) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMaxDistance) ( XbHybridDSBuffer* pHybridThis, - FLOAT flMaxDistance, - DWORD dwApply) + float_xt flMaxDistance, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1154,11 +1154,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMaxDistance) // ****************************************************************** // * patch: IDirectSoundBuffer_SetMinDistance // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMinDistance) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMinDistance) ( XbHybridDSBuffer* pHybridThis, - FLOAT flMinDistance, - DWORD dwApply) + float_xt flMinDistance, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1177,10 +1177,10 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMinDistance) // ****************************************************************** // * patch: IDirectSoundBuffer_SetMixBins // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMixBins) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMixBins) ( XbHybridDSBuffer* pHybridThis, - DWORD dwMixBinMask) + dword_xt dwMixBinMask) { DSoundMutexGuardLock; HRESULT hRet = DS_OK; @@ -1211,11 +1211,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMixBins) // * patch: IDirectSoundBuffer_SetMixBinVolumes_12 // ****************************************************************** // This revision API was used in XDK 3911 until API had changed in XDK 4039. -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes_12) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes_12) ( XbHybridDSBuffer* pHybridThis, - DWORD dwMixBinMask, - const LONG* alVolumes) + dword_xt dwMixBinMask, + const long_xt* alVolumes) { DSoundMutexGuardLock; @@ -1237,7 +1237,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes_12) // * patch: IDirectSoundBuffer_SetMixBinVolumes_8 // ****************************************************************** // This revision is only used in XDK 4039 and higher. -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes_8) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes_8) ( XbHybridDSBuffer* pHybridThis, X_LPDSMIXBINS pMixBins) @@ -1259,11 +1259,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMixBinVolumes_8) // ****************************************************************** // * patch: IDirectSoundBuffer_SetMode // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMode) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMode) ( XbHybridDSBuffer* pHybridThis, - DWORD dwMode, - DWORD dwApply) + dword_xt dwMode, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1282,10 +1282,10 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetMode) // ****************************************************************** // * patch: IDirectSoundBuffer_SetNotificationPositions // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetNotificationPositions) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetNotificationPositions) ( XbHybridDSBuffer* pHybridThis, - DWORD dwNotifyCount, + dword_xt dwNotifyCount, LPCDSBPOSITIONNOTIFY paNotifies) { DSoundMutexGuardLock; @@ -1328,7 +1328,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetNotificationPositions) // ****************************************************************** // * patch: IDirectSoundBuffer_SetOutputBuffer // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetOutputBuffer) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetOutputBuffer) ( XbHybridDSBuffer* pHybridThis, XbHybridDSBuffer* pOutputBuffer) @@ -1352,10 +1352,10 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetOutputBuffer) // ****************************************************************** // * patch: IDirectSoundBuffer_SetPitch // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetPitch) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetPitch) ( XbHybridDSBuffer* pHybridThis, - LONG lPitch) + long_xt lPitch) { DSoundMutexGuardLock; @@ -1374,11 +1374,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetPitch) // ****************************************************************** // * patch: IDirectSoundBuffer_SetPlayRegion // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetPlayRegion) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetPlayRegion) ( XbHybridDSBuffer* pHybridThis, - DWORD dwPlayStart, - DWORD dwPlayLength) + dword_xt dwPlayStart, + dword_xt dwPlayLength) { DSoundMutexGuardLock; @@ -1419,13 +1419,13 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetPlayRegion) // ****************************************************************** // * patch: IDirectSoundBuffer_SetPosition // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetPosition) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetPosition) ( XbHybridDSBuffer* pHybridThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply) + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1446,12 +1446,12 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetPosition) // ****************************************************************** // * patch: IDirectSoundBuffer_SetRolloffCurve // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetRolloffCurve) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetRolloffCurve) ( XbHybridDSBuffer* pHybridThis, - const FLOAT* pflPoints, - DWORD dwPointCount, - DWORD dwApply) + const float_xt* pflPoints, + dword_xt dwPointCount, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1472,11 +1472,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetRolloffCurve) // ****************************************************************** // * patch: IDirectSoundBuffer_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetRolloffFactor) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetRolloffFactor) ( XbHybridDSBuffer* pHybridThis, - FLOAT flRolloffFactor, - DWORD dwApply) + float_xt flRolloffFactor, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1496,13 +1496,13 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetRolloffFactor) // ****************************************************************** // * patch: IDirectSoundBuffer_SetVelocity // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetVelocity) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetVelocity) ( XbHybridDSBuffer* pHybridThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply) + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1523,10 +1523,10 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetVelocity) // ****************************************************************** // * patch: IDirectSoundBuffer_SetVolume // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetVolume) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetVolume) ( XbHybridDSBuffer* pHybridThis, - LONG lVolume) + long_xt lVolume) { DSoundMutexGuardLock; @@ -1545,7 +1545,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_SetVolume) // ****************************************************************** // * patch: IDirectSoundBuffer_Stop // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Stop) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Stop) ( XbHybridDSBuffer* pHybridThis) { @@ -1568,11 +1568,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Stop) // ****************************************************************** // * patch: IDirectSoundBuffer_StopEx // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_StopEx) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_StopEx) ( XbHybridDSBuffer* pHybridThis, REFERENCE_TIME rtTimeStamp, - DWORD dwFlags) + dword_xt dwFlags) { DSoundMutexGuardLock; @@ -1662,10 +1662,10 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_StopEx) // ****************************************************************** // * patch: IDirectSoundBuffer_Set3DVoiceData // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Set3DVoiceData) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Set3DVoiceData) ( XbHybridDSBuffer* pHybridThis, - DWORD a2 + dword_xt a2 ) { DSoundMutexGuardLock; @@ -1677,13 +1677,13 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Set3DVoiceData) LOG_UNIMPLEMENTED(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * patch: IDirectSoundBuffer_Use3DVoiceData // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Use3DVoiceData) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Use3DVoiceData) ( XbHybridDSBuffer* pHybridThis, LPUNKNOWN pUnknown) diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundGlobal.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundGlobal.cpp index 934d9d86e..4c4b51daa 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSoundGlobal.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSoundGlobal.cpp @@ -26,7 +26,7 @@ // ****************************************************************** -#include +#include #include #include "DirectSoundGlobal.hpp" diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp index bfac481a2..4734e0793 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX CXBXR_MODULE::DSSTREAM -#include +#include #include #include "DirectSoundGlobal.hpp" // Global variables @@ -117,7 +117,7 @@ void DirectSoundDoWork_Stream(xbox::LARGE_INTEGER& time) // ****************************************************************** // * patch: CDirectSoundStream_AddRef // ****************************************************************** -ULONG WINAPI xbox::EMUPATCH(CDirectSoundStream_AddRef) +xbox::ulong_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_AddRef) ( X_CDirectSoundStream* pThis) { @@ -133,7 +133,7 @@ ULONG WINAPI xbox::EMUPATCH(CDirectSoundStream_AddRef) // ****************************************************************** // * patch: CDirectSoundStream_Release // ****************************************************************** -ULONG WINAPI xbox::EMUPATCH(CDirectSoundStream_Release) +xbox::ulong_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_Release) ( X_CDirectSoundStream* pThis) { @@ -175,7 +175,7 @@ ULONG WINAPI xbox::EMUPATCH(CDirectSoundStream_Release) // ****************************************************************** // * patch: DirectSoundCreateStream // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(DirectSoundCreateStream) +xbox::hresult_xt WINAPI xbox::EMUPATCH(DirectSoundCreateStream) ( X_DSSTREAMDESC* pdssd, OUT X_CDirectSoundStream** ppStream) @@ -232,7 +232,7 @@ HRESULT WINAPI xbox::EMUPATCH(DirectSoundCreateStream) (*ppStream)->Xb_rtFlushEx = 0LL; // We have to set DSBufferDesc last due to EmuFlags must be either 0 or previously written value to preserve other flags. - GeneratePCMFormat(DSBufferDesc, pdssd->lpwfxFormat, pdssd->dwFlags, (*ppStream)->EmuFlags, 0, + GeneratePCMFormat(DSBufferDesc, pdssd->lpwfxFormat, (DWORD &)pdssd->dwFlags, (*ppStream)->EmuFlags, 0, xbox::zeroptr, (*ppStream)->X_BufferCacheSize, (*ppStream)->Xb_VoiceProperties, pdssd->lpMixBinsOutput, &(*ppStream)->Xb_Voice); @@ -288,7 +288,7 @@ HRESULT WINAPI xbox::EMUPATCH(DirectSoundCreateStream) // ****************************************************************** // * patch: IDirectSound_CreateSoundStream // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSound_CreateSoundStream) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSound_CreateSoundStream) ( LPDIRECTSOUND8 pThis, X_DSSTREAMDESC* pdssd, @@ -307,7 +307,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSound_CreateSoundStream) // ****************************************************************** // * patch: CMcpxStream_Dummy_0x10 // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(CMcpxStream_Dummy_0x10)(DWORD dwDummy1, DWORD dwDummy2) +xbox::void_xt WINAPI xbox::EMUPATCH(CMcpxStream_Dummy_0x10)(dword_xt dwDummy1, dword_xt dwDummy2) { DSoundMutexGuardLock; @@ -328,7 +328,7 @@ VOID WINAPI xbox::EMUPATCH(CMcpxStream_Dummy_0x10)(DWORD dwDummy1, DWORD dwDummy // ****************************************************************** // * patch: CDirectSoundStream_Discontinuity // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_Discontinuity) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_Discontinuity) ( X_CDirectSoundStream* pThis) { @@ -349,7 +349,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_Discontinuity) // ****************************************************************** // * patch: CDirectSoundStream_Flush // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_Flush) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_Flush) ( X_CDirectSoundStream* pThis) { @@ -367,11 +367,11 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_Flush) // ****************************************************************** // * patch: CDirectSoundStream_FlushEx // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_FlushEx) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_FlushEx) ( X_CDirectSoundStream* pThis, REFERENCE_TIME rtTimeStamp, - DWORD dwFlags) + dword_xt dwFlags) { DSoundMutexGuardLock; @@ -430,7 +430,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_FlushEx) // ****************************************************************** // * patch: CDirectSoundStream_GetInfo // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_GetInfo) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_GetInfo) ( X_CDirectSoundStream* pThis, OUT LPXMEDIAINFO pInfo) @@ -455,10 +455,10 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_GetInfo) // ****************************************************************** // * patch: CDirectSoundStream_GetStatus // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_GetStatus) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_GetStatus) ( X_CDirectSoundStream* pThis, - OUT DWORD* pdwStatus) + OUT dword_xt* pdwStatus) { DSoundMutexGuardLock; @@ -498,7 +498,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_GetStatus) // ****************************************************************** // * patch: CDirectSoundStream_GetVoiceProperties // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_GetVoiceProperties) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_GetVoiceProperties) ( X_CDirectSoundStream* pThis, OUT X_DSVOICEPROPS* pVoiceProps @@ -523,10 +523,10 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_GetVoiceProperties) // ****************************************************************** // * patch: CDirectSoundStream_Pause // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_Pause) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_Pause) ( X_CDirectSoundStream* pThis, - DWORD dwPause) + dword_xt dwPause) { DSoundMutexGuardLock; @@ -537,7 +537,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_Pause) if (!pThis) { LOG_TEST_CASE("CDirectSoundStream_Pause called with pThis = nullptr"); - return STATUS_SUCCESS; + return xbox::status_success; } HRESULT hRet = HybridDirectSoundBuffer_Pause(pThis->EmuDirectSoundBuffer8, dwPause, pThis->EmuFlags, pThis->EmuPlayFlags, @@ -567,11 +567,11 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_Pause) // ****************************************************************** // * patch: CDirectSoundStream_PauseEx // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_PauseEx) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_PauseEx) ( X_CDirectSoundStream *pThis, REFERENCE_TIME rtTimestamp, - DWORD dwPause) + dword_xt dwPause) { DSoundMutexGuardLock; @@ -593,7 +593,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_PauseEx) // ****************************************************************** // * patch: CDirectSoundStream_Process // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_Process) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_Process) ( X_CDirectSoundStream *pThis, PXMEDIAPACKET pInputBuffer, @@ -684,11 +684,11 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_Process) // ****************************************************************** // * patch: CDirectSoundStream_SetAllParameters // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetAllParameters) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetAllParameters) ( X_CDirectSoundStream* pThis, X_DS3DBUFFER* pc3DBufferParameters, - DWORD dwApply) + dword_xt dwApply) { DSoundMutexGuardLock; @@ -706,12 +706,12 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetAllParameters) // ****************************************************************** // * patch: CDirectSoundStream_SetConeAngles // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetConeAngles) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetConeAngles) ( X_CDirectSoundStream* pThis, - DWORD dwInsideConeAngle, - DWORD dwOutsideConeAngle, - DWORD dwApply) + dword_xt dwInsideConeAngle, + dword_xt dwOutsideConeAngle, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -730,13 +730,13 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetConeAngles) // ****************************************************************** // * patch: CDirectSoundStream_SetConeOrientation // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetConeOrientation) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetConeOrientation) ( X_CDirectSoundStream* pThis, D3DVALUE x, D3DVALUE y, D3DVALUE z, - DWORD dwApply) + dword_xt dwApply) { DSoundMutexGuardLock; @@ -756,11 +756,11 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetConeOrientation) // ****************************************************************** // * patch: CDirectSoundStream_SetConeOutsideVolume // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetConeOutsideVolume) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetConeOutsideVolume) ( X_CDirectSoundStream* pThis, - LONG lConeOutsideVolume, - DWORD dwApply) + long_xt lConeOutsideVolume, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -778,11 +778,11 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetConeOutsideVolume) // ****************************************************************** // * patch: CDirectSoundStream_SetDistanceFactor // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetDistanceFactor) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetDistanceFactor) ( X_CDirectSoundStream* pThis, - FLOAT flDistanceFactor, - DWORD dwApply) + float_xt flDistanceFactor, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -800,11 +800,11 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetDistanceFactor) // ****************************************************************** // * patch: CDirectSoundStream_SetDopplerFactor // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetDopplerFactor) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetDopplerFactor) ( X_CDirectSoundStream* pThis, - FLOAT flDopplerFactor, - DWORD dwApply) + float_xt flDopplerFactor, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -822,7 +822,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetDopplerFactor) // ****************************************************************** // * patch: CDirectSoundStream_SetEG // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetEG) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetEG) ( X_CDirectSoundStream* pThis, X_DSENVOLOPEDESC* pEnvelopeDesc) @@ -846,7 +846,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetEG) // ****************************************************************** // * patch: IDirectSoundStream_SetEG // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetEG) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundStream_SetEG) ( X_CDirectSoundStream* pThis, X_DSENVOLOPEDESC* pEnvelopeDesc) @@ -861,7 +861,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetEG) // ****************************************************************** // * patch: CDirectSoundStream_SetFilter // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetFilter) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetFilter) ( X_CDirectSoundStream* pThis, X_DSFILTERDESC* pFilterDesc) @@ -883,7 +883,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetFilter) // ****************************************************************** // * patch: IDirectSoundStream_SetFilter // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetFilter) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundStream_SetFilter) ( X_CDirectSoundStream* pThis, X_DSFILTERDESC* pFilterDesc) @@ -898,7 +898,7 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetFilter) // ****************************************************************** // * patch: CDirectSoundStream::SetFormat // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetFormat) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetFormat) ( X_CDirectSoundStream* pThis, LPCWAVEFORMATEX pwfxFormat) @@ -924,10 +924,10 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetFormat) // ****************************************************************** // * patch: CDirectSoundStream_SetFrequency // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetFrequency) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetFrequency) ( X_CDirectSoundStream* pThis, - DWORD dwFrequency) + dword_xt dwFrequency) { DSoundMutexGuardLock; @@ -944,10 +944,10 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetFrequency) // ****************************************************************** // * patch: IDirectSoundStream_SetFrequency // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetFrequency) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundStream_SetFrequency) ( X_CDirectSoundStream* pThis, - DWORD dwFrequency) + dword_xt dwFrequency) { DSoundMutexGuardLock; @@ -959,10 +959,10 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetFrequency) // ****************************************************************** // * patch: CDirectSoundStream_SetHeadroom // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetHeadroom) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetHeadroom) ( X_CDirectSoundStream* pThis, - DWORD dwHeadroom) + dword_xt dwHeadroom) { DSoundMutexGuardLock; @@ -980,10 +980,10 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetHeadroom) // ****************************************************************** // * patch: IDirectSoundStream_SetHeadroom // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetHeadroom) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundStream_SetHeadroom) ( X_CDirectSoundStream* pThis, - DWORD dwHeadroom) + dword_xt dwHeadroom) { DSoundMutexGuardLock; @@ -995,11 +995,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetHeadroom) // ****************************************************************** // * patch: CDirectSoundStream_SetI3DL2Source // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetI3DL2Source) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetI3DL2Source) ( X_CDirectSoundStream* pThis, X_DSI3DL2BUFFER* pds3db, - DWORD dwApply) + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1021,7 +1021,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetI3DL2Source) // ****************************************************************** // * patch: CDirectSoundStream_SetLFO // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetLFO) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetLFO) ( X_CDirectSoundStream* pThis, LPCDSLFODESC pLFODesc) @@ -1043,7 +1043,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetLFO) // ****************************************************************** // * patch: IDirectSoundStream_SetLFO // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetLFO) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundStream_SetLFO) ( X_CDirectSoundStream* pThis, LPCDSLFODESC pLFODesc) @@ -1058,11 +1058,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetLFO) // ****************************************************************** // * patch: CDirectSoundStream_SetMaxDistance // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMaxDistance) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMaxDistance) ( X_CDirectSoundStream* pThis, D3DVALUE flMaxDistance, - DWORD dwApply) + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1080,11 +1080,11 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMaxDistance) // ****************************************************************** // * patch: CDirectSoundStream_SetMinDistance // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMinDistance) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMinDistance) ( X_CDirectSoundStream* pThis, D3DVALUE fMinDistance, - DWORD dwApply) + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1102,10 +1102,10 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMinDistance) // ****************************************************************** // * patch: CDirectSoundStream_SetMixBins // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMixBins) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMixBins) ( X_CDirectSoundStream* pThis, - DWORD dwMixBinMask) // Also can be X_LPDSMIXBINS (4039+) + dword_xt dwMixBinMask) // Also can be X_LPDSMIXBINS (4039+) { DSoundMutexGuardLock; HRESULT hRet = DS_OK; @@ -1135,10 +1135,10 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMixBins) // ****************************************************************** // * patch: IDirectSoundStream_SetMixBins // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetMixBins) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundStream_SetMixBins) ( X_CDirectSoundStream* pThis, - DWORD dwMixBinMask) // Also can be X_LPDSMIXBINS (4039+) + dword_xt dwMixBinMask) // Also can be X_LPDSMIXBINS (4039+) { DSoundMutexGuardLock; @@ -1150,11 +1150,11 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetMixBins) // ****************************************************************** // * patch: CDirectSoundStream_SetMode // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMode) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMode) ( X_CDirectSoundStream* pThis, - DWORD dwMode, - DWORD dwApply) + dword_xt dwMode, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1173,11 +1173,11 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMode) // * patch: CDirectSoundStream_SetMixBinVolumes_12 // This revision API was used in XDK 3911 until API had changed in XDK 4039. // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMixBinVolumes_12) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMixBinVolumes_12) ( X_CDirectSoundStream* pThis, - DWORD dwMixBinMask, - const LONG* alVolumes) + dword_xt dwMixBinMask, + const long_xt* alVolumes) { DSoundMutexGuardLock; @@ -1199,7 +1199,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMixBinVolumes_12) // * patch: CDirectSoundStream_SetMixBinVolumes_8 // ****************************************************************** // This revision API is only used in XDK 4039 and higher. -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMixBinVolumes_8) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMixBinVolumes_8) ( X_CDirectSoundStream* pThis, X_LPDSMIXBINS pMixBins) @@ -1220,7 +1220,7 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetMixBinVolumes_8) // ****************************************************************** // * patch: CDirectSoundStream_SetOutputBuffer // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetOutputBuffer) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetOutputBuffer) ( X_CDirectSoundStream* pThis, XbHybridDSBuffer* pOutputBuffer) @@ -1244,10 +1244,10 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetOutputBuffer) // ****************************************************************** // * patch: CDirectSoundStream_SetPitch // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetPitch) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetPitch) ( X_CDirectSoundStream* pThis, - LONG lPitch) + long_xt lPitch) { DSoundMutexGuardLock; @@ -1264,10 +1264,10 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetPitch) // ****************************************************************** // * patch: IDirectSoundStream_SetPitch // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetPitch) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundStream_SetPitch) ( X_CDirectSoundStream* pThis, - LONG lPitch) + long_xt lPitch) { DSoundMutexGuardLock; @@ -1279,13 +1279,13 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetPitch) // ****************************************************************** // * patch: CDirectSoundStream_SetPosition // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetPosition) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetPosition) ( X_CDirectSoundStream* pThis, D3DVALUE x, D3DVALUE y, D3DVALUE z, - DWORD dwApply) + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1305,12 +1305,12 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetPosition) // ****************************************************************** // * patch: CDirectSoundStream::SetRolloffCurve // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetRolloffCurve) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetRolloffCurve) ( X_CDirectSoundStream* pThis, - const FLOAT* pflPoints, - DWORD dwPointCount, - DWORD dwApply) + const float_xt* pflPoints, + dword_xt dwPointCount, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1329,11 +1329,11 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetRolloffCurve) // ****************************************************************** // * patch: CDirectSoundStream_SetRolloffFactor // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetRolloffFactor) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetRolloffFactor) ( X_CDirectSoundStream* pThis, - FLOAT fRolloffFactor, - DWORD dwApply) + float_xt fRolloffFactor, + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1353,13 +1353,13 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetRolloffFactor) // ****************************************************************** // * patch: CDirectSoundStream_SetVelocity // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetVelocity) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetVelocity) ( X_CDirectSoundStream* pThis, D3DVALUE x, D3DVALUE y, D3DVALUE z, - DWORD dwApply) + dword_xt dwApply) { DSoundMutexGuardLock; @@ -1379,10 +1379,10 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetVelocity) // ****************************************************************** // * patch: CDirectSoundStream_SetVolume // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetVolume) +xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_SetVolume) ( X_CDirectSoundStream* pThis, - LONG lVolume) + long_xt lVolume) { DSoundMutexGuardLock; @@ -1400,10 +1400,10 @@ HRESULT WINAPI xbox::EMUPATCH(CDirectSoundStream_SetVolume) // ****************************************************************** // * patch: IDirectSoundStream_SetVolume // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetVolume) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundStream_SetVolume) ( X_CDirectSoundStream* pThis, - LONG lVolume + long_xt lVolume ) { DSoundMutexGuardLock; @@ -1416,10 +1416,10 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_SetVolume) // ****************************************************************** // * patch: IDirectSoundStream_Set3DVoiceData // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_Set3DVoiceData) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundStream_Set3DVoiceData) ( X_CDirectSoundStream* pThis, - DWORD a2 + dword_xt a2 ) { DSoundMutexGuardLock; @@ -1431,16 +1431,16 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_Set3DVoiceData) LOG_UNIMPLEMENTED(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * patch: IDirectSoundBuffer_Use3DVoiceData // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_Use3DVoiceData) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundStream_Use3DVoiceData) ( X_CDirectSoundStream* pThis, - DWORD a2 + dword_xt a2 ) { DSoundMutexGuardLock; @@ -1452,5 +1452,5 @@ HRESULT WINAPI xbox::EMUPATCH(IDirectSoundStream_Use3DVoiceData) LOG_UNIMPLEMENTED(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } diff --git a/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp b/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp index b0dd69ad6..fb85b8a66 100644 --- a/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp +++ b/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp @@ -28,7 +28,7 @@ #define LOG_PREFIX CXBXR_MODULE::XMO -#include +#include #include #include "DirectSoundGlobal.hpp" // Global variables @@ -70,10 +70,10 @@ xbox::X_XFileMediaObject::_vtbl xbox::X_XFileMediaObject::vtbl = // ****************************************************************** // * patch: XAudioCreateAdpcmFormat // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(XAudioCreateAdpcmFormat) +xbox::void_xt WINAPI xbox::EMUPATCH(XAudioCreateAdpcmFormat) ( - WORD nChannels, - DWORD nSamplesPerSec, + word_xt nChannels, + dword_xt nSamplesPerSec, OUT LPXBOXADPCMWAVEFORMAT pwfx) { DSoundMutexGuardLock; @@ -99,11 +99,11 @@ VOID WINAPI xbox::EMUPATCH(XAudioCreateAdpcmFormat) // ****************************************************************** // * patch: XAudioDownloadEffectsImage // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(XAudioDownloadEffectsImage) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XAudioDownloadEffectsImage) ( LPCSTR pszImageName, LPVOID pImageLoc, - DWORD dwFlags, + dword_xt dwFlags, LPVOID* ppImageDesc) { DSoundMutexGuardLock; @@ -123,9 +123,9 @@ HRESULT WINAPI xbox::EMUPATCH(XAudioDownloadEffectsImage) // ****************************************************************** // * patch: XAudioSetEffectData // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(XAudioSetEffectData) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XAudioSetEffectData) ( - DWORD dwEffectIndex, + dword_xt dwEffectIndex, void* pDesc, void* pRawDesc) { @@ -145,13 +145,13 @@ HRESULT WINAPI xbox::EMUPATCH(XAudioSetEffectData) // ****************************************************************** // * patch: XFileCreaeMediaObject // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(XFileCreateMediaObject) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XFileCreateMediaObject) ( LPCSTR pstrFileName, - DWORD dwDesiredAccess, - DWORD dwShareMode, - DWORD dwCreationDisposition, - DWORD dwFlagsAndAttributes, + dword_xt dwDesiredAccess, + dword_xt dwShareMode, + dword_xt dwCreationDisposition, + dword_xt dwFlagsAndAttributes, OUT void** ppMediaObject) { DSoundMutexGuardLock; @@ -174,10 +174,10 @@ HRESULT WINAPI xbox::EMUPATCH(XFileCreateMediaObject) // * patch: XFileCreateMediaObjectAsync // ****************************************************************** // NOTE: Does not require a patch. -HRESULT WINAPI xbox::EMUPATCH(XFileCreateMediaObjectAsync) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XFileCreateMediaObjectAsync) ( HANDLE hFile, - DWORD dwMaxPackets, + dword_xt dwMaxPackets, OUT void** ppMediaObject) { DSoundMutexGuardLock; @@ -198,7 +198,7 @@ HRESULT WINAPI xbox::EMUPATCH(XFileCreateMediaObjectAsync) // ****************************************************************** // * patch: XFileCreaeMediaObjectEx // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(XFileCreateMediaObjectEx) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XFileCreateMediaObjectEx) ( HANDLE hFile, OUT void** ppMediaObject) @@ -219,7 +219,7 @@ HRESULT WINAPI xbox::EMUPATCH(XFileCreateMediaObjectEx) // * patch: XWaveFileCreateMediaObject // ****************************************************************** // NOTE: Does not require any patch. -HRESULT WINAPI xbox::EMUPATCH(XWaveFileCreateMediaObject) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XWaveFileCreateMediaObject) ( LPCSTR pszFileName, LPCWAVEFORMATEX* ppwfxFormat, @@ -244,7 +244,7 @@ HRESULT WINAPI xbox::EMUPATCH(XWaveFileCreateMediaObject) // * patch: XWaveFileCreateMediaObjectEx // ****************************************************************** // NOTE: Does not require a patch. -HRESULT WINAPI xbox::EMUPATCH(XWaveFileCreateMediaObjectEx) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XWaveFileCreateMediaObjectEx) ( LPCSTR pszFileName, HANDLE hFile, @@ -269,11 +269,11 @@ HRESULT WINAPI xbox::EMUPATCH(XWaveFileCreateMediaObjectEx) // * patch: XFileMediaObject_Seek // ****************************************************************** // NOTE: Does not require a patch. -HRESULT WINAPI xbox::EMUPATCH(XFileMediaObject_Seek) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XFileMediaObject_Seek) ( X_XFileMediaObject* pThis, - LONG lOffset, - DWORD dwOrigin, + long_xt lOffset, + dword_xt dwOrigin, LPDWORD pdwAbsolute) { DSoundMutexGuardLock; @@ -294,7 +294,7 @@ HRESULT WINAPI xbox::EMUPATCH(XFileMediaObject_Seek) // * patch: XFileMediaObject_DoWork // ****************************************************************** // NOTE: Does not require a patch. -VOID WINAPI xbox::EMUPATCH(XFileMediaObject_DoWork)(X_XFileMediaObject* pThis) +xbox::void_xt WINAPI xbox::EMUPATCH(XFileMediaObject_DoWork)(X_XFileMediaObject* pThis) { DSoundMutexGuardLock; @@ -308,7 +308,7 @@ VOID WINAPI xbox::EMUPATCH(XFileMediaObject_DoWork)(X_XFileMediaObject* pThis) // * patch: XFileMediaObject_GetStatus // ****************************************************************** // NOTE: Does not require a patch. -HRESULT WINAPI xbox::EMUPATCH(XFileMediaObject_GetStatus) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XFileMediaObject_GetStatus) ( X_XFileMediaObject* pThis, OUT LPDWORD pdwStatus) @@ -329,7 +329,7 @@ HRESULT WINAPI xbox::EMUPATCH(XFileMediaObject_GetStatus) // * patch: XFileMediaObject_GetInfo // ****************************************************************** // NOTE: Does not require a patch. -HRESULT WINAPI xbox::EMUPATCH(XFileMediaObject_GetInfo) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XFileMediaObject_GetInfo) ( X_XFileMediaObject* pThis, OUT XMEDIAINFO* pInfo) @@ -350,7 +350,7 @@ HRESULT WINAPI xbox::EMUPATCH(XFileMediaObject_GetInfo) // * patch: XFileMediaObject_Process // ****************************************************************** // NOTE: Does not require a patch. -HRESULT WINAPI xbox::EMUPATCH(XFileMediaObject_Process) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XFileMediaObject_Process) ( X_XFileMediaObject* pThis, LPXMEDIAPACKET pInputBuffer, @@ -373,7 +373,7 @@ HRESULT WINAPI xbox::EMUPATCH(XFileMediaObject_Process) // * patch: XFileMediaObject_AddRef // ****************************************************************** // NOTE: Does not require a patch. -ULONG WINAPI xbox::EMUPATCH(XFileMediaObject_AddRef) +xbox::ulong_xt WINAPI xbox::EMUPATCH(XFileMediaObject_AddRef) ( X_XFileMediaObject* pThis) { @@ -394,7 +394,7 @@ ULONG WINAPI xbox::EMUPATCH(XFileMediaObject_AddRef) // * patch: XFileMediaObject_Release // ****************************************************************** // NOTE: Does not require a patch. -ULONG WINAPI xbox::EMUPATCH(XFileMediaObject_Release) +xbox::ulong_xt WINAPI xbox::EMUPATCH(XFileMediaObject_Release) ( X_XFileMediaObject* pThis) { @@ -418,7 +418,7 @@ ULONG WINAPI xbox::EMUPATCH(XFileMediaObject_Release) // * patch: XFileMediaObject_Discontinuity // ****************************************************************** // NOTE: Does not require a patch. -HRESULT WINAPI xbox::EMUPATCH(XFileMediaObject_Discontinuity) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XFileMediaObject_Discontinuity) ( X_XFileMediaObject *pThis) { diff --git a/src/core/hle/DSOUND/XbDSoundTypes.h b/src/core/hle/DSOUND/XbDSoundTypes.h index 7d36bedcd..4760e451b 100644 --- a/src/core/hle/DSOUND/XbDSoundTypes.h +++ b/src/core/hle/DSOUND/XbDSoundTypes.h @@ -72,8 +72,8 @@ typedef const WAVEFORMATEX *LPCWAVEFORMATEX; // * X_DSMIXBINVOLUMEPAIR // ****************************************************************** typedef struct _XDSMIXBINVOLUMEPAIR { - DWORD dwMixBin; - LONG lVolume; + dword_xt dwMixBin; + long_xt lVolume; } X_DSMIXBINVOLUMEPAIR, *X_LPDSMIXBINVOLUMEPAIR; // ****************************************************************** @@ -81,7 +81,7 @@ typedef struct _XDSMIXBINVOLUMEPAIR { // ****************************************************************** // Revision 2 (4039+) typedef struct _XDSMIXBINS { - DWORD dwCount; + dword_xt dwCount; X_LPDSMIXBINVOLUMEPAIR lpMixBinVolumePairs; } X_DSMIXBINS, *X_LPDSMIXBINS; @@ -145,12 +145,12 @@ typedef struct _XDSMIXBINS { // ****************************************************************** struct X_DSBUFFERDESC { - DWORD dwSize; - DWORD dwFlags; - DWORD dwBufferBytes; + dword_xt dwSize; + dword_xt dwFlags; + dword_xt dwBufferBytes; LPWAVEFORMATEX lpwfxFormat; X_LPDSMIXBINS lpMixBinsOutput; - DWORD dwInputMixBin; + dword_xt dwInputMixBin; }; // ****************************************************************** @@ -158,16 +158,16 @@ struct X_DSBUFFERDESC // ****************************************************************** struct X_DSENVOLOPEDESC { - DWORD dwEnvelopGenerator; - DWORD dwMode; - DWORD dwDelay; - DWORD dwAttack; - DWORD dwHold; - DWORD dwDecay; - DWORD dwRelease; - DWORD dwSustain; - LONG lPitchScale; - LONG lFilterCutOff; + dword_xt dwEnvelopGenerator; + dword_xt dwMode; + dword_xt dwDelay; + dword_xt dwAttack; + dword_xt dwHold; + dword_xt dwDecay; + dword_xt dwRelease; + dword_xt dwSustain; + long_xt lPitchScale; + long_xt lFilterCutOff; }; #define XTL_DSSCAPS_CTRL3D 0x00000010 @@ -178,15 +178,15 @@ struct X_DSENVOLOPEDESC #define XTL_DSSCAPS_NOMERGE 0x20000000 #define XTL_DSSCAPS_ACCURATENOTIFY 0x40000000 -typedef VOID(XCALLBACK *LPFNXMOCALLBACK)(LPVOID pStreamContext, LPVOID pPacketContext, DWORD dwStatus); +typedef xbox::void_xt(XCALLBACK *LPFNXMOCALLBACK)(LPVOID pStreamContext, LPVOID pPacketContext, dword_xt dwStatus); // ****************************************************************** // * X_DSSTREAMDESC // ****************************************************************** struct X_DSSTREAMDESC { - DWORD dwFlags; - DWORD dwMaxAttachedPackets; + dword_xt dwFlags; + dword_xt dwMaxAttachedPackets; LPWAVEFORMATEX lpwfxFormat; LPFNXMOCALLBACK lpfnCallback; LPVOID lpvContext; @@ -196,7 +196,7 @@ struct X_DSSTREAMDESC // ****************************************************************** // * REFERENCE_TIME // ****************************************************************** -typedef LONGLONG REFERENCE_TIME, *PREFERENCE_TIME, *LPREFERENCE_TIME; +typedef longlong_xt REFERENCE_TIME, *PREFERENCE_TIME, *LPREFERENCE_TIME; // ****************************************************************** // * XMEDIAPACKET @@ -204,7 +204,7 @@ typedef LONGLONG REFERENCE_TIME, *PREFERENCE_TIME, *LPREFERENCE_TIME; typedef struct _XMEDIAPACKET { LPVOID pvBuffer; - DWORD dwMaxSize; + dword_xt dwMaxSize; PDWORD pdwCompletedSize; PDWORD pdwStatus; union { @@ -226,10 +226,10 @@ XMEDIAPACKET, *PXMEDIAPACKET, *LPXMEDIAPACKET; // ****************************************************************** typedef struct _XMEDIAINFO { - DWORD dwFlags; - DWORD dwInputSize; - DWORD dwOutputSize; - DWORD dwMaxLookahead; + dword_xt dwFlags; + dword_xt dwInputSize; + dword_xt dwOutputSize; + dword_xt dwMaxLookahead; } XMEDIAINFO, *PXEIDIAINFO, *LPXMEDIAINFO; @@ -246,9 +246,9 @@ XMEDIAINFO, *PXEIDIAINFO, *LPXMEDIAINFO; // ****************************************************************** struct X_DSFILTERDESC { - DWORD dwMode; - DWORD dwQCoefficient; - DWORD adwCoefficients[4]; + dword_xt dwMode; + dword_xt dwQCoefficient; + dword_xt adwCoefficients[4]; }; // X_DSFILTERDESC modes @@ -262,12 +262,12 @@ struct X_DSFILTERDESC // ****************************************************************** typedef struct _DSLFODESC { - DWORD dwLFO; - DWORD dwDelay; - DWORD dwDelta; - LONG lPitchModulation; - LONG lFilterCutOffRange; - LONG lAmplitudeModulation; + dword_xt dwLFO; + dword_xt dwDelay; + dword_xt dwDelta; + long_xt lPitchModulation; + long_xt lFilterCutOffRange; + long_xt lAmplitudeModulation; } DSLFODESC, *LPCDSLFODESC; @@ -277,7 +277,7 @@ DSLFODESC, *LPCDSLFODESC; typedef struct xbox_adpcmwaveformat_tag { WAVEFORMATEX wfx; // WAVEFORMATEX data - WORD wSamplesPerBlock; // Number of samples per encoded block. It must be 64. + word_xt wSamplesPerBlock; // Number of samples per encoded block. It must be 64. } XBOXADPCMWAVEFORMAT, *PXBOXADPCMWAVEFORMAT, *LPXBOXADPCMWAVEFORMAT; @@ -288,22 +288,22 @@ typedef const XBOXADPCMWAVEFORMAT *LPCXBOXADPCMWAVEFORMAT; // ****************************************************************** struct X_DSOUTPUTLEVELS { - DWORD dwAnalogLeftTotalPeak; // analog peak - DWORD dwAnalogRightTotalPeak; - DWORD dwAnalogLeftTotalRMS; // analog RMS - DWORD dwAnalogRightTotalRMS; - DWORD dwDigitalFrontLeftPeak; // digital peak levels - DWORD dwDigitalFrontCenterPeak; - DWORD dwDigitalFrontRightPeak; - DWORD dwDigitalBackLeftPeak; - DWORD dwDigitalBackRightPeak; - DWORD dwDigitalLowFrequencyPeak; - DWORD dwDigitalFrontLeftRMS; // digital RMS levels - DWORD dwDigitalFrontCenterRMS; - DWORD dwDigitalFrontRightRMS; - DWORD dwDigitalBackLeftRMS; - DWORD dwDigitalBackRightRMS; - DWORD dwDigitalLowFrequencyRMS; + dword_xt dwAnalogLeftTotalPeak; // analog peak + dword_xt dwAnalogRightTotalPeak; + dword_xt dwAnalogLeftTotalRMS; // analog RMS + dword_xt dwAnalogRightTotalRMS; + dword_xt dwDigitalFrontLeftPeak; // digital peak levels + dword_xt dwDigitalFrontCenterPeak; + dword_xt dwDigitalFrontRightPeak; + dword_xt dwDigitalBackLeftPeak; + dword_xt dwDigitalBackRightPeak; + dword_xt dwDigitalLowFrequencyPeak; + dword_xt dwDigitalFrontLeftRMS; // digital RMS levels + dword_xt dwDigitalFrontCenterRMS; + dword_xt dwDigitalFrontRightRMS; + dword_xt dwDigitalBackLeftRMS; + dword_xt dwDigitalBackRightRMS; + dword_xt dwDigitalLowFrequencyRMS; }; // ****************************************************************** @@ -311,10 +311,10 @@ struct X_DSOUTPUTLEVELS // ****************************************************************** struct X_DSCAPS { - DWORD dwFree2DBuffers; - DWORD dwFree3DBuffers; - DWORD dwFreeBufferSGEs; - DWORD dwMemoryAllocated; + dword_xt dwFree2DBuffers; + dword_xt dwFree3DBuffers; + dword_xt dwFreeBufferSGEs; + dword_xt dwMemoryAllocated; }; #define X_DSSPEAKER_STEREO 0x00000000 @@ -324,52 +324,52 @@ struct X_DSCAPS #define X_DSSPEAKER_ENABLE_DTS 0x00020000 struct X_DS3DBUFFER { - DWORD dwSize; + dword_xt dwSize; D3DVECTOR vPosition; D3DVECTOR vVelocity; - DWORD dwInsideConeAngle; - DWORD dwOutsideConeAngle; + dword_xt dwInsideConeAngle; + dword_xt dwOutsideConeAngle; D3DVECTOR vConeOrientation; - LONG lConeOutsideVolume; - FLOAT flMinDistance; - FLOAT flMaxDistance; - DWORD dwMode; - FLOAT flDistanceFactor; - FLOAT flRolloffFactor; - FLOAT flDopplerFactor; + long_xt lConeOutsideVolume; + float_xt flMinDistance; + float_xt flMaxDistance; + dword_xt dwMode; + float_xt flDistanceFactor; + float_xt flRolloffFactor; + float_xt flDopplerFactor; }; struct X_DSI3DL2LISTENER { - LONG lRoom; - LONG lRoomHF; - FLOAT flRoomRolloffFactor; - FLOAT flDecayTime; - FLOAT flDecayHFRatio; - LONG lReflections; - FLOAT flReflectionsDelay; - LONG lReverb; - FLOAT flReverbDelay; - FLOAT flDiffusion; - FLOAT flDensity; - FLOAT flHFReference; + long_xt lRoom; + long_xt lRoomHF; + float_xt flRoomRolloffFactor; + float_xt flDecayTime; + float_xt flDecayHFRatio; + long_xt lReflections; + float_xt flReflectionsDelay; + long_xt lReverb; + float_xt flReverbDelay; + float_xt flDiffusion; + float_xt flDensity; + float_xt flHFReference; }; struct X_DSI3DL2OBSTRUCTION { - LONG lHFLevel; - FLOAT flLFRatio; + long_xt lHFLevel; + float_xt flLFRatio; }; struct X_DSI3DL2OCCLUSION { - LONG lHFLevel; - FLOAT flLFRatio; + long_xt lHFLevel; + float_xt flLFRatio; }; struct X_DSI3DL2BUFFER { - LONG lDirect; - LONG lDirectHF; - LONG lRoom; - LONG lRoomHF; - FLOAT flRoomRolloffFactor; + long_xt lDirect; + long_xt lDirectHF; + long_xt lRoom; + long_xt lRoomHF; + float_xt flRoomRolloffFactor; X_DSI3DL2OBSTRUCTION Obstruction; X_DSI3DL2OCCLUSION Occlusion; }; @@ -378,14 +378,14 @@ typedef struct IDirectSoundStream IDirectSoundStream; typedef IDirectSoundStream *LPDIRECTSOUNDSTREAM; struct X_DSVOICEPROPS { - DWORD dwMixBinCount; + dword_xt dwMixBinCount; X_DSMIXBINVOLUMEPAIR MixBinVolumePairs[8]; - LONG lPitch; - LONG l3DDistanceVolume; - LONG l3DConeVolume; - LONG l3DDopplerPitch; - LONG lI3DL2DirectVolume; - LONG lI3DL2RoomVolume; + long_xt lPitch; + long_xt l3DDistanceVolume; + long_xt l3DConeVolume; + long_xt l3DDopplerPitch; + long_xt lI3DL2DirectVolume; + long_xt lI3DL2RoomVolume; }; } // end of namespace xbox diff --git a/src/core/hle/DSOUND/common/XbInternalStruct.hpp b/src/core/hle/DSOUND/common/XbInternalStruct.hpp index ae534983f..746d85811 100644 --- a/src/core/hle/DSOUND/common/XbInternalStruct.hpp +++ b/src/core/hle/DSOUND/common/XbInternalStruct.hpp @@ -109,7 +109,7 @@ struct CDirectSoundVoice : CUnknownGenericManager { } unknown; struct _r4034_lower { - xbox::addr p_unknown_08; // 0x008 + xbox::addr_xt p_unknown_08; // 0x008 uint16_t unknown_0C; // 0x00C // zero'd - unknown XBOXADPCMWAVEFORMAT* p_audio_format; // 0x010 // Same as XBOXADPCMWAVEFORMAT / WAVEFORMATEX structure int32_t pitch; // 0x014 // Always init and custom pitch from SetFrequency, SetPitch, SetFormat, etc calls. @@ -203,16 +203,16 @@ struct DSBUFFER_S : CUnknownTemplate { uint32_t unknown_08; // Offset 0x08 // -0x14 CMcpxVoiceClient* p_CMcpxVoiceClient; // Offset 0x0C // -0x10 CDirectSoundVoice* p_CDSVoice; // Offset 0x10 // -0x0C - xbox::addr p_unknown_14; // Offset 0x14 // -0x08 // (points to this address) - xbox::addr p_unknown_18; // Offset 0x18 // -0x04 // (points to above address) + xbox::addr_xt p_unknown_14; // Offset 0x14 // -0x08 // (points to this address) + xbox::addr_xt p_unknown_18; // Offset 0x18 // -0x04 // (points to above address) } dsb_c; static_assert(sizeof(DSBUFFER_C) == 0x14); struct DSBUFFER_I { CDirectSoundVoice* p_CDSVoice; // Offset 0x1C // 0x00 // Same as p_CDSVoice (above); pThis CMcpxVoiceClient* p_CMcpxVoiceClient; // Offset 0x20 // 0x04 // Same as p_CMcpxVoiceClient (above) - xbox::addr p_unknown_24; // Offset 0x24 // 0x08 - xbox::addr p_unknown_28; // Offset 0x28 // 0x0C + xbox::addr_xt p_unknown_24; // Offset 0x24 // 0x08 + xbox::addr_xt p_unknown_28; // Offset 0x28 // 0x0C uint32_t unknown_2C; // Offset 0x2C // 0x10 // was integer, later shift to offset 0x30 uint32_t unknown_30; // Offset 0x30 // 0x14 // later shifted from offset 0x2C; integer } dsb_i; @@ -236,7 +236,7 @@ struct DSBUFFER_S : CUnknownTemplate { init_member(); dsb_c.p_CMcpxVoiceClient = new CMcpxVoiceClient(); dsb_i.p_CMcpxVoiceClient = dsb_c.p_CMcpxVoiceClient; dsb_c.p_CDSVoice = new CDirectSoundVoice(is3D); dsb_i.p_CDSVoice = dsb_c.p_CDSVoice; - dsb_c.p_unknown_18 = reinterpret_cast(&dsb_c.p_unknown_14); + dsb_c.p_unknown_18 = reinterpret_cast(&dsb_c.p_unknown_14); dsb_c.p_unknown_14 = dsb_c.p_unknown_18; } }; diff --git a/src/core/hle/Intercept.cpp b/src/core/hle/Intercept.cpp index 7e1cdfe65..532847b3f 100644 --- a/src/core/hle/Intercept.cpp +++ b/src/core/hle/Intercept.cpp @@ -72,7 +72,7 @@ static struct { static const char* section_symbols = "Symbols"; -std::map g_SymbolAddresses; +std::map g_SymbolAddresses; bool g_SymbolCacheUsed = false; bool bLLE_APU = false; // Set this to true for experimental APU (sound) LLE @@ -99,13 +99,13 @@ void* GetXboxFunctionPointer(std::string functionName) } // NOTE: GetDetectedSymbolName do not get to be in XbSymbolDatabase, get symbol string in Cxbx project only. -std::string GetDetectedSymbolName(const xbox::addr address, int * const symbolOffset) +std::string GetDetectedSymbolName(const xbox::addr_xt address, int * const symbolOffset) { std::string result = ""; int closestMatch = MAXINT; for (auto it = g_SymbolAddresses.begin(); it != g_SymbolAddresses.end(); ++it) { - xbox::addr symbolAddr = it->second; + xbox::addr_xt symbolAddr = it->second; if (symbolAddr == xbox::zero) continue; @@ -132,11 +132,11 @@ std::string GetDetectedSymbolName(const xbox::addr address, int * const symbolOf // NOTE: VerifySymbolAddressAgainstXRef do not get to be in XbSymbolDatabase, perform verification in Cxbx project only. /* -bool VerifySymbolAddressAgainstXRef(char *SymbolName, xbox::addr Address, int XRef) +bool VerifySymbolAddressAgainstXRef(char *SymbolName, xbox::addr_xt Address, int XRef) { // Temporary verification - is XREF_D3DTSS_TEXCOORDINDEX derived correctly? // TODO : Remove this when XREF_D3DTSS_TEXCOORDINDEX derivation is deemed stable - xbox::addr XRefAddr = XRefDataBase[XRef]; + xbox::addr_xt XRefAddr = XRefDataBase[XRef]; if (XRefAddr == Address) return true; @@ -424,7 +424,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader) // Iterate through the map of symbol addresses, calling GetEmuPatchAddr on all functions. for (auto it = g_SymbolAddresses.begin(); it != g_SymbolAddresses.end(); ++it) { std::string functionName = it->first; - xbox::addr location = it->second; + xbox::addr_xt location = it->second; std::stringstream output; output << "SymbolCache: 0x" << std::setfill('0') << std::setw(8) << std::hex << location diff --git a/src/core/hle/Intercept.hpp b/src/core/hle/Intercept.hpp index 0080abe0e..b8a39d8c0 100644 --- a/src/core/hle/Intercept.hpp +++ b/src/core/hle/Intercept.hpp @@ -32,11 +32,11 @@ extern bool bLLE_GPU; // Set this to true for experimental GPU (graphics) LLE extern bool bLLE_USB; // Set this to true for experimental USB (input) LLE extern bool bLLE_JIT; // Set this to true for experimental JIT -extern std::map g_SymbolAddresses; +extern std::map g_SymbolAddresses; void EmuHLEIntercept(Xbe::Header *XbeHeader); -std::string GetDetectedSymbolName(const xbox::addr address, int * const symbolOffset); +std::string GetDetectedSymbolName(const xbox::addr_xt address, int * const symbolOffset); void* GetXboxFunctionPointer(std::string functionName); #define XB_TYPE(func) XB_TRAMPOLINE_##func##_t diff --git a/src/core/hle/Patches.cpp b/src/core/hle/Patches.cpp index c15c9b341..39201e985 100644 --- a/src/core/hle/Patches.cpp +++ b/src/core/hle/Patches.cpp @@ -390,7 +390,7 @@ inline bool TitleRequiresUnpatchedFibers() // NOTE: EmuInstallPatch do not get to be in XbSymbolDatabase, do the patches in Cxbx project only. -inline void EmuInstallPatch(const std::string FunctionName, const xbox::addr FunctionAddr) +inline void EmuInstallPatch(const std::string FunctionName, const xbox::addr_xt FunctionAddr) { auto it = g_PatchTable.find(FunctionName); if (it == g_PatchTable.end()) { diff --git a/src/core/hle/XACTENG/XactEng.cpp b/src/core/hle/XACTENG/XactEng.cpp index 23e98cb51..4e3b4e03a 100644 --- a/src/core/hle/XACTENG/XactEng.cpp +++ b/src/core/hle/XACTENG/XactEng.cpp @@ -28,7 +28,7 @@ #define LOG_PREFIX CXBXR_MODULE::XACT -#include +#include #include "core\kernel\init\CxbxKrnl.h" #include "common\Logging.h" #include "core\kernel\support\Emu.h" @@ -52,7 +52,7 @@ // ****************************************************************** // * patch: XACTEngineCreate // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(XACTEngineCreate) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XACTEngineCreate) ( X_XACT_RUNTIME_PARAMETERS* pParams, X_XACTEngine** ppEngine @@ -92,11 +92,11 @@ void WINAPI xbox::EMUPATCH(XACTEngineDoWork)() // ****************************************************************** // * EmuIXACTEngine_RegisterWaveBank // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_RegisterWaveBank) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_RegisterWaveBank) ( X_XACTEngine* pThis, LPVOID pvData, - DWORD dwSize, + dword_xt dwSize, X_XACTWaveBank** ppWaveBank ) { @@ -117,7 +117,7 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_RegisterWaveBank) // ****************************************************************** // * EmuIXACTEngine_RegisterStreamedWaveBank // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_RegisterStreamedWaveBank) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_RegisterStreamedWaveBank) ( X_XACTEngine* pThis, X_XACT_WAVEBANK_STREAMING_PARAMETERS* pParams, @@ -140,11 +140,11 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_RegisterStreamedWaveBank) // ****************************************************************** // * EmuIXACTEngine_CreateSoundBank // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_CreateSoundBank) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_CreateSoundBank) ( X_XACTEngine* pThis, LPVOID pvData, - DWORD dwSize, + dword_xt dwSize, X_XACTSoundBank** ppSoundBank ) { @@ -165,11 +165,11 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_CreateSoundBank) // ****************************************************************** // * EmuIXACTEngine_DownloadEffectsImage // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_DownloadEffectsImage) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_DownloadEffectsImage) ( X_XACTEngine* pThis, PVOID pvData, - DWORD dwSize, + dword_xt dwSize, LPVOID pEffectLoc, LPVOID* ppImageDesc ) @@ -190,10 +190,10 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_DownloadEffectsImage) // ****************************************************************** // * EmuIXACTEngine_CreateSoundSource // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_CreateSoundSource) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_CreateSoundSource) ( X_XACTEngine* pThis, - DWORD dwFlags, + dword_xt dwFlags, X_XACTSoundSource** ppSoundSource ) { @@ -211,10 +211,10 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_CreateSoundSource) // ****************************************************************** // * EmuIXACTEngine_EnableHeadphones // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_EnableHeadphones) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_EnableHeadphones) ( X_XACTEngine* pThis, - BOOL fEnabled + bool_xt fEnabled ) { LOG_FUNC_BEGIN @@ -228,7 +228,7 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_EnableHeadphones) // ****************************************************************** // * EmuIXACTEngine_SetListenerOrientation // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_SetListenerOrientation) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_SetListenerOrientation) ( X_XACTEngine* pThis, float xFront, @@ -237,7 +237,7 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_SetListenerOrientation) float xTop, float yTop, float zTop, - DWORD dwApply + dword_xt dwApply ) { LOG_FUNC_BEGIN @@ -257,13 +257,13 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_SetListenerOrientation) // ****************************************************************** // * EmuIXACTEngine_SetListenerPosition // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_SetListenerPosition) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_SetListenerPosition) ( X_XACTEngine* pThis, float x, float y, float z, - DWORD dwApply + dword_xt dwApply ) { LOG_FUNC_BEGIN @@ -280,13 +280,13 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_SetListenerPosition) // ****************************************************************** // * EmuIXACTEngine_SetListenerVelocity // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_SetListenerVelocity) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_SetListenerVelocity) ( X_XACTEngine* pThis, float x, float y, float z, - DWORD dwApply + dword_xt dwApply ) { LOG_FUNC_BEGIN @@ -303,11 +303,11 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_SetListenerVelocity) // ****************************************************************** // * EmuIXACTEngine_SetMasterVolume // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_SetMasterVolume) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_SetMasterVolume) ( X_XACTEngine* pThis, - WORD wCategory, - LONG lVolume + word_xt wCategory, + long_xt lVolume ) { LOG_FUNC_BEGIN @@ -322,7 +322,7 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_SetMasterVolume) // ****************************************************************** // * EmuIXACTEngine_CommitDeferredSettings // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_CommitDeferredSettings) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_CommitDeferredSettings) ( X_XACTEngine* pThis ) @@ -335,11 +335,11 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_CommitDeferredSettings) // ****************************************************************** // * EmuIXACTSoundBank_GetSoundCueIndexFromFriendlyName // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTSoundBank_GetSoundCueIndexFromFriendlyName) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTSoundBank_GetSoundCueIndexFromFriendlyName) ( X_XACTEngine* pThis, PCSTR pFriendlyName, - DWORD* pdwSoundCueIndex + dword_xt* pdwSoundCueIndex ) { LOG_FUNC_BEGIN @@ -354,12 +354,12 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTSoundBank_GetSoundCueIndexFromFriendlyName) // ****************************************************************** // * EmuIXACTSoundBank_Play // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTSoundBank_Play) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTSoundBank_Play) ( X_XACTSoundBank* pThis, - DWORD dwSoundCueIndex, + dword_xt dwSoundCueIndex, X_XACTSoundSource* pSoundSource, - DWORD dwFlags, + dword_xt dwFlags, X_XACTSoundCue** ppSoundCue ) { @@ -377,11 +377,11 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTSoundBank_Play) // ****************************************************************** // * EmuIXACTSoundBank_Stop // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTSoundBank_Stop) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTSoundBank_Stop) ( X_XACTSoundBank* pThis, - DWORD dwSoundCueIndex, - DWORD dwFlags, + dword_xt dwSoundCueIndex, + dword_xt dwFlags, X_XACTSoundCue* pSoundCue ) { @@ -398,13 +398,13 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTSoundBank_Stop) // ****************************************************************** // * EmuIXACTSoundSource_SetPosition // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTSoundSource_SetPosition) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTSoundSource_SetPosition) ( X_XACTSoundSource* pThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply ) { LOG_FUNC_BEGIN @@ -421,13 +421,13 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTSoundSource_SetPosition) // ****************************************************************** // * EmuIXACTSoundSource_SetVelocity // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTSoundSource_SetVelocity) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTSoundSource_SetVelocity) ( X_XACTSoundSource* pThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply ) { LOG_FUNC_BEGIN @@ -444,7 +444,7 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTSoundSource_SetVelocity) // ****************************************************************** // * EmuIXACTEngine_RegisterNotification // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_RegisterNotification) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_RegisterNotification) ( X_XACTEngine* pThis, PCXACT_NOTIFICATION_DESCRIPTION pNotificationDesc @@ -461,7 +461,7 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_RegisterNotification) // ****************************************************************** // * EmuIXACTEngine_GetNotification // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_GetNotification) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_GetNotification) ( X_XACTEngine* pThis, PCXACT_NOTIFICATION_DESCRIPTION pNotificationDesc, @@ -483,7 +483,7 @@ HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_GetNotification) // ****************************************************************** // * EmuIXACTEngine_UnRegisterWaveBank // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(IXACTEngine_UnRegisterWaveBank) +xbox::hresult_xt WINAPI xbox::EMUPATCH(IXACTEngine_UnRegisterWaveBank) ( X_XACTEngine* pThis, X_XACTWaveBank* pWaveBank diff --git a/src/core/hle/XACTENG/XactEng.h b/src/core/hle/XACTENG/XactEng.h index b71413fc8..81bc2dcb2 100644 --- a/src/core/hle/XACTENG/XactEng.h +++ b/src/core/hle/XACTENG/XactEng.h @@ -28,7 +28,6 @@ #include "common\xbe\Xbe.h" #include "core\hle\XAPI\Xapi.h" // For EMUPATCH -#undef FIELD_OFFSET // prevent macro redefinition warnings #include #include @@ -136,7 +135,7 @@ struct X_XACTSoundCue // ****************************************************************** // * EmuXACTEngineCreate // ****************************************************************** -HRESULT WINAPI EMUPATCH(XACTEngineCreate)( X_XACT_RUNTIME_PARAMETERS* pParams, X_XACTEngine** ppEngine ); +xbox::hresult_xt WINAPI EMUPATCH(XACTEngineCreate)( X_XACT_RUNTIME_PARAMETERS* pParams, X_XACTEngine** ppEngine ); // ****************************************************************** // * EmuXACTEngineDoWork @@ -146,18 +145,18 @@ void WINAPI EMUPATCH(XACTEngineDoWork)(); // ****************************************************************** // * EmuIXACTEngine_RegisterWaveBank // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_RegisterWaveBank) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_RegisterWaveBank) ( X_XACTEngine* pThis, LPVOID pvData, - DWORD dwSize, + dword_xt dwSize, X_XACTWaveBank** ppWaveBank ); // ****************************************************************** // * EmuIXACTEngine_RegisterStreamedWaveBank // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_RegisterStreamedWaveBank) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_RegisterStreamedWaveBank) ( X_XACTEngine* pThis, X_XACT_WAVEBANK_STREAMING_PARAMETERS* pParams, @@ -167,22 +166,22 @@ HRESULT WINAPI EMUPATCH(IXACTEngine_RegisterStreamedWaveBank) // ****************************************************************** // * EmuIXACTEngine_CreateSoundBank // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_CreateSoundBank) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_CreateSoundBank) ( X_XACTEngine* pThis, LPVOID pvData, - DWORD dwSize, + dword_xt dwSize, X_XACTSoundBank** ppSoundBank ); // ****************************************************************** // * EmuIXACTEngine_DownloadEffectsImage // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_DownloadEffectsImage) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_DownloadEffectsImage) ( X_XACTEngine* pThis, PVOID pvData, - DWORD dwSize, + dword_xt dwSize, LPVOID pEffectLoc, LPVOID* ppImageDesc ); @@ -190,26 +189,26 @@ HRESULT WINAPI EMUPATCH(IXACTEngine_DownloadEffectsImage) // ****************************************************************** // * EmuIXACTEngine_CreateSoundSource // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_CreateSoundSource) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_CreateSoundSource) ( X_XACTEngine* pThis, - DWORD dwFlags, + dword_xt dwFlags, X_XACTSoundSource** ppSoundSource ); // ****************************************************************** // * EmuIXACTEngine_EnableHeadphones // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_EnableHeadphones) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_EnableHeadphones) ( X_XACTEngine* pThis, - BOOL fEnabled + bool_xt fEnabled ); // ****************************************************************** // * EmuIXACTEngine_SetListenerOrientation // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_SetListenerOrientation) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_SetListenerOrientation) ( X_XACTEngine* pThis, float xFront, @@ -218,109 +217,109 @@ HRESULT WINAPI EMUPATCH(IXACTEngine_SetListenerOrientation) float xTop, float yTop, float zTop, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * EmuIXACTEngine_SetListenerPosition // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_SetListenerPosition) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_SetListenerPosition) ( X_XACTEngine* pThis, float x, float y, float z, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * EmuIXACTEngine_SetListenerVelocity // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_SetListenerVelocity) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_SetListenerVelocity) ( X_XACTEngine* pThis, float x, float y, float z, - DWORD dwApply + dword_xt dwApply ); // ****************************************************************** // * EmuIXACTEngine_SetMasterVolume // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_SetMasterVolume) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_SetMasterVolume) ( X_XACTEngine* pThis, - WORD wCategory, - LONG lVolume + word_xt wCategory, + long_xt lVolume ); // ****************************************************************** // * EmuIXACTEngine_CommitDeferredSettings // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_CommitDeferredSettings)(X_XACTEngine* pThis); +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_CommitDeferredSettings)(X_XACTEngine* pThis); // ****************************************************************** // * EmuIXACTSoundBank_GetSoundCueIndexFromFriendlyName // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTSoundBank_GetSoundCueIndexFromFriendlyName) +xbox::hresult_xt WINAPI EMUPATCH(IXACTSoundBank_GetSoundCueIndexFromFriendlyName) ( X_XACTEngine* pThis, PCSTR pFriendlyName, - DWORD* pdwSoundCueIndex + dword_xt* pdwSoundCueIndex ); // ****************************************************************** // * EmuIXACTSoundBank_Play // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTSoundBank_Play) +xbox::hresult_xt WINAPI EMUPATCH(IXACTSoundBank_Play) ( X_XACTSoundBank* pThis, - DWORD dwSoundCueIndex, + dword_xt dwSoundCueIndex, X_XACTSoundSource* pSoundSource, - DWORD dwFlags, + dword_xt dwFlags, X_XACTSoundCue** ppSoundCue ); // ****************************************************************** // * EmuIXACTSoundBank_Stop // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTSoundBank_Stop) +xbox::hresult_xt WINAPI EMUPATCH(IXACTSoundBank_Stop) ( X_XACTSoundBank* pThis, - DWORD dwSoundCueIndex, - DWORD dwFlags, + dword_xt dwSoundCueIndex, + dword_xt dwFlags, X_XACTSoundCue* pSoundCue ); // ****************************************************************** // * EmuIXACTSoundSource_SetPosition // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTSoundSource_SetPosition) +xbox::hresult_xt WINAPI EMUPATCH(IXACTSoundSource_SetPosition) ( X_XACTSoundSource* pThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply ); // ****************************************************************** // * EmuIXACTSoundSource_SetVelocity // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTSoundSource_SetVelocity) +xbox::hresult_xt WINAPI EMUPATCH(IXACTSoundSource_SetVelocity) ( X_XACTSoundSource* pThis, - FLOAT x, - FLOAT y, - FLOAT z, - DWORD dwApply + float_xt x, + float_xt y, + float_xt z, + dword_xt dwApply ); // ****************************************************************** // * EmuIXACTEngine_RegisterNotification // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_RegisterNotification) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_RegisterNotification) ( X_XACTEngine* pThis, PCXACT_NOTIFICATION_DESCRIPTION pNotificationDesc @@ -329,7 +328,7 @@ HRESULT WINAPI EMUPATCH(IXACTEngine_RegisterNotification) // ****************************************************************** // * EmuIXACTEngine_GetNotification // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_GetNotification) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_GetNotification) ( X_XACTEngine* pThis, PCXACT_NOTIFICATION_DESCRIPTION pNotificationDesc, @@ -339,7 +338,7 @@ HRESULT WINAPI EMUPATCH(IXACTEngine_GetNotification) // ****************************************************************** // * EmuIXACTEngine_UnRegisterWaveBank // ****************************************************************** -HRESULT WINAPI EMUPATCH(IXACTEngine_UnRegisterWaveBank) +xbox::hresult_xt WINAPI EMUPATCH(IXACTEngine_UnRegisterWaveBank) ( X_XACTEngine* pThis, X_XACTWaveBank* pWaveBank diff --git a/src/core/hle/XAPI/Xapi.cpp b/src/core/hle/XAPI/Xapi.cpp index 275e1309b..e29559588 100644 --- a/src/core/hle/XAPI/Xapi.cpp +++ b/src/core/hle/XAPI/Xapi.cpp @@ -27,10 +27,9 @@ #define LOG_PREFIX CXBXR_MODULE::XAPI -#undef FIELD_OFFSET // prevent macro redefinition warnings -#include +#include #include "common\input\SdlJoystick.h" #include "common\input\InputManager.h" #include @@ -193,8 +192,8 @@ void SetupXboxDeviceTypes() if (typeInformation != g_SymbolAddresses.end() && typeInformation->second != xbox::zero) { printf("Deriving XDEVICE_TYPE_GAMEPAD from DeviceTable (via GetTypeInformation)\n"); // Read the offset values of the device table structure from GetTypeInformation - xbox::addr deviceTableStartOffset = *(uint32_t*)((uint32_t)typeInformation->second + 0x01); - xbox::addr deviceTableEndOffset = *(uint32_t*)((uint32_t)typeInformation->second + 0x09); + xbox::addr_xt deviceTableStartOffset = *(uint32_t*)((uint32_t)typeInformation->second + 0x01); + xbox::addr_xt deviceTableEndOffset = *(uint32_t*)((uint32_t)typeInformation->second + 0x09); // Calculate the number of device entires in the table size_t deviceTableEntryCount = (deviceTableEndOffset - deviceTableStartOffset) / sizeof(uint32_t); @@ -256,9 +255,9 @@ void SetupXboxDeviceTypes() // ****************************************************************** // * patch: XInitDevices // ****************************************************************** -xbox::VOID WINAPI xbox::EMUPATCH(XInitDevices) +xbox::void_xt WINAPI xbox::EMUPATCH(XInitDevices) ( - DWORD dwPreallocTypeCount, + dword_xt dwPreallocTypeCount, PXDEVICE_PREALLOC_TYPE PreallocTypes ) { @@ -321,7 +320,7 @@ void UpdateConnectedDeviceState(xbox::PXPP_DEVICE_TYPE DeviceType) { // * This in turn requires USB LLE to be implemented, or USBD_Init // * patched with a stub, so this patch is still enabled for now // ****************************************************************** -xbox::DWORD WINAPI xbox::EMUPATCH(XGetDevices) +xbox::dword_xt WINAPI xbox::EMUPATCH(XGetDevices) ( PXPP_DEVICE_TYPE DeviceType ) @@ -332,7 +331,7 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XGetDevices) UCHAR oldIrql = xbox::KeRaiseIrqlToDpcLevel(); - DWORD ret = DeviceType->CurrentConnected; + dword_xt ret = DeviceType->CurrentConnected; DeviceType->ChangeConnected = 0; DeviceType->PreviousConnected = DeviceType->CurrentConnected; @@ -349,7 +348,7 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XGetDevices) // * This in turn requires USB LLE to be implemented, or USBD_Init // * patched with a stub, so this patch is still enabled for now // ****************************************************************** -xbox::BOOL WINAPI xbox::EMUPATCH(XGetDeviceChanges) +xbox::bool_xt WINAPI xbox::EMUPATCH(XGetDeviceChanges) ( PXPP_DEVICE_TYPE DeviceType, PDWORD pdwInsertions, @@ -403,8 +402,8 @@ xbox::BOOL WINAPI xbox::EMUPATCH(XGetDeviceChanges) xbox::HANDLE WINAPI xbox::EMUPATCH(XInputOpen) ( IN PXPP_DEVICE_TYPE DeviceType, - IN DWORD dwPort, - IN DWORD dwSlot, + IN dword_xt dwPort, + IN dword_xt dwSlot, IN PXINPUT_POLLING_PARAMETERS pPollingParameters OPTIONAL ) { @@ -455,7 +454,7 @@ xbox::HANDLE WINAPI xbox::EMUPATCH(XInputOpen) // ****************************************************************** // * patch: XInputClose // ****************************************************************** -xbox::VOID WINAPI xbox::EMUPATCH(XInputClose) +xbox::void_xt WINAPI xbox::EMUPATCH(XInputClose) ( IN HANDLE hDevice ) @@ -472,7 +471,7 @@ xbox::VOID WINAPI xbox::EMUPATCH(XInputClose) // ****************************************************************** // * patch: XInputPoll // ****************************************************************** -xbox::DWORD WINAPI xbox::EMUPATCH(XInputPoll) +xbox::dword_xt WINAPI xbox::EMUPATCH(XInputPoll) ( IN HANDLE hDevice ) @@ -487,7 +486,7 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XInputPoll) // ****************************************************************** // * patch: XInputGetCapabilities // ****************************************************************** -xbox::DWORD WINAPI xbox::EMUPATCH(XInputGetCapabilities) +xbox::dword_xt WINAPI xbox::EMUPATCH(XInputGetCapabilities) ( IN HANDLE hDevice, OUT PXINPUT_CAPABILITIES pCapabilities @@ -498,7 +497,7 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XInputGetCapabilities) LOG_FUNC_ARG_OUT(pCapabilities) LOG_FUNC_END; - DWORD ret = ERROR_DEVICE_NOT_CONNECTED; + dword_xt ret = ERROR_DEVICE_NOT_CONNECTED; PCXBX_CONTROLLER_HOST_BRIDGE Device = (PCXBX_CONTROLLER_HOST_BRIDGE)hDevice; int Port = Device->XboxPort; if (g_XboxControllerHostBridge[Port].hXboxDevice == hDevice && !g_XboxControllerHostBridge[Port].bPendingRemoval) { @@ -739,7 +738,7 @@ void EmuSBCGetState(xbox::PX_SBC_GAMEPAD pSBCGamepad, xbox::PXINPUT_GAMEPAD pXIG // ****************************************************************** // * patch: XInputGetState // ****************************************************************** -xbox::DWORD WINAPI xbox::EMUPATCH(XInputGetState) +xbox::dword_xt WINAPI xbox::EMUPATCH(XInputGetState) ( IN HANDLE hDevice, OUT PXINPUT_STATE pState @@ -752,7 +751,7 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XInputGetState) LOG_FUNC_ARG_OUT(pState) LOG_FUNC_END; - DWORD ret = ERROR_DEVICE_NOT_CONNECTED; + dword_xt ret = ERROR_DEVICE_NOT_CONNECTED; PCXBX_CONTROLLER_HOST_BRIDGE Device = (PCXBX_CONTROLLER_HOST_BRIDGE)hDevice; int Port = Device->XboxPort; if (g_XboxControllerHostBridge[Port].hXboxDevice == hDevice) { @@ -773,7 +772,7 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XInputGetState) // ****************************************************************** // * patch: XInputSetState // ****************************************************************** -xbox::DWORD WINAPI xbox::EMUPATCH(XInputSetState) +xbox::dword_xt WINAPI xbox::EMUPATCH(XInputSetState) ( IN HANDLE hDevice, IN OUT PXINPUT_FEEDBACK pFeedback @@ -808,10 +807,10 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XInputSetState) // ****************************************************************** // * patch: SetThreadPriorityBoost // ****************************************************************** -xbox::BOOL WINAPI xbox::EMUPATCH(SetThreadPriorityBoost) +xbox::bool_xt WINAPI xbox::EMUPATCH(SetThreadPriorityBoost) ( HANDLE hThread, - BOOL DisablePriorityBoost + bool_xt DisablePriorityBoost ) { @@ -832,7 +831,7 @@ xbox::BOOL WINAPI xbox::EMUPATCH(SetThreadPriorityBoost) // ****************************************************************** // * patch: SetThreadPriority // ****************************************************************** -xbox::BOOL WINAPI xbox::EMUPATCH(SetThreadPriority) +xbox::bool_xt WINAPI xbox::EMUPATCH(SetThreadPriority) ( HANDLE hThread, int nPriority @@ -877,7 +876,7 @@ int WINAPI xbox::EMUPATCH(GetThreadPriority) // ****************************************************************** // * patch: GetExitCodeThread // ****************************************************************** -xbox::BOOL WINAPI xbox::EMUPATCH(GetExitCodeThread) +xbox::bool_xt WINAPI xbox::EMUPATCH(GetExitCodeThread) ( HANDLE hThread, LPDWORD lpExitCode @@ -890,7 +889,7 @@ xbox::BOOL WINAPI xbox::EMUPATCH(GetExitCodeThread) LOG_FUNC_ARG(lpExitCode) LOG_FUNC_END; - BOOL bRet = GetExitCodeThread(hThread, lpExitCode); + BOOL bRet = GetExitCodeThread(hThread, (::LPDWORD)lpExitCode); RETURN(bRet); } @@ -898,10 +897,10 @@ xbox::BOOL WINAPI xbox::EMUPATCH(GetExitCodeThread) // ****************************************************************** // * patch: XapiThreadStartup // ****************************************************************** -xbox::VOID WINAPI xbox::EMUPATCH(XapiThreadStartup) +xbox::void_xt WINAPI xbox::EMUPATCH(XapiThreadStartup) ( - DWORD dwDummy1, - DWORD dwDummy2 + dword_xt dwDummy1, + dword_xt dwDummy2 ) { LOG_FUNC_BEGIN @@ -909,7 +908,7 @@ xbox::VOID WINAPI xbox::EMUPATCH(XapiThreadStartup) LOG_FUNC_ARG(dwDummy2) LOG_FUNC_END; - typedef int (__stdcall *pfDummyFunc)(DWORD dwDummy); + typedef int (__stdcall *pfDummyFunc)(dword_xt dwDummy); pfDummyFunc func = (pfDummyFunc)dwDummy1; @@ -931,10 +930,10 @@ xbox::VOID WINAPI xbox::EMUPATCH(XapiThreadStartup) // ****************************************************************** // * patch: XRegisterThreadNotifyRoutine // ****************************************************************** -xbox::VOID WINAPI xbox::EMUPATCH(XRegisterThreadNotifyRoutine) +xbox::void_xt WINAPI xbox::EMUPATCH(XRegisterThreadNotifyRoutine) ( PXTHREAD_NOTIFICATION pThreadNotification, - BOOL fRegister + bool_xt fRegister ) { LOG_FUNC_BEGIN @@ -992,7 +991,7 @@ void WINAPI EmuFiberStartup(fiber_context_t* context) // ****************************************************************** xbox::LPVOID WINAPI xbox::EMUPATCH(CreateFiber) ( - DWORD dwStackSize, + dword_xt dwStackSize, LPFIBER_START_ROUTINE lpStartRoutine, LPVOID lpParameter ) @@ -1018,7 +1017,7 @@ xbox::LPVOID WINAPI xbox::EMUPATCH(CreateFiber) // ****************************************************************** // * patch: DeleteFiber // ****************************************************************** -xbox::VOID WINAPI xbox::EMUPATCH(DeleteFiber) +xbox::void_xt WINAPI xbox::EMUPATCH(DeleteFiber) ( LPVOID lpFiber ) @@ -1032,7 +1031,7 @@ xbox::VOID WINAPI xbox::EMUPATCH(DeleteFiber) // ****************************************************************** // * patch: SwitchToFiber // ****************************************************************** -xbox::VOID WINAPI xbox::EMUPATCH(SwitchToFiber) +xbox::void_xt WINAPI xbox::EMUPATCH(SwitchToFiber) ( LPVOID lpFiber ) @@ -1062,11 +1061,11 @@ xbox::LPVOID WINAPI xbox::EMUPATCH(ConvertThreadToFiber) // ****************************************************************** // * patch: QueueUserAPC // ****************************************************************** -xbox::DWORD WINAPI xbox::EMUPATCH(QueueUserAPC) +xbox::dword_xt WINAPI xbox::EMUPATCH(QueueUserAPC) ( PAPCFUNC pfnAPC, HANDLE hThread, - DWORD dwData + dword_xt dwData ) { LOG_FUNC_BEGIN @@ -1075,7 +1074,7 @@ xbox::DWORD WINAPI xbox::EMUPATCH(QueueUserAPC) LOG_FUNC_ARG(dwData) LOG_FUNC_END; - DWORD dwRet = 0; + dword_xt dwRet = 0; // If necessary, we can just continue to emulate NtQueueApcThread (0xCE). // I added this because NtQueueApcThread fails in Metal Slug 3. @@ -1095,12 +1094,12 @@ xbox::DWORD WINAPI xbox::EMUPATCH(QueueUserAPC) // ****************************************************************** // * patch: GetOverlappedResult // ****************************************************************** -BOOL WINAPI xbox::EMUPATCH(GetOverlappedResult) +xbox::bool_xt WINAPI xbox::EMUPATCH(GetOverlappedResult) ( HANDLE hFile, LPOVERLAPPED lpOverlapped, LPDWORD lpNumberOfBytesTransferred, - BOOL bWait + bool_xt bWait ) { LOG_FUNC_BEGIN @@ -1122,7 +1121,7 @@ BOOL WINAPI xbox::EMUPATCH(GetOverlappedResult) // ****************************************************************** // * patch: XLaunchNewImageA // ****************************************************************** -xbox::DWORD WINAPI xbox::EMUPATCH(XLaunchNewImageA) +xbox::dword_xt WINAPI xbox::EMUPATCH(XLaunchNewImageA) ( LPCSTR lpTitlePath, PLAUNCH_DATA pLaunchData @@ -1153,7 +1152,7 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XLaunchNewImageA) PVOID LaunchDataVAddr = xbox::MmAllocateContiguousMemory(sizeof(xbox::LAUNCH_DATA_PAGE)); if (!LaunchDataVAddr) { - RETURN(STATUS_NO_MEMORY); + RETURN(xbox::status_no_memory); } xbox::LaunchDataPage = (xbox::LAUNCH_DATA_PAGE*)LaunchDataVAddr; } @@ -1205,7 +1204,7 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XLaunchNewImageA) // ****************************************************************** // * patch: XGetLaunchInfo // ****************************************************************** -DWORD WINAPI xbox::EMUPATCH(XGetLaunchInfo) +xbox::dword_xt WINAPI xbox::EMUPATCH(XGetLaunchInfo) ( PDWORD pdwLaunchDataType, PLAUNCH_DATA pLaunchData @@ -1225,7 +1224,7 @@ DWORD WINAPI xbox::EMUPATCH(XGetLaunchInfo) LOG_FUNC_ARG(pLaunchData) LOG_FUNC_END; - DWORD ret = ERROR_NOT_FOUND; + dword_xt ret = ERROR_NOT_FOUND; if (xbox::LaunchDataPage != NULL) { @@ -1255,9 +1254,9 @@ DWORD WINAPI xbox::EMUPATCH(XGetLaunchInfo) // ****************************************************************** // * patch: XSetProcessQuantumLength // ****************************************************************** -xbox::VOID WINAPI xbox::EMUPATCH(XSetProcessQuantumLength) +xbox::void_xt WINAPI xbox::EMUPATCH(XSetProcessQuantumLength) ( - DWORD dwMilliseconds + dword_xt dwMilliseconds ) { @@ -1270,12 +1269,12 @@ xbox::VOID WINAPI xbox::EMUPATCH(XSetProcessQuantumLength) // ****************************************************************** // * patch: SignalObjectAndWait // ****************************************************************** -xbox::DWORD WINAPI xbox::EMUPATCH(SignalObjectAndWait) +xbox::dword_xt WINAPI xbox::EMUPATCH(SignalObjectAndWait) ( HANDLE hObjectToSignal, HANDLE hObjectToWaitOn, - DWORD dwMilliseconds, - BOOL bAlertable + dword_xt dwMilliseconds, + bool_xt bAlertable ) { @@ -1286,7 +1285,7 @@ xbox::DWORD WINAPI xbox::EMUPATCH(SignalObjectAndWait) LOG_FUNC_ARG(bAlertable) LOG_FUNC_END; - DWORD dwRet = SignalObjectAndWait( hObjectToSignal, hObjectToWaitOn, dwMilliseconds, bAlertable ); + dword_xt dwRet = SignalObjectAndWait( hObjectToSignal, hObjectToWaitOn, dwMilliseconds, bAlertable ); RETURN(dwRet); } @@ -1296,11 +1295,11 @@ xbox::DWORD WINAPI xbox::EMUPATCH(SignalObjectAndWait) // ****************************************************************** MMRESULT WINAPI xbox::EMUPATCH(timeSetEvent) ( - UINT uDelay, - UINT uResolution, + uint_xt uDelay, + uint_xt uResolution, LPTIMECALLBACK fptc, - DWORD dwUser, - UINT fuEvent + dword_xt dwUser, + uint_xt fuEvent ) { @@ -1323,7 +1322,7 @@ MMRESULT WINAPI xbox::EMUPATCH(timeSetEvent) // ****************************************************************** MMRESULT WINAPI xbox::EMUPATCH(timeKillEvent) ( - UINT uTimerID + uint_xt uTimerID ) { @@ -1338,12 +1337,12 @@ MMRESULT WINAPI xbox::EMUPATCH(timeKillEvent) // ****************************************************************** // * patch: RaiseException // ****************************************************************** -xbox::VOID WINAPI xbox::EMUPATCH(RaiseException) +xbox::void_xt WINAPI xbox::EMUPATCH(RaiseException) ( - DWORD dwExceptionCode, // exception code - DWORD dwExceptionFlags, // continuable exception flag - DWORD nNumberOfArguments, // number of arguments - CONST ULONG_PTR *lpArguments // array of arguments + dword_xt dwExceptionCode, // exception code + dword_xt dwExceptionFlags, // continuable exception flag + dword_xt nNumberOfArguments, // number of arguments + CONST ulong_ptr_xt *lpArguments // array of arguments ) { @@ -1364,10 +1363,10 @@ xbox::VOID WINAPI xbox::EMUPATCH(RaiseException) // ****************************************************************** // patch: XMountMUA // ****************************************************************** -xbox::DWORD WINAPI xbox::EMUPATCH(XMountMUA) +xbox::dword_xt WINAPI xbox::EMUPATCH(XMountMUA) ( - DWORD dwPort, - DWORD dwSlot, + dword_xt dwPort, + dword_xt dwSlot, PCHAR pchDrive ) { @@ -1388,13 +1387,13 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XMountMUA) // ****************************************************************** // * patch: XGetDeviceEnumerationStatus // ****************************************************************** -xbox::DWORD WINAPI xbox::EMUPATCH(XGetDeviceEnumerationStatus)() +xbox::dword_xt WINAPI xbox::EMUPATCH(XGetDeviceEnumerationStatus)() { LOG_FUNC(); - DWORD ret = (g_bIsDevicesInitializing || g_bIsDevicesEmulating) ? XDEVICE_ENUMERATION_BUSY : XDEVICE_ENUMERATION_IDLE; + dword_xt ret = (g_bIsDevicesInitializing || g_bIsDevicesEmulating) ? XDEVICE_ENUMERATION_BUSY : XDEVICE_ENUMERATION_IDLE; RETURN(ret); } @@ -1402,7 +1401,7 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XGetDeviceEnumerationStatus)() // ****************************************************************** // * patch: XInputGetDeviceDescription // ****************************************************************** -xbox::DWORD WINAPI xbox::EMUPATCH(XInputGetDeviceDescription) +xbox::dword_xt WINAPI xbox::EMUPATCH(XInputGetDeviceDescription) ( HANDLE hDevice, PVOID pDescription @@ -1424,10 +1423,10 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XInputGetDeviceDescription) // ****************************************************************** // * patch: XMountMURootA // ****************************************************************** -xbox::DWORD WINAPI xbox::EMUPATCH(XMountMURootA) +xbox::dword_xt WINAPI xbox::EMUPATCH(XMountMURootA) ( - DWORD dwPort, - DWORD dwSlot, + dword_xt dwPort, + dword_xt dwSlot, PCHAR pchDrive ) { @@ -1448,7 +1447,7 @@ xbox::DWORD WINAPI xbox::EMUPATCH(XMountMURootA) // ****************************************************************** // * patch: OutputDebugStringA // ****************************************************************** -xbox::VOID WINAPI xbox::EMUPATCH(OutputDebugStringA) +xbox::void_xt WINAPI xbox::EMUPATCH(OutputDebugStringA) ( IN LPCSTR lpOutputString ) diff --git a/src/core/hle/XAPI/Xapi.h b/src/core/hle/XAPI/Xapi.h index 794a9de45..43b183f9c 100644 --- a/src/core/hle/XAPI/Xapi.h +++ b/src/core/hle/XAPI/Xapi.h @@ -51,7 +51,7 @@ typedef void* LPSECURITY_ATTRIBUTES; // ****************************************************************** // * PTHREAD_START_ROUTINE / LPTHREAD_START_ROUTINE // ****************************************************************** -typedef DWORD (WINAPI *PTHREAD_START_ROUTINE) +typedef xbox::dword_xt (WINAPI *PTHREAD_START_ROUTINE) ( LPVOID lpThreadParameter ); @@ -62,12 +62,12 @@ typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE; // ****************************************************************** typedef struct _XINPUT_POLLING_PARAMETERS { - BYTE fAutoPoll : 1; - BYTE fInterruptOut : 1; - BYTE ReservedMBZ1 : 6; - BYTE bInputInterval; - BYTE bOutputInterval; - BYTE ReservedMBZ2; + xbox::byte_xt fAutoPoll : 1; + xbox::byte_xt fInterruptOut : 1; + xbox::byte_xt ReservedMBZ1 : 6; + xbox::byte_xt bInputInterval; + xbox::byte_xt bOutputInterval; + xbox::byte_xt ReservedMBZ2; } XINPUT_POLLING_PARAMETERS, *PXINPUT_POLLING_PARAMETERS; @@ -76,9 +76,9 @@ XINPUT_POLLING_PARAMETERS, *PXINPUT_POLLING_PARAMETERS; // ****************************************************************** typedef struct _XPP_DEVICE_TYPE { - ULONG CurrentConnected; - ULONG ChangeConnected; - ULONG PreviousConnected; + xbox::ulong_xt CurrentConnected; + xbox::ulong_xt ChangeConnected; + xbox::ulong_xt PreviousConnected; } XPP_DEVICE_TYPE, *PXPP_DEVICE_TYPE; @@ -87,9 +87,9 @@ XPP_DEVICE_TYPE, *PXPP_DEVICE_TYPE; // ****************************************************************** typedef struct _XPP_DEVICE_INPUTSTATE_DESC { - unsigned char ucSize; //size of InputState, doesn't include the dwPacketNumber, seems DWORD aligned. + unsigned char ucSize; //size of InputState, doesn't include the dwPacketNumber, seems xbox::dword_xt aligned. unsigned char * pInputState;//pointer to InputState - unsigned char ucUnknown[3]; //for DWORD align + unsigned char ucUnknown[3]; //for xbox::dword_xt align } XPP_DEVICE_INPUTSTATE_DESC, *PXPP_DEVICE_INPUTSTATE_DESC; @@ -98,9 +98,9 @@ XPP_DEVICE_INPUTSTATE_DESC, *PXPP_DEVICE_INPUTSTATE_DESC; // ****************************************************************** typedef struct _XPP_DEVICE_FEEDBACK_DESC { - unsigned char ucSize; //size of Feedback, not include Feedback_Header, seems DWORD aligned. + unsigned char ucSize; //size of Feedback, not include Feedback_Header, seems xbox::dword_xt aligned. unsigned char * pFeedback; //pointer to Feedback - unsigned char ucUnknown[3]; //for DWORD align + unsigned char ucUnknown[3]; //for xbox::dword_xt align } XPP_DEVICE_FEEDBACK_DESC, *PXPP_DEVICE_FEEDBACK_DESC; @@ -109,15 +109,15 @@ XPP_DEVICE_FEEDBACK_DESC, *PXPP_DEVICE_FEEDBACK_DESC; // ****************************************************************** typedef struct _XID_TYPE_INFORMATION { - UCHAR ucType; - BYTE bRemainingHandles; - UCHAR ucUnknown[2];//probably for DWORD align + xbox::uchar_xt ucType; + xbox::byte_xt bRemainingHandles; + xbox::uchar_xt ucUnknown[2];//probably for xbox::dword_xt align PXPP_DEVICE_TYPE XppType;//pointer to DeviceType structure. PXPP_DEVICE_INPUTSTATE_DESC pInputStateDesc;//pointer to InputStateDesc structure PXPP_DEVICE_FEEDBACK_DESC pFeedbackDesc;//pointer to FeedbackDesc structure - DWORD * pConstant;//always 0x0801 + xbox::dword_xt * pConstant;//always 0x0801 void * pFunction;//unknown function for device related process - DWORD dwEndZero;//last DWROD, always 0 + xbox::dword_xt dwEndZero;//last DWROD, always 0 } XID_TYPE_INFORMATION, *PXID_TYPE_INFORMATION; // ****************************************************************** @@ -126,7 +126,7 @@ typedef struct _XID_TYPE_INFORMATION typedef struct _XDEVICE_PREALLOC_TYPE { PXPP_DEVICE_TYPE DeviceType; - DWORD dwPreallocCount; + xbox::dword_xt dwPreallocCount; } XDEVICE_PREALLOC_TYPE, *PXDEVICE_PREALLOC_TYPE; @@ -135,12 +135,12 @@ XDEVICE_PREALLOC_TYPE, *PXDEVICE_PREALLOC_TYPE; // ****************************************************************** typedef struct _XINPUT_GAMEPAD { - WORD wButtons; - BYTE bAnalogButtons[8]; - SHORT sThumbLX; - SHORT sThumbLY; - SHORT sThumbRX; - SHORT sThumbRY; + xbox::word_xt wButtons; + xbox::byte_xt bAnalogButtons[8]; + xbox::short_xt sThumbLX; + xbox::short_xt sThumbLY; + xbox::short_xt sThumbRX; + xbox::short_xt sThumbRY; } XINPUT_GAMEPAD, *PXINPUT_GAMEPAD; @@ -148,17 +148,17 @@ XINPUT_GAMEPAD, *PXINPUT_GAMEPAD; // * X_SBC_GAMEPAD for xbox SteelBatalion GAMEPAD struc // ****************************************************************** typedef struct _X_SBC_GAMEPAD { - WORD wButtons[3]; - SHORT sAimingX; - SHORT sAimingY; - SHORT sRotationLever;//maybe only high byte was used. - SHORT sSightChangeX; - SHORT sSightChangeY; - WORD wLeftPedal;//maybe only high byte was used. - WORD wMiddlePedal;//maybe only high byte was used. - WORD wRightPedal;//maybe only high byte was used. - UCHAR ucTunerDial;//low nibble, The 9 o'clock postion is 0, and the 6 o'clock position is 12. The blank area between the 6 and 9 o'clock positions is 13, 14, and 15 clockwise. - UCHAR ucGearLever;//GearLever 1~5 for gear 1~5, 7~13 for gear R,N,1~5, 15 for gear R. we use the continues range from 7~13 + xbox::word_xt wButtons[3]; + xbox::short_xt sAimingX; + xbox::short_xt sAimingY; + xbox::short_xt sRotationLever;//maybe only high byte was used. + xbox::short_xt sSightChangeX; + xbox::short_xt sSightChangeY; + xbox::word_xt wLeftPedal;//maybe only high byte was used. + xbox::word_xt wMiddlePedal;//maybe only high byte was used. + xbox::word_xt wRightPedal;//maybe only high byte was used. + xbox::uchar_xt ucTunerDial;//low nibble, The 9 o'clock postion is 0, and the 6 o'clock position is 12. The blank area between the 6 and 9 o'clock positions is 13, 14, and 15 clockwise. + xbox::uchar_xt ucGearLever;//GearLever 1~5 for gear 1~5, 7~13 for gear R,N,1~5, 15 for gear R. we use the continues range from 7~13 } X_SBC_GAMEPAD, *PX_SBC_GAMEPAD; @@ -167,8 +167,8 @@ X_SBC_GAMEPAD, *PX_SBC_GAMEPAD; // ****************************************************************** typedef struct _XINPUT_RUMBLE { - WORD wLeftMotorSpeed; - WORD wRightMotorSpeed; + xbox::word_xt wLeftMotorSpeed; + xbox::word_xt wRightMotorSpeed; } XINPUT_RUMBLE, *PXINPUT_RUMBLE; @@ -178,8 +178,8 @@ XINPUT_RUMBLE, *PXINPUT_RUMBLE; #include "AlignPrefix1.h" typedef struct _XINPUT_CAPABILITIES { - BYTE SubType; - WORD Reserved; + xbox::byte_xt SubType; + xbox::word_xt Reserved; union { @@ -226,7 +226,7 @@ XINPUT_CAPABILITIES, *PXINPUT_CAPABILITIES; // ****************************************************************** typedef struct _XINPUT_STATE { - DWORD dwPacketNumber; + xbox::dword_xt dwPacketNumber; union { @@ -241,11 +241,11 @@ XINPUT_STATE, *PXINPUT_STATE; #include "AlignPrefix1.h" typedef struct _XINPUT_FEEDBACK_HEADER { - DWORD dwStatus; + xbox::dword_xt dwStatus; HANDLE OPTIONAL hEvent; - BYTE Unknown1[4]; + xbox::byte_xt Unknown1[4]; PVOID IoCompletedEvent; // PKEVENT really - BYTE Unknown2[50]; + xbox::byte_xt Unknown2[50]; } #include "AlignPosfix1.h" XINPUT_FEEDBACK_HEADER, *PXINPUT_FEEDBACK_HEADER; @@ -269,15 +269,15 @@ XINPUT_FEEDBACK, *PXINPUT_FEEDBACK; // ****************************************************************** typedef struct _RTL_HEAP_PARAMETERS { - ULONG Length; - BYTE Unknown[0x2C]; + xbox::ulong_xt Length; + xbox::byte_xt Unknown[0x2C]; } RTL_HEAP_PARAMETERS; // ****************************************************************** // * XTHREAD_NOTIFY_PROC // ****************************************************************** -typedef VOID (WINAPI *XTHREAD_NOTIFY_PROC)(BOOL fCreate); +typedef xbox::void_xt (WINAPI *XTHREAD_NOTIFY_PROC)(bool_xt fCreate); // ****************************************************************** // * XTHREAD_NOTIFICATION @@ -296,7 +296,7 @@ XTHREAD_NOTIFICATION, *PXTHREAD_NOTIFICATION; typedef struct _XCALCSIG_SIGNATURE { - BYTE Signature[XCALCSIG_SIGNATURE_SIZE]; + xbox::byte_xt Signature[XCALCSIG_SIGNATURE_SIZE]; } XCALCSIG_SIGNATURE, *PXCALCSIG_SIGNATURE; @@ -309,8 +309,8 @@ XCALCSIG_SIGNATURE, *PXCALCSIG_SIGNATURE; typedef struct _LAUNCH_DATA { - BYTE Data[MAX_LAUNCH_DATA_SIZE]; -} + xbox::byte_xt Data[MAX_LAUNCH_DATA_SIZE]; +} LAUNCH_DATA, *PLAUNCH_DATA; #define LDT_TITLE 0 @@ -332,13 +332,13 @@ LAUNCH_DATA, *PLAUNCH_DATA; // ****************************************************************** // * patch: XFormatUtilityDrive // ****************************************************************** -BOOL WINAPI EMUPATCH(XFormatUtilityDrive)(); +xbox::bool_xt WINAPI EMUPATCH(XFormatUtilityDrive)(); #if 0 // Handled by ExQueryNonVolatileSetting(XC_MAX_OS) returning XBOX_USER_SETTINGS // ****************************************************************** // * patch: GetTimeZoneInformation // ****************************************************************** -DWORD WINAPI EMUPATCH(GetTimeZoneInformation) +xbox::dword_xt WINAPI EMUPATCH(GetTimeZoneInformation) ( OUT LPTIME_ZONE_INFORMATION lpTimeZoneInformation ); @@ -347,24 +347,24 @@ DWORD WINAPI EMUPATCH(GetTimeZoneInformation) // ****************************************************************** // * patch: XMountUtilityDrive // ****************************************************************** -BOOL WINAPI EMUPATCH(XMountUtilityDrive) +xbox::bool_xt WINAPI EMUPATCH(XMountUtilityDrive) ( - BOOL fFormatClean + bool_xt fFormatClean ); // ****************************************************************** // * patch: XInitDevices // ****************************************************************** -VOID WINAPI EMUPATCH(XInitDevices) +xbox::void_xt WINAPI EMUPATCH(XInitDevices) ( - DWORD dwPreallocTypeCount, + dword_xt dwPreallocTypeCount, PXDEVICE_PREALLOC_TYPE PreallocTypes ); // ****************************************************************** // * patch: XGetDevices // ****************************************************************** -DWORD WINAPI EMUPATCH(XGetDevices) +xbox::dword_xt WINAPI EMUPATCH(XGetDevices) ( XPP_DEVICE_TYPE *DeviceType ); @@ -372,7 +372,7 @@ DWORD WINAPI EMUPATCH(XGetDevices) // ****************************************************************** // * patch: XGetDeviceChanges // ****************************************************************** -BOOL WINAPI EMUPATCH(XGetDeviceChanges) +xbox::bool_xt WINAPI EMUPATCH(XGetDeviceChanges) ( PXPP_DEVICE_TYPE DeviceType, PDWORD pdwInsertions, @@ -385,15 +385,15 @@ BOOL WINAPI EMUPATCH(XGetDeviceChanges) HANDLE WINAPI EMUPATCH(XInputOpen) ( IN PXPP_DEVICE_TYPE DeviceType, - IN DWORD dwPort, - IN DWORD dwSlot, + IN dword_xt dwPort, + IN dword_xt dwSlot, IN PXINPUT_POLLING_PARAMETERS pPollingParameters OPTIONAL ); // ****************************************************************** // * patch: XInputClose // ****************************************************************** -VOID WINAPI EMUPATCH(XInputClose) +xbox::void_xt WINAPI EMUPATCH(XInputClose) ( IN HANDLE hDevice ); @@ -401,7 +401,7 @@ VOID WINAPI EMUPATCH(XInputClose) // ****************************************************************** // * patch: XInputPoll // ****************************************************************** -DWORD WINAPI EMUPATCH(XInputPoll) +xbox::dword_xt WINAPI EMUPATCH(XInputPoll) ( IN HANDLE Device ); @@ -409,7 +409,7 @@ DWORD WINAPI EMUPATCH(XInputPoll) // ****************************************************************** // * patch: XInputGetCapabilities // ****************************************************************** -DWORD WINAPI EMUPATCH(XInputGetCapabilities) +xbox::dword_xt WINAPI EMUPATCH(XInputGetCapabilities) ( IN HANDLE hDevice, OUT PXINPUT_CAPABILITIES pCapabilities @@ -418,7 +418,7 @@ DWORD WINAPI EMUPATCH(XInputGetCapabilities) // ****************************************************************** // * patch: XInputGetState // ****************************************************************** -DWORD WINAPI EMUPATCH(XInputGetState) +xbox::dword_xt WINAPI EMUPATCH(XInputGetState) ( IN HANDLE hDevice, OUT PXINPUT_STATE pState @@ -427,7 +427,7 @@ DWORD WINAPI EMUPATCH(XInputGetState) // ****************************************************************** // * patch: XInputSetState // ****************************************************************** -DWORD WINAPI EMUPATCH(XInputSetState) +xbox::dword_xt WINAPI EMUPATCH(XInputSetState) ( IN HANDLE hDevice, IN OUT PXINPUT_FEEDBACK pFeedback @@ -440,14 +440,14 @@ DWORD WINAPI EMUPATCH(XInputSetState) HANDLE WINAPI EMUPATCH(CreateMutex) ( LPSECURITY_ATTRIBUTES lpMutexAttributes, - BOOL bInitialOwner, + bool_xt bInitialOwner, LPCSTR lpName ); // ****************************************************************** // * patch: CloseHandle // ****************************************************************** -BOOL WINAPI EMUPATCH(CloseHandle) +xbox::bool_xt WINAPI EMUPATCH(CloseHandle) ( HANDLE hObject ); @@ -455,7 +455,7 @@ BOOL WINAPI EMUPATCH(CloseHandle) // ****************************************************************** // * patch: SetThreadPriority // ****************************************************************** -BOOL WINAPI EMUPATCH(SetThreadPriority) +xbox::bool_xt WINAPI EMUPATCH(SetThreadPriority) ( HANDLE hThread, int nPriority @@ -472,16 +472,16 @@ int WINAPI EMUPATCH(GetThreadPriority) // ****************************************************************** // * patch: SetThreadPriorityBoost // ****************************************************************** -BOOL WINAPI EMUPATCH(SetThreadPriorityBoost) +xbox::bool_xt WINAPI EMUPATCH(SetThreadPriorityBoost) ( HANDLE hThread, - BOOL DisablePriorityBoost + bool_xt DisablePriorityBoost ); // ****************************************************************** // * patch: GetExitCodeThread // ****************************************************************** -BOOL WINAPI EMUPATCH(GetExitCodeThread) +xbox::bool_xt WINAPI EMUPATCH(GetExitCodeThread) ( HANDLE hThread, LPDWORD lpExitCode @@ -490,26 +490,26 @@ BOOL WINAPI EMUPATCH(GetExitCodeThread) // ****************************************************************** // * patch: XapiThreadStartup // ****************************************************************** -VOID WINAPI EMUPATCH(XapiThreadStartup) +xbox::void_xt WINAPI EMUPATCH(XapiThreadStartup) ( - DWORD dwDummy1, - DWORD dwDummy2 + dword_xt dwDummy1, + dword_xt dwDummy2 ); /* Too High Level! // ****************************************************************** // * patch: XapiSetupPerTitleDriveLetters // ****************************************************************** -NTSTATUS CDECL XapiSetupPerTitleDriveLetters(DWORD dwTitleId, LPCWSTR wszTitleName); +NTSTATUS CDECL XapiSetupPerTitleDriveLetters(dword_xt dwTitleId, LPCWSTR wszTitleName); */ // ****************************************************************** // * patch: XRegisterThreadNotifyRoutine // ****************************************************************** -VOID WINAPI EMUPATCH(XRegisterThreadNotifyRoutine) +xbox::void_xt WINAPI EMUPATCH(XRegisterThreadNotifyRoutine) ( PXTHREAD_NOTIFICATION pThreadNotification, - BOOL fRegister + bool_xt fRegister ); // ****************************************************************** @@ -517,7 +517,7 @@ VOID WINAPI EMUPATCH(XRegisterThreadNotifyRoutine) // ****************************************************************** LPVOID WINAPI EMUPATCH(CreateFiber) ( - DWORD dwStackSize, + dword_xt dwStackSize, LPFIBER_START_ROUTINE lpStartRoutine, LPVOID lpParameter ); @@ -525,7 +525,7 @@ LPVOID WINAPI EMUPATCH(CreateFiber) // ****************************************************************** // * patch: DeleteFiber // ****************************************************************** -VOID WINAPI EMUPATCH(DeleteFiber) +xbox::void_xt WINAPI EMUPATCH(DeleteFiber) ( LPVOID lpFiber ); @@ -533,7 +533,7 @@ VOID WINAPI EMUPATCH(DeleteFiber) // ****************************************************************** // * patch: SwitchToFiber // ****************************************************************** -VOID WINAPI EMUPATCH(SwitchToFiber) +xbox::void_xt WINAPI EMUPATCH(SwitchToFiber) ( LPVOID lpFiber ); @@ -549,12 +549,12 @@ LPVOID WINAPI EMUPATCH(ConvertThreadToFiber) // ****************************************************************** // * patch: XapiFiberStartup // ****************************************************************** -VOID WINAPI EMUPATCH(XapiFiberStartup)(DWORD dwDummy); +xbox::void_xt WINAPI EMUPATCH(XapiFiberStartup)(dword_xt dwDummy); // ****************************************************************** // * patch: QueryPerformanceCounter // ****************************************************************** -BOOL WINAPI EMUPATCH(QueryPerformanceCounter) +xbox::bool_xt WINAPI EMUPATCH(QueryPerformanceCounter) ( LARGE_INTEGER *lpPerformanceCount ); @@ -562,30 +562,30 @@ BOOL WINAPI EMUPATCH(QueryPerformanceCounter) // ****************************************************************** // * patch: QueueUserAPC // ****************************************************************** -DWORD WINAPI EMUPATCH(QueueUserAPC) +xbox::dword_xt WINAPI EMUPATCH(QueueUserAPC) ( PAPCFUNC pfnAPC, HANDLE hThread, - DWORD dwData + dword_xt dwData ); #if 0 // Handled by WaitForSingleObject // ****************************************************************** // * patch: GetOverlappedResult // ****************************************************************** -BOOL WINAPI EMUPATCH(GetOverlappedResult) +xbox::bool_xt WINAPI EMUPATCH(GetOverlappedResult) ( HANDLE hFile, LPOVERLAPPED lpOverlapped, LPDWORD lpNumberOfBytesTransferred, - BOOL bWait + bool_xt bWait ); #endif // ****************************************************************** // * patch: XLaunchNewImageA // ****************************************************************** -DWORD WINAPI EMUPATCH(XLaunchNewImageA) +xbox::dword_xt WINAPI EMUPATCH(XLaunchNewImageA) ( LPCSTR lpTitlePath, PLAUNCH_DATA pLaunchData @@ -595,7 +595,7 @@ DWORD WINAPI EMUPATCH(XLaunchNewImageA) // ****************************************************************** // * patch: XGetLaunchInfo // ****************************************************************** -DWORD WINAPI EMUPATCH(XGetLaunchInfo) +xbox::dword_xt WINAPI EMUPATCH(XGetLaunchInfo) ( PDWORD pdwLaunchDataType, PLAUNCH_DATA pLaunchData @@ -605,20 +605,20 @@ DWORD WINAPI EMUPATCH(XGetLaunchInfo) // ****************************************************************** // * patch: XSetProcessQuantumLength // ****************************************************************** -VOID WINAPI EMUPATCH(XSetProcessQuantumLength) +xbox::void_xt WINAPI EMUPATCH(XSetProcessQuantumLength) ( - DWORD dwMilliseconds + dword_xt dwMilliseconds ); // ****************************************************************** // * patch: SignalObjectAndWait // ****************************************************************** -DWORD WINAPI EMUPATCH(SignalObjectAndWait) +xbox::dword_xt WINAPI EMUPATCH(SignalObjectAndWait) ( HANDLE hObjectToSignal, HANDLE hObjectToWaitOn, - DWORD dwMilliseconds, - BOOL bAlertable + dword_xt dwMilliseconds, + bool_xt bAlertable ); // ****************************************************************** @@ -626,11 +626,11 @@ DWORD WINAPI EMUPATCH(SignalObjectAndWait) // ****************************************************************** MMRESULT WINAPI EMUPATCH(timeSetEvent) ( - UINT uDelay, - UINT uResolution, + uint_xt uDelay, + uint_xt uResolution, LPTIMECALLBACK fptc, - DWORD dwUser, - UINT fuEvent + dword_xt dwUser, + uint_xt fuEvent ); // ****************************************************************** @@ -638,18 +638,18 @@ MMRESULT WINAPI EMUPATCH(timeSetEvent) // ****************************************************************** MMRESULT WINAPI EMUPATCH(timeKillEvent) ( - UINT uTimerID + uint_xt uTimerID ); // ****************************************************************** // * patch: RaiseException // ****************************************************************** -VOID WINAPI EMUPATCH(RaiseException) +xbox::void_xt WINAPI EMUPATCH(RaiseException) ( - DWORD dwExceptionCode, // exception code - DWORD dwExceptionFlags, // continuable exception flag - DWORD nNumberOfArguments, // number of arguments - CONST ULONG_PTR *lpArguments // array of arguments + dword_xt dwExceptionCode, // exception code + dword_xt dwExceptionFlags, // continuable exception flag + dword_xt nNumberOfArguments, // number of arguments + CONST ulong_ptr_xt *lpArguments // array of arguments ); // ****************************************************************** @@ -664,42 +664,42 @@ int WINAPI EMUPATCH(lstrcmpiW) // ****************************************************************** // * patch: XMountMUA // ****************************************************************** -DWORD WINAPI EMUPATCH(XMountMUA) +xbox::dword_xt WINAPI EMUPATCH(XMountMUA) ( - DWORD dwPort, - DWORD dwSlot, + dword_xt dwPort, + dword_xt dwSlot, PCHAR pchDrive ); // ****************************************************************** // * patch: XMountMURootA // ****************************************************************** -DWORD WINAPI EMUPATCH(XMountMURootA) +xbox::dword_xt WINAPI EMUPATCH(XMountMURootA) ( - DWORD dwPort, - DWORD dwSlot, + dword_xt dwPort, + dword_xt dwSlot, PCHAR pchDrive ); // ****************************************************************** // * patch: XMountAlternateTitleA // ****************************************************************** -/*DWORD WINAPI EMUPATCH(XMountAlternateTitleA) +/*xbox::dword_xt WINAPI EMUPATCH(XMountAlternateTitleA) ( LPCSTR lpRootPath, - DWORD dwAltTitleId, + dword_xt dwAltTitleId, PCHAR pchDrive );*/ // ****************************************************************** // * patch: XUnmountAlternateTitleA // ****************************************************************** -//DWORD WINAPI EMUPATCH(XUnmountAlternateTitleA)(CHAR chDrive); +//xbox::dword_xt WINAPI EMUPATCH(XUnmountAlternateTitleA)(char_xt chDrive); // ****************************************************************** // * patch: MoveFileA // ****************************************************************** -BOOL WINAPI EMUPATCH(MoveFileA) +xbox::bool_xt WINAPI EMUPATCH(MoveFileA) ( LPCSTR lpExistingFileName, LPCSTR lpNewFileName @@ -708,17 +708,17 @@ BOOL WINAPI EMUPATCH(MoveFileA) // ****************************************************************** // * patch: XGetDeviceEnumerationStatus // ****************************************************************** -DWORD WINAPI EMUPATCH(XGetDeviceEnumerationStatus)(); +xbox::dword_xt WINAPI EMUPATCH(XGetDeviceEnumerationStatus)(); // ****************************************************************** // * patch: SwitchToThread // ****************************************************************** -BOOL WINAPI EMUPATCH(SwitchToThread)(); +xbox::bool_xt WINAPI EMUPATCH(SwitchToThread)(); // ****************************************************************** // * patch: XInputGetDeviceDescription // ****************************************************************** -DWORD WINAPI EMUPATCH(XInputGetDeviceDescription) +xbox::dword_xt WINAPI EMUPATCH(XInputGetDeviceDescription) ( HANDLE hDevice, PVOID pDescription @@ -727,11 +727,11 @@ DWORD WINAPI EMUPATCH(XInputGetDeviceDescription) // ****************************************************************** // * patch: ReadFileEx // ****************************************************************** -BOOL WINAPI EMUPATCH(ReadFileEx) +xbox::bool_xt WINAPI EMUPATCH(ReadFileEx) ( HANDLE hFile, // handle to file LPVOID lpBuffer, // data buffer - DWORD nNumberOfBytesToRead, // number of bytes to read + dword_xt nNumberOfBytesToRead, // number of bytes to read LPOVERLAPPED lpOverlapped, // offset LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine // completion routine ); @@ -739,11 +739,11 @@ BOOL WINAPI EMUPATCH(ReadFileEx) // ****************************************************************** // * patch: WriteFileEx // ****************************************************************** -BOOL WINAPI EMUPATCH(WriteFileEx) +xbox::bool_xt WINAPI EMUPATCH(WriteFileEx) ( HANDLE hFile, // handle to output file LPCVOID lpBuffer, // data buffer - DWORD nNumberOfBytesToWrite, // number of bytes to write + dword_xt nNumberOfBytesToWrite, // number of bytes to write LPOVERLAPPED lpOverlapped, // overlapped buffer LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine // completion routine ); @@ -751,7 +751,7 @@ BOOL WINAPI EMUPATCH(WriteFileEx) // ****************************************************************** // * patch: OutputDebugStringA // ****************************************************************** -VOID WINAPI EMUPATCH(OutputDebugStringA) +xbox::void_xt WINAPI EMUPATCH(OutputDebugStringA) ( IN LPCSTR lpOutputString ); @@ -763,7 +763,7 @@ VOID WINAPI EMUPATCH(OutputDebugStringA) // ****************************************************************** HANDLE WINAPI EMUPATCH(XCalculateSignatureBegin) ( - DWORD dwFlags + dword_xt dwFlags ); // ****************************************************************** @@ -771,24 +771,24 @@ HANDLE WINAPI EMUPATCH(XCalculateSignatureBegin) // ****************************************************************** HANDLE WINAPI EMUPATCH(XCalculateSignatureBeginEx) ( - DWORD dwFlags, - DWORD dwAltTitleId + dword_xt dwFlags, + dword_xt dwAltTitleId ); // ****************************************************************** // * patch: XCalculateSignatureUpdate // ****************************************************************** -DWORD WINAPI EMUPATCH(XCalculateSignatureUpdate) +xbox::dword_xt WINAPI EMUPATCH(XCalculateSignatureUpdate) ( HANDLE hCalcSig, - const BYTE *pbData, - ULONG cbData + const xbox::byte_xt *pbData, + ulong_xt cbData ); // ****************************************************************** // * patch: XCalculateSignatureEnd // ****************************************************************** -DWORD WINAPI EMUPATCH(XCalculateSignatureEnd) +xbox::dword_xt WINAPI EMUPATCH(XCalculateSignatureEnd) ( HANDLE hCalcSig, PXCALCSIG_SIGNATURE pSignature diff --git a/src/core/hle/XGRAPHIC/XGraphic.cpp b/src/core/hle/XGRAPHIC/XGraphic.cpp index eb51267b1..78e7200a8 100644 --- a/src/core/hle/XGRAPHIC/XGraphic.cpp +++ b/src/core/hle/XGRAPHIC/XGraphic.cpp @@ -27,7 +27,6 @@ #define LOG_PREFIX CXBXR_MODULE::XGRP -#undef FIELD_OFFSET // prevent macro redefinition warnings #include #include "core\kernel\support\Emu.h" @@ -54,7 +53,7 @@ PVOID WINAPI xbox::EMUPATCH(XGIsSwizzledFormat) // ****************************************************************** // * patch: XGSwizzleRect // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(XGSwizzleRect) +xbox::void_xt WINAPI xbox::EMUPATCH(XGSwizzleRect) ( LPCVOID pSource, DWORD Pitch, @@ -115,7 +114,7 @@ VOID WINAPI xbox::EMUPATCH(XGSwizzleRect) // ****************************************************************** // * patch: XGSwizzleBox // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(XGSwizzleBox) +xbox::void_xt WINAPI xbox::EMUPATCH(XGSwizzleBox) ( LPCVOID pSource, DWORD RowPitch, @@ -182,11 +181,11 @@ VOID WINAPI xbox::EMUPATCH(XGSwizzleBox) // ****************************************************************** // * patch: XGWriteSurfaceOrTextureToXPR // ****************************************************************** -HRESULT WINAPI xbox::EMUPATCH(XGWriteSurfaceOrTextureToXPR) +xbox::hresult_xt WINAPI xbox::EMUPATCH(XGWriteSurfaceOrTextureToXPR) ( LPVOID pResource, const char* cPath, - BOOL bWriteSurfaceAsTexture + bool_xt bWriteSurfaceAsTexture ) { LOG_FUNC_BEGIN @@ -207,17 +206,17 @@ HRESULT WINAPI xbox::EMUPATCH(XGWriteSurfaceOrTextureToXPR) // ****************************************************************** // * patch: XGSetTextureHeader // ****************************************************************** -VOID WINAPI xbox::EMUPATCH(XGSetTextureHeader) +xbox::void_xt WINAPI xbox::EMUPATCH(XGSetTextureHeader) ( - UINT Width, - UINT Height, - UINT Levels, + uint_xt Width, + uint_xt Height, + uint_xt Levels, DWORD Usage, X_D3DFORMAT Format, D3DPOOL Pool, X_D3DTexture* pTexture, - UINT Data, - UINT Pitch + uint_xt Data, + uint_xt Pitch ) { LOG_FUNC_BEGIN @@ -274,7 +273,7 @@ VOID WINAPI xbox::EMUPATCH(XGSetTextureHeader) // ****************************************************************** // * patch: XFONT_OpenBitmapFontFromMemory // ****************************************************************** -//HRESULT WINAPI xbox::EMUPATCH(XFONT_OpenBitmapFontFromMemory) +//xbox::hresult_xt WINAPI xbox::EMUPATCH(XFONT_OpenBitmapFontFromMemory) //( // CONST void *pFontData, // unsigned uFontDataSize, diff --git a/src/core/hle/XGRAPHIC/XGraphic.h b/src/core/hle/XGRAPHIC/XGraphic.h index 9f855e9c0..6c486c276 100644 --- a/src/core/hle/XGRAPHIC/XGraphic.h +++ b/src/core/hle/XGRAPHIC/XGraphic.h @@ -49,7 +49,7 @@ PVOID WINAPI EMUPATCH(XGIsSwizzledFormat) // ****************************************************************** // * patch: XGSwizzleRect // ****************************************************************** -VOID WINAPI EMUPATCH(XGSwizzleRect) +xbox::void_xt WINAPI EMUPATCH(XGSwizzleRect) ( LPCVOID pSource, DWORD Pitch, @@ -65,7 +65,7 @@ VOID WINAPI EMUPATCH(XGSwizzleRect) // ****************************************************************** // * patch: XGSwizzleBox // ****************************************************************** -VOID WINAPI EMUPATCH(XGSwizzleBox) +xbox::void_xt WINAPI EMUPATCH(XGSwizzleBox) ( LPCVOID pSource, DWORD RowPitch, @@ -82,33 +82,33 @@ VOID WINAPI EMUPATCH(XGSwizzleBox) // ****************************************************************** // * patch: XGWriteSurfaceOrTextureToXPR // ****************************************************************** -HRESULT WINAPI EMUPATCH(XGWriteSurfaceOrTextureToXPR) +xbox::hresult_xt WINAPI EMUPATCH(XGWriteSurfaceOrTextureToXPR) ( LPVOID pResource, const char* cPath, - BOOL bWriteSurfaceAsTexture + bool_xt bWriteSurfaceAsTexture ); // ****************************************************************** // * patch: XGSetTextureHeader // ****************************************************************** -VOID WINAPI EMUPATCH(XGSetTextureHeader) +xbox::void_xt WINAPI EMUPATCH(XGSetTextureHeader) ( - UINT Width, - UINT Height, - UINT Levels, + uint_xt Width, + uint_xt Height, + uint_xt Levels, DWORD Usage, X_D3DFORMAT Format, D3DPOOL Pool, X_D3DTexture* pTexture, - UINT Data, - UINT Pitch + uint_xt Data, + uint_xt Pitch ); // ****************************************************************** // * patch: XFONT_OpenBitmapFontFromMemory // ****************************************************************** -HRESULT WINAPI EMUPATCH(XFONT_OpenBitmapFontFromMemory) +xbox::hresult_xt WINAPI EMUPATCH(XFONT_OpenBitmapFontFromMemory) ( CONST void *pFontData, unsigned uFontDataSize, diff --git a/src/core/hle/XONLINE/XOnline.h b/src/core/hle/XONLINE/XOnline.h index b0a3f106c..c1e9c650d 100644 --- a/src/core/hle/XONLINE/XOnline.h +++ b/src/core/hle/XONLINE/XOnline.h @@ -32,16 +32,16 @@ namespace xbox { // ****************************************************************** // * patch: WSAStartup // ****************************************************************** -int WINAPI EMUPATCH(WSAStartup) +xbox::int_xt WINAPI EMUPATCH(WSAStartup) ( - WORD wVersionRequested, + word_xt wVersionRequested, WSADATA *lpWSAData ); // ****************************************************************** // * patch: XNetStartup // ****************************************************************** -INT WINAPI EMUPATCH(XNetStartup) +xbox::int_xt WINAPI EMUPATCH(XNetStartup) ( const PVOID pDummy ); @@ -49,12 +49,12 @@ INT WINAPI EMUPATCH(XNetStartup) // ****************************************************************** // * patch: XNetGetEthernetLinkStatus // ****************************************************************** -DWORD WINAPI EMUPATCH(XNetGetEthernetLinkStatus)(); +xbox::dword_xt WINAPI EMUPATCH(XNetGetEthernetLinkStatus)(); // ****************************************************************** // * patch: XOnlineLaunchNewImage // ****************************************************************** -HRESULT WINAPI XOnlineLaunchNewImage +xbox::hresult_xt WINAPI XOnlineLaunchNewImage ( LPCSTR lpImagePath, LPVOID pLaunchData @@ -63,60 +63,60 @@ HRESULT WINAPI XOnlineLaunchNewImage // ****************************************************************** // * patch: XOnlineLogon // ****************************************************************** -HRESULT WINAPI EMUPATCH(XOnlineLogon) +xbox::hresult_xt WINAPI EMUPATCH(XOnlineLogon) ( - VOID* pUsers, - DWORD* pdwServiceIDs, - DWORD dwServices, + void_xt* pUsers, + dword_xt* pdwServiceIDs, + dword_xt dwServices, HANDLE hEvent, HANDLE pHandle ); SOCKET WINAPI EMUPATCH(socket) ( - int af, - int type, - int protocol + int_xt af, + int_xt type, + int_xt protocol ); -int WINAPI EMUPATCH(connect) +xbox::int_xt WINAPI EMUPATCH(connect) ( SOCKET s, const struct sockaddr FAR *name, - int namelen + int_xt namelen ); -int WINAPI EMUPATCH(send) +xbox::int_xt WINAPI EMUPATCH(send) ( SOCKET s, const char FAR *buf, - int len, - int flags + int_xt len, + int_xt flags ); -int WINAPI EMUPATCH(recv) +xbox::int_xt WINAPI EMUPATCH(recv) ( SOCKET s, char FAR *buf, - int len, - int flags + int_xt len, + int_xt flags ); -int WINAPI EMUPATCH(bind) +xbox::int_xt WINAPI EMUPATCH(bind) ( SOCKET s, const struct sockaddr FAR *name, - int namelen + int_xt namelen ); -int WINAPI EMUPATCH(listen) +xbox::int_xt WINAPI EMUPATCH(listen) ( SOCKET s, - int backlog + int_xt backlog ); -int WINAPI EMUPATCH(ioctlsocket) +xbox::int_xt WINAPI EMUPATCH(ioctlsocket) ( SOCKET s, long cmd, diff --git a/import/OpenXDK/include/xboxkrnl/dbg.h b/src/core/kernel/common/dbg.h similarity index 51% rename from import/OpenXDK/include/xboxkrnl/dbg.h rename to src/core/kernel/common/dbg.h index c8d25a067..773c6d471 100644 --- a/import/OpenXDK/include/xboxkrnl/dbg.h +++ b/src/core/kernel/common/dbg.h @@ -12,34 +12,41 @@ #ifndef XBOXKRNL_DBG_H #define XBOXKRNL_DBG_H -XBSYSAPI EXPORTNUM(5) VOID NTAPI DbgBreakPoint(); -XBSYSAPI EXPORTNUM(6) VOID NTAPI DbgBreakPointWithStatus +#include "types.h" + +namespace xbox +{ + +XBSYSAPI EXPORTNUM(5) void_xt NTAPI DbgBreakPoint(); +XBSYSAPI EXPORTNUM(6) void_xt NTAPI DbgBreakPointWithStatus ( - IN ULONG Status + IN ulong_xt Status ); -XBSYSAPI EXPORTNUM(7) NTSTATUS NTAPI DbgLoadImageSymbols +XBSYSAPI EXPORTNUM(7) ntstatus_xt NTAPI DbgLoadImageSymbols ( IN PANSI_STRING Name, IN PVOID Base, - IN ULONG_PTR ProcessId + IN ulong_ptr_xt ProcessId ); -XBSYSAPI EXPORTNUM(8) ULONG _cdecl DbgPrint +XBSYSAPI EXPORTNUM(8) ulong_xt _cdecl DbgPrint ( PCHAR Format, ... ); -XBSYSAPI EXPORTNUM(10) ULONG NTAPI DbgPrompt +XBSYSAPI EXPORTNUM(10) ulong_xt NTAPI DbgPrompt ( IN PCCH Prompt, OUT PCH Response, - IN ULONG MaximumResponseLength + IN ulong_xt MaximumResponseLength ); -XBSYSAPI EXPORTNUM(11) VOID NTAPI DbgUnLoadImageSymbols +XBSYSAPI EXPORTNUM(11) void_xt NTAPI DbgUnLoadImageSymbols ( IN PANSI_STRING Name, IN PVOID Base, - IN ULONG_PTR ProcessId + IN ulong_ptr_xt ProcessId ); +} + #endif diff --git a/import/OpenXDK/include/xboxkrnl/ex.h b/src/core/kernel/common/ex.h similarity index 73% rename from import/OpenXDK/include/xboxkrnl/ex.h rename to src/core/kernel/common/ex.h index 5b4da1933..04c76f79b 100644 --- a/import/OpenXDK/include/xboxkrnl/ex.h +++ b/src/core/kernel/common/ex.h @@ -12,12 +12,17 @@ #ifndef XBOXKRNL_EX_H #define XBOXKRNL_EX_H -XBSYSAPI EXPORTNUM(12) VOID NTAPI ExAcquireReadWriteLockExclusive +#include "types.h" + +namespace xbox +{ + +XBSYSAPI EXPORTNUM(12) void_xt NTAPI ExAcquireReadWriteLockExclusive ( IN PERWLOCK ReadWriteLock ); -XBSYSAPI EXPORTNUM(13) VOID NTAPI ExAcquireReadWriteLockShared +XBSYSAPI EXPORTNUM(13) void_xt NTAPI ExAcquireReadWriteLockShared ( IN PERWLOCK ReadWriteLock ); @@ -31,7 +36,7 @@ XBSYSAPI EXPORTNUM(13) VOID NTAPI ExAcquireReadWriteLockShared // ****************************************************************** XBSYSAPI EXPORTNUM(14) PVOID NTAPI ExAllocatePool ( - IN SIZE_T NumberOfBytes + IN size_xt NumberOfBytes ); // ****************************************************************** @@ -43,8 +48,8 @@ XBSYSAPI EXPORTNUM(14) PVOID NTAPI ExAllocatePool // ****************************************************************** XBSYSAPI EXPORTNUM(15) PVOID NTAPI ExAllocatePoolWithTag ( - IN SIZE_T NumberOfBytes, - IN ULONG Tag + IN size_xt NumberOfBytes, + IN ulong_xt Tag ); XBSYSAPI EXPORTNUM(16) OBJECT_TYPE ExEventObjectType; @@ -56,7 +61,7 @@ XBSYSAPI EXPORTNUM(16) OBJECT_TYPE ExEventObjectType; // * Deallocates a block of pool memory // * // ****************************************************************** -XBSYSAPI EXPORTNUM(17) VOID NTAPI ExFreePool +XBSYSAPI EXPORTNUM(17) void_xt NTAPI ExFreePool ( IN PVOID P ); @@ -64,7 +69,7 @@ XBSYSAPI EXPORTNUM(17) VOID NTAPI ExFreePool // ****************************************************************** // * 0x0012 - ExInitializeReadWriteLock() // ****************************************************************** -XBSYSAPI EXPORTNUM(18) VOID NTAPI ExInitializeReadWriteLock +XBSYSAPI EXPORTNUM(18) void_xt NTAPI ExInitializeReadWriteLock ( IN PERWLOCK ReadWriteLock ); @@ -78,14 +83,14 @@ XBSYSAPI EXPORTNUM(19) LARGE_INTEGER NTAPI ExInterlockedAddLargeInteger ); // Source:ReactOS -XBSYSAPI EXPORTNUM(20) VOID FASTCALL ExInterlockedAddLargeStatistic +XBSYSAPI EXPORTNUM(20) void_xt FASTCALL ExInterlockedAddLargeStatistic ( IN PLARGE_INTEGER Addend, - IN ULONG Increment + IN ulong_xt Increment ); // Source:ReactOS -XBSYSAPI EXPORTNUM(21) LONGLONG FASTCALL ExInterlockedCompareExchange64 +XBSYSAPI EXPORTNUM(21) longlong_xt FASTCALL ExInterlockedCompareExchange64 ( IN OUT PLONGLONG Destination, IN PLONGLONG Exchange, @@ -97,7 +102,7 @@ XBSYSAPI EXPORTNUM(22) OBJECT_TYPE ExMutantObjectType; // ****************************************************************** // * ExQueryPoolBlockSize // ****************************************************************** -XBSYSAPI EXPORTNUM(23) ULONG NTAPI ExQueryPoolBlockSize +XBSYSAPI EXPORTNUM(23) ulong_xt NTAPI ExQueryPoolBlockSize ( IN PVOID PoolBlock ); @@ -105,36 +110,36 @@ XBSYSAPI EXPORTNUM(23) ULONG NTAPI ExQueryPoolBlockSize // ****************************************************************** // * 0x0018 - ExQueryNonVolatileSetting() // ****************************************************************** -XBSYSAPI EXPORTNUM(24) NTSTATUS NTAPI ExQueryNonVolatileSetting +XBSYSAPI EXPORTNUM(24) ntstatus_xt NTAPI ExQueryNonVolatileSetting ( - IN DWORD ValueIndex, - OUT DWORD *Type, + IN dword_xt ValueIndex, + OUT dword_xt *Type, OUT PVOID Value, - IN SIZE_T ValueLength, + IN size_xt ValueLength, OUT PSIZE_T ResultLength OPTIONAL ); // ****************************************************************** // * ExReadWriteRefurbInfo // ****************************************************************** -XBSYSAPI EXPORTNUM(25) NTSTATUS NTAPI ExReadWriteRefurbInfo +XBSYSAPI EXPORTNUM(25) ntstatus_xt NTAPI ExReadWriteRefurbInfo ( IN OUT PXBOX_REFURB_INFO pRefurbInfo, - IN ULONG dwBufferSize, - IN BOOLEAN bIsWriteMode + IN ulong_xt dwBufferSize, + IN boolean_xt bIsWriteMode ); -XBSYSAPI EXPORTNUM(26) VOID NTAPI ExRaiseException +XBSYSAPI EXPORTNUM(26) void_xt NTAPI ExRaiseException ( IN PEXCEPTION_RECORD ExceptionRecord ); -XBSYSAPI EXPORTNUM(27) VOID NTAPI ExRaiseStatus +XBSYSAPI EXPORTNUM(27) void_xt NTAPI ExRaiseStatus ( - IN NTSTATUS Status + IN ntstatus_xt Status ); -XBSYSAPI EXPORTNUM(28) VOID NTAPI ExReleaseReadWriteLock +XBSYSAPI EXPORTNUM(28) void_xt NTAPI ExReleaseReadWriteLock ( IN PERWLOCK ReadWriteLock ); @@ -142,12 +147,12 @@ XBSYSAPI EXPORTNUM(28) VOID NTAPI ExReleaseReadWriteLock // ****************************************************************** // * 0x001D - ExSaveNonVolatileSetting() // ****************************************************************** -XBSYSAPI EXPORTNUM(29) NTSTATUS NTAPI ExSaveNonVolatileSetting +XBSYSAPI EXPORTNUM(29) ntstatus_xt NTAPI ExSaveNonVolatileSetting ( - IN DWORD ValueIndex, - IN DWORD Type, + IN dword_xt ValueIndex, + IN dword_xt Type, IN PVOID Value, - IN SIZE_T ValueLength + IN size_xt ValueLength ); XBSYSAPI EXPORTNUM(30) OBJECT_TYPE ExSemaphoreObjectType; @@ -180,33 +185,33 @@ XBSYSAPI EXPORTNUM(34) PLIST_ENTRY FASTCALL ExfInterlockedRemoveHeadList IN PLIST_ENTRY ListHead ); -XBSYSAPI EXPORTNUM(51) LONG FASTCALL KRNL(InterlockedCompareExchange) +XBSYSAPI EXPORTNUM(51) long_xt FASTCALL KRNL(InterlockedCompareExchange) ( IN OUT volatile PLONG Destination, - IN LONG Exchange, - IN LONG Comparand + IN long_xt Exchange, + IN long_xt Comparand ); -XBSYSAPI EXPORTNUM(52) LONG FASTCALL KRNL(InterlockedDecrement) +XBSYSAPI EXPORTNUM(52) long_xt FASTCALL KRNL(InterlockedDecrement) ( IN OUT PLONG Addend ); -XBSYSAPI EXPORTNUM(53) LONG FASTCALL KRNL(InterlockedIncrement) +XBSYSAPI EXPORTNUM(53) long_xt FASTCALL KRNL(InterlockedIncrement) ( IN OUT PLONG Addend ); -XBSYSAPI EXPORTNUM(54) LONG FASTCALL KRNL(InterlockedExchange) +XBSYSAPI EXPORTNUM(54) long_xt FASTCALL KRNL(InterlockedExchange) ( IN volatile PLONG Destination, - IN LONG Value + IN long_xt Value ); -XBSYSAPI EXPORTNUM(55) LONG FASTCALL KRNL(InterlockedExchangeAdd) +XBSYSAPI EXPORTNUM(55) long_xt FASTCALL KRNL(InterlockedExchangeAdd) ( IN volatile PLONG Addend, - IN LONG Value + IN long_xt Value ); // Dxbx Note : The Xbox1 SINGLE_LIST strucures are the same as in WinNT @@ -226,6 +231,8 @@ XBSYSAPI EXPORTNUM(58) SLIST_ENTRY * FASTCALL KRNL(InterlockedPushEntrySList) IN PSLIST_ENTRY ListEntry ); +} + #endif diff --git a/import/OpenXDK/include/xboxkrnl/hal.h b/src/core/kernel/common/hal.h similarity index 64% rename from import/OpenXDK/include/xboxkrnl/hal.h rename to src/core/kernel/common/hal.h index eb643a8d3..53e341d70 100644 --- a/import/OpenXDK/include/xboxkrnl/hal.h +++ b/src/core/kernel/common/hal.h @@ -12,16 +12,21 @@ #ifndef XBOXKRNL_HAL_H #define XBOXKRNL_HAL_H +#include "types.h" + +namespace xbox +{ + // ****************************************************************** // * HalReadSMCTrayState // ****************************************************************** -XBSYSAPI EXPORTNUM(9) NTSTATUS NTAPI HalReadSMCTrayState +XBSYSAPI EXPORTNUM(9) ntstatus_xt NTAPI HalReadSMCTrayState ( - DWORD* State, - DWORD* Count + dword_xt* State, + dword_xt* Count ); -XBSYSAPI EXPORTNUM(38) VOID FASTCALL HalClearSoftwareInterrupt +XBSYSAPI EXPORTNUM(38) void_xt FASTCALL HalClearSoftwareInterrupt ( KIRQL Request ); @@ -29,73 +34,73 @@ XBSYSAPI EXPORTNUM(38) VOID FASTCALL HalClearSoftwareInterrupt // ****************************************************************** // * 0x0027 - HalDisableSystemInterrupt() // ****************************************************************** -XBSYSAPI EXPORTNUM(39) VOID NTAPI HalDisableSystemInterrupt +XBSYSAPI EXPORTNUM(39) void_xt NTAPI HalDisableSystemInterrupt ( - IN ULONG BusInterruptLevel + IN ulong_xt BusInterruptLevel ); -XBSYSAPI EXPORTNUM(40) ULONG HalDiskCachePartitionCount; +XBSYSAPI EXPORTNUM(40) ulong_xt HalDiskCachePartitionCount; XBSYSAPI EXPORTNUM(41) PANSI_STRING HalDiskModelNumber; XBSYSAPI EXPORTNUM(42) PANSI_STRING HalDiskSerialNumber; // ****************************************************************** // * 0x002B - HalEnableSystemInterrupt() // ****************************************************************** -XBSYSAPI EXPORTNUM(43) VOID NTAPI HalEnableSystemInterrupt +XBSYSAPI EXPORTNUM(43) void_xt NTAPI HalEnableSystemInterrupt ( - IN ULONG BusInterruptLevel, + IN ulong_xt BusInterruptLevel, IN KINTERRUPT_MODE InterruptMode ); // ****************************************************************** // * HalGetInterruptVector // ****************************************************************** -XBSYSAPI EXPORTNUM(44) ULONG NTAPI HalGetInterruptVector +XBSYSAPI EXPORTNUM(44) ulong_xt NTAPI HalGetInterruptVector ( - IN ULONG BusInterruptLevel, + IN ulong_xt BusInterruptLevel, OUT PKIRQL Irql ); // ****************************************************************** // * HalReadSMBusValue // ****************************************************************** -XBSYSAPI EXPORTNUM(45) NTSTATUS NTAPI HalReadSMBusValue +XBSYSAPI EXPORTNUM(45) ntstatus_xt NTAPI HalReadSMBusValue ( - IN UCHAR Address, - IN UCHAR Command, - IN BOOLEAN WriteWord, + IN uchar_xt Address, + IN uchar_xt Command, + IN boolean_xt WriteWord, OUT PULONG DataValue ); // ****************************************************************** // * HalReadWritePCISpace // ****************************************************************** -XBSYSAPI EXPORTNUM(46) VOID NTAPI HalReadWritePCISpace +XBSYSAPI EXPORTNUM(46) void_xt NTAPI HalReadWritePCISpace ( - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN ULONG RegisterNumber, + IN ulong_xt BusNumber, + IN ulong_xt SlotNumber, + IN ulong_xt RegisterNumber, IN PVOID Buffer, - IN ULONG Length, - IN BOOLEAN WritePCISpace + IN ulong_xt Length, + IN boolean_xt WritePCISpace ); -typedef VOID (*PHAL_SHUTDOWN_NOTIFICATION)( +typedef void_xt (*PHAL_SHUTDOWN_NOTIFICATION)( IN struct _HAL_SHUTDOWN_REGISTRATION *ShutdownRegistration ); typedef struct _HAL_SHUTDOWN_REGISTRATION { PHAL_SHUTDOWN_NOTIFICATION NotificationRoutine; - LONG Priority; + long_xt Priority; LIST_ENTRY ListEntry; } HAL_SHUTDOWN_REGISTRATION, *PHAL_SHUTDOWN_REGISTRATION; -XBSYSAPI EXPORTNUM(47) VOID NTAPI HalRegisterShutdownNotification( +XBSYSAPI EXPORTNUM(47) void_xt NTAPI HalRegisterShutdownNotification( IN PHAL_SHUTDOWN_REGISTRATION ShutdownRegistration, - IN BOOLEAN Register + IN boolean_xt Register ); -XBSYSAPI EXPORTNUM(46) VOID FASTCALL HalRequestSoftwareInterrupt +XBSYSAPI EXPORTNUM(46) void_xt FASTCALL HalRequestSoftwareInterrupt ( IN KIRQL Request ); @@ -107,7 +112,7 @@ XBSYSAPI EXPORTNUM(46) VOID FASTCALL HalRequestSoftwareInterrupt // * Reboot / Shutdown / Etc // * // ****************************************************************** -XBSYSAPI EXPORTNUM(49) VOID DECLSPEC_NORETURN NTAPI HalReturnToFirmware +XBSYSAPI EXPORTNUM(49) void_xt DECLSPEC_NORETURN NTAPI HalReturnToFirmware ( RETURN_FIRMWARE Routine ); @@ -115,96 +120,98 @@ XBSYSAPI EXPORTNUM(49) VOID DECLSPEC_NORETURN NTAPI HalReturnToFirmware // ****************************************************************** // * HalWriteSMBusValue // ****************************************************************** -XBSYSAPI EXPORTNUM(50) NTSTATUS NTAPI HalWriteSMBusValue +XBSYSAPI EXPORTNUM(50) ntstatus_xt NTAPI HalWriteSMBusValue ( - UCHAR Address, - UCHAR Command, - BOOLEAN WriteWord, - ULONG DataValue + uchar_xt Address, + uchar_xt Command, + boolean_xt WriteWord, + ulong_xt DataValue ); // ****************************************************************** // * READ_PORT_BUFFER_UCHAR // ****************************************************************** -XBSYSAPI EXPORTNUM(329) VOID NTAPI READ_PORT_BUFFER_UCHAR +XBSYSAPI EXPORTNUM(329) void_xt NTAPI READ_PORT_BUFFER_UCHAR ( IN PUCHAR Port, IN PUCHAR Buffer, - IN ULONG Count + IN ulong_xt Count ); // ****************************************************************** // * READ_PORT_BUFFER_USHORT // ****************************************************************** -XBSYSAPI EXPORTNUM(330) VOID NTAPI READ_PORT_BUFFER_USHORT +XBSYSAPI EXPORTNUM(330) void_xt NTAPI READ_PORT_BUFFER_USHORT ( IN PUSHORT Port, IN PUSHORT Buffer, - IN ULONG Count + IN ulong_xt Count ); // ****************************************************************** // * READ_PORT_BUFFER_ULONG // ****************************************************************** -XBSYSAPI EXPORTNUM(331) VOID NTAPI READ_PORT_BUFFER_ULONG +XBSYSAPI EXPORTNUM(331) void_xt NTAPI READ_PORT_BUFFER_ULONG ( IN PULONG Port, IN PULONG Buffer, - IN ULONG Count + IN ulong_xt Count ); // ****************************************************************** // * WRITE_PORT_BUFFER_UCHAR // ****************************************************************** -XBSYSAPI EXPORTNUM(332) VOID NTAPI WRITE_PORT_BUFFER_UCHAR +XBSYSAPI EXPORTNUM(332) void_xt NTAPI WRITE_PORT_BUFFER_UCHAR ( IN PUCHAR Port, IN PUCHAR Buffer, - IN ULONG Count + IN ulong_xt Count ); // ****************************************************************** // * WRITE_PORT_BUFFER_USHORT // ****************************************************************** -XBSYSAPI EXPORTNUM(333) VOID NTAPI WRITE_PORT_BUFFER_USHORT +XBSYSAPI EXPORTNUM(333) void_xt NTAPI WRITE_PORT_BUFFER_USHORT ( IN PUSHORT Port, IN PUSHORT Buffer, - IN ULONG Count + IN ulong_xt Count ); // ****************************************************************** // * WRITE_PORT_BUFFER_ULONG // ****************************************************************** -XBSYSAPI EXPORTNUM(334) VOID NTAPI WRITE_PORT_BUFFER_ULONG +XBSYSAPI EXPORTNUM(334) void_xt NTAPI WRITE_PORT_BUFFER_ULONG ( IN PULONG Port, IN PULONG Buffer, - IN ULONG Count + IN ulong_xt Count ); // ****************************************************************** // * HalBootSMCVideoMode // ****************************************************************** -XBSYSAPI EXPORTNUM(356) DWORD HalBootSMCVideoMode; +XBSYSAPI EXPORTNUM(356) dword_xt HalBootSMCVideoMode; -XBSYSAPI EXPORTNUM(358) BOOLEAN NTAPI HalIsResetOrShutdownPending +XBSYSAPI EXPORTNUM(358) boolean_xt NTAPI HalIsResetOrShutdownPending ( ); -XBSYSAPI EXPORTNUM(360) NTSTATUS NTAPI HalInitiateShutdown +XBSYSAPI EXPORTNUM(360) ntstatus_xt NTAPI HalInitiateShutdown ( ); -XBSYSAPI EXPORTNUM(365) VOID NTAPI HalEnableSecureTrayEject +XBSYSAPI EXPORTNUM(365) void_xt NTAPI HalEnableSecureTrayEject ( ); -XBSYSAPI EXPORTNUM(366) NTSTATUS NTAPI HalWriteSMCScratchRegister +XBSYSAPI EXPORTNUM(366) ntstatus_xt NTAPI HalWriteSMCScratchRegister ( - IN DWORD ScratchRegister + IN dword_xt ScratchRegister ); +} + #endif diff --git a/import/OpenXDK/include/xboxkrnl/io.h b/src/core/kernel/common/io.h similarity index 76% rename from import/OpenXDK/include/xboxkrnl/io.h rename to src/core/kernel/common/io.h index ae7f4a024..b67131ef4 100644 --- a/import/OpenXDK/include/xboxkrnl/io.h +++ b/src/core/kernel/common/io.h @@ -12,12 +12,17 @@ #ifndef XBOXKRNL_IO_H #define XBOXKRNL_IO_H +#include "types.h" + +namespace xbox +{ + // ****************************************************************** // * 0x003B - IoAllocateIrp() // ****************************************************************** XBSYSAPI EXPORTNUM(59) PVOID NTAPI IoAllocateIrp ( - IN CCHAR StackSize + IN cchar_xt StackSize ); // ****************************************************************** @@ -25,10 +30,10 @@ XBSYSAPI EXPORTNUM(59) PVOID NTAPI IoAllocateIrp // ****************************************************************** XBSYSAPI EXPORTNUM(60) PVOID NTAPI IoBuildAsynchronousFsdRequest ( - IN ULONG MajorFunction, + IN ulong_xt MajorFunction, IN PDEVICE_OBJECT DeviceObject, OUT PVOID Buffer OPTIONAL, - IN ULONG Length, + IN ulong_xt Length, OUT PLARGE_INTEGER StartingOffset OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock OPTIONAL ); @@ -38,13 +43,13 @@ XBSYSAPI EXPORTNUM(60) PVOID NTAPI IoBuildAsynchronousFsdRequest // ****************************************************************** XBSYSAPI EXPORTNUM(61) PVOID NTAPI IoBuildDeviceIoControlRequest ( - IN ULONG IoControlCode, + IN ulong_xt IoControlCode, IN PDEVICE_OBJECT DeviceObject, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, + IN ulong_xt InputBufferLength, OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength OPTIONAL, - IN BOOLEAN InternalDeviceIoControl, + IN ulong_xt OutputBufferLength OPTIONAL, + IN boolean_xt InternalDeviceIoControl, IN PKEVENT Event, OUT PIO_STATUS_BLOCK IoStatusBlock OPTIONAL ); @@ -54,10 +59,10 @@ XBSYSAPI EXPORTNUM(61) PVOID NTAPI IoBuildDeviceIoControlRequest // ****************************************************************** XBSYSAPI EXPORTNUM(62) PVOID NTAPI IoBuildSynchronousFsdRequest ( - IN ULONG MajorFunction, + IN ulong_xt MajorFunction, IN PDEVICE_OBJECT DeviceObject, OUT PVOID Buffer OPTIONAL, - IN ULONG Length, + IN ulong_xt Length, OUT PLARGE_INTEGER StartingOffset OPTIONAL, IN PKEVENT Event, OUT PIO_STATUS_BLOCK IoStatusBlock @@ -66,13 +71,13 @@ XBSYSAPI EXPORTNUM(62) PVOID NTAPI IoBuildSynchronousFsdRequest // ****************************************************************** // * 0x003F - IoCheckShareAccess() // ****************************************************************** -XBSYSAPI EXPORTNUM(63) NTSTATUS NTAPI IoCheckShareAccess +XBSYSAPI EXPORTNUM(63) ntstatus_xt NTAPI IoCheckShareAccess ( - IN ACCESS_MASK DesiredAccess, - IN ULONG DesiredShareAccess, + IN access_mask_xt DesiredAccess, + IN ulong_xt DesiredShareAccess, OUT PFILE_OBJECT FileObject, OUT PSHARE_ACCESS ShareAccess, - IN BOOLEAN Update + IN boolean_xt Update ); // ****************************************************************** @@ -83,37 +88,37 @@ XBSYSAPI EXPORTNUM(64) OBJECT_TYPE IoCompletionObjectType; // ****************************************************************** // * 0x0041 - IoCreateDevice() // ****************************************************************** -XBSYSAPI EXPORTNUM(65) NTSTATUS NTAPI IoCreateDevice +XBSYSAPI EXPORTNUM(65) ntstatus_xt NTAPI IoCreateDevice ( IN PDRIVER_OBJECT DriverObject, - IN ULONG DeviceExtensionSize, + IN ulong_xt DeviceExtensionSize, IN PSTRING DeviceName OPTIONAL, - IN ULONG DeviceType, - IN BOOLEAN Exclusive, + IN ulong_xt DeviceType, + IN boolean_xt Exclusive, OUT PDEVICE_OBJECT* DeviceObject ); // ****************************************************************** // * 0x0042 - IoCreateFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(66) NTSTATUS NTAPI IoCreateFile +XBSYSAPI EXPORTNUM(66) ntstatus_xt NTAPI IoCreateFile ( OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, + IN access_mask_xt DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PIO_STATUS_BLOCK IoStatusBlock, IN PLARGE_INTEGER AllocationSize, - IN ULONG FileAttributes, - IN ULONG ShareAccess, - IN ULONG Disposition, - IN ULONG CreateOptions, - IN ULONG Options + IN ulong_xt FileAttributes, + IN ulong_xt ShareAccess, + IN ulong_xt Disposition, + IN ulong_xt CreateOptions, + IN ulong_xt Options ); // ****************************************************************** // * 0x0043 - IoCreateSymbolicLink() // ****************************************************************** -XBSYSAPI EXPORTNUM(67) NTSTATUS NTAPI IoCreateSymbolicLink +XBSYSAPI EXPORTNUM(67) ntstatus_xt NTAPI IoCreateSymbolicLink ( IN PSTRING SymbolicLinkName, IN PSTRING DeviceName @@ -122,7 +127,7 @@ XBSYSAPI EXPORTNUM(67) NTSTATUS NTAPI IoCreateSymbolicLink // ****************************************************************** // * 0x0044 - IoDeleteDevice() // ****************************************************************** -XBSYSAPI EXPORTNUM(68) VOID NTAPI IoDeleteDevice +XBSYSAPI EXPORTNUM(68) void_xt NTAPI IoDeleteDevice ( IN PDEVICE_OBJECT irql ); @@ -130,7 +135,7 @@ XBSYSAPI EXPORTNUM(68) VOID NTAPI IoDeleteDevice // ****************************************************************** // * 0x0045 - IoDeleteSymbolicLink() // ****************************************************************** -XBSYSAPI EXPORTNUM(69) NTSTATUS NTAPI IoDeleteSymbolicLink +XBSYSAPI EXPORTNUM(69) ntstatus_xt NTAPI IoDeleteSymbolicLink ( IN PSTRING SymbolicLinkName ); @@ -148,7 +153,7 @@ XBSYSAPI EXPORTNUM(71) OBJECT_TYPE IoFileObjectType; // ****************************************************************** // * 0x0048 - IoFreeIrp() // ****************************************************************** -XBSYSAPI EXPORTNUM(72) VOID NTAPI IoFreeIrp +XBSYSAPI EXPORTNUM(72) void_xt NTAPI IoFreeIrp ( IN PIRP Irp ); @@ -159,14 +164,14 @@ XBSYSAPI EXPORTNUM(72) VOID NTAPI IoFreeIrp XBSYSAPI EXPORTNUM(73) PVOID NTAPI IoInitializeIrp ( IN PIRP Irp, - IN USHORT PacketSize, - IN CCHAR StackSize + IN ushort_xt PacketSize, + IN cchar_xt StackSize ); // ****************************************************************** // * 0x004A - IoInvalidDeviceRequest() // ****************************************************************** -XBSYSAPI EXPORTNUM(74) NTSTATUS NTAPI IoInvalidDeviceRequest +XBSYSAPI EXPORTNUM(74) ntstatus_xt NTAPI IoInvalidDeviceRequest ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -175,11 +180,11 @@ XBSYSAPI EXPORTNUM(74) NTSTATUS NTAPI IoInvalidDeviceRequest // ****************************************************************** // * 0x004B - IoQueryFileInformation() // ****************************************************************** -XBSYSAPI EXPORTNUM(75) NTSTATUS NTAPI IoQueryFileInformation +XBSYSAPI EXPORTNUM(75) ntstatus_xt NTAPI IoQueryFileInformation ( IN PFILE_OBJECT FileObject, IN FILE_INFORMATION_CLASS FileInformationClass, - IN ULONG Length, + IN ulong_xt Length, OUT PVOID FileInformation, OUT PULONG ReturnedLength ); @@ -187,11 +192,11 @@ XBSYSAPI EXPORTNUM(75) NTSTATUS NTAPI IoQueryFileInformation // ****************************************************************** // * 0x004C - IoQueryVolumeInformation() // ****************************************************************** -XBSYSAPI EXPORTNUM(76) NTSTATUS NTAPI IoQueryVolumeInformation +XBSYSAPI EXPORTNUM(76) ntstatus_xt NTAPI IoQueryVolumeInformation ( IN PFILE_OBJECT FileObject, IN FS_INFORMATION_CLASS FsInformationClass, - IN ULONG Length, + IN ulong_xt Length, OUT PVOID FsInformation, OUT PULONG ReturnedLength ); @@ -199,7 +204,7 @@ XBSYSAPI EXPORTNUM(76) NTSTATUS NTAPI IoQueryVolumeInformation // ****************************************************************** // * 0x004D - IoQueueThreadIrp() // ****************************************************************** -XBSYSAPI EXPORTNUM(77) VOID NTAPI IoQueueThreadIrp +XBSYSAPI EXPORTNUM(77) void_xt NTAPI IoQueueThreadIrp ( IN PIRP Irp ); @@ -207,7 +212,7 @@ XBSYSAPI EXPORTNUM(77) VOID NTAPI IoQueueThreadIrp // ****************************************************************** // * 0x004E - IoRemoveShareAccess() // ****************************************************************** -XBSYSAPI EXPORTNUM(78) VOID NTAPI IoRemoveShareAccess +XBSYSAPI EXPORTNUM(78) void_xt NTAPI IoRemoveShareAccess ( IN PFILE_OBJECT FileObject, IN PSHARE_ACCESS ShareAccess @@ -216,22 +221,22 @@ XBSYSAPI EXPORTNUM(78) VOID NTAPI IoRemoveShareAccess // ****************************************************************** // * 0x004F - IoSetIoCompletion() // ****************************************************************** -XBSYSAPI EXPORTNUM(79) NTSTATUS NTAPI IoSetIoCompletion +XBSYSAPI EXPORTNUM(79) ntstatus_xt NTAPI IoSetIoCompletion ( IN PKQUEUE IoCompletion, IN PVOID KeyContext, IN PVOID ApcContext, - IN NTSTATUS IoStatus, - IN ULONG IoStatusInformation + IN ntstatus_xt IoStatus, + IN ulong_xt IoStatusInformation ); // ****************************************************************** // * 0x0050 - IoSetShareAccess() // ****************************************************************** -XBSYSAPI EXPORTNUM(80) CCHAR NTAPI IoSetShareAccess +XBSYSAPI EXPORTNUM(80) cchar_xt NTAPI IoSetShareAccess ( - IN ULONG DesiredAccess, - IN ULONG DesiredShareAccess, + IN ulong_xt DesiredAccess, + IN ulong_xt DesiredShareAccess, IN PFILE_OBJECT FileObject, OUT PSHARE_ACCESS ShareAccess ); @@ -239,7 +244,7 @@ XBSYSAPI EXPORTNUM(80) CCHAR NTAPI IoSetShareAccess // ****************************************************************** // * 0x0051 - IoStartNextPacket() // ****************************************************************** -XBSYSAPI EXPORTNUM(81) VOID NTAPI IoStartNextPacket +XBSYSAPI EXPORTNUM(81) void_xt NTAPI IoStartNextPacket ( IN PDEVICE_OBJECT DeviceObject ); @@ -247,16 +252,16 @@ XBSYSAPI EXPORTNUM(81) VOID NTAPI IoStartNextPacket // ****************************************************************** // * 0x0052 - IoStartNextPacketByKey() // ****************************************************************** -XBSYSAPI EXPORTNUM(82) VOID NTAPI IoStartNextPacketByKey +XBSYSAPI EXPORTNUM(82) void_xt NTAPI IoStartNextPacketByKey ( IN PDEVICE_OBJECT DeviceObject, - IN ULONG Key + IN ulong_xt Key ); // ****************************************************************** // * 0x0053 - IoStartPacket() // ****************************************************************** -XBSYSAPI EXPORTNUM(83) VOID NTAPI IoStartPacket +XBSYSAPI EXPORTNUM(83) void_xt NTAPI IoStartPacket ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -266,34 +271,34 @@ XBSYSAPI EXPORTNUM(83) VOID NTAPI IoStartPacket // ****************************************************************** // * 0x0054 - IoSynchronousDeviceIoControlRequest() // ****************************************************************** -XBSYSAPI EXPORTNUM(84) NTSTATUS NTAPI IoSynchronousDeviceIoControlRequest +XBSYSAPI EXPORTNUM(84) ntstatus_xt NTAPI IoSynchronousDeviceIoControlRequest ( - IN ULONG IoControlCode, + IN ulong_xt IoControlCode, IN PDEVICE_OBJECT DeviceObject, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, + IN ulong_xt InputBufferLength, OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength, + IN ulong_xt OutputBufferLength, OUT PULONG ReturnedOutputBufferLength OPTIONAL, - IN BOOLEAN InternalDeviceIoControl + IN boolean_xt InternalDeviceIoControl ); // ****************************************************************** // * 0x0055 - IoSynchronousFsdRequest() // ****************************************************************** -XBSYSAPI EXPORTNUM(85) NTSTATUS NTAPI IoSynchronousFsdRequest +XBSYSAPI EXPORTNUM(85) ntstatus_xt NTAPI IoSynchronousFsdRequest ( - IN ULONG MajorFunction, + IN ulong_xt MajorFunction, IN PDEVICE_OBJECT DeviceObject, OUT PVOID Buffer OPTIONAL, - IN ULONG Length, + IN ulong_xt Length, IN PLARGE_INTEGER StartingOffset OPTIONAL ); // ****************************************************************** // * 0x0056 - IofCallDriver() // ****************************************************************** -XBSYSAPI EXPORTNUM(86) NTSTATUS FASTCALL IofCallDriver +XBSYSAPI EXPORTNUM(86) ntstatus_xt FASTCALL IofCallDriver ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -302,16 +307,16 @@ XBSYSAPI EXPORTNUM(86) NTSTATUS FASTCALL IofCallDriver // ****************************************************************** // * 0x0057 - IofCompleteRequest() // ****************************************************************** -XBSYSAPI EXPORTNUM(87) VOID FASTCALL IofCompleteRequest +XBSYSAPI EXPORTNUM(87) void_xt FASTCALL IofCompleteRequest ( IN PIRP Irp, - IN CCHAR PriorityBoost + IN cchar_xt PriorityBoost ); // ****************************************************************** // * 0x005A - IoDismountVolume() // ****************************************************************** -XBSYSAPI EXPORTNUM(90) NTSTATUS NTAPI IoDismountVolume +XBSYSAPI EXPORTNUM(90) ntstatus_xt NTAPI IoDismountVolume ( IN PDEVICE_OBJECT DeviceObject ); @@ -319,7 +324,7 @@ XBSYSAPI EXPORTNUM(90) NTSTATUS NTAPI IoDismountVolume // ****************************************************************** // * 0x005B - IoDismountVolumeByName() // ****************************************************************** -XBSYSAPI EXPORTNUM(91) NTSTATUS NTAPI IoDismountVolumeByName +XBSYSAPI EXPORTNUM(91) ntstatus_xt NTAPI IoDismountVolumeByName ( IN PSTRING VolumeName ); @@ -327,11 +332,13 @@ XBSYSAPI EXPORTNUM(91) NTSTATUS NTAPI IoDismountVolumeByName // ****************************************************************** // * 0x0167 - IoMarkIrpMustComplete() // ****************************************************************** -XBSYSAPI EXPORTNUM(359) CCHAR NTAPI IoMarkIrpMustComplete +XBSYSAPI EXPORTNUM(359) cchar_xt NTAPI IoMarkIrpMustComplete ( IN PIRP Irp ); +} + #endif diff --git a/import/OpenXDK/include/xboxkrnl/kernel.h b/src/core/kernel/common/kernel.h similarity index 75% rename from import/OpenXDK/include/xboxkrnl/kernel.h rename to src/core/kernel/common/kernel.h index 93a8f7e70..2c1fcece4 100644 --- a/import/OpenXDK/include/xboxkrnl/kernel.h +++ b/src/core/kernel/common/kernel.h @@ -12,10 +12,15 @@ #ifndef KERNEL_H #define KERNEL_H +#include "types.h" + +namespace xbox +{ + // ****************************************************************** // * 0x005C - KeAlertResumeThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(92) NTSTATUS NTAPI KeAlertResumeThread +XBSYSAPI EXPORTNUM(92) ntstatus_xt NTAPI KeAlertResumeThread ( IN HANDLE ThreadHandle, IN OUT PULONG PreviousSuspendCount @@ -24,7 +29,7 @@ XBSYSAPI EXPORTNUM(92) NTSTATUS NTAPI KeAlertResumeThread // ****************************************************************** // * 0x005D - KeAlertThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(93) NTSTATUS NTAPI KeAlertThread +XBSYSAPI EXPORTNUM(93) ntstatus_xt NTAPI KeAlertThread ( IN HANDLE ThreadHandle ); @@ -32,7 +37,7 @@ XBSYSAPI EXPORTNUM(93) NTSTATUS NTAPI KeAlertThread // ****************************************************************** // * 0x005E - KeBoostPriorityThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(94) NTSTATUS NTAPI KeBoostPriorityThread +XBSYSAPI EXPORTNUM(94) ntstatus_xt NTAPI KeBoostPriorityThread ( IN PKTHREAD Thread, IN KPRIORITY Increment @@ -41,17 +46,17 @@ XBSYSAPI EXPORTNUM(94) NTSTATUS NTAPI KeBoostPriorityThread // ****************************************************************** // * 0x005F - KeBugCheck() // ****************************************************************** -XBSYSAPI EXPORTNUM(95) VOID NTAPI KeBugCheck +XBSYSAPI EXPORTNUM(95) void_xt NTAPI KeBugCheck ( - IN ULONG BugCheckMode + IN ulong_xt BugCheckMode ); // ****************************************************************** // * 0x0060 - KeBugCheckEx() // ****************************************************************** -XBSYSAPI EXPORTNUM(96) NTSTATUS NTAPI KeBugCheckEx +XBSYSAPI EXPORTNUM(96) ntstatus_xt NTAPI KeBugCheckEx ( - IN DWORD BugCheckCode, + IN dword_xt BugCheckCode, IN PVOID BugCheckParameter1, IN PVOID BugCheckParameter2, IN PVOID BugCheckParameter3, @@ -61,7 +66,7 @@ XBSYSAPI EXPORTNUM(96) NTSTATUS NTAPI KeBugCheckEx // ****************************************************************** // * 0x0061 - KeCancelTimer() // ****************************************************************** -XBSYSAPI EXPORTNUM(97) BOOLEAN NTAPI KeCancelTimer +XBSYSAPI EXPORTNUM(97) boolean_xt NTAPI KeCancelTimer ( IN PKTIMER ); @@ -69,7 +74,7 @@ XBSYSAPI EXPORTNUM(97) BOOLEAN NTAPI KeCancelTimer // ****************************************************************** // * 0x0062 - KeConnectInterrupt() // ****************************************************************** -XBSYSAPI EXPORTNUM(98) BOOLEAN NTAPI KeConnectInterrupt +XBSYSAPI EXPORTNUM(98) boolean_xt NTAPI KeConnectInterrupt ( IN PKINTERRUPT InterruptObject ); @@ -77,17 +82,17 @@ XBSYSAPI EXPORTNUM(98) BOOLEAN NTAPI KeConnectInterrupt // ****************************************************************** // * 0x0063 - KeDelayExecutionThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(99) NTSTATUS NTAPI KeDelayExecutionThread +XBSYSAPI EXPORTNUM(99) ntstatus_xt NTAPI KeDelayExecutionThread ( IN KPROCESSOR_MODE WaitMode, - IN BOOLEAN Alertable, + IN boolean_xt Alertable, IN PLARGE_INTEGER Interval ); // ****************************************************************** // * 0x0064 - KeDisconnectInterrupt() // ****************************************************************** -XBSYSAPI EXPORTNUM(100) VOID NTAPI KeDisconnectInterrupt +XBSYSAPI EXPORTNUM(100) void_xt NTAPI KeDisconnectInterrupt ( IN PKINTERRUPT InterruptObject ); @@ -95,9 +100,9 @@ XBSYSAPI EXPORTNUM(100) VOID NTAPI KeDisconnectInterrupt // ****************************************************************** // * 0x0065 - KeEnterCriticalRegion() // ****************************************************************** -XBSYSAPI EXPORTNUM(101) VOID NTAPI KeEnterCriticalRegion +XBSYSAPI EXPORTNUM(101) void_xt NTAPI KeEnterCriticalRegion ( - VOID + void_xt ); // ****************************************************************** @@ -113,7 +118,7 @@ XBSYSAPI EXPORTNUM(104) PKTHREAD NTAPI KeGetCurrentThread(void); // ****************************************************************** // * 0x0069 - KeInitializeApc() // ****************************************************************** -XBSYSAPI EXPORTNUM(105) VOID NTAPI KeInitializeApc +XBSYSAPI EXPORTNUM(105) void_xt NTAPI KeInitializeApc ( IN PKAPC Apc, IN PKTHREAD Thread, @@ -127,7 +132,7 @@ XBSYSAPI EXPORTNUM(105) VOID NTAPI KeInitializeApc // ****************************************************************** // * 0x006A - KeInitializeDeviceQueue() // ****************************************************************** -XBSYSAPI EXPORTNUM(106) VOID NTAPI KeInitializeDeviceQueue +XBSYSAPI EXPORTNUM(106) void_xt NTAPI KeInitializeDeviceQueue ( OUT PKDEVICE_QUEUE DeviceQueue ); @@ -135,7 +140,7 @@ XBSYSAPI EXPORTNUM(106) VOID NTAPI KeInitializeDeviceQueue // ****************************************************************** // * 0x006B - KeInitializeDpc() // ****************************************************************** -XBSYSAPI EXPORTNUM(107) VOID NTAPI KeInitializeDpc +XBSYSAPI EXPORTNUM(107) void_xt NTAPI KeInitializeDpc ( KDPC *Dpc, PKDEFERRED_ROUTINE DeferredRoutine, @@ -145,90 +150,90 @@ XBSYSAPI EXPORTNUM(107) VOID NTAPI KeInitializeDpc // ****************************************************************** // * 0x006C - KeInitializeEvent() // ****************************************************************** -XBSYSAPI EXPORTNUM(108) VOID NTAPI KeInitializeEvent +XBSYSAPI EXPORTNUM(108) void_xt NTAPI KeInitializeEvent ( IN PRKEVENT Event, IN EVENT_TYPE Type, - IN BOOLEAN SignalState + IN boolean_xt SignalState ); // ****************************************************************** // * 0x006D - KeInitializeInterrupt() // ****************************************************************** -XBSYSAPI EXPORTNUM(109) VOID NTAPI KeInitializeInterrupt +XBSYSAPI EXPORTNUM(109) void_xt NTAPI KeInitializeInterrupt ( OUT PKINTERRUPT Interrupt, IN PKSERVICE_ROUTINE ServiceRoutine, IN PVOID ServiceContext, - IN ULONG Vector, + IN ulong_xt Vector, IN KIRQL Irql, IN KINTERRUPT_MODE InterruptMode, - IN BOOLEAN ShareVector + IN boolean_xt ShareVector ); // ****************************************************************** // * 0x006E - KeInitializeMutant() // ****************************************************************** -XBSYSAPI EXPORTNUM(110) VOID NTAPI KeInitializeMutant +XBSYSAPI EXPORTNUM(110) void_xt NTAPI KeInitializeMutant ( IN PRKMUTANT Mutant, - IN BOOLEAN InitialOwner + IN boolean_xt InitialOwner ); // ****************************************************************** // * 0x006F - KeInitializeQueue() // ****************************************************************** -XBSYSAPI EXPORTNUM(111) VOID NTAPI KeInitializeQueue +XBSYSAPI EXPORTNUM(111) void_xt NTAPI KeInitializeQueue ( IN PKQUEUE Queue, - IN ULONG Count OPTIONAL + IN ulong_xt Count OPTIONAL ); // ****************************************************************** // * 0x0070 - KeInitializeSemaphore() // ****************************************************************** -XBSYSAPI EXPORTNUM(112) VOID NTAPI KeInitializeSemaphore +XBSYSAPI EXPORTNUM(112) void_xt NTAPI KeInitializeSemaphore ( IN PRKSEMAPHORE Semaphore, - IN LONG Count, - IN LONG Limit + IN long_xt Count, + IN long_xt Limit ); // ****************************************************************** // * 0x0071 - KeInitializeTimerEx() // ****************************************************************** -XBSYSAPI EXPORTNUM(113) VOID NTAPI KeInitializeTimerEx +XBSYSAPI EXPORTNUM(113) void_xt NTAPI KeInitializeTimerEx ( IN PKTIMER Timer, IN TIMER_TYPE Type ); -XBSYSAPI EXPORTNUM(114) BOOLEAN NTAPI KeInsertByKeyDeviceQueue +XBSYSAPI EXPORTNUM(114) boolean_xt NTAPI KeInsertByKeyDeviceQueue ( IN PKDEVICE_QUEUE DeviceQueue, IN PKDEVICE_QUEUE_ENTRY DeviceQueueEntry, - IN ULONG SortKey + IN ulong_xt SortKey ); -XBSYSAPI EXPORTNUM(115) BOOLEAN NTAPI KeInsertDeviceQueue +XBSYSAPI EXPORTNUM(115) boolean_xt NTAPI KeInsertDeviceQueue ( IN PKDEVICE_QUEUE DeviceQueue, IN PKDEVICE_QUEUE_ENTRY DeviceQueueEntry ); -XBSYSAPI EXPORTNUM(116) LONG NTAPI KeInsertHeadQueue +XBSYSAPI EXPORTNUM(116) long_xt NTAPI KeInsertHeadQueue ( IN PRKQUEUE Queue, IN PLIST_ENTRY Entry ); -XBSYSAPI EXPORTNUM(117) LONG NTAPI KeInsertQueue +XBSYSAPI EXPORTNUM(117) long_xt NTAPI KeInsertQueue ( IN PRKQUEUE Queue, IN PLIST_ENTRY Entry ); -XBSYSAPI EXPORTNUM(118) BOOLEAN NTAPI KeInsertQueueApc +XBSYSAPI EXPORTNUM(118) boolean_xt NTAPI KeInsertQueueApc ( IN PRKAPC Apc, IN PVOID SystemArgument1, @@ -239,7 +244,7 @@ XBSYSAPI EXPORTNUM(118) BOOLEAN NTAPI KeInsertQueueApc // ****************************************************************** // * 0x0077 - KeInsertQueueDpc() // ****************************************************************** -XBSYSAPI EXPORTNUM(119) BOOLEAN NTAPI KeInsertQueueDpc +XBSYSAPI EXPORTNUM(119) boolean_xt NTAPI KeInsertQueueDpc ( IN PKDPC Dpc, IN PVOID SystemArgument1, @@ -254,24 +259,24 @@ XBSYSAPI EXPORTNUM(120) KSYSTEM_TIME KeInterruptTime; // ****************************************************************** // * 0x0079 - KeIsExecutingDpc() // ****************************************************************** -XBSYSAPI EXPORTNUM(121) BOOLEAN NTAPI KeIsExecutingDpc(); +XBSYSAPI EXPORTNUM(121) boolean_xt NTAPI KeIsExecutingDpc(); // ****************************************************************** // * 0x007A - KeLeaveCriticalRegion() // ****************************************************************** -XBSYSAPI EXPORTNUM(122) VOID NTAPI KeLeaveCriticalRegion +XBSYSAPI EXPORTNUM(122) void_xt NTAPI KeLeaveCriticalRegion ( - VOID + void_xt ); -XBSYSAPI EXPORTNUM(123) LONG NTAPI KePulseEvent +XBSYSAPI EXPORTNUM(123) long_xt NTAPI KePulseEvent ( IN PRKEVENT Event, IN KPRIORITY Increment, - IN BOOLEAN Wait + IN boolean_xt Wait ); -XBSYSAPI EXPORTNUM(124) LONG NTAPI KeQueryBasePriorityThread +XBSYSAPI EXPORTNUM(124) long_xt NTAPI KeQueryBasePriorityThread ( IN PKTHREAD Thread ); @@ -279,22 +284,22 @@ XBSYSAPI EXPORTNUM(124) LONG NTAPI KeQueryBasePriorityThread // ****************************************************************** // * 0x007D - KeQueryInterruptTime() // ****************************************************************** -XBSYSAPI EXPORTNUM(125) ULONGLONG NTAPI KeQueryInterruptTime(void); +XBSYSAPI EXPORTNUM(125) ulonglong_xt NTAPI KeQueryInterruptTime(void); // ****************************************************************** // * 0x007E - KeQueryPerformanceCounter() // ****************************************************************** -XBSYSAPI EXPORTNUM(126) ULONGLONG NTAPI KeQueryPerformanceCounter(void); +XBSYSAPI EXPORTNUM(126) ulonglong_xt NTAPI KeQueryPerformanceCounter(void); // ****************************************************************** // * 0x007F - KeQueryPerformanceFrequency() // ****************************************************************** -XBSYSAPI EXPORTNUM(127) ULONGLONG NTAPI KeQueryPerformanceFrequency(void); +XBSYSAPI EXPORTNUM(127) ulonglong_xt NTAPI KeQueryPerformanceFrequency(void); // ****************************************************************** // * 0x0080 - KeQuerySystemTime() // ****************************************************************** -XBSYSAPI EXPORTNUM(128) VOID NTAPI KeQuerySystemTime +XBSYSAPI EXPORTNUM(128) void_xt NTAPI KeQuerySystemTime ( PLARGE_INTEGER CurrentTime ); @@ -302,33 +307,33 @@ XBSYSAPI EXPORTNUM(128) VOID NTAPI KeQuerySystemTime // ****************************************************************** // * 0x0081 - KeRaiseIrqlToDpcLevel() // ****************************************************************** -XBSYSAPI EXPORTNUM(129) UCHAR NTAPI KeRaiseIrqlToDpcLevel(); +XBSYSAPI EXPORTNUM(129) uchar_xt NTAPI KeRaiseIrqlToDpcLevel(); // ****************************************************************** // * 0x0082 - KeRaiseIrqlToSynchLevel() // ****************************************************************** -XBSYSAPI EXPORTNUM(130) UCHAR NTAPI KeRaiseIrqlToSynchLevel(); +XBSYSAPI EXPORTNUM(130) uchar_xt NTAPI KeRaiseIrqlToSynchLevel(); -XBSYSAPI EXPORTNUM(131) LONG NTAPI KeReleaseMutant +XBSYSAPI EXPORTNUM(131) long_xt NTAPI KeReleaseMutant ( IN PRKMUTANT Mutant, IN KPRIORITY Increment, - IN BOOLEAN Abandoned, - IN BOOLEAN Wait + IN boolean_xt Abandoned, + IN boolean_xt Wait ); -XBSYSAPI EXPORTNUM(132) LONG NTAPI KeReleaseSemaphore +XBSYSAPI EXPORTNUM(132) long_xt NTAPI KeReleaseSemaphore ( IN PRKSEMAPHORE Semaphore, IN KPRIORITY Increment, - IN LONG Adjustment, - IN BOOLEAN Wait + IN long_xt Adjustment, + IN boolean_xt Wait ); XBSYSAPI EXPORTNUM(133) PKDEVICE_QUEUE_ENTRY NTAPI KeRemoveByKeyDeviceQueue ( IN PKDEVICE_QUEUE DeviceQueue, - IN ULONG SortKey + IN ulong_xt SortKey ); XBSYSAPI EXPORTNUM(134) PKDEVICE_QUEUE_ENTRY NTAPI KeRemoveDeviceQueue @@ -336,7 +341,7 @@ XBSYSAPI EXPORTNUM(134) PKDEVICE_QUEUE_ENTRY NTAPI KeRemoveDeviceQueue IN PKDEVICE_QUEUE DeviceQueue ); -XBSYSAPI EXPORTNUM(135) BOOLEAN NTAPI KeRemoveEntryDeviceQueue +XBSYSAPI EXPORTNUM(135) boolean_xt NTAPI KeRemoveEntryDeviceQueue ( IN PKDEVICE_QUEUE DeviceQueue, IN PKDEVICE_QUEUE_ENTRY DeviceQueueEntry @@ -352,7 +357,7 @@ XBSYSAPI EXPORTNUM(136) PLIST_ENTRY NTAPI KeRemoveQueue // ****************************************************************** // * 0x0089 - KeRemoveQueueDpc() // ****************************************************************** -XBSYSAPI EXPORTNUM(137) BOOLEAN NTAPI KeRemoveQueueDpc +XBSYSAPI EXPORTNUM(137) boolean_xt NTAPI KeRemoveQueueDpc ( IN PKDPC Dpc ); @@ -360,7 +365,7 @@ XBSYSAPI EXPORTNUM(137) BOOLEAN NTAPI KeRemoveQueueDpc // ****************************************************************** // * 0x008A - KeResetEvent() // ****************************************************************** -XBSYSAPI EXPORTNUM(138) LONG NTAPI KeResetEvent +XBSYSAPI EXPORTNUM(138) long_xt NTAPI KeResetEvent ( IN PRKEVENT Event ); @@ -368,7 +373,7 @@ XBSYSAPI EXPORTNUM(138) LONG NTAPI KeResetEvent // ****************************************************************** // * 0x008B - KeRestoreFloatingPointState() // ****************************************************************** -XBSYSAPI EXPORTNUM(139) NTSTATUS NTAPI KeRestoreFloatingPointState +XBSYSAPI EXPORTNUM(139) ntstatus_xt NTAPI KeRestoreFloatingPointState ( IN PKFLOATING_SAVE PublicFloatSave ); @@ -376,7 +381,7 @@ XBSYSAPI EXPORTNUM(139) NTSTATUS NTAPI KeRestoreFloatingPointState // ****************************************************************** // * 0x008C - KeResumeThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(140) ULONG NTAPI KeResumeThread +XBSYSAPI EXPORTNUM(140) ulong_xt NTAPI KeResumeThread ( IN PKTHREAD Thread ); @@ -389,7 +394,7 @@ XBSYSAPI EXPORTNUM(141) PLIST_ENTRY NTAPI KeRundownQueue // ****************************************************************** // * 0x008E - KeSaveFloatingPointState() // ****************************************************************** -XBSYSAPI EXPORTNUM(142) NTSTATUS NTAPI KeSaveFloatingPointState +XBSYSAPI EXPORTNUM(142) ntstatus_xt NTAPI KeSaveFloatingPointState ( OUT PKFLOATING_SAVE PublicFloatSave ); @@ -397,29 +402,29 @@ XBSYSAPI EXPORTNUM(142) NTSTATUS NTAPI KeSaveFloatingPointState // ****************************************************************** // * 0x008F - KeSetBasePriorityThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(143) LONG NTAPI KeSetBasePriorityThread +XBSYSAPI EXPORTNUM(143) long_xt NTAPI KeSetBasePriorityThread ( IN PKTHREAD Thread, - IN LONG Priority + IN long_xt Priority ); -XBSYSAPI EXPORTNUM(144) ULONG NTAPI KeSetDisableBoostThread +XBSYSAPI EXPORTNUM(144) ulong_xt NTAPI KeSetDisableBoostThread ( IN PKTHREAD Thread, - IN ULONG Disable + IN ulong_xt Disable ); // ****************************************************************** // * 0x0091 - KeSetEvent() // ****************************************************************** -XBSYSAPI EXPORTNUM(145) LONG NTAPI KeSetEvent +XBSYSAPI EXPORTNUM(145) long_xt NTAPI KeSetEvent ( IN PRKEVENT Event, IN KPRIORITY Increment, - IN BOOLEAN Wait + IN boolean_xt Wait ); -XBSYSAPI EXPORTNUM(146) VOID NTAPI KeSetEventBoostPriority +XBSYSAPI EXPORTNUM(146) void_xt NTAPI KeSetEventBoostPriority ( IN PRKEVENT Event, IN PRKTHREAD *Thread @@ -434,16 +439,16 @@ XBSYSAPI EXPORTNUM(147) KPRIORITY NTAPI KeSetPriorityProcess // ****************************************************************** // * 0x0094 - KeSetPriorityThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(148) BOOLEAN NTAPI KeSetPriorityThread +XBSYSAPI EXPORTNUM(148) boolean_xt NTAPI KeSetPriorityThread ( IN PKTHREAD Thread, - IN LONG Priority + IN long_xt Priority ); // ****************************************************************** // * 0x0095 - KeSetTimer() // ****************************************************************** -XBSYSAPI EXPORTNUM(149) BOOLEAN NTAPI KeSetTimer +XBSYSAPI EXPORTNUM(149) boolean_xt NTAPI KeSetTimer ( IN PKTIMER Timer, IN LARGE_INTEGER DueTime, @@ -453,26 +458,26 @@ XBSYSAPI EXPORTNUM(149) BOOLEAN NTAPI KeSetTimer // ****************************************************************** // * 0x0096 - KeSetTimerEx() // ****************************************************************** -XBSYSAPI EXPORTNUM(150) BOOLEAN NTAPI KeSetTimerEx +XBSYSAPI EXPORTNUM(150) boolean_xt NTAPI KeSetTimerEx ( IN PKTIMER Timer, IN LARGE_INTEGER DueTime, - IN LONG Period OPTIONAL, + IN long_xt Period OPTIONAL, IN PKDPC Dpc OPTIONAL ); // ****************************************************************** // * 0x0097 - KeStallExecutionProcessor() // ****************************************************************** -XBSYSAPI EXPORTNUM(151) VOID NTAPI KeStallExecutionProcessor +XBSYSAPI EXPORTNUM(151) void_xt NTAPI KeStallExecutionProcessor ( - IN ULONG MicroSeconds + IN ulong_xt MicroSeconds ); // ****************************************************************** // * 0x0098 - KeSuspendThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(152) ULONG NTAPI KeSuspendThread +XBSYSAPI EXPORTNUM(152) ulong_xt NTAPI KeSuspendThread ( IN PKTHREAD Thread ); @@ -480,7 +485,7 @@ XBSYSAPI EXPORTNUM(152) ULONG NTAPI KeSuspendThread // ****************************************************************** // * 0x0099 - KeSynchronizeExecution() // ****************************************************************** -XBSYSAPI EXPORTNUM(153) BOOLEAN NTAPI KeSynchronizeExecution +XBSYSAPI EXPORTNUM(153) boolean_xt NTAPI KeSynchronizeExecution ( IN PKINTERRUPT Interrupt, IN PKSYNCHRONIZE_ROUTINE SynchronizeRoutine, @@ -495,7 +500,7 @@ XBSYSAPI EXPORTNUM(154) KSYSTEM_TIME KeSystemTime; // ****************************************************************** // * 0x009B - KeTestAlertThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(155) BOOLEAN NTAPI KeTestAlertThread +XBSYSAPI EXPORTNUM(155) boolean_xt NTAPI KeTestAlertThread ( IN KPROCESSOR_MODE AlertMode ); @@ -503,24 +508,24 @@ XBSYSAPI EXPORTNUM(155) BOOLEAN NTAPI KeTestAlertThread // ****************************************************************** // * 0x009C - KeTickCount // ****************************************************************** -XBSYSAPI EXPORTNUM(156) volatile DWORD KeTickCount; +XBSYSAPI EXPORTNUM(156) volatile dword_xt KeTickCount; // ****************************************************************** // * 0x009D - KeTimeIncrement // ****************************************************************** -XBSYSAPI EXPORTNUM(157) ULONG KeTimeIncrement; +XBSYSAPI EXPORTNUM(157) ulong_xt KeTimeIncrement; // ****************************************************************** // * 0x009E - KeWaitForMultipleObjects() // ****************************************************************** -XBSYSAPI EXPORTNUM(158) NTSTATUS NTAPI KeWaitForMultipleObjects +XBSYSAPI EXPORTNUM(158) ntstatus_xt NTAPI KeWaitForMultipleObjects ( - IN ULONG Count, + IN ulong_xt Count, IN PVOID Object[], IN WAIT_TYPE WaitType, IN KWAIT_REASON WaitReason, IN KPROCESSOR_MODE WaitMode, - IN BOOLEAN Alertable, + IN boolean_xt Alertable, IN PLARGE_INTEGER Timeout OPTIONAL, IN PKWAIT_BLOCK WaitBlockArray OPTIONAL ); @@ -528,15 +533,17 @@ XBSYSAPI EXPORTNUM(158) NTSTATUS NTAPI KeWaitForMultipleObjects // ****************************************************************** // * 0x009F - KeWaitForSingleObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(159) NTSTATUS NTAPI KeWaitForSingleObject +XBSYSAPI EXPORTNUM(159) ntstatus_xt NTAPI KeWaitForSingleObject ( IN PVOID Object, IN KWAIT_REASON WaitReason, IN KPROCESSOR_MODE WaitMode, - IN BOOLEAN Alertable, + IN boolean_xt Alertable, IN PLARGE_INTEGER Timeout OPTIONAL ); +} + #endif diff --git a/import/OpenXDK/include/xboxkrnl/mm.h b/src/core/kernel/common/mm.h similarity index 74% rename from import/OpenXDK/include/xboxkrnl/mm.h rename to src/core/kernel/common/mm.h index 95d13bc92..3be1e3e4e 100644 --- a/import/OpenXDK/include/xboxkrnl/mm.h +++ b/src/core/kernel/common/mm.h @@ -12,6 +12,11 @@ #ifndef XBOXKRNL_MM_H #define XBOXKRNL_MM_H +#include "types.h" + +namespace xbox +{ + XBSYSAPI EXPORTNUM(102) PVOID MmGlobalData[8]; // ****************************************************************** @@ -24,7 +29,7 @@ XBSYSAPI EXPORTNUM(102) PVOID MmGlobalData[8]; // ****************************************************************** XBSYSAPI EXPORTNUM(165) PVOID NTAPI MmAllocateContiguousMemory ( - IN ULONG NumberOfBytes + IN ulong_xt NumberOfBytes ); // ****************************************************************** @@ -32,11 +37,11 @@ XBSYSAPI EXPORTNUM(165) PVOID NTAPI MmAllocateContiguousMemory // ****************************************************************** XBSYSAPI EXPORTNUM(166) PVOID NTAPI MmAllocateContiguousMemoryEx ( - IN ULONG NumberOfBytes, - IN PHYSICAL_ADDRESS LowestAcceptableAddress, - IN PHYSICAL_ADDRESS HighestAcceptableAddress, - IN ULONG Alignment OPTIONAL, - IN ULONG ProtectionType + IN ulong_xt NumberOfBytes, + IN physical_address_xt LowestAcceptableAddress, + IN physical_address_xt HighestAcceptableAddress, + IN ulong_xt Alignment OPTIONAL, + IN ulong_xt ProtectionType ); // ****************************************************************** @@ -44,8 +49,8 @@ XBSYSAPI EXPORTNUM(166) PVOID NTAPI MmAllocateContiguousMemoryEx // ****************************************************************** XBSYSAPI EXPORTNUM(167) PVOID NTAPI MmAllocateSystemMemory ( - ULONG NumberOfBytes, - ULONG Protect + ulong_xt NumberOfBytes, + ulong_xt Protect ); // ****************************************************************** @@ -53,8 +58,8 @@ XBSYSAPI EXPORTNUM(167) PVOID NTAPI MmAllocateSystemMemory // ****************************************************************** XBSYSAPI EXPORTNUM(168) PVOID NTAPI MmClaimGpuInstanceMemory ( - IN SIZE_T NumberOfBytes, - OUT SIZE_T *NumberOfPaddingBytes + IN size_xt NumberOfBytes, + OUT size_xt *NumberOfPaddingBytes ); // ****************************************************************** @@ -62,14 +67,14 @@ XBSYSAPI EXPORTNUM(168) PVOID NTAPI MmClaimGpuInstanceMemory // ****************************************************************** XBSYSAPI EXPORTNUM(169) PVOID NTAPI MmCreateKernelStack ( - IN ULONG NumberOfBytes, - IN BOOLEAN DebuggerThread + IN ulong_xt NumberOfBytes, + IN boolean_xt DebuggerThread ); // ****************************************************************** // * MmDeleteKernelStack // ****************************************************************** -XBSYSAPI EXPORTNUM(170) VOID NTAPI MmDeleteKernelStack +XBSYSAPI EXPORTNUM(170) void_xt NTAPI MmDeleteKernelStack ( IN PVOID StackBase, IN PVOID StackLimit @@ -78,7 +83,7 @@ XBSYSAPI EXPORTNUM(170) VOID NTAPI MmDeleteKernelStack // ****************************************************************** // * MmFreeContiguousMemory // ****************************************************************** -XBSYSAPI EXPORTNUM(171) VOID NTAPI MmFreeContiguousMemory +XBSYSAPI EXPORTNUM(171) void_xt NTAPI MmFreeContiguousMemory ( IN PVOID BaseAddress ); @@ -86,16 +91,16 @@ XBSYSAPI EXPORTNUM(171) VOID NTAPI MmFreeContiguousMemory // ****************************************************************** // * MmFreeSystemMemory // ****************************************************************** -XBSYSAPI EXPORTNUM(172) ULONG NTAPI MmFreeSystemMemory +XBSYSAPI EXPORTNUM(172) ulong_xt NTAPI MmFreeSystemMemory ( PVOID BaseAddress, - ULONG NumberOfBytes + ulong_xt NumberOfBytes ); // ****************************************************************** // * MmGetPhysicalAddress // ****************************************************************** -XBSYSAPI EXPORTNUM(173) PHYSICAL_ADDRESS NTAPI MmGetPhysicalAddress +XBSYSAPI EXPORTNUM(173) physical_address_xt NTAPI MmGetPhysicalAddress ( IN PVOID BaseAddress ); @@ -103,7 +108,7 @@ XBSYSAPI EXPORTNUM(173) PHYSICAL_ADDRESS NTAPI MmGetPhysicalAddress // ****************************************************************** // * MmIsAddressValid // ****************************************************************** -XBSYSAPI EXPORTNUM(174) BOOLEAN NTAPI MmIsAddressValid +XBSYSAPI EXPORTNUM(174) boolean_xt NTAPI MmIsAddressValid ( IN PVOID VirtualAddress ); @@ -111,20 +116,20 @@ XBSYSAPI EXPORTNUM(174) BOOLEAN NTAPI MmIsAddressValid // ****************************************************************** // * MmLockUnlockBufferPages // ****************************************************************** -XBSYSAPI EXPORTNUM(175) VOID NTAPI MmLockUnlockBufferPages +XBSYSAPI EXPORTNUM(175) void_xt NTAPI MmLockUnlockBufferPages ( IN PVOID BaseAddress, - IN SIZE_T NumberOfBytes, - IN BOOLEAN UnlockPages + IN size_xt NumberOfBytes, + IN boolean_xt UnlockPages ); // ****************************************************************** // * MmLockUnlockPhysicalPage // ****************************************************************** -XBSYSAPI EXPORTNUM(176) VOID NTAPI MmLockUnlockPhysicalPage +XBSYSAPI EXPORTNUM(176) void_xt NTAPI MmLockUnlockPhysicalPage ( - IN ULONG_PTR PhysicalAddress, - IN BOOLEAN UnlockPage + IN ulong_ptr_xt PhysicalAddress, + IN boolean_xt UnlockPage ); // ****************************************************************** @@ -132,25 +137,25 @@ XBSYSAPI EXPORTNUM(176) VOID NTAPI MmLockUnlockPhysicalPage // ****************************************************************** XBSYSAPI EXPORTNUM(177) PVOID NTAPI MmMapIoSpace ( - IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberOfBytes, - IN ULONG ProtectionType + IN physical_address_xt PhysicalAddress, + IN ulong_xt NumberOfBytes, + IN ulong_xt ProtectionType ); // ****************************************************************** // * MmPersistContiguousMemory // ****************************************************************** -XBSYSAPI EXPORTNUM(178) VOID NTAPI MmPersistContiguousMemory +XBSYSAPI EXPORTNUM(178) void_xt NTAPI MmPersistContiguousMemory ( IN PVOID BaseAddress, - IN ULONG NumberOfBytes, - IN BOOLEAN Persist + IN ulong_xt NumberOfBytes, + IN boolean_xt Persist ); // ****************************************************************** // * MmQueryAddressProtect // ****************************************************************** -XBSYSAPI EXPORTNUM(179) ULONG NTAPI MmQueryAddressProtect +XBSYSAPI EXPORTNUM(179) ulong_xt NTAPI MmQueryAddressProtect ( IN PVOID VirtualAddress ); @@ -158,7 +163,7 @@ XBSYSAPI EXPORTNUM(179) ULONG NTAPI MmQueryAddressProtect // ****************************************************************** // * MmQueryAllocationSize // ****************************************************************** -XBSYSAPI EXPORTNUM(180) ULONG NTAPI MmQueryAllocationSize +XBSYSAPI EXPORTNUM(180) ulong_xt NTAPI MmQueryAllocationSize ( IN PVOID BaseAddress ); @@ -166,7 +171,7 @@ XBSYSAPI EXPORTNUM(180) ULONG NTAPI MmQueryAllocationSize // ****************************************************************** // * MmQueryStatistics // ****************************************************************** -XBSYSAPI EXPORTNUM(181) NTSTATUS NTAPI MmQueryStatistics +XBSYSAPI EXPORTNUM(181) ntstatus_xt NTAPI MmQueryStatistics ( OUT PMM_STATISTICS MemoryStatistics ); @@ -174,20 +179,20 @@ XBSYSAPI EXPORTNUM(181) NTSTATUS NTAPI MmQueryStatistics // ****************************************************************** // * MmSetAddressProtect // ****************************************************************** -XBSYSAPI EXPORTNUM(182) VOID NTAPI MmSetAddressProtect +XBSYSAPI EXPORTNUM(182) void_xt NTAPI MmSetAddressProtect ( IN PVOID BaseAddress, - IN ULONG NumberOfBytes, - IN ULONG NewProtect + IN ulong_xt NumberOfBytes, + IN ulong_xt NewProtect ); // ****************************************************************** // * MmUnmapIoSpace // ****************************************************************** -XBSYSAPI EXPORTNUM(183) VOID NTAPI MmUnmapIoSpace +XBSYSAPI EXPORTNUM(183) void_xt NTAPI MmUnmapIoSpace ( IN PVOID BaseAddress, - IN ULONG NumberOfBytes + IN ulong_xt NumberOfBytes ); // ****************************************************************** @@ -195,28 +200,28 @@ XBSYSAPI EXPORTNUM(183) VOID NTAPI MmUnmapIoSpace // ****************************************************************** XBSYSAPI EXPORTNUM(374) PVOID NTAPI MmDbgAllocateMemory ( - IN ULONG NumberOfBytes, - IN ULONG Protect + IN ulong_xt NumberOfBytes, + IN ulong_xt Protect ); // ****************************************************************** // * MmDbgFreeMemory // ****************************************************************** -XBSYSAPI EXPORTNUM(375) ULONG NTAPI MmDbgFreeMemory +XBSYSAPI EXPORTNUM(375) ulong_xt NTAPI MmDbgFreeMemory ( IN PVOID BaseAddress, - IN ULONG NumberOfBytes + IN ulong_xt NumberOfBytes ); // ****************************************************************** // * MmDbgQueryAvailablePages // ****************************************************************** -XBSYSAPI EXPORTNUM(376) ULONG NTAPI MmDbgQueryAvailablePages(void); +XBSYSAPI EXPORTNUM(376) ulong_xt NTAPI MmDbgQueryAvailablePages(void); // ****************************************************************** // * MmDbgReleaseAddress // ****************************************************************** -XBSYSAPI EXPORTNUM(377) VOID NTAPI MmDbgReleaseAddress +XBSYSAPI EXPORTNUM(377) void_xt NTAPI MmDbgReleaseAddress ( IN PVOID VirtualAddress, IN PULONG Opaque @@ -231,6 +236,8 @@ XBSYSAPI EXPORTNUM(378) PVOID NTAPI MmDbgWriteCheck IN PULONG Opaque ); +} + #endif diff --git a/import/OpenXDK/include/xboxkrnl/nt.h b/src/core/kernel/common/nt.h similarity index 76% rename from import/OpenXDK/include/xboxkrnl/nt.h rename to src/core/kernel/common/nt.h index 7a1062636..446881176 100644 --- a/import/OpenXDK/include/xboxkrnl/nt.h +++ b/src/core/kernel/common/nt.h @@ -12,24 +12,29 @@ #ifndef XBOXKRNL_NT_H #define XBOXKRNL_NT_H +#include "types.h" + +namespace xbox +{ + #define NtCurrentThread() ((HANDLE)-2) // ****************************************************************** // * NtAllocateVirtualMemory // ****************************************************************** -XBSYSAPI EXPORTNUM(184) NTSTATUS NTAPI NtAllocateVirtualMemory +XBSYSAPI EXPORTNUM(184) ntstatus_xt NTAPI NtAllocateVirtualMemory ( IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, + IN ulong_xt ZeroBits, IN OUT PULONG AllocationSize, - IN DWORD AllocationType, - IN DWORD Protect + IN dword_xt AllocationType, + IN dword_xt Protect ); // ****************************************************************** // * 0x00B9 - NtCancelTimer() // ****************************************************************** -XBSYSAPI EXPORTNUM(185) NTSTATUS NTAPI NtCancelTimer +XBSYSAPI EXPORTNUM(185) ntstatus_xt NTAPI NtCancelTimer ( IN HANDLE TimerHandle, OUT PBOOLEAN CurrentState OPTIONAL @@ -38,7 +43,7 @@ XBSYSAPI EXPORTNUM(185) NTSTATUS NTAPI NtCancelTimer // ****************************************************************** // * NtClearEvent // ****************************************************************** -XBSYSAPI EXPORTNUM(186) NTSTATUS NTAPI NtClearEvent +XBSYSAPI EXPORTNUM(186) ntstatus_xt NTAPI NtClearEvent ( IN HANDLE EventHandle ); @@ -50,12 +55,12 @@ XBSYSAPI EXPORTNUM(186) NTSTATUS NTAPI NtClearEvent // * Closes an object handle // * // ****************************************************************** -XBSYSAPI EXPORTNUM(187) NTSTATUS NTAPI NtClose +XBSYSAPI EXPORTNUM(187) ntstatus_xt NTAPI NtClose ( IN HANDLE Handle ); -XBSYSAPI EXPORTNUM(188) NTSTATUS NTAPI NtCreateDirectoryObject +XBSYSAPI EXPORTNUM(188) ntstatus_xt NTAPI NtCreateDirectoryObject ( OUT PHANDLE DirectoryHandle, IN POBJECT_ATTRIBUTES ObjectAttributes @@ -64,12 +69,12 @@ XBSYSAPI EXPORTNUM(188) NTSTATUS NTAPI NtCreateDirectoryObject // ****************************************************************** // * NtCreateEvent // ****************************************************************** -XBSYSAPI EXPORTNUM(189) NTSTATUS NTAPI NtCreateEvent +XBSYSAPI EXPORTNUM(189) ntstatus_xt NTAPI NtCreateEvent ( OUT PHANDLE EventHandle, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN EVENT_TYPE EventType, - IN BOOLEAN InitialState + IN boolean_xt InitialState ); @@ -83,52 +88,52 @@ XBSYSAPI EXPORTNUM(189) NTSTATUS NTAPI NtCreateEvent // * a handle for the file object. // * // ****************************************************************** -XBSYSAPI EXPORTNUM(190) NTSTATUS NTAPI NtCreateFile +XBSYSAPI EXPORTNUM(190) ntstatus_xt NTAPI NtCreateFile ( OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, + IN access_mask_xt DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PIO_STATUS_BLOCK IoStatusBlock, IN PLARGE_INTEGER AllocationSize OPTIONAL, - IN ULONG FileAttributes, - IN ULONG ShareAccess, - IN ULONG CreateDisposition, - IN ULONG CreateOptions + IN ulong_xt FileAttributes, + IN ulong_xt ShareAccess, + IN ulong_xt CreateDisposition, + IN ulong_xt CreateOptions ); -XBSYSAPI EXPORTNUM(191) NTSTATUS NTAPI NtCreateIoCompletion +XBSYSAPI EXPORTNUM(191) ntstatus_xt NTAPI NtCreateIoCompletion ( OUT PHANDLE IoCompletionHandle, - IN ACCESS_MASK DesiredAccess, + IN access_mask_xt DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG Count + IN ulong_xt Count ); // ****************************************************************** // * NtCreateMutant // ****************************************************************** -XBSYSAPI EXPORTNUM(192) NTSTATUS NTAPI NtCreateMutant +XBSYSAPI EXPORTNUM(192) ntstatus_xt NTAPI NtCreateMutant ( OUT PHANDLE MutantHandle, IN POBJECT_ATTRIBUTES ObjectAttributes, - IN BOOLEAN InitialOwner + IN boolean_xt InitialOwner ); // ****************************************************************** // * NtCreateSemaphore // ****************************************************************** -XBSYSAPI EXPORTNUM(193) NTSTATUS NTAPI NtCreateSemaphore +XBSYSAPI EXPORTNUM(193) ntstatus_xt NTAPI NtCreateSemaphore ( OUT PHANDLE SemaphoreHandle, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN ULONG InitialCount, - IN ULONG MaximumCount + IN ulong_xt InitialCount, + IN ulong_xt MaximumCount ); // ****************************************************************** // * 0x00C2 - NtCreateTimer() // ****************************************************************** -XBSYSAPI EXPORTNUM(194) NTSTATUS NTAPI NtCreateTimer +XBSYSAPI EXPORTNUM(194) ntstatus_xt NTAPI NtCreateTimer ( OUT PHANDLE TimerHandle, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, @@ -138,7 +143,7 @@ XBSYSAPI EXPORTNUM(194) NTSTATUS NTAPI NtCreateTimer // ****************************************************************** // * 0x00C3 - NtDeleteFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(195) NTSTATUS NTAPI NtDeleteFile +XBSYSAPI EXPORTNUM(195) ntstatus_xt NTAPI NtDeleteFile ( IN POBJECT_ATTRIBUTES ObjectAttributes ); @@ -146,34 +151,34 @@ XBSYSAPI EXPORTNUM(195) NTSTATUS NTAPI NtDeleteFile // ****************************************************************** // * 0x00C4 - NtDeviceIoControlFile // ****************************************************************** -XBSYSAPI EXPORTNUM(196) NTSTATUS NTAPI NtDeviceIoControlFile +XBSYSAPI EXPORTNUM(196) ntstatus_xt NTAPI NtDeviceIoControlFile ( IN HANDLE FileHandle, IN HANDLE Event OPTIONAL, IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG IoControlCode, + IN ulong_xt IoControlCode, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, + IN ulong_xt InputBufferLength, OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength + IN ulong_xt OutputBufferLength ); // ****************************************************************** // * NtDuplicateObject // ****************************************************************** -XBSYSAPI EXPORTNUM(197) NTSTATUS NTAPI NtDuplicateObject +XBSYSAPI EXPORTNUM(197) ntstatus_xt NTAPI NtDuplicateObject ( PVOID SourceHandle, PVOID *TargetHandle, - DWORD Options + dword_xt Options ); // ****************************************************************** // * NtFlushBuffersFile // ****************************************************************** -XBSYSAPI EXPORTNUM(198) NTSTATUS NTAPI NtFlushBuffersFile +XBSYSAPI EXPORTNUM(198) ntstatus_xt NTAPI NtFlushBuffersFile ( PVOID FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock @@ -182,31 +187,31 @@ XBSYSAPI EXPORTNUM(198) NTSTATUS NTAPI NtFlushBuffersFile // ****************************************************************** // * NtFreeVirtualMemory // ****************************************************************** -XBSYSAPI EXPORTNUM(199) NTSTATUS NTAPI NtFreeVirtualMemory +XBSYSAPI EXPORTNUM(199) ntstatus_xt NTAPI NtFreeVirtualMemory ( IN OUT PVOID *BaseAddress, IN OUT PULONG FreeSize, - IN ULONG FreeType + IN ulong_xt FreeType ); // ****************************************************************** // * 0x00C8 - NtFsControlFile // ****************************************************************** -XBSYSAPI EXPORTNUM(200) NTSTATUS NTAPI NtFsControlFile +XBSYSAPI EXPORTNUM(200) ntstatus_xt NTAPI NtFsControlFile ( IN HANDLE FileHandle, IN HANDLE Event OPTIONAL, IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG FsControlCode, + IN ulong_xt FsControlCode, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, + IN ulong_xt InputBufferLength, OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength + IN ulong_xt OutputBufferLength ); -XBSYSAPI EXPORTNUM(201) NTSTATUS NTAPI NtOpenDirectoryObject +XBSYSAPI EXPORTNUM(201) ntstatus_xt NTAPI NtOpenDirectoryObject ( OUT PHANDLE DirectoryHandle, IN POBJECT_ATTRIBUTES ObjectAttributes @@ -215,25 +220,25 @@ XBSYSAPI EXPORTNUM(201) NTSTATUS NTAPI NtOpenDirectoryObject // ****************************************************************** // * NtOpenFile // ****************************************************************** -XBSYSAPI EXPORTNUM(202) NTSTATUS NTAPI NtOpenFile +XBSYSAPI EXPORTNUM(202) ntstatus_xt NTAPI NtOpenFile ( OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, + IN access_mask_xt DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG ShareAccess, - IN ULONG OpenOptions + IN ulong_xt ShareAccess, + IN ulong_xt OpenOptions ); -XBSYSAPI EXPORTNUM(203) NTSTATUS NTAPI NtOpenSymbolicLinkObject( +XBSYSAPI EXPORTNUM(203) ntstatus_xt NTAPI NtOpenSymbolicLinkObject( OUT PHANDLE LinkHandle, IN POBJECT_ATTRIBUTES ObjectAttributes ); -XBSYSAPI EXPORTNUM(205) NTSTATUS NTAPI NtProtectVirtualMemory( +XBSYSAPI EXPORTNUM(205) ntstatus_xt NTAPI NtProtectVirtualMemory( IN OUT PVOID *BaseAddress, IN OUT PSIZE_T RegionSize, - IN ULONG NewProtect, + IN ulong_xt NewProtect, OUT PULONG OldProtect ); @@ -241,7 +246,7 @@ XBSYSAPI EXPORTNUM(205) NTSTATUS NTAPI NtProtectVirtualMemory( // ****************************************************************** // * NtPulseEvent // ****************************************************************** -XBSYSAPI EXPORTNUM(205) NTSTATUS NTAPI NtPulseEvent +XBSYSAPI EXPORTNUM(205) ntstatus_xt NTAPI NtPulseEvent ( IN HANDLE EventHandle, OUT PLONG PreviousState OPTIONAL @@ -250,19 +255,19 @@ XBSYSAPI EXPORTNUM(205) NTSTATUS NTAPI NtPulseEvent // ****************************************************************** // * NtQueueApcThread // ****************************************************************** -XBSYSAPI EXPORTNUM(206) NTSTATUS NTAPI NtQueueApcThread +XBSYSAPI EXPORTNUM(206) ntstatus_xt NTAPI NtQueueApcThread ( IN HANDLE ThreadHandle, IN PIO_APC_ROUTINE ApcRoutine, IN PVOID ApcRoutineContext OPTIONAL, IN PIO_STATUS_BLOCK ApcStatusBlock OPTIONAL, - IN ULONG ApcReserved OPTIONAL + IN ulong_xt ApcReserved OPTIONAL ); // ****************************************************************** // * NtQueryDirectoryFile // ****************************************************************** -XBSYSAPI EXPORTNUM(207) NTSTATUS NTAPI NtQueryDirectoryFile +XBSYSAPI EXPORTNUM(207) ntstatus_xt NTAPI NtQueryDirectoryFile ( IN HANDLE FileHandle, IN HANDLE Event OPTIONAL, @@ -270,20 +275,20 @@ XBSYSAPI EXPORTNUM(207) NTSTATUS NTAPI NtQueryDirectoryFile IN PVOID ApcContext, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT FILE_DIRECTORY_INFORMATION *FileInformation, - IN ULONG Length, + IN ulong_xt Length, IN FILE_INFORMATION_CLASS FileInformationClass, IN PSTRING FileMask, - IN BOOLEAN RestartScan + IN boolean_xt RestartScan ); // ****************************************************************** // * 0x00D0 - NtQueryDirectoryObject // ****************************************************************** -XBSYSAPI EXPORTNUM(208) NTSTATUS NTAPI NtQueryDirectoryObject( +XBSYSAPI EXPORTNUM(208) ntstatus_xt NTAPI NtQueryDirectoryObject( IN HANDLE DirectoryHandle, OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN RestartScan, + IN ulong_xt Length, + IN boolean_xt RestartScan, IN OUT PULONG Context, OUT PULONG ReturnedLength OPTIONAL ); @@ -291,7 +296,7 @@ XBSYSAPI EXPORTNUM(208) NTSTATUS NTAPI NtQueryDirectoryObject( // ****************************************************************** // * 0x00D1 - NtQueryEvent() // ****************************************************************** -XBSYSAPI EXPORTNUM(209) NTSTATUS NTAPI NtQueryEvent +XBSYSAPI EXPORTNUM(209) ntstatus_xt NTAPI NtQueryEvent ( IN HANDLE EventHandle, OUT PEVENT_BASIC_INFORMATION EventInformation @@ -300,7 +305,7 @@ XBSYSAPI EXPORTNUM(209) NTSTATUS NTAPI NtQueryEvent // ****************************************************************** // * NtQueryFullAttributesFile // ****************************************************************** -XBSYSAPI EXPORTNUM(210) NTSTATUS NTAPI NtQueryFullAttributesFile +XBSYSAPI EXPORTNUM(210) ntstatus_xt NTAPI NtQueryFullAttributesFile ( IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PFILE_NETWORK_OPEN_INFORMATION Attributes @@ -313,19 +318,19 @@ XBSYSAPI EXPORTNUM(210) NTSTATUS NTAPI NtQueryFullAttributesFile // * Return various kinds of information about a given file object. // * // ****************************************************************** -XBSYSAPI EXPORTNUM(211) NTSTATUS NTAPI NtQueryInformationFile +XBSYSAPI EXPORTNUM(211) ntstatus_xt NTAPI NtQueryInformationFile ( IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID FileInformation, - IN ULONG Length, + IN ulong_xt Length, IN FILE_INFORMATION_CLASS FileInfo ); // ****************************************************************** // * 0x00D4 - NtQueryIoCompletion // ****************************************************************** -XBSYSAPI EXPORTNUM(212) NTSTATUS NTAPI NtQueryIoCompletion +XBSYSAPI EXPORTNUM(212) ntstatus_xt NTAPI NtQueryIoCompletion ( IN HANDLE IoCompletionHandle, OUT PIO_COMPLETION_BASIC_INFORMATION IoCompletionInformation @@ -334,7 +339,7 @@ XBSYSAPI EXPORTNUM(212) NTSTATUS NTAPI NtQueryIoCompletion // ****************************************************************** // * 0x00D5 - NtQueryMutant() // ****************************************************************** -XBSYSAPI EXPORTNUM(213) NTSTATUS NTAPI NtQueryMutant +XBSYSAPI EXPORTNUM(213) ntstatus_xt NTAPI NtQueryMutant ( IN HANDLE MutantHandle, OUT PMUTANT_BASIC_INFORMATION MutantInformation @@ -343,7 +348,7 @@ XBSYSAPI EXPORTNUM(213) NTSTATUS NTAPI NtQueryMutant // ****************************************************************** // * 0x00D6 - NtQuerySemaphore() // ****************************************************************** -XBSYSAPI EXPORTNUM(214) NTSTATUS NTAPI NtQuerySemaphore +XBSYSAPI EXPORTNUM(214) ntstatus_xt NTAPI NtQuerySemaphore ( IN HANDLE SemaphoreHandle, OUT PSEMAPHORE_BASIC_INFORMATION SemaphoreInformation @@ -352,7 +357,7 @@ XBSYSAPI EXPORTNUM(214) NTSTATUS NTAPI NtQuerySemaphore // ****************************************************************** // * 0x00D7 - NtQuerySymbolicLinkObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(215) NTSTATUS NTAPI NtQuerySymbolicLinkObject +XBSYSAPI EXPORTNUM(215) ntstatus_xt NTAPI NtQuerySymbolicLinkObject ( HANDLE LinkHandle, OUT PSTRING LinkTarget, @@ -362,7 +367,7 @@ XBSYSAPI EXPORTNUM(215) NTSTATUS NTAPI NtQuerySymbolicLinkObject // ****************************************************************** // * 0x00D8 - NtQueryTimer() // ****************************************************************** -XBSYSAPI EXPORTNUM(216) NTSTATUS NTAPI NtQueryTimer +XBSYSAPI EXPORTNUM(216) ntstatus_xt NTAPI NtQueryTimer ( IN HANDLE TimerHandle, OUT PTIMER_BASIC_INFORMATION TimerInformation @@ -371,7 +376,7 @@ XBSYSAPI EXPORTNUM(216) NTSTATUS NTAPI NtQueryTimer // ****************************************************************** // * NtQueryVirtualMemory // ****************************************************************** -XBSYSAPI EXPORTNUM(217) NTSTATUS NTAPI NtQueryVirtualMemory +XBSYSAPI EXPORTNUM(217) ntstatus_xt NTAPI NtQueryVirtualMemory ( IN PVOID BaseAddress, OUT PMEMORY_BASIC_INFORMATION Buffer @@ -380,12 +385,12 @@ XBSYSAPI EXPORTNUM(217) NTSTATUS NTAPI NtQueryVirtualMemory // ****************************************************************** // * NtQueryVolumeInformationFile // ****************************************************************** -XBSYSAPI EXPORTNUM(218) NTSTATUS NTAPI NtQueryVolumeInformationFile +XBSYSAPI EXPORTNUM(218) ntstatus_xt NTAPI NtQueryVolumeInformationFile ( IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PFILE_FS_SIZE_INFORMATION FileInformation, - IN ULONG Length, + IN ulong_xt Length, IN FS_INFORMATION_CLASS FileInformationClass ); @@ -396,7 +401,7 @@ XBSYSAPI EXPORTNUM(218) NTSTATUS NTAPI NtQueryVolumeInformationFile // * Read data from an opened file. // * // ****************************************************************** -XBSYSAPI EXPORTNUM(219) NTSTATUS NTAPI NtReadFile +XBSYSAPI EXPORTNUM(219) ntstatus_xt NTAPI NtReadFile ( IN HANDLE FileHandle, // TODO: correct paramters IN HANDLE Event OPTIONAL, @@ -404,14 +409,14 @@ XBSYSAPI EXPORTNUM(219) NTSTATUS NTAPI NtReadFile IN PVOID ApcContext, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID Buffer, - IN ULONG Length, + IN ulong_xt Length, IN PLARGE_INTEGER ByteOffset OPTIONAL ); // ****************************************************************** // * 0x00DC - NtReadFileScatter // ****************************************************************** -XBSYSAPI EXPORTNUM(220) NTSTATUS NTAPI NtReadFileScatter +XBSYSAPI EXPORTNUM(220) ntstatus_xt NTAPI NtReadFileScatter ( IN HANDLE FileHandle, IN HANDLE Event OPTIONAL, @@ -419,14 +424,14 @@ XBSYSAPI EXPORTNUM(220) NTSTATUS NTAPI NtReadFileScatter IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, IN PFILE_SEGMENT_ELEMENT SegmentArray, - IN ULONG Length, + IN ulong_xt Length, IN PLARGE_INTEGER ByteOffset OPTIONAL ); // ****************************************************************** // * NtReleaseMutant // ****************************************************************** -XBSYSAPI EXPORTNUM(221) NTSTATUS NTAPI NtReleaseMutant +XBSYSAPI EXPORTNUM(221) ntstatus_xt NTAPI NtReleaseMutant ( IN HANDLE MutantHandle, OUT PLONG PreviousCount @@ -435,17 +440,17 @@ XBSYSAPI EXPORTNUM(221) NTSTATUS NTAPI NtReleaseMutant // ****************************************************************** // * NtReleaseSemaphore // ****************************************************************** -XBSYSAPI EXPORTNUM(222) NTSTATUS NTAPI NtReleaseSemaphore +XBSYSAPI EXPORTNUM(222) ntstatus_xt NTAPI NtReleaseSemaphore ( IN HANDLE SemaphoreHandle, - IN ULONG ReleaseCount, + IN ulong_xt ReleaseCount, OUT PULONG PreviousCount OPTIONAL ); // ****************************************************************** // * 0x00DF - NtRemoveIoCompletion // ****************************************************************** -XBSYSAPI EXPORTNUM(223) NTSTATUS NTAPI NtRemoveIoCompletion +XBSYSAPI EXPORTNUM(223) ntstatus_xt NTAPI NtRemoveIoCompletion ( IN HANDLE IoCompletionHandle, OUT PVOID *KeyContext, @@ -457,7 +462,7 @@ XBSYSAPI EXPORTNUM(223) NTSTATUS NTAPI NtRemoveIoCompletion // ****************************************************************** // * NtResumeThread // ****************************************************************** -XBSYSAPI EXPORTNUM(224) NTSTATUS NTAPI NtResumeThread +XBSYSAPI EXPORTNUM(224) ntstatus_xt NTAPI NtResumeThread ( IN HANDLE ThreadHandle, OUT PULONG PreviousSuspendCount @@ -466,7 +471,7 @@ XBSYSAPI EXPORTNUM(224) NTSTATUS NTAPI NtResumeThread // ****************************************************************** // * NtSetEvent // ****************************************************************** -XBSYSAPI EXPORTNUM(225) NTSTATUS NTAPI NtSetEvent +XBSYSAPI EXPORTNUM(225) ntstatus_xt NTAPI NtSetEvent ( IN HANDLE EventHandle, OUT PLONG PreviousState @@ -479,31 +484,31 @@ XBSYSAPI EXPORTNUM(225) NTSTATUS NTAPI NtSetEvent // * Changes various kinds of information about a given file object. // * // ****************************************************************** -XBSYSAPI EXPORTNUM(226) NTSTATUS NTAPI NtSetInformationFile +XBSYSAPI EXPORTNUM(226) ntstatus_xt NTAPI NtSetInformationFile ( IN HANDLE FileHandle, // TODO: correct paramters OUT PIO_STATUS_BLOCK IoStatusBlock, IN PVOID FileInformation, - IN ULONG Length, + IN ulong_xt Length, IN FILE_INFORMATION_CLASS FileInformationClass ); // ****************************************************************** // * 0x00E3 - NtSetIoCompletion // ****************************************************************** -XBSYSAPI EXPORTNUM(227) NTSTATUS NTAPI NtSetIoCompletion +XBSYSAPI EXPORTNUM(227) ntstatus_xt NTAPI NtSetIoCompletion ( IN HANDLE IoCompletionHandle, IN PVOID KeyContext, IN PVOID ApcContext, - IN NTSTATUS IoStatus, - IN ULONG_PTR IoStatusInformation + IN ntstatus_xt IoStatus, + IN ulong_ptr_xt IoStatusInformation ); // ****************************************************************** // * NtSetSystemTime // ****************************************************************** -XBSYSAPI EXPORTNUM(228) NTSTATUS NTAPI NtSetSystemTime +XBSYSAPI EXPORTNUM(228) ntstatus_xt NTAPI NtSetSystemTime ( IN PLARGE_INTEGER SystemTime, OUT PLARGE_INTEGER PreviousTime OPTIONAL @@ -512,34 +517,34 @@ XBSYSAPI EXPORTNUM(228) NTSTATUS NTAPI NtSetSystemTime // ****************************************************************** // * 0x00E5 - NtSetTimerEx() // ****************************************************************** -XBSYSAPI EXPORTNUM(229) NTSTATUS NTAPI NtSetTimerEx +XBSYSAPI EXPORTNUM(229) ntstatus_xt NTAPI NtSetTimerEx ( IN HANDLE TimerHandle, IN PLARGE_INTEGER DueTime, IN PTIMER_APC_ROUTINE TimerApcRoutine OPTIONAL, IN KPROCESSOR_MODE ApcMode, IN PVOID TimerContext OPTIONAL, - IN BOOLEAN WakeTimer, - IN LONG Period OPTIONAL, + IN boolean_xt WakeTimer, + IN long_xt Period OPTIONAL, OUT PBOOLEAN PreviousState OPTIONAL ); // ****************************************************************** // * 0x00E6 - NtSignalAndWaitForSingleObjectEx // ****************************************************************** -XBSYSAPI EXPORTNUM(230) NTSTATUS NTAPI NtSignalAndWaitForSingleObjectEx +XBSYSAPI EXPORTNUM(230) ntstatus_xt NTAPI NtSignalAndWaitForSingleObjectEx ( IN HANDLE SignalHandle, IN HANDLE WaitHandle, IN KPROCESSOR_MODE WaitMode, - IN BOOLEAN Alertable, + IN boolean_xt Alertable, IN PLARGE_INTEGER Timeout OPTIONAL ); // ****************************************************************** // * NtSuspendThread // ****************************************************************** -XBSYSAPI EXPORTNUM(231) NTSTATUS NTAPI NtSuspendThread +XBSYSAPI EXPORTNUM(231) ntstatus_xt NTAPI NtSuspendThread ( IN HANDLE ThreadHandle, OUT PULONG PreviousSuspendCount OPTIONAL @@ -548,11 +553,11 @@ XBSYSAPI EXPORTNUM(231) NTSTATUS NTAPI NtSuspendThread // ****************************************************************** // * NtUserIoApcDispatcher // ****************************************************************** -XBSYSAPI EXPORTNUM(232) VOID NTAPI NtUserIoApcDispatcher +XBSYSAPI EXPORTNUM(232) void_xt NTAPI NtUserIoApcDispatcher ( PVOID ApcContext, PIO_STATUS_BLOCK IoStatusBlock, - ULONG Reserved + ulong_xt Reserved ); // ****************************************************************** @@ -564,34 +569,34 @@ XBSYSAPI EXPORTNUM(232) VOID NTAPI NtUserIoApcDispatcher // * until the wait times out. // * // ****************************************************************** -XBSYSAPI EXPORTNUM(233) NTSTATUS NTAPI NtWaitForSingleObject +XBSYSAPI EXPORTNUM(233) ntstatus_xt NTAPI NtWaitForSingleObject ( IN HANDLE Handle, - IN BOOLEAN Alertable, + IN boolean_xt Alertable, IN PLARGE_INTEGER Timeout ); // ****************************************************************** // * NtWaitForSingleObjectEx // ****************************************************************** -XBSYSAPI EXPORTNUM(234) NTSTATUS NTAPI NtWaitForSingleObjectEx +XBSYSAPI EXPORTNUM(234) ntstatus_xt NTAPI NtWaitForSingleObjectEx ( IN HANDLE Handle, - IN CHAR WaitMode, - IN BOOLEAN Alertable, + IN char_xt WaitMode, + IN boolean_xt Alertable, IN PLARGE_INTEGER Timeout ); // ****************************************************************** // * NtWaitForMultipleObjectsEx // ****************************************************************** -XBSYSAPI EXPORTNUM(235) NTSTATUS NTAPI NtWaitForMultipleObjectsEx +XBSYSAPI EXPORTNUM(235) ntstatus_xt NTAPI NtWaitForMultipleObjectsEx ( - IN ULONG Count, + IN ulong_xt Count, IN HANDLE *Handles, IN WAIT_TYPE WaitType, - IN CHAR WaitMode, - IN BOOLEAN Alertable, + IN char_xt WaitMode, + IN boolean_xt Alertable, IN PLARGE_INTEGER Timeout ); @@ -602,7 +607,7 @@ XBSYSAPI EXPORTNUM(235) NTSTATUS NTAPI NtWaitForMultipleObjectsEx // * Write data to an opened file. // * // ****************************************************************** -XBSYSAPI EXPORTNUM(236) NTSTATUS NTAPI NtWriteFile +XBSYSAPI EXPORTNUM(236) ntstatus_xt NTAPI NtWriteFile ( IN HANDLE FileHandle, IN HANDLE Event, @@ -610,14 +615,14 @@ XBSYSAPI EXPORTNUM(236) NTSTATUS NTAPI NtWriteFile IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, IN PVOID Buffer, - IN ULONG Length, + IN ulong_xt Length, IN PLARGE_INTEGER ByteOffset OPTIONAL ); // ****************************************************************** // * 0x00ED - NtWriteFileGather // ****************************************************************** -XBSYSAPI EXPORTNUM(237) NTSTATUS NTAPI NtWriteFileGather +XBSYSAPI EXPORTNUM(237) ntstatus_xt NTAPI NtWriteFileGather ( IN HANDLE FileHandle, IN HANDLE Event OPTIONAL, @@ -625,14 +630,16 @@ XBSYSAPI EXPORTNUM(237) NTSTATUS NTAPI NtWriteFileGather IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, IN PFILE_SEGMENT_ELEMENT SegmentArray, - IN ULONG Length, + IN ulong_xt Length, IN PLARGE_INTEGER ByteOffset OPTIONAL ); // ****************************************************************** // * NtYieldExecution // ****************************************************************** -XBSYSAPI EXPORTNUM(238) VOID NTAPI NtYieldExecution(void); +XBSYSAPI EXPORTNUM(238) void_xt NTAPI NtYieldExecution(void); + +} #endif diff --git a/import/OpenXDK/include/xboxkrnl/ob.h b/src/core/kernel/common/ob.h similarity index 80% rename from import/OpenXDK/include/xboxkrnl/ob.h rename to src/core/kernel/common/ob.h index d6350b1ad..5df648399 100644 --- a/import/OpenXDK/include/xboxkrnl/ob.h +++ b/src/core/kernel/common/ob.h @@ -12,7 +12,12 @@ #ifndef XBOXKRNL_OB_H #define XBOXKRNL_OB_H -#define OBJ_NAME_PATH_SEPARATOR ((CHAR)L'\\') +#include "types.h" + +namespace xbox +{ + +#define OBJ_NAME_PATH_SEPARATOR ((char_xt)L'\\') #define OB_NUMBER_HASH_BUCKETS 11 typedef struct _OBJECT_DIRECTORY { @@ -35,13 +40,13 @@ typedef struct _OBJECT_HEADER_NAME_INFO { #define ObpIsFlagSet(flagset, flag) (((flagset) & (flag)) != 0) #define ObpIsFlagClear(flagset, flag) (((flagset) & (flag)) == 0) -#define ObpEncodeFreeHandleLink(Link) (((ULONG_PTR)(Link)) | 1) -#define ObpDecodeFreeHandleLink(Link) (((ULONG_PTR)(Link)) & (~1)) -#define ObpIsFreeHandleLink(Link) (((ULONG_PTR)(Link)) & 1) +#define ObpEncodeFreeHandleLink(Link) (((ulong_ptr_xt)(Link)) | 1) +#define ObpDecodeFreeHandleLink(Link) (((ulong_ptr_xt)(Link)) & (~1)) +#define ObpIsFreeHandleLink(Link) (((ulong_ptr_xt)(Link)) & 1) #define ObpGetTableByteOffsetFromHandle(Handle) (HandleToUlong(Handle) & (OB_HANDLES_PER_TABLE * sizeof(PVOID) - 1)) #define ObpGetTableFromHandle(Handle) ObpObjectHandleTable.RootTable[HandleToUlong(Handle) >> (OB_HANDLES_PER_TABLE_SHIFT + 2)] #define ObpGetHandleContentsPointer(Handle) ((PVOID*)((PUCHAR)ObpGetTableFromHandle(Handle) + ObpGetTableByteOffsetFromHandle(Handle))) -#define ObpMaskOffApplicationBits(Handle) ((HANDLE)(((ULONG_PTR)(Handle)) & ~(sizeof(ULONG) - 1))) +#define ObpMaskOffApplicationBits(Handle) ((HANDLE)(((ulong_ptr_xt)(Handle)) & ~(sizeof(ulong_xt) - 1))) #define OB_FLAG_NAMED_OBJECT 0x01 #define OB_FLAG_PERMANENT_OBJECT 0x02 @@ -54,15 +59,15 @@ typedef struct _OBJECT_HEADER_NAME_INFO { #define OBJECT_HEADER_NAME_INFO_TO_OBJECT(ObjectHeaderNameInfo) (&OBJECT_HEADER_NAME_INFO_TO_OBJECT_HEADER(ObjectHeaderNameInfo)->Body) HANDLE ObpCreateObjectHandle(PVOID Object); -BOOLEAN ObpCreatePermanentDirectoryObject( +boolean_xt ObpCreatePermanentDirectoryObject( IN POBJECT_STRING DirectoryName OPTIONAL, OUT POBJECT_DIRECTORY *DirectoryObject ); -NTSTATUS ObpReferenceObjectByName( +ntstatus_xt ObpReferenceObjectByName( IN HANDLE RootDirectoryHandle, IN POBJECT_STRING ObjectName, - IN ULONG Attributes, + IN ulong_xt Attributes, IN POBJECT_TYPE ObjectType, IN OUT PVOID ParseContext OPTIONAL, OUT PVOID *ReturnedObject @@ -74,28 +79,28 @@ NTSTATUS ObpReferenceObjectByName( (p)->ObjectName = n; \ } -BOOLEAN ObInitSystem(); -BOOLEAN ObpExtendObjectHandleTable(); -VOID ObDissectName(OBJECT_STRING Path, POBJECT_STRING FirstName, POBJECT_STRING RemainingName); +boolean_xt ObInitSystem(); +boolean_xt ObpExtendObjectHandleTable(); +void_xt ObDissectName(OBJECT_STRING Path, POBJECT_STRING FirstName, POBJECT_STRING RemainingName); PVOID ObpGetObjectHandleContents(HANDLE Handle); PVOID ObpGetObjectHandleReference(HANDLE Handle); -ULONG FASTCALL ObpComputeHashIndex(IN POBJECT_STRING ElementName); +ulong_xt FASTCALL ObpComputeHashIndex(IN POBJECT_STRING ElementName); -BOOLEAN ObpLookupElementNameInDirectory( +boolean_xt ObpLookupElementNameInDirectory( IN POBJECT_DIRECTORY Directory, IN POBJECT_STRING ElementName, - IN BOOLEAN ResolveSymbolicLink, + IN boolean_xt ResolveSymbolicLink, OUT PVOID *ReturnedObject ); // ****************************************************************** // * 0x00EF - ObCreateObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(239) NTSTATUS NTAPI ObCreateObject +XBSYSAPI EXPORTNUM(239) ntstatus_xt NTAPI ObCreateObject ( IN POBJECT_TYPE ObjectType, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN ULONG ObjectBodySize, + IN ulong_xt ObjectBodySize, OUT PVOID *Object ); @@ -107,18 +112,18 @@ XBSYSAPI EXPORTNUM(240) OBJECT_TYPE ObDirectoryObjectType; // ****************************************************************** // * 0x00F1 - ObInsertObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(241) NTSTATUS NTAPI ObInsertObject +XBSYSAPI EXPORTNUM(241) ntstatus_xt NTAPI ObInsertObject ( IN PVOID Object, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN ULONG ObjectPointerBias, + IN ulong_xt ObjectPointerBias, OUT PHANDLE Handle ); // ****************************************************************** // * 0x00F2 - ObMakeTemporaryObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(242) VOID NTAPI ObMakeTemporaryObject +XBSYSAPI EXPORTNUM(242) void_xt NTAPI ObMakeTemporaryObject ( IN PVOID Object ); @@ -126,7 +131,7 @@ XBSYSAPI EXPORTNUM(242) VOID NTAPI ObMakeTemporaryObject // ****************************************************************** // * 0x00F3 - ObOpenObjectByName() // ****************************************************************** -XBSYSAPI EXPORTNUM(243) NTSTATUS NTAPI ObOpenObjectByName +XBSYSAPI EXPORTNUM(243) ntstatus_xt NTAPI ObOpenObjectByName ( IN POBJECT_ATTRIBUTES ObjectAttributes, IN POBJECT_TYPE ObjectType, @@ -137,7 +142,7 @@ XBSYSAPI EXPORTNUM(243) NTSTATUS NTAPI ObOpenObjectByName // ****************************************************************** // * 0x00F4 - ObOpenObjectByPointer() // ****************************************************************** -XBSYSAPI EXPORTNUM(244) NTSTATUS NTAPI ObOpenObjectByPointer +XBSYSAPI EXPORTNUM(244) ntstatus_xt NTAPI ObOpenObjectByPointer ( IN PVOID Object, IN POBJECT_TYPE ObjectType, @@ -150,8 +155,8 @@ XBSYSAPI EXPORTNUM(244) NTSTATUS NTAPI ObOpenObjectByPointer #define OB_HANDLES_PER_SEGMENT (OB_TABLES_PER_SEGMENT * OB_HANDLES_PER_TABLE) typedef struct _OBJECT_HANDLE_TABLE { - LONG HandleCount; - LONG_PTR FirstFreeTableEntry; + long_xt HandleCount; + long_ptr_xt FirstFreeTableEntry; HANDLE NextHandleNeedingPool; PVOID **RootTable; PVOID *BuiltinRootTable[OB_TABLES_PER_SEGMENT]; @@ -165,7 +170,7 @@ XBSYSAPI EXPORTNUM(245) OBJECT_HANDLE_TABLE ObpObjectHandleTable; // ****************************************************************** // * 0x00F6 - ObReferenceObjectByHandle() // ****************************************************************** -XBSYSAPI EXPORTNUM(246) NTSTATUS NTAPI ObReferenceObjectByHandle +XBSYSAPI EXPORTNUM(246) ntstatus_xt NTAPI ObReferenceObjectByHandle ( IN HANDLE Handle, IN POBJECT_TYPE ObjectType OPTIONAL, @@ -175,10 +180,10 @@ XBSYSAPI EXPORTNUM(246) NTSTATUS NTAPI ObReferenceObjectByHandle // ****************************************************************** // * 0x00F7 - ObReferenceObjectByName() // ****************************************************************** -XBSYSAPI EXPORTNUM(247) NTSTATUS NTAPI ObReferenceObjectByName +XBSYSAPI EXPORTNUM(247) ntstatus_xt NTAPI ObReferenceObjectByName ( IN POBJECT_STRING ObjectName, - IN ULONG Attributes, + IN ulong_xt Attributes, IN POBJECT_TYPE ObjectType, IN OUT PVOID ParseContext OPTIONAL, OUT PVOID *Object @@ -187,7 +192,7 @@ XBSYSAPI EXPORTNUM(247) NTSTATUS NTAPI ObReferenceObjectByName // ****************************************************************** // * 0x00F8 - ObReferenceObjectByPointer() // ****************************************************************** -XBSYSAPI EXPORTNUM(248) NTSTATUS NTAPI ObReferenceObjectByPointer +XBSYSAPI EXPORTNUM(248) ntstatus_xt NTAPI ObReferenceObjectByPointer ( IN PVOID Object, IN POBJECT_TYPE ObjectType @@ -201,7 +206,7 @@ XBSYSAPI EXPORTNUM(249) OBJECT_TYPE ObSymbolicLinkObjectType; // ****************************************************************** // * 0x00FA - ObfDereferenceObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(250) VOID FASTCALL ObfDereferenceObject +XBSYSAPI EXPORTNUM(250) void_xt FASTCALL ObfDereferenceObject ( IN PVOID Object ); @@ -209,11 +214,12 @@ XBSYSAPI EXPORTNUM(250) VOID FASTCALL ObfDereferenceObject // ****************************************************************** // * 0x00FB - ObfReferenceObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(251) VOID FASTCALL ObfReferenceObject +XBSYSAPI EXPORTNUM(251) void_xt FASTCALL ObfReferenceObject ( IN PVOID Object ); +} #endif diff --git a/import/OpenXDK/include/xboxkrnl/ps.h b/src/core/kernel/common/ps.h similarity index 74% rename from import/OpenXDK/include/xboxkrnl/ps.h rename to src/core/kernel/common/ps.h index 4304f7024..a9da41d00 100644 --- a/import/OpenXDK/include/xboxkrnl/ps.h +++ b/src/core/kernel/common/ps.h @@ -12,41 +12,46 @@ #ifndef XBOXKRNL_PS_H #define XBOXKRNL_PS_H +#include "types.h" + +namespace xbox +{ + #define PsGetCurrentThread() (CONTAINING_RECORD((KeGetCurrentThread()),ETHREAD,Tcb)) // ****************************************************************** // * PsCreateSystemThread // ****************************************************************** -XBSYSAPI EXPORTNUM(254) NTSTATUS NTAPI PsCreateSystemThread +XBSYSAPI EXPORTNUM(254) ntstatus_xt NTAPI PsCreateSystemThread ( OUT PHANDLE ThreadHandle, OUT PHANDLE ThreadId OPTIONAL, IN PKSTART_ROUTINE StartRoutine, IN PVOID StartContext, - IN BOOLEAN DebuggerThread + IN boolean_xt DebuggerThread ); // ****************************************************************** // * PsCreateSystemThreadEx // ****************************************************************** -XBSYSAPI EXPORTNUM(255) NTSTATUS NTAPI PsCreateSystemThreadEx +XBSYSAPI EXPORTNUM(255) ntstatus_xt NTAPI PsCreateSystemThreadEx ( OUT PHANDLE ThreadHandle, - IN ULONG ThreadExtensionSize, - IN ULONG KernelStackSize, - IN ULONG TlsDataSize, + IN ulong_xt ThreadExtensionSize, + IN ulong_xt KernelStackSize, + IN ulong_xt TlsDataSize, OUT PHANDLE ThreadId OPTIONAL, IN PKSTART_ROUTINE StartRoutine, IN PVOID StartContext, - IN BOOLEAN CreateSuspended, - IN BOOLEAN DebuggerThread, + IN boolean_xt CreateSuspended, + IN boolean_xt DebuggerThread, IN PKSYSTEM_ROUTINE SystemRoutine OPTIONAL ); // ****************************************************************** // * 0x0100 - PsQueryStatistics() // ****************************************************************** -XBSYSAPI EXPORTNUM(256) NTSTATUS NTAPI PsQueryStatistics +XBSYSAPI EXPORTNUM(256) ntstatus_xt NTAPI PsQueryStatistics ( IN OUT PPS_STATISTICS ProcessStatistics ); @@ -54,7 +59,7 @@ XBSYSAPI EXPORTNUM(256) NTSTATUS NTAPI PsQueryStatistics // ****************************************************************** // * PsSetCreateThreadNotifyRoutine // ****************************************************************** -XBSYSAPI EXPORTNUM(257) NTSTATUS NTAPI PsSetCreateThreadNotifyRoutine +XBSYSAPI EXPORTNUM(257) ntstatus_xt NTAPI PsSetCreateThreadNotifyRoutine ( IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine ); @@ -62,10 +67,12 @@ XBSYSAPI EXPORTNUM(257) NTSTATUS NTAPI PsSetCreateThreadNotifyRoutine // ****************************************************************** // * PsTerminateSystemThread // ****************************************************************** -XBSYSAPI EXPORTNUM(258) VOID NTAPI PsTerminateSystemThread(IN NTSTATUS ExitStatus); +XBSYSAPI EXPORTNUM(258) void_xt NTAPI PsTerminateSystemThread(IN ntstatus_xt ExitStatus); XBSYSAPI EXPORTNUM(259) volatile OBJECT_TYPE PsThreadObjectType; +} + #endif diff --git a/import/OpenXDK/include/xboxkrnl/rtl.h b/src/core/kernel/common/rtl.h similarity index 73% rename from import/OpenXDK/include/xboxkrnl/rtl.h rename to src/core/kernel/common/rtl.h index 59577582e..924d11ed8 100644 --- a/import/OpenXDK/include/xboxkrnl/rtl.h +++ b/src/core/kernel/common/rtl.h @@ -12,32 +12,37 @@ #ifndef XBOXKRNL_RTL_H #define XBOXKRNL_RTL_H +#include "types.h" + +namespace xbox +{ + // ****************************************************************** // * RtlAnsiStringToUnicodeString // ****************************************************************** -XBSYSAPI EXPORTNUM(260) NTSTATUS NTAPI RtlAnsiStringToUnicodeString +XBSYSAPI EXPORTNUM(260) ntstatus_xt NTAPI RtlAnsiStringToUnicodeString ( PUNICODE_STRING DestinationString, PSTRING SourceString, - UCHAR AllocateDestinationString + uchar_xt AllocateDestinationString ); // ****************************************************************** // * RtlAppendStringToString // ****************************************************************** -XBSYSAPI EXPORTNUM(261) NTSTATUS NTAPI RtlAppendStringToString +XBSYSAPI EXPORTNUM(261) ntstatus_xt NTAPI RtlAppendStringToString ( IN OUT PSTRING Destination, IN PSTRING Source ); -XBSYSAPI EXPORTNUM(262) NTSTATUS NTAPI RtlAppendUnicodeStringToString +XBSYSAPI EXPORTNUM(262) ntstatus_xt NTAPI RtlAppendUnicodeStringToString ( IN OUT PUNICODE_STRING Destination, IN PUNICODE_STRING Source ); -XBSYSAPI EXPORTNUM(263) NTSTATUS NTAPI RtlAppendUnicodeToString +XBSYSAPI EXPORTNUM(263) ntstatus_xt NTAPI RtlAppendUnicodeToString ( IN OUT PUNICODE_STRING Destination, IN LPCWSTR Source @@ -46,18 +51,18 @@ XBSYSAPI EXPORTNUM(263) NTSTATUS NTAPI RtlAppendUnicodeToString // ****************************************************************** // * RtlAssert // ****************************************************************** -XBSYSAPI EXPORTNUM(264) VOID NTAPI RtlAssert +XBSYSAPI EXPORTNUM(264) void_xt NTAPI RtlAssert ( PCHAR FailedAssertion, PCHAR FileName, - ULONG LineNumber, + ulong_xt LineNumber, PCHAR Message ); // ****************************************************************** // * 0x0109 - RtlCaptureContext() // ****************************************************************** -XBSYSAPI EXPORTNUM(265) VOID NTAPI RtlCaptureContext +XBSYSAPI EXPORTNUM(265) void_xt NTAPI RtlCaptureContext ( IN PCONTEXT ContextRecord ); @@ -65,10 +70,10 @@ XBSYSAPI EXPORTNUM(265) VOID NTAPI RtlCaptureContext // ****************************************************************** // * 0x010A - RtlCaptureStackBackTrace() // ****************************************************************** -XBSYSAPI EXPORTNUM(266) USHORT NTAPI RtlCaptureStackBackTrace +XBSYSAPI EXPORTNUM(266) ushort_xt NTAPI RtlCaptureStackBackTrace ( - IN ULONG FramesToSkip, - IN ULONG FramesToCapture, + IN ulong_xt FramesToSkip, + IN ulong_xt FramesToCapture, OUT PVOID *BackTrace, OUT PULONG BackTraceHash ); @@ -76,10 +81,10 @@ XBSYSAPI EXPORTNUM(266) USHORT NTAPI RtlCaptureStackBackTrace // ****************************************************************** // * RtlCharToInteger // ****************************************************************** -XBSYSAPI EXPORTNUM(267) NTSTATUS NTAPI RtlCharToInteger +XBSYSAPI EXPORTNUM(267) ntstatus_xt NTAPI RtlCharToInteger ( IN PCSZ String, - IN ULONG Base OPTIONAL, + IN ulong_xt Base OPTIONAL, OUT PULONG Value ); @@ -90,41 +95,41 @@ XBSYSAPI EXPORTNUM(267) NTSTATUS NTAPI RtlCharToInteger // * compare block of memory, return number of equivalent bytes. // * // ****************************************************************** -XBSYSAPI EXPORTNUM(268) SIZE_T NTAPI RtlCompareMemory +XBSYSAPI EXPORTNUM(268) size_xt NTAPI RtlCompareMemory ( - IN CONST VOID *Source1, - IN CONST VOID *Source2, - IN SIZE_T Length + IN CONST void_xt *Source1, + IN CONST void_xt *Source2, + IN size_xt Length ); // ****************************************************************** // * 0x010D - RtlCompareMemoryUlong() // ****************************************************************** -XBSYSAPI EXPORTNUM(269) SIZE_T NTAPI RtlCompareMemoryUlong +XBSYSAPI EXPORTNUM(269) size_xt NTAPI RtlCompareMemoryUlong ( IN PVOID Source, - IN SIZE_T Length, - IN ULONG Pattern + IN size_xt Length, + IN ulong_xt Pattern ); // ****************************************************************** // * 0x010E - RtlCompareString() // ****************************************************************** -XBSYSAPI EXPORTNUM(270) LONG NTAPI RtlCompareString +XBSYSAPI EXPORTNUM(270) long_xt NTAPI RtlCompareString ( IN PSTRING String1, IN PSTRING String2, - IN BOOLEAN CaseInSensitive + IN boolean_xt CaseInSensitive ); // ****************************************************************** // * 0x010F - RtlCompareUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(271) LONG NTAPI RtlCompareUnicodeString +XBSYSAPI EXPORTNUM(271) long_xt NTAPI RtlCompareUnicodeString ( IN PUNICODE_STRING String1, IN PUNICODE_STRING String2, - IN BOOLEAN CaseInSensitive + IN boolean_xt CaseInSensitive ); // ****************************************************************** @@ -134,7 +139,7 @@ XBSYSAPI EXPORTNUM(271) LONG NTAPI RtlCompareUnicodeString // * Copy Source to Destination // * // ****************************************************************** -XBSYSAPI EXPORTNUM(272) VOID NTAPI RtlCopyString +XBSYSAPI EXPORTNUM(272) void_xt NTAPI RtlCopyString ( OUT PSTRING DestinationString, IN PSTRING SourceString OPTIONAL @@ -143,7 +148,7 @@ XBSYSAPI EXPORTNUM(272) VOID NTAPI RtlCopyString // ****************************************************************** // * 0x0111 - RtlCopyUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(273) VOID NTAPI RtlCopyUnicodeString +XBSYSAPI EXPORTNUM(273) void_xt NTAPI RtlCopyUnicodeString ( OUT PUNICODE_STRING DestinationString, IN PUNICODE_STRING SourceString OPTIONAL @@ -152,7 +157,7 @@ XBSYSAPI EXPORTNUM(273) VOID NTAPI RtlCopyUnicodeString // ****************************************************************** // * 0x0112 - RtlCreateUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(274) BOOLEAN NTAPI RtlCreateUnicodeString +XBSYSAPI EXPORTNUM(274) boolean_xt NTAPI RtlCreateUnicodeString ( OUT PUNICODE_STRING DestinationString, IN PCWSTR SourceString @@ -161,25 +166,25 @@ XBSYSAPI EXPORTNUM(274) BOOLEAN NTAPI RtlCreateUnicodeString // ****************************************************************** // * 0x0113 - RtlDowncaseUnicodeChar() // ****************************************************************** -XBSYSAPI EXPORTNUM(275) WCHAR NTAPI RtlDowncaseUnicodeChar +XBSYSAPI EXPORTNUM(275) wchar_xt NTAPI RtlDowncaseUnicodeChar ( - IN WCHAR SourceCharacter + IN wchar_xt SourceCharacter ); // ****************************************************************** // * 0x0114 - RtlDowncaseUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(276) NTSTATUS NTAPI RtlDowncaseUnicodeString +XBSYSAPI EXPORTNUM(276) ntstatus_xt NTAPI RtlDowncaseUnicodeString ( OUT PUNICODE_STRING DestinationString, IN PUNICODE_STRING SourceString, - IN BOOLEAN AllocateDestinationString + IN boolean_xt AllocateDestinationString ); // ****************************************************************** // * RtlEnterCriticalSection // ****************************************************************** -XBSYSAPI EXPORTNUM(277) VOID NTAPI RtlEnterCriticalSection +XBSYSAPI EXPORTNUM(277) void_xt NTAPI RtlEnterCriticalSection ( IN PRTL_CRITICAL_SECTION CriticalSection ); @@ -187,7 +192,7 @@ XBSYSAPI EXPORTNUM(277) VOID NTAPI RtlEnterCriticalSection // ****************************************************************** // * 0x0116 - RtlEnterCriticalSectionAndRegion() // ****************************************************************** -XBSYSAPI EXPORTNUM(278) VOID NTAPI RtlEnterCriticalSectionAndRegion +XBSYSAPI EXPORTNUM(278) void_xt NTAPI RtlEnterCriticalSectionAndRegion ( IN PRTL_CRITICAL_SECTION CriticalSection ); @@ -195,21 +200,21 @@ XBSYSAPI EXPORTNUM(278) VOID NTAPI RtlEnterCriticalSectionAndRegion // ****************************************************************** // * 0x0117 - RtlEqualString() // ****************************************************************** -XBSYSAPI EXPORTNUM(279) BOOLEAN NTAPI RtlEqualString +XBSYSAPI EXPORTNUM(279) boolean_xt NTAPI RtlEqualString ( IN PSTRING String1, IN PSTRING String2, - IN BOOLEAN CaseInsensitive + IN boolean_xt CaseInsensitive ); // ****************************************************************** // * 0x0118 - RtlEqualUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(280) BOOLEAN NTAPI RtlEqualUnicodeString +XBSYSAPI EXPORTNUM(280) boolean_xt NTAPI RtlEqualUnicodeString ( IN PUNICODE_STRING String1, IN PUNICODE_STRING String2, - IN BOOLEAN CaseInSensitive + IN boolean_xt CaseInSensitive ); // ****************************************************************** @@ -218,7 +223,7 @@ XBSYSAPI EXPORTNUM(280) BOOLEAN NTAPI RtlEqualUnicodeString XBSYSAPI EXPORTNUM(281) LARGE_INTEGER NTAPI RtlExtendedIntegerMultiply ( IN LARGE_INTEGER Multiplicand, - IN LONG Multiplier + IN long_xt Multiplier ); // ****************************************************************** @@ -227,7 +232,7 @@ XBSYSAPI EXPORTNUM(281) LARGE_INTEGER NTAPI RtlExtendedIntegerMultiply XBSYSAPI EXPORTNUM(282) LARGE_INTEGER NTAPI RtlExtendedLargeIntegerDivide ( IN LARGE_INTEGER Dividend, - IN ULONG Divisor, + IN ulong_xt Divisor, IN PULONG Remainder // OUT? OPTIONAL? ); @@ -238,33 +243,33 @@ XBSYSAPI EXPORTNUM(283) LARGE_INTEGER NTAPI RtlExtendedMagicDivide ( IN LARGE_INTEGER Dividend, IN LARGE_INTEGER MagicDivisor, - IN CCHAR ShiftCount + IN cchar_xt ShiftCount ); // ****************************************************************** // * 0x011C - RtlFillMemory() // ****************************************************************** -XBSYSAPI EXPORTNUM(284) VOID NTAPI RtlFillMemory +XBSYSAPI EXPORTNUM(284) void_xt NTAPI RtlFillMemory ( - IN VOID UNALIGNED *Destination, - IN DWORD Length, - IN BYTE Fill + IN void_xt UNALIGNED *Destination, + IN dword_xt Length, + IN byte_xt Fill ); // ****************************************************************** // * 0x011D - RtlFillMemoryUlong() // ****************************************************************** -XBSYSAPI EXPORTNUM(285) VOID NTAPI RtlFillMemoryUlong +XBSYSAPI EXPORTNUM(285) void_xt NTAPI RtlFillMemoryUlong ( IN PVOID Destination, - IN SIZE_T Length, - IN ULONG Pattern + IN size_xt Length, + IN ulong_xt Pattern ); // ****************************************************************** // * RtlFreeAnsiString // ****************************************************************** -XBSYSAPI EXPORTNUM(286) VOID NTAPI RtlFreeAnsiString +XBSYSAPI EXPORTNUM(286) void_xt NTAPI RtlFreeAnsiString ( IN OUT PANSI_STRING AnsiString ); @@ -272,7 +277,7 @@ XBSYSAPI EXPORTNUM(286) VOID NTAPI RtlFreeAnsiString // ****************************************************************** // * 0x011F - RtlFreeUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(287) VOID NTAPI RtlFreeUnicodeString +XBSYSAPI EXPORTNUM(287) void_xt NTAPI RtlFreeUnicodeString ( IN OUT PUNICODE_STRING UnicodeString ); @@ -280,7 +285,7 @@ XBSYSAPI EXPORTNUM(287) VOID NTAPI RtlFreeUnicodeString // ****************************************************************** // * 0x0120 - RtlGetCallersAddress() // ****************************************************************** -XBSYSAPI EXPORTNUM(288) VOID NTAPI RtlGetCallersAddress +XBSYSAPI EXPORTNUM(288) void_xt NTAPI RtlGetCallersAddress ( OUT PVOID *CallersAddress, OUT PVOID *CallersCaller @@ -293,13 +298,13 @@ XBSYSAPI EXPORTNUM(288) VOID NTAPI RtlGetCallersAddress // * Initialize a counted ANSI string. // * // ****************************************************************** -XBSYSAPI EXPORTNUM(289) VOID NTAPI RtlInitAnsiString +XBSYSAPI EXPORTNUM(289) void_xt NTAPI RtlInitAnsiString ( IN OUT PANSI_STRING DestinationString, IN PCSZ SourceString ); -XBSYSAPI EXPORTNUM(290) VOID NTAPI RtlInitUnicodeString +XBSYSAPI EXPORTNUM(290) void_xt NTAPI RtlInitUnicodeString ( IN OUT PUNICODE_STRING DestinationString, IN PCWSTR SourceString @@ -308,7 +313,7 @@ XBSYSAPI EXPORTNUM(290) VOID NTAPI RtlInitUnicodeString // ****************************************************************** // * RtlInitializeCriticalSection // ****************************************************************** -XBSYSAPI EXPORTNUM(291) VOID NTAPI RtlInitializeCriticalSection +XBSYSAPI EXPORTNUM(291) void_xt NTAPI RtlInitializeCriticalSection ( IN PRTL_CRITICAL_SECTION CriticalSection ); @@ -316,28 +321,28 @@ XBSYSAPI EXPORTNUM(291) VOID NTAPI RtlInitializeCriticalSection // ****************************************************************** // * 0x0124 - RtlIntegerToChar() // ****************************************************************** -XBSYSAPI EXPORTNUM(292) NTSTATUS NTAPI RtlIntegerToChar +XBSYSAPI EXPORTNUM(292) ntstatus_xt NTAPI RtlIntegerToChar ( - IN ULONG Value, - IN ULONG Base, - IN LONG OutputLength, + IN ulong_xt Value, + IN ulong_xt Base, + IN long_xt OutputLength, IN PSZ String ); // ****************************************************************** // * 0x0125 - RtlIntegerToUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(293) NTSTATUS NTAPI RtlIntegerToUnicodeString +XBSYSAPI EXPORTNUM(293) ntstatus_xt NTAPI RtlIntegerToUnicodeString ( - IN ULONG Value, - IN ULONG Base, + IN ulong_xt Value, + IN ulong_xt Base, IN PUNICODE_STRING String ); // ****************************************************************** // * RtlLeaveCriticalSection // ****************************************************************** -XBSYSAPI EXPORTNUM(294) VOID NTAPI RtlLeaveCriticalSection +XBSYSAPI EXPORTNUM(294) void_xt NTAPI RtlLeaveCriticalSection ( IN PRTL_CRITICAL_SECTION CriticalSection ); @@ -345,7 +350,7 @@ XBSYSAPI EXPORTNUM(294) VOID NTAPI RtlLeaveCriticalSection // ****************************************************************** // * 0x0127 - RtlLeaveCriticalSectionAndRegion() // ****************************************************************** -XBSYSAPI EXPORTNUM(295) VOID NTAPI RtlLeaveCriticalSectionAndRegion +XBSYSAPI EXPORTNUM(295) void_xt NTAPI RtlLeaveCriticalSectionAndRegion ( IN PRTL_CRITICAL_SECTION CriticalSection ); @@ -353,12 +358,12 @@ XBSYSAPI EXPORTNUM(295) VOID NTAPI RtlLeaveCriticalSectionAndRegion // ****************************************************************** // * RtlLowerChar // ****************************************************************** -XBSYSAPI EXPORTNUM(296) CHAR NTAPI RtlLowerChar(CHAR Character); +XBSYSAPI EXPORTNUM(296) char_xt NTAPI RtlLowerChar(char_xt Character); // ****************************************************************** // * 0x0129 - RtlMapGenericMask() // ****************************************************************** -XBSYSAPI EXPORTNUM(297) VOID NTAPI RtlMapGenericMask +XBSYSAPI EXPORTNUM(297) void_xt NTAPI RtlMapGenericMask ( IN PACCESS_MASK AccessMask, IN PGENERIC_MAPPING GenericMapping @@ -372,47 +377,47 @@ XBSYSAPI EXPORTNUM(297) VOID NTAPI RtlMapGenericMask // * in 4-byte blocks, followed by any remaining blocks. // * // ****************************************************************** -XBSYSAPI EXPORTNUM(298) VOID NTAPI RtlMoveMemory +XBSYSAPI EXPORTNUM(298) void_xt NTAPI RtlMoveMemory ( - IN VOID UNALIGNED *Destination, - IN CONST VOID UNALIGNED *Source, - IN SIZE_T Length + IN void_xt UNALIGNED *Destination, + IN CONST void_xt UNALIGNED *Source, + IN size_xt Length ); // ****************************************************************** // * 0x012B - RtlMultiByteToUnicodeN() // ****************************************************************** -XBSYSAPI EXPORTNUM(299) NTSTATUS NTAPI RtlMultiByteToUnicodeN +XBSYSAPI EXPORTNUM(299) ntstatus_xt NTAPI RtlMultiByteToUnicodeN ( IN PWSTR UnicodeString, - IN ULONG MaxBytesInUnicodeString, + IN ulong_xt MaxBytesInUnicodeString, IN PULONG BytesInUnicodeString, IN PCHAR MultiByteString, - IN ULONG BytesInMultiByteString + IN ulong_xt BytesInMultiByteString ); // ****************************************************************** // * 0x012C - RtlMultiByteToUnicodeSize() // ****************************************************************** -XBSYSAPI EXPORTNUM(300) NTSTATUS NTAPI RtlMultiByteToUnicodeSize +XBSYSAPI EXPORTNUM(300) ntstatus_xt NTAPI RtlMultiByteToUnicodeSize ( IN PULONG BytesInUnicodeString, IN PCHAR MultiByteString, - IN ULONG BytesInMultiByteString + IN ulong_xt BytesInMultiByteString ); // ****************************************************************** // * RtlNtStatusToDosError // ****************************************************************** -XBSYSAPI EXPORTNUM(301) ULONG NTAPI RtlNtStatusToDosError +XBSYSAPI EXPORTNUM(301) ulong_xt NTAPI RtlNtStatusToDosError ( - IN NTSTATUS Status + IN ntstatus_xt Status ); // ****************************************************************** // * 0x012E - RtlRaiseException() // ****************************************************************** -XBSYSAPI EXPORTNUM(302) VOID NTAPI RtlRaiseException +XBSYSAPI EXPORTNUM(302) void_xt NTAPI RtlRaiseException ( IN PEXCEPTION_RECORD ExceptionRecord ); @@ -420,15 +425,15 @@ XBSYSAPI EXPORTNUM(302) VOID NTAPI RtlRaiseException // ****************************************************************** // * 0x012F - RtlRaiseStatus() // ****************************************************************** -XBSYSAPI EXPORTNUM(303) VOID NTAPI RtlRaiseStatus +XBSYSAPI EXPORTNUM(303) void_xt NTAPI RtlRaiseStatus ( - IN NTSTATUS Status + IN ntstatus_xt Status ); // ****************************************************************** // * RtlTimeFieldsToTime // ****************************************************************** -XBSYSAPI EXPORTNUM(304) BOOLEAN NTAPI RtlTimeFieldsToTime +XBSYSAPI EXPORTNUM(304) boolean_xt NTAPI RtlTimeFieldsToTime ( IN PTIME_FIELDS TimeFields, OUT PLARGE_INTEGER Time @@ -437,7 +442,7 @@ XBSYSAPI EXPORTNUM(304) BOOLEAN NTAPI RtlTimeFieldsToTime // ****************************************************************** // * RtlTimeToTimeFields // ****************************************************************** -XBSYSAPI EXPORTNUM(305) VOID NTAPI RtlTimeToTimeFields +XBSYSAPI EXPORTNUM(305) void_xt NTAPI RtlTimeToTimeFields ( IN PLARGE_INTEGER Time, OUT PTIME_FIELDS TimeFields @@ -446,7 +451,7 @@ XBSYSAPI EXPORTNUM(305) VOID NTAPI RtlTimeToTimeFields // ****************************************************************** // * RtlTryEnterCriticalSection // ****************************************************************** -XBSYSAPI EXPORTNUM(306) BOOLEAN NTAPI RtlTryEnterCriticalSection +XBSYSAPI EXPORTNUM(306) boolean_xt NTAPI RtlTryEnterCriticalSection ( IN PRTL_CRITICAL_SECTION CriticalSection ); @@ -454,57 +459,57 @@ XBSYSAPI EXPORTNUM(306) BOOLEAN NTAPI RtlTryEnterCriticalSection // ****************************************************************** // * 0x0133 - RtlUlongByteSwap() // ****************************************************************** -XBSYSAPI EXPORTNUM(307) ULONG FASTCALL RtlUlongByteSwap +XBSYSAPI EXPORTNUM(307) ulong_xt FASTCALL RtlUlongByteSwap ( - IN ULONG Source + IN ulong_xt Source ); // ****************************************************************** // * RtlUnicodeStringToAnsiString // ****************************************************************** -XBSYSAPI EXPORTNUM(308) NTSTATUS NTAPI RtlUnicodeStringToAnsiString +XBSYSAPI EXPORTNUM(308) ntstatus_xt NTAPI RtlUnicodeStringToAnsiString ( IN OUT PSTRING DestinationString, IN PUNICODE_STRING SourceString, - IN BOOLEAN AllocateDestinationString + IN boolean_xt AllocateDestinationString ); // ****************************************************************** // * 0x0135 - RtlUnicodeStringToInteger() // ****************************************************************** -XBSYSAPI EXPORTNUM(309) NTSTATUS NTAPI RtlUnicodeStringToInteger +XBSYSAPI EXPORTNUM(309) ntstatus_xt NTAPI RtlUnicodeStringToInteger ( IN PUNICODE_STRING String, - IN ULONG Base, + IN ulong_xt Base, IN PULONG Value ); // ****************************************************************** // * 0x0136 - RtlUnicodeToMultiByteN() // ****************************************************************** -XBSYSAPI EXPORTNUM(310) NTSTATUS NTAPI RtlUnicodeToMultiByteN +XBSYSAPI EXPORTNUM(310) ntstatus_xt NTAPI RtlUnicodeToMultiByteN ( IN PCHAR MultiByteString, - IN ULONG MaxBytesInMultiByteString, + IN ulong_xt MaxBytesInMultiByteString, IN PULONG BytesInMultiByteString, IN PWSTR UnicodeString, - IN ULONG BytesInUnicodeString + IN ulong_xt BytesInUnicodeString ); // ****************************************************************** // * 0x0137 - RtlUnicodeToMultiByteSize() // ****************************************************************** -XBSYSAPI EXPORTNUM(311) NTSTATUS NTAPI RtlUnicodeToMultiByteSize +XBSYSAPI EXPORTNUM(311) ntstatus_xt NTAPI RtlUnicodeToMultiByteSize ( IN PULONG BytesInMultiByteString, IN PWSTR UnicodeString, - IN ULONG BytesInUnicodeString + IN ulong_xt BytesInUnicodeString ); // ****************************************************************** // * 0x0138 - RtlUnwind() // ****************************************************************** -XBSYSAPI EXPORTNUM(312) VOID NTAPI RtlUnwind +XBSYSAPI EXPORTNUM(312) void_xt NTAPI RtlUnwind ( IN PVOID TargetFrame OPTIONAL, IN PVOID TargetIp OPTIONAL, @@ -515,45 +520,45 @@ XBSYSAPI EXPORTNUM(312) VOID NTAPI RtlUnwind // ****************************************************************** // * 0x0139 - RtlUpcaseUnicodeChar() // ****************************************************************** -XBSYSAPI EXPORTNUM(313) WCHAR NTAPI RtlUpcaseUnicodeChar +XBSYSAPI EXPORTNUM(313) wchar_xt NTAPI RtlUpcaseUnicodeChar ( - IN WCHAR SourceCharacter + IN wchar_xt SourceCharacter ); // ****************************************************************** // * 0x013A - RtlUpcaseUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(314) NTSTATUS NTAPI RtlUpcaseUnicodeString +XBSYSAPI EXPORTNUM(314) ntstatus_xt NTAPI RtlUpcaseUnicodeString ( OUT PUNICODE_STRING DestinationString, IN PUNICODE_STRING SourceString, - IN BOOLEAN AllocateDestinationString + IN boolean_xt AllocateDestinationString ); // ****************************************************************** // * 0x013B - RtlUpcaseUnicodeToMultiByteN() // ****************************************************************** -XBSYSAPI EXPORTNUM(315) NTSTATUS NTAPI RtlUpcaseUnicodeToMultiByteN +XBSYSAPI EXPORTNUM(315) ntstatus_xt NTAPI RtlUpcaseUnicodeToMultiByteN ( IN OUT PCHAR MultiByteString, - IN ULONG MaxBytesInMultiByteString, + IN ulong_xt MaxBytesInMultiByteString, IN PULONG BytesInMultiByteString, IN PWSTR UnicodeString, - IN ULONG BytesInUnicodeString + IN ulong_xt BytesInUnicodeString ); // ****************************************************************** // * 0x013C - RtlUpperChar() // ****************************************************************** -XBSYSAPI EXPORTNUM(316) CHAR NTAPI RtlUpperChar +XBSYSAPI EXPORTNUM(316) char_xt NTAPI RtlUpperChar ( - CHAR Character + char_xt Character ); // ****************************************************************** // * 0x013D - RtlUpperString() // ****************************************************************** -XBSYSAPI EXPORTNUM(317) VOID NTAPI RtlUpperString +XBSYSAPI EXPORTNUM(317) void_xt NTAPI RtlUpperString ( OUT PSTRING DestinationString, IN PSTRING SourceString @@ -562,19 +567,19 @@ XBSYSAPI EXPORTNUM(317) VOID NTAPI RtlUpperString // ****************************************************************** // * 0x013E - RtlUshortByteSwap() // ****************************************************************** -XBSYSAPI EXPORTNUM(318) USHORT FASTCALL RtlUshortByteSwap +XBSYSAPI EXPORTNUM(318) ushort_xt FASTCALL RtlUshortByteSwap ( - IN USHORT Source + IN ushort_xt Source ); // ****************************************************************** // * 0x013F - RtlWalkFrameChain // ****************************************************************** -XBSYSAPI EXPORTNUM(319) ULONG NTAPI RtlWalkFrameChain +XBSYSAPI EXPORTNUM(319) ulong_xt NTAPI RtlWalkFrameChain ( OUT PVOID *Callers, - IN ULONG Count, - IN ULONG Flags + IN ulong_xt Count, + IN ulong_xt Flags ); // ****************************************************************** @@ -584,22 +589,24 @@ XBSYSAPI EXPORTNUM(319) ULONG NTAPI RtlWalkFrameChain // * Fill a block of memory with zeros. // * // ****************************************************************** -XBSYSAPI EXPORTNUM(320) VOID NTAPI RtlZeroMemory +XBSYSAPI EXPORTNUM(320) void_xt NTAPI RtlZeroMemory ( - IN VOID UNALIGNED *Destination, - IN SIZE_T Length + IN void_xt UNALIGNED *Destination, + IN size_xt Length ); // ****************************************************************** // * 0x0160 - RtlRip // ****************************************************************** -XBSYSAPI EXPORTNUM(352) VOID NTAPI RtlRip +XBSYSAPI EXPORTNUM(352) void_xt NTAPI RtlRip ( PCHAR ApiName, PCHAR Expression, PCHAR Message ); +} + #endif diff --git a/import/OpenXDK/include/xboxkrnl/xboxkrnl.h b/src/core/kernel/common/types.h similarity index 72% rename from import/OpenXDK/include/xboxkrnl/xboxkrnl.h rename to src/core/kernel/common/types.h index 1768ac447..c6c039493 100644 --- a/import/OpenXDK/include/xboxkrnl/xboxkrnl.h +++ b/src/core/kernel/common/types.h @@ -66,64 +66,53 @@ namespace xbox // ****************************************************************** typedef void* LPSECURITY_ATTRIBUTES; -// ****************************************************************** -// * NTSTATUS -// ****************************************************************** -typedef long NTSTATUS; - -#define NT_SUCCESS(Status) ((NTSTATUS) (Status) >= 0) -#define STATUS_SUCCESS ((DWORD )0x00000000L) -#define STATUS_ABANDONED ((DWORD )0x00000080L) -#define STATUS_MUTANT_LIMIT_EXCEEDED ((DWORD )0xC0000191L) -#ifndef STATUS_PENDING -#define STATUS_PENDING ((DWORD )0x00000103L) -#endif -#define STATUS_TIMER_RESUME_IGNORED ((DWORD )0x40000025L) -#define STATUS_BUFFER_OVERFLOW ((DWORD )0x80000005L) -#define STATUS_UNSUCCESSFUL ((DWORD )0xC0000001) -#define STATUS_UNRECOGNIZED_MEDIA ((DWORD )0xC0000014) -#ifndef STATUS_NO_MEMORY -#define STATUS_NO_MEMORY ((DWORD )0xC0000017L) -#endif -#define STATUS_BUFFER_TOO_SMALL ((DWORD )0xC0000023L) -#define STATUS_INVALID_PARAMETER_2 ((DWORD )0xC00000F0L) -#define STATUS_ALERTED ((DWORD )0x00000101) -#define STATUS_USER_APC ((DWORD )0x000000C0L) +inline bool nt_success(ntstatus_xt status) { return status >= 0; } +inline constexpr dword_xt status_success = 0x00000000L; +inline constexpr dword_xt status_abandoned = 0x00000080L; +inline constexpr dword_xt status_mutant_limit_exceeded = 0xC0000191L; +inline constexpr dword_xt status_pending = 0x00000103L; +inline constexpr dword_xt status_timer_resume_ignored = 0x40000025L; +inline constexpr dword_xt status_buffer_overflow = 0x80000005L; +inline constexpr dword_xt status_unsuccessful = 0xC0000001; +inline constexpr dword_xt status_unrecognized_media = 0xC0000014; +inline constexpr dword_xt status_no_memory = 0xC0000017L; +inline constexpr dword_xt status_buffer_too_small = 0xC0000023L; +inline constexpr dword_xt status_invalid_parameter_2 = 0xC00000F0L; +inline constexpr dword_xt status_alerted = 0x00000101; +inline constexpr dword_xt status_user_apc = 0x000000C0L; // The SCSI input buffer was too large (not necessarily an error!) -#define STATUS_DATA_OVERRUN ((DWORD )0xC000003CL) -#define STATUS_SEMAPHORE_LIMIT_EXCEEDED ((DWORD )0xC0000047L) -#define STATUS_INVALID_IMAGE_FORMAT ((DWORD )0xC000007BL) -#define STATUS_INSUFFICIENT_RESOURCES ((DWORD )0xC000009AL) -#define STATUS_TOO_MANY_SECRETS ((DWORD )0xC0000156L) -#define STATUS_XBE_REGION_MISMATCH ((DWORD )0xC0050001L) -#define STATUS_XBE_MEDIA_MISMATCH ((DWORD )0xC0050002L) -#define STATUS_OBJECT_NAME_NOT_FOUND ((DWORD )0xC0000034L) -#define STATUS_OBJECT_NAME_COLLISION ((DWORD )0xC0000035L) -#define STATUS_INVALID_PAGE_PROTECTION ((DWORD )0xC0000045L) -#define STATUS_CONFLICTING_ADDRESSES ((DWORD )0xC0000018L) -#define STATUS_UNABLE_TO_FREE_VM ((DWORD )0xC000001AL) -#define STATUS_FREE_VM_NOT_AT_BASE ((DWORD )0xC000009FL) -#define STATUS_MEMORY_NOT_ALLOCATED ((DWORD )0xC00000A0L) -#define STATUS_NOT_COMMITTED ((DWORD )0xC000002DL) +inline constexpr dword_xt status_data_overrun = 0xC000003CL; +inline constexpr dword_xt status_semaphore_limit_exceeded = 0xC0000047L; +inline constexpr dword_xt status_invalid_image_format = 0xC000007BL; +inline constexpr dword_xt status_insufficient_resources = 0xC000009AL; +inline constexpr dword_xt status_too_many_secrets = 0xC0000156L; +inline constexpr dword_xt status_xbe_region_mismatch = 0xC0050001L; +inline constexpr dword_xt status_xbe_media_mismatch = 0xC0050002L; +inline constexpr dword_xt status_object_name_not_found = 0xC0000034L; +inline constexpr dword_xt status_object_name_collision = 0xC0000035L; +inline constexpr dword_xt status_invalid_page_protection = 0xC0000045L; +inline constexpr dword_xt status_conflicting_addresses = 0xC0000018L; +inline constexpr dword_xt status_unable_to_free_vm = 0xC000001AL; +inline constexpr dword_xt status_free_vm_not_at_base = 0xC000009FL; +inline constexpr dword_xt status_memory_not_allocated = 0xC00000A0L; +inline constexpr dword_xt status_not_committed = 0xC000002DL; // ****************************************************************** // * Registry value types // ****************************************************************** // Used in ExQueryNonVolatileSetting and ExSaveNonVolatileSetting -#ifndef _WIN32 // Avoid "warning C4005: 'REG_NONE': macro redefinition" (conflicting with winnt.h) -#define REG_NONE ( 0 ) // No defined value type. -#define REG_SZ ( 1 ) // A null - terminated string. This will be either a Unicode or an ANSI string, depending on whether you use the Unicode or ANSI functions. -#define REG_EXPAND_SZ ( 2 ) // A null - terminated string that contains unexpanded references to environment variables (for example, "%PATH%"). It will be a Unicode or ANSI string depending on whether you use the Unicode or ANSI functions. To expand the environment variable references, use the ExpandEnvironmentStrings function. -#define REG_BINARY ( 3 ) // Binary data in any form. -#define REG_DWORD ( 4 ) // A 32 - bit number. -#define REG_DWORD_LITTLE_ENDIAN ( 4 ) // A 32 - bit number in little - endian format. Windows is designed to run on little - endian computer architectures. Therefore, this value is defined as REG_DWORD in the Windows header files. -#define REG_DWORD_BIG_ENDIAN ( 5 ) // A 32 - bit number in big - endian format. Some UNIX systems support big - endian architectures. -#define REG_LINK ( 6 ) // A null - terminated Unicode string that contains the target path of a symbolic link that was created by calling the RegCreateKeyEx function with REG_OPTION_CREATE_LINK. -#define REG_MULTI_SZ ( 7 ) // A sequence of null - terminated strings, terminated by an empty string(\0). String1\0String2\0String3\0LastString\0\0 // The first \0 terminates the first string, the second to the last \0 terminates the last string, and the final \0 terminates the sequence.Note that the final terminator must be factored into the length of the string. -#define REG_RESOURCE_LIST ( 8 ) // Resource list in the resource map -#define REG_FULL_RESOURCE_DESCRIPTOR ( 9 ) // Resource list in the hardware description -#define REG_RESOURCE_REQUIREMENTS_LIST ( 10 ) -#endif +inline constexpr int_xt reg_none = 0; // No defined value type. +inline constexpr int_xt reg_sz = 1; // A null - terminated string. This will be either a Unicode or an ANSI string, depending on whether you use the Unicode or ANSI functions. +inline constexpr int_xt reg_expand_sz = 2; // A null - terminated string that contains unexpanded references to environment variables (for example, "%PATH%"). It will be a Unicode or ANSI string depending on whether you use the Unicode or ANSI functions. To expand the environment variable references, use the ExpandEnvironmentStrings function. +inline constexpr int_xt reg_binary = 3; // Binary data in any form. +inline constexpr int_xt reg_dword = 4; // A 32 - bit number. +inline constexpr int_xt reg_dword_little_endian = 4; // A 32 - bit number in little - endian format. Windows is designed to run on little - endian computer architectures. Therefore, this value is defined as REG_DWORD in the Windows header files. +inline constexpr int_xt reg_dword_big_endian = 5; // A 32 - bit number in big - endian format. Some UNIX systems support big - endian architectures. +inline constexpr int_xt reg_link = 6; // A null - terminated Unicode string that contains the target path of a symbolic link that was created by calling the RegCreateKeyEx function with REG_OPTION_CREATE_LINK. +inline constexpr int_xt reg_multi_sz = 7; // A sequence of null - terminated strings, terminated by an empty string(\0). String1\0String2\0String3\0LastString\0\0 // The first \0 terminates the first string, the second to the last \0 terminates the last string, and the final \0 terminates the sequence.Note that the final terminator must be factored into the length of the string. +inline constexpr int_xt reg_resource_list = 8; // Resource list in the resource map +inline constexpr int_xt reg_full_resource_descriptor = 9; // Resource list in the hardware description +inline constexpr int_xt reg_resource_requirements_list = 10; // ****************************************************************** // * calling conventions @@ -148,7 +137,7 @@ typedef long NTSTATUS; // ****************************************************************** // * KPROCESSOR_MODE // ****************************************************************** -typedef CCHAR KPROCESSOR_MODE; +typedef cchar_xt KPROCESSOR_MODE; // ****************************************************************** // * KWAIT_REASON @@ -212,12 +201,12 @@ typedef union _LARGE_INTEGER { struct { - DWORD LowPart; - LONG HighPart; + dword_xt LowPart; + long_xt HighPart; } u; - LONGLONG QuadPart; + longlong_xt QuadPart; } LARGE_INTEGER, *PLARGE_INTEGER; @@ -228,19 +217,19 @@ typedef union _ULARGE_INTEGER { struct { - DWORD LowPart; - DWORD HighPart; + dword_xt LowPart; + dword_xt HighPart; } u1; struct { - DWORD LowPart; - DWORD HighPart; + dword_xt LowPart; + dword_xt HighPart; } u; - ULONGLONG QuadPart; + ulonglong_xt QuadPart; } ULARGE_INTEGER, *PULARGE_INTEGER; @@ -249,8 +238,8 @@ ULARGE_INTEGER, *PULARGE_INTEGER; // ****************************************************************** typedef struct _STRING { - USHORT Length; - USHORT MaximumLength; + ushort_xt Length; + ushort_xt MaximumLength; PCHAR Buffer; } STRING, ANSI_STRING, *PSTRING, *PANSI_STRING; @@ -265,9 +254,9 @@ typedef STRING OBJECT_STRING, *POBJECT_STRING; // ****************************************************************** typedef struct _UNICODE_STRING { - USHORT Length; - USHORT MaximumLength; - USHORT *Buffer; + ushort_xt Length; + ushort_xt MaximumLength; + ushort_xt *Buffer; } UNICODE_STRING, *PUNICODE_STRING; @@ -289,15 +278,15 @@ typedef struct _SINGLE_LIST_ENTRY { } SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY, SLIST_ENTRY, *PSLIST_ENTRY; typedef union _SLIST_HEADER { - ULONGLONG Alignment; + ulonglong_xt Alignment; struct { SINGLE_LIST_ENTRY Next; - USHORT Depth; - USHORT Sequence; + ushort_xt Depth; + ushort_xt Sequence; }; } SLIST_HEADER, *PSLIST_HEADER; -#define QUERY_DEPTH_SLIST(_listhead_) (USHORT)(_listhead_)->Depth +#define QUERY_DEPTH_SLIST(_listhead_) (xbox::ushort_xt)(_listhead_)->Depth /* * Disabled as Cxbx-Reloaded does not support Win64 compilation @@ -340,8 +329,8 @@ typedef struct _FILE_FS_SIZE_INFORMATION { LARGE_INTEGER TotalAllocationUnits; LARGE_INTEGER AvailableAllocationUnits; - ULONG SectorsPerAllocationUnit; - ULONG BytesPerSector; + ulong_xt SectorsPerAllocationUnit; + ulong_xt BytesPerSector; } FILE_FS_SIZE_INFORMATION, *PFILE_FS_SIZE_INFORMATION; @@ -350,10 +339,10 @@ FILE_FS_SIZE_INFORMATION, *PFILE_FS_SIZE_INFORMATION; // ****************************************************************** typedef struct _FILE_FS_VOLUME_INFORMATION { LARGE_INTEGER VolumeCreationTime; - ULONG VolumeSerialNumber; - ULONG VolumeLabelLength; - BOOLEAN SupportsObjects; - CHAR VolumeLabel[1]; + ulong_xt VolumeSerialNumber; + ulong_xt VolumeLabelLength; + boolean_xt SupportsObjects; + char_xt VolumeLabel[1]; } FILE_FS_VOLUME_INFORMATION, *PFILE_FS_VOLUME_INFORMATION; // ****************************************************************** @@ -477,10 +466,10 @@ FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; // ****************************************************************** typedef struct _GENERIC_MAPPING { - ACCESS_MASK GenericRead; - ACCESS_MASK GenericWrite; - ACCESS_MASK GenericExecute; - ACCESS_MASK GenericAll; + access_mask_xt GenericRead; + access_mask_xt GenericWrite; + access_mask_xt GenericExecute; + access_mask_xt GenericAll; } GENERIC_MAPPING, *PGENERIC_MAPPING; @@ -491,7 +480,7 @@ typedef struct _OBJECT_ATTRIBUTES { HANDLE RootDirectory; PSTRING ObjectName; - ULONG Attributes; + ulong_xt Attributes; } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; @@ -499,27 +488,27 @@ OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; // * OBJECT_TYPE // ****************************************************************** typedef PVOID(NTAPI *OB_ALLOCATE_METHOD)( - IN SIZE_T NumberOfBytes, - IN ULONG Tag + IN size_xt NumberOfBytes, + IN ulong_xt Tag ); -typedef VOID(NTAPI *OB_FREE_METHOD)( +typedef void_xt(NTAPI *OB_FREE_METHOD)( IN PVOID Pointer ); -typedef VOID(NTAPI *OB_CLOSE_METHOD)( +typedef void_xt(NTAPI *OB_CLOSE_METHOD)( IN PVOID Object, - IN ULONG SystemHandleCount + IN ulong_xt SystemHandleCount ); -typedef VOID(NTAPI *OB_DELETE_METHOD)( +typedef void_xt(NTAPI *OB_DELETE_METHOD)( IN PVOID Object ); -typedef NTSTATUS(NTAPI *OB_PARSE_METHOD)( +typedef ntstatus_xt(NTAPI *OB_PARSE_METHOD)( IN PVOID ParseObject, IN struct _OBJECT_TYPE *ObjectType, - IN ULONG Attributes, + IN ulong_xt Attributes, IN OUT POBJECT_STRING CompleteName, IN OUT POBJECT_STRING RemainingName, IN OUT PVOID Context OPTIONAL, @@ -534,7 +523,7 @@ typedef struct _OBJECT_TYPE OB_DELETE_METHOD DeleteProcedure; OB_PARSE_METHOD ParseProcedure; PVOID DefaultObject; - ULONG PoolTag; + ulong_xt PoolTag; } OBJECT_TYPE, *POBJECT_TYPE; @@ -542,15 +531,15 @@ OBJECT_TYPE, *POBJECT_TYPE; // * OBJECT_HEADER // ****************************************************************** typedef struct _OBJECT_HEADER { - LONG PointerCount; - LONG HandleCount; + long_xt PointerCount; + long_xt HandleCount; POBJECT_TYPE Type; - ULONG Flags; - QUAD Body; + ulong_xt Flags; + quad_xt Body; } OBJECT_HEADER, *POBJECT_HEADER; // Source : DXBX -typedef ULONG_PTR KSPIN_LOCK; +typedef ulong_ptr_xt KSPIN_LOCK; typedef KSPIN_LOCK *PKSPIN_LOCK; // ****************************************************************** @@ -559,8 +548,8 @@ typedef KSPIN_LOCK *PKSPIN_LOCK; // Source : DXBX typedef struct _FILETIME { - DWORD dwLowDateTime; - DWORD dwHighDateTime; + dword_xt dwLowDateTime; + dword_xt dwHighDateTime; } FILETIME, *PFILETIME; @@ -570,18 +559,18 @@ FILETIME, *PFILETIME; // Source : DXBX (Xbox Refurb Info) typedef struct _XBOX_REFURB_INFO { - DWORD Signature; - DWORD PowerCycleCount; + dword_xt Signature; + dword_xt PowerCycleCount; FILETIME FirstBootTime; } XBOX_REFURB_INFO, *PXBOX_REFURB_INFO; #define EXCEPTION_MAXIMUM_PARAMETERS 15 // maximum number of exception parameters -#define ALIGN_DOWN(length, type) ((ULONG)(length) & ~(sizeof(type) - 1)) -#define ALIGN_UP(length, type) (ALIGN_DOWN(((ULONG)(length) + sizeof(type) - 1), type)) -#define ALIGN_DOWN_POINTER(address, type) ((PVOID)((ULONG_PTR)(address) & ~((ULONG_PTR)sizeof(type) - 1))) -#define ALIGN_UP_POINTER(address, type) (ALIGN_DOWN_POINTER(((ULONG_PTR)(address) + sizeof(type) - 1), type)) +#define ALIGN_DOWN(length, type) ((ulong_xt)(length) & ~(sizeof(type) - 1)) +#define ALIGN_UP(length, type) (ALIGN_DOWN(((ulong_xt)(length) + sizeof(type) - 1), type)) +#define ALIGN_DOWN_POINTER(address, type) ((PVOID)((ulong_ptr_xt)(address) & ~((ulong_ptr_xt)sizeof(type) - 1))) +#define ALIGN_UP_POINTER(address, type) (ALIGN_DOWN_POINTER(((ulong_ptr_xt)(address) + sizeof(type) - 1), type)) // ****************************************************************** // * EXCEPTION_RECORD @@ -589,12 +578,12 @@ XBOX_REFURB_INFO, *PXBOX_REFURB_INFO; // Source : DXBX typedef struct _EXCEPTION_RECORD { - DWORD ExceptionCode; - DWORD ExceptionFlags; + dword_xt ExceptionCode; + dword_xt ExceptionFlags; _EXCEPTION_RECORD *ExceptionRecord; - VOID *ExceptionAddress; - DWORD NumberParameters; - ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; + void_xt *ExceptionAddress; + dword_xt NumberParameters; + ulong_ptr_xt ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; } EXCEPTION_RECORD, *PEXCEPTION_RECORD; @@ -620,17 +609,17 @@ FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS; // ****************************************************************** typedef struct _FILE_DIRECTORY_INFORMATION { - ULONG NextEntryOffset; - ULONG FileIndex; + ulong_xt NextEntryOffset; + ulong_xt FileIndex; LARGE_INTEGER CreationTime; LARGE_INTEGER LastAccessTime; LARGE_INTEGER LastWriteTime; LARGE_INTEGER ChangeTime; LARGE_INTEGER EndOfFile; LARGE_INTEGER AllocationSize; - ULONG FileAttributes; - ULONG FileNameLength; - CHAR FileName[1]; // Offset: 0x40 + ulong_xt FileAttributes; + ulong_xt FileNameLength; + char_xt FileName[1]; // Offset: 0x40 } FILE_DIRECTORY_INFORMATION; @@ -639,7 +628,7 @@ FILE_DIRECTORY_INFORMATION; // ****************************************************************** typedef struct _FILE_RENAME_INFORMATION { - BOOLEAN ReplaceIfExists; + boolean_xt ReplaceIfExists; HANDLE RootDirectory; OBJECT_STRING FileName; } @@ -649,10 +638,10 @@ FILE_RENAME_INFORMATION; // * FILE_LINK_INFORMATION // ****************************************************************** typedef struct _FILE_LINK_INFORMATION { - BOOLEAN ReplaceIfExists; + boolean_xt ReplaceIfExists; HANDLE RootDirectory; - ULONG FileNameLength; - CHAR FileName[1]; + ulong_xt FileNameLength; + char_xt FileName[1]; } FILE_LINK_INFORMATION, *PFILE_LINK_INFORMATION; // ****************************************************************** @@ -665,18 +654,18 @@ typedef struct _FILE_NETWORK_OPEN_INFORMATION { LARGE_INTEGER ChangeTime; LARGE_INTEGER AllocationSize; LARGE_INTEGER EndOfFile; - ULONG FileAttributes; + ulong_xt FileAttributes; } FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION; // ****************************************************************** // * FILE_FULL_EA_INFORMATION // ****************************************************************** typedef struct _FILE_FULL_EA_INFORMATION { - ULONG NextEntryOffset; - UCHAR Flags; - UCHAR EaNameLength; - USHORT EaValueLength; - CHAR EaName[1]; + ulong_xt NextEntryOffset; + uchar_xt Flags; + uchar_xt EaNameLength; + ushort_xt EaValueLength; + char_xt EaName[1]; } FILE_FULL_EA_INFORMATION, *PFILE_FULL_EA_INFORMATION; // ****************************************************************** @@ -687,7 +676,7 @@ typedef struct _FILE_BASIC_INFORMATION { LARGE_INTEGER LastAccessTime; LARGE_INTEGER LastWriteTime; LARGE_INTEGER ChangeTime; - ULONG FileAttributes; + ulong_xt FileAttributes; } FILE_BASIC_INFORMATION, *PFILE_BASIC_INFORMATION; // ****************************************************************** @@ -696,9 +685,9 @@ typedef struct _FILE_BASIC_INFORMATION { typedef struct _FILE_STANDARD_INFORMATION { LARGE_INTEGER AllocationSize; LARGE_INTEGER EndOfFile; - ULONG NumberOfLinks; - BOOLEAN DeletePending; - BOOLEAN Directory; + ulong_xt NumberOfLinks; + boolean_xt DeletePending; + boolean_xt Directory; } FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION; // ****************************************************************** @@ -712,14 +701,14 @@ typedef struct _FILE_INTERNAL_INFORMATION { // * FILE_EA_INFORMATION // ****************************************************************** typedef struct _FILE_EA_INFORMATION { - ULONG EaSize; + ulong_xt EaSize; } FILE_EA_INFORMATION, *PFILE_EA_INFORMATION; // ****************************************************************** // * FILE_ACCESS_INFORMATION // ****************************************************************** typedef struct _FILE_ACCESS_INFORMATION { - ACCESS_MASK AccessFlags; + access_mask_xt AccessFlags; } FILE_ACCESS_INFORMATION, *PFILE_ACCESS_INFORMATION; // ****************************************************************** @@ -733,22 +722,22 @@ typedef struct _FILE_POSITION_INFORMATION { // * FILE_MODE_INFORMATION // ****************************************************************** typedef struct _FILE_MODE_INFORMATION { - ULONG Mode; + ulong_xt Mode; } FILE_MODE_INFORMATION, *PFILE_MODE_INFORMATION; // ****************************************************************** // * FILE_ALIGNMENT_INFORMATION // ****************************************************************** typedef struct _FILE_ALIGNMENT_INFORMATION { - ULONG AlignmentRequirement; + ulong_xt AlignmentRequirement; } FILE_ALIGNMENT_INFORMATION, *PFILE_ALIGNMENT_INFORMATION; // ****************************************************************** // * FILE_NAME_INFORMATION // ****************************************************************** typedef struct _FILE_NAME_INFORMATION { - ULONG FileNameLength; - CHAR FileName[1]; + ulong_xt FileNameLength; + char_xt FileName[1]; } FILE_NAME_INFORMATION, *PFILE_NAME_INFORMATION; // ****************************************************************** @@ -770,7 +759,7 @@ typedef struct _FILE_ALL_INFORMATION { // * FILE_DISPOSITION_INFORMATION // ****************************************************************** typedef struct _FILE_DISPOSITION_INFORMATION { - BOOLEAN DeleteFile; + boolean_xt DeleteFile; } FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; // ****************************************************************** @@ -785,11 +774,11 @@ typedef struct _FILE_ALLOCATION_INFORMATION { // ****************************************************************** typedef struct _FILE_COMPRESSION_INFORMATION { LARGE_INTEGER CompressedFileSize; - USHORT CompressionFormat; - UCHAR CompressionUnitShift; - UCHAR ChunkShift; - UCHAR ClusterShift; - UCHAR Reserved[3]; + ushort_xt CompressionFormat; + uchar_xt CompressionUnitShift; + uchar_xt ChunkShift; + uchar_xt ClusterShift; + uchar_xt Reserved[3]; } FILE_COMPRESSION_INFORMATION, *PFILE_COMPRESSION_INFORMATION; // ****************************************************************** @@ -803,21 +792,21 @@ typedef struct _FILE_END_OF_FILE_INFORMATION { // * FILE_MOVE_CLUSTER_INFORMATION // ****************************************************************** typedef struct _FILE_MOVE_CLUSTER_INFORMATION { - ULONG ClusterCount; + ulong_xt ClusterCount; HANDLE RootDirectory; - ULONG FileNameLength; - CHAR FileName[1]; + ulong_xt FileNameLength; + char_xt FileName[1]; } FILE_MOVE_CLUSTER_INFORMATION, *PFILE_MOVE_CLUSTER_INFORMATION; // ****************************************************************** // * FILE_STREAM_INFORMATION // ****************************************************************** typedef struct _FILE_STREAM_INFORMATION { - ULONG NextEntryOffset; - ULONG StreamNameLength; + ulong_xt NextEntryOffset; + ulong_xt StreamNameLength; LARGE_INTEGER StreamSize; LARGE_INTEGER StreamAllocationSize; - CHAR StreamName[1]; + char_xt StreamName[1]; } FILE_STREAM_INFORMATION, *PFILE_STREAM_INFORMATION; // ****************************************************************** @@ -825,8 +814,8 @@ typedef struct _FILE_STREAM_INFORMATION { // ****************************************************************** typedef struct _FILE_TRACKING_INFORMATION { HANDLE DestinationFile; - ULONG ObjectInformationLength; - CHAR ObjectInformation[1]; + ulong_xt ObjectInformationLength; + char_xt ObjectInformation[1]; } FILE_TRACKING_INFORMATION, *PFILE_TRACKING_INFORMATION; // ****************************************************************** @@ -841,24 +830,24 @@ typedef struct _FILE_COMPLETION_INFORMATION { // * FILE_PIPE_INFORMATION // ****************************************************************** typedef struct _FILE_PIPE_INFORMATION { - ULONG ReadMode; - ULONG CompletionMode; + ulong_xt ReadMode; + ulong_xt CompletionMode; } FILE_PIPE_INFORMATION, *PFILE_PIPE_INFORMATION; // ****************************************************************** // * FILE_PIPE_LOCAL_INFORMATION // ****************************************************************** typedef struct _FILE_PIPE_LOCAL_INFORMATION { - ULONG NamedPipeType; - ULONG NamedPipeConfiguration; - ULONG MaximumInstances; - ULONG CurrentInstances; - ULONG InboundQuota; - ULONG ReadDataAvailable; - ULONG OutboundQuota; - ULONG WriteQuotaAvailable; - ULONG NamedPipeState; - ULONG NamedPipeEnd; + ulong_xt NamedPipeType; + ulong_xt NamedPipeConfiguration; + ulong_xt MaximumInstances; + ulong_xt CurrentInstances; + ulong_xt InboundQuota; + ulong_xt ReadDataAvailable; + ulong_xt OutboundQuota; + ulong_xt WriteQuotaAvailable; + ulong_xt NamedPipeState; + ulong_xt NamedPipeEnd; } FILE_PIPE_LOCAL_INFORMATION, *PFILE_PIPE_LOCAL_INFORMATION; // ****************************************************************** @@ -866,17 +855,17 @@ typedef struct _FILE_PIPE_LOCAL_INFORMATION { // ****************************************************************** typedef struct _FILE_PIPE_REMOTE_INFORMATION { LARGE_INTEGER CollectDataTime; - ULONG MaximumCollectionCount; + ulong_xt MaximumCollectionCount; } FILE_PIPE_REMOTE_INFORMATION, *PFILE_PIPE_REMOTE_INFORMATION; // ****************************************************************** // * FILE_MAILSLOT_QUERY_INFORMATION // ****************************************************************** typedef struct _FILE_MAILSLOT_QUERY_INFORMATION { - ULONG MaximumMessageSize; - ULONG MailslotQuota; - ULONG NextMessageSize; - ULONG MessagesAvailable; + ulong_xt MaximumMessageSize; + ulong_xt MailslotQuota; + ulong_xt NextMessageSize; + ulong_xt MessagesAvailable; LARGE_INTEGER ReadTimeout; } FILE_MAILSLOT_QUERY_INFORMATION, *PFILE_MAILSLOT_QUERY_INFORMATION; @@ -891,8 +880,8 @@ typedef struct _FILE_MAILSLOT_SET_INFORMATION { // * FILE_REPARSE_POINT_INFORMATION // ****************************************************************** typedef struct _FILE_REPARSE_POINT_INFORMATION { - LONGLONG FileReference; - ULONG Tag; + longlong_xt FileReference; + ulong_xt Tag; } FILE_REPARSE_POINT_INFORMATION, *PFILE_REPARSE_POINT_INFORMATION; // ****************************************************************** @@ -900,9 +889,9 @@ typedef struct _FILE_REPARSE_POINT_INFORMATION { // ****************************************************************** typedef struct _KSYSTEM_TIME { - /* 0x00 */ ULONG LowPart; - /* 0x04 */ LONG High1Time; - /* 0x08 */ LONG High2Time; + /* 0x00 */ ulong_xt LowPart; + /* 0x04 */ long_xt High1Time; + /* 0x08 */ long_xt High2Time; } // Size = 0x0C KSYSTEM_TIME, *PKSYSTEM_TIME; @@ -911,15 +900,15 @@ KSYSTEM_TIME, *PKSYSTEM_TIME; // ****************************************************************** typedef struct _MM_STATISTICS { - ULONG Length; - ULONG TotalPhysicalPages; - ULONG AvailablePages; - ULONG VirtualMemoryBytesCommitted; - ULONG VirtualMemoryBytesReserved; - ULONG CachePagesCommitted; - ULONG PoolPagesCommitted; - ULONG StackPagesCommitted; - ULONG ImagePagesCommitted; + ulong_xt Length; + ulong_xt TotalPhysicalPages; + ulong_xt AvailablePages; + ulong_xt VirtualMemoryBytesCommitted; + ulong_xt VirtualMemoryBytesReserved; + ulong_xt CachePagesCommitted; + ulong_xt PoolPagesCommitted; + ulong_xt StackPagesCommitted; + ulong_xt ImagePagesCommitted; } MM_STATISTICS, *PMM_STATISTICS; @@ -930,32 +919,32 @@ typedef struct _IO_STATUS_BLOCK { union { - NTSTATUS Status; + ntstatus_xt Status; PVOID Pointer; }; - ULONG_PTR Information; + ulong_ptr_xt Information; } IO_STATUS_BLOCK, *PIO_STATUS_BLOCK; // ****************************************************************** // * PIO_APC_ROUTINE // ****************************************************************** -typedef VOID (NTAPI *PIO_APC_ROUTINE) +typedef void_xt (NTAPI *PIO_APC_ROUTINE) ( IN PVOID ApcContext, IN PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG Reserved + IN ulong_xt Reserved ); // ****************************************************************** // * PTIMER_APC_ROUTINE *Same as Win2k/XP* // ****************************************************************** -typedef VOID(NTAPI *PTIMER_APC_ROUTINE) +typedef void_xt(NTAPI *PTIMER_APC_ROUTINE) ( IN PVOID TimerContext, - IN ULONG TimerLowValue, - IN LONG TimerHighValue + IN ulong_xt TimerLowValue, + IN long_xt TimerHighValue ); // ****************************************************************** @@ -964,7 +953,7 @@ typedef VOID(NTAPI *PTIMER_APC_ROUTINE) typedef struct _TIMER_BASIC_INFORMATION { LARGE_INTEGER TimeRemaining; - BOOLEAN SignalState; + boolean_xt SignalState; } TIMER_BASIC_INFORMATION, *PTIMER_BASIC_INFORMATION; @@ -975,11 +964,11 @@ typedef struct _MEMORY_BASIC_INFORMATION { PVOID BaseAddress; PVOID AllocationBase; - DWORD AllocationProtect; - SIZE_T RegionSize; - DWORD State; - DWORD Protect; - DWORD Type; + dword_xt AllocationProtect; + size_xt RegionSize; + dword_xt State; + dword_xt Protect; + dword_xt Type; } MEMORY_BASIC_INFORMATION, *PMEMORY_BASIC_INFORMATION; @@ -1024,13 +1013,13 @@ typedef struct _PCI_SLOT_NUMBER { struct { - ULONG DeviceNumber:5; - ULONG FunctionNumber:3; - ULONG Reserved:24; + ulong_xt DeviceNumber:5; + ulong_xt FunctionNumber:3; + ulong_xt Reserved:24; } bits; - ULONG AsULONG; + ulong_xt AsULONG; }u; } PCI_SLOT_NUMBER, *PPCI_SLOT_NUMBER; @@ -1049,16 +1038,16 @@ PCI_SLOT_NUMBER, *PPCI_SLOT_NUMBER; typedef struct _PCI_TYPE1_CFG_BITS { union { struct { - ULONG Reserved1:2; - ULONG RegisterNumber:6; - ULONG FunctionNumber:3; - ULONG DeviceNumber:5; - ULONG BusNumber:8; - ULONG Reserved2:7; - ULONG Enable:1; + ulong_xt Reserved1:2; + ulong_xt RegisterNumber:6; + ulong_xt FunctionNumber:3; + ulong_xt DeviceNumber:5; + ulong_xt BusNumber:8; + ulong_xt Reserved2:7; + ulong_xt Enable:1; } bits; - ULONG AsULONG; + ulong_xt AsULONG; } u; } PCI_TYPE1_CFG_BITS, *PPCI_TYPE1_CFG_BITS; @@ -1067,48 +1056,44 @@ typedef struct _PCI_TYPE1_CFG_BITS { // ****************************************************************** typedef struct _PCI_COMMON_CONFIG { - USHORT VendorID; // 0x00 (ro) - USHORT DeviceID; // 0x02 (ro) - USHORT Command; // 0x04 Device control - USHORT Status; // 0x06 - UCHAR RevisionID; // 0x08 (ro) - UCHAR ProgIf; // 0x09 (ro) - UCHAR SubClass; // 0x0A (ro) - UCHAR BaseClass; // 0x0B (ro) - UCHAR CacheLineSize; // 0x0C (ro+) - UCHAR LatencyTimer; // 0x0D (ro+) - UCHAR HeaderType; // 0x0E (ro) - UCHAR BIST; // 0x0F Built in self test + ushort_xt VendorID; // 0x00 (ro) + ushort_xt DeviceID; // 0x02 (ro) + ushort_xt Command; // 0x04 Device control + ushort_xt Status; // 0x06 + uchar_xt RevisionID; // 0x08 (ro) + uchar_xt ProgIf; // 0x09 (ro) + uchar_xt SubClass; // 0x0A (ro) + uchar_xt BaseClass; // 0x0B (ro) + uchar_xt CacheLineSize; // 0x0C (ro+) + uchar_xt LatencyTimer; // 0x0D (ro+) + uchar_xt HeaderType; // 0x0E (ro) + uchar_xt BIST; // 0x0F Built in self test union { struct _PCI_HEADER_TYPE_0 { - ULONG BaseAddresses[PCI_TYPE0_ADDRESSES]; // 0x10 - ULONG CIS; - USHORT SubVendorID; - USHORT SubSystemID; - ULONG ROMBaseAddress; - UCHAR CapabilitiesPtr; - UCHAR Reserved1[3]; - ULONG Reserved2; - UCHAR InterruptLine; // - UCHAR InterruptPin; // (ro) - UCHAR MinimumGrant; // (ro) - UCHAR MaximumLatency; // (ro) + ulong_xt BaseAddresses[PCI_TYPE0_ADDRESSES]; // 0x10 + ulong_xt CIS; + ushort_xt SubVendorID; + ushort_xt SubSystemID; + ulong_xt ROMBaseAddress; + uchar_xt CapabilitiesPtr; + uchar_xt Reserved1[3]; + ulong_xt Reserved2; + uchar_xt InterruptLine; // + uchar_xt InterruptPin; // (ro) + uchar_xt MinimumGrant; // (ro) + uchar_xt MaximumLatency; // (ro) } type0; }u; - UCHAR DeviceSpecific[192]; + uchar_xt DeviceSpecific[192]; } PCI_COMMON_CONFIG, *PPCI_COMMON_CONFIG; -#define FIELD_OFFSET(type, field) ((LONG)(LONG_PTR)&(((type *)0)->field)) - -#define PCI_COMMON_HDR_LENGTH (FIELD_OFFSET (PCI_COMMON_CONFIG, DeviceSpecific)) - #define PCI_MAX_DEVICES 32 #define PCI_MAX_FUNCTION 8 #define PCI_MAX_BRIDGE_NUMBER 0xFF @@ -1142,10 +1127,10 @@ RETURN_FIRMWARE, *LPRETURN_FIRMWARE; // ****************************************************************** typedef struct _LAUNCH_DATA_HEADER { - DWORD dwLaunchDataType; - DWORD dwTitleId; + dword_xt dwLaunchDataType; + dword_xt dwTitleId; char szLaunchPath[520]; - DWORD dwFlags; + dword_xt dwFlags; } LAUNCH_DATA_HEADER, *PLAUNCH_DATA_HEADER; @@ -1155,8 +1140,8 @@ LAUNCH_DATA_HEADER, *PLAUNCH_DATA_HEADER; typedef struct _LAUNCH_DATA_PAGE { LAUNCH_DATA_HEADER Header; - UCHAR Pad[492]; - UCHAR LaunchData[3072]; + uchar_xt Pad[492]; + uchar_xt LaunchData[3072]; } LAUNCH_DATA_PAGE, *PLAUNCH_DATA_PAGE; @@ -1165,11 +1150,11 @@ LAUNCH_DATA_PAGE, *PLAUNCH_DATA_PAGE; // ****************************************************************** typedef struct _DASH_LAUNCH_DATA { - DWORD dwReason; - DWORD dwContext; - DWORD dwParameter1; - DWORD dwParameter2; - BYTE Reserved[3072 - 16]; + dword_xt dwReason; + dword_xt dwContext; + dword_xt dwParameter1; + dword_xt dwParameter2; + byte_xt Reserved[3072 - 16]; } DASH_LAUNCH_DATA, *PDASH_LAUNCH_DATA; @@ -1183,16 +1168,16 @@ extern PVOID AvSavedDataAddress; // ****************************************************************** typedef struct _DISPATCHER_HEADER { - UCHAR Type; // 0x00 - UCHAR Absolute; // 0x01 - UCHAR Size; // 0x02 - UCHAR Inserted; // 0x03 - LONG SignalState; // 0x04 + uchar_xt Type; // 0x00 + uchar_xt Absolute; // 0x01 + uchar_xt Size; // 0x02 + uchar_xt Inserted; // 0x03 + long_xt SignalState; // 0x04 LIST_ENTRY WaitListHead; // 0x08 } DISPATCHER_HEADER; -typedef LONG KPRIORITY; +typedef long_xt KPRIORITY; // ****************************************************************** // * KEVENT @@ -1210,7 +1195,7 @@ KEVENT, *PKEVENT, *PRKEVENT; // even with undefined RESTRICTED_POINTER, this doe typedef struct _EVENT_BASIC_INFORMATION { EVENT_TYPE EventType; - LONG EventState; + long_xt EventState; } EVENT_BASIC_INFORMATION, *PEVENT_BASIC_INFORMATION; @@ -1220,7 +1205,7 @@ EVENT_BASIC_INFORMATION, *PEVENT_BASIC_INFORMATION; typedef struct _KSEMAPHORE { DISPATCHER_HEADER Header; // 0x00 - LONG Limit; // 0x10 + long_xt Limit; // 0x10 } // 0x14 KSEMAPHORE, *PKSEMAPHORE, *RESTRICTED_POINTER PRKSEMAPHORE; @@ -1229,8 +1214,8 @@ KSEMAPHORE, *PKSEMAPHORE, *RESTRICTED_POINTER PRKSEMAPHORE; // ****************************************************************** typedef struct _SEMAPHORE_BASIC_INFORMATION { - LONG CurrentCount; - LONG MaximumCount; + long_xt CurrentCount; + long_xt MaximumCount; } SEMAPHORE_BASIC_INFORMATION, *PSEMAPHORE_BASIC_INFORMATION; @@ -1239,9 +1224,9 @@ SEMAPHORE_BASIC_INFORMATION, *PSEMAPHORE_BASIC_INFORMATION; // ****************************************************************** typedef struct _MUTANT_BASIC_INFORMATION { - LONG CurrentCount; - BOOLEAN OwnedByCaller; - BOOLEAN AbandonedState; + long_xt CurrentCount; + boolean_xt OwnedByCaller; + boolean_xt AbandonedState; } MUTANT_BASIC_INFORMATION, *PMUTANT_BASIC_INFORMATION; @@ -1250,10 +1235,10 @@ MUTANT_BASIC_INFORMATION, *PMUTANT_BASIC_INFORMATION; // ****************************************************************** typedef struct _ERWLOCK { - LONG LockCount; // 0x00 - ULONG WritersWaitingCount; // 0x04 - ULONG ReadersWaitingCount; // 0x08 - ULONG ReadersEntryCount; // 0x0C + long_xt LockCount; // 0x00 + ulong_xt WritersWaitingCount; // 0x04 + ulong_xt ReadersWaitingCount; // 0x08 + ulong_xt ReadersEntryCount; // 0x0C KEVENT WriterEvent; // 0x10 KSEMAPHORE ReaderSemaphore; // 0x20 } // 0x34 @@ -1264,9 +1249,9 @@ ERWLOCK, *PERWLOCK; // ****************************************************************** typedef struct _KDEVICE_QUEUE { - CSHORT Type; // 0x00 - UCHAR Size; // 0x02 - BOOLEAN Busy; // 0x04 + cshort_xt Type; // 0x00 + uchar_xt Size; // 0x02 + boolean_xt Busy; // 0x04 LIST_ENTRY DeviceListHead; // 0x08 } KDEVICE_QUEUE, *PKDEVICE_QUEUE, *RESTRICTED_POINTER PRKDEVICE_QUEUE; @@ -1274,8 +1259,8 @@ KDEVICE_QUEUE, *PKDEVICE_QUEUE, *RESTRICTED_POINTER PRKDEVICE_QUEUE; typedef struct _KDEVICE_QUEUE_ENTRY { LIST_ENTRY DeviceListEntry; - ULONG SortKey; - BOOLEAN Inserted; + ulong_xt SortKey; + boolean_xt Inserted; } KDEVICE_QUEUE_ENTRY, *PKDEVICE_QUEUE_ENTRY, *RESTRICTED_POINTER PRKDEVICE_QUEUE_ENTRY; // ****************************************************************** @@ -1288,22 +1273,22 @@ typedef PVOID PFILE_SEGMENT_ELEMENT; // ****************************************************************** typedef struct _IRP { - CSHORT Type; // 0x00 - WORD Size; // 0x02 - ULONG Flags; // 0x04 + cshort_xt Type; // 0x00 + word_xt Size; // 0x02 + ulong_xt Flags; // 0x04 LIST_ENTRY ThreadListEntry; // 0x08 IO_STATUS_BLOCK IoStatus; // 0x10 - CHAR StackCount; // 0x18 - CHAR CurrentLocation; // 0x19 - UCHAR PendingReturned; // 0x1A - UCHAR Cancel; // 0x1B + char_xt StackCount; // 0x18 + char_xt CurrentLocation; // 0x19 + uchar_xt PendingReturned; // 0x1A + uchar_xt Cancel; // 0x1B PIO_STATUS_BLOCK UserIosb; // 0x1C PKEVENT UserEvent; // 0x20 - ULONGLONG Overlay; // 0x28 + ulonglong_xt Overlay; // 0x28 PVOID UserBuffer; // 0x30 PFILE_SEGMENT_ELEMENT SegmentArray; // 0x34 - ULONG LockedBufferLength; // 0x38 - ULONGLONG Tail; // 0x3C + ulong_xt LockedBufferLength; // 0x38 + ulonglong_xt Tail; // 0x3C } IRP, *PIRP; @@ -1312,30 +1297,30 @@ IRP, *PIRP; // ****************************************************************** typedef struct _DEVICE_OBJECT { - CSHORT Type; - USHORT Size; - LONG ReferenceCount; + cshort_xt Type; + ushort_xt Size; + long_xt ReferenceCount; struct _DRIVER_OBJECT *DriverObject; struct _DEVICE_OBJECT *MountedOrSelfDevice; PIRP CurrentIrp; - ULONG Flags; + ulong_xt Flags; PVOID DeviceExtension; - UCHAR DeviceType; - UCHAR StartIoFlags; - CCHAR StackSize; - BOOLEAN DeletePending; - ULONG SectorSize; - ULONG AlignmentRequirement; + uchar_xt DeviceType; + uchar_xt StartIoFlags; + cchar_xt StackSize; + boolean_xt DeletePending; + ulong_xt SectorSize; + ulong_xt AlignmentRequirement; KDEVICE_QUEUE DeviceQueue; KEVENT DeviceLock; - ULONG StartIoKey; + ulong_xt StartIoKey; } DEVICE_OBJECT, *PDEVICE_OBJECT; // ****************************************************************** // PDRIVER_OBJECT // ****************************************************************** -typedef VOID *PDRIVER_OBJECT; +typedef void_xt *PDRIVER_OBJECT; // ****************************************************************** // * IO_COMPLETION_CONTEXT @@ -1350,26 +1335,26 @@ typedef struct _IO_COMPLETION_CONTEXT // * FILE_OBJECT // ****************************************************************** typedef struct _FILE_OBJECT { - CSHORT Type; // 0x00 + cshort_xt Type; // 0x00 - BYTE DeletePending : 1; // 0x02 - BYTE ReadAccess : 1; // 0x02 - BYTE WriteAccess : 1; // 0x02 - BYTE DeleteAccess : 1; // 0x02 - BYTE SharedRead : 1; // 0x02 - BYTE SharedWrite : 1; // 0x02 - BYTE SharedDelete : 1; // 0x02 - BYTE Reserved : 1; // 0x02 + byte_xt DeletePending : 1; // 0x02 + byte_xt ReadAccess : 1; // 0x02 + byte_xt WriteAccess : 1; // 0x02 + byte_xt DeleteAccess : 1; // 0x02 + byte_xt SharedRead : 1; // 0x02 + byte_xt SharedWrite : 1; // 0x02 + byte_xt SharedDelete : 1; // 0x02 + byte_xt Reserved : 1; // 0x02 - BYTE Flags; // 0x03 + byte_xt Flags; // 0x03 PDEVICE_OBJECT DeviceObject; // 0x04 PVOID FsContext; // 0x08 PVOID FsContext2; // 0x0C - NTSTATUS FinalStatus; // 0x10 + ntstatus_xt FinalStatus; // 0x10 LARGE_INTEGER CurrentByteOffset; // 0x14 struct _FILE_OBJECT * RelatedFileObject; // 0x1C PIO_COMPLETION_CONTEXT CompletionContext; // 0x20 - LONG LockCount; // 0x24 + long_xt LockCount; // 0x24 KEVENT Lock; // 0x28 KEVENT Event; // 0x38 } FILE_OBJECT, *PFILE_OBJECT; @@ -1378,13 +1363,13 @@ typedef struct _FILE_OBJECT { // * SHARE_ACCESS // ****************************************************************** typedef struct _SHARE_ACCESS { - BYTE OpenCount; - BYTE Readers; - BYTE Writers; - BYTE Deleters; - BYTE SharedRead; - BYTE SharedWrite; - BYTE SharedDelete; + byte_xt OpenCount; + byte_xt Readers; + byte_xt Writers; + byte_xt Deleters; + byte_xt SharedRead; + byte_xt SharedWrite; + byte_xt SharedDelete; } SHARE_ACCESS, *PSHARE_ACCESS; // ****************************************************************** @@ -1406,14 +1391,14 @@ typedef struct _KTIMER ULARGE_INTEGER DueTime; // 0x10 LIST_ENTRY TimerListEntry; // 0x18 struct _KDPC *Dpc; // 0x20 - LONG Period; // 0x24 + long_xt Period; // 0x24 } KTIMER, *PKTIMER; // ****************************************************************** // * PKSTART_ROUTINE // ****************************************************************** -typedef VOID (NTAPI *PKSTART_ROUTINE) +typedef void_xt (NTAPI *PKSTART_ROUTINE) ( IN PVOID StartContext ); @@ -1429,7 +1414,7 @@ typedef VOID (NTAPI *PKSTART_ROUTINE) // * opposed to 1. // * // ****************************************************************** -typedef VOID (*PKSYSTEM_ROUTINE) +typedef void_xt (*PKSYSTEM_ROUTINE) ( IN PKSTART_ROUTINE StartRoutine OPTIONAL, IN PVOID StartContext OPTIONAL @@ -1440,7 +1425,7 @@ struct _KDPC; // ****************************************************************** // * PKDEFERRED_ROUTINE // ****************************************************************** -typedef VOID (__stdcall *PKDEFERRED_ROUTINE) +typedef void_xt (__stdcall *PKDEFERRED_ROUTINE) ( IN struct _KDPC *Dpc, IN PVOID DeferredContext, @@ -1453,13 +1438,13 @@ typedef VOID (__stdcall *PKDEFERRED_ROUTINE) // ****************************************************************** typedef struct _KDPC { - CSHORT Type; // 0x00 + cshort_xt Type; // 0x00 union { - UCHAR Number; // 0x02 - BOOLEAN Inserted; // 0x02 + uchar_xt Number; // 0x02 + boolean_xt Inserted; // 0x02 }; - UCHAR Importance; // 0x03 + uchar_xt Importance; // 0x03 LIST_ENTRY DpcListEntry; // 0x04 PKDEFERRED_ROUTINE DeferredRoutine; // 0x0C PVOID DeferredContext; @@ -1485,15 +1470,15 @@ DPC_QUEUE_ENTRY, *PDPC_QUEUE_ENTRY; // See NtDll::FLOATING_SAVE_AREA typedef struct _KFLOATING_SAVE { - ULONG ControlWord; - ULONG StatusWord; - // NtDll contains ULONG TagWord here - ULONG ErrorOffset; - ULONG ErrorSelector; - ULONG DataOffset; - ULONG DataSelector; - ULONG Cr0NpxState; // NtDll has RegisterArea[SIZE_OF_80387_REGISTERS]; - ULONG Spare1; // NtDll calls this Spare0 + ulong_xt ControlWord; + ulong_xt StatusWord; + // NtDll contains ulong_xt TagWord here + ulong_xt ErrorOffset; + ulong_xt ErrorSelector; + ulong_xt DataOffset; + ulong_xt DataSelector; + ulong_xt Cr0NpxState; // NtDll has RegisterArea[SIZE_OF_80387_REGISTERS]; + ulong_xt Spare1; // NtDll calls this Spare0 } KFLOATING_SAVE, *PKFLOATING_SAVE; @@ -1519,7 +1504,7 @@ KOBJECTS, *PKOBJECTS; // ****************************************************************** // * PKNORMAL_ROUTINE // ****************************************************************** -typedef VOID (*PKNORMAL_ROUTINE) +typedef void_xt (*PKNORMAL_ROUTINE) ( IN PVOID NormalContext, IN PVOID SystemArgument1, @@ -1529,7 +1514,7 @@ typedef VOID (*PKNORMAL_ROUTINE) // ****************************************************************** // * PKKERNEL_ROUTINE // ****************************************************************** -typedef VOID (*PKKERNEL_ROUTINE) +typedef void_xt (*PKKERNEL_ROUTINE) ( IN struct _KAPC *Apc, IN OUT PKNORMAL_ROUTINE *NormalRoutine, @@ -1541,7 +1526,7 @@ typedef VOID (*PKKERNEL_ROUTINE) // ****************************************************************** // * PKRUNDOWN_ROUTINE // ****************************************************************** -typedef VOID (*PKRUNDOWN_ROUTINE) +typedef void_xt (*PKRUNDOWN_ROUTINE) ( IN struct _KAPC *Apc ); @@ -1549,7 +1534,7 @@ typedef VOID (*PKRUNDOWN_ROUTINE) // ****************************************************************** // * PKSYNCHRONIZE_ROUTINE // ****************************************************************** -typedef BOOLEAN (*PKSYNCHRONIZE_ROUTINE) +typedef boolean_xt (*PKSYNCHRONIZE_ROUTINE) ( IN PVOID SynchronizeContext ); @@ -1557,7 +1542,7 @@ typedef BOOLEAN (*PKSYNCHRONIZE_ROUTINE) // ****************************************************************** // * PKSERVICE_ROUTINE // ****************************************************************** -typedef BOOLEAN (*PKSERVICE_ROUTINE) +typedef boolean_xt (*PKSERVICE_ROUTINE) ( IN struct _KINTERRUPT *Interrupt, IN PVOID ServiceContext @@ -1604,29 +1589,29 @@ typedef struct _KINTERRUPT { /* 0x00= 0 */ PKSERVICE_ROUTINE ServiceRoutine; /* 0x04= 4 */ PVOID ServiceContext; - /* 0x08= 8 */ ULONG BusInterruptLevel; - /* 0x0C=12 */ ULONG Irql; // Was : unsigned char KIRQL; unsigned char PaddingA[0x03]; - /* 0x10=16 */ BOOLEAN Connected; - /* 0x11=17 */ BOOLEAN ShareVector; + /* 0x08= 8 */ ulong_xt BusInterruptLevel; + /* 0x0C=12 */ ulong_xt Irql; // Was : unsigned char KIRQL; unsigned char PaddingA[0x03]; + /* 0x10=16 */ boolean_xt Connected; + /* 0x11=17 */ boolean_xt ShareVector; /* 0x12=18 */ KINTERRUPT_MODE Mode; - /* 0x14=20 */ ULONG ServiceCount; - /* 0x18=24 */ ULONG DispatchCode[DISPATCH_SIZE]; // Same as old : unsigned char ISR[0x58]; + /* 0x14=20 */ ulong_xt ServiceCount; + /* 0x18=24 */ ulong_xt DispatchCode[DISPATCH_SIZE]; // Same as old : unsigned char ISR[0x58]; } KINTERRUPT, *PKINTERRUPT; // ****************************************************************** // * IRQL (Interrupt ReQuest Level) (* same as on win *) // ****************************************************************** -typedef UCHAR KIRQL, *PKIRQL; +typedef uchar_xt KIRQL, *PKIRQL; // ****************************************************************** // * PS_STATISTICS // ****************************************************************** typedef struct _PS_STATISTICS { - ULONG Length; - ULONG ThreadCount; - ULONG HandleCount; + ulong_xt Length; + ulong_xt ThreadCount; + ulong_xt HandleCount; } PS_STATISTICS, *PPS_STATISTICS; @@ -1636,8 +1621,8 @@ PS_STATISTICS, *PPS_STATISTICS; typedef struct _RTL_CRITICAL_SECTION { DISPATCHER_HEADER Event; // 0x00 - LONG LockCount; // 0x10 - LONG RecursionCount; // 0x14 + long_xt LockCount; // 0x10 + long_xt RecursionCount; // 0x14 HANDLE OwningThread; // 0x18 } RTL_CRITICAL_SECTION, *PRTL_CRITICAL_SECTION; @@ -1654,7 +1639,7 @@ typedef struct _NT_TIB union { PVOID FiberData; // 0x10 for TIB - ULONG Version; // 0x10 for TEB (?) + ulong_xt Version; // 0x10 for TEB (?) } u_a; PVOID ArbitraryUserPointer; // 0x14 @@ -1664,30 +1649,30 @@ NT_TIB, *PNT_TIB; // typedef struct _KGDTENTRY // { -// WORD LimitLow; -// WORD BaseLow; -// ULONG HighWord; +// word_xt LimitLow; +// word_xt BaseLow; +// ulong_xt HighWord; // } // KGDTENTRY, *PKGDTENTRY; // // typedef struct _KIDTENTRY // { -// WORD Offset; -// WORD Selector; -// WORD Access; -// WORD ExtendedOffset; +// word_xt Offset; +// word_xt Selector; +// word_xt Access; +// word_xt ExtendedOffset; // } // KIDTENTRY, *PKIDTENTRY; // // typedef struct _KEXECUTE_OPTIONS // { -// ULONG ExecuteDisable: 1; -// ULONG ExecuteEnable: 1; -// ULONG DisableThunkEmulation: 1; -// ULONG Permanent: 1; -// ULONG ExecuteDispatchEnable: 1; -// ULONG ImageDispatchEnable: 1; -// ULONG Spare: 2; +// ulong_xt ExecuteDisable: 1; +// ulong_xt ExecuteEnable: 1; +// ulong_xt DisableThunkEmulation: 1; +// ulong_xt Permanent: 1; +// ulong_xt ExecuteDispatchEnable: 1; +// ulong_xt ImageDispatchEnable: 1; +// ulong_xt Spare: 2; // } // KEXECUTE_OPTIONS, *PKEXECUTE_OPTIONS; @@ -1698,12 +1683,12 @@ typedef struct _KPROCESS { /* 0x0/0 */ LIST_ENTRY ReadyListHead; /* 0x8/8 */ LIST_ENTRY ThreadListHead; - /* 0x10/16 */ ULONG StackCount; - /* 0x14/20 */ ULONG ThreadQuantum; - /* 0x18/24 */ CHAR BasePriority; - /* 0x19/25 */ CHAR DisableBoost; - /* 0x1A/26 */ CHAR DisableQuantum; - /* 0x1B/27 */ CHAR _padding; + /* 0x10/16 */ ulong_xt StackCount; + /* 0x14/20 */ ulong_xt ThreadQuantum; + /* 0x18/24 */ char_xt BasePriority; + /* 0x19/25 */ char_xt DisableBoost; + /* 0x1A/26 */ char_xt DisableQuantum; + /* 0x1B/27 */ char_xt _padding; } KPROCESS, *PKPROCESS; @@ -1714,10 +1699,10 @@ typedef struct _KAPC_STATE { LIST_ENTRY ApcListHead[2]; PKPROCESS Process; - UCHAR KernelApcInProgress; - UCHAR KernelApcPending; - UCHAR UserApcPending; - UCHAR ApcQueueable; + uchar_xt KernelApcInProgress; + uchar_xt KernelApcPending; + uchar_xt UserApcPending; + uchar_xt ApcQueueable; } KAPC_STATE, *PKAPC_STATE; @@ -1737,7 +1722,7 @@ typedef struct _KMUTANT { DISPATCHER_HEADER Header; LIST_ENTRY MutantListEntry; struct _KTHREAD *RESTRICTED_POINTER OwnerThread; - BOOLEAN Abandoned; + boolean_xt Abandoned; } KMUTANT, *PKMUTANT, *RESTRICTED_POINTER PRKMUTANT; // ****************************************************************** @@ -1747,8 +1732,8 @@ typedef struct _KQUEUE { DISPATCHER_HEADER Header; LIST_ENTRY EntryListHead; - ULONG CurrentCount; - ULONG MaximumCount; + ulong_xt CurrentCount; + ulong_xt MaximumCount; LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; @@ -1780,43 +1765,43 @@ EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; // ****************************************************************** typedef struct _KTRAP_FRAME { - ULONG DbgEbp; - ULONG DbgEip; - ULONG DbgArgMark; - ULONG DbgArgPointer; - WORD TempSegCs; - UCHAR Logging; - UCHAR Reserved; - ULONG TempEsp; - ULONG Dr0; - ULONG Dr1; - ULONG Dr2; - ULONG Dr3; - ULONG Dr6; - ULONG Dr7; - ULONG SegGs; - ULONG SegEs; - ULONG SegDs; - ULONG Edx; - ULONG Ecx; - ULONG Eax; - ULONG PreviousPreviousMode; + ulong_xt DbgEbp; + ulong_xt DbgEip; + ulong_xt DbgArgMark; + ulong_xt DbgArgPointer; + word_xt TempSegCs; + uchar_xt Logging; + uchar_xt Reserved; + ulong_xt TempEsp; + ulong_xt Dr0; + ulong_xt Dr1; + ulong_xt Dr2; + ulong_xt Dr3; + ulong_xt Dr6; + ulong_xt Dr7; + ulong_xt SegGs; + ulong_xt SegEs; + ulong_xt SegDs; + ulong_xt Edx; + ulong_xt Ecx; + ulong_xt Eax; + ulong_xt PreviousPreviousMode; PEXCEPTION_REGISTRATION_RECORD ExceptionList; - ULONG SegFs; - ULONG Edi; - ULONG Esi; - ULONG Ebx; - ULONG Ebp; - ULONG ErrCode; - ULONG Eip; - ULONG SegCs; - ULONG EFlags; - ULONG HardwareEsp; - ULONG HardwareSegSs; - ULONG V86Es; - ULONG V86Ds; - ULONG V86Fs; - ULONG V86Gs; + ulong_xt SegFs; + ulong_xt Edi; + ulong_xt Esi; + ulong_xt Ebx; + ulong_xt Ebp; + ulong_xt ErrCode; + ulong_xt Eip; + ulong_xt SegCs; + ulong_xt EFlags; + ulong_xt HardwareEsp; + ulong_xt HardwareSegSs; + ulong_xt V86Es; + ulong_xt V86Ds; + ulong_xt V86Fs; + ulong_xt V86Gs; } KTRAP_FRAME, *PKTRAP_FRAME; @@ -1832,9 +1817,9 @@ typedef struct _KWAIT_BLOCK PKTHREAD Thread; PVOID Object; struct _KWAIT_BLOCK *NextWaitBlock; - WORD WaitKey; - UCHAR WaitType; - UCHAR SpareByte; + word_xt WaitKey; + uchar_xt WaitType; + uchar_xt SpareByte; } KWAIT_BLOCK, *PKWAIT_BLOCK; @@ -1843,9 +1828,9 @@ KWAIT_BLOCK, *PKWAIT_BLOCK; // ****************************************************************** typedef struct _KAPC { - /* 0x0/0 */ USHORT Type; + /* 0x0/0 */ ushort_xt Type; /* 0x2/2 */ KPROCESSOR_MODE ApcMode; - /* 0x3/3 */ BOOLEAN Inserted; + /* 0x3/3 */ boolean_xt Inserted; /* 0x4/4 */ PKTHREAD Thread; /* 0x8/8 */ LIST_ENTRY ApcListEntry; /* 0x10/16 */ PKKERNEL_ROUTINE KernelRoutine; @@ -1873,42 +1858,42 @@ typedef struct _KTHREAD /* 0x20/32 */ void *StackLimit; /* 0x24/36 */ void *KernelStack; /* 0x28/40 */ void *TlsData; - /* 0x2C/44 */ CHAR State; - /* 0x2D/45 */ CHAR Alerted[2]; - /* 0x2F/47 */ CHAR Alertable; - /* 0x30/48 */ CHAR NpxState; - /* 0x31/49 */ CHAR Saturation; - /* 0x32/50 */ CHAR Priority; - /* 0x33/51 */ CHAR Padding; + /* 0x2C/44 */ char_xt State; + /* 0x2D/45 */ char_xt Alerted[2]; + /* 0x2F/47 */ char_xt Alertable; + /* 0x30/48 */ char_xt NpxState; + /* 0x31/49 */ char_xt Saturation; + /* 0x32/50 */ char_xt Priority; + /* 0x33/51 */ char_xt Padding; /* 0x34/52 */ KAPC_STATE ApcState; - /* 0x4C/76 */ ULONG ContextSwitches; - /* 0x50/80 */ ULONG WaitStatus; - /* 0x54/84 */ CHAR WaitIrql; - /* 0x55/85 */ CHAR WaitMode; - /* 0x56/86 */ CHAR WaitNext; - /* 0x57/87 */ CHAR WaitReason; + /* 0x4C/76 */ ulong_xt ContextSwitches; + /* 0x50/80 */ ulong_xt WaitStatus; + /* 0x54/84 */ char_xt WaitIrql; + /* 0x55/85 */ char_xt WaitMode; + /* 0x56/86 */ char_xt WaitNext; + /* 0x57/87 */ char_xt WaitReason; /* 0x58/88 */ PKWAIT_BLOCK WaitBlockList; /* 0x5C/92 */ LIST_ENTRY WaitListEntry; - /* 0x64/100 */ ULONG WaitTime; - /* 0x68/104 */ ULONG KernelApcDisable; - /* 0x6C/108 */ ULONG Quantum; - /* 0x70/112 */ CHAR BasePriority; - /* 0x71/113 */ CHAR DecrementCount; - /* 0x72/114 */ CHAR PriorityDecrement; - /* 0x73/115 */ CHAR DisableBoost; - /* 0x74/116 */ CHAR NpxIrql; - /* 0x75/117 */ CHAR SuspendCount; - /* 0x76/118 */ CHAR Preempted; - /* 0x77/119 */ CHAR HasTerminated; + /* 0x64/100 */ ulong_xt WaitTime; + /* 0x68/104 */ ulong_xt KernelApcDisable; + /* 0x6C/108 */ ulong_xt Quantum; + /* 0x70/112 */ char_xt BasePriority; + /* 0x71/113 */ char_xt DecrementCount; + /* 0x72/114 */ char_xt PriorityDecrement; + /* 0x73/115 */ char_xt DisableBoost; + /* 0x74/116 */ char_xt NpxIrql; + /* 0x75/117 */ char_xt SuspendCount; + /* 0x76/118 */ char_xt Preempted; + /* 0x77/119 */ char_xt HasTerminated; /* 0x78/120 */ PVOID Queue; /* 0x7C/124 */ LIST_ENTRY QueueListEntry; - /* 0x88/136 */ UCHAR rsvd1[4]; + /* 0x88/136 */ uchar_xt rsvd1[4]; /* 0x88/136 */ KTIMER Timer; /* 0xB0/176 */ KWAIT_BLOCK TimerWaitBlock; /* 0xC8/200 */ KAPC SuspendApc; /* 0xF0/240 */ KSEMAPHORE SuspendSemaphore; /* 0x104/260 */ LIST_ENTRY ThreadListEntry; - /* 0x10C/268 */ UCHAR _padding[4]; + /* 0x10C/268 */ uchar_xt _padding[4]; } KTHREAD, *PKTHREAD, *RESTRICTED_POINTER PRKTHREAD; @@ -1922,19 +1907,19 @@ KTHREAD, *PKTHREAD, *RESTRICTED_POINTER PRKTHREAD; typedef struct _ETHREAD { struct _KTHREAD Tcb; - UCHAR UnknownA[0x1C]; // 0x110 - DWORD UniqueThread; // 0x12C + uchar_xt UnknownA[0x1C]; // 0x110 + dword_xt UniqueThread; // 0x12C } ETHREAD, *PETHREAD; // ****************************************************************** // * PCREATE_THREAD_NOTIFY_ROUTINE // ****************************************************************** -typedef VOID(*PCREATE_THREAD_NOTIFY_ROUTINE) +typedef void_xt(*PCREATE_THREAD_NOTIFY_ROUTINE) ( IN PETHREAD Thread, IN HANDLE ThreadId, - IN BOOLEAN Create + IN boolean_xt Create ); // ****************************************************************** @@ -1950,13 +1935,13 @@ typedef struct _KPRCB struct _KTHREAD* NextThread; // 0x04, KPCR : 0x2C struct _KTHREAD* IdleThread; // 0x08, KPCR : 0x30 - ULONG Unknown1[7]; // 0x0C, KPCR : 0x34 + ulong_xt Unknown1[7]; // 0x0C, KPCR : 0x34 LIST_ENTRY DpcListHead; // 0x28, KPCR : 0x50 - ULONG DpcRoutineActive; // 0x30, KPCR : 0x58 + ulong_xt DpcRoutineActive; // 0x30, KPCR : 0x58 // This completes the total size of the structure (presumably) - UCHAR Unknown[0x224]; + uchar_xt Unknown[0x224]; } KPRCB, *PKPRCB; @@ -1973,7 +1958,7 @@ typedef struct _KPCR struct _NT_TIB NtTib; // 0x00 struct _KPCR *SelfPcr; // 0x1C struct _KPRCB *Prcb; // 0x20 - UCHAR Irql; // 0x24 + uchar_xt Irql; // 0x24 struct _KPRCB PrcbData; // 0x28 } KPCR, *PKPCR; @@ -2022,27 +2007,27 @@ XC_VALUE_INDEX, *PXC_VALUE_INDEX; // ****************************************************************** typedef struct _XBOX_HARDWARE_INFO { - ULONG Flags; - UCHAR GpuRevision; - UCHAR McpRevision; - UCHAR Unknown3; - UCHAR Unknown4; + ulong_xt Flags; + uchar_xt GpuRevision; + uchar_xt McpRevision; + uchar_xt Unknown3; + uchar_xt Unknown4; } XBOX_HARDWARE_INFO; const int XBOX_KEY_LENGTH = 16; const int ALTERNATE_SIGNATURE_COUNT = 16; -typedef UCHAR XBOX_KEY_DATA[XBOX_KEY_LENGTH]; +typedef uchar_xt XBOX_KEY_DATA[XBOX_KEY_LENGTH]; // ****************************************************************** // * XBOX_ENCRYPTED_SETTINGS // ****************************************************************** typedef struct _XBOX_ENCRYPTED_SETTINGS { - UCHAR Checksum[20]; - UCHAR Confounder[8]; - UCHAR HDKey[XBOX_KEY_LENGTH]; - ULONG GameRegion; + uchar_xt Checksum[20]; + uchar_xt Confounder[8]; + uchar_xt HDKey[XBOX_KEY_LENGTH]; + ulong_xt GameRegion; } XBOX_ENCRYPTED_SETTINGS; @@ -2051,13 +2036,13 @@ XBOX_ENCRYPTED_SETTINGS; // ****************************************************************** typedef struct _XBOX_FACTORY_SETTINGS { - ULONG Checksum; - UCHAR SerialNumber[12]; - UCHAR EthernetAddr[6]; - UCHAR Reserved1[2]; - UCHAR OnlineKey[16]; - ULONG AVRegion; - ULONG Reserved2; + ulong_xt Checksum; + uchar_xt SerialNumber[12]; + uchar_xt EthernetAddr[6]; + uchar_xt Reserved1[2]; + uchar_xt OnlineKey[16]; + ulong_xt AVRegion; + ulong_xt Reserved2; } XBOX_FACTORY_SETTINGS; @@ -2066,10 +2051,10 @@ XBOX_FACTORY_SETTINGS; // ****************************************************************** typedef struct _XBOX_TIMEZONE_DATE { - UCHAR Month; - UCHAR Day; - UCHAR DayOfWeek; - UCHAR Hour; + uchar_xt Month; + uchar_xt Day; + uchar_xt DayOfWeek; + uchar_xt Hour; } XBOX_TIMEZONE_DATE; @@ -2079,28 +2064,28 @@ XBOX_TIMEZONE_DATE; #define TIME_ZONE_NAME_LENGTH 4 typedef struct _XBOX_USER_SETTINGS { - ULONG Checksum; - LONG TimeZoneBias; - CHAR TimeZoneStdName[TIME_ZONE_NAME_LENGTH]; - CHAR TimeZoneDltName[TIME_ZONE_NAME_LENGTH]; - ULONG Reserved1[2]; + ulong_xt Checksum; + long_xt TimeZoneBias; + char_xt TimeZoneStdName[TIME_ZONE_NAME_LENGTH]; + char_xt TimeZoneDltName[TIME_ZONE_NAME_LENGTH]; + ulong_xt Reserved1[2]; XBOX_TIMEZONE_DATE TimeZoneStdDate; XBOX_TIMEZONE_DATE TimeZoneDltDate; - ULONG Reserved2[2]; - LONG TimeZoneStdBias; - LONG TimeZoneDltBias; - ULONG Language; - ULONG VideoFlags; - ULONG AudioFlags; - ULONG ParentalControlGames; - ULONG ParentalControlPassword; - ULONG ParentalControlMovies; - ULONG OnlineIpAddress; - ULONG OnlineDnsAddress; - ULONG OnlineDefaultGatewayAddress; - ULONG OnlineSubnetMask; - ULONG MiscFlags; - ULONG DvdRegion; + ulong_xt Reserved2[2]; + long_xt TimeZoneStdBias; + long_xt TimeZoneDltBias; + ulong_xt Language; + ulong_xt VideoFlags; + ulong_xt AudioFlags; + ulong_xt ParentalControlGames; + ulong_xt ParentalControlPassword; + ulong_xt ParentalControlMovies; + ulong_xt OnlineIpAddress; + ulong_xt OnlineDnsAddress; + ulong_xt OnlineDefaultGatewayAddress; + ulong_xt OnlineSubnetMask; + ulong_xt MiscFlags; + ulong_xt DvdRegion; } XBOX_USER_SETTINGS; @@ -2112,9 +2097,9 @@ typedef struct _XBOX_EEPROM XBOX_ENCRYPTED_SETTINGS EncryptedSettings; XBOX_FACTORY_SETTINGS FactorySettings; XBOX_USER_SETTINGS UserSettings; - UCHAR Unused[58]; - UCHAR UEMInfo[4]; - UCHAR Reserved1[2]; + uchar_xt Unused[58]; + uchar_xt UEMInfo[4]; + uchar_xt Reserved1[2]; } XBOX_EEPROM; @@ -2123,9 +2108,9 @@ XBOX_EEPROM; // ****************************************************************** typedef struct _XBOX_UEM_INFO { - UCHAR ErrorCode; - UCHAR Unused; - USHORT History; + uchar_xt ErrorCode; + uchar_xt Unused; + ushort_xt History; } XBOX_UEM_INFO; @@ -2161,14 +2146,14 @@ XBOX_UEM_INFO; // ****************************************************************** typedef struct _TIME_FIELDS { - USHORT Year; - USHORT Month; - USHORT Day; - USHORT Hour; - USHORT Minute; - USHORT Second; - USHORT Millisecond; - USHORT Weekday; + ushort_xt Year; + ushort_xt Month; + ushort_xt Day; + ushort_xt Hour; + ushort_xt Minute; + ushort_xt Second; + ushort_xt Millisecond; + ushort_xt Weekday; } TIME_FIELDS, *PTIME_FIELDS; @@ -2183,11 +2168,11 @@ KINTERRUPT_POLARITY; typedef struct _OWNER_ENTRY { - ULONG OwnerThread; + ulong_xt OwnerThread; union { - LONG OwnerCount; - ULONG TableSize; + long_xt OwnerCount; + ulong_xt TableSize; }; } OWNER_ENTRY, *POWNER_ENTRY; @@ -2196,21 +2181,21 @@ typedef struct _ERESOURCE { LIST_ENTRY SystemResourcesList; POWNER_ENTRY OwnerTable; - SHORT ActiveCount; - WORD Flag; + short_xt ActiveCount; + word_xt Flag; PKSEMAPHORE SharedWaiters; PKEVENT ExclusiveWaiters; OWNER_ENTRY OwnerEntry; - ULONG ActiveEntries; - ULONG ContentionCount; - ULONG NumberOfSharedWaiters; - ULONG NumberOfExclusiveWaiters; + ulong_xt ActiveEntries; + ulong_xt ContentionCount; + ulong_xt NumberOfSharedWaiters; + ulong_xt NumberOfExclusiveWaiters; union { PVOID Address; - ULONG CreatorBackTraceIndex; + ulong_xt CreatorBackTraceIndex; }; - ULONG SpinLock; + ulong_xt SpinLock; } ERESOURCE, *PERESOURCE; @@ -2236,38 +2221,38 @@ POOL_TYPE; typedef struct _GENERIC_MAPPING { - ULONG GenericRead; - ULONG GenericWrite; - ULONG GenericExecute; - ULONG GenericAll; + ulong_xt GenericRead; + ulong_xt GenericWrite; + ulong_xt GenericExecute; + ulong_xt GenericAll; } GENERIC_MAPPING, *PGENERIC_MAPPING; typedef struct _OBJECT_TYPE_INITIALIZER { - WORD Length; - UCHAR ObjectTypeFlags; - ULONG CaseInsensitive: 1; - ULONG UnnamedObjectsOnly: 1; - ULONG UseDefaultObject: 1; - ULONG SecurityRequired: 1; - ULONG MaintainHandleCount: 1; - ULONG MaintainTypeList: 1; - ULONG ObjectTypeCode; - ULONG InvalidAttributes; + word_xt Length; + uchar_xt ObjectTypeFlags; + ulong_xt CaseInsensitive: 1; + ulong_xt UnnamedObjectsOnly: 1; + ulong_xt UseDefaultObject: 1; + ulong_xt SecurityRequired: 1; + ulong_xt MaintainHandleCount: 1; + ulong_xt MaintainTypeList: 1; + ulong_xt ObjectTypeCode; + ulong_xt InvalidAttributes; GENERIC_MAPPING GenericMapping; - ULONG ValidAccessMask; + ulong_xt ValidAccessMask; POOL_TYPE PoolType; - ULONG DefaultPagedPoolCharge; - ULONG DefaultNonPagedPoolCharge; + ulong_xt DefaultPagedPoolCharge; + ulong_xt DefaultNonPagedPoolCharge; PVOID DumpProcedure; - LONG * OpenProcedure; + long_xt * OpenProcedure; PVOID CloseProcedure; PVOID DeleteProcedure; - LONG * ParseProcedure; - LONG * SecurityProcedure; - LONG * QueryNameProcedure; - UCHAR * OkayToCloseProcedure; + long_xt * ParseProcedure; + long_xt * SecurityProcedure; + long_xt * QueryNameProcedure; + uchar_xt * OkayToCloseProcedure; } OBJECT_TYPE_INITIALIZER, *POBJECT_TYPE_INITIALIZER; @@ -2275,12 +2260,12 @@ typedef struct _EX_PUSH_LOCK { union { - ULONG Locked: 1; - ULONG Waiting: 1; - ULONG Waking: 1; - ULONG MultipleShared: 1; - ULONG Shared: 28; - ULONG Value; + ulong_xt Locked: 1; + ulong_xt Waiting: 1; + ulong_xt Waking: 1; + ulong_xt MultipleShared: 1; + ulong_xt Shared: 28; + ulong_xt Value; PVOID Ptr; }; } @@ -2292,13 +2277,13 @@ typedef struct _OBJECT_TYPE LIST_ENTRY TypeList; UNICODE_STRING Name; PVOID DefaultObject; - ULONG Index; - ULONG TotalNumberOfObjects; - ULONG TotalNumberOfHandles; - ULONG HighWaterNumberOfObjects; - ULONG HighWaterNumberOfHandles; + ulong_xt Index; + ulong_xt TotalNumberOfObjects; + ulong_xt TotalNumberOfHandles; + ulong_xt HighWaterNumberOfObjects; + ulong_xt HighWaterNumberOfHandles; OBJECT_TYPE_INITIALIZER TypeInfo; - ULONG Key; + ulong_xt Key; EX_PUSH_LOCK ObjectLocks[32]; } OBJECT_TYPE, *POBJECT_TYPE; @@ -2311,9 +2296,9 @@ OBJECT_TYPE, *POBJECT_TYPE; // * Use this to access I/O mapped memory. Just a good standard. // * // ****************************************************************** -INLINE static UCHAR READ_REGISTER_UCHAR(PUCHAR Address) +INLINE static uchar_xt READ_REGISTER_UCHAR(PUCHAR Address) { - return *(volatile UCHAR *)Address; + return *(volatile uchar_xt *)Address; } // ****************************************************************** @@ -2323,9 +2308,9 @@ INLINE static UCHAR READ_REGISTER_UCHAR(PUCHAR Address) // * Use this to access I/O mapped memory. Just a good standard. // * // ****************************************************************** -INLINE static USHORT READ_REGISTER_USHORT(PUSHORT Address) +INLINE static ushort_xt READ_REGISTER_USHORT(PUSHORT Address) { - return *(volatile USHORT *)Address; + return *(volatile ushort_xt *)Address; } // ****************************************************************** @@ -2335,9 +2320,9 @@ INLINE static USHORT READ_REGISTER_USHORT(PUSHORT Address) // * Use this to access I/O mapped memory. Just a good standard. // * // ****************************************************************** -INLINE static ULONG READ_REGISTER_ULONG(PULONG Address) +INLINE static ulong_xt READ_REGISTER_ULONG(PULONG Address) { - return *(volatile ULONG *)Address; + return *(volatile ulong_xt *)Address; } // ****************************************************************** @@ -2349,7 +2334,7 @@ INLINE static ULONG READ_REGISTER_ULONG(PULONG Address) // * because the write may not be completed yet.) // * // ****************************************************************** -static VOID WRITE_REGISTER_UCHAR(PVOID Address, UCHAR Value) +static void_xt WRITE_REGISTER_UCHAR(PVOID Address, uchar_xt Value) { __asm { @@ -2369,7 +2354,7 @@ static VOID WRITE_REGISTER_UCHAR(PVOID Address, UCHAR Value) // * because the write may not be completed yet.) // * // ****************************************************************** -static VOID WRITE_REGISTER_USHORT(PVOID Address, USHORT Value) +static void_xt WRITE_REGISTER_USHORT(PVOID Address, ushort_xt Value) { __asm { @@ -2389,7 +2374,7 @@ static VOID WRITE_REGISTER_USHORT(PVOID Address, USHORT Value) // * because the write may not be completed yet.) // * // ****************************************************************** -static VOID WRITE_REGISTER_ULONG(PVOID Address, ULONG Value) +static void_xt WRITE_REGISTER_ULONG(PVOID Address, ulong_xt Value) { __asm { @@ -2404,42 +2389,42 @@ static VOID WRITE_REGISTER_ULONG(PVOID Address, ULONG Value) // * SCSI_PASS_THROUGH_DIRECT // ****************************************************************** typedef struct _SCSI_PASS_THROUGH_DIRECT { - USHORT Length; - UCHAR ScsiStatus; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - UCHAR CdbLength; - UCHAR SenseInfoLength; - UCHAR DataIn; - ULONG DataTransferLength; - ULONG TimeOutValue; + ushort_xt Length; + uchar_xt ScsiStatus; + uchar_xt PathId; + uchar_xt TargetId; + uchar_xt Lun; + uchar_xt CdbLength; + uchar_xt SenseInfoLength; + uchar_xt DataIn; + ulong_xt DataTransferLength; + ulong_xt TimeOutValue; PVOID DataBuffer; - ULONG SenseInfoOffset; - UCHAR Cdb[16]; + ulong_xt SenseInfoOffset; + uchar_xt Cdb[16]; }SCSI_PASS_THROUGH_DIRECT, *PSCSI_PASS_THROUGH_DIRECT; // ****************************************************************** // * MODE_PARAMETER_HEADER10 // ****************************************************************** typedef struct _MODE_PARAMETER_HEADER10 { - UCHAR ModeDataLength[2]; - UCHAR MediumType; - UCHAR DeviceSpecificParameter; - UCHAR Reserved[2]; - UCHAR BlockDescriptorLength[2]; + uchar_xt ModeDataLength[2]; + uchar_xt MediumType; + uchar_xt DeviceSpecificParameter; + uchar_xt Reserved[2]; + uchar_xt BlockDescriptorLength[2]; }MODE_PARAMETER_HEADER10, *PMODE_PARAMETER_HEADER10; // ****************************************************************** // * DVDX2_AUTHENTICATION_PAGE // ****************************************************************** typedef struct _DVDX2_AUTHENTICATION_PAGE { - UCHAR Unknown[2]; - UCHAR PartitionArea; - UCHAR CDFValid; - UCHAR Authentication; - UCHAR Unknown2[3]; - ULONG Unknown3[3]; + uchar_xt Unknown[2]; + uchar_xt PartitionArea; + uchar_xt CDFValid; + uchar_xt Authentication; + uchar_xt Unknown2[3]; + ulong_xt Unknown3[3]; } DVDX2_AUTHENTICATION_PAGE, *PDVDX2_AUTHENTICATION_PAGE; // ****************************************************************** @@ -2457,16 +2442,16 @@ typedef struct _DVDX2_AUTHENTICATION { // See Xbe.h struct SectionHeader typedef struct _XBE_SECTION // Was _XBE_SECTIONHEADER { - ULONG Flags; + ulong_xt Flags; PVOID VirtualAddress; // Virtual address (where this section loads in RAM) - ULONG VirtualSize; // Virtual size (size of section in RAM; after FileSize it's 00'd) - ULONG FileAddress; // File address (where in the file from which this section comes) - ULONG FileSize; // File size (size of the section in the XBE file) + ulong_xt VirtualSize; // Virtual size (size of section in RAM; after FileSize it's 00'd) + ulong_xt FileAddress; // File address (where in the file from which this section comes) + ulong_xt FileSize; // File size (size of the section in the XBE file) PCSZ SectionName; // Pointer to section name - ULONG SectionReferenceCount; // Section reference count - when >= 1, section is loaded + ulong_xt SectionReferenceCount; // Section reference count - when >= 1, section is loaded PUSHORT HeadReferenceCount; // Pointer to head shared page reference counter PUSHORT TailReferenceCount; // Pointer to tail shared page reference counter - BYTE ShaHash[20]; // SHA hash. Hash DWORD containing FileSize, then hash section. + byte_xt ShaHash[20]; // SHA hash. Hash dword_xt containing FileSize, then hash section. } XBEIMAGE_SECTION, *PXBEIMAGE_SECTION; @@ -2503,69 +2488,69 @@ typedef enum _MEDIA_TYPE { typedef struct _DISK_GEOMETRY { LARGE_INTEGER Cylinders; MEDIA_TYPE MediaType; - DWORD TracksPerCylinder; - DWORD SectorsPerTrack; - DWORD BytesPerSector; + dword_xt TracksPerCylinder; + dword_xt SectorsPerTrack; + dword_xt BytesPerSector; } DISK_GEOMETRY, *PDISK_GEOMETRY; // From nxdk #pragma pack(push, 1) typedef struct _FLOATING_SAVE_AREA { - WORD ControlWord; - WORD StatusWord; - WORD TagWord; - WORD ErrorOpcode; - DWORD ErrorOffset; - DWORD ErrorSelector; - DWORD DataOffset; - DWORD DataSelector; - DWORD MXCsr; - DWORD Reserved2; - BYTE RegisterArea[128]; - BYTE XmmRegisterArea[128]; - BYTE Reserved4[224]; - DWORD Cr0NpxState; + word_xt ControlWord; + word_xt StatusWord; + word_xt TagWord; + word_xt ErrorOpcode; + dword_xt ErrorOffset; + dword_xt ErrorSelector; + dword_xt DataOffset; + dword_xt DataSelector; + dword_xt MXCsr; + dword_xt Reserved2; + byte_xt RegisterArea[128]; + byte_xt XmmRegisterArea[128]; + byte_xt Reserved4[224]; + dword_xt Cr0NpxState; } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA; #pragma pack(pop) typedef struct _CONTEXT { - DWORD ContextFlags; // 0x00 + dword_xt ContextFlags; // 0x00 FLOATING_SAVE_AREA FloatSave; // 0x04 - DWORD Edi; // 0x208 - DWORD Esi; // 0x20C - DWORD Ebx; // 0x210 - DWORD Edx; // 0x214 - DWORD Ecx; // 0x218 - DWORD Eax; // 0x21C - DWORD Ebp; // 0x220 - DWORD Eip; // 0x224 - DWORD SegCs; // 0x228 - DWORD EFlags; // 0x22C - DWORD Esp; // 0x230 - DWORD SegSs; // 0x234 + dword_xt Edi; // 0x208 + dword_xt Esi; // 0x20C + dword_xt Ebx; // 0x210 + dword_xt Edx; // 0x214 + dword_xt Ecx; // 0x218 + dword_xt Eax; // 0x21C + dword_xt Ebp; // 0x220 + dword_xt Eip; // 0x224 + dword_xt SegCs; // 0x228 + dword_xt EFlags; // 0x22C + dword_xt Esp; // 0x230 + dword_xt SegSs; // 0x234 } CONTEXT, *PCONTEXT; // This is modeled around the Windows definition typedef struct _IO_COMPLETION_BASIC_INFORMATION { - LONG Depth; + long_xt Depth; } IO_COMPLETION_BASIC_INFORMATION, *PIO_COMPLETION_BASIC_INFORMATION; -typedef VOID(*PIDE_INTERRUPT_ROUTINE) (void); +typedef void_xt(*PIDE_INTERRUPT_ROUTINE) (void); -typedef VOID(*PIDE_FINISHIO_ROUTINE) (void); +typedef void_xt(*PIDE_FINISHIO_ROUTINE) (void); -typedef BOOLEAN(*PIDE_POLL_RESET_COMPLETE_ROUTINE) (void); +typedef boolean_xt(*PIDE_POLL_RESET_COMPLETE_ROUTINE) (void); -typedef VOID(*PIDE_TIMEOUT_EXPIRED_ROUTINE) (void); +typedef void_xt(*PIDE_TIMEOUT_EXPIRED_ROUTINE) (void); -typedef VOID(*PIDE_START_PACKET_ROUTINE) ( +typedef void_xt(*PIDE_START_PACKET_ROUTINE) ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); -typedef VOID(*PIDE_START_NEXT_PACKET_ROUTINE) (void); +typedef void_xt(*PIDE_START_NEXT_PACKET_ROUTINE) (void); typedef struct _IDE_CHANNEL_OBJECT { @@ -2576,77 +2561,22 @@ typedef struct _IDE_CHANNEL_OBJECT PIDE_START_PACKET_ROUTINE StartPacketRoutine; PIDE_START_NEXT_PACKET_ROUTINE StartNextPacketRoutine; KIRQL InterruptIrql; - BOOLEAN ExpectingBusMasterInterrupt; - BOOLEAN StartPacketBusy; - BOOLEAN StartPacketRequested; - UCHAR Timeout; - UCHAR IoRetries; - UCHAR MaximumIoRetries; + boolean_xt ExpectingBusMasterInterrupt; + boolean_xt StartPacketBusy; + boolean_xt StartPacketRequested; + uchar_xt Timeout; + uchar_xt IoRetries; + uchar_xt MaximumIoRetries; PIRP CurrentIrp; KDEVICE_QUEUE DeviceQueue; - ULONG PhysicalRegionDescriptorTablePhysical; + ulong_xt PhysicalRegionDescriptorTablePhysical; KDPC TimerDpc; KDPC FinishDpc; KTIMER Timer; KINTERRUPT InterruptObject; } IDE_CHANNEL_OBJECT, *PIDE_CHANNEL_OBJECT; -// ****************************************************************** -// * Debug -// ****************************************************************** -#include "dbg.h" - -// ****************************************************************** -// * Executive -// ****************************************************************** -#include "ex.h" - -// ****************************************************************** -// * Hardware Abstraction Layer -// ****************************************************************** -#include "hal.h" - -// ****************************************************************** -// * I/O Manager -// ****************************************************************** -#include "io.h" - -// ****************************************************************** -// * Kernel -// ****************************************************************** -#include "kernel.h" - -// ****************************************************************** -// * Memory Manager -// ****************************************************************** -#include "mm.h" - -// ****************************************************************** -// * NT -// ****************************************************************** -#include "nt.h" - -// ****************************************************************** -// * Object Manager -// ****************************************************************** -#include "ob.h" - -// ****************************************************************** -// * Process Structure -// ****************************************************************** -#include "ps.h" - -// ****************************************************************** -// * Run-time Library -// ****************************************************************** -#include "rtl.h" - -// ****************************************************************** -// * XBox -// ****************************************************************** -#include "xbox.h" - -}; +} #endif diff --git a/import/OpenXDK/include/xboxkrnl/xbox.h b/src/core/kernel/common/xbox.h similarity index 73% rename from import/OpenXDK/include/xboxkrnl/xbox.h rename to src/core/kernel/common/xbox.h index 455971663..d1784a8ce 100644 --- a/import/OpenXDK/include/xboxkrnl/xbox.h +++ b/src/core/kernel/common/xbox.h @@ -12,6 +12,11 @@ #ifndef XBOX_H #define XBOX_H +#include "types.h" + +namespace xbox +{ + #define AV_PACK_NONE 0x00000000 #define AV_PACK_STANDARD 0x00000001 #define AV_PACK_RFU 0x00000002 @@ -73,7 +78,7 @@ #define AV_OPTION_CGMS 18 #define AV_OPTION_WIDESCREEN 19 -VOID InitializeFscCacheEvent(); +void_xt InitializeFscCacheEvent(); // ****************************************************************** // * 0x0001 - AvGetSavedDataAddress() @@ -83,31 +88,31 @@ XBSYSAPI EXPORTNUM(1) PVOID NTAPI AvGetSavedDataAddress(void); // ****************************************************************** // * 0x0002 - AvSendTVEncoderOption() // ****************************************************************** -XBSYSAPI EXPORTNUM(2) VOID NTAPI AvSendTVEncoderOption +XBSYSAPI EXPORTNUM(2) void_xt NTAPI AvSendTVEncoderOption ( IN PVOID RegisterBase, - IN ULONG Option, - IN ULONG Param, - OUT ULONG *Result + IN ulong_xt Option, + IN ulong_xt Param, + OUT ulong_xt *Result ); // ****************************************************************** // * 0x0003 - AvSetDisplayMode() // ****************************************************************** -XBSYSAPI EXPORTNUM(3) ULONG NTAPI AvSetDisplayMode +XBSYSAPI EXPORTNUM(3) ulong_xt NTAPI AvSetDisplayMode ( IN PVOID RegisterBase, - IN ULONG Step, - IN ULONG Mode, - IN ULONG Format, - IN ULONG Pitch, - IN ULONG FrameBuffer + IN ulong_xt Step, + IN ulong_xt Mode, + IN ulong_xt Format, + IN ulong_xt Pitch, + IN ulong_xt FrameBuffer ); // ****************************************************************** // * 0x0004 - AvSetSavedDataAddress() // ****************************************************************** -XBSYSAPI EXPORTNUM(4) VOID NTAPI AvSetSavedDataAddress +XBSYSAPI EXPORTNUM(4) void_xt NTAPI AvSetSavedDataAddress ( IN PVOID Address ); @@ -115,51 +120,51 @@ XBSYSAPI EXPORTNUM(4) VOID NTAPI AvSetSavedDataAddress // ****************************************************************** // * 0x0023 - FscGetCacheSize() // ****************************************************************** -XBSYSAPI EXPORTNUM(35) ULONG NTAPI FscGetCacheSize(); +XBSYSAPI EXPORTNUM(35) ulong_xt NTAPI FscGetCacheSize(); // ****************************************************************** // * 0x0024 - FscInvalidateIdleBlocks() // ****************************************************************** -XBSYSAPI EXPORTNUM(36) VOID NTAPI FscInvalidateIdleBlocks(); +XBSYSAPI EXPORTNUM(36) void_xt NTAPI FscInvalidateIdleBlocks(); // ****************************************************************** // * 0x0025 - FscSetCacheSize() // ****************************************************************** -XBSYSAPI EXPORTNUM(37) NTSTATUS NTAPI FscSetCacheSize +XBSYSAPI EXPORTNUM(37) ntstatus_xt NTAPI FscSetCacheSize ( - ULONG NumberOfCachePages + ulong_xt NumberOfCachePages ); // ****************************************************************** // * 0x0058 - KdDebuggerEnabled // ****************************************************************** -XBSYSAPI EXPORTNUM(88) BOOLEAN KdDebuggerEnabled; +XBSYSAPI EXPORTNUM(88) boolean_xt KdDebuggerEnabled; // ****************************************************************** // * 0x0059 - KdDebuggerNotPresent // ****************************************************************** -XBSYSAPI EXPORTNUM(89) BOOLEAN KdDebuggerNotPresent; +XBSYSAPI EXPORTNUM(89) boolean_xt KdDebuggerNotPresent; // ****************************************************************** // * 0x00A0 - KfRaiseIrql() // ****************************************************************** -XBSYSAPI EXPORTNUM(160) UCHAR FASTCALL KfRaiseIrql +XBSYSAPI EXPORTNUM(160) uchar_xt FASTCALL KfRaiseIrql ( - IN UCHAR NewIrql + IN uchar_xt NewIrql ); // ****************************************************************** // * 0x00A1 - KfLowerIrql() // ****************************************************************** -XBSYSAPI EXPORTNUM(161) VOID FASTCALL KfLowerIrql +XBSYSAPI EXPORTNUM(161) void_xt FASTCALL KfLowerIrql ( - IN UCHAR NewIrql + IN uchar_xt NewIrql ); // ****************************************************************** // * 0x00A2 - KiBugCheckData // ****************************************************************** -XBSYSAPI EXPORTNUM(162) ULONG_PTR KiBugCheckData[5]; +XBSYSAPI EXPORTNUM(162) ulong_ptr_xt KiBugCheckData[5]; void KiLockDispatcherDatabase ( @@ -169,7 +174,7 @@ void KiLockDispatcherDatabase // ****************************************************************** // * 0x00A3 - KiUnlockDispatcherDatabase() // ****************************************************************** -XBSYSAPI EXPORTNUM(163) VOID FASTCALL KiUnlockDispatcherDatabase +XBSYSAPI EXPORTNUM(163) void_xt FASTCALL KiUnlockDispatcherDatabase ( IN KIRQL OldIrql ); @@ -182,24 +187,24 @@ XBSYSAPI EXPORTNUM(164) PLAUNCH_DATA_PAGE LaunchDataPage; // ****************************************************************** // * 0x00FC - PhyGetLinkState() // ****************************************************************** -XBSYSAPI EXPORTNUM(252) DWORD NTAPI PhyGetLinkState +XBSYSAPI EXPORTNUM(252) dword_xt NTAPI PhyGetLinkState ( - IN ULONG Mode + IN ulong_xt Mode ); // ****************************************************************** // * 0x00FD - PhyInitialize() // ****************************************************************** -XBSYSAPI EXPORTNUM(253) NTSTATUS NTAPI PhyInitialize +XBSYSAPI EXPORTNUM(253) ntstatus_xt NTAPI PhyInitialize ( - IN ULONG forceReset, + IN ulong_xt forceReset, IN PVOID Parameter2 ); // ****************************************************************** // * 0x0141 - XboxEEPROMKey // ****************************************************************** -XBSYSAPI EXPORTNUM(321) UCHAR XboxEEPROMKey[16]; +XBSYSAPI EXPORTNUM(321) uchar_xt XboxEEPROMKey[16]; // ****************************************************************** // * 0x0142 - XboxHardwareInfo @@ -209,13 +214,13 @@ XBSYSAPI EXPORTNUM(322) XBOX_HARDWARE_INFO XboxHardwareInfo; // ****************************************************************** // * 0x0143 - XboxHDKey // ****************************************************************** -XBSYSAPI EXPORTNUM(323) UCHAR XboxHDKey[16]; +XBSYSAPI EXPORTNUM(323) uchar_xt XboxHDKey[16]; typedef struct _XBOX_KRNL_VERSION { - USHORT Major; - USHORT Minor; - USHORT Build; - USHORT Qfe; + ushort_xt Major; + ushort_xt Minor; + ushort_xt Build; + ushort_xt Qfe; } XBOX_KRNL_VERSION; // ****************************************************************** @@ -226,7 +231,7 @@ XBSYSAPI EXPORTNUM(324) XBOX_KRNL_VERSION XboxKrnlVersion; // ****************************************************************** // * 0x0145 - XboxSignatureKey // ****************************************************************** -XBSYSAPI EXPORTNUM(325) BYTE XboxSignatureKey[16]; +XBSYSAPI EXPORTNUM(325) byte_xt XboxSignatureKey[16]; // ****************************************************************** // * 0x0146 - XeImageFileName @@ -236,7 +241,7 @@ XBSYSAPI EXPORTNUM(326) OBJECT_STRING XeImageFileName; // ****************************************************************** // * 0x0147 - XeLoadSection() // ****************************************************************** -XBSYSAPI EXPORTNUM(327) NTSTATUS NTAPI XeLoadSection +XBSYSAPI EXPORTNUM(327) ntstatus_xt NTAPI XeLoadSection ( IN PXBEIMAGE_SECTION Section ); @@ -244,7 +249,7 @@ XBSYSAPI EXPORTNUM(327) NTSTATUS NTAPI XeLoadSection // ****************************************************************** // * 0x0148 - XeUnloadSection() // ****************************************************************** -XBSYSAPI EXPORTNUM(328) NTSTATUS NTAPI XeUnloadSection +XBSYSAPI EXPORTNUM(328) ntstatus_xt NTAPI XeUnloadSection ( IN PXBEIMAGE_SECTION Section ); @@ -252,7 +257,7 @@ XBSYSAPI EXPORTNUM(328) NTSTATUS NTAPI XeUnloadSection // ****************************************************************** // * 0x014F - XcSHAInit() // ****************************************************************** -XBSYSAPI EXPORTNUM(335) VOID NTAPI XcSHAInit +XBSYSAPI EXPORTNUM(335) void_xt NTAPI XcSHAInit ( IN PUCHAR pbSHAContext ); @@ -260,17 +265,17 @@ XBSYSAPI EXPORTNUM(335) VOID NTAPI XcSHAInit // ****************************************************************** // * 0x0150 - XcSHAUpdate() // ****************************************************************** -XBSYSAPI EXPORTNUM(336) VOID NTAPI XcSHAUpdate +XBSYSAPI EXPORTNUM(336) void_xt NTAPI XcSHAUpdate ( IN PUCHAR pbSHAContext, IN PUCHAR pbInput, - IN ULONG dwInputLength + IN ulong_xt dwInputLength ); // ****************************************************************** // * 0x0151 - XcSHAFinal() // ****************************************************************** -XBSYSAPI EXPORTNUM(337) VOID NTAPI XcSHAFinal +XBSYSAPI EXPORTNUM(337) void_xt NTAPI XcSHAFinal ( IN PUCHAR pbSHAContext, IN PUCHAR pbDigest @@ -279,41 +284,41 @@ XBSYSAPI EXPORTNUM(337) VOID NTAPI XcSHAFinal // ****************************************************************** // * 0x0152 - XcRC4Key() // ****************************************************************** -XBSYSAPI EXPORTNUM(338) VOID NTAPI XcRC4Key +XBSYSAPI EXPORTNUM(338) void_xt NTAPI XcRC4Key ( IN PUCHAR pbKeyStruct, - IN ULONG dwKeyLength, + IN ulong_xt dwKeyLength, IN PUCHAR pbKey ); // ****************************************************************** // * 0x0153 - XcRC4Crypt() // ****************************************************************** -XBSYSAPI EXPORTNUM(339) VOID NTAPI XcRC4Crypt +XBSYSAPI EXPORTNUM(339) void_xt NTAPI XcRC4Crypt ( IN PUCHAR pbKeyStruct, - IN ULONG dwInputLength, + IN ulong_xt dwInputLength, IN PUCHAR pbInput ); // ****************************************************************** // * 0x0154 - XcHMAC() // ****************************************************************** -XBSYSAPI EXPORTNUM(340) VOID NTAPI XcHMAC +XBSYSAPI EXPORTNUM(340) void_xt NTAPI XcHMAC ( IN PBYTE pbKeyMaterial, - IN ULONG cbKeyMaterial, + IN ulong_xt cbKeyMaterial, IN PBYTE pbData, - IN ULONG cbData, + IN ulong_xt cbData, IN PBYTE pbData2, - IN ULONG cbData2, + IN ulong_xt cbData2, OUT PBYTE HmacData ); // ****************************************************************** // * 0x0155 - XcPKEncPublic() // ****************************************************************** -XBSYSAPI EXPORTNUM(341) ULONG NTAPI XcPKEncPublic +XBSYSAPI EXPORTNUM(341) ulong_xt NTAPI XcPKEncPublic ( IN PUCHAR pbPubKey, IN PUCHAR pbInput, @@ -323,7 +328,7 @@ XBSYSAPI EXPORTNUM(341) ULONG NTAPI XcPKEncPublic // ****************************************************************** // * 0x0156 - XcPKDecPrivate() // ****************************************************************** -XBSYSAPI EXPORTNUM(342) ULONG NTAPI XcPKDecPrivate +XBSYSAPI EXPORTNUM(342) ulong_xt NTAPI XcPKDecPrivate ( IN PUCHAR pbPrvKey, IN PUCHAR pbInput, @@ -333,7 +338,7 @@ XBSYSAPI EXPORTNUM(342) ULONG NTAPI XcPKDecPrivate // ****************************************************************** // * 0x0157 - XcPKGetKeyLen() // ****************************************************************** -XBSYSAPI EXPORTNUM(343) ULONG NTAPI XcPKGetKeyLen +XBSYSAPI EXPORTNUM(343) ulong_xt NTAPI XcPKGetKeyLen ( OUT PUCHAR pbPubKey ); @@ -341,7 +346,7 @@ XBSYSAPI EXPORTNUM(343) ULONG NTAPI XcPKGetKeyLen // ****************************************************************** // * 0x0158 - XcVerifyPKCS1Signature() // ****************************************************************** -XBSYSAPI EXPORTNUM(344) BOOLEAN NTAPI XcVerifyPKCS1Signature +XBSYSAPI EXPORTNUM(344) boolean_xt NTAPI XcVerifyPKCS1Signature ( IN PUCHAR pbSig, IN PUCHAR pbPubKey, @@ -351,30 +356,30 @@ XBSYSAPI EXPORTNUM(344) BOOLEAN NTAPI XcVerifyPKCS1Signature // ****************************************************************** // * 0x0159 - XcModExp() // ****************************************************************** -XBSYSAPI EXPORTNUM(345) ULONG NTAPI XcModExp +XBSYSAPI EXPORTNUM(345) ulong_xt NTAPI XcModExp ( IN LPDWORD pA, IN LPDWORD pB, IN LPDWORD pC, IN LPDWORD pD, - IN ULONG dwN + IN ulong_xt dwN ); // ****************************************************************** // * 0x015A - XcDESKeyParity() // ****************************************************************** -XBSYSAPI EXPORTNUM(346) VOID NTAPI XcDESKeyParity +XBSYSAPI EXPORTNUM(346) void_xt NTAPI XcDESKeyParity ( IN PUCHAR pbKey, - IN ULONG dwKeyLength + IN ulong_xt dwKeyLength ); // ****************************************************************** // * 0x015B - XcKeyTable() // ****************************************************************** -XBSYSAPI EXPORTNUM(347) VOID NTAPI XcKeyTable +XBSYSAPI EXPORTNUM(347) void_xt NTAPI XcKeyTable ( - IN ULONG dwCipher, + IN ulong_xt dwCipher, OUT PUCHAR pbKeyTable, IN PUCHAR pbKey ); @@ -382,55 +387,55 @@ XBSYSAPI EXPORTNUM(347) VOID NTAPI XcKeyTable // ****************************************************************** // * 0x015C - XcBlockCrypt() // ****************************************************************** -XBSYSAPI EXPORTNUM(348) VOID NTAPI XcBlockCrypt +XBSYSAPI EXPORTNUM(348) void_xt NTAPI XcBlockCrypt ( - IN ULONG dwCipher, + IN ulong_xt dwCipher, OUT PUCHAR pbOutput, IN PUCHAR pbInput, IN PUCHAR pbKeyTable, - IN ULONG dwOp + IN ulong_xt dwOp ); // ****************************************************************** // * 0x015D - XcBlockCryptCBC() // ****************************************************************** -XBSYSAPI EXPORTNUM(349) VOID NTAPI XcBlockCryptCBC +XBSYSAPI EXPORTNUM(349) void_xt NTAPI XcBlockCryptCBC ( - IN ULONG dwCipher, - IN ULONG dwInputLength, + IN ulong_xt dwCipher, + IN ulong_xt dwInputLength, OUT PUCHAR pbOutput, IN PUCHAR pbInput, IN PUCHAR pbKeyTable, - IN ULONG dwOp, + IN ulong_xt dwOp, IN PUCHAR pbFeedback ); // ****************************************************************** // * 0x015E - XcCryptService() // ****************************************************************** -XBSYSAPI EXPORTNUM(350) ULONG NTAPI XcCryptService +XBSYSAPI EXPORTNUM(350) ulong_xt NTAPI XcCryptService ( - IN ULONG dwOp, + IN ulong_xt dwOp, IN PVOID pArgs ); /* Function pointers which point to all the kernel crypto functions. Used by PCRYPTO_VECTOR. */ -typedef VOID(NTAPI *pfXcSHAInit)(PUCHAR pbSHAContext); -typedef VOID(NTAPI *pfXcSHAUpdate)(PUCHAR pbSHAContext, PUCHAR pbInput, ULONG dwInputLength); -typedef VOID(NTAPI *pfXcSHAFinal)(PUCHAR pbSHAContext, PUCHAR pbDigest); -typedef VOID(NTAPI *pfXcRC4Key)(PUCHAR pbKeyStruct, ULONG dwKeyLength, PUCHAR pbKey); -typedef VOID(NTAPI *pfXcRC4Crypt)(PUCHAR pbKeyStruct, ULONG dwInputLength, PUCHAR pbInput); -typedef VOID(NTAPI *pfXcHMAC)(PBYTE pbKeyMaterial, ULONG cbKeyMaterial, PBYTE pbData, ULONG cbData, PBYTE pbData2, ULONG cbData2, PBYTE HmacData); -typedef ULONG(NTAPI *pfXcPKEncPublic)(PUCHAR pbPubKey, PUCHAR pbInput, PUCHAR pbOutput); -typedef ULONG(NTAPI *pfXcPKDecPrivate)(PUCHAR pbPrvKey, PUCHAR pbInput, PUCHAR pbOutput); -typedef ULONG(NTAPI *pfXcPKGetKeyLen)(PUCHAR pbPubKey); -typedef BOOLEAN(NTAPI *pfXcVerifyPKCS1Signature)(PUCHAR pbSig, PUCHAR pbPubKey, PUCHAR pbDigest); -typedef ULONG(NTAPI *pfXcModExp)(LPDWORD pA, LPDWORD pB, LPDWORD pC, LPDWORD pD, ULONG dwN); -typedef VOID(NTAPI *pfXcDESKeyParity)(PUCHAR pbKey, ULONG dwKeyLength); -typedef VOID(NTAPI *pfXcKeyTable)(ULONG dwCipher, PUCHAR pbKeyTable, PUCHAR pbKey); -typedef VOID(NTAPI *pfXcBlockCrypt)(ULONG dwCipher, PUCHAR pbOutput, PUCHAR pbInput, PUCHAR pbKeyTable, ULONG dwOp); -typedef VOID(NTAPI *pfXcBlockCryptCBC)(ULONG dwCipher, ULONG dwInputLength, PUCHAR pbOutput, PUCHAR pbInput, PUCHAR pbKeyTable, ULONG dwOp, PUCHAR pbFeedback); -typedef ULONG(NTAPI *pfXcCryptService)(ULONG dwOp, PVOID pArgs); +typedef void_xt(NTAPI *pfXcSHAInit)(PUCHAR pbSHAContext); +typedef void_xt(NTAPI *pfXcSHAUpdate)(PUCHAR pbSHAContext, PUCHAR pbInput, ulong_xt dwInputLength); +typedef void_xt(NTAPI *pfXcSHAFinal)(PUCHAR pbSHAContext, PUCHAR pbDigest); +typedef void_xt(NTAPI *pfXcRC4Key)(PUCHAR pbKeyStruct, ulong_xt dwKeyLength, PUCHAR pbKey); +typedef void_xt(NTAPI *pfXcRC4Crypt)(PUCHAR pbKeyStruct, ulong_xt dwInputLength, PUCHAR pbInput); +typedef void_xt(NTAPI *pfXcHMAC)(PBYTE pbKeyMaterial, ulong_xt cbKeyMaterial, PBYTE pbData, ulong_xt cbData, PBYTE pbData2, ulong_xt cbData2, PBYTE HmacData); +typedef ulong_xt(NTAPI *pfXcPKEncPublic)(PUCHAR pbPubKey, PUCHAR pbInput, PUCHAR pbOutput); +typedef ulong_xt(NTAPI *pfXcPKDecPrivate)(PUCHAR pbPrvKey, PUCHAR pbInput, PUCHAR pbOutput); +typedef ulong_xt(NTAPI *pfXcPKGetKeyLen)(PUCHAR pbPubKey); +typedef boolean_xt(NTAPI *pfXcVerifyPKCS1Signature)(PUCHAR pbSig, PUCHAR pbPubKey, PUCHAR pbDigest); +typedef ulong_xt(NTAPI *pfXcModExp)(LPDWORD pA, LPDWORD pB, LPDWORD pC, LPDWORD pD, ulong_xt dwN); +typedef void_xt(NTAPI *pfXcDESKeyParity)(PUCHAR pbKey, ulong_xt dwKeyLength); +typedef void_xt(NTAPI *pfXcKeyTable)(ulong_xt dwCipher, PUCHAR pbKeyTable, PUCHAR pbKey); +typedef void_xt(NTAPI *pfXcBlockCrypt)(ulong_xt dwCipher, PUCHAR pbOutput, PUCHAR pbInput, PUCHAR pbKeyTable, ulong_xt dwOp); +typedef void_xt(NTAPI *pfXcBlockCryptCBC)(ulong_xt dwCipher, ulong_xt dwInputLength, PUCHAR pbOutput, PUCHAR pbInput, PUCHAR pbKeyTable, ulong_xt dwOp, PUCHAR pbFeedback); +typedef ulong_xt(NTAPI *pfXcCryptService)(ulong_xt dwOp, PVOID pArgs); /* Struct which contains all the pointers to the crypto functions */ typedef struct { @@ -455,7 +460,7 @@ typedef struct { // ****************************************************************** // * 0x015F - XcUpdateCrypto() // ****************************************************************** -XBSYSAPI EXPORTNUM(351) VOID NTAPI XcUpdateCrypto +XBSYSAPI EXPORTNUM(351) void_xt NTAPI XcUpdateCrypto ( IN PCRYPTO_VECTOR pNewVector, OUT PCRYPTO_VECTOR pROMVector OPTIONAL @@ -477,10 +482,10 @@ XBSYSAPI EXPORTNUM(354) XBOX_KEY_DATA XboxAlternateSignatureKeys[ALTERNATE_SIGNA // ****************************************************************** // * 0x0163 - XePublicKeyData // ****************************************************************** -XBSYSAPI EXPORTNUM(355) UCHAR XePublicKeyData[284]; -XBSYSAPI EXPORTNUM(355) UCHAR XePublicKeyDataRetail[284]; -XBSYSAPI EXPORTNUM(355) UCHAR XePublicKeyDataChihiroGame[284]; -XBSYSAPI EXPORTNUM(355) UCHAR XePublicKeyDataChihiroBoot[284]; +XBSYSAPI EXPORTNUM(355) uchar_xt XePublicKeyData[284]; +XBSYSAPI EXPORTNUM(355) uchar_xt XePublicKeyDataRetail[284]; +XBSYSAPI EXPORTNUM(355) uchar_xt XePublicKeyDataChihiroGame[284]; +XBSYSAPI EXPORTNUM(355) uchar_xt XePublicKeyDataChihiroBoot[284]; // ****************************************************************** // * 0x0165 - IdexChannelObject @@ -490,10 +495,10 @@ XBSYSAPI EXPORTNUM(357) IDE_CHANNEL_OBJECT IdexChannelObject; // ****************************************************************** // * 0x0169 - RtlSnprintf() // ****************************************************************** -XBSYSAPI EXPORTNUM(361) INT CDECL RtlSnprintf +XBSYSAPI EXPORTNUM(361) int_xt CDECL RtlSnprintf ( IN PCHAR string, - IN SIZE_T count, + IN size_xt count, IN LPCCH format, ... ); @@ -501,7 +506,7 @@ XBSYSAPI EXPORTNUM(361) INT CDECL RtlSnprintf // ****************************************************************** // * 0x016A - RtlSprintf() // ****************************************************************** -XBSYSAPI EXPORTNUM(362) INT CDECL RtlSprintf +XBSYSAPI EXPORTNUM(362) int_xt CDECL RtlSprintf ( IN PCHAR string, IN LPCCH format, @@ -511,10 +516,10 @@ XBSYSAPI EXPORTNUM(362) INT CDECL RtlSprintf // ****************************************************************** // * 0x016B - RtlVsnprintf() // ****************************************************************** -XBSYSAPI EXPORTNUM(363) INT CDECL RtlVsnprintf +XBSYSAPI EXPORTNUM(363) int_xt CDECL RtlVsnprintf ( IN PCHAR string, - IN SIZE_T count, + IN size_xt count, IN LPCCH format, ... ); @@ -522,47 +527,49 @@ XBSYSAPI EXPORTNUM(363) INT CDECL RtlVsnprintf // ****************************************************************** // * 0x016C - RtlVsprintf() // ****************************************************************** -XBSYSAPI EXPORTNUM(364) INT CDECL RtlVsprintf +XBSYSAPI EXPORTNUM(364) int_xt CDECL RtlVsprintf ( IN PCHAR string, IN LPCCH format, ... ); -XBSYSAPI EXPORTNUM(367) NTSTATUS NTAPI UnknownAPI367 +XBSYSAPI EXPORTNUM(367) ntstatus_xt NTAPI UnknownAPI367 ( // UNKNOWN ARGUMENTS ); -XBSYSAPI EXPORTNUM(368) NTSTATUS NTAPI UnknownAPI368 +XBSYSAPI EXPORTNUM(368) ntstatus_xt NTAPI UnknownAPI368 ( // UNKNOWN ARGUMENTS ); -XBSYSAPI EXPORTNUM(369) NTSTATUS NTAPI UnknownAPI369 +XBSYSAPI EXPORTNUM(369) ntstatus_xt NTAPI UnknownAPI369 ( // UNKNOWN ARGUMENTS ); -XBSYSAPI EXPORTNUM(370) NTSTATUS NTAPI XProfpControl // PROFILING +XBSYSAPI EXPORTNUM(370) ntstatus_xt NTAPI XProfpControl // PROFILING ( - ULONG Action, - ULONG Param + ulong_xt Action, + ulong_xt Param ); -XBSYSAPI EXPORTNUM(371) NTSTATUS NTAPI XProfpGetData // PROFILING +XBSYSAPI EXPORTNUM(371) ntstatus_xt NTAPI XProfpGetData // PROFILING ( // NO ARGUMENTS ); -XBSYSAPI EXPORTNUM(372) NTSTATUS NTAPI IrtClientInitFast // PROFILING +XBSYSAPI EXPORTNUM(372) ntstatus_xt NTAPI IrtClientInitFast // PROFILING ( // UNKNOWN ARGUMENTS ); -XBSYSAPI EXPORTNUM(373) NTSTATUS NTAPI IrtSweep // PROFILING +XBSYSAPI EXPORTNUM(373) ntstatus_xt NTAPI IrtSweep // PROFILING ( // UNKNOWN ARGUMENTS ); +} + #endif diff --git a/src/core/kernel/exports/EmuKrnl.cpp b/src/core/kernel/exports/EmuKrnl.cpp index 7e523d17d..4863d0282 100644 --- a/src/core/kernel/exports/EmuKrnl.cpp +++ b/src/core/kernel/exports/EmuKrnl.cpp @@ -28,7 +28,7 @@ #define LOG_PREFIX CXBXR_MODULE::KRNL -#include +#include #include #include #include @@ -82,7 +82,7 @@ void InsertTailList(xbox::PLIST_ENTRY pListHead, xbox::PLIST_ENTRY pEntry) //#define RemoveEntryList(e) do { PLIST_ENTRY f = (e)->Flink, b = (e)->Blink; f->Blink = b; b->Flink = f; (e)->Flink = (e)->Blink = NULL; } while (0) // Returns TRUE if the list has become empty after removing the element, FALSE otherwise. -xbox::BOOLEAN RemoveEntryList(xbox::PLIST_ENTRY pEntry) +xbox::boolean_xt RemoveEntryList(xbox::PLIST_ENTRY pEntry) { xbox::PLIST_ENTRY _EX_Flink = pEntry->Flink; xbox::PLIST_ENTRY _EX_Blink = pEntry->Blink; @@ -217,11 +217,11 @@ const DWORD IrqlMasks[] = { // * 0x0033 - InterlockedCompareExchange() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(51) xbox::LONG FASTCALL xbox::KRNL(InterlockedCompareExchange) +XBSYSAPI EXPORTNUM(51) xbox::long_xt FASTCALL xbox::KRNL(InterlockedCompareExchange) ( IN OUT PLONG VOLATILE Destination, - IN LONG Exchange, - IN LONG Comparand + IN long_xt Exchange, + IN long_xt Comparand ) { LOG_FUNC_BEGIN @@ -239,7 +239,7 @@ XBSYSAPI EXPORTNUM(51) xbox::LONG FASTCALL xbox::KRNL(InterlockedCompareExchange // * 0x0034 - InterlockedDecrement() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(52) xbox::LONG FASTCALL xbox::KRNL(InterlockedDecrement) +XBSYSAPI EXPORTNUM(52) xbox::long_xt FASTCALL xbox::KRNL(InterlockedDecrement) ( IN OUT PLONG Addend ) @@ -255,7 +255,7 @@ XBSYSAPI EXPORTNUM(52) xbox::LONG FASTCALL xbox::KRNL(InterlockedDecrement) // * 0x0035 - InterlockedIncrement() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(53) xbox::LONG FASTCALL xbox::KRNL(InterlockedIncrement) +XBSYSAPI EXPORTNUM(53) xbox::long_xt FASTCALL xbox::KRNL(InterlockedIncrement) ( IN OUT PLONG Addend ) @@ -271,10 +271,10 @@ XBSYSAPI EXPORTNUM(53) xbox::LONG FASTCALL xbox::KRNL(InterlockedIncrement) // * 0x0036 - InterlockedExchange() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(54) xbox::LONG FASTCALL xbox::KRNL(InterlockedExchange) +XBSYSAPI EXPORTNUM(54) xbox::long_xt FASTCALL xbox::KRNL(InterlockedExchange) ( IN PLONG VOLATILE Destination, - IN LONG Value + IN long_xt Value ) { LOG_FUNC_BEGIN @@ -291,10 +291,10 @@ XBSYSAPI EXPORTNUM(54) xbox::LONG FASTCALL xbox::KRNL(InterlockedExchange) // * 0x0037 - InterlockedExchangeAdd() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(55) xbox::LONG FASTCALL xbox::KRNL(InterlockedExchangeAdd) +XBSYSAPI EXPORTNUM(55) xbox::long_xt FASTCALL xbox::KRNL(InterlockedExchangeAdd) ( IN PLONG VOLATILE Addend, - IN LONG Value + IN long_xt Value ) { LOG_FUNC_BEGIN @@ -395,7 +395,7 @@ inline int bsr(const uint32_t a) { DWORD result; _BitScanReverse(&result, a); re // ****************************************************************** // Restores the irq level on the current processor // ARGUMENTS NewIrql = Irql to lower to -XBSYSAPI EXPORTNUM(161) xbox::VOID FASTCALL xbox::KfLowerIrql +XBSYSAPI EXPORTNUM(161) xbox::void_xt FASTCALL xbox::KfLowerIrql ( IN KIRQL NewIrql ) @@ -436,14 +436,14 @@ XBSYSAPI EXPORTNUM(161) xbox::VOID FASTCALL xbox::KfLowerIrql // * 0x00A2 - KiBugCheckData // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(162) xbox::ULONG_PTR xbox::KiBugCheckData[5] = { NULL, NULL, NULL, NULL, NULL }; +XBSYSAPI EXPORTNUM(162) xbox::ulong_ptr_xt xbox::KiBugCheckData[5] = { NULL, NULL, NULL, NULL, NULL }; extern xbox::KPRCB *KeGetCurrentPrcb(); // ****************************************************************** // * 0x00A3 - KiUnlockDispatcherDatabase() // ****************************************************************** -XBSYSAPI EXPORTNUM(163) xbox::VOID FASTCALL xbox::KiUnlockDispatcherDatabase +XBSYSAPI EXPORTNUM(163) xbox::void_xt FASTCALL xbox::KiUnlockDispatcherDatabase ( IN KIRQL OldIrql ) @@ -466,10 +466,10 @@ XBSYSAPI EXPORTNUM(357) xbox::IDE_CHANNEL_OBJECT xbox::IdexChannelObject = { }; // ****************************************************************** // * 0x0169 - RtlSnprintf() // ****************************************************************** -XBSYSAPI EXPORTNUM(361) xbox::INT CDECL xbox::RtlSnprintf +XBSYSAPI EXPORTNUM(361) xbox::int_xt CDECL xbox::RtlSnprintf ( IN PCHAR string, - IN SIZE_T count, + IN size_xt count, IN LPCCH format, ... ) @@ -493,7 +493,7 @@ XBSYSAPI EXPORTNUM(361) xbox::INT CDECL xbox::RtlSnprintf // ****************************************************************** // * 0x016A - RtlSprintf() // ****************************************************************** -XBSYSAPI EXPORTNUM(362) xbox::INT CDECL xbox::RtlSprintf +XBSYSAPI EXPORTNUM(362) xbox::int_xt CDECL xbox::RtlSprintf ( IN PCHAR string, IN LPCCH format, @@ -518,10 +518,10 @@ XBSYSAPI EXPORTNUM(362) xbox::INT CDECL xbox::RtlSprintf // ****************************************************************** // * 0x016B - RtlVsnprintf() // ****************************************************************** -XBSYSAPI EXPORTNUM(363) xbox::INT CDECL xbox::RtlVsnprintf +XBSYSAPI EXPORTNUM(363) xbox::int_xt CDECL xbox::RtlVsnprintf ( IN PCHAR string, - IN SIZE_T count, + IN size_xt count, IN LPCCH format, ... ) @@ -545,7 +545,7 @@ XBSYSAPI EXPORTNUM(363) xbox::INT CDECL xbox::RtlVsnprintf // ****************************************************************** // * 0x016C - RtlVsprintf() // ****************************************************************** -XBSYSAPI EXPORTNUM(364) xbox::INT CDECL xbox::RtlVsprintf +XBSYSAPI EXPORTNUM(364) xbox::int_xt CDECL xbox::RtlVsprintf ( IN PCHAR string, IN LPCCH format, @@ -570,7 +570,7 @@ XBSYSAPI EXPORTNUM(364) xbox::INT CDECL xbox::RtlVsprintf // ****************************************************************** // * 0x016F - UnknownAPI367() // ****************************************************************** -XBSYSAPI EXPORTNUM(367) xbox::NTSTATUS NTAPI xbox::UnknownAPI367 +XBSYSAPI EXPORTNUM(367) xbox::ntstatus_xt NTAPI xbox::UnknownAPI367 ( // UNKNOWN ARGUMENTS ) @@ -585,7 +585,7 @@ XBSYSAPI EXPORTNUM(367) xbox::NTSTATUS NTAPI xbox::UnknownAPI367 // ****************************************************************** // * 0x0170 - UnknownAPI368() // ****************************************************************** -XBSYSAPI EXPORTNUM(368) xbox::NTSTATUS NTAPI xbox::UnknownAPI368 +XBSYSAPI EXPORTNUM(368) xbox::ntstatus_xt NTAPI xbox::UnknownAPI368 ( // UNKNOWN ARGUMENTS ) @@ -600,7 +600,7 @@ XBSYSAPI EXPORTNUM(368) xbox::NTSTATUS NTAPI xbox::UnknownAPI368 // ****************************************************************** // * 0x0171 - UnknownAPI369() // ****************************************************************** -XBSYSAPI EXPORTNUM(369) xbox::NTSTATUS NTAPI xbox::UnknownAPI369 +XBSYSAPI EXPORTNUM(369) xbox::ntstatus_xt NTAPI xbox::UnknownAPI369 ( // UNKNOWN ARGUMENTS ) @@ -615,10 +615,10 @@ XBSYSAPI EXPORTNUM(369) xbox::NTSTATUS NTAPI xbox::UnknownAPI369 // ****************************************************************** // * 0x0172 - XProfpControl() // ****************************************************************** -XBSYSAPI EXPORTNUM(370) xbox::NTSTATUS NTAPI xbox::XProfpControl // PROFILING +XBSYSAPI EXPORTNUM(370) xbox::ntstatus_xt NTAPI xbox::XProfpControl // PROFILING ( - ULONG Action, - ULONG Param + ulong_xt Action, + ulong_xt Param ) { LOG_FUNC_BEGIN @@ -634,7 +634,7 @@ XBSYSAPI EXPORTNUM(370) xbox::NTSTATUS NTAPI xbox::XProfpControl // PROFILING // ****************************************************************** // * 0x0173 - XProfpGetData() // ****************************************************************** -XBSYSAPI EXPORTNUM(371) xbox::NTSTATUS NTAPI xbox::XProfpGetData // PROFILING +XBSYSAPI EXPORTNUM(371) xbox::ntstatus_xt NTAPI xbox::XProfpGetData // PROFILING ( // NO ARGUMENTS ) @@ -649,7 +649,7 @@ XBSYSAPI EXPORTNUM(371) xbox::NTSTATUS NTAPI xbox::XProfpGetData // PROFILING // ****************************************************************** // * 0x0174 - IrtClientInitFast() // ****************************************************************** -XBSYSAPI EXPORTNUM(372) xbox::NTSTATUS NTAPI xbox::IrtClientInitFast // PROFILING +XBSYSAPI EXPORTNUM(372) xbox::ntstatus_xt NTAPI xbox::IrtClientInitFast // PROFILING ( // UNKNOWN ARGUMENTS ) @@ -664,7 +664,7 @@ XBSYSAPI EXPORTNUM(372) xbox::NTSTATUS NTAPI xbox::IrtClientInitFast // PROFILIN // ****************************************************************** // * 0x0175 - IrtSweep() // ****************************************************************** -XBSYSAPI EXPORTNUM(373) xbox::NTSTATUS NTAPI xbox::IrtSweep // PROFILING +XBSYSAPI EXPORTNUM(373) xbox::ntstatus_xt NTAPI xbox::IrtSweep // PROFILING ( // UNKNOWN ARGUMENTS ) diff --git a/src/core/kernel/exports/EmuKrnl.h b/src/core/kernel/exports/EmuKrnl.h index cd16d90bb..774551f80 100644 --- a/src/core/kernel/exports/EmuKrnl.h +++ b/src/core/kernel/exports/EmuKrnl.h @@ -43,7 +43,7 @@ void InsertHeadList(xbox::PLIST_ENTRY pListHead, xbox::PLIST_ENTRY pEntry); void InsertTailList(xbox::PLIST_ENTRY pListHead, xbox::PLIST_ENTRY pEntry); //#define RemoveEntryList(e) do { PLIST_ENTRY f = (e)->Flink, b = (e)->Blink; f->Blink = b; b->Flink = f; (e)->Flink = (e)->Blink = NULL; } while (0) -xbox::BOOLEAN RemoveEntryList(xbox::PLIST_ENTRY pEntry); +xbox::boolean_xt RemoveEntryList(xbox::PLIST_ENTRY pEntry); xbox::PLIST_ENTRY RemoveHeadList(xbox::PLIST_ENTRY pListHead); xbox::PLIST_ENTRY RemoveTailList(xbox::PLIST_ENTRY pListHead); @@ -88,8 +88,8 @@ public: m_Pending = false; } - BOOLEAN(__stdcall *ServiceRoutine)(xbox::PKINTERRUPT, void*) = (BOOLEAN(__stdcall *)(xbox::PKINTERRUPT, void*))Interrupt->ServiceRoutine; - BOOLEAN result = ServiceRoutine(Interrupt, Interrupt->ServiceContext); + xbox::boolean_xt(__stdcall *ServiceRoutine)(xbox::PKINTERRUPT, void*) = (xbox::boolean_xt(__stdcall *)(xbox::PKINTERRUPT, void*))Interrupt->ServiceRoutine; + xbox::boolean_xt result = ServiceRoutine(Interrupt, Interrupt->ServiceContext); } private: bool m_Asserted = false; diff --git a/src/core/kernel/exports/EmuKrnlAv.cpp b/src/core/kernel/exports/EmuKrnlAv.cpp index 84801b45a..d5e50ce39 100644 --- a/src/core/kernel/exports/EmuKrnlAv.cpp +++ b/src/core/kernel/exports/EmuKrnlAv.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX CXBXR_MODULE::AV -#include // For AvGetSavedDataAddress, etc. +#include // For AvGetSavedDataAddress, etc. #include "EmuKrnlLogging.h" // prevent name collisions @@ -38,10 +38,6 @@ namespace NtDll #include "core\kernel\support\EmuNtDll.h" }; -#ifndef VOID -#define VOID void -#endif - #include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "core\hle\D3D8\Direct3D9\Direct3D9.h" #include "devices\x86\EmuX86.h" @@ -51,33 +47,29 @@ namespace NtDll #include "devices\video\nv2a_int.h" #include "devices\video\nv2a.h" // For NV2ABlockInfo, EmuNV2A_Block() -#ifdef VOID -#undef VOID -#endif - // HW Register helper functions -xbox::UCHAR REG_RD08(void* Ptr, xbox::ULONG Addr) +xbox::uchar_xt REG_RD08(void* Ptr, xbox::ulong_xt Addr) { - return EmuX86_Read((xbox::addr)Ptr + Addr, sizeof(uint8_t)); + return EmuX86_Read((xbox::addr_xt)Ptr + Addr, sizeof(uint8_t)); } -void REG_WR08(void* Ptr, xbox::ULONG Addr, xbox::UCHAR Val) +void REG_WR08(void* Ptr, xbox::ulong_xt Addr, xbox::uchar_xt Val) { - EmuX86_Write((xbox::addr)Ptr + Addr, Val, sizeof(uint8_t)); + EmuX86_Write((xbox::addr_xt)Ptr + Addr, Val, sizeof(uint8_t)); } -xbox::ULONG REG_RD32(void* Ptr, xbox::ULONG Addr) +xbox::ulong_xt REG_RD32(void* Ptr, xbox::ulong_xt Addr) { - return EmuX86_Read((xbox::addr)Ptr + Addr, sizeof(uint32_t)); + return EmuX86_Read((xbox::addr_xt)Ptr + Addr, sizeof(uint32_t)); } -void REG_WR32(void* Ptr, xbox::ULONG Addr, xbox::ULONG Val) +void REG_WR32(void* Ptr, xbox::ulong_xt Addr, xbox::ulong_xt Val) { - EmuX86_Write((xbox::addr)Ptr + Addr, Val, sizeof(uint32_t)); + EmuX86_Write((xbox::addr_xt)Ptr + Addr, Val, sizeof(uint32_t)); } -void CRTC_WR(void* Ptr, xbox::UCHAR i, xbox::UCHAR d) +void CRTC_WR(void* Ptr, xbox::uchar_xt i, xbox::uchar_xt d) { static const NV2ABlockInfo* block = EmuNV2A_Block(NV_PRMCIO_CRX__COLOR); @@ -85,7 +77,7 @@ void CRTC_WR(void* Ptr, xbox::UCHAR i, xbox::UCHAR d) g_NV2A->BlockWrite(block, NV_PRMCIO_CR__COLOR, d, sizeof(uint8_t)); } -void SRX_WR(void *Ptr, xbox::UCHAR i, xbox::UCHAR d) +void SRX_WR(void *Ptr, xbox::uchar_xt i, xbox::uchar_xt d) { static const NV2ABlockInfo* block = EmuNV2A_Block(NV_PRMVIO_SRX); @@ -93,7 +85,7 @@ void SRX_WR(void *Ptr, xbox::UCHAR i, xbox::UCHAR d) g_NV2A->BlockWrite(block, NV_PRMVIO_SR, d, sizeof(uint8_t)); } -void GRX_WR(void *Ptr, xbox::UCHAR i, xbox::UCHAR d) +void GRX_WR(void *Ptr, xbox::uchar_xt i, xbox::uchar_xt d) { static const NV2ABlockInfo* block = EmuNV2A_Block(NV_PRMVIO_GRX); @@ -101,7 +93,7 @@ void GRX_WR(void *Ptr, xbox::UCHAR i, xbox::UCHAR d) g_NV2A->BlockWrite(block, NV_PRMVIO_GX, d, sizeof(uint8_t)); } -void ARX_WR(void *Ptr, xbox::UCHAR i, xbox::UCHAR d) +void ARX_WR(void *Ptr, xbox::uchar_xt i, xbox::uchar_xt d) { static const NV2ABlockInfo* block = EmuNV2A_Block(NV_PRMCIO_ARX); @@ -140,13 +132,13 @@ ULONG AvQueryAvCapabilities() ULONG avRegion; NTSTATUS result = xbox::ExQueryNonVolatileSetting( xbox::XC_FACTORY_AV_REGION, - &type, + (xbox::dword_xt *)&type, &avRegion, sizeof(ULONG), - &resultSize); + (xbox::PSIZE_T)&resultSize); // If this failed, default to AV_STANDARD_NTSC_M | AV_FLAGS_60Hz - if (result != STATUS_SUCCESS || resultSize != sizeof(ULONG)) { + if (result != xbox::status_success || resultSize != sizeof(ULONG)) { avRegion = AV_STANDARD_NTSC_M | AV_FLAGS_60Hz; } @@ -154,13 +146,13 @@ ULONG AvQueryAvCapabilities() ULONG userSettings; result = xbox::ExQueryNonVolatileSetting( xbox::XC_VIDEO, - &type, + (xbox::dword_xt *) &type, &userSettings, sizeof(ULONG), - &resultSize); + (xbox::PSIZE_T)&resultSize); // If this failed, default to no user-options set - if (result != STATUS_SUCCESS || resultSize != sizeof(ULONG)) { + if (result != xbox::status_success || resultSize != sizeof(ULONG)) { userSettings = 0; } @@ -182,12 +174,12 @@ XBSYSAPI EXPORTNUM(1) xbox::PVOID NTAPI xbox::AvGetSavedDataAddress(void) // ****************************************************************** // * 0x0002 - AvSendTVEncoderOption() // ****************************************************************** -XBSYSAPI EXPORTNUM(2) xbox::VOID NTAPI xbox::AvSendTVEncoderOption +XBSYSAPI EXPORTNUM(2) xbox::void_xt NTAPI xbox::AvSendTVEncoderOption ( IN PVOID RegisterBase, - IN ULONG Option, - IN ULONG Param, - OUT ULONG *Result + IN ulong_xt Option, + IN ulong_xt Param, + OUT ulong_xt *Result ) { LOG_FUNC_BEGIN; @@ -261,14 +253,14 @@ XBSYSAPI EXPORTNUM(2) xbox::VOID NTAPI xbox::AvSendTVEncoderOption // ****************************************************************** // * 0x0003 - AvSetDisplayMode() // ****************************************************************** -XBSYSAPI EXPORTNUM(3) xbox::ULONG NTAPI xbox::AvSetDisplayMode +XBSYSAPI EXPORTNUM(3) xbox::ulong_xt NTAPI xbox::AvSetDisplayMode ( IN PVOID RegisterBase, - IN ULONG Step, - IN ULONG Mode, - IN ULONG Format, - IN ULONG Pitch, - IN ULONG FrameBuffer + IN ulong_xt Step, + IN ulong_xt Mode, + IN ulong_xt Format, + IN ulong_xt Pitch, + IN ulong_xt FrameBuffer ) { LOG_FUNC_BEGIN; @@ -325,7 +317,7 @@ XBSYSAPI EXPORTNUM(3) xbox::ULONG NTAPI xbox::AvSetDisplayMode AvSendTVEncoderOption(RegisterBase, AV_OPTION_FLICKER_FILTER, 5, NULL); AvSendTVEncoderOption(RegisterBase, AV_OPTION_ENABLE_LUMA_FILTER, FALSE, NULL); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } CRTC_WR(RegisterBase, NV_CIO_CRE_PIXEL_INDEX /*=0x28*/, 0x80 | CR28Depth); @@ -403,13 +395,13 @@ XBSYSAPI EXPORTNUM(3) xbox::ULONG NTAPI xbox::AvSetDisplayMode REG_WR32(RegisterBase, NV_PCRTC_START, FrameBuffer); AvpCurrentMode = Mode; - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x0004 - AvSetSavedDataAddress() // ****************************************************************** -XBSYSAPI EXPORTNUM(4) xbox::VOID NTAPI xbox::AvSetSavedDataAddress +XBSYSAPI EXPORTNUM(4) xbox::void_xt NTAPI xbox::AvSetSavedDataAddress ( IN PVOID Address ) diff --git a/src/core/kernel/exports/EmuKrnlAvModes.h b/src/core/kernel/exports/EmuKrnlAvModes.h index ce4a87374..20acb7d65 100644 --- a/src/core/kernel/exports/EmuKrnlAvModes.h +++ b/src/core/kernel/exports/EmuKrnlAvModes.h @@ -203,10 +203,10 @@ const UCHAR AvpCRTCRegisters[][34] = typedef struct { - ULONG AvInfo; - USHORT Width; - USHORT Height; - ULONG DisplayMode; + xbox::ulong_xt AvInfo; + xbox::ushort_xt Width; + xbox::ushort_xt Height; + xbox::ulong_xt DisplayMode; } XB_DisplayMode; const XB_DisplayMode g_DisplayModes[] = @@ -417,4 +417,4 @@ const XB_DisplayMode g_DisplayModes[] = { 0xFFFFFFFF, 0, 0, 0 }, }; -const uint32_t g_DisplayModeCount = sizeof(g_DisplayModes) / sizeof(XB_DisplayMode); \ No newline at end of file +const uint32_t g_DisplayModeCount = sizeof(g_DisplayModes) / sizeof(XB_DisplayMode); diff --git a/src/core/kernel/exports/EmuKrnlDbg.cpp b/src/core/kernel/exports/EmuKrnlDbg.cpp index 48f651e3e..3b7962b4f 100644 --- a/src/core/kernel/exports/EmuKrnlDbg.cpp +++ b/src/core/kernel/exports/EmuKrnlDbg.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX CXBXR_MODULE::DBG -#include // For DbgPrint, etc. +#include // For DbgPrint, etc. #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" @@ -45,7 +45,7 @@ namespace NtDll // ****************************************************************** // * 0x0005 - DbgBreakPoint() // ****************************************************************** -XBSYSAPI EXPORTNUM(5) xbox::VOID NTAPI xbox::DbgBreakPoint() +XBSYSAPI EXPORTNUM(5) xbox::void_xt NTAPI xbox::DbgBreakPoint() { LOG_FUNC(); @@ -55,9 +55,9 @@ XBSYSAPI EXPORTNUM(5) xbox::VOID NTAPI xbox::DbgBreakPoint() // ****************************************************************** // * 0x0006 - DbgBreakPointWithStatus() // ****************************************************************** -XBSYSAPI EXPORTNUM(6) xbox::VOID NTAPI xbox::DbgBreakPointWithStatus +XBSYSAPI EXPORTNUM(6) xbox::void_xt NTAPI xbox::DbgBreakPointWithStatus ( - IN ULONG Status + IN ulong_xt Status ) { LOG_FUNC_ONE_ARG(Status); @@ -68,11 +68,11 @@ XBSYSAPI EXPORTNUM(6) xbox::VOID NTAPI xbox::DbgBreakPointWithStatus // ****************************************************************** // * 0x0007 - DbgLoadImageSymbols() // ****************************************************************** -XBSYSAPI EXPORTNUM(7) xbox::NTSTATUS NTAPI xbox::DbgLoadImageSymbols +XBSYSAPI EXPORTNUM(7) xbox::ntstatus_xt NTAPI xbox::DbgLoadImageSymbols ( IN PANSI_STRING Name, IN PVOID Base, - IN ULONG_PTR ProcessId + IN ulong_ptr_xt ProcessId ) { LOG_FUNC_BEGIN; @@ -91,7 +91,7 @@ XBSYSAPI EXPORTNUM(7) xbox::NTSTATUS NTAPI xbox::DbgLoadImageSymbols // ****************************************************************** // * 0x0008 - DbgPrint() // ****************************************************************** -XBSYSAPI EXPORTNUM(8) xbox::ULONG _cdecl xbox::DbgPrint +XBSYSAPI EXPORTNUM(8) xbox::ulong_xt _cdecl xbox::DbgPrint ( PCHAR Format, ... ) @@ -117,7 +117,7 @@ XBSYSAPI EXPORTNUM(8) xbox::ULONG _cdecl xbox::DbgPrint // Prevent a crash if we can't allocate enough memory // We want this to be transparent to the running Xbox application // Hence, we return success. - return STATUS_SUCCESS; + return xbox::status_success; } // Perform the actual print operation @@ -130,18 +130,18 @@ XBSYSAPI EXPORTNUM(8) xbox::ULONG _cdecl xbox::DbgPrint fflush(stdout); } - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x000A - DbgPrompt() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(10) xbox::ULONG NTAPI xbox::DbgPrompt +XBSYSAPI EXPORTNUM(10) xbox::ulong_xt NTAPI xbox::DbgPrompt ( IN PCCH Prompt, OUT PCH Response, - IN ULONG MaximumResponseLength + IN ulong_xt MaximumResponseLength ) { LOG_FUNC_BEGIN; @@ -161,11 +161,11 @@ XBSYSAPI EXPORTNUM(10) xbox::ULONG NTAPI xbox::DbgPrompt // * 0x000B - DbgUnLoadImageSymbols() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(11) xbox::VOID NTAPI xbox::DbgUnLoadImageSymbols +XBSYSAPI EXPORTNUM(11) xbox::void_xt NTAPI xbox::DbgUnLoadImageSymbols ( IN PANSI_STRING Name, IN PVOID Base, - IN ULONG_PTR ProcessId + IN ulong_ptr_xt ProcessId ) { LOG_FUNC_BEGIN; diff --git a/src/core/kernel/exports/EmuKrnlEx.cpp b/src/core/kernel/exports/EmuKrnlEx.cpp index 0fd7d918f..93aacc396 100644 --- a/src/core/kernel/exports/EmuKrnlEx.cpp +++ b/src/core/kernel/exports/EmuKrnlEx.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX CXBXR_MODULE::EX -#include // For ExAllocatePool, etc. +#include // For ExAllocatePool, etc. #include "Logging.h" // For LOG_FUNC() #include "EmuEEPROM.h" // For EmuFindEEPROMInfo, EEPROM, XboxFactoryGameRegion #include "EmuKrnlLogging.h" @@ -47,7 +47,7 @@ namespace NtDll #include // for std::atomic #pragma warning(disable:4005) // Ignore redefined status values -#include // For STATUS_BUFFER_TOO_SMALL +#include // For xbox::status_buffer_too_small #pragma warning(default:4005) static CRITICAL_SECTION eeprom_crit_section; @@ -140,7 +140,7 @@ static bool eeprom_data_is_valid(xbox::XC_VALUE_INDEX index) // * 0x000C - ExAcquireReadWriteLockExclusive() // ****************************************************************** // Source:APILogger - Uncertain -XBSYSAPI EXPORTNUM(12) xbox::VOID NTAPI xbox::ExAcquireReadWriteLockExclusive +XBSYSAPI EXPORTNUM(12) xbox::void_xt NTAPI xbox::ExAcquireReadWriteLockExclusive ( IN PERWLOCK ReadWriteLock ) @@ -169,7 +169,7 @@ XBSYSAPI EXPORTNUM(12) xbox::VOID NTAPI xbox::ExAcquireReadWriteLockExclusive // * 0x000D - ExAcquireReadWriteLockShared() // ****************************************************************** // Source:APILogger - Uncertain -XBSYSAPI EXPORTNUM(13) xbox::VOID NTAPI xbox::ExAcquireReadWriteLockShared +XBSYSAPI EXPORTNUM(13) xbox::void_xt NTAPI xbox::ExAcquireReadWriteLockShared ( IN PERWLOCK ReadWriteLock ) @@ -205,7 +205,7 @@ XBSYSAPI EXPORTNUM(13) xbox::VOID NTAPI xbox::ExAcquireReadWriteLockShared // ****************************************************************** XBSYSAPI EXPORTNUM(14) xbox::PVOID NTAPI xbox::ExAllocatePool ( - IN SIZE_T NumberOfBytes + IN size_xt NumberOfBytes ) { LOG_FORWARD("ExAllocatePoolWithTag"); @@ -221,8 +221,8 @@ XBSYSAPI EXPORTNUM(14) xbox::PVOID NTAPI xbox::ExAllocatePool // ****************************************************************** XBSYSAPI EXPORTNUM(15) xbox::PVOID NTAPI xbox::ExAllocatePoolWithTag ( - IN SIZE_T NumberOfBytes, - IN ULONG Tag + IN size_xt NumberOfBytes, + IN ulong_xt Tag ) { LOG_FUNC_BEGIN @@ -252,7 +252,7 @@ XBSYSAPI EXPORTNUM(16) xbox::OBJECT_TYPE xbox::ExEventObjectType = // ****************************************************************** // * 0x0011 - ExFreePool() // ****************************************************************** -XBSYSAPI EXPORTNUM(17) xbox::VOID NTAPI xbox::ExFreePool +XBSYSAPI EXPORTNUM(17) xbox::void_xt NTAPI xbox::ExFreePool ( IN PVOID P ) @@ -266,7 +266,7 @@ XBSYSAPI EXPORTNUM(17) xbox::VOID NTAPI xbox::ExFreePool // * 0x0012 - ExInitializeReadWriteLock() // ****************************************************************** // Source:APILogger - Uncertain -XBSYSAPI EXPORTNUM(18) xbox::VOID NTAPI xbox::ExInitializeReadWriteLock +XBSYSAPI EXPORTNUM(18) xbox::void_xt NTAPI xbox::ExInitializeReadWriteLock ( IN PERWLOCK ReadWriteLock ) @@ -321,10 +321,10 @@ XBSYSAPI EXPORTNUM(19) xbox::LARGE_INTEGER NTAPI xbox::ExInterlockedAddLargeInte // * 0x0014 - ExInterlockedAddLargeStatistic() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(20) xbox::VOID FASTCALL xbox::ExInterlockedAddLargeStatistic +XBSYSAPI EXPORTNUM(20) xbox::void_xt FASTCALL xbox::ExInterlockedAddLargeStatistic ( IN PLARGE_INTEGER Addend, - IN ULONG Increment + IN ulong_xt Increment ) { LOG_FUNC_BEGIN @@ -340,7 +340,7 @@ XBSYSAPI EXPORTNUM(20) xbox::VOID FASTCALL xbox::ExInterlockedAddLargeStatistic // * 0x0015 - ExInterlockedCompareExchange64() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(21) xbox::LONGLONG FASTCALL xbox::ExInterlockedCompareExchange64 +XBSYSAPI EXPORTNUM(21) xbox::longlong_xt FASTCALL xbox::ExInterlockedCompareExchange64 ( IN OUT PLONGLONG Destination, IN PLONGLONG Exchange, @@ -378,7 +378,7 @@ XBSYSAPI EXPORTNUM(22) xbox::OBJECT_TYPE xbox::ExMutantObjectType = // ****************************************************************** // * 0x0017 - ExQueryPoolBlockSize() // ****************************************************************** -XBSYSAPI EXPORTNUM(23) xbox::ULONG NTAPI xbox::ExQueryPoolBlockSize +XBSYSAPI EXPORTNUM(23) xbox::ulong_xt NTAPI xbox::ExQueryPoolBlockSize ( IN PVOID PoolBlock ) @@ -393,12 +393,12 @@ XBSYSAPI EXPORTNUM(23) xbox::ULONG NTAPI xbox::ExQueryPoolBlockSize // ****************************************************************** // * 0x0018 - ExQueryNonVolatileSetting() // ****************************************************************** -XBSYSAPI EXPORTNUM(24) xbox::NTSTATUS NTAPI xbox::ExQueryNonVolatileSetting +XBSYSAPI EXPORTNUM(24) xbox::ntstatus_xt NTAPI xbox::ExQueryNonVolatileSetting ( - IN DWORD ValueIndex, - OUT DWORD *Type, + IN dword_xt ValueIndex, + OUT dword_xt *Type, OUT PVOID Value, - IN SIZE_T ValueLength, + IN size_xt ValueLength, OUT PSIZE_T ResultLength OPTIONAL ) { @@ -410,7 +410,7 @@ XBSYSAPI EXPORTNUM(24) xbox::NTSTATUS NTAPI xbox::ExQueryNonVolatileSetting LOG_FUNC_ARG_OUT(ResultLength) LOG_FUNC_END; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = xbox::status_success; void * value_addr = nullptr; int value_type; int result_length; @@ -419,7 +419,7 @@ XBSYSAPI EXPORTNUM(24) xbox::NTSTATUS NTAPI xbox::ExQueryNonVolatileSetting // handle eeprom read if (index == XC_FACTORY_GAME_REGION) { value_addr = &XboxFactoryGameRegion; - value_type = REG_DWORD; + value_type = reg_dword; result_length = sizeof(ULONG); } else { @@ -457,11 +457,11 @@ XBSYSAPI EXPORTNUM(24) xbox::NTSTATUS NTAPI xbox::ExQueryNonVolatileSetting UnlockEeprom(); } else { - Status = STATUS_BUFFER_TOO_SMALL; + Status = xbox::status_buffer_too_small; } } else { - Status = STATUS_OBJECT_NAME_NOT_FOUND; + Status = xbox::status_object_name_not_found; } RETURN(Status); @@ -470,11 +470,11 @@ XBSYSAPI EXPORTNUM(24) xbox::NTSTATUS NTAPI xbox::ExQueryNonVolatileSetting // ****************************************************************** // * 0x0019 - ExReadWriteRefurbInfo() // ****************************************************************** -XBSYSAPI EXPORTNUM(25) xbox::NTSTATUS NTAPI xbox::ExReadWriteRefurbInfo +XBSYSAPI EXPORTNUM(25) xbox::ntstatus_xt NTAPI xbox::ExReadWriteRefurbInfo ( IN OUT PXBOX_REFURB_INFO pRefurbInfo, - IN ULONG dwBufferSize, - IN BOOLEAN bIsWriteMode + IN ulong_xt dwBufferSize, + IN boolean_xt bIsWriteMode ) { LOG_FUNC_BEGIN @@ -483,7 +483,7 @@ XBSYSAPI EXPORTNUM(25) xbox::NTSTATUS NTAPI xbox::ExReadWriteRefurbInfo LOG_FUNC_ARG(bIsWriteMode) LOG_FUNC_END; - NTSTATUS Result = STATUS_SUCCESS; + NTSTATUS Result = xbox::status_success; /* TODO: Port this Dxbx code : if (pRefurbInfo) @@ -508,7 +508,7 @@ XBSYSAPI EXPORTNUM(25) xbox::NTSTATUS NTAPI xbox::ExReadWriteRefurbInfo &IoStatusBlock, FILE_SHARE_READ or FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_ALERT); - if (NT_SUCCESS(Result)) + if (nt_success(Result)) { LARGE_INTEGER ByteOffset; ByteOffset.QuadPart = XBOX_REFURB_INFO_SECTOR_INDEX * XBOX_HD_SECTOR_SIZE; @@ -523,7 +523,7 @@ XBSYSAPI EXPORTNUM(25) xbox::NTSTATUS NTAPI xbox::ExReadWriteRefurbInfo else { Result = xbox::NtReadFile(ConfigPartitionHandle, 0, NULL, NULL, &IoStatusBlock, &RefurbInfoCopy, XBOX_HD_SECTOR_SIZE, &ByteOffset); - if (NT_SUCCESS(Result)) + if (nt_success(Result)) { if (RefurbInfoCopy.Signature_ == XBOX_REFURB_INFO_SIGNATURE) // No signature - clear output buffer : @@ -538,7 +538,7 @@ XBSYSAPI EXPORTNUM(25) xbox::NTSTATUS NTAPI xbox::ExReadWriteRefurbInfo } } else - Result = STATUS_UNSUCCESSFUL; // This may never happen! + Result = xbox::status_unsuccessful; // This may never happen! */ LOG_IGNORED(); @@ -550,7 +550,7 @@ XBSYSAPI EXPORTNUM(25) xbox::NTSTATUS NTAPI xbox::ExReadWriteRefurbInfo // * 0x001A - ExRaiseException() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(26) xbox::VOID NTAPI xbox::ExRaiseException +XBSYSAPI EXPORTNUM(26) xbox::void_xt NTAPI xbox::ExRaiseException ( IN PEXCEPTION_RECORD ExceptionRecord ) @@ -565,9 +565,9 @@ XBSYSAPI EXPORTNUM(26) xbox::VOID NTAPI xbox::ExRaiseException // * 0x001B - ExRaiseStatus() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(27) xbox::VOID NTAPI xbox::ExRaiseStatus +XBSYSAPI EXPORTNUM(27) xbox::void_xt NTAPI xbox::ExRaiseStatus ( - IN NTSTATUS Status + IN ntstatus_xt Status ) { LOG_FUNC_ONE_ARG(Status); @@ -579,7 +579,7 @@ XBSYSAPI EXPORTNUM(27) xbox::VOID NTAPI xbox::ExRaiseStatus // * 0x001C - ExReleaseReadWriteLock() // ****************************************************************** // Source:APILogger - Uncertain -XBSYSAPI EXPORTNUM(28) xbox::VOID NTAPI xbox::ExReleaseReadWriteLock +XBSYSAPI EXPORTNUM(28) xbox::void_xt NTAPI xbox::ExReleaseReadWriteLock ( IN PERWLOCK ReadWriteLock ) @@ -600,7 +600,7 @@ XBSYSAPI EXPORTNUM(28) xbox::VOID NTAPI xbox::ExReleaseReadWriteLock ReadWriteLock->ReadersEntryCount = ReadWriteLock->ReadersWaitingCount; ReadWriteLock->ReadersWaitingCount = 0; RestoreInterruptMode(interrupt_mode); - KeReleaseSemaphore(&ReadWriteLock->ReaderSemaphore, 1, (LONG)orig_readers_waiting, 0); + KeReleaseSemaphore(&ReadWriteLock->ReaderSemaphore, 1, (long_xt)orig_readers_waiting, 0); return; } } @@ -620,12 +620,12 @@ XBSYSAPI EXPORTNUM(28) xbox::VOID NTAPI xbox::ExReleaseReadWriteLock // ****************************************************************** // * 0x001D - ExSaveNonVolatileSetting() // ****************************************************************** -XBSYSAPI EXPORTNUM(29) xbox::NTSTATUS NTAPI xbox::ExSaveNonVolatileSetting +XBSYSAPI EXPORTNUM(29) xbox::ntstatus_xt NTAPI xbox::ExSaveNonVolatileSetting ( - IN DWORD ValueIndex, - IN DWORD Type, + IN dword_xt ValueIndex, + IN dword_xt Type, IN PVOID Value, - IN SIZE_T ValueLength + IN size_xt ValueLength ) { LOG_FUNC_BEGIN @@ -635,13 +635,13 @@ XBSYSAPI EXPORTNUM(29) xbox::NTSTATUS NTAPI xbox::ExSaveNonVolatileSetting LOG_FUNC_ARG(ValueLength) LOG_FUNC_END; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = xbox::status_success; void * value_addr = nullptr; DWORD result_length; // Don't allow writing to the eeprom encrypted area if (ValueIndex == XC_ENCRYPTED_SECTION) - RETURN(STATUS_OBJECT_NAME_NOT_FOUND); + RETURN(xbox::status_object_name_not_found); // handle eeprom write if (g_bIsDebug || ValueIndex <= XC_MAX_OS || ValueIndex > XC_MAX_FACTORY) @@ -683,7 +683,7 @@ XBSYSAPI EXPORTNUM(29) xbox::NTSTATUS NTAPI xbox::ExSaveNonVolatileSetting } } else { - Status = STATUS_OBJECT_NAME_NOT_FOUND; + Status = xbox::status_object_name_not_found; } RETURN(Status); diff --git a/src/core/kernel/exports/EmuKrnlFs.cpp b/src/core/kernel/exports/EmuKrnlFs.cpp index 9edc2889c..cb5e8b30d 100644 --- a/src/core/kernel/exports/EmuKrnlFs.cpp +++ b/src/core/kernel/exports/EmuKrnlFs.cpp @@ -28,7 +28,7 @@ #define LOG_PREFIX CXBXR_MODULE::FSC -#include // For FscGetCacheSize, etc. +#include // For FscGetCacheSize, etc. #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" @@ -43,12 +43,12 @@ namespace NtDll #define FSCACHE_MAXIMUM_NUMBER_OF_CACHE_PAGES 2048 // global variables -xbox::LONG g_FscNumberOfCachePages = 16; // 16 = default number of file system cache pages +xbox::long_xt g_FscNumberOfCachePages = 16; // 16 = default number of file system cache pages // ****************************************************************** // * 0x0023 - FscGetCacheSize() // ****************************************************************** -XBSYSAPI EXPORTNUM(35) xbox::ULONG NTAPI xbox::FscGetCacheSize() +XBSYSAPI EXPORTNUM(35) xbox::ulong_xt NTAPI xbox::FscGetCacheSize() { LOG_FUNC(); @@ -58,7 +58,7 @@ XBSYSAPI EXPORTNUM(35) xbox::ULONG NTAPI xbox::FscGetCacheSize() // ****************************************************************** // * 0x0024 - FscInvalidateIdleBlocks() // ****************************************************************** -XBSYSAPI EXPORTNUM(36) xbox::VOID NTAPI xbox::FscInvalidateIdleBlocks() +XBSYSAPI EXPORTNUM(36) xbox::void_xt NTAPI xbox::FscInvalidateIdleBlocks() { LOG_FUNC(); @@ -67,7 +67,7 @@ XBSYSAPI EXPORTNUM(36) xbox::VOID NTAPI xbox::FscInvalidateIdleBlocks() static xbox::KEVENT g_FscCacheEvent; -xbox::VOID xbox::InitializeFscCacheEvent() +xbox::void_xt xbox::InitializeFscCacheEvent() { KeInitializeEvent(&g_FscCacheEvent, SynchronizationEvent, TRUE); } @@ -75,14 +75,14 @@ xbox::VOID xbox::InitializeFscCacheEvent() // ****************************************************************** // * 0x0025 - FscSetCacheSize() // ****************************************************************** -XBSYSAPI EXPORTNUM(37) xbox::NTSTATUS NTAPI xbox::FscSetCacheSize +XBSYSAPI EXPORTNUM(37) xbox::ntstatus_xt NTAPI xbox::FscSetCacheSize ( - ULONG NumberOfCachePages + ulong_xt NumberOfCachePages ) { LOG_FUNC_ONE_ARG(NumberOfCachePages); - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; KeWaitForSingleObject(&g_FscCacheEvent, Executive, 0, 0, 0); UCHAR orig_irql = KeRaiseIrqlToDpcLevel(); diff --git a/src/core/kernel/exports/EmuKrnlHal.cpp b/src/core/kernel/exports/EmuKrnlHal.cpp index 36d6a2dda..043ccf87c 100644 --- a/src/core/kernel/exports/EmuKrnlHal.cpp +++ b/src/core/kernel/exports/EmuKrnlHal.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX CXBXR_MODULE::HAL -#include // For HalReadSMCTrayState, etc. +#include // For HalReadSMCTrayState, etc. #include // For PathRemoveFileSpec() #include "Logging.h" // For LOG_FUNC() #include "EmuKrnl.h" // For InitializeListHead(), etc. @@ -78,10 +78,10 @@ static DWORD g_TrayCount = 0; // ****************************************************************** // * 0x0009 - HalReadSMCTrayState() // ****************************************************************** -XBSYSAPI EXPORTNUM(9) xbox::NTSTATUS NTAPI xbox::HalReadSMCTrayState +XBSYSAPI EXPORTNUM(9) xbox::ntstatus_xt NTAPI xbox::HalReadSMCTrayState ( - DWORD* State, - DWORD* Count + dword_xt* State, + dword_xt* Count ) { LOG_FUNC_BEGIN @@ -94,9 +94,9 @@ XBSYSAPI EXPORTNUM(9) xbox::NTSTATUS NTAPI xbox::HalReadSMCTrayState DWORD orig_TrayCount = g_TrayCount; KfLowerIrql(orig_irql); - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; if (TrayState == INIT_TRAY_STATE) { - ret = HalReadSMBusValue(SMBUS_ADDRESS_SYSTEM_MICRO_CONTROLLER, SMC_COMMAND_TRAY_STATE, 0, &TrayState); + ret = HalReadSMBusValue(SMBUS_ADDRESS_SYSTEM_MICRO_CONTROLLER, SMC_COMMAND_TRAY_STATE, 0, (PULONG)&TrayState); // If bit 31 = 1, then there is an error so do not execute this code. if ((ret >> 31) == 0) { TrayState &= 0x70; @@ -125,7 +125,7 @@ XBSYSAPI EXPORTNUM(9) xbox::NTSTATUS NTAPI xbox::HalReadSMCTrayState // * 0x0026 - HalClearSoftwareInterrupt() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(38) xbox::VOID FASTCALL xbox::HalClearSoftwareInterrupt +XBSYSAPI EXPORTNUM(38) xbox::void_xt FASTCALL xbox::HalClearSoftwareInterrupt ( KIRQL Request ) @@ -140,9 +140,9 @@ XBSYSAPI EXPORTNUM(38) xbox::VOID FASTCALL xbox::HalClearSoftwareInterrupt // ****************************************************************** // * 0x0027 - HalDisableSystemInterrupt() // ****************************************************************** -XBSYSAPI EXPORTNUM(39) xbox::VOID NTAPI xbox::HalDisableSystemInterrupt +XBSYSAPI EXPORTNUM(39) xbox::void_xt NTAPI xbox::HalDisableSystemInterrupt ( - IN ULONG BusInterruptLevel + IN ulong_xt BusInterruptLevel ) { LOG_FUNC_ONE_ARG(BusInterruptLevel); @@ -155,7 +155,7 @@ XBSYSAPI EXPORTNUM(39) xbox::VOID NTAPI xbox::HalDisableSystemInterrupt // ****************************************************************** // This specifies the number of Cache partitions available for game data caching // On real hardware, there are three, generally known as X, Y and Z in homebrew -XBSYSAPI EXPORTNUM(40) xbox::ULONG xbox::HalDiskCachePartitionCount = 3; +XBSYSAPI EXPORTNUM(40) xbox::ulong_xt xbox::HalDiskCachePartitionCount = 3; // ****************************************************************** // * 0x0029 - HalDiskModelNumber @@ -172,9 +172,9 @@ XBSYSAPI EXPORTNUM(42) xbox::PANSI_STRING xbox::HalDiskSerialNumber = 0; // ****************************************************************** // * 0x002B - HalEnableSystemInterrupt() // ****************************************************************** -XBSYSAPI EXPORTNUM(43) xbox::VOID NTAPI xbox::HalEnableSystemInterrupt +XBSYSAPI EXPORTNUM(43) xbox::void_xt NTAPI xbox::HalEnableSystemInterrupt ( - IN ULONG BusInterruptLevel, + IN ulong_xt BusInterruptLevel, IN KINTERRUPT_MODE InterruptMode ) { @@ -224,9 +224,9 @@ char *IRQNames[MAX_BUS_INTERRUPT_LEVEL + 1] = // ****************************************************************** // * 0x002C - HalGetInterruptVector() // ****************************************************************** -XBSYSAPI EXPORTNUM(44) xbox::ULONG NTAPI xbox::HalGetInterruptVector +XBSYSAPI EXPORTNUM(44) xbox::ulong_xt NTAPI xbox::HalGetInterruptVector ( - IN ULONG BusInterruptLevel, + IN ulong_xt BusInterruptLevel, OUT PKIRQL Irql ) { @@ -261,11 +261,11 @@ XBSYSAPI EXPORTNUM(44) xbox::ULONG NTAPI xbox::HalGetInterruptVector // ****************************************************************** // * 0x002D - HalReadSMBusValue() // ****************************************************************** -XBSYSAPI EXPORTNUM(45) xbox::NTSTATUS NTAPI xbox::HalReadSMBusValue +XBSYSAPI EXPORTNUM(45) xbox::ntstatus_xt NTAPI xbox::HalReadSMBusValue ( - IN UCHAR Address, - IN UCHAR Command, - IN BOOLEAN ReadWord, + IN uchar_xt Address, + IN uchar_xt Command, + IN boolean_xt ReadWord, OUT PULONG DataValue ) { @@ -278,7 +278,7 @@ XBSYSAPI EXPORTNUM(45) xbox::NTSTATUS NTAPI xbox::HalReadSMBusValue // TODO : Prevent interrupts - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = xbox::status_success; // ergo720: the or 1 on the address is necessary because I have seen that UnleashX and RDX dashboard pass 0x20 instead of the // expected 0x21 to this function when reading cpu and m/b temperatures @@ -293,7 +293,7 @@ XBSYSAPI EXPORTNUM(45) xbox::NTSTATUS NTAPI xbox::HalReadSMBusValue // Check if the command was executed successfully if (g_SMBus->IORead(1, SMB_GLOBAL_STATUS) & GS_PRERR_STS) { - Status = STATUS_UNSUCCESSFUL; + Status = xbox::status_unsuccessful; } else { *DataValue = g_SMBus->IORead(1, SMB_HOST_DATA); @@ -310,14 +310,14 @@ XBSYSAPI EXPORTNUM(45) xbox::NTSTATUS NTAPI xbox::HalReadSMBusValue // * 0x002E - HalReadWritePCISpace() // ****************************************************************** // Source:OpenXDK -XBSYSAPI EXPORTNUM(46) xbox::VOID NTAPI xbox::HalReadWritePCISpace +XBSYSAPI EXPORTNUM(46) xbox::void_xt NTAPI xbox::HalReadWritePCISpace ( - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN ULONG RegisterNumber, + IN ulong_xt BusNumber, + IN ulong_xt SlotNumber, + IN ulong_xt RegisterNumber, IN PVOID Buffer, - IN ULONG Length, - IN BOOLEAN WritePCISpace + IN ulong_xt Length, + IN boolean_xt WritePCISpace ) { LOG_FUNC_BEGIN @@ -355,7 +355,7 @@ XBSYSAPI EXPORTNUM(46) xbox::VOID NTAPI xbox::HalReadWritePCISpace int ByteOffset = RegisterNumber % sizeof(ULONG); int Size = RegisterDataSizes[RegisterNumber % sizeof(ULONG)][Length % sizeof(ULONG)]; - EmuX86_IOWrite((xbox::addr)PCI_TYPE1_ADDR_PORT, CfgBits.u.AsULONG, sizeof(uint32_t)); + EmuX86_IOWrite((xbox::addr_xt)PCI_TYPE1_ADDR_PORT, CfgBits.u.AsULONG, sizeof(uint32_t)); if (WritePCISpace) { EmuX86_IOWrite(PCI_TYPE1_DATA_PORT, *((PUCHAR)Buffer), Size); @@ -386,10 +386,10 @@ XBSYSAPI EXPORTNUM(46) xbox::VOID NTAPI xbox::HalReadWritePCISpace // ****************************************************************** // * 0x002F - HalRegisterShutdownNotification() // ****************************************************************** -XBSYSAPI EXPORTNUM(47) xbox::VOID NTAPI xbox::HalRegisterShutdownNotification +XBSYSAPI EXPORTNUM(47) xbox::void_xt NTAPI xbox::HalRegisterShutdownNotification ( IN PHAL_SHUTDOWN_REGISTRATION ShutdownRegistration, - IN BOOLEAN Register + IN boolean_xt Register ) { LOG_FUNC_BEGIN @@ -446,7 +446,7 @@ uint8_t SoftwareInterruptLookupTable[] = { // * 0x0030 - HalRequestSoftwareInterrupt() // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(48) xbox::VOID FASTCALL xbox::HalRequestSoftwareInterrupt +XBSYSAPI EXPORTNUM(48) xbox::void_xt FASTCALL xbox::HalRequestSoftwareInterrupt ( IN KIRQL Request ) @@ -480,7 +480,7 @@ XBSYSAPI EXPORTNUM(48) xbox::VOID FASTCALL xbox::HalRequestSoftwareInterrupt // ****************************************************************** // * 0x0031 - HalReturnToFirmware() // ****************************************************************** -XBSYSAPI EXPORTNUM(49) xbox::VOID DECLSPEC_NORETURN NTAPI xbox::HalReturnToFirmware +XBSYSAPI EXPORTNUM(49) xbox::void_xt DECLSPEC_NORETURN NTAPI xbox::HalReturnToFirmware ( RETURN_FIRMWARE Routine ) @@ -651,12 +651,12 @@ XBSYSAPI EXPORTNUM(49) xbox::VOID DECLSPEC_NORETURN NTAPI xbox::HalReturnToFirmw // ****************************************************************** // * 0x0032 - HalWriteSMBusValue() // ****************************************************************** -XBSYSAPI EXPORTNUM(50) xbox::NTSTATUS NTAPI xbox::HalWriteSMBusValue +XBSYSAPI EXPORTNUM(50) xbox::ntstatus_xt NTAPI xbox::HalWriteSMBusValue ( - IN UCHAR Address, - IN UCHAR Command, - IN BOOLEAN WriteWord, - IN ULONG DataValue + IN uchar_xt Address, + IN uchar_xt Command, + IN boolean_xt WriteWord, + IN ulong_xt DataValue ) { LOG_FUNC_BEGIN @@ -668,7 +668,7 @@ XBSYSAPI EXPORTNUM(50) xbox::NTSTATUS NTAPI xbox::HalWriteSMBusValue // TODO : Prevent interrupts - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = xbox::status_success; g_SMBus->IOWrite(1, SMB_HOST_ADDRESS, Address); g_SMBus->IOWrite(1, SMB_HOST_COMMAND, Command); @@ -683,7 +683,7 @@ XBSYSAPI EXPORTNUM(50) xbox::NTSTATUS NTAPI xbox::HalWriteSMBusValue // Check if the command was executed successfully if (g_SMBus->IORead(1, SMB_GLOBAL_STATUS) & GS_PRERR_STS) { - Status = STATUS_UNSUCCESSFUL; + Status = xbox::status_unsuccessful; } // TODO : Reenable interrupts @@ -694,11 +694,11 @@ XBSYSAPI EXPORTNUM(50) xbox::NTSTATUS NTAPI xbox::HalWriteSMBusValue // ****************************************************************** // * 0x0149 - READ_PORT_BUFFER_UCHAR() // ****************************************************************** -XBSYSAPI EXPORTNUM(329) xbox::VOID NTAPI xbox::READ_PORT_BUFFER_UCHAR +XBSYSAPI EXPORTNUM(329) xbox::void_xt NTAPI xbox::READ_PORT_BUFFER_UCHAR ( IN PUCHAR Port, IN PUCHAR Buffer, - IN ULONG Count + IN ulong_xt Count ) { LOG_FUNC_BEGIN @@ -708,17 +708,17 @@ XBSYSAPI EXPORTNUM(329) xbox::VOID NTAPI xbox::READ_PORT_BUFFER_UCHAR LOG_FUNC_END; while (Count-- > 0) - *Buffer++ = (uint8_t)EmuX86_IORead((xbox::addr)Port, sizeof(uint8_t)); + *Buffer++ = (uint8_t)EmuX86_IORead((xbox::addr_xt)Port, sizeof(uint8_t)); } // ****************************************************************** // * 0x014A - READ_PORT_BUFFER_USHORT() // ****************************************************************** -XBSYSAPI EXPORTNUM(330) xbox::VOID NTAPI xbox::READ_PORT_BUFFER_USHORT +XBSYSAPI EXPORTNUM(330) xbox::void_xt NTAPI xbox::READ_PORT_BUFFER_USHORT ( IN PUSHORT Port, IN PUSHORT Buffer, - IN ULONG Count + IN ulong_xt Count ) { LOG_FUNC_BEGIN @@ -728,17 +728,17 @@ XBSYSAPI EXPORTNUM(330) xbox::VOID NTAPI xbox::READ_PORT_BUFFER_USHORT LOG_FUNC_END; while (Count-- > 0) - *Buffer++ = (uint16_t)EmuX86_IORead((xbox::addr)Port, sizeof(uint16_t)); + *Buffer++ = (uint16_t)EmuX86_IORead((xbox::addr_xt)Port, sizeof(uint16_t)); } // ****************************************************************** // * 0x014B - READ_PORT_BUFFER_ULONG() // ****************************************************************** -XBSYSAPI EXPORTNUM(331) xbox::VOID NTAPI xbox::READ_PORT_BUFFER_ULONG +XBSYSAPI EXPORTNUM(331) xbox::void_xt NTAPI xbox::READ_PORT_BUFFER_ULONG ( IN PULONG Port, IN PULONG Buffer, - IN ULONG Count + IN ulong_xt Count ) { LOG_FUNC_BEGIN @@ -748,17 +748,17 @@ XBSYSAPI EXPORTNUM(331) xbox::VOID NTAPI xbox::READ_PORT_BUFFER_ULONG LOG_FUNC_END; while (Count-- > 0) - *Buffer++ = EmuX86_IORead((xbox::addr)Port, sizeof(uint32_t)); + *Buffer++ = EmuX86_IORead((xbox::addr_xt)Port, sizeof(uint32_t)); } // ****************************************************************** // * 0x014C - WRITE_PORT_BUFFER_UCHAR() // ****************************************************************** -XBSYSAPI EXPORTNUM(332) xbox::VOID NTAPI xbox::WRITE_PORT_BUFFER_UCHAR +XBSYSAPI EXPORTNUM(332) xbox::void_xt NTAPI xbox::WRITE_PORT_BUFFER_UCHAR ( IN PUCHAR Port, IN PUCHAR Buffer, - IN ULONG Count + IN ulong_xt Count ) { LOG_FUNC_BEGIN @@ -768,17 +768,17 @@ XBSYSAPI EXPORTNUM(332) xbox::VOID NTAPI xbox::WRITE_PORT_BUFFER_UCHAR LOG_FUNC_END; while (Count-- > 0) - EmuX86_IOWrite((xbox::addr)Port, *Buffer++, sizeof(uint8_t)); + EmuX86_IOWrite((xbox::addr_xt)Port, *Buffer++, sizeof(uint8_t)); } // ****************************************************************** // * 0x014D - WRITE_PORT_BUFFER_USHORT() // ****************************************************************** -XBSYSAPI EXPORTNUM(333) xbox::VOID NTAPI xbox::WRITE_PORT_BUFFER_USHORT +XBSYSAPI EXPORTNUM(333) xbox::void_xt NTAPI xbox::WRITE_PORT_BUFFER_USHORT ( IN PUSHORT Port, IN PUSHORT Buffer, - IN ULONG Count + IN ulong_xt Count ) { LOG_FUNC_BEGIN @@ -788,17 +788,17 @@ XBSYSAPI EXPORTNUM(333) xbox::VOID NTAPI xbox::WRITE_PORT_BUFFER_USHORT LOG_FUNC_END; while (Count-- > 0) - EmuX86_IOWrite((xbox::addr)Port, *Buffer++, sizeof(uint16_t)); + EmuX86_IOWrite((xbox::addr_xt)Port, *Buffer++, sizeof(uint16_t)); } // ****************************************************************** // * 0x014E - WRITE_PORT_BUFFER_ULONG() // ****************************************************************** -XBSYSAPI EXPORTNUM(334) xbox::VOID NTAPI xbox::WRITE_PORT_BUFFER_ULONG +XBSYSAPI EXPORTNUM(334) xbox::void_xt NTAPI xbox::WRITE_PORT_BUFFER_ULONG ( IN PULONG Port, IN PULONG Buffer, - IN ULONG Count + IN ulong_xt Count ) { LOG_FUNC_BEGIN @@ -808,20 +808,20 @@ XBSYSAPI EXPORTNUM(334) xbox::VOID NTAPI xbox::WRITE_PORT_BUFFER_ULONG LOG_FUNC_END; while (Count-- > 0) - EmuX86_IOWrite((xbox::addr)Port, *Buffer++, sizeof(uint32_t)); + EmuX86_IOWrite((xbox::addr_xt)Port, *Buffer++, sizeof(uint32_t)); } // ****************************************************************** // * 0x0164 - HalBootSMCVideoMode // ****************************************************************** // TODO: This should be set to whichever AV Pack is read from the SMC at boot time -XBSYSAPI EXPORTNUM(356) xbox::DWORD xbox::HalBootSMCVideoMode = 1; // TODO : AV_PACK_STANDARD? +XBSYSAPI EXPORTNUM(356) xbox::dword_xt xbox::HalBootSMCVideoMode = 1; // TODO : AV_PACK_STANDARD? // ****************************************************************** // * 0x0166 - HalIsResetOrShutdownPending() // ****************************************************************** // Source:Dxbx -XBSYSAPI EXPORTNUM(358) xbox::BOOLEAN NTAPI xbox::HalIsResetOrShutdownPending +XBSYSAPI EXPORTNUM(358) xbox::boolean_xt NTAPI xbox::HalIsResetOrShutdownPending ( ) { @@ -838,7 +838,7 @@ XBSYSAPI EXPORTNUM(358) xbox::BOOLEAN NTAPI xbox::HalIsResetOrShutdownPending // * 0x0168 - HalInitiateShutdown() // ****************************************************************** // Source:Dxbx -XBSYSAPI EXPORTNUM(360) xbox::NTSTATUS NTAPI xbox::HalInitiateShutdown +XBSYSAPI EXPORTNUM(360) xbox::ntstatus_xt NTAPI xbox::HalInitiateShutdown ( ) { @@ -859,7 +859,7 @@ XBSYSAPI EXPORTNUM(360) xbox::NTSTATUS NTAPI xbox::HalInitiateShutdown // // New to the XBOX. // Source:XBMC Undocumented.h -XBSYSAPI EXPORTNUM(365) xbox::VOID NTAPI xbox::HalEnableSecureTrayEject +XBSYSAPI EXPORTNUM(365) xbox::void_xt NTAPI xbox::HalEnableSecureTrayEject ( ) { @@ -872,9 +872,9 @@ XBSYSAPI EXPORTNUM(365) xbox::VOID NTAPI xbox::HalEnableSecureTrayEject // * 0x016E - HalWriteSMCScratchRegister() // ****************************************************************** // Source:Dxbx -XBSYSAPI EXPORTNUM(366) xbox::NTSTATUS NTAPI xbox::HalWriteSMCScratchRegister +XBSYSAPI EXPORTNUM(366) xbox::ntstatus_xt NTAPI xbox::HalWriteSMCScratchRegister ( - IN DWORD ScratchRegister + IN dword_xt ScratchRegister ) { LOG_FUNC_ONE_ARG(ScratchRegister); diff --git a/src/core/kernel/exports/EmuKrnlIo.cpp b/src/core/kernel/exports/EmuKrnlIo.cpp index bc27018ec..471c6f9ab 100644 --- a/src/core/kernel/exports/EmuKrnlIo.cpp +++ b/src/core/kernel/exports/EmuKrnlIo.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX CXBXR_MODULE::IO -#include // For IoCompletionObjectType, etc. +#include // For IoCompletionObjectType, etc. #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup @@ -42,7 +42,7 @@ // ****************************************************************** XBSYSAPI EXPORTNUM(59) xbox::PVOID NTAPI xbox::IoAllocateIrp ( - IN CCHAR StackSize + IN cchar_xt StackSize ) { LOG_FUNC_ONE_ARG(StackSize); @@ -59,10 +59,10 @@ XBSYSAPI EXPORTNUM(59) xbox::PVOID NTAPI xbox::IoAllocateIrp // ****************************************************************** XBSYSAPI EXPORTNUM(60) xbox::PVOID NTAPI xbox::IoBuildAsynchronousFsdRequest ( - IN ULONG MajorFunction, + IN ulong_xt MajorFunction, IN PDEVICE_OBJECT DeviceObject, OUT PVOID Buffer OPTIONAL, - IN ULONG Length, + IN ulong_xt Length, OUT PLARGE_INTEGER StartingOffset OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock OPTIONAL ) @@ -88,13 +88,13 @@ XBSYSAPI EXPORTNUM(60) xbox::PVOID NTAPI xbox::IoBuildAsynchronousFsdRequest // ****************************************************************** XBSYSAPI EXPORTNUM(61) xbox::PVOID NTAPI xbox::IoBuildDeviceIoControlRequest ( - IN ULONG IoControlCode, + IN ulong_xt IoControlCode, IN PDEVICE_OBJECT DeviceObject, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, + IN ulong_xt InputBufferLength, OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength OPTIONAL, - IN BOOLEAN InternalDeviceIoControl, + IN ulong_xt OutputBufferLength OPTIONAL, + IN boolean_xt InternalDeviceIoControl, IN PKEVENT Event, OUT PIO_STATUS_BLOCK IoStatusBlock OPTIONAL ) @@ -123,10 +123,10 @@ XBSYSAPI EXPORTNUM(61) xbox::PVOID NTAPI xbox::IoBuildDeviceIoControlRequest // ****************************************************************** XBSYSAPI EXPORTNUM(62) xbox::PVOID NTAPI xbox::IoBuildSynchronousFsdRequest ( - IN ULONG MajorFunction, + IN ulong_xt MajorFunction, IN PDEVICE_OBJECT DeviceObject, OUT PVOID Buffer OPTIONAL, - IN ULONG Length, + IN ulong_xt Length, OUT PLARGE_INTEGER StartingOffset OPTIONAL, IN PKEVENT Event, OUT PIO_STATUS_BLOCK IoStatusBlock @@ -152,13 +152,13 @@ XBSYSAPI EXPORTNUM(62) xbox::PVOID NTAPI xbox::IoBuildSynchronousFsdRequest // ****************************************************************** // * 0x003F - IoCheckShareAccess() // ****************************************************************** -XBSYSAPI EXPORTNUM(63) xbox::NTSTATUS NTAPI xbox::IoCheckShareAccess +XBSYSAPI EXPORTNUM(63) xbox::ntstatus_xt NTAPI xbox::IoCheckShareAccess ( - IN ACCESS_MASK DesiredAccess, - IN ULONG DesiredShareAccess, + IN access_mask_xt DesiredAccess, + IN ulong_xt DesiredShareAccess, OUT PFILE_OBJECT FileObject, OUT PSHARE_ACCESS ShareAccess, - IN BOOLEAN Update + IN boolean_xt Update ) { LOG_FUNC_BEGIN @@ -191,13 +191,13 @@ XBSYSAPI EXPORTNUM(64) xbox::OBJECT_TYPE xbox::IoCompletionObjectType = // ****************************************************************** // * 0x0041 - IoCreateDevice() // ****************************************************************** -XBSYSAPI EXPORTNUM(65) xbox::NTSTATUS NTAPI xbox::IoCreateDevice +XBSYSAPI EXPORTNUM(65) xbox::ntstatus_xt NTAPI xbox::IoCreateDevice ( IN PDRIVER_OBJECT DriverObject, - IN ULONG DeviceExtensionSize, + IN ulong_xt DeviceExtensionSize, IN PSTRING DeviceName OPTIONAL, - IN ULONG DeviceType, - IN BOOLEAN Exclusive, + IN ulong_xt DeviceType, + IN boolean_xt Exclusive, OUT PDEVICE_OBJECT* DeviceObject ) { @@ -212,24 +212,24 @@ XBSYSAPI EXPORTNUM(65) xbox::NTSTATUS NTAPI xbox::IoCreateDevice LOG_UNIMPLEMENTED(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x0042 - IoCreateFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(66) xbox::NTSTATUS NTAPI xbox::IoCreateFile +XBSYSAPI EXPORTNUM(66) xbox::ntstatus_xt NTAPI xbox::IoCreateFile ( OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, + IN access_mask_xt DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PIO_STATUS_BLOCK IoStatusBlock, IN PLARGE_INTEGER AllocationSize OPTIONAL, - IN ULONG FileAttributes, - IN ULONG ShareAccess, - IN ULONG Disposition, - IN ULONG CreateOptions, - IN ULONG Options + IN ulong_xt FileAttributes, + IN ulong_xt ShareAccess, + IN ulong_xt Disposition, + IN ulong_xt CreateOptions, + IN ulong_xt Options ) { LOG_FUNC_BEGIN @@ -303,7 +303,7 @@ XBSYSAPI EXPORTNUM(66) xbox::NTSTATUS NTAPI xbox::IoCreateFile // ****************************************************************** // * 0x0043 - IoCreateSymbolicLink() // ****************************************************************** -XBSYSAPI EXPORTNUM(67) xbox::NTSTATUS NTAPI xbox::IoCreateSymbolicLink +XBSYSAPI EXPORTNUM(67) xbox::ntstatus_xt NTAPI xbox::IoCreateSymbolicLink ( IN PSTRING SymbolicLinkName, IN PSTRING DeviceName @@ -322,7 +322,7 @@ XBSYSAPI EXPORTNUM(67) xbox::NTSTATUS NTAPI xbox::IoCreateSymbolicLink // ****************************************************************** // * 0x0044 - IoDeleteDevice() // ****************************************************************** -XBSYSAPI EXPORTNUM(68) xbox::VOID NTAPI xbox::IoDeleteDevice +XBSYSAPI EXPORTNUM(68) xbox::void_xt NTAPI xbox::IoDeleteDevice ( IN PDEVICE_OBJECT Irql ) @@ -335,7 +335,7 @@ XBSYSAPI EXPORTNUM(68) xbox::VOID NTAPI xbox::IoDeleteDevice // ****************************************************************** // * 0x0045 - IoDeleteSymbolicLink() // ****************************************************************** -XBSYSAPI EXPORTNUM(69) xbox::NTSTATUS NTAPI xbox::IoDeleteSymbolicLink +XBSYSAPI EXPORTNUM(69) xbox::ntstatus_xt NTAPI xbox::IoDeleteSymbolicLink ( IN PSTRING SymbolicLinkName ) @@ -344,7 +344,7 @@ XBSYSAPI EXPORTNUM(69) xbox::NTSTATUS NTAPI xbox::IoDeleteSymbolicLink EmuNtSymbolicLinkObject* symbolicLink = FindNtSymbolicLinkObjectByName(PSTRING_to_string(SymbolicLinkName)); - NTSTATUS ret = STATUS_OBJECT_NAME_NOT_FOUND; + NTSTATUS ret = xbox::status_object_name_not_found; if (symbolicLink != NULL) // Destroy the object once all handles to it are closed too : @@ -384,7 +384,7 @@ XBSYSAPI EXPORTNUM(71) xbox::OBJECT_TYPE xbox::IoFileObjectType = // ****************************************************************** // * 0x0048 - IoFreeIrp() // ****************************************************************** -XBSYSAPI EXPORTNUM(72) xbox::VOID NTAPI xbox::IoFreeIrp +XBSYSAPI EXPORTNUM(72) xbox::void_xt NTAPI xbox::IoFreeIrp ( IN PIRP Irp ) @@ -400,8 +400,8 @@ XBSYSAPI EXPORTNUM(72) xbox::VOID NTAPI xbox::IoFreeIrp XBSYSAPI EXPORTNUM(73) xbox::PVOID NTAPI xbox::IoInitializeIrp ( IN PIRP Irp, - IN USHORT PacketSize, - IN CCHAR StackSize + IN ushort_xt PacketSize, + IN cchar_xt StackSize ) { LOG_FUNC_BEGIN @@ -420,7 +420,7 @@ XBSYSAPI EXPORTNUM(73) xbox::PVOID NTAPI xbox::IoInitializeIrp // ****************************************************************** // * 0x004A - IoInvalidDeviceRequest() // ****************************************************************** -XBSYSAPI EXPORTNUM(74) xbox::NTSTATUS NTAPI xbox::IoInvalidDeviceRequest +XBSYSAPI EXPORTNUM(74) xbox::ntstatus_xt NTAPI xbox::IoInvalidDeviceRequest ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -439,11 +439,11 @@ XBSYSAPI EXPORTNUM(74) xbox::NTSTATUS NTAPI xbox::IoInvalidDeviceRequest // ****************************************************************** // * 0x004B - IoQueryFileInformation() // ****************************************************************** -XBSYSAPI EXPORTNUM(75) xbox::NTSTATUS NTAPI xbox::IoQueryFileInformation +XBSYSAPI EXPORTNUM(75) xbox::ntstatus_xt NTAPI xbox::IoQueryFileInformation ( IN PFILE_OBJECT FileObject, IN FILE_INFORMATION_CLASS FileInformationClass, - IN ULONG Length, + IN ulong_xt Length, OUT PVOID FileInformation, OUT PULONG ReturnedLength ) @@ -465,11 +465,11 @@ XBSYSAPI EXPORTNUM(75) xbox::NTSTATUS NTAPI xbox::IoQueryFileInformation // ****************************************************************** // * 0x004C - IoQueryVolumeInformation() // ****************************************************************** -XBSYSAPI EXPORTNUM(76) xbox::NTSTATUS NTAPI xbox::IoQueryVolumeInformation +XBSYSAPI EXPORTNUM(76) xbox::ntstatus_xt NTAPI xbox::IoQueryVolumeInformation ( IN PFILE_OBJECT FileObject, IN FS_INFORMATION_CLASS FsInformationClass, - IN ULONG Length, + IN ulong_xt Length, OUT PVOID FsInformation, OUT PULONG ReturnedLength ) @@ -492,7 +492,7 @@ XBSYSAPI EXPORTNUM(76) xbox::NTSTATUS NTAPI xbox::IoQueryVolumeInformation // ****************************************************************** // * 0x004D - IoQueueThreadIrp() // ****************************************************************** -XBSYSAPI EXPORTNUM(77) xbox::VOID NTAPI xbox::IoQueueThreadIrp +XBSYSAPI EXPORTNUM(77) xbox::void_xt NTAPI xbox::IoQueueThreadIrp ( IN PIRP Irp ) @@ -505,7 +505,7 @@ XBSYSAPI EXPORTNUM(77) xbox::VOID NTAPI xbox::IoQueueThreadIrp // ****************************************************************** // * 0x004E - IoRemoveShareAccess() // ****************************************************************** -XBSYSAPI EXPORTNUM(78) xbox::VOID NTAPI xbox::IoRemoveShareAccess +XBSYSAPI EXPORTNUM(78) xbox::void_xt NTAPI xbox::IoRemoveShareAccess ( IN PFILE_OBJECT FileObject, IN PSHARE_ACCESS ShareAccess @@ -522,13 +522,13 @@ XBSYSAPI EXPORTNUM(78) xbox::VOID NTAPI xbox::IoRemoveShareAccess // ****************************************************************** // * 0x004F - IoSetIoCompletion() // ****************************************************************** -XBSYSAPI EXPORTNUM(79) xbox::NTSTATUS NTAPI xbox::IoSetIoCompletion +XBSYSAPI EXPORTNUM(79) xbox::ntstatus_xt NTAPI xbox::IoSetIoCompletion ( IN PKQUEUE IoCompletion, IN PVOID KeyContext, IN PVOID ApcContext, - IN NTSTATUS IoStatus, - IN ULONG IoStatusInformation + IN ntstatus_xt IoStatus, + IN ulong_xt IoStatusInformation ) { LOG_FUNC_BEGIN @@ -547,10 +547,10 @@ XBSYSAPI EXPORTNUM(79) xbox::NTSTATUS NTAPI xbox::IoSetIoCompletion // ****************************************************************** // * 0x0050 - IoSetShareAccess() // ****************************************************************** -XBSYSAPI EXPORTNUM(80) xbox::CCHAR NTAPI xbox::IoSetShareAccess +XBSYSAPI EXPORTNUM(80) xbox::cchar_xt NTAPI xbox::IoSetShareAccess ( - IN ULONG DesiredAccess, - IN ULONG DesiredShareAccess, + IN ulong_xt DesiredAccess, + IN ulong_xt DesiredShareAccess, IN PFILE_OBJECT FileObject, OUT PSHARE_ACCESS ShareAccess ) @@ -562,7 +562,7 @@ XBSYSAPI EXPORTNUM(80) xbox::CCHAR NTAPI xbox::IoSetShareAccess LOG_FUNC_ARG_OUT(ShareAccess) LOG_FUNC_END; - xbox::CCHAR ret = 0; // ShareAccess->OpenCount; + xbox::cchar_xt ret = 0; // ShareAccess->OpenCount; LOG_UNIMPLEMENTED(); @@ -572,7 +572,7 @@ XBSYSAPI EXPORTNUM(80) xbox::CCHAR NTAPI xbox::IoSetShareAccess // ****************************************************************** // * 0x0051 - IoStartNextPacket() // ****************************************************************** -XBSYSAPI EXPORTNUM(81) xbox::VOID NTAPI xbox::IoStartNextPacket +XBSYSAPI EXPORTNUM(81) xbox::void_xt NTAPI xbox::IoStartNextPacket ( IN PDEVICE_OBJECT DeviceObject ) @@ -585,10 +585,10 @@ XBSYSAPI EXPORTNUM(81) xbox::VOID NTAPI xbox::IoStartNextPacket // ****************************************************************** // * 0x0052 - IoStartNextPacketByKey() // ****************************************************************** -XBSYSAPI EXPORTNUM(82) xbox::VOID NTAPI xbox::IoStartNextPacketByKey +XBSYSAPI EXPORTNUM(82) xbox::void_xt NTAPI xbox::IoStartNextPacketByKey ( IN PDEVICE_OBJECT DeviceObject, - IN ULONG Key + IN ulong_xt Key ) { LOG_FUNC_BEGIN @@ -602,7 +602,7 @@ XBSYSAPI EXPORTNUM(82) xbox::VOID NTAPI xbox::IoStartNextPacketByKey // ****************************************************************** // * 0x0053 - IoStartPacket() // ****************************************************************** -XBSYSAPI EXPORTNUM(83) xbox::VOID NTAPI xbox::IoStartPacket +XBSYSAPI EXPORTNUM(83) xbox::void_xt NTAPI xbox::IoStartPacket ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -626,16 +626,16 @@ XBSYSAPI EXPORTNUM(83) xbox::VOID NTAPI xbox::IoStartPacket // blocking IOCTL on the specified device. // // New to the XBOX. -XBSYSAPI EXPORTNUM(84) xbox::NTSTATUS NTAPI xbox::IoSynchronousDeviceIoControlRequest +XBSYSAPI EXPORTNUM(84) xbox::ntstatus_xt NTAPI xbox::IoSynchronousDeviceIoControlRequest ( - IN ULONG IoControlCode, + IN ulong_xt IoControlCode, IN PDEVICE_OBJECT DeviceObject, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, + IN ulong_xt InputBufferLength, OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength, + IN ulong_xt OutputBufferLength, OUT PULONG ReturnedOutputBufferLength OPTIONAL, - IN BOOLEAN InternalDeviceIoControl + IN boolean_xt InternalDeviceIoControl ) { LOG_FUNC_BEGIN @@ -657,12 +657,12 @@ XBSYSAPI EXPORTNUM(84) xbox::NTSTATUS NTAPI xbox::IoSynchronousDeviceIoControlRe // ****************************************************************** // * 0x0055 - IoSynchronousFsdRequest() // ****************************************************************** -XBSYSAPI EXPORTNUM(85) xbox::NTSTATUS NTAPI xbox::IoSynchronousFsdRequest +XBSYSAPI EXPORTNUM(85) xbox::ntstatus_xt NTAPI xbox::IoSynchronousFsdRequest ( - IN ULONG MajorFunction, + IN ulong_xt MajorFunction, IN PDEVICE_OBJECT DeviceObject, OUT PVOID Buffer OPTIONAL, - IN ULONG Length, + IN ulong_xt Length, IN PLARGE_INTEGER StartingOffset OPTIONAL ) { @@ -682,7 +682,7 @@ XBSYSAPI EXPORTNUM(85) xbox::NTSTATUS NTAPI xbox::IoSynchronousFsdRequest // ****************************************************************** // * 0x0056 - IofCallDriver() // ****************************************************************** -XBSYSAPI EXPORTNUM(86) xbox::NTSTATUS FASTCALL xbox::IofCallDriver +XBSYSAPI EXPORTNUM(86) xbox::ntstatus_xt FASTCALL xbox::IofCallDriver ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -701,10 +701,10 @@ XBSYSAPI EXPORTNUM(86) xbox::NTSTATUS FASTCALL xbox::IofCallDriver // ****************************************************************** // * 0x0057 - IofCompleteRequest() // ****************************************************************** -XBSYSAPI EXPORTNUM(87) xbox::VOID FASTCALL xbox::IofCompleteRequest +XBSYSAPI EXPORTNUM(87) xbox::void_xt FASTCALL xbox::IofCompleteRequest ( IN PIRP Irp, - IN CCHAR PriorityBoost + IN cchar_xt PriorityBoost ) { LOG_FUNC_BEGIN @@ -718,14 +718,14 @@ XBSYSAPI EXPORTNUM(87) xbox::VOID FASTCALL xbox::IofCompleteRequest // ****************************************************************** // * 0x005A - IoDismountVolume() // ****************************************************************** -XBSYSAPI EXPORTNUM(90) xbox::NTSTATUS NTAPI xbox::IoDismountVolume +XBSYSAPI EXPORTNUM(90) xbox::ntstatus_xt NTAPI xbox::IoDismountVolume ( IN PDEVICE_OBJECT DeviceObject ) { LOG_FUNC_ONE_ARG(DeviceObject); - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; LOG_UNIMPLEMENTED(); @@ -735,14 +735,14 @@ XBSYSAPI EXPORTNUM(90) xbox::NTSTATUS NTAPI xbox::IoDismountVolume // ****************************************************************** // * 0x005B - IoDismountVolumeByName() // ****************************************************************** -XBSYSAPI EXPORTNUM(91) xbox::NTSTATUS NTAPI xbox::IoDismountVolumeByName +XBSYSAPI EXPORTNUM(91) xbox::ntstatus_xt NTAPI xbox::IoDismountVolumeByName ( IN PSTRING VolumeName ) { LOG_FUNC_ONE_ARG(VolumeName); - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; // TODO: Anything? LOG_UNIMPLEMENTED(); @@ -753,14 +753,14 @@ XBSYSAPI EXPORTNUM(91) xbox::NTSTATUS NTAPI xbox::IoDismountVolumeByName // ****************************************************************** // * 0x0167 - IoMarkIrpMustComplete() // ****************************************************************** -XBSYSAPI EXPORTNUM(359) xbox::CCHAR NTAPI xbox::IoMarkIrpMustComplete +XBSYSAPI EXPORTNUM(359) xbox::cchar_xt NTAPI xbox::IoMarkIrpMustComplete ( IN PIRP Irp ) { LOG_FUNC_ONE_ARG(Irp); - xbox::CCHAR ret = 0; // ShareAccess->OpenCount; + xbox::cchar_xt ret = 0; // ShareAccess->OpenCount; LOG_UNIMPLEMENTED(); diff --git a/src/core/kernel/exports/EmuKrnlKd.cpp b/src/core/kernel/exports/EmuKrnlKd.cpp index e74500ff7..8c11aa076 100644 --- a/src/core/kernel/exports/EmuKrnlKd.cpp +++ b/src/core/kernel/exports/EmuKrnlKd.cpp @@ -29,16 +29,16 @@ #define LOG_PREFIX CXBXR_MODULE::KD -#include // For KdDebuggerEnabled, etc. +#include // For KdDebuggerEnabled, etc. #include "Logging.h" // ****************************************************************** // * 0x0058 - KdDebuggerEnabled // ****************************************************************** -XBSYSAPI EXPORTNUM(88) xbox::BOOLEAN xbox::KdDebuggerEnabled = false; +XBSYSAPI EXPORTNUM(88) xbox::boolean_xt xbox::KdDebuggerEnabled = false; // ****************************************************************** // * 0x0059 - KdDebuggerNotPresent // ****************************************************************** // Source:ReactOS -XBSYSAPI EXPORTNUM(89) xbox::BOOLEAN xbox::KdDebuggerNotPresent = true; +XBSYSAPI EXPORTNUM(89) xbox::boolean_xt xbox::KdDebuggerNotPresent = true; diff --git a/src/core/kernel/exports/EmuKrnlKe.cpp b/src/core/kernel/exports/EmuKrnlKe.cpp index f8ea37031..6feacfd28 100644 --- a/src/core/kernel/exports/EmuKrnlKe.cpp +++ b/src/core/kernel/exports/EmuKrnlKe.cpp @@ -65,7 +65,7 @@ the said software). #define LOG_PREFIX CXBXR_MODULE::KE -#include // For KeBugCheck, etc. +#include // For KeBugCheck, etc. #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" @@ -98,7 +98,7 @@ typedef struct _DpcData { DpcData g_DpcData = { 0 }; // Note : g_DpcData is initialized in InitDpcThread() -xbox::ULONGLONG LARGE_INTEGER2ULONGLONG(xbox::LARGE_INTEGER value) +xbox::ulonglong_xt LARGE_INTEGER2ULONGLONG(xbox::LARGE_INTEGER value) { // Weird construction because there doesn't seem to exist an implicit // conversion of LARGE_INTEGER to ULONGLONG : @@ -109,20 +109,20 @@ xbox::ULONGLONG LARGE_INTEGER2ULONGLONG(xbox::LARGE_INTEGER value) if (Alertable) { \ if (Thread->Alerted[WaitMode] != FALSE) { \ Thread->Alerted[WaitMode] = FALSE; \ - WaitStatus = STATUS_ALERTED; \ + WaitStatus = xbox::status_alerted; \ break; \ } else if ((WaitMode != KernelMode) && \ (IsListEmpty(&Thread->ApcState.ApcListHead[UserMode])) == FALSE) { \ Thread->ApcState.UserApcPending = TRUE; \ - WaitStatus = STATUS_USER_APC; \ + WaitStatus = xbox::status_user_apc; \ break; \ } else if (Thread->Alerted[KernelMode] != FALSE) { \ Thread->Alerted[KernelMode] = FALSE; \ - WaitStatus = STATUS_ALERTED; \ + WaitStatus = xbox::status_alerted; \ break; \ } \ } else if ((WaitMode != KernelMode) && (Thread->ApcState.UserApcPending)) { \ - WaitStatus = STATUS_USER_APC; \ + WaitStatus = xbox::status_user_apc; \ break; \ } @@ -160,7 +160,7 @@ xbox::KPRCB *KeGetCurrentPrcb() // ****************************************************************** // * KeSetSystemTime() // ****************************************************************** -xbox::VOID NTAPI xbox::KeSetSystemTime +xbox::void_xt NTAPI xbox::KeSetSystemTime ( IN xbox::PLARGE_INTEGER NewTime, OUT xbox::PLARGE_INTEGER OldTime @@ -254,7 +254,7 @@ xbox::VOID NTAPI xbox::KeSetSystemTime // ****************************************************************** // * KeInitializeTimer() // ****************************************************************** -xbox::VOID NTAPI xbox::KeInitializeTimer +xbox::void_xt NTAPI xbox::KeInitializeTimer ( IN PKTIMER Timer ) @@ -371,7 +371,7 @@ void CxbxInitPerformanceCounters() // * 0x005C - KeAlertResumeThread() // ****************************************************************** // Source:Dxbx -XBSYSAPI EXPORTNUM(92) xbox::NTSTATUS NTAPI xbox::KeAlertResumeThread +XBSYSAPI EXPORTNUM(92) xbox::ntstatus_xt NTAPI xbox::KeAlertResumeThread ( IN HANDLE ThreadHandle, IN OUT PULONG PreviousSuspendCount @@ -392,7 +392,7 @@ XBSYSAPI EXPORTNUM(92) xbox::NTSTATUS NTAPI xbox::KeAlertResumeThread // * 0x005D - KeAlertThread() // ****************************************************************** // Source:Dxbx -XBSYSAPI EXPORTNUM(93) xbox::NTSTATUS NTAPI xbox::KeAlertThread +XBSYSAPI EXPORTNUM(93) xbox::ntstatus_xt NTAPI xbox::KeAlertThread ( IN HANDLE ThreadHandle ) @@ -409,7 +409,7 @@ XBSYSAPI EXPORTNUM(93) xbox::NTSTATUS NTAPI xbox::KeAlertThread // * 0x005E - KeBoostPriorityThread() // ****************************************************************** // Source:Dxbx -XBSYSAPI EXPORTNUM(94) xbox::NTSTATUS NTAPI xbox::KeBoostPriorityThread +XBSYSAPI EXPORTNUM(94) xbox::ntstatus_xt NTAPI xbox::KeBoostPriorityThread ( IN PKTHREAD Thread, IN KPRIORITY Increment @@ -429,9 +429,9 @@ XBSYSAPI EXPORTNUM(94) xbox::NTSTATUS NTAPI xbox::KeBoostPriorityThread // ****************************************************************** // * 0x005F - KeBugCheck() // ****************************************************************** -XBSYSAPI EXPORTNUM(95) xbox::VOID NTAPI xbox::KeBugCheck +XBSYSAPI EXPORTNUM(95) xbox::void_xt NTAPI xbox::KeBugCheck ( - IN ULONG BugCheckMode + IN ulong_xt BugCheckMode ) { LOG_FORWARD("KeBugCheckEx"); @@ -443,9 +443,9 @@ XBSYSAPI EXPORTNUM(95) xbox::VOID NTAPI xbox::KeBugCheck // * 0x0060 - KeBugCheckEx() // ****************************************************************** // Source:Dxbx -XBSYSAPI EXPORTNUM(96) xbox::NTSTATUS NTAPI xbox::KeBugCheckEx +XBSYSAPI EXPORTNUM(96) xbox::ntstatus_xt NTAPI xbox::KeBugCheckEx ( - IN DWORD BugCheckCode, + IN dword_xt BugCheckCode, IN PVOID BugCheckParameter1, IN PVOID BugCheckParameter2, IN PVOID BugCheckParameter3, @@ -491,7 +491,7 @@ XBSYSAPI EXPORTNUM(96) xbox::NTSTATUS NTAPI xbox::KeBugCheckEx // ****************************************************************** // * 0x0061 - KeCancelTimer() // ****************************************************************** -XBSYSAPI EXPORTNUM(96) xbox::BOOLEAN NTAPI xbox::KeCancelTimer +XBSYSAPI EXPORTNUM(96) xbox::boolean_xt NTAPI xbox::KeCancelTimer ( IN PKTIMER Timer ) @@ -526,7 +526,7 @@ xbox::PKINTERRUPT EmuInterruptList[MAX_BUS_INTERRUPT_LEVEL + 1] = { 0 }; // ****************************************************************** // * 0x0062 - KeConnectInterrupt() // ****************************************************************** -XBSYSAPI EXPORTNUM(98) xbox::BOOLEAN NTAPI xbox::KeConnectInterrupt +XBSYSAPI EXPORTNUM(98) xbox::boolean_xt NTAPI xbox::KeConnectInterrupt ( IN PKINTERRUPT InterruptObject ) @@ -560,10 +560,10 @@ XBSYSAPI EXPORTNUM(98) xbox::BOOLEAN NTAPI xbox::KeConnectInterrupt // ****************************************************************** // * 0x0063 - KeDelayExecutionThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(99) xbox::NTSTATUS NTAPI xbox::KeDelayExecutionThread +XBSYSAPI EXPORTNUM(99) xbox::ntstatus_xt NTAPI xbox::KeDelayExecutionThread ( IN KPROCESSOR_MODE WaitMode, - IN BOOLEAN Alertable, + IN boolean_xt Alertable, IN PLARGE_INTEGER Interval ) { @@ -581,7 +581,7 @@ XBSYSAPI EXPORTNUM(99) xbox::NTSTATUS NTAPI xbox::KeDelayExecutionThread // ****************************************************************** // * 0x0064 - KeDisconnectInterrupt() // ****************************************************************** -XBSYSAPI EXPORTNUM(100) xbox::VOID NTAPI xbox::KeDisconnectInterrupt +XBSYSAPI EXPORTNUM(100) xbox::void_xt NTAPI xbox::KeDisconnectInterrupt ( IN PKINTERRUPT InterruptObject ) @@ -606,9 +606,9 @@ XBSYSAPI EXPORTNUM(100) xbox::VOID NTAPI xbox::KeDisconnectInterrupt // ****************************************************************** // * 0x0065 - KeEnterCriticalRegion() // ****************************************************************** -XBSYSAPI EXPORTNUM(101) xbox::VOID NTAPI xbox::KeEnterCriticalRegion +XBSYSAPI EXPORTNUM(101) xbox::void_xt NTAPI xbox::KeEnterCriticalRegion ( - VOID + void_xt ) { LOG_FUNC(); @@ -646,7 +646,7 @@ XBSYSAPI EXPORTNUM(104) xbox::PKTHREAD NTAPI xbox::KeGetCurrentThread(void) // ****************************************************************** // * 0x0069 - KeInitializeApc() // ****************************************************************** -XBSYSAPI EXPORTNUM(105) xbox::VOID NTAPI xbox::KeInitializeApc +XBSYSAPI EXPORTNUM(105) xbox::void_xt NTAPI xbox::KeInitializeApc ( IN PKAPC Apc, IN PKTHREAD Thread, @@ -685,7 +685,7 @@ XBSYSAPI EXPORTNUM(105) xbox::VOID NTAPI xbox::KeInitializeApc // ****************************************************************** // * 0x006A - KeInitializeDeviceQueue() // ****************************************************************** -XBSYSAPI EXPORTNUM(106) xbox::VOID NTAPI xbox::KeInitializeDeviceQueue +XBSYSAPI EXPORTNUM(106) xbox::void_xt NTAPI xbox::KeInitializeDeviceQueue ( OUT PKDEVICE_QUEUE DeviceQueue ) @@ -702,7 +702,7 @@ XBSYSAPI EXPORTNUM(106) xbox::VOID NTAPI xbox::KeInitializeDeviceQueue // ****************************************************************** // * 0x006B - KeInitializeDpc() // ****************************************************************** -XBSYSAPI EXPORTNUM(107) xbox::VOID NTAPI xbox::KeInitializeDpc +XBSYSAPI EXPORTNUM(107) xbox::void_xt NTAPI xbox::KeInitializeDpc ( KDPC *Dpc, PKDEFERRED_ROUTINE DeferredRoutine, @@ -725,11 +725,11 @@ XBSYSAPI EXPORTNUM(107) xbox::VOID NTAPI xbox::KeInitializeDpc // ****************************************************************** // * 0x006C - KeInitializeEvent() // ****************************************************************** -XBSYSAPI EXPORTNUM(108) xbox::VOID NTAPI xbox::KeInitializeEvent +XBSYSAPI EXPORTNUM(108) xbox::void_xt NTAPI xbox::KeInitializeEvent ( IN PRKEVENT Event, IN EVENT_TYPE Type, - IN BOOLEAN SignalState + IN boolean_xt SignalState ) { LOG_FUNC_BEGIN @@ -756,12 +756,12 @@ XBSYSAPI EXPORTNUM(108) xbox::VOID NTAPI xbox::KeInitializeEvent // ****************************************************************** // * 0x006D - KeInitializeInterrupt() // ****************************************************************** -XBSYSAPI EXPORTNUM(109) xbox::VOID NTAPI xbox::KeInitializeInterrupt +XBSYSAPI EXPORTNUM(109) xbox::void_xt NTAPI xbox::KeInitializeInterrupt ( OUT PKINTERRUPT Interrupt, IN PKSERVICE_ROUTINE ServiceRoutine, IN PVOID ServiceContext, - IN ULONG Vector, + IN ulong_xt Vector, IN KIRQL Irql, IN KINTERRUPT_MODE InterruptMode, IN BOOLEAN ShareVector @@ -795,10 +795,10 @@ XBSYSAPI EXPORTNUM(109) xbox::VOID NTAPI xbox::KeInitializeInterrupt // ****************************************************************** // * 0x006E - KeInitializeMutant() // ****************************************************************** -XBSYSAPI EXPORTNUM(110) xbox::VOID NTAPI xbox::KeInitializeMutant +XBSYSAPI EXPORTNUM(110) xbox::void_xt NTAPI xbox::KeInitializeMutant ( IN PRKMUTANT Mutant, - IN BOOLEAN InitialOwner + IN boolean_xt InitialOwner ) { LOG_FUNC_BEGIN @@ -834,10 +834,10 @@ XBSYSAPI EXPORTNUM(110) xbox::VOID NTAPI xbox::KeInitializeMutant // ****************************************************************** // * 0x006F - KeInitializeQueue() // ****************************************************************** -XBSYSAPI EXPORTNUM(111) xbox::VOID NTAPI xbox::KeInitializeQueue +XBSYSAPI EXPORTNUM(111) xbox::void_xt NTAPI xbox::KeInitializeQueue ( IN PKQUEUE Queue, - IN ULONG Count OPTIONAL + IN ulong_xt Count OPTIONAL ) { LOG_FUNC_BEGIN @@ -860,11 +860,11 @@ XBSYSAPI EXPORTNUM(111) xbox::VOID NTAPI xbox::KeInitializeQueue // ****************************************************************** // * 0x0070 - KeInitializeSemaphore() // ****************************************************************** -XBSYSAPI EXPORTNUM(112) xbox::VOID NTAPI xbox::KeInitializeSemaphore +XBSYSAPI EXPORTNUM(112) xbox::void_xt NTAPI xbox::KeInitializeSemaphore ( IN PRKSEMAPHORE Semaphore, - IN LONG Count, - IN LONG Limit + IN long_xt Count, + IN long_xt Limit ) { LOG_FUNC_BEGIN @@ -885,7 +885,7 @@ XBSYSAPI EXPORTNUM(112) xbox::VOID NTAPI xbox::KeInitializeSemaphore // ****************************************************************** // * 0x0071 - KeInitializeTimerEx() // ****************************************************************** -XBSYSAPI EXPORTNUM(113) xbox::VOID NTAPI xbox::KeInitializeTimerEx +XBSYSAPI EXPORTNUM(113) xbox::void_xt NTAPI xbox::KeInitializeTimerEx ( IN PKTIMER Timer, IN TIMER_TYPE Type @@ -911,11 +911,11 @@ XBSYSAPI EXPORTNUM(113) xbox::VOID NTAPI xbox::KeInitializeTimerEx Timer->Period = 0; } -XBSYSAPI EXPORTNUM(114) xbox::BOOLEAN NTAPI xbox::KeInsertByKeyDeviceQueue +XBSYSAPI EXPORTNUM(114) xbox::boolean_xt NTAPI xbox::KeInsertByKeyDeviceQueue ( IN PKDEVICE_QUEUE DeviceQueue, IN PKDEVICE_QUEUE_ENTRY DeviceQueueEntry, - IN ULONG SortKey + IN ulong_xt SortKey ) { LOG_FUNC_BEGIN @@ -959,7 +959,7 @@ XBSYSAPI EXPORTNUM(114) xbox::BOOLEAN NTAPI xbox::KeInsertByKeyDeviceQueue // * This implementation is inspired by ReactOS source code // * Ref: https://github.com/reactos/reactos/blob/master/ntoskrnl/ke/devqueue.c // ****************************************************************** -XBSYSAPI EXPORTNUM(115) xbox::BOOLEAN NTAPI xbox::KeInsertDeviceQueue +XBSYSAPI EXPORTNUM(115) xbox::boolean_xt NTAPI xbox::KeInsertDeviceQueue ( IN PKDEVICE_QUEUE DeviceQueue, IN PKDEVICE_QUEUE_ENTRY DeviceQueueEntry @@ -989,7 +989,7 @@ XBSYSAPI EXPORTNUM(115) xbox::BOOLEAN NTAPI xbox::KeInsertDeviceQueue RETURN(Res); } -XBSYSAPI EXPORTNUM(116) xbox::LONG NTAPI xbox::KeInsertHeadQueue +XBSYSAPI EXPORTNUM(116) xbox::long_xt NTAPI xbox::KeInsertHeadQueue ( IN PRKQUEUE Queue, IN PLIST_ENTRY Entry @@ -1005,7 +1005,7 @@ XBSYSAPI EXPORTNUM(116) xbox::LONG NTAPI xbox::KeInsertHeadQueue RETURN(0); } -XBSYSAPI EXPORTNUM(117) xbox::LONG NTAPI xbox::KeInsertQueue +XBSYSAPI EXPORTNUM(117) xbox::long_xt NTAPI xbox::KeInsertQueue ( IN PRKQUEUE Queue, IN PLIST_ENTRY Entry @@ -1021,7 +1021,7 @@ XBSYSAPI EXPORTNUM(117) xbox::LONG NTAPI xbox::KeInsertQueue RETURN(0); } -XBSYSAPI EXPORTNUM(118) xbox::BOOLEAN NTAPI xbox::KeInsertQueueApc +XBSYSAPI EXPORTNUM(118) xbox::boolean_xt NTAPI xbox::KeInsertQueueApc ( IN PRKAPC Apc, IN PVOID SystemArgument1, @@ -1044,7 +1044,7 @@ XBSYSAPI EXPORTNUM(118) xbox::BOOLEAN NTAPI xbox::KeInsertQueueApc // ****************************************************************** // * 0x0077 - KeInsertQueueDpc() // ****************************************************************** -XBSYSAPI EXPORTNUM(119) xbox::BOOLEAN NTAPI xbox::KeInsertQueueDpc +XBSYSAPI EXPORTNUM(119) xbox::boolean_xt NTAPI xbox::KeInsertQueueDpc ( IN PKDPC Dpc, IN PVOID SystemArgument1, @@ -1087,7 +1087,7 @@ XBSYSAPI EXPORTNUM(119) xbox::BOOLEAN NTAPI xbox::KeInsertQueueDpc // ****************************************************************** // * 0x0079 - KeIsExecutingDpc() // ****************************************************************** -XBSYSAPI EXPORTNUM(121) xbox::BOOLEAN NTAPI xbox::KeIsExecutingDpc +XBSYSAPI EXPORTNUM(121) xbox::boolean_xt NTAPI xbox::KeIsExecutingDpc () { LOG_FUNC(); @@ -1105,9 +1105,9 @@ XBSYSAPI EXPORTNUM(120) xbox::KSYSTEM_TIME xbox::KeInterruptTime = { 0, 0, 0 }; // ****************************************************************** // * 0x007A - KeLeaveCriticalRegion() // ****************************************************************** -XBSYSAPI EXPORTNUM(122) xbox::VOID NTAPI xbox::KeLeaveCriticalRegion +XBSYSAPI EXPORTNUM(122) xbox::void_xt NTAPI xbox::KeLeaveCriticalRegion ( - VOID + void_xt ) { LOG_FUNC(); @@ -1123,11 +1123,11 @@ XBSYSAPI EXPORTNUM(122) xbox::VOID NTAPI xbox::KeLeaveCriticalRegion } } -XBSYSAPI EXPORTNUM(123) xbox::LONG NTAPI xbox::KePulseEvent +XBSYSAPI EXPORTNUM(123) xbox::long_xt NTAPI xbox::KePulseEvent ( IN PRKEVENT Event, IN KPRIORITY Increment, - IN BOOLEAN Wait + IN boolean_xt Wait ) { LOG_FUNC_BEGIN @@ -1171,7 +1171,7 @@ XBSYSAPI EXPORTNUM(123) xbox::LONG NTAPI xbox::KePulseEvent RETURN(OldState); } -XBSYSAPI EXPORTNUM(124) xbox::LONG NTAPI xbox::KeQueryBasePriorityThread +XBSYSAPI EXPORTNUM(124) xbox::long_xt NTAPI xbox::KeQueryBasePriorityThread ( IN PKTHREAD Thread ) @@ -1186,7 +1186,7 @@ XBSYSAPI EXPORTNUM(124) xbox::LONG NTAPI xbox::KeQueryBasePriorityThread // ****************************************************************** // * 0x007D - KeQueryInterruptTime() // ****************************************************************** -XBSYSAPI EXPORTNUM(125) xbox::ULONGLONG NTAPI xbox::KeQueryInterruptTime(void) +XBSYSAPI EXPORTNUM(125) xbox::ulonglong_xt NTAPI xbox::KeQueryInterruptTime(void) { // TODO : Some software might call KeQueryInterruptTime often and fill the log quickly, // in which case we should not LOG_FUNC nor RETURN (use normal return instead). @@ -1218,7 +1218,7 @@ XBSYSAPI EXPORTNUM(125) xbox::ULONGLONG NTAPI xbox::KeQueryInterruptTime(void) // NOTE: The KeQueryPerformance* functions run at the ACPI clock // The XAPI QueryPerformance* functions run at the TSC clock // ****************************************************************** -XBSYSAPI EXPORTNUM(126) xbox::ULONGLONG NTAPI xbox::KeQueryPerformanceCounter(void) +XBSYSAPI EXPORTNUM(126) xbox::ulonglong_xt NTAPI xbox::KeQueryPerformanceCounter(void) { LOG_FUNC(); ULONGLONG ret; @@ -1229,7 +1229,7 @@ XBSYSAPI EXPORTNUM(126) xbox::ULONGLONG NTAPI xbox::KeQueryPerformanceCounter(vo // ****************************************************************** // * 0x007F - KeQueryPerformanceFrequency() // ****************************************************************** -XBSYSAPI EXPORTNUM(127) xbox::ULONGLONG NTAPI xbox::KeQueryPerformanceFrequency(void) +XBSYSAPI EXPORTNUM(127) xbox::ulonglong_xt NTAPI xbox::KeQueryPerformanceFrequency(void) { LOG_FUNC(); ULONGLONG ret = XBOX_ACPI_FREQUENCY; @@ -1239,7 +1239,7 @@ XBSYSAPI EXPORTNUM(127) xbox::ULONGLONG NTAPI xbox::KeQueryPerformanceFrequency( // ****************************************************************** // * 0x0080 - KeQuerySystemTime() // ****************************************************************** -XBSYSAPI EXPORTNUM(128) xbox::VOID NTAPI xbox::KeQuerySystemTime +XBSYSAPI EXPORTNUM(128) xbox::void_xt NTAPI xbox::KeQuerySystemTime ( PLARGE_INTEGER CurrentTime ) @@ -1265,7 +1265,7 @@ XBSYSAPI EXPORTNUM(128) xbox::VOID NTAPI xbox::KeQuerySystemTime // ****************************************************************** // * 0x0081 - KeRaiseIrqlToDpcLevel() // ****************************************************************** -XBSYSAPI EXPORTNUM(129) xbox::UCHAR NTAPI xbox::KeRaiseIrqlToDpcLevel() +XBSYSAPI EXPORTNUM(129) xbox::uchar_xt NTAPI xbox::KeRaiseIrqlToDpcLevel() { LOG_FORWARD(KfRaiseIrql); @@ -1275,19 +1275,19 @@ XBSYSAPI EXPORTNUM(129) xbox::UCHAR NTAPI xbox::KeRaiseIrqlToDpcLevel() // ****************************************************************** // * 0x0082 - KeRaiseIrqlToSynchLevel() // ****************************************************************** -XBSYSAPI EXPORTNUM(130) xbox::UCHAR NTAPI xbox::KeRaiseIrqlToSynchLevel() +XBSYSAPI EXPORTNUM(130) xbox::uchar_xt NTAPI xbox::KeRaiseIrqlToSynchLevel() { LOG_FORWARD(KfRaiseIrql); return KfRaiseIrql(SYNC_LEVEL); } -XBSYSAPI EXPORTNUM(131) xbox::LONG NTAPI xbox::KeReleaseMutant +XBSYSAPI EXPORTNUM(131) xbox::long_xt NTAPI xbox::KeReleaseMutant ( IN PRKMUTANT Mutant, IN KPRIORITY Increment, - IN BOOLEAN Abandoned, - IN BOOLEAN Wait + IN boolean_xt Abandoned, + IN boolean_xt Wait ) { LOG_FUNC_BEGIN @@ -1302,12 +1302,12 @@ XBSYSAPI EXPORTNUM(131) xbox::LONG NTAPI xbox::KeReleaseMutant RETURN(0); } -XBSYSAPI EXPORTNUM(132) xbox::LONG NTAPI xbox::KeReleaseSemaphore +XBSYSAPI EXPORTNUM(132) xbox::long_xt NTAPI xbox::KeReleaseSemaphore ( IN PRKSEMAPHORE Semaphore, IN KPRIORITY Increment, - IN LONG Adjustment, - IN BOOLEAN Wait + IN long_xt Adjustment, + IN boolean_xt Wait ) { LOG_FUNC_BEGIN @@ -1325,7 +1325,7 @@ XBSYSAPI EXPORTNUM(132) xbox::LONG NTAPI xbox::KeReleaseSemaphore BOOL signalstate_overflow = adjusted_signalstate < initial_state; if (limit_reached || signalstate_overflow) { KiUnlockDispatcherDatabase(orig_irql); - ExRaiseStatus(STATUS_SEMAPHORE_LIMIT_EXCEEDED); + ExRaiseStatus(xbox::status_semaphore_limit_exceeded); } Semaphore->Header.SignalState = adjusted_signalstate; @@ -1351,7 +1351,7 @@ XBSYSAPI EXPORTNUM(132) xbox::LONG NTAPI xbox::KeReleaseSemaphore XBSYSAPI EXPORTNUM(133) xbox::PKDEVICE_QUEUE_ENTRY NTAPI xbox::KeRemoveByKeyDeviceQueue ( IN PKDEVICE_QUEUE DeviceQueue, - IN ULONG SortKey + IN ulong_xt SortKey ) { LOG_FUNC_BEGIN @@ -1416,7 +1416,7 @@ XBSYSAPI EXPORTNUM(134) xbox::PKDEVICE_QUEUE_ENTRY NTAPI xbox::KeRemoveDeviceQue RETURN(pEntry); } -XBSYSAPI EXPORTNUM(135) xbox::BOOLEAN NTAPI xbox::KeRemoveEntryDeviceQueue +XBSYSAPI EXPORTNUM(135) xbox::boolean_xt NTAPI xbox::KeRemoveEntryDeviceQueue ( IN PKDEVICE_QUEUE DeviceQueue, IN PKDEVICE_QUEUE_ENTRY DeviceQueueEntry @@ -1466,7 +1466,7 @@ XBSYSAPI EXPORTNUM(136) xbox::PLIST_ENTRY NTAPI xbox::KeRemoveQueue // ****************************************************************** // * 0x0089 - KeRemoveQueueDpc() // ****************************************************************** -XBSYSAPI EXPORTNUM(137) xbox::BOOLEAN NTAPI xbox::KeRemoveQueueDpc +XBSYSAPI EXPORTNUM(137) xbox::boolean_xt NTAPI xbox::KeRemoveQueueDpc ( IN PKDPC Dpc ) @@ -1495,7 +1495,7 @@ XBSYSAPI EXPORTNUM(137) xbox::BOOLEAN NTAPI xbox::KeRemoveQueueDpc // ****************************************************************** // * 0x008A - KeResetEvent() // ****************************************************************** -XBSYSAPI EXPORTNUM(138) xbox::LONG NTAPI xbox::KeResetEvent +XBSYSAPI EXPORTNUM(138) xbox::long_xt NTAPI xbox::KeResetEvent ( IN PRKEVENT Event ) @@ -1524,14 +1524,14 @@ XBSYSAPI EXPORTNUM(138) xbox::LONG NTAPI xbox::KeResetEvent // ****************************************************************** // * 0x008B - KeRestoreFloatingPointState() // ****************************************************************** -XBSYSAPI EXPORTNUM(139) xbox::NTSTATUS NTAPI xbox::KeRestoreFloatingPointState +XBSYSAPI EXPORTNUM(139) xbox::ntstatus_xt NTAPI xbox::KeRestoreFloatingPointState ( IN PKFLOATING_SAVE PublicFloatSave ) { LOG_FUNC_ONE_ARG(PublicFloatSave); - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; LOG_UNIMPLEMENTED(); @@ -1541,14 +1541,14 @@ XBSYSAPI EXPORTNUM(139) xbox::NTSTATUS NTAPI xbox::KeRestoreFloatingPointState // ****************************************************************** // * 0x008C - KeResumeThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(140) xbox::ULONG NTAPI xbox::KeResumeThread +XBSYSAPI EXPORTNUM(140) xbox::ulong_xt NTAPI xbox::KeResumeThread ( IN PKTHREAD Thread ) { LOG_FUNC_ONE_ARG(Thread); - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; LOG_UNIMPLEMENTED(); @@ -1570,14 +1570,14 @@ XBSYSAPI EXPORTNUM(141) xbox::PLIST_ENTRY NTAPI xbox::KeRundownQueue // ****************************************************************** // * 0x008E - KeSaveFloatingPointState() // ****************************************************************** -XBSYSAPI EXPORTNUM(142) xbox::NTSTATUS NTAPI xbox::KeSaveFloatingPointState +XBSYSAPI EXPORTNUM(142) xbox::ntstatus_xt NTAPI xbox::KeSaveFloatingPointState ( OUT PKFLOATING_SAVE PublicFloatSave ) { LOG_FUNC_ONE_ARG_OUT(PublicFloatSave); - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; LOG_UNIMPLEMENTED(); @@ -1587,10 +1587,10 @@ XBSYSAPI EXPORTNUM(142) xbox::NTSTATUS NTAPI xbox::KeSaveFloatingPointState // ****************************************************************** // * 0x008F - KeSetBasePriorityThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(143) xbox::LONG NTAPI xbox::KeSetBasePriorityThread +XBSYSAPI EXPORTNUM(143) xbox::long_xt NTAPI xbox::KeSetBasePriorityThread ( IN PKTHREAD Thread, - IN LONG Priority + IN long_xt Priority ) { LOG_FUNC_BEGIN @@ -1609,10 +1609,10 @@ XBSYSAPI EXPORTNUM(143) xbox::LONG NTAPI xbox::KeSetBasePriorityThread RETURN(ret); } -XBSYSAPI EXPORTNUM(144) xbox::ULONG NTAPI xbox::KeSetDisableBoostThread +XBSYSAPI EXPORTNUM(144) xbox::ulong_xt NTAPI xbox::KeSetDisableBoostThread ( IN PKTHREAD Thread, - IN ULONG Disable + IN ulong_xt Disable ) { LOG_FUNC_BEGIN @@ -1634,11 +1634,11 @@ XBSYSAPI EXPORTNUM(144) xbox::ULONG NTAPI xbox::KeSetDisableBoostThread // ****************************************************************** // * 0x0091 - KeSetEvent() // ****************************************************************** -XBSYSAPI EXPORTNUM(145) xbox::LONG NTAPI xbox::KeSetEvent +XBSYSAPI EXPORTNUM(145) xbox::long_xt NTAPI xbox::KeSetEvent ( IN PRKEVENT Event, IN KPRIORITY Increment, - IN BOOLEAN Wait + IN boolean_xt Wait ) { LOG_FUNC_BEGIN @@ -1692,7 +1692,7 @@ XBSYSAPI EXPORTNUM(145) xbox::LONG NTAPI xbox::KeSetEvent RETURN(OldState); } -XBSYSAPI EXPORTNUM(146) xbox::VOID NTAPI xbox::KeSetEventBoostPriority +XBSYSAPI EXPORTNUM(146) xbox::void_xt NTAPI xbox::KeSetEventBoostPriority ( IN PRKEVENT Event, IN PRKTHREAD *Thread @@ -1724,7 +1724,7 @@ XBSYSAPI EXPORTNUM(146) xbox::VOID NTAPI xbox::KeSetEventBoostPriority } WaitThread->Quantum = WaitThread->ApcState.Process->ThreadQuantum; - // TODO: KiUnwaitThread(WaitThread, STATUS_SUCCESS, 1); + // TODO: KiUnwaitThread(WaitThread, xbox::status_success, 1); // For now, we just sleep to give other threads time to wake // See KePulseEvent Sleep(1); @@ -1753,10 +1753,10 @@ XBSYSAPI EXPORTNUM(147) xbox::KPRIORITY NTAPI xbox::KeSetPriorityProcess // ****************************************************************** // * 0x0094 - KeSetPriorityThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(148) xbox::BOOLEAN NTAPI xbox::KeSetPriorityThread +XBSYSAPI EXPORTNUM(148) xbox::boolean_xt NTAPI xbox::KeSetPriorityThread ( IN PKTHREAD Thread, - IN LONG Priority + IN long_xt Priority ) { LOG_FUNC_BEGIN @@ -1772,7 +1772,7 @@ XBSYSAPI EXPORTNUM(148) xbox::BOOLEAN NTAPI xbox::KeSetPriorityThread // ****************************************************************** // * 0x0095 - KeSetTimer() // ****************************************************************** -XBSYSAPI EXPORTNUM(149) xbox::BOOLEAN NTAPI xbox::KeSetTimer +XBSYSAPI EXPORTNUM(149) xbox::boolean_xt NTAPI xbox::KeSetTimer ( IN PKTIMER Timer, IN LARGE_INTEGER DueTime, @@ -1788,11 +1788,11 @@ XBSYSAPI EXPORTNUM(149) xbox::BOOLEAN NTAPI xbox::KeSetTimer // ****************************************************************** // * 0x0096 - KeSetTimerEx() // ****************************************************************** -XBSYSAPI EXPORTNUM(150) xbox::BOOLEAN NTAPI xbox::KeSetTimerEx +XBSYSAPI EXPORTNUM(150) xbox::boolean_xt NTAPI xbox::KeSetTimerEx ( IN PKTIMER Timer, IN LARGE_INTEGER DueTime, - IN LONG Period OPTIONAL, + IN long_xt Period OPTIONAL, IN PKDPC Dpc OPTIONAL ) { @@ -1824,7 +1824,7 @@ XBSYSAPI EXPORTNUM(150) xbox::BOOLEAN NTAPI xbox::KeSetTimerEx /* Set Default Timer Data */ Timer->Dpc = Dpc; Timer->Period = Period; - if (!KiComputeDueTime(Timer, DueTime, &Hand)) + if (!KiComputeDueTime(Timer, DueTime, (PULONG)&Hand)) { /* Signal the timer */ RequestInterrupt = KiSignalTimer(Timer); @@ -1851,9 +1851,9 @@ XBSYSAPI EXPORTNUM(150) xbox::BOOLEAN NTAPI xbox::KeSetTimerEx // ****************************************************************** // * 0x0097 - KeStallExecutionProcessor() // ****************************************************************** -XBSYSAPI EXPORTNUM(151) xbox::VOID NTAPI xbox::KeStallExecutionProcessor +XBSYSAPI EXPORTNUM(151) xbox::void_xt NTAPI xbox::KeStallExecutionProcessor ( - IN ULONG MicroSeconds + IN ulong_xt MicroSeconds ) { LOG_FUNC_ONE_ARG(MicroSeconds); @@ -1867,14 +1867,14 @@ XBSYSAPI EXPORTNUM(151) xbox::VOID NTAPI xbox::KeStallExecutionProcessor // ****************************************************************** // * 0x0098 - KeSuspendThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(152) xbox::ULONG NTAPI xbox::KeSuspendThread +XBSYSAPI EXPORTNUM(152) xbox::ulong_xt NTAPI xbox::KeSuspendThread ( IN PKTHREAD Thread ) { LOG_FUNC_ONE_ARG(Thread); - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; LOG_UNIMPLEMENTED(); @@ -1884,7 +1884,7 @@ XBSYSAPI EXPORTNUM(152) xbox::ULONG NTAPI xbox::KeSuspendThread // ****************************************************************** // * 0x0099 - KeSynchronizeExecution() // ****************************************************************** -XBSYSAPI EXPORTNUM(153) xbox::BOOLEAN NTAPI xbox::KeSynchronizeExecution +XBSYSAPI EXPORTNUM(153) xbox::boolean_xt NTAPI xbox::KeSynchronizeExecution ( IN PKINTERRUPT Interrupt, IN PKSYNCHRONIZE_ROUTINE SynchronizeRoutine, @@ -1912,7 +1912,7 @@ XBSYSAPI EXPORTNUM(154) xbox::KSYSTEM_TIME xbox::KeSystemTime = { 0, 0, 0 }; // ****************************************************************** // * 0x009B - KeTestAlertThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(155) xbox::BOOLEAN NTAPI xbox::KeTestAlertThread +XBSYSAPI EXPORTNUM(155) xbox::boolean_xt NTAPI xbox::KeTestAlertThread ( IN KPROCESSOR_MODE AlertMode ) @@ -1929,12 +1929,12 @@ XBSYSAPI EXPORTNUM(155) xbox::BOOLEAN NTAPI xbox::KeTestAlertThread // ****************************************************************** // * 0x009C - KeTickCount // ****************************************************************** -XBSYSAPI EXPORTNUM(156) xbox::DWORD VOLATILE xbox::KeTickCount = 0; +XBSYSAPI EXPORTNUM(156) xbox::dword_xt VOLATILE xbox::KeTickCount = 0; // ****************************************************************** // * 0x009D - KeTimeIncrement // ****************************************************************** -XBSYSAPI EXPORTNUM(157) xbox::ULONG xbox::KeTimeIncrement = CLOCK_TIME_INCREMENT; +XBSYSAPI EXPORTNUM(157) xbox::ulong_xt xbox::KeTimeIncrement = CLOCK_TIME_INCREMENT; xbox::PLARGE_INTEGER FASTCALL KiComputeWaitInterval( @@ -1957,14 +1957,14 @@ xbox::PLARGE_INTEGER FASTCALL KiComputeWaitInterval( // ****************************************************************** // * 0x009E - KeWaitForMultipleObjects() // ****************************************************************** -XBSYSAPI EXPORTNUM(158) xbox::NTSTATUS NTAPI xbox::KeWaitForMultipleObjects +XBSYSAPI EXPORTNUM(158) xbox::ntstatus_xt NTAPI xbox::KeWaitForMultipleObjects ( - IN ULONG Count, + IN ulong_xt Count, IN PVOID Object[], IN WAIT_TYPE WaitType, IN KWAIT_REASON WaitReason, IN KPROCESSOR_MODE WaitMode, - IN BOOLEAN Alertable, + IN boolean_xt Alertable, IN PLARGE_INTEGER Timeout OPTIONAL, IN PKWAIT_BLOCK WaitBlockArray OPTIONAL ) @@ -2007,7 +2007,7 @@ XBSYSAPI EXPORTNUM(158) xbox::NTSTATUS NTAPI xbox::KeWaitForMultipleObjects } else { WaitSatisfied = TRUE; - Thread->WaitStatus = STATUS_SUCCESS; + Thread->WaitStatus = xbox::status_success; for (ULONG Index = 0; Index < Count; Index += 1) { ObjectMutant = (PKMUTANT)Object[Index]; @@ -2023,21 +2023,21 @@ XBSYSAPI EXPORTNUM(158) xbox::NTSTATUS NTAPI xbox::KeWaitForMultipleObjects } else { KiUnlockDispatcherDatabase(Thread->WaitIrql); - ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); + ExRaiseStatus(xbox::status_mutant_limit_exceeded); } } } else if (ObjectMutant->Header.SignalState) { // Otherwise, if the signal state is > 0, we can still just satisfy the wait KiWaitSatisfyOther(ObjectMutant); - WaitStatus = STATUS_SUCCESS; + WaitStatus = xbox::status_success; goto NoWait; } } else { if (ObjectMutant->Header.Type == MutantObject) { if ((Thread == ObjectMutant->OwnerThread) && (ObjectMutant->Header.SignalState == MINLONG)) { KiUnlockDispatcherDatabase(Thread->WaitIrql); - ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); + ExRaiseStatus(xbox::status_mutant_limit_exceeded); } else if ((ObjectMutant->Header.SignalState <= 0) && (Thread != ObjectMutant->OwnerThread)) { WaitSatisfied = FALSE; } @@ -2050,7 +2050,7 @@ XBSYSAPI EXPORTNUM(158) xbox::NTSTATUS NTAPI xbox::KeWaitForMultipleObjects // If we reached here, the wait could not be satisfied immediately, so we must setup a WaitBlock WaitBlock = &WaitBlockArray[Index]; WaitBlock->Object = ObjectMutant; - WaitBlock->WaitKey = (CSHORT)(Index); + WaitBlock->WaitKey = (cshort_xt)(Index); WaitBlock->WaitType = WaitType; WaitBlock->Thread = Thread; WaitBlock->NextWaitBlock = &WaitBlockArray[Index + 1]; @@ -2143,7 +2143,7 @@ XBSYSAPI EXPORTNUM(158) xbox::NTSTATUS NTAPI xbox::KeWaitForMultipleObjects //WaitStatus = (NTSTATUS)KiSwapThread(); - //if (WaitStatus == STATUS_USER_APC) { + //if (WaitStatus == xbox::status_user_apc) { // TODO: KiDeliverUserApc(); //} @@ -2174,7 +2174,7 @@ XBSYSAPI EXPORTNUM(158) xbox::NTSTATUS NTAPI xbox::KeWaitForMultipleObjects // The waiting thead has been alerted, or an APC needs to be delivered // So unlock the dispatcher database, lower the IRQ and return the status KiUnlockDispatcherDatabase(Thread->WaitIrql); - if (WaitStatus == STATUS_USER_APC) { + if (WaitStatus == xbox::status_user_apc) { //TODO: KiDeliverUserApc(); } @@ -2195,7 +2195,7 @@ NoWait: KiUnlockDispatcherDatabase(Thread->WaitIrql); - if (WaitStatus == STATUS_USER_APC) { + if (WaitStatus == xbox::status_user_apc) { // TODO: KiDeliverUserApc(); } @@ -2205,12 +2205,12 @@ NoWait: // ****************************************************************** // * 0x009F - KeWaitForSingleObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(159) xbox::NTSTATUS NTAPI xbox::KeWaitForSingleObject +XBSYSAPI EXPORTNUM(159) xbox::ntstatus_xt NTAPI xbox::KeWaitForSingleObject ( IN PVOID Object, IN KWAIT_REASON WaitReason, IN KPROCESSOR_MODE WaitMode, - IN BOOLEAN Alertable, + IN boolean_xt Alertable, IN PLARGE_INTEGER Timeout OPTIONAL ) { @@ -2246,7 +2246,7 @@ XBSYSAPI EXPORTNUM(159) xbox::NTSTATUS NTAPI xbox::KeWaitForSingleObject KiUnlockDispatcherDatabase(Thread->WaitIrql); } else { PKMUTANT ObjectMutant = (PKMUTANT)Object; - Thread->WaitStatus = STATUS_SUCCESS; + Thread->WaitStatus = xbox::status_success; if (ObjectMutant->Header.Type == MutantObject) { // If the object is a mutant object and it has been acquired MINGLONG times, raise an exception @@ -2259,21 +2259,21 @@ XBSYSAPI EXPORTNUM(159) xbox::NTSTATUS NTAPI xbox::KeWaitForSingleObject } else { KiUnlockDispatcherDatabase(Thread->WaitIrql); - ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); + ExRaiseStatus(xbox::status_mutant_limit_exceeded); } } } else if (ObjectMutant->Header.SignalState > 0) { // Otherwise, if the signal state is > 0, we can still just satisfy the wait KiWaitSatisfyOther(ObjectMutant); - WaitStatus = STATUS_SUCCESS; + WaitStatus = xbox::status_success; goto NoWait; } // If we reached here, the wait could not be satisfied immediately, so we must setup a WaitBlock Thread->WaitBlockList = WaitBlock; WaitBlock->Object = Object; - WaitBlock->WaitKey = (CSHORT)(STATUS_SUCCESS); + WaitBlock->WaitKey = (cshort_xt)(xbox::status_success); WaitBlock->WaitType = WaitAny; WaitBlock->Thread = Thread; @@ -2348,7 +2348,7 @@ XBSYSAPI EXPORTNUM(159) xbox::NTSTATUS NTAPI xbox::KeWaitForSingleObject /* WaitStatus = (NTSTATUS)KiSwapThread(); - if (WaitStatus == STATUS_USER_APC) { + if (WaitStatus == xbox::status_user_apc) { // TODO: KiDeliverUserApc(); } @@ -2379,7 +2379,7 @@ XBSYSAPI EXPORTNUM(159) xbox::NTSTATUS NTAPI xbox::KeWaitForSingleObject // The waiting thead has been alerted, or an APC needs to be delivered // So unlock the dispatcher database, lower the IRQ and return the status KiUnlockDispatcherDatabase(Thread->WaitIrql); - if (WaitStatus == STATUS_USER_APC) { + if (WaitStatus == xbox::status_user_apc) { //TODO: KiDeliverUserApc(); } @@ -2400,7 +2400,7 @@ NoWait: KiUnlockDispatcherDatabase(Thread->WaitIrql); - if (WaitStatus == STATUS_USER_APC) { + if (WaitStatus == xbox::status_user_apc) { // TODO: KiDeliverUserApc(); } diff --git a/src/core/kernel/exports/EmuKrnlKe.h b/src/core/kernel/exports/EmuKrnlKe.h index 5f3ae8369..cca37ebd9 100644 --- a/src/core/kernel/exports/EmuKrnlKe.h +++ b/src/core/kernel/exports/EmuKrnlKe.h @@ -27,13 +27,13 @@ namespace xbox { - VOID NTAPI KeSetSystemTime + xbox::void_xt NTAPI KeSetSystemTime ( IN PLARGE_INTEGER NewTime, OUT PLARGE_INTEGER OldTime ); - VOID NTAPI KeInitializeTimer + xbox::void_xt NTAPI KeInitializeTimer ( IN PKTIMER Timer ); diff --git a/src/core/kernel/exports/EmuKrnlKi.cpp b/src/core/kernel/exports/EmuKrnlKi.cpp index b5961ee4d..3046cf58c 100644 --- a/src/core/kernel/exports/EmuKrnlKi.cpp +++ b/src/core/kernel/exports/EmuKrnlKi.cpp @@ -79,7 +79,7 @@ the said software). #define LOG_PREFIX CXBXR_MODULE::KI -#include // For KeBugCheck, etc. +#include // For KeBugCheck, etc. #include "Logging.h" // For LOG_FUNC() #include "EmuKrnl.h" // for the list support functions #include "EmuKrnlKi.h" @@ -88,14 +88,14 @@ the said software). #define ASSERT_TIMER_LOCKED assert(KiTimerMtx.Acquired > 0) -const xbox::ULONG CLOCK_TIME_INCREMENT = 0x2710; +const xbox::ulong_xt CLOCK_TIME_INCREMENT = 0x2710; xbox::KDPC KiTimerExpireDpc; xbox::KI_TIMER_LOCK KiTimerMtx; xbox::KTIMER_TABLE_ENTRY KiTimerTableListHead[TIMER_TABLE_SIZE]; xbox::LIST_ENTRY KiWaitInListHead; -xbox::VOID xbox::KiInitSystem() +xbox::void_xt xbox::KiInitSystem() { unsigned int i; @@ -112,19 +112,19 @@ xbox::VOID xbox::KiInitSystem() InitializeListHead(&IdexChannelObject.DeviceQueue.DeviceListHead); } -xbox::VOID xbox::KiTimerLock() +xbox::void_xt xbox::KiTimerLock() { KiTimerMtx.Mtx.lock(); KiTimerMtx.Acquired++; } -xbox::VOID xbox::KiTimerUnlock() +xbox::void_xt xbox::KiTimerUnlock() { KiTimerMtx.Acquired--; KiTimerMtx.Mtx.unlock(); } -xbox::VOID xbox::KiClockIsr +xbox::void_xt xbox::KiClockIsr ( unsigned int ScalingFactor ) @@ -175,7 +175,7 @@ xbox::VOID xbox::KiClockIsr KfLowerIrql(OldIrql); } -xbox::VOID NTAPI xbox::KiCheckTimerTable +xbox::void_xt NTAPI xbox::KiCheckTimerTable ( IN xbox::ULARGE_INTEGER CurrentTime ) @@ -217,10 +217,10 @@ xbox::VOID NTAPI xbox::KiCheckTimerTable KfLowerIrql(OldIrql); } -xbox::VOID xbox::KxInsertTimer +xbox::void_xt xbox::KxInsertTimer ( IN xbox::PKTIMER Timer, - IN xbox::ULONG Hand + IN xbox::ulong_xt Hand ) { ASSERT_TIMER_LOCKED; @@ -233,10 +233,10 @@ xbox::VOID xbox::KxInsertTimer } } -xbox::VOID FASTCALL xbox::KiCompleteTimer +xbox::void_xt FASTCALL xbox::KiCompleteTimer ( IN xbox::PKTIMER Timer, - IN xbox::ULONG Hand + IN xbox::ulong_xt Hand ) { LIST_ENTRY ListHead; @@ -264,10 +264,10 @@ xbox::VOID FASTCALL xbox::KiCompleteTimer } } -xbox::VOID xbox::KiRemoveEntryTimer +xbox::void_xt xbox::KiRemoveEntryTimer ( IN xbox::PKTIMER Timer, - IN xbox::ULONG Hand + IN xbox::ulong_xt Hand ) { PKTIMER_TABLE_ENTRY TableEntry; @@ -291,7 +291,7 @@ xbox::VOID xbox::KiRemoveEntryTimer Timer->TimerListEntry.Blink = NULL; } -xbox::VOID xbox::KxRemoveTreeTimer +xbox::void_xt xbox::KxRemoveTreeTimer ( IN xbox::PKTIMER Timer ) @@ -317,10 +317,10 @@ xbox::VOID xbox::KxRemoveTreeTimer } } -xbox::BOOLEAN FASTCALL xbox::KiInsertTimerTable +xbox::boolean_xt FASTCALL xbox::KiInsertTimerTable ( IN xbox::PKTIMER Timer, - IN xbox::ULONG Hand + IN xbox::ulong_xt Hand ) { LARGE_INTEGER InterruptTime; @@ -374,7 +374,7 @@ xbox::BOOLEAN FASTCALL xbox::KiInsertTimerTable return Expired; } -xbox::BOOLEAN FASTCALL xbox::KiInsertTreeTimer +xbox::boolean_xt FASTCALL xbox::KiInsertTreeTimer ( IN xbox::PKTIMER Timer, IN xbox::LARGE_INTEGER Interval @@ -386,7 +386,7 @@ xbox::BOOLEAN FASTCALL xbox::KiInsertTreeTimer ASSERT_TIMER_LOCKED; /* Setup the timer's due time */ - if (KiComputeDueTime(Timer, Interval, &Hand)) + if (KiComputeDueTime(Timer, Interval, (PULONG)&Hand)) { /* Insert the timer */ if (KiInsertTimerTable(Timer, Hand)) @@ -405,15 +405,15 @@ xbox::BOOLEAN FASTCALL xbox::KiInsertTreeTimer return Inserted; } -xbox::ULONG xbox::KiComputeTimerTableIndex +xbox::ulong_xt xbox::KiComputeTimerTableIndex ( - IN xbox::ULONGLONG Interval + IN xbox::ulonglong_xt Interval ) { return (Interval / CLOCK_TIME_INCREMENT) & (TIMER_TABLE_SIZE - 1); } -xbox::BOOLEAN xbox::KiComputeDueTime +xbox::boolean_xt xbox::KiComputeDueTime ( IN xbox::PKTIMER Timer, IN xbox::LARGE_INTEGER DueTime, @@ -462,7 +462,7 @@ xbox::BOOLEAN xbox::KiComputeDueTime return TRUE; } -xbox::BOOLEAN FASTCALL xbox::KiSignalTimer +xbox::boolean_xt FASTCALL xbox::KiSignalTimer ( IN xbox::PKTIMER Timer ) @@ -517,7 +517,7 @@ xbox::BOOLEAN FASTCALL xbox::KiSignalTimer return RequestInterrupt; } -xbox::VOID NTAPI xbox::KiTimerExpiration +xbox::void_xt NTAPI xbox::KiTimerExpiration ( IN xbox::PKDPC Dpc, IN xbox::PVOID DeferredContext, @@ -746,7 +746,7 @@ xbox::VOID NTAPI xbox::KiTimerExpiration } } -xbox::VOID FASTCALL xbox::KiTimerListExpire +xbox::void_xt FASTCALL xbox::KiTimerListExpire ( IN xbox::PLIST_ENTRY ExpiredListHead, IN xbox::KIRQL OldIrql @@ -854,7 +854,7 @@ xbox::VOID FASTCALL xbox::KiTimerListExpire } } -xbox::VOID FASTCALL xbox::KiWaitSatisfyAll +xbox::void_xt FASTCALL xbox::KiWaitSatisfyAll ( IN xbox::PKWAIT_BLOCK WaitBlock ) @@ -866,7 +866,7 @@ xbox::VOID FASTCALL xbox::KiWaitSatisfyAll WaitBlock1 = WaitBlock; Thread = WaitBlock1->Thread; do { - if (WaitBlock1->WaitKey != (CSHORT)STATUS_TIMEOUT) { + if (WaitBlock1->WaitKey != (cshort_xt)STATUS_TIMEOUT) { Object = (PKMUTANT)WaitBlock1->Object; KiWaitSatisfyAny(Object, Thread); } diff --git a/src/core/kernel/exports/EmuKrnlKi.h b/src/core/kernel/exports/EmuKrnlKi.h index 53f19eb9d..51ed230fb 100644 --- a/src/core/kernel/exports/EmuKrnlKi.h +++ b/src/core/kernel/exports/EmuKrnlKi.h @@ -28,11 +28,6 @@ #include -// Workaround to avoid collisions with the VOID provided by Windows and the one of xboxkrnl -#ifdef VOID -#undef VOID -#endif - // ReactOS uses a size of 512, but disassembling the kernel reveals it to be 32 instead #define TIMER_TABLE_SIZE 32 @@ -53,75 +48,75 @@ namespace xbox } KI_TIMER_LOCK; - VOID KiInitSystem(); + xbox::void_xt KiInitSystem(); - VOID KiTimerLock(); + xbox::void_xt KiTimerLock(); - VOID KiTimerUnlock(); + xbox::void_xt KiTimerUnlock(); - VOID KiClockIsr + xbox::void_xt KiClockIsr ( IN unsigned int ScalingFactor ); - VOID NTAPI KiCheckTimerTable + xbox::void_xt NTAPI KiCheckTimerTable ( IN ULARGE_INTEGER CurrentTime ); - VOID KxInsertTimer + xbox::void_xt KxInsertTimer ( IN PKTIMER Timer, - IN ULONG Hand + IN ulong_xt Hand ); - VOID FASTCALL KiCompleteTimer + xbox::void_xt FASTCALL KiCompleteTimer ( IN PKTIMER Timer, - IN ULONG Hand + IN ulong_xt Hand ); - VOID KiRemoveEntryTimer + xbox::void_xt KiRemoveEntryTimer ( IN PKTIMER Timer, - IN ULONG Hand + IN ulong_xt Hand ); - VOID KxRemoveTreeTimer + xbox::void_xt KxRemoveTreeTimer ( IN PKTIMER Timer ); - BOOLEAN FASTCALL KiInsertTimerTable + boolean_xt FASTCALL KiInsertTimerTable ( IN PKTIMER Timer, - IN ULONG Hand + IN ulong_xt Hand ); - BOOLEAN FASTCALL KiInsertTreeTimer + boolean_xt FASTCALL KiInsertTreeTimer ( IN PKTIMER Timer, IN LARGE_INTEGER Interval ); - ULONG KiComputeTimerTableIndex + xbox::ulong_xt KiComputeTimerTableIndex ( - IN ULONGLONG Interval + IN ulonglong_xt Interval ); - BOOLEAN KiComputeDueTime + boolean_xt KiComputeDueTime ( IN PKTIMER Timer, IN LARGE_INTEGER DueTime, OUT PULONG Hand ); - BOOLEAN FASTCALL KiSignalTimer + boolean_xt FASTCALL KiSignalTimer ( IN PKTIMER Timer ); - VOID NTAPI KiTimerExpiration + xbox::void_xt NTAPI KiTimerExpiration ( IN PKDPC Dpc, IN PVOID DeferredContext, @@ -129,19 +124,19 @@ namespace xbox IN PVOID SystemArgument2 ); - VOID FASTCALL KiTimerListExpire + xbox::void_xt FASTCALL KiTimerListExpire ( IN PLIST_ENTRY ExpiredListHead, IN KIRQL OldIrql ); - VOID FASTCALL KiWaitSatisfyAll + xbox::void_xt FASTCALL KiWaitSatisfyAll ( IN PKWAIT_BLOCK WaitBlock ); }; -extern const xbox::ULONG CLOCK_TIME_INCREMENT; +extern const xbox::ulong_xt CLOCK_TIME_INCREMENT; extern xbox::LIST_ENTRY KiWaitInListHead; extern xbox::KTIMER_TABLE_ENTRY KiTimerTableListHead[TIMER_TABLE_SIZE]; extern xbox::KI_TIMER_LOCK KiTimerMtx; @@ -170,7 +165,7 @@ extern xbox::KI_TIMER_LOCK KiTimerMtx; (_Object_)->OwnerThread = (_Thread_); \ if ((_Object_)->Abandoned == TRUE) { \ (_Object_)->Abandoned = FALSE; \ - (_Thread_)->WaitStatus = STATUS_ABANDONED; \ + (_Thread_)->WaitStatus = xbox::status_abandoned; \ } \ \ InsertHeadList((_Thread_)->MutantListHead.Blink, \ @@ -201,7 +196,7 @@ extern xbox::KI_TIMER_LOCK KiTimerMtx; (_Object_)->OwnerThread = (_Thread_); \ if ((_Object_)->Abandoned == TRUE) { \ (_Object_)->Abandoned = FALSE; \ - (_Thread_)->WaitStatus = STATUS_ABANDONED; \ + (_Thread_)->WaitStatus = xbox::status_abandoned; \ } \ \ InsertHeadList((_Thread_)->MutantListHead.Blink, \ diff --git a/src/core/kernel/exports/EmuKrnlLogging.cpp b/src/core/kernel/exports/EmuKrnlLogging.cpp index e2bb9b86f..842b5d4ca 100644 --- a/src/core/kernel/exports/EmuKrnlLogging.cpp +++ b/src/core/kernel/exports/EmuKrnlLogging.cpp @@ -28,7 +28,7 @@ #define LOG_PREFIX CXBXR_MODULE::LOG -#include +#include #include "Logging.h" #include "EmuKrnlLogging.h" #include "core\kernel\init\CxbxKrnl.h" @@ -270,23 +270,23 @@ ENUM2STR_START(MODE) ENUM2STR_END_and_LOGRENDER(MODE) /* TODO : Fix error C2593 "'operator <<' is ambiguous", -// because often NtDLL::NTSTATUS is used instead of xbox::NTSTATUS +// because often NtDLL::NTSTATUS is used instead of xbox::ntstatus_xt ENUM2STR_START(NTSTATUS) // Not really an enum - ENUM2STR_CASE(STATUS_SUCCESS) - ENUM2STR_CASE(STATUS_PENDING) - ENUM2STR_CASE(STATUS_TIMER_RESUME_IGNORED) - ENUM2STR_CASE(STATUS_UNSUCCESSFUL) - ENUM2STR_CASE(STATUS_UNRECOGNIZED_MEDIA) - ENUM2STR_CASE(STATUS_NO_MEMORY) - ENUM2STR_CASE(STATUS_ALERTED) - ENUM2STR_CASE(STATUS_USER_APC) + ENUM2STR_CASE(xbox::status_success) + ENUM2STR_CASE(xbox::status_pending) + ENUM2STR_CASE(xbox::status_timer_resume_ignored) + ENUM2STR_CASE(xbox::status_unsuccessful) + ENUM2STR_CASE(xbox::status_unrecognized_media) + ENUM2STR_CASE(xbox::status_no_memory) + ENUM2STR_CASE(xbox::status_alerted) + ENUM2STR_CASE(xbox::status_user_apc) ENUM2STR_CASE(STATUS_DATA_OVERRUN) - ENUM2STR_CASE(STATUS_INVALID_IMAGE_FORMAT) - ENUM2STR_CASE(STATUS_INSUFFICIENT_RESOURCES) - ENUM2STR_CASE(STATUS_XBE_REGION_MISMATCH) - ENUM2STR_CASE(STATUS_XBE_MEDIA_MISMATCH) - ENUM2STR_CASE(STATUS_OBJECT_NAME_NOT_FOUND) - ENUM2STR_CASE(STATUS_OBJECT_NAME_COLLISION) + ENUM2STR_CASE(xbox::status_invalid_image_format) + ENUM2STR_CASE(xbox::status_insufficient_resources) + ENUM2STR_CASE(xbox::status_xbe_region_mismatch) + ENUM2STR_CASE(xbox::status_xbe_media_mismatch) + ENUM2STR_CASE(xbox::status_object_name_not_found) + ENUM2STR_CASE(xbox::status_object_name_collision) ENUM2STR_END_and_LOGRENDER(NTSTATUS) */ diff --git a/src/core/kernel/exports/EmuKrnlLogging.h b/src/core/kernel/exports/EmuKrnlLogging.h index 1f0faf344..9dfeb98bd 100644 --- a/src/core/kernel/exports/EmuKrnlLogging.h +++ b/src/core/kernel/exports/EmuKrnlLogging.h @@ -52,7 +52,7 @@ enum PROTECTION_TYPE : int; #undef ExceptionCollidedUnwind #endif -#include +#include // prevent name collisions namespace xbox diff --git a/src/core/kernel/exports/EmuKrnlMm.cpp b/src/core/kernel/exports/EmuKrnlMm.cpp index cdb8b6519..5c304c3c9 100644 --- a/src/core/kernel/exports/EmuKrnlMm.cpp +++ b/src/core/kernel/exports/EmuKrnlMm.cpp @@ -30,7 +30,7 @@ #define LOG_PREFIX CXBXR_MODULE::MM -#include // For MmGlobalData, etc. +#include // For MmGlobalData, etc. #include "Logging.h" // For LOG_FUNC() #include "EmuKrnl.h" // For DefaultLaunchDataPage #include "EmuKrnlLogging.h" @@ -70,7 +70,7 @@ XBSYSAPI EXPORTNUM(164) xbox::PLAUNCH_DATA_PAGE xbox::LaunchDataPage = xbox::zer // to not care about the highest address. XBSYSAPI EXPORTNUM(165) xbox::PVOID NTAPI xbox::MmAllocateContiguousMemory ( - IN ULONG NumberOfBytes + IN ulong_xt NumberOfBytes ) { LOG_FORWARD("MmAllocateContiguousMemoryEx"); @@ -83,11 +83,11 @@ XBSYSAPI EXPORTNUM(165) xbox::PVOID NTAPI xbox::MmAllocateContiguousMemory // ****************************************************************** XBSYSAPI EXPORTNUM(166) xbox::PVOID NTAPI xbox::MmAllocateContiguousMemoryEx ( - IN ULONG NumberOfBytes, - IN PHYSICAL_ADDRESS LowestAcceptableAddress, - IN PHYSICAL_ADDRESS HighestAcceptableAddress, - IN ULONG Alignment OPTIONAL, - IN ULONG ProtectionType + IN ulong_xt NumberOfBytes, + IN physical_address_xt LowestAcceptableAddress, + IN physical_address_xt HighestAcceptableAddress, + IN ulong_xt Alignment OPTIONAL, + IN ulong_xt ProtectionType ) { LOG_FUNC_BEGIN @@ -108,8 +108,8 @@ XBSYSAPI EXPORTNUM(166) xbox::PVOID NTAPI xbox::MmAllocateContiguousMemoryEx // ****************************************************************** XBSYSAPI EXPORTNUM(167) xbox::PVOID NTAPI xbox::MmAllocateSystemMemory ( - ULONG NumberOfBytes, - ULONG Protect + ulong_xt NumberOfBytes, + ulong_xt Protect ) { LOG_FUNC_BEGIN @@ -127,8 +127,8 @@ XBSYSAPI EXPORTNUM(167) xbox::PVOID NTAPI xbox::MmAllocateSystemMemory // ****************************************************************** XBSYSAPI EXPORTNUM(168) xbox::PVOID NTAPI xbox::MmClaimGpuInstanceMemory ( - IN SIZE_T NumberOfBytes, - OUT SIZE_T *NumberOfPaddingBytes + IN size_xt NumberOfBytes, + OUT size_xt *NumberOfPaddingBytes ) { LOG_FUNC_BEGIN @@ -148,8 +148,8 @@ XBSYSAPI EXPORTNUM(168) xbox::PVOID NTAPI xbox::MmClaimGpuInstanceMemory // ****************************************************************** XBSYSAPI EXPORTNUM(169) xbox::PVOID NTAPI xbox::MmCreateKernelStack ( - IN ULONG NumberOfBytes, - IN BOOLEAN DebuggerThread + IN ulong_xt NumberOfBytes, + IN boolean_xt DebuggerThread ) { LOG_FUNC_BEGIN @@ -170,7 +170,7 @@ XBSYSAPI EXPORTNUM(169) xbox::PVOID NTAPI xbox::MmCreateKernelStack // ****************************************************************** // * 0x00AA - MmDeleteKernelStack() // ****************************************************************** -XBSYSAPI EXPORTNUM(170) xbox::VOID NTAPI xbox::MmDeleteKernelStack +XBSYSAPI EXPORTNUM(170) xbox::void_xt NTAPI xbox::MmDeleteKernelStack ( PVOID StackBase, PVOID StackLimit @@ -193,7 +193,7 @@ XBSYSAPI EXPORTNUM(170) xbox::VOID NTAPI xbox::MmDeleteKernelStack // Frees memory allocated with MmAllocateContiguousMemory. // // Differences from NT: None. -XBSYSAPI EXPORTNUM(171) xbox::VOID NTAPI xbox::MmFreeContiguousMemory +XBSYSAPI EXPORTNUM(171) xbox::void_xt NTAPI xbox::MmFreeContiguousMemory ( IN PVOID BaseAddress ) @@ -211,10 +211,10 @@ XBSYSAPI EXPORTNUM(171) xbox::VOID NTAPI xbox::MmFreeContiguousMemory // ****************************************************************** // * 0x00AC - MmFreeSystemMemory() // ****************************************************************** -XBSYSAPI EXPORTNUM(172) xbox::ULONG NTAPI xbox::MmFreeSystemMemory +XBSYSAPI EXPORTNUM(172) xbox::ulong_xt NTAPI xbox::MmFreeSystemMemory ( PVOID BaseAddress, - ULONG NumberOfBytes + ulong_xt NumberOfBytes ) { LOG_FUNC_BEGIN @@ -233,7 +233,7 @@ XBSYSAPI EXPORTNUM(172) xbox::ULONG NTAPI xbox::MmFreeSystemMemory // Translates a virtual address into a physical address. // // Differences from NT: PhysicalAddress is 32 bit, not 64. -XBSYSAPI EXPORTNUM(173) xbox::PHYSICAL_ADDRESS NTAPI xbox::MmGetPhysicalAddress +XBSYSAPI EXPORTNUM(173) xbox::physical_address_xt NTAPI xbox::MmGetPhysicalAddress ( IN PVOID BaseAddress ) @@ -251,7 +251,7 @@ XBSYSAPI EXPORTNUM(173) xbox::PHYSICAL_ADDRESS NTAPI xbox::MmGetPhysicalAddress // ****************************************************************** // * 0x00AE - MmIsAddressValid() // ****************************************************************** -XBSYSAPI EXPORTNUM(174) xbox::BOOLEAN NTAPI xbox::MmIsAddressValid +XBSYSAPI EXPORTNUM(174) xbox::boolean_xt NTAPI xbox::MmIsAddressValid ( IN PVOID VirtualAddress ) @@ -268,11 +268,11 @@ XBSYSAPI EXPORTNUM(174) xbox::BOOLEAN NTAPI xbox::MmIsAddressValid // ****************************************************************** // * 0x00AF - MmLockUnlockBufferPages() // ****************************************************************** -XBSYSAPI EXPORTNUM(175) xbox::VOID NTAPI xbox::MmLockUnlockBufferPages +XBSYSAPI EXPORTNUM(175) xbox::void_xt NTAPI xbox::MmLockUnlockBufferPages ( IN PVOID BaseAddress, - IN SIZE_T NumberOfBytes, - IN BOOLEAN UnlockPages + IN size_xt NumberOfBytes, + IN boolean_xt UnlockPages ) { LOG_FUNC_BEGIN @@ -289,10 +289,10 @@ XBSYSAPI EXPORTNUM(175) xbox::VOID NTAPI xbox::MmLockUnlockBufferPages // ****************************************************************** // * 0x00B0 - MmLockUnlockPhysicalPage() // ****************************************************************** -XBSYSAPI EXPORTNUM(176) xbox::VOID NTAPI xbox::MmLockUnlockPhysicalPage +XBSYSAPI EXPORTNUM(176) xbox::void_xt NTAPI xbox::MmLockUnlockPhysicalPage ( - IN ULONG_PTR PhysicalAddress, - IN BOOLEAN UnlockPage + IN ulong_ptr_xt PhysicalAddress, + IN boolean_xt UnlockPage ) { LOG_FUNC_BEGIN @@ -318,9 +318,9 @@ XBSYSAPI EXPORTNUM(176) xbox::VOID NTAPI xbox::MmLockUnlockPhysicalPage // want... XBSYSAPI EXPORTNUM(177) xbox::PVOID NTAPI xbox::MmMapIoSpace ( - IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberOfBytes, - IN ULONG ProtectionType + IN physical_address_xt PhysicalAddress, + IN ulong_xt NumberOfBytes, + IN ulong_xt ProtectionType ) { LOG_FUNC_BEGIN @@ -337,11 +337,11 @@ XBSYSAPI EXPORTNUM(177) xbox::PVOID NTAPI xbox::MmMapIoSpace // ****************************************************************** // * 0x00B2 - MmPersistContiguousMemory() // ****************************************************************** -XBSYSAPI EXPORTNUM(178) xbox::VOID NTAPI xbox::MmPersistContiguousMemory +XBSYSAPI EXPORTNUM(178) xbox::void_xt NTAPI xbox::MmPersistContiguousMemory ( IN PVOID BaseAddress, - IN ULONG NumberOfBytes, - IN BOOLEAN Persist + IN ulong_xt NumberOfBytes, + IN boolean_xt Persist ) { LOG_FUNC_BEGIN @@ -356,7 +356,7 @@ XBSYSAPI EXPORTNUM(178) xbox::VOID NTAPI xbox::MmPersistContiguousMemory // ****************************************************************** // * 0x00B3 - MmQueryAddressProtect() // ****************************************************************** -XBSYSAPI EXPORTNUM(179) xbox::ULONG NTAPI xbox::MmQueryAddressProtect +XBSYSAPI EXPORTNUM(179) xbox::ulong_xt NTAPI xbox::MmQueryAddressProtect ( IN PVOID VirtualAddress ) @@ -371,7 +371,7 @@ XBSYSAPI EXPORTNUM(179) xbox::ULONG NTAPI xbox::MmQueryAddressProtect // ****************************************************************** // * 0x00B4 - MmQueryAllocationSize() // ****************************************************************** -XBSYSAPI EXPORTNUM(180) xbox::ULONG NTAPI xbox::MmQueryAllocationSize +XBSYSAPI EXPORTNUM(180) xbox::ulong_xt NTAPI xbox::MmQueryAllocationSize ( IN PVOID BaseAddress ) @@ -386,7 +386,7 @@ XBSYSAPI EXPORTNUM(180) xbox::ULONG NTAPI xbox::MmQueryAllocationSize // ****************************************************************** // * 0x00B5 - MmQueryStatistics() // ****************************************************************** -XBSYSAPI EXPORTNUM(181) xbox::NTSTATUS NTAPI xbox::MmQueryStatistics +XBSYSAPI EXPORTNUM(181) xbox::ntstatus_xt NTAPI xbox::MmQueryStatistics ( OUT PMM_STATISTICS MemoryStatistics ) @@ -416,7 +416,7 @@ XBSYSAPI EXPORTNUM(181) xbox::NTSTATUS NTAPI xbox::MmQueryStatistics EmuLog(LOG_LEVEL::DEBUG, " MemoryStatistics->StackPagesCommitted = 0x%.08X", MemoryStatistics->StackPagesCommitted); EmuLog(LOG_LEVEL::DEBUG, " MemoryStatistics->ImagePagesCommitted = 0x%.08X", MemoryStatistics->ImagePagesCommitted); - ret = STATUS_SUCCESS; + ret = xbox::status_success; } else { @@ -430,11 +430,11 @@ XBSYSAPI EXPORTNUM(181) xbox::NTSTATUS NTAPI xbox::MmQueryStatistics // ****************************************************************** // * 0x00B6 - MmSetAddressProtect() // ****************************************************************** -XBSYSAPI EXPORTNUM(182) xbox::VOID NTAPI xbox::MmSetAddressProtect +XBSYSAPI EXPORTNUM(182) xbox::void_xt NTAPI xbox::MmSetAddressProtect ( IN PVOID BaseAddress, - IN ULONG NumberOfBytes, - IN ULONG NewProtect + IN ulong_xt NumberOfBytes, + IN ulong_xt NewProtect ) { LOG_FUNC_BEGIN @@ -452,10 +452,10 @@ XBSYSAPI EXPORTNUM(182) xbox::VOID NTAPI xbox::MmSetAddressProtect // Unmaps a virtual address mapping made by MmMapIoSpace. // // Differences from NT: None. -XBSYSAPI EXPORTNUM(183) xbox::VOID NTAPI xbox::MmUnmapIoSpace +XBSYSAPI EXPORTNUM(183) xbox::void_xt NTAPI xbox::MmUnmapIoSpace ( IN PVOID BaseAddress, - IN ULONG NumberOfBytes + IN ulong_xt NumberOfBytes ) { LOG_FUNC_BEGIN @@ -471,8 +471,8 @@ XBSYSAPI EXPORTNUM(183) xbox::VOID NTAPI xbox::MmUnmapIoSpace // ****************************************************************** XBSYSAPI EXPORTNUM(374) xbox::PVOID NTAPI xbox::MmDbgAllocateMemory ( - IN ULONG NumberOfBytes, - IN ULONG Protect + IN ulong_xt NumberOfBytes, + IN ulong_xt Protect ) { LOG_FUNC_BEGIN @@ -489,10 +489,10 @@ XBSYSAPI EXPORTNUM(374) xbox::PVOID NTAPI xbox::MmDbgAllocateMemory // ****************************************************************** // * 0x0177 - MmDbgFreeMemory // ****************************************************************** -XBSYSAPI EXPORTNUM(375) xbox::ULONG NTAPI xbox::MmDbgFreeMemory +XBSYSAPI EXPORTNUM(375) xbox::ulong_xt NTAPI xbox::MmDbgFreeMemory ( IN PVOID BaseAddress, - IN ULONG NumberOfBytes + IN ulong_xt NumberOfBytes ) { LOG_FUNC_BEGIN @@ -508,7 +508,7 @@ XBSYSAPI EXPORTNUM(375) xbox::ULONG NTAPI xbox::MmDbgFreeMemory // ****************************************************************** // * 0x0178 - MmDbgQueryAvailablePages // ****************************************************************** -XBSYSAPI EXPORTNUM(376) xbox::ULONG NTAPI xbox::MmDbgQueryAvailablePages(void) +XBSYSAPI EXPORTNUM(376) xbox::ulong_xt NTAPI xbox::MmDbgQueryAvailablePages(void) { LOG_FUNC(); @@ -520,7 +520,7 @@ XBSYSAPI EXPORTNUM(376) xbox::ULONG NTAPI xbox::MmDbgQueryAvailablePages(void) // ****************************************************************** // * 0x0179 - MmDbgReleaseAddress // ****************************************************************** -XBSYSAPI EXPORTNUM(377) xbox::VOID NTAPI xbox::MmDbgReleaseAddress +XBSYSAPI EXPORTNUM(377) xbox::void_xt NTAPI xbox::MmDbgReleaseAddress ( IN PVOID VirtualAddress, IN PULONG Opaque diff --git a/src/core/kernel/exports/EmuKrnlNt.cpp b/src/core/kernel/exports/EmuKrnlNt.cpp index aa18df9ea..b188d0a1a 100644 --- a/src/core/kernel/exports/EmuKrnlNt.cpp +++ b/src/core/kernel/exports/EmuKrnlNt.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX CXBXR_MODULE::NT -#include // For NtAllocateVirtualMemory, etc. +#include // For NtAllocateVirtualMemory, etc. #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" @@ -63,13 +63,13 @@ std::mutex NtSystemTimeMtx; // ****************************************************************** // * 0x00B8 - NtAllocateVirtualMemory() // ****************************************************************** -XBSYSAPI EXPORTNUM(184) xbox::NTSTATUS NTAPI xbox::NtAllocateVirtualMemory +XBSYSAPI EXPORTNUM(184) xbox::ntstatus_xt NTAPI xbox::NtAllocateVirtualMemory ( IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, + IN ulong_xt ZeroBits, IN OUT PULONG AllocationSize, - IN DWORD AllocationType, - IN DWORD Protect + IN dword_xt AllocationType, + IN dword_xt Protect ) { LOG_FUNC_BEGIN @@ -89,7 +89,7 @@ XBSYSAPI EXPORTNUM(184) xbox::NTSTATUS NTAPI xbox::NtAllocateVirtualMemory // ****************************************************************** // * 0x00B9 - NtCancelTimer() // ****************************************************************** -XBSYSAPI EXPORTNUM(185) xbox::NTSTATUS NTAPI xbox::NtCancelTimer +XBSYSAPI EXPORTNUM(185) xbox::ntstatus_xt NTAPI xbox::NtCancelTimer ( IN HANDLE TimerHandle, OUT PBOOLEAN CurrentState OPTIONAL @@ -115,7 +115,7 @@ XBSYSAPI EXPORTNUM(185) xbox::NTSTATUS NTAPI xbox::NtCancelTimer // ****************************************************************** // * 0x00BA - NtClearEvent() // ****************************************************************** -XBSYSAPI EXPORTNUM(186) xbox::NTSTATUS NTAPI xbox::NtClearEvent +XBSYSAPI EXPORTNUM(186) xbox::ntstatus_xt NTAPI xbox::NtClearEvent ( IN HANDLE EventHandle ) @@ -133,14 +133,14 @@ XBSYSAPI EXPORTNUM(186) xbox::NTSTATUS NTAPI xbox::NtClearEvent // ****************************************************************** // * 0x00BB - NtClose() // ****************************************************************** -XBSYSAPI EXPORTNUM(187) xbox::NTSTATUS NTAPI xbox::NtClose +XBSYSAPI EXPORTNUM(187) xbox::ntstatus_xt NTAPI xbox::NtClose ( IN HANDLE Handle ) { LOG_FUNC_ONE_ARG(Handle); - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; if (IsEmuHandle(Handle)) { @@ -179,7 +179,7 @@ XBSYSAPI EXPORTNUM(187) xbox::NTSTATUS NTAPI xbox::NtClose // ****************************************************************** // * 0x00BC - NtCreateDirectoryObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(188) xbox::NTSTATUS NTAPI xbox::NtCreateDirectoryObject +XBSYSAPI EXPORTNUM(188) xbox::ntstatus_xt NTAPI xbox::NtCreateDirectoryObject ( OUT PHANDLE DirectoryHandle, IN POBJECT_ATTRIBUTES ObjectAttributes @@ -196,7 +196,7 @@ XBSYSAPI EXPORTNUM(188) xbox::NTSTATUS NTAPI xbox::NtCreateDirectoryObject nativeObjectAttributes, "NtCreateDirectoryObject"); - if (ret == STATUS_SUCCESS) + if (ret == xbox::status_success) { // TODO : Is this the correct ACCESS_MASK? : const ACCESS_MASK DesiredAccess = DIRECTORY_CREATE_OBJECT; @@ -218,12 +218,12 @@ XBSYSAPI EXPORTNUM(188) xbox::NTSTATUS NTAPI xbox::NtCreateDirectoryObject // ****************************************************************** // * 0x00BD - NtCreateEvent() // ****************************************************************** -XBSYSAPI EXPORTNUM(189) xbox::NTSTATUS NTAPI xbox::NtCreateEvent +XBSYSAPI EXPORTNUM(189) xbox::ntstatus_xt NTAPI xbox::NtCreateEvent ( OUT PHANDLE EventHandle, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN EVENT_TYPE EventType, - IN BOOLEAN InitialState + IN boolean_xt InitialState ) { LOG_FUNC_BEGIN @@ -243,7 +243,7 @@ XBSYSAPI EXPORTNUM(189) xbox::NTSTATUS NTAPI xbox::NtCreateEvent PKEVENT Event; Status = ObCreateObject(&ExEventObjectType, ObjectAttributes, sizeof(KEVENT), (PVOID *)&Event); - if (NT_SUCCESS(Status)) { + if (nt_success(Status)) { KeInitializeEvent(Event, EventType, InitialState); Status = ObInsertObject(Event, ObjectAttributes, 0, EventHandle); } @@ -298,17 +298,17 @@ XBSYSAPI EXPORTNUM(189) xbox::NTSTATUS NTAPI xbox::NtCreateEvent // ****************************************************************** // * 0x00BE - NtCreateFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(190) xbox::NTSTATUS NTAPI xbox::NtCreateFile +XBSYSAPI EXPORTNUM(190) xbox::ntstatus_xt NTAPI xbox::NtCreateFile ( OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, + IN access_mask_xt DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PIO_STATUS_BLOCK IoStatusBlock, IN PLARGE_INTEGER AllocationSize OPTIONAL, - IN ULONG FileAttributes, - IN ULONG ShareAccess, - IN ULONG CreateDisposition, - IN ULONG CreateOptions + IN ulong_xt FileAttributes, + IN ulong_xt ShareAccess, + IN ulong_xt CreateDisposition, + IN ulong_xt CreateOptions ) { LOG_FORWARD("IoCreateFile"); @@ -331,12 +331,12 @@ XBSYSAPI EXPORTNUM(190) xbox::NTSTATUS NTAPI xbox::NtCreateFile // ****************************************************************** // * 0x00BF - NtCreateIoCompletion() // ****************************************************************** -XBSYSAPI EXPORTNUM(191) xbox::NTSTATUS NTAPI xbox::NtCreateIoCompletion +XBSYSAPI EXPORTNUM(191) xbox::ntstatus_xt NTAPI xbox::NtCreateIoCompletion ( OUT PHANDLE IoCompletionHandle, - IN ACCESS_MASK DesiredAccess, + IN access_mask_xt DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG Count + IN ulong_xt Count ) { LOG_FUNC_BEGIN @@ -354,11 +354,11 @@ XBSYSAPI EXPORTNUM(191) xbox::NTSTATUS NTAPI xbox::NtCreateIoCompletion // ****************************************************************** // * 0x00C0 - NtCreateMutant() // ****************************************************************** -XBSYSAPI EXPORTNUM(192) xbox::NTSTATUS NTAPI xbox::NtCreateMutant +XBSYSAPI EXPORTNUM(192) xbox::ntstatus_xt NTAPI xbox::NtCreateMutant ( OUT PHANDLE MutantHandle, IN POBJECT_ATTRIBUTES ObjectAttributes, - IN BOOLEAN InitialOwner + IN boolean_xt InitialOwner ) { LOG_FUNC_BEGIN @@ -377,7 +377,7 @@ XBSYSAPI EXPORTNUM(192) xbox::NTSTATUS NTAPI xbox::NtCreateMutant PKMUTANT Mutant; Status = ObCreateObject(&ExMutantObjectType, ObjectAttributes, sizeof(KMUTANT), (PVOID *)&Mutant); - if (NT_SUCCESS(Status)) { + if (nt_success(Status)) { KeInitializeMutant(Mutant, InitialOwner); Status = ObInsertObject(Mutant, ObjectAttributes, 0, /*OUT* /MutantHandle); } @@ -426,12 +426,12 @@ XBSYSAPI EXPORTNUM(192) xbox::NTSTATUS NTAPI xbox::NtCreateMutant // ****************************************************************** // * 0x00C1 - NtCreateSemaphore() // ****************************************************************** -XBSYSAPI EXPORTNUM(193) xbox::NTSTATUS NTAPI xbox::NtCreateSemaphore +XBSYSAPI EXPORTNUM(193) xbox::ntstatus_xt NTAPI xbox::NtCreateSemaphore ( OUT PHANDLE SemaphoreHandle, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN ULONG InitialCount, - IN ULONG MaximumCount + IN ulong_xt InitialCount, + IN ulong_xt MaximumCount ) { LOG_FUNC_BEGIN @@ -451,7 +451,7 @@ XBSYSAPI EXPORTNUM(193) xbox::NTSTATUS NTAPI xbox::NtCreateSemaphore PKSEMAPHORE Semaphore; Status = ObCreateObject(&ExSemaphoreObjectType, ObjectAttributes, sizeof(KSEMAPHORE), (PVOID *)&Semaphore); - if (NT_SUCCESS(Status)) { + if (nt_success(Status)) { KeInitializeSemaphore(Semaphore, InitialCount, /*Limit=* /MaximumCount); Status = ObInsertObject(Semaphore, ObjectAttributes, 0, /*OUT* /SemaphoreHandle); } @@ -501,7 +501,7 @@ XBSYSAPI EXPORTNUM(193) xbox::NTSTATUS NTAPI xbox::NtCreateSemaphore // ****************************************************************** // * 0x00C2 - NtCreateTimer() // ****************************************************************** -XBSYSAPI EXPORTNUM(194) xbox::NTSTATUS NTAPI xbox::NtCreateTimer +XBSYSAPI EXPORTNUM(194) xbox::ntstatus_xt NTAPI xbox::NtCreateTimer ( OUT PHANDLE TimerHandle, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, @@ -524,7 +524,7 @@ XBSYSAPI EXPORTNUM(194) xbox::NTSTATUS NTAPI xbox::NtCreateTimer PKTIMER Timer; Status = ObCreateObject(&ExTimerType, ObjectAttributes, sizeof(KTIMER), (PVOID *)&Timer); - if (NT_SUCCESS(Status)) { + if (nt_success(Status)) { KeInitializeTimerEx(Timer, TimerType); Status = ObInsertObject(Timer, ObjectAttributes, 0, /*OUT* /TimerHandle); } @@ -561,7 +561,7 @@ XBSYSAPI EXPORTNUM(194) xbox::NTSTATUS NTAPI xbox::NtCreateTimer // ****************************************************************** // * 0x00C3 - NtDeleteFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(195) xbox::NTSTATUS NTAPI xbox::NtDeleteFile +XBSYSAPI EXPORTNUM(195) xbox::ntstatus_xt NTAPI xbox::NtDeleteFile ( IN POBJECT_ATTRIBUTES ObjectAttributes ) @@ -574,7 +574,7 @@ XBSYSAPI EXPORTNUM(195) xbox::NTSTATUS NTAPI xbox::NtDeleteFile nativeObjectAttributes, "NtDeleteFile"); - if (ret == STATUS_SUCCESS) + if (ret == xbox::status_success) { ret = NtDll::NtDeleteFile( nativeObjectAttributes.NtObjAttrPtr); @@ -589,18 +589,18 @@ XBSYSAPI EXPORTNUM(195) xbox::NTSTATUS NTAPI xbox::NtDeleteFile // ****************************************************************** // * 0x00C4 - NtDeviceIoControlFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(196) xbox::NTSTATUS NTAPI xbox::NtDeviceIoControlFile +XBSYSAPI EXPORTNUM(196) xbox::ntstatus_xt NTAPI xbox::NtDeviceIoControlFile ( IN HANDLE FileHandle, IN HANDLE Event OPTIONAL, IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG IoControlCode, + IN ulong_xt IoControlCode, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, + IN ulong_xt InputBufferLength, OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength + IN ulong_xt OutputBufferLength ) { LOG_FUNC_BEGIN @@ -616,7 +616,7 @@ XBSYSAPI EXPORTNUM(196) xbox::NTSTATUS NTAPI xbox::NtDeviceIoControlFile LOG_FUNC_ARG(OutputBufferLength) LOG_FUNC_END; - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; switch (IoControlCode) { @@ -667,11 +667,11 @@ XBSYSAPI EXPORTNUM(196) xbox::NTSTATUS NTAPI xbox::NtDeviceIoControlFile // ****************************************************************** // * 0x00C5 - NtDuplicateObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(197) xbox::NTSTATUS NTAPI xbox::NtDuplicateObject +XBSYSAPI EXPORTNUM(197) xbox::ntstatus_xt NTAPI xbox::NtDuplicateObject ( HANDLE SourceHandle, HANDLE *TargetHandle, - DWORD Options + dword_xt Options ) { LOG_FUNC_BEGIN @@ -680,7 +680,7 @@ XBSYSAPI EXPORTNUM(197) xbox::NTSTATUS NTAPI xbox::NtDuplicateObject LOG_FUNC_ARG(Options) LOG_FUNC_END; - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; if (IsEmuHandle(SourceHandle)) { EmuHandle* iEmuHandle = HandleToEmuHandle(SourceHandle); @@ -689,7 +689,7 @@ XBSYSAPI EXPORTNUM(197) xbox::NTSTATUS NTAPI xbox::NtDuplicateObject PVOID Object; ret = ObReferenceObjectByHandle(SourceHandle, /*ObjectType=* /NULL, &Object); - if (NT_SUCCESS(ret)) { + if (nt_success(ret)) { if (ObpIsFlagSet(Options, DUPLICATE_CLOSE_SOURCE)) NtClose(SourceHandle); @@ -717,7 +717,7 @@ XBSYSAPI EXPORTNUM(197) xbox::NTSTATUS NTAPI xbox::NtDuplicateObject Options); } - if (ret != STATUS_SUCCESS) + if (ret != xbox::status_success) EmuLog(LOG_LEVEL::WARNING, "Object was not duplicated!"); RETURN(ret); @@ -726,7 +726,7 @@ XBSYSAPI EXPORTNUM(197) xbox::NTSTATUS NTAPI xbox::NtDuplicateObject // ****************************************************************** // * 0x00C6 - NtFlushBuffersFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(198) xbox::NTSTATUS NTAPI xbox::NtFlushBuffersFile +XBSYSAPI EXPORTNUM(198) xbox::ntstatus_xt NTAPI xbox::NtFlushBuffersFile ( PVOID FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock @@ -736,7 +736,7 @@ XBSYSAPI EXPORTNUM(198) xbox::NTSTATUS NTAPI xbox::NtFlushBuffersFile LOG_FUNC_ARG(FileHandle) LOG_FUNC_ARG_OUT(IoStatusBlock) LOG_FUNC_END; - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; if (IsEmuHandle(FileHandle)) LOG_UNIMPLEMENTED(); @@ -752,11 +752,11 @@ XBSYSAPI EXPORTNUM(198) xbox::NTSTATUS NTAPI xbox::NtFlushBuffersFile // Frees virtual memory. // // Differences from NT: There is no ProcessHandle parameter. -XBSYSAPI EXPORTNUM(199) xbox::NTSTATUS NTAPI xbox::NtFreeVirtualMemory +XBSYSAPI EXPORTNUM(199) xbox::ntstatus_xt NTAPI xbox::NtFreeVirtualMemory ( IN OUT PVOID *BaseAddress, IN OUT PULONG FreeSize, - IN ULONG FreeType + IN ulong_xt FreeType ) { LOG_FUNC_BEGIN @@ -773,18 +773,18 @@ XBSYSAPI EXPORTNUM(199) xbox::NTSTATUS NTAPI xbox::NtFreeVirtualMemory // ****************************************************************** // * 0x00C8 - NtFsControlFile // ****************************************************************** -XBSYSAPI EXPORTNUM(200) xbox::NTSTATUS NTAPI xbox::NtFsControlFile +XBSYSAPI EXPORTNUM(200) xbox::ntstatus_xt NTAPI xbox::NtFsControlFile ( IN HANDLE FileHandle, IN HANDLE Event OPTIONAL, IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG FsControlCode, + IN ulong_xt FsControlCode, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, + IN ulong_xt InputBufferLength, OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength + IN ulong_xt OutputBufferLength ) { LOG_FUNC_BEGIN @@ -807,7 +807,7 @@ XBSYSAPI EXPORTNUM(200) xbox::NTSTATUS NTAPI xbox::NtFsControlFile int partitionNumber = CxbxGetPartitionNumberFromHandle(FileHandle); if (partitionNumber > 0) { CxbxFormatPartitionByHandle(FileHandle); - ret = STATUS_SUCCESS; + ret = xbox::status_success; } break; } @@ -819,7 +819,7 @@ XBSYSAPI EXPORTNUM(200) xbox::NTSTATUS NTAPI xbox::NtFsControlFile // ****************************************************************** // * 0x00C9 - NtOpenDirectoryObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(201) xbox::NTSTATUS NTAPI xbox::NtOpenDirectoryObject +XBSYSAPI EXPORTNUM(201) xbox::ntstatus_xt NTAPI xbox::NtOpenDirectoryObject ( OUT PHANDLE DirectoryHandle, IN POBJECT_ATTRIBUTES ObjectAttributes @@ -838,14 +838,14 @@ XBSYSAPI EXPORTNUM(201) xbox::NTSTATUS NTAPI xbox::NtOpenDirectoryObject // IoStatusBlock, NULL, 0, ShareAccess, OPEN_EXISTING, OpenOptions); // // Differences from NT: See NtCreateFile. -XBSYSAPI EXPORTNUM(202) xbox::NTSTATUS NTAPI xbox::NtOpenFile +XBSYSAPI EXPORTNUM(202) xbox::ntstatus_xt NTAPI xbox::NtOpenFile ( OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, + IN access_mask_xt DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG ShareAccess, - IN ULONG OpenOptions + IN ulong_xt ShareAccess, + IN ulong_xt OpenOptions ) { LOG_FORWARD("IoCreateFile"); @@ -866,7 +866,7 @@ XBSYSAPI EXPORTNUM(202) xbox::NTSTATUS NTAPI xbox::NtOpenFile // ****************************************************************** // * 0x00CB - NtOpenSymbolicLinkObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(203) xbox::NTSTATUS NTAPI xbox::NtOpenSymbolicLinkObject +XBSYSAPI EXPORTNUM(203) xbox::ntstatus_xt NTAPI xbox::NtOpenSymbolicLinkObject ( OUT PHANDLE LinkHandle, IN POBJECT_ATTRIBUTES ObjectAttributes @@ -890,10 +890,10 @@ XBSYSAPI EXPORTNUM(203) xbox::NTSTATUS NTAPI xbox::NtOpenSymbolicLinkObject { // Return a new handle (which is an EmuHandle, actually) : *LinkHandle = symbolicLinkObject->NewHandle(); - ret = STATUS_SUCCESS; + ret = xbox::status_success; } - if (ret != STATUS_SUCCESS) + if (ret != xbox::status_success) EmuLog(LOG_LEVEL::WARNING, "NtOpenSymbolicLinkObject failed! (%s)", NtStatusToString(ret)); else EmuLog(LOG_LEVEL::DEBUG, "NtOpenSymbolicLinkObject LinkHandle^ = 0x%.8X", *LinkHandle); @@ -904,11 +904,11 @@ XBSYSAPI EXPORTNUM(203) xbox::NTSTATUS NTAPI xbox::NtOpenSymbolicLinkObject // ****************************************************************** // * 0x00CC - NtProtectVirtualMemory() // ****************************************************************** -XBSYSAPI EXPORTNUM(204) xbox::NTSTATUS NTAPI xbox::NtProtectVirtualMemory +XBSYSAPI EXPORTNUM(204) xbox::ntstatus_xt NTAPI xbox::NtProtectVirtualMemory ( IN OUT PVOID *BaseAddress, IN OUT PSIZE_T RegionSize, - IN ULONG NewProtect, + IN ulong_xt NewProtect, OUT PULONG OldProtect ) { @@ -930,7 +930,7 @@ XBSYSAPI EXPORTNUM(204) xbox::NTSTATUS NTAPI xbox::NtProtectVirtualMemory // ****************************************************************** // * 0x00CD - NtPulseEvent() // ****************************************************************** -XBSYSAPI EXPORTNUM(205) xbox::NTSTATUS NTAPI xbox::NtPulseEvent +XBSYSAPI EXPORTNUM(205) xbox::ntstatus_xt NTAPI xbox::NtPulseEvent ( IN HANDLE EventHandle, OUT PLONG PreviousState OPTIONAL @@ -945,7 +945,7 @@ XBSYSAPI EXPORTNUM(205) xbox::NTSTATUS NTAPI xbox::NtPulseEvent // TODO : Untested NTSTATUS ret = NtDll::NtPulseEvent( EventHandle, - /*OUT*/PreviousState); + /*OUT*/(::PLONG)(PreviousState)); if (FAILED(ret)) EmuLog(LOG_LEVEL::WARNING, "NtPulseEvent failed!"); @@ -956,13 +956,13 @@ XBSYSAPI EXPORTNUM(205) xbox::NTSTATUS NTAPI xbox::NtPulseEvent // ****************************************************************** // * 0x00CE - NtQueueApcThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(206) xbox::NTSTATUS NTAPI xbox::NtQueueApcThread +XBSYSAPI EXPORTNUM(206) xbox::ntstatus_xt NTAPI xbox::NtQueueApcThread ( IN HANDLE ThreadHandle, IN PIO_APC_ROUTINE ApcRoutine, IN PVOID ApcRoutineContext OPTIONAL, IN PIO_STATUS_BLOCK ApcStatusBlock OPTIONAL, - IN ULONG ApcReserved OPTIONAL + IN ulong_xt ApcReserved OPTIONAL ) { LOG_FUNC_BEGIN @@ -1026,7 +1026,7 @@ XBSYSAPI EXPORTNUM(206) xbox::NTSTATUS NTAPI xbox::NtQueueApcThread // ****************************************************************** // * 0x00CF - NtQueryDirectoryFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(207) xbox::NTSTATUS NTAPI xbox::NtQueryDirectoryFile +XBSYSAPI EXPORTNUM(207) xbox::ntstatus_xt NTAPI xbox::NtQueryDirectoryFile ( IN HANDLE FileHandle, IN HANDLE Event OPTIONAL, @@ -1034,10 +1034,10 @@ XBSYSAPI EXPORTNUM(207) xbox::NTSTATUS NTAPI xbox::NtQueryDirectoryFile IN PVOID ApcContext, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT FILE_DIRECTORY_INFORMATION *FileInformation, - IN ULONG Length, + IN ulong_xt Length, IN FILE_INFORMATION_CLASS FileInformationClass, IN PSTRING FileMask, - IN BOOLEAN RestartScan + IN boolean_xt RestartScan ) { LOG_FUNC_BEGIN @@ -1126,12 +1126,12 @@ XBSYSAPI EXPORTNUM(207) xbox::NTSTATUS NTAPI xbox::NtQueryDirectoryFile // ****************************************************************** // * 0x00D0 - NtQueryDirectoryObject // ****************************************************************** -XBSYSAPI EXPORTNUM(208) xbox::NTSTATUS NTAPI xbox::NtQueryDirectoryObject +XBSYSAPI EXPORTNUM(208) xbox::ntstatus_xt NTAPI xbox::NtQueryDirectoryObject ( IN HANDLE DirectoryHandle, OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN RestartScan, + IN ulong_xt Length, + IN boolean_xt RestartScan, IN OUT PULONG Context, OUT PULONG ReturnedLength OPTIONAL ) @@ -1147,13 +1147,13 @@ XBSYSAPI EXPORTNUM(208) xbox::NTSTATUS NTAPI xbox::NtQueryDirectoryObject LOG_UNIMPLEMENTED(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x00D1 - NtQueryEvent() // ****************************************************************** -XBSYSAPI EXPORTNUM(209) xbox::NTSTATUS NTAPI xbox::NtQueryEvent +XBSYSAPI EXPORTNUM(209) xbox::ntstatus_xt NTAPI xbox::NtQueryEvent ( IN HANDLE EventHandle, OUT PEVENT_BASIC_INFORMATION EventInformation @@ -1171,7 +1171,7 @@ XBSYSAPI EXPORTNUM(209) xbox::NTSTATUS NTAPI xbox::NtQueryEvent sizeof(EVENT_BASIC_INFORMATION), /*ReturnLength=*/nullptr); - if (ret != STATUS_SUCCESS) + if (ret != xbox::status_success) EmuLog(LOG_LEVEL::WARNING, "NtQueryEvent failed! (%s)", NtStatusToString(ret)); RETURN(ret); @@ -1180,7 +1180,7 @@ XBSYSAPI EXPORTNUM(209) xbox::NTSTATUS NTAPI xbox::NtQueryEvent // ****************************************************************** // * 0x00D2 - NtQueryFullAttributesFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(210) xbox::NTSTATUS NTAPI xbox::NtQueryFullAttributesFile +XBSYSAPI EXPORTNUM(210) xbox::ntstatus_xt NTAPI xbox::NtQueryFullAttributesFile ( IN POBJECT_ATTRIBUTES ObjectAttributes, OUT xbox::PFILE_NETWORK_OPEN_INFORMATION Attributes @@ -1200,7 +1200,7 @@ XBSYSAPI EXPORTNUM(210) xbox::NTSTATUS NTAPI xbox::NtQueryFullAttributesFile /*var*/nativeObjectAttributes, "NtQueryFullAttributesFile"); - if (ret == STATUS_SUCCESS) + if (ret == xbox::status_success) ret = NtDll::NtQueryFullAttributesFile( nativeObjectAttributes.NtObjAttrPtr, &nativeNetOpenInfo); @@ -1217,12 +1217,12 @@ XBSYSAPI EXPORTNUM(210) xbox::NTSTATUS NTAPI xbox::NtQueryFullAttributesFile // ****************************************************************** // * 0x00D3 - NtQueryInformationFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(211) xbox::NTSTATUS NTAPI xbox::NtQueryInformationFile +XBSYSAPI EXPORTNUM(211) xbox::ntstatus_xt NTAPI xbox::NtQueryInformationFile ( IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID FileInformation, - IN ULONG Length, + IN ulong_xt Length, IN FILE_INFORMATION_CLASS FileInformationClass ) { @@ -1253,7 +1253,7 @@ XBSYSAPI EXPORTNUM(211) xbox::NTSTATUS NTAPI xbox::NtQueryInformationFile (NtDll::FILE_INFORMATION_CLASS)FileInformationClass); // Buffer is too small; make a larger one - if (ret == STATUS_BUFFER_OVERFLOW) + if (ret == xbox::status_buffer_overflow) { free(ntFileInfo); @@ -1262,7 +1262,7 @@ XBSYSAPI EXPORTNUM(211) xbox::NTSTATUS NTAPI xbox::NtQueryInformationFile if (bufferSize > 65536) return STATUS_INVALID_PARAMETER; // TODO: what's the appropriate error code to return here? } - } while (ret == STATUS_BUFFER_OVERFLOW); + } while (ret == xbox::status_buffer_overflow); // Convert and copy NT data to the given Xbox struct NTSTATUS convRet = NTToXboxFileInformation(ntFileInfo, FileInformation, FileInformationClass, Length); @@ -1275,7 +1275,7 @@ XBSYSAPI EXPORTNUM(211) xbox::NTSTATUS NTAPI xbox::NtQueryInformationFile // Prioritize the buffer overflow over real return code, // in case the Xbox program decides to follow the same procedure above - if (convRet == STATUS_BUFFER_OVERFLOW) + if (convRet == xbox::status_buffer_overflow) return convRet; RETURN(ret); @@ -1284,7 +1284,7 @@ XBSYSAPI EXPORTNUM(211) xbox::NTSTATUS NTAPI xbox::NtQueryInformationFile // ****************************************************************** // * 0x00D4 - NtQueryIoCompletion // ****************************************************************** -XBSYSAPI EXPORTNUM(212) xbox::NTSTATUS NTAPI xbox::NtQueryIoCompletion +XBSYSAPI EXPORTNUM(212) xbox::ntstatus_xt NTAPI xbox::NtQueryIoCompletion ( IN HANDLE IoCompletionHandle, OUT PIO_COMPLETION_BASIC_INFORMATION IoCompletionInformation @@ -1297,13 +1297,13 @@ XBSYSAPI EXPORTNUM(212) xbox::NTSTATUS NTAPI xbox::NtQueryIoCompletion LOG_UNIMPLEMENTED(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x00D5 - NtQueryMutant() // ****************************************************************** -XBSYSAPI EXPORTNUM(213) xbox::NTSTATUS NTAPI xbox::NtQueryMutant +XBSYSAPI EXPORTNUM(213) xbox::ntstatus_xt NTAPI xbox::NtQueryMutant ( IN HANDLE MutantHandle, OUT PMUTANT_BASIC_INFORMATION MutantInformation @@ -1321,7 +1321,7 @@ XBSYSAPI EXPORTNUM(213) xbox::NTSTATUS NTAPI xbox::NtQueryMutant sizeof(MUTANT_BASIC_INFORMATION), /*ReturnLength=*/nullptr); - if (ret != STATUS_SUCCESS) + if (ret != xbox::status_success) EmuLog(LOG_LEVEL::WARNING, "NtQueryMutant failed! (%s)", NtStatusToString(ret)); RETURN(ret); @@ -1330,7 +1330,7 @@ XBSYSAPI EXPORTNUM(213) xbox::NTSTATUS NTAPI xbox::NtQueryMutant // ****************************************************************** // * 0x00D6 - NtQuerySemaphore() // ****************************************************************** -XBSYSAPI EXPORTNUM(214) xbox::NTSTATUS NTAPI xbox::NtQuerySemaphore +XBSYSAPI EXPORTNUM(214) xbox::ntstatus_xt NTAPI xbox::NtQuerySemaphore ( IN HANDLE SemaphoreHandle, OUT PSEMAPHORE_BASIC_INFORMATION SemaphoreInformation @@ -1348,7 +1348,7 @@ XBSYSAPI EXPORTNUM(214) xbox::NTSTATUS NTAPI xbox::NtQuerySemaphore sizeof(SEMAPHORE_BASIC_INFORMATION), /*ReturnLength=*/nullptr); - if (ret != STATUS_SUCCESS) + if (ret != xbox::status_success) EmuLog(LOG_LEVEL::WARNING, "NtQuerySemaphore failed! (%s)", NtStatusToString(ret)); RETURN(ret); @@ -1357,7 +1357,7 @@ XBSYSAPI EXPORTNUM(214) xbox::NTSTATUS NTAPI xbox::NtQuerySemaphore // ****************************************************************** // * 0x00D7 - NtQuerySymbolicLinkObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(215) xbox::NTSTATUS NTAPI xbox::NtQuerySymbolicLinkObject +XBSYSAPI EXPORTNUM(215) xbox::ntstatus_xt NTAPI xbox::NtQuerySymbolicLinkObject ( HANDLE LinkHandle, OUT PSTRING LinkTarget, @@ -1378,7 +1378,7 @@ XBSYSAPI EXPORTNUM(215) xbox::NTSTATUS NTAPI xbox::NtQuerySymbolicLinkObject EmuHandle* iEmuHandle = HandleToEmuHandle(LinkHandle); // Retrieve the NtSymbolicLinkObject and populate the output arguments : - ret = STATUS_SUCCESS; + ret = xbox::status_success; symbolicLinkObject = (EmuNtSymbolicLinkObject*)iEmuHandle->NtObject; if (symbolicLinkObject->IsHostBasedPath) { @@ -1391,7 +1391,7 @@ XBSYSAPI EXPORTNUM(215) xbox::NTSTATUS NTAPI xbox::NtQuerySymbolicLinkObject copy_string_to_PSTRING_to(symbolicLinkObject->XboxSymbolicLinkPath, LinkTarget); } else { - ret = STATUS_BUFFER_TOO_SMALL; + ret = xbox::status_buffer_too_small; } } @@ -1400,7 +1400,7 @@ XBSYSAPI EXPORTNUM(215) xbox::NTSTATUS NTAPI xbox::NtQuerySymbolicLinkObject *ReturnedLength = symbolicLinkObject->XboxSymbolicLinkPath.length(); // Return full length (even if buffer was too small) } } - if (ret != STATUS_SUCCESS) + if (ret != xbox::status_success) EmuLog(LOG_LEVEL::WARNING, "NtQuerySymbolicLinkObject failed! (%s)", NtStatusToString(ret)); RETURN(ret); @@ -1409,7 +1409,7 @@ XBSYSAPI EXPORTNUM(215) xbox::NTSTATUS NTAPI xbox::NtQuerySymbolicLinkObject // ****************************************************************** // * 0x00D8 - NtQueryTimer() // ****************************************************************** -XBSYSAPI EXPORTNUM(216) xbox::NTSTATUS NTAPI xbox::NtQueryTimer +XBSYSAPI EXPORTNUM(216) xbox::ntstatus_xt NTAPI xbox::NtQueryTimer ( IN HANDLE TimerHandle, OUT PTIMER_BASIC_INFORMATION TimerInformation @@ -1436,7 +1436,7 @@ XBSYSAPI EXPORTNUM(216) xbox::NTSTATUS NTAPI xbox::NtQueryTimer // ****************************************************************** // * 0x00D9 - NtQueryVirtualMemory() // ****************************************************************** -XBSYSAPI EXPORTNUM(217) xbox::NTSTATUS NTAPI xbox::NtQueryVirtualMemory +XBSYSAPI EXPORTNUM(217) xbox::ntstatus_xt NTAPI xbox::NtQueryVirtualMemory ( IN PVOID BaseAddress, OUT PMEMORY_BASIC_INFORMATION Buffer @@ -1456,7 +1456,7 @@ XBSYSAPI EXPORTNUM(217) xbox::NTSTATUS NTAPI xbox::NtQueryVirtualMemory NTSTATUS ret = g_VMManager.XbVirtualMemoryStatistics((VAddr)BaseAddress, Buffer); - if (ret == STATUS_SUCCESS) + if (ret == xbox::status_success) { EmuLog(LOG_LEVEL::DEBUG, " Buffer->AllocationBase = 0x%.08X", Buffer->AllocationBase); EmuLog(LOG_LEVEL::DEBUG, " Buffer->AllocationProtect = 0x%.08X", Buffer->AllocationProtect); @@ -1486,7 +1486,7 @@ XBSYSAPI EXPORTNUM(217) xbox::NTSTATUS NTAPI xbox::NtQueryVirtualMemory Buffer->Protect = PAGE_READONLY; // One of the flags listed for the AllocationProtect member is specified Buffer->Type = 262144; // Specifies the type of pages in the region. (MEM_IMAGE, MEM_MAPPED or MEM_PRIVATE) - ret = STATUS_SUCCESS; + ret = xbox::status_success; EmuLog(LOG_LEVEL::DEBUG, "NtQueryVirtualMemory: Applied fix for Forza Motorsport!"); } @@ -1499,12 +1499,12 @@ XBSYSAPI EXPORTNUM(217) xbox::NTSTATUS NTAPI xbox::NtQueryVirtualMemory // ****************************************************************** // * 0x00DA - NtQueryVolumeInformationFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(218) xbox::NTSTATUS NTAPI xbox::NtQueryVolumeInformationFile +XBSYSAPI EXPORTNUM(218) xbox::ntstatus_xt NTAPI xbox::NtQueryVolumeInformationFile ( IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PFILE_FS_SIZE_INFORMATION FileInformation, - IN ULONG Length, + IN ulong_xt Length, IN FS_INFORMATION_CLASS FileInformationClass ) { @@ -1538,7 +1538,7 @@ XBSYSAPI EXPORTNUM(218) xbox::NTSTATUS NTAPI xbox::NtQueryVolumeInformationFile XboxSizeInfo->TotalAllocationUnits.QuadPart = partitionTable.TableEntries[partitionNumber - 1].LBASize / XboxSizeInfo->SectorsPerAllocationUnit; XboxSizeInfo->AvailableAllocationUnits.QuadPart = partitionTable.TableEntries[partitionNumber - 1].LBASize / XboxSizeInfo->SectorsPerAllocationUnit; - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // Get the required size for the host buffer @@ -1576,7 +1576,7 @@ XBSYSAPI EXPORTNUM(218) xbox::NTSTATUS NTAPI xbox::NtQueryVolumeInformationFile (NtDll::FS_INFORMATION_CLASS)FileInformationClass); // Convert Xbox NativeFileInformation to FileInformation - if (ret == STATUS_SUCCESS) { + if (ret == xbox::status_success) { switch ((DWORD)FileInformationClass) { case FileFsVolumeInformation: { PFILE_FS_VOLUME_INFORMATION XboxVolumeInfo = (PFILE_FS_VOLUME_INFORMATION)FileInformation; @@ -1612,7 +1612,7 @@ XBSYSAPI EXPORTNUM(218) xbox::NTSTATUS NTAPI xbox::NtQueryVolumeInformationFile // ****************************************************************** // * 0x00DB - NtReadFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(219) xbox::NTSTATUS NTAPI xbox::NtReadFile +XBSYSAPI EXPORTNUM(219) xbox::ntstatus_xt NTAPI xbox::NtReadFile ( IN HANDLE FileHandle, // TODO: correct paramters IN HANDLE Event OPTIONAL, @@ -1620,7 +1620,7 @@ XBSYSAPI EXPORTNUM(219) xbox::NTSTATUS NTAPI xbox::NtReadFile IN PVOID ApcContext, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID Buffer, - IN ULONG Length, + IN ulong_xt Length, IN PLARGE_INTEGER ByteOffset OPTIONAL ) { @@ -1669,7 +1669,7 @@ XBSYSAPI EXPORTNUM(219) xbox::NTSTATUS NTAPI xbox::NtReadFile // ****************************************************************** // * 0x00DC - NtReadFileScatter // ****************************************************************** -XBSYSAPI EXPORTNUM(220) xbox::NTSTATUS NTAPI xbox::NtReadFileScatter +XBSYSAPI EXPORTNUM(220) xbox::ntstatus_xt NTAPI xbox::NtReadFileScatter ( IN HANDLE FileHandle, IN HANDLE Event OPTIONAL, @@ -1677,7 +1677,7 @@ XBSYSAPI EXPORTNUM(220) xbox::NTSTATUS NTAPI xbox::NtReadFileScatter IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, IN PFILE_SEGMENT_ELEMENT SegmentArray, - IN ULONG Length, + IN ulong_xt Length, IN PLARGE_INTEGER ByteOffset OPTIONAL ) { @@ -1694,13 +1694,13 @@ XBSYSAPI EXPORTNUM(220) xbox::NTSTATUS NTAPI xbox::NtReadFileScatter LOG_UNIMPLEMENTED(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x00DD - NtReleaseMutant() // ****************************************************************** -XBSYSAPI EXPORTNUM(221) xbox::NTSTATUS NTAPI xbox::NtReleaseMutant +XBSYSAPI EXPORTNUM(221) xbox::ntstatus_xt NTAPI xbox::NtReleaseMutant ( IN HANDLE MutantHandle, OUT PLONG PreviousCount @@ -1712,21 +1712,21 @@ XBSYSAPI EXPORTNUM(221) xbox::NTSTATUS NTAPI xbox::NtReleaseMutant LOG_FUNC_END; // redirect to NtCreateMutant - NTSTATUS ret = NtDll::NtReleaseMutant(MutantHandle, PreviousCount); + NTSTATUS ret = NtDll::NtReleaseMutant(MutantHandle, (::PLONG)(PreviousCount)); if (FAILED(ret)) EmuLog(LOG_LEVEL::WARNING, "NtReleaseMutant Failed!"); - RETURN(STATUS_SUCCESS); // TODO : RETURN(ret); + RETURN(xbox::status_success); // TODO : RETURN(ret); } // ****************************************************************** // * 0x00DE - NtReleaseSemaphore() // ****************************************************************** -XBSYSAPI EXPORTNUM(222) xbox::NTSTATUS NTAPI xbox::NtReleaseSemaphore +XBSYSAPI EXPORTNUM(222) xbox::ntstatus_xt NTAPI xbox::NtReleaseSemaphore ( IN HANDLE SemaphoreHandle, - IN ULONG ReleaseCount, + IN ulong_xt ReleaseCount, OUT PULONG PreviousCount OPTIONAL ) { @@ -1739,7 +1739,7 @@ XBSYSAPI EXPORTNUM(222) xbox::NTSTATUS NTAPI xbox::NtReleaseSemaphore NTSTATUS ret = NtDll::NtReleaseSemaphore( SemaphoreHandle, ReleaseCount, - PreviousCount); + (::PULONG)PreviousCount); if (FAILED(ret)) EmuLog(LOG_LEVEL::WARNING, "NtReleaseSemaphore failed!"); @@ -1750,7 +1750,7 @@ XBSYSAPI EXPORTNUM(222) xbox::NTSTATUS NTAPI xbox::NtReleaseSemaphore // ****************************************************************** // * 0x00DF - NtRemoveIoCompletion // ****************************************************************** -XBSYSAPI EXPORTNUM(223) xbox::NTSTATUS NTAPI xbox::NtRemoveIoCompletion +XBSYSAPI EXPORTNUM(223) xbox::ntstatus_xt NTAPI xbox::NtRemoveIoCompletion ( IN HANDLE IoCompletionHandle, OUT PVOID *KeyContext, @@ -1769,13 +1769,13 @@ XBSYSAPI EXPORTNUM(223) xbox::NTSTATUS NTAPI xbox::NtRemoveIoCompletion LOG_UNIMPLEMENTED(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x00E0 - NtResumeThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(224) xbox::NTSTATUS NTAPI xbox::NtResumeThread +XBSYSAPI EXPORTNUM(224) xbox::ntstatus_xt NTAPI xbox::NtResumeThread ( IN HANDLE ThreadHandle, OUT PULONG PreviousSuspendCount @@ -1788,7 +1788,7 @@ XBSYSAPI EXPORTNUM(224) xbox::NTSTATUS NTAPI xbox::NtResumeThread NTSTATUS ret = NtDll::NtResumeThread( ThreadHandle, - PreviousSuspendCount); + (::PULONG)PreviousSuspendCount); // TODO : Once we do our own thread-switching, implement NtResumeThread using KetResumeThread @@ -1800,7 +1800,7 @@ XBSYSAPI EXPORTNUM(224) xbox::NTSTATUS NTAPI xbox::NtResumeThread // ****************************************************************** // * 0x00E1 - NtSetEvent() // ****************************************************************** -XBSYSAPI EXPORTNUM(225) xbox::NTSTATUS NTAPI xbox::NtSetEvent +XBSYSAPI EXPORTNUM(225) xbox::ntstatus_xt NTAPI xbox::NtSetEvent ( IN HANDLE EventHandle, OUT PLONG PreviousState @@ -1813,7 +1813,7 @@ XBSYSAPI EXPORTNUM(225) xbox::NTSTATUS NTAPI xbox::NtSetEvent NTSTATUS ret = NtDll::NtSetEvent( EventHandle, - PreviousState); + (::PLONG)(PreviousState)); if (FAILED(ret)) EmuLog(LOG_LEVEL::WARNING, "NtSetEvent Failed!"); @@ -1824,12 +1824,12 @@ XBSYSAPI EXPORTNUM(225) xbox::NTSTATUS NTAPI xbox::NtSetEvent // ****************************************************************** // * 0x00E2 - NtSetInformationFile() // ****************************************************************** -XBSYSAPI EXPORTNUM(226) xbox::NTSTATUS NTAPI xbox::NtSetInformationFile +XBSYSAPI EXPORTNUM(226) xbox::ntstatus_xt NTAPI xbox::NtSetInformationFile ( IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, IN PVOID FileInformation, - IN ULONG Length, + IN ulong_xt Length, IN FILE_INFORMATION_CLASS FileInformationClass ) { @@ -1841,7 +1841,7 @@ XBSYSAPI EXPORTNUM(226) xbox::NTSTATUS NTAPI xbox::NtSetInformationFile LOG_FUNC_ARG(FileInformationClass) LOG_FUNC_END; - XboxToNTFileInformation(convertedFileInfo, FileInformation, FileInformationClass, &Length); + XboxToNTFileInformation(convertedFileInfo, FileInformation, FileInformationClass, (::PULONG)&Length); NTSTATUS ret = NtDll::NtSetInformationFile( FileHandle, @@ -1856,13 +1856,13 @@ XBSYSAPI EXPORTNUM(226) xbox::NTSTATUS NTAPI xbox::NtSetInformationFile // ****************************************************************** // * 0x00E3 - NtSetIoCompletion // ****************************************************************** -XBSYSAPI EXPORTNUM(227) xbox::NTSTATUS NTAPI xbox::NtSetIoCompletion +XBSYSAPI EXPORTNUM(227) xbox::ntstatus_xt NTAPI xbox::NtSetIoCompletion ( IN HANDLE IoCompletionHandle, IN PVOID KeyContext, IN PVOID ApcContext, - IN NTSTATUS IoStatus, - IN ULONG_PTR IoStatusInformation + IN ntstatus_xt IoStatus, + IN ulong_ptr_xt IoStatusInformation ) { LOG_FUNC_BEGIN @@ -1875,13 +1875,13 @@ XBSYSAPI EXPORTNUM(227) xbox::NTSTATUS NTAPI xbox::NtSetIoCompletion LOG_UNIMPLEMENTED(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x00E4 - NtSetSystemTime() // ****************************************************************** -XBSYSAPI EXPORTNUM(228) xbox::NTSTATUS NTAPI xbox::NtSetSystemTime +XBSYSAPI EXPORTNUM(228) xbox::ntstatus_xt NTAPI xbox::NtSetSystemTime ( IN PLARGE_INTEGER SystemTime, OUT PLARGE_INTEGER PreviousTime OPTIONAL @@ -1892,7 +1892,7 @@ XBSYSAPI EXPORTNUM(228) xbox::NTSTATUS NTAPI xbox::NtSetSystemTime LOG_FUNC_ARG_OUT(PreviousTime) LOG_FUNC_END; - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; LARGE_INTEGER NewSystemTime, OldSystemTime; // LARGE_INTEGER LocalTime; // TIME_FIELDS TimeFields; @@ -1930,15 +1930,15 @@ XBSYSAPI EXPORTNUM(228) xbox::NTSTATUS NTAPI xbox::NtSetSystemTime // ****************************************************************** // * 0x00E5 - NtSetTimerEx() // ****************************************************************** -XBSYSAPI EXPORTNUM(229) xbox::NTSTATUS NTAPI xbox::NtSetTimerEx +XBSYSAPI EXPORTNUM(229) xbox::ntstatus_xt NTAPI xbox::NtSetTimerEx ( IN HANDLE TimerHandle, IN PLARGE_INTEGER DueTime, IN PTIMER_APC_ROUTINE TimerApcRoutine OPTIONAL, IN KPROCESSOR_MODE ApcMode, IN PVOID TimerContext OPTIONAL, - IN BOOLEAN WakeTimer, - IN LONG Period OPTIONAL, + IN boolean_xt WakeTimer, + IN long_xt Period OPTIONAL, OUT PBOOLEAN PreviousState OPTIONAL ) { @@ -1973,12 +1973,12 @@ XBSYSAPI EXPORTNUM(229) xbox::NTSTATUS NTAPI xbox::NtSetTimerEx // ****************************************************************** // * 0x00E6 - NtSignalAndWaitForSingleObjectEx // ****************************************************************** -XBSYSAPI EXPORTNUM(230) xbox::NTSTATUS NTAPI xbox::NtSignalAndWaitForSingleObjectEx +XBSYSAPI EXPORTNUM(230) xbox::ntstatus_xt NTAPI xbox::NtSignalAndWaitForSingleObjectEx ( IN HANDLE SignalHandle, IN HANDLE WaitHandle, IN KPROCESSOR_MODE WaitMode, - IN BOOLEAN Alertable, + IN boolean_xt Alertable, IN PLARGE_INTEGER Timeout OPTIONAL ) { @@ -1992,13 +1992,13 @@ XBSYSAPI EXPORTNUM(230) xbox::NTSTATUS NTAPI xbox::NtSignalAndWaitForSingleObjec LOG_UNIMPLEMENTED(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x00E7 - NtSuspendThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(231) xbox::NTSTATUS NTAPI xbox::NtSuspendThread +XBSYSAPI EXPORTNUM(231) xbox::ntstatus_xt NTAPI xbox::NtSuspendThread ( IN HANDLE ThreadHandle, OUT PULONG PreviousSuspendCount OPTIONAL @@ -2011,7 +2011,7 @@ XBSYSAPI EXPORTNUM(231) xbox::NTSTATUS NTAPI xbox::NtSuspendThread NTSTATUS ret = NtDll::NtSuspendThread( ThreadHandle, - PreviousSuspendCount); + (::PULONG)PreviousSuspendCount); // TODO : Once we do our own thread-switching, implement NtSuspendThread using KeSuspendThread @@ -2021,11 +2021,11 @@ XBSYSAPI EXPORTNUM(231) xbox::NTSTATUS NTAPI xbox::NtSuspendThread // ****************************************************************** // * 0x00E8 - NtUserIoApcDispatcher() // ****************************************************************** -XBSYSAPI EXPORTNUM(232) xbox::VOID NTAPI xbox::NtUserIoApcDispatcher +XBSYSAPI EXPORTNUM(232) xbox::void_xt NTAPI xbox::NtUserIoApcDispatcher ( PVOID ApcContext, PIO_STATUS_BLOCK IoStatusBlock, - ULONG Reserved + ulong_xt Reserved ) { LOG_FUNC_BEGIN @@ -2037,7 +2037,7 @@ XBSYSAPI EXPORTNUM(232) xbox::VOID NTAPI xbox::NtUserIoApcDispatcher ULONG dwErrorCode = 0; ULONG dwTransferred = 0; - if (NT_SUCCESS(IoStatusBlock->Status)) { + if (nt_success(IoStatusBlock->Status)) { dwTransferred = (ULONG)IoStatusBlock->Information; } else { dwErrorCode = RtlNtStatusToDosError(IoStatusBlock->Status); @@ -2054,10 +2054,10 @@ XBSYSAPI EXPORTNUM(232) xbox::VOID NTAPI xbox::NtUserIoApcDispatcher // ****************************************************************** // * 0x00E9 - NtWaitForSingleObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(233) xbox::NTSTATUS NTAPI xbox::NtWaitForSingleObject +XBSYSAPI EXPORTNUM(233) xbox::ntstatus_xt NTAPI xbox::NtWaitForSingleObject ( IN HANDLE Handle, - IN BOOLEAN Alertable, + IN boolean_xt Alertable, IN PLARGE_INTEGER Timeout ) { @@ -2076,11 +2076,11 @@ XBSYSAPI EXPORTNUM(233) xbox::NTSTATUS NTAPI xbox::NtWaitForSingleObject // ****************************************************************** // * 0x00EA - NtWaitForSingleObjectEx() // ****************************************************************** -XBSYSAPI EXPORTNUM(234) xbox::NTSTATUS NTAPI xbox::NtWaitForSingleObjectEx +XBSYSAPI EXPORTNUM(234) xbox::ntstatus_xt NTAPI xbox::NtWaitForSingleObjectEx ( IN HANDLE Handle, IN KPROCESSOR_MODE WaitMode, - IN BOOLEAN Alertable, + IN boolean_xt Alertable, IN PLARGE_INTEGER Timeout ) { @@ -2099,13 +2099,13 @@ XBSYSAPI EXPORTNUM(234) xbox::NTSTATUS NTAPI xbox::NtWaitForSingleObjectEx // ****************************************************************** // * 0x00EB - NtWaitForMultipleObjectsEx() // ****************************************************************** -XBSYSAPI EXPORTNUM(235) xbox::NTSTATUS NTAPI xbox::NtWaitForMultipleObjectsEx +XBSYSAPI EXPORTNUM(235) xbox::ntstatus_xt NTAPI xbox::NtWaitForMultipleObjectsEx ( - IN ULONG Count, + IN ulong_xt Count, IN HANDLE *Handles, IN WAIT_TYPE WaitType, - IN CHAR WaitMode, - IN BOOLEAN Alertable, + IN char_xt WaitMode, + IN boolean_xt Alertable, IN PLARGE_INTEGER Timeout ) { @@ -2132,7 +2132,7 @@ XBSYSAPI EXPORTNUM(235) xbox::NTSTATUS NTAPI xbox::NtWaitForMultipleObjectsEx // Writes a file. // // Differences from NT: There is no Key parameter. -XBSYSAPI EXPORTNUM(236) xbox::NTSTATUS NTAPI xbox::NtWriteFile +XBSYSAPI EXPORTNUM(236) xbox::ntstatus_xt NTAPI xbox::NtWriteFile ( IN HANDLE FileHandle, IN HANDLE Event, @@ -2140,7 +2140,7 @@ XBSYSAPI EXPORTNUM(236) xbox::NTSTATUS NTAPI xbox::NtWriteFile IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, IN PVOID Buffer, - IN ULONG Length, + IN ulong_xt Length, IN PLARGE_INTEGER ByteOffset OPTIONAL ) { @@ -2188,7 +2188,7 @@ XBSYSAPI EXPORTNUM(236) xbox::NTSTATUS NTAPI xbox::NtWriteFile // ****************************************************************** // * 0x00ED - NtWriteFileGather // ****************************************************************** -XBSYSAPI EXPORTNUM(237) xbox::NTSTATUS NTAPI xbox::NtWriteFileGather +XBSYSAPI EXPORTNUM(237) xbox::ntstatus_xt NTAPI xbox::NtWriteFileGather ( IN HANDLE FileHandle, IN HANDLE Event OPTIONAL, @@ -2196,7 +2196,7 @@ XBSYSAPI EXPORTNUM(237) xbox::NTSTATUS NTAPI xbox::NtWriteFileGather IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, IN PFILE_SEGMENT_ELEMENT SegmentArray, - IN ULONG Length, + IN ulong_xt Length, IN PLARGE_INTEGER ByteOffset OPTIONAL ) { @@ -2213,13 +2213,13 @@ XBSYSAPI EXPORTNUM(237) xbox::NTSTATUS NTAPI xbox::NtWriteFileGather LOG_UNIMPLEMENTED(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x00EE - NtYieldExecution() // ****************************************************************** -XBSYSAPI EXPORTNUM(238) xbox::VOID NTAPI xbox::NtYieldExecution() +XBSYSAPI EXPORTNUM(238) xbox::void_xt NTAPI xbox::NtYieldExecution() { // NOTE: Logging this fills the debug log far too quickly, so don't. // LOG_FUNC(); diff --git a/src/core/kernel/exports/EmuKrnlOb.cpp b/src/core/kernel/exports/EmuKrnlOb.cpp index 11f217387..1d42dc071 100644 --- a/src/core/kernel/exports/EmuKrnlOb.cpp +++ b/src/core/kernel/exports/EmuKrnlOb.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX CXBXR_MODULE::OB -#include // For ObDirectoryObjectType, etc. +#include // For ObDirectoryObjectType, etc. #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup @@ -41,10 +41,8 @@ #include #pragma warning(default:4005) -#define FIELD_OFFSET(type,field) ((ULONG)&(((type *)0)->field)) - #define INITIALIZED_OBJECT_STRING(ObjectString, Value) \ - xbox::CHAR ObjectString##Buffer[] = Value; \ + xbox::char_xt ObjectString##Buffer[] = Value; \ xbox::OBJECT_STRING ObjectString = { \ sizeof(Value) - sizeof(CHAR), \ sizeof(Value), \ @@ -66,7 +64,7 @@ XBSYSAPI EXPORTNUM(245) xbox::OBJECT_HANDLE_TABLE xbox::ObpObjectHandleTable = { xbox::PVOID ObpDosDevicesDriveLetterMap['Z' - 'A' + 1]; -xbox::BOOLEAN xbox::ObpCreatePermanentDirectoryObject( +xbox::boolean_xt xbox::ObpCreatePermanentDirectoryObject( IN xbox::POBJECT_STRING DirectoryName OPTIONAL, OUT xbox::POBJECT_DIRECTORY *DirectoryObject ) @@ -82,13 +80,13 @@ xbox::BOOLEAN xbox::ObpCreatePermanentDirectoryObject( HANDLE Handle; NTSTATUS status = NtCreateDirectoryObject(&Handle, &ObjectAttributes); - if (!NT_SUCCESS(status)) { + if (!nt_success(status)) { RETURN(FALSE); } status = ObReferenceObjectByHandle(Handle, &ObDirectoryObjectType, (PVOID *)DirectoryObject); - if (!NT_SUCCESS(status)) { + if (!nt_success(status)) { RETURN(FALSE); } @@ -97,10 +95,10 @@ xbox::BOOLEAN xbox::ObpCreatePermanentDirectoryObject( RETURN(TRUE); } -xbox::NTSTATUS xbox::ObpReferenceObjectByName( +xbox::ntstatus_xt xbox::ObpReferenceObjectByName( IN HANDLE RootDirectoryHandle, IN POBJECT_STRING ObjectName, - IN ULONG Attributes, + IN ulong_xt Attributes, IN POBJECT_TYPE ObjectType, IN OUT PVOID ParseContext OPTIONAL, OUT PVOID *ReturnedObject @@ -175,7 +173,7 @@ xbox::NTSTATUS xbox::ObpReferenceObjectByName( if (!ObpLookupElementNameInDirectory(Directory, &ElementName, ResolveSymbolicLink, &FoundObject)) { - status = (RemainingName.Length != 0) ? STATUS_OBJECT_PATH_NOT_FOUND : STATUS_OBJECT_NAME_NOT_FOUND; + status = (RemainingName.Length != 0) ? STATUS_OBJECT_PATH_NOT_FOUND : xbox::status_object_name_not_found; goto CleanupAndExit; } @@ -194,7 +192,7 @@ OpenRootDirectory: ObjectHeader->PointerCount++; *ReturnedObject = FoundObject; - status = STATUS_SUCCESS; + status = xbox::status_success; goto CleanupAndExit; } @@ -218,10 +216,10 @@ InvokeParseProcedure: status = ObjectHeader->Type->ParseProcedure(FoundObject, ObjectType, Attributes, ObjectName, &RemainingName, ParseContext, &ParsedObject); ObfDereferenceObject(FoundObject); - if (NT_SUCCESS(status)) { + if (nt_success(status)) { if ((ObjectType == NULL) || (ObjectType == OBJECT_TO_OBJECT_HEADER(ParsedObject)->Type)) { *ReturnedObject = ParsedObject; - status = STATUS_SUCCESS; + status = xbox::status_success; } else { ObfDereferenceObject(ParsedObject); status = STATUS_OBJECT_TYPE_MISMATCH; @@ -236,7 +234,7 @@ CleanupAndExit: return status; } -xbox::BOOLEAN xbox::ObInitSystem() +xbox::boolean_xt xbox::ObInitSystem() { ObpObjectHandleTable.HandleCount = 0; ObpObjectHandleTable.FirstFreeTableEntry = -1; @@ -264,7 +262,7 @@ xbox::BOOLEAN xbox::ObInitSystem() return TRUE; } -xbox::BOOLEAN xbox::ObpExtendObjectHandleTable() +xbox::boolean_xt xbox::ObpExtendObjectHandleTable() { PVOID* NewTable = (PVOID*)ExAllocatePoolWithTag(sizeof(PVOID) * OB_HANDLES_PER_TABLE, 'tHbO'); if (NewTable == NULL) { @@ -342,7 +340,7 @@ xbox::HANDLE xbox::ObpCreateObjectHandle(xbox::PVOID Object) return Handle; } -xbox::VOID xbox::ObDissectName(OBJECT_STRING Path, POBJECT_STRING FirstName, POBJECT_STRING RemainingName) +xbox::void_xt xbox::ObDissectName(OBJECT_STRING Path, POBJECT_STRING FirstName, POBJECT_STRING RemainingName) { ULONG i = 0; @@ -385,11 +383,11 @@ xbox::VOID xbox::ObDissectName(OBJECT_STRING Path, POBJECT_STRING FirstName, POB // ****************************************************************** // * 0x00EF - ObCreateObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(239) xbox::NTSTATUS NTAPI xbox::ObCreateObject +XBSYSAPI EXPORTNUM(239) xbox::ntstatus_xt NTAPI xbox::ObCreateObject ( IN POBJECT_TYPE ObjectType, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN ULONG ObjectBodySize, + IN ulong_xt ObjectBodySize, OUT PVOID *Object ) { @@ -401,10 +399,10 @@ XBSYSAPI EXPORTNUM(239) xbox::NTSTATUS NTAPI xbox::ObCreateObject LOG_FUNC_END; if (ObjectAttributes == NULL || ObjectAttributes->ObjectName == NULL) { - POBJECT_HEADER ObjectHeader = (POBJECT_HEADER)ObjectType->AllocateProcedure(FIELD_OFFSET(OBJECT_HEADER, Body) + ObjectBodySize, ObjectType->PoolTag); + POBJECT_HEADER ObjectHeader = (POBJECT_HEADER)ObjectType->AllocateProcedure(offsetof(OBJECT_HEADER, Body) + ObjectBodySize, ObjectType->PoolTag); if (ObjectHeader == nullptr) { - RETURN(STATUS_INSUFFICIENT_RESOURCES); + RETURN(xbox::status_insufficient_resources); } ObjectHeader->PointerCount = 1; @@ -414,7 +412,7 @@ XBSYSAPI EXPORTNUM(239) xbox::NTSTATUS NTAPI xbox::ObCreateObject *Object = &ObjectHeader->Body; - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } OBJECT_STRING RemainingName = *ObjectAttributes->ObjectName; @@ -436,11 +434,11 @@ XBSYSAPI EXPORTNUM(239) xbox::NTSTATUS NTAPI xbox::ObCreateObject ObjectBodySize = ALIGN_UP(ObjectBodySize, ULONG); POBJECT_HEADER_NAME_INFO ObjectNameInfo = (POBJECT_HEADER_NAME_INFO)ObjectType->AllocateProcedure( - sizeof(OBJECT_HEADER_NAME_INFO) + FIELD_OFFSET(OBJECT_HEADER, Body) + + sizeof(OBJECT_HEADER_NAME_INFO) + offsetof(OBJECT_HEADER, Body) + ObjectBodySize + ElementName.Length, ObjectType->PoolTag); if (ObjectNameInfo == NULL) { - return STATUS_INSUFFICIENT_RESOURCES; + return xbox::status_insufficient_resources; } POBJECT_HEADER ObjectHeader = (POBJECT_HEADER)(ObjectNameInfo + 1); @@ -459,7 +457,7 @@ XBSYSAPI EXPORTNUM(239) xbox::NTSTATUS NTAPI xbox::ObCreateObject *Object = &ObjectHeader->Body; - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** @@ -494,7 +492,7 @@ xbox::PVOID xbox::ObpGetObjectHandleContents(HANDLE Handle) return NULL; } -xbox::ULONG FASTCALL xbox::ObpComputeHashIndex( +xbox::ulong_xt FASTCALL xbox::ObpComputeHashIndex( IN POBJECT_STRING ElementName ) { @@ -542,10 +540,10 @@ xbox::PVOID xbox::ObpGetObjectHandleReference(HANDLE Handle) return NULL; } -xbox::BOOLEAN xbox::ObpLookupElementNameInDirectory( +xbox::boolean_xt xbox::ObpLookupElementNameInDirectory( IN POBJECT_DIRECTORY Directory, IN POBJECT_STRING ElementName, - IN BOOLEAN ResolveSymbolicLink, + IN boolean_xt ResolveSymbolicLink, OUT PVOID *ReturnedObject ) { @@ -590,11 +588,11 @@ xbox::BOOLEAN xbox::ObpLookupElementNameInDirectory( // ****************************************************************** // * 0x00F1 - ObInsertObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(241) xbox::NTSTATUS NTAPI xbox::ObInsertObject +XBSYSAPI EXPORTNUM(241) xbox::ntstatus_xt NTAPI xbox::ObInsertObject ( IN PVOID Object, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN ULONG ObjectPointerBias, + IN ulong_xt ObjectPointerBias, OUT PHANDLE ReturnedHandle ) { @@ -664,7 +662,7 @@ XBSYSAPI EXPORTNUM(241) xbox::NTSTATUS NTAPI xbox::ObInsertObject goto CleanupAndExit; } } else { - status = STATUS_OBJECT_NAME_COLLISION; + status = xbox::status_object_name_collision; goto CleanupAndExit; } } @@ -692,7 +690,7 @@ XBSYSAPI EXPORTNUM(241) xbox::NTSTATUS NTAPI xbox::ObInsertObject Handle = ObpCreateObjectHandle(InsertObject); if (Handle == NULL) { - status = STATUS_INSUFFICIENT_RESOURCES; + status = xbox::status_insufficient_resources; goto CleanupAndExit; } @@ -732,7 +730,7 @@ XBSYSAPI EXPORTNUM(241) xbox::NTSTATUS NTAPI xbox::ObInsertObject ObjectHeader->Flags |= OB_FLAG_PERMANENT_OBJECT; } - status = (Object == InsertObject) ? STATUS_SUCCESS : STATUS_OBJECT_NAME_EXISTS; + status = (Object == InsertObject) ? xbox::status_success : STATUS_OBJECT_NAME_EXISTS; CleanupAndExit: KfLowerIrql(OldIrql); @@ -745,7 +743,7 @@ CleanupAndExit: // ****************************************************************** // * 0x00F2 - ObMakeTemporaryObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(242) xbox::VOID NTAPI xbox::ObMakeTemporaryObject +XBSYSAPI EXPORTNUM(242) xbox::void_xt NTAPI xbox::ObMakeTemporaryObject ( IN PVOID Object ) @@ -759,7 +757,7 @@ XBSYSAPI EXPORTNUM(242) xbox::VOID NTAPI xbox::ObMakeTemporaryObject // ****************************************************************** // * 0x00F3 - ObOpenObjectByName() // ****************************************************************** -XBSYSAPI EXPORTNUM(243) xbox::NTSTATUS NTAPI xbox::ObOpenObjectByName +XBSYSAPI EXPORTNUM(243) xbox::ntstatus_xt NTAPI xbox::ObOpenObjectByName ( IN POBJECT_ATTRIBUTES ObjectAttributes, IN POBJECT_TYPE ObjectType, @@ -777,13 +775,13 @@ XBSYSAPI EXPORTNUM(243) xbox::NTSTATUS NTAPI xbox::ObOpenObjectByName LOG_UNIMPLEMENTED(); assert(false); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x00F4 - ObOpenObjectByPointer() // ****************************************************************** -XBSYSAPI EXPORTNUM(244) xbox::NTSTATUS NTAPI xbox::ObOpenObjectByPointer +XBSYSAPI EXPORTNUM(244) xbox::ntstatus_xt NTAPI xbox::ObOpenObjectByPointer ( IN PVOID Object, IN POBJECT_TYPE ObjectType, @@ -799,7 +797,7 @@ XBSYSAPI EXPORTNUM(244) xbox::NTSTATUS NTAPI xbox::ObOpenObjectByPointer LOG_UNIMPLEMENTED(); assert(false); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** @@ -811,7 +809,7 @@ XBSYSAPI EXPORTNUM(244) xbox::NTSTATUS NTAPI xbox::ObOpenObjectByPointer // // Differences from NT: There are no DesiredAccess, AccessMode, or // HandleInformation parameters. -XBSYSAPI EXPORTNUM(246) xbox::NTSTATUS NTAPI xbox::ObReferenceObjectByHandle +XBSYSAPI EXPORTNUM(246) xbox::ntstatus_xt NTAPI xbox::ObReferenceObjectByHandle ( IN HANDLE Handle, IN POBJECT_TYPE ObjectType OPTIONAL, @@ -832,9 +830,9 @@ XBSYSAPI EXPORTNUM(246) xbox::NTSTATUS NTAPI xbox::ObReferenceObjectByHandle if ((ObjectType == &PsThreadObjectType) || (ObjectType == NULL)) { Object = PsGetCurrentThread(); ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); - InterlockedIncrement(&ObjectHeader->PointerCount); + InterlockedIncrement((::PLONG)(&ObjectHeader->PointerCount)); *ReturnedObject = Object; - return STATUS_SUCCESS; + return xbox::status_success; } else { status = STATUS_OBJECT_TYPE_MISMATCH; } @@ -846,7 +844,7 @@ XBSYSAPI EXPORTNUM(246) xbox::NTSTATUS NTAPI xbox::ObReferenceObjectByHandle if ((ObjectType == ObjectHeader->Type) || (ObjectType == NULL)) { *ReturnedObject = Object; - return STATUS_SUCCESS; + return xbox::status_success; } else { ObfDereferenceObject(Object); status = STATUS_OBJECT_TYPE_MISMATCH; @@ -859,7 +857,7 @@ XBSYSAPI EXPORTNUM(246) xbox::NTSTATUS NTAPI xbox::ObReferenceObjectByHandle if (GetHandleInformation(Handle, &flags)) { // This was a Windows Handle, so return it. *ReturnedObject = Handle; - return STATUS_SUCCESS; + return xbox::status_success; } status = STATUS_INVALID_HANDLE; @@ -874,10 +872,10 @@ XBSYSAPI EXPORTNUM(246) xbox::NTSTATUS NTAPI xbox::ObReferenceObjectByHandle // ****************************************************************** // * 0x00F7 - ObReferenceObjectByName() // ****************************************************************** -XBSYSAPI EXPORTNUM(247) xbox::NTSTATUS NTAPI xbox::ObReferenceObjectByName +XBSYSAPI EXPORTNUM(247) xbox::ntstatus_xt NTAPI xbox::ObReferenceObjectByName ( IN POBJECT_STRING ObjectName, - IN ULONG Attributes, + IN ulong_xt Attributes, IN POBJECT_TYPE ObjectType, IN OUT PVOID ParseContext OPTIONAL, OUT PVOID *Object @@ -898,7 +896,7 @@ XBSYSAPI EXPORTNUM(247) xbox::NTSTATUS NTAPI xbox::ObReferenceObjectByName // ****************************************************************** // * 0x00F8 - ObReferenceObjectByPointer() // ****************************************************************** -XBSYSAPI EXPORTNUM(248) xbox::NTSTATUS NTAPI xbox::ObReferenceObjectByPointer +XBSYSAPI EXPORTNUM(248) xbox::ntstatus_xt NTAPI xbox::ObReferenceObjectByPointer ( IN PVOID Object, IN POBJECT_TYPE ObjectType @@ -912,8 +910,8 @@ XBSYSAPI EXPORTNUM(248) xbox::NTSTATUS NTAPI xbox::ObReferenceObjectByPointer POBJECT_HEADER ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); if (ObjectType == ObjectHeader->Type) { - InterlockedIncrement(&ObjectHeader->PointerCount); - RETURN(STATUS_SUCCESS); + InterlockedIncrement((::PLONG)(&ObjectHeader->PointerCount)); + RETURN(xbox::status_success); } RETURN(STATUS_OBJECT_TYPE_MISMATCH); @@ -936,7 +934,7 @@ XBSYSAPI EXPORTNUM(249) xbox::OBJECT_TYPE xbox::ObSymbolicLinkObjectType = // ****************************************************************** // * 0x00FA - ObfDereferenceObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(250) xbox::VOID FASTCALL xbox::ObfDereferenceObject +XBSYSAPI EXPORTNUM(250) xbox::void_xt FASTCALL xbox::ObfDereferenceObject ( IN PVOID Object ) @@ -953,7 +951,7 @@ XBSYSAPI EXPORTNUM(250) xbox::VOID FASTCALL xbox::ObfDereferenceObject POBJECT_HEADER ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); - if (InterlockedDecrement(&ObjectHeader->PointerCount) == 0) { + if (InterlockedDecrement((::PLONG)(&ObjectHeader->PointerCount)) == 0) { if (ObjectHeader->Type->DeleteProcedure != NULL) { ObjectHeader->Type->DeleteProcedure(Object); } @@ -972,11 +970,11 @@ XBSYSAPI EXPORTNUM(250) xbox::VOID FASTCALL xbox::ObfDereferenceObject // ****************************************************************** // * 0x00FB - ObfReferenceObject() // ****************************************************************** -XBSYSAPI EXPORTNUM(251) xbox::VOID FASTCALL xbox::ObfReferenceObject +XBSYSAPI EXPORTNUM(251) xbox::void_xt FASTCALL xbox::ObfReferenceObject ( IN PVOID Object ) { LOG_FUNC_ONE_ARG_OUT(Object); - InterlockedIncrement(&OBJECT_TO_OBJECT_HEADER(Object)->PointerCount); + InterlockedIncrement((::PLONG)(&OBJECT_TO_OBJECT_HEADER(Object)->PointerCount)); } diff --git a/src/core/kernel/exports/EmuKrnlPhy.cpp b/src/core/kernel/exports/EmuKrnlPhy.cpp index 166fc92cc..b43689c04 100644 --- a/src/core/kernel/exports/EmuKrnlPhy.cpp +++ b/src/core/kernel/exports/EmuKrnlPhy.cpp @@ -26,7 +26,7 @@ // ****************************************************************** -#include +#include #define LOG_PREFIX CXBXR_MODULE::KRNL @@ -61,7 +61,7 @@ LONG PhyLockFlag; #define PhyLock() InterlockedCompareExchange(&PhyLockFlag, 1, 0) #define PhyUnlock() (PhyLockFlag = 0) #define NETERR(_err) HRESULT_FROM_WIN32(_err) -#define NETERR_OK STATUS_SUCCESS +#define NETERR_OK xbox::status_success #define NETERR_HARDWARE 0x801f0001 // hardware not responding #define BIT(n) (1u << (n)) @@ -209,9 +209,9 @@ BOOL PhyUpdateLinkState() // ****************************************************************** // * 0x00FC - PhyGetLinkState() // ****************************************************************** -XBSYSAPI EXPORTNUM(252) xbox::DWORD NTAPI xbox::PhyGetLinkState +XBSYSAPI EXPORTNUM(252) xbox::dword_xt NTAPI xbox::PhyGetLinkState ( - IN ULONG Mode + IN ulong_xt Mode ) { LOG_FUNC_ONE_ARG(Mode); @@ -227,9 +227,9 @@ XBSYSAPI EXPORTNUM(252) xbox::DWORD NTAPI xbox::PhyGetLinkState // ****************************************************************** // * 0x00FD - PhyInitialize() // ****************************************************************** -XBSYSAPI EXPORTNUM(253) xbox::NTSTATUS NTAPI xbox::PhyInitialize +XBSYSAPI EXPORTNUM(253) xbox::ntstatus_xt NTAPI xbox::PhyInitialize ( - IN ULONG forceReset, + IN ulong_xt forceReset, IN PVOID Parameter2 ) { diff --git a/src/core/kernel/exports/EmuKrnlPs.cpp b/src/core/kernel/exports/EmuKrnlPs.cpp index fa185fb98..e3eb2be71 100644 --- a/src/core/kernel/exports/EmuKrnlPs.cpp +++ b/src/core/kernel/exports/EmuKrnlPs.cpp @@ -30,7 +30,7 @@ #include -#include // For PsCreateSystemThreadEx, etc. +#include // For PsCreateSystemThreadEx, etc. #include // For __beginthreadex(), etc. #include // For _controlfp constants @@ -142,7 +142,7 @@ static unsigned int WINAPI PCSTProxy // This will also handle thread notification : LOG_TEST_CASE("Thread returned from SystemRoutine"); - xbox::PsTerminateSystemThread(STATUS_SUCCESS); + xbox::PsTerminateSystemThread(xbox::status_success); return 0; // will never be reached } @@ -157,19 +157,19 @@ void PspSystemThreadStartup // TODO : Call PspUnhandledExceptionInSystemThread(GetExceptionInformation()) (StartRoutine)(StartContext); - xbox::PsTerminateSystemThread(STATUS_SUCCESS); + xbox::PsTerminateSystemThread(xbox::status_success); } // ****************************************************************** // * 0x00FE - PsCreateSystemThread() // ****************************************************************** -XBSYSAPI EXPORTNUM(254) xbox::NTSTATUS NTAPI xbox::PsCreateSystemThread +XBSYSAPI EXPORTNUM(254) xbox::ntstatus_xt NTAPI xbox::PsCreateSystemThread ( OUT PHANDLE ThreadHandle, OUT PHANDLE ThreadId OPTIONAL, IN PKSTART_ROUTINE StartRoutine, IN PVOID StartContext, - IN BOOLEAN DebuggerThread + IN boolean_xt DebuggerThread ) { LOG_FORWARD("PsCreateSystemThreadEx"); @@ -204,17 +204,17 @@ XBSYSAPI EXPORTNUM(254) xbox::NTSTATUS NTAPI xbox::PsCreateSystemThread // SystemRoutine: System function (normally XapiThreadStartup) called when the thread is created // // New to the XBOX. -XBSYSAPI EXPORTNUM(255) xbox::NTSTATUS NTAPI xbox::PsCreateSystemThreadEx +XBSYSAPI EXPORTNUM(255) xbox::ntstatus_xt NTAPI xbox::PsCreateSystemThreadEx ( OUT PHANDLE ThreadHandle, - IN ULONG ThreadExtensionSize, - IN ULONG KernelStackSize, - IN ULONG TlsDataSize, + IN ulong_xt ThreadExtensionSize, + IN ulong_xt KernelStackSize, + IN ulong_xt TlsDataSize, OUT PHANDLE ThreadId OPTIONAL, IN PKSTART_ROUTINE StartRoutine, IN PVOID StartContext, - IN BOOLEAN CreateSuspended, - IN BOOLEAN DebuggerThread, + IN boolean_xt CreateSuspended, + IN boolean_xt DebuggerThread, IN PKSYSTEM_ROUTINE SystemRoutine OPTIONAL ) { @@ -330,20 +330,20 @@ XBSYSAPI EXPORTNUM(255) xbox::NTSTATUS NTAPI xbox::PsCreateSystemThreadEx SwitchToThread(); Sleep(10); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x0100 - PsQueryStatistics() // ****************************************************************** -XBSYSAPI EXPORTNUM(256) xbox::NTSTATUS NTAPI xbox::PsQueryStatistics +XBSYSAPI EXPORTNUM(256) xbox::ntstatus_xt NTAPI xbox::PsQueryStatistics ( IN OUT PPS_STATISTICS ProcessStatistics ) { LOG_FUNC_ONE_ARG_OUT(ProcessStatistics); - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; if (ProcessStatistics->Length == sizeof(PS_STATISTICS)) { LOG_INCOMPLETE(); // TODO : Return number of threads and handles that currently exist @@ -359,14 +359,14 @@ XBSYSAPI EXPORTNUM(256) xbox::NTSTATUS NTAPI xbox::PsQueryStatistics // ****************************************************************** // * 0x0101 - PsSetCreateThreadNotifyRoutine() // ****************************************************************** -XBSYSAPI EXPORTNUM(257) xbox::NTSTATUS NTAPI xbox::PsSetCreateThreadNotifyRoutine +XBSYSAPI EXPORTNUM(257) xbox::ntstatus_xt NTAPI xbox::PsSetCreateThreadNotifyRoutine ( IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine ) { LOG_FUNC_ONE_ARG(NotifyRoutine); - NTSTATUS ret = STATUS_INSUFFICIENT_RESOURCES; + NTSTATUS ret = xbox::status_insufficient_resources; // Taken from xbox::EmuXRegisterThreadNotifyRoutine (perhaps that can be removed now) : @@ -383,7 +383,7 @@ XBSYSAPI EXPORTNUM(257) xbox::NTSTATUS NTAPI xbox::PsSetCreateThreadNotifyRoutin { g_pfnThreadNotification[i] = (PVOID)NotifyRoutine; g_iThreadNotificationCount++; - ret = STATUS_SUCCESS; + ret = xbox::status_success; break; } } @@ -397,9 +397,9 @@ XBSYSAPI EXPORTNUM(257) xbox::NTSTATUS NTAPI xbox::PsSetCreateThreadNotifyRoutin // Exits the current system thread. Must be called from a system thread. // // Differences from NT: None. -XBSYSAPI EXPORTNUM(258) xbox::VOID NTAPI xbox::PsTerminateSystemThread +XBSYSAPI EXPORTNUM(258) xbox::void_xt NTAPI xbox::PsTerminateSystemThread ( - IN NTSTATUS ExitStatus + IN ntstatus_xt ExitStatus ) { LOG_FUNC_ONE_ARG(ExitStatus); diff --git a/src/core/kernel/exports/EmuKrnlRtl.cpp b/src/core/kernel/exports/EmuKrnlRtl.cpp index 23b22f0ec..df5f8ba5e 100644 --- a/src/core/kernel/exports/EmuKrnlRtl.cpp +++ b/src/core/kernel/exports/EmuKrnlRtl.cpp @@ -30,7 +30,7 @@ #define CHECK_ALIGNMENT(size, alignment) (((size) % (alignment)) == 0) // For RtlFillMemoryUlong -#include // For RtlAnsiStringToUnicodeString, etc. +#include // For RtlAnsiStringToUnicodeString, etc. #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" @@ -73,7 +73,7 @@ namespace NtDll #define EXCEPTION_COLLIDED_UNWIND 0x40 #define EXCEPTION_UNWIND (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND | EXCEPTION_TARGET_UNWIND | EXCEPTION_COLLIDED_UNWIND) -DWORD WINAPI RtlAnsiStringToUnicodeSize(const xbox::STRING *str) +xbox::dword_xt WINAPI RtlAnsiStringToUnicodeSize(const xbox::STRING *str) { return (str->Length + sizeof(ANSI_NULL)) * sizeof(WCHAR); } @@ -81,11 +81,11 @@ DWORD WINAPI RtlAnsiStringToUnicodeSize(const xbox::STRING *str) // ****************************************************************** // * 0x0104 - RtlAnsiStringToUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(260) xbox::NTSTATUS NTAPI xbox::RtlAnsiStringToUnicodeString +XBSYSAPI EXPORTNUM(260) xbox::ntstatus_xt NTAPI xbox::RtlAnsiStringToUnicodeString ( OUT PUNICODE_STRING DestinationString, IN PSTRING SourceString, - IN UCHAR AllocateDestinationString + IN uchar_xt AllocateDestinationString ) { LOG_FUNC_BEGIN @@ -94,35 +94,35 @@ XBSYSAPI EXPORTNUM(260) xbox::NTSTATUS NTAPI xbox::RtlAnsiStringToUnicodeString LOG_FUNC_ARG(AllocateDestinationString) LOG_FUNC_END; - DWORD total = RtlAnsiStringToUnicodeSize(SourceString); + dword_xt total = RtlAnsiStringToUnicodeSize(SourceString); if (total > 0xffff) { - return STATUS_INVALID_PARAMETER_2; + return xbox::status_invalid_parameter_2; } DestinationString->Length = (USHORT)(total - sizeof(WCHAR)); if (AllocateDestinationString) { DestinationString->MaximumLength = (USHORT)total; if (!(DestinationString->Buffer = (USHORT*)ExAllocatePoolWithTag(total, 'grtS'))) { - return STATUS_NO_MEMORY; + return xbox::status_no_memory; } } else { if (total > DestinationString->MaximumLength) { - return STATUS_BUFFER_OVERFLOW; + return xbox::status_buffer_overflow; } } RtlMultiByteToUnicodeN((PWSTR)DestinationString->Buffer, (ULONG)DestinationString->Length, NULL, SourceString->Buffer, SourceString->Length); DestinationString->Buffer[DestinationString->Length / sizeof(WCHAR)] = 0; - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x0105 - RtlAppendStringToString() // ****************************************************************** -XBSYSAPI EXPORTNUM(261) xbox::NTSTATUS NTAPI xbox::RtlAppendStringToString +XBSYSAPI EXPORTNUM(261) xbox::ntstatus_xt NTAPI xbox::RtlAppendStringToString ( IN PSTRING Destination, IN PSTRING Source @@ -133,13 +133,13 @@ XBSYSAPI EXPORTNUM(261) xbox::NTSTATUS NTAPI xbox::RtlAppendStringToString LOG_FUNC_ARG(Source) LOG_FUNC_END; - NTSTATUS result = STATUS_SUCCESS; + NTSTATUS result = xbox::status_success; USHORT dstLen = Destination->Length; USHORT srcLen = Source->Length; if (srcLen > 0) { if ((srcLen + dstLen) > Destination->MaximumLength) { - result = STATUS_BUFFER_TOO_SMALL; + result = xbox::status_buffer_too_small; } else { CHAR *dstBuf = Destination->Buffer + Destination->Length; @@ -155,7 +155,7 @@ XBSYSAPI EXPORTNUM(261) xbox::NTSTATUS NTAPI xbox::RtlAppendStringToString // ****************************************************************** // * 0x0106 - RtlAppendUnicodeStringToString() // ****************************************************************** -XBSYSAPI EXPORTNUM(262) xbox::NTSTATUS NTAPI xbox::RtlAppendUnicodeStringToString +XBSYSAPI EXPORTNUM(262) xbox::ntstatus_xt NTAPI xbox::RtlAppendUnicodeStringToString ( IN PUNICODE_STRING Destination, IN PUNICODE_STRING Source @@ -166,13 +166,13 @@ XBSYSAPI EXPORTNUM(262) xbox::NTSTATUS NTAPI xbox::RtlAppendUnicodeStringToStrin LOG_FUNC_ARG(Source) LOG_FUNC_END; - NTSTATUS result = STATUS_SUCCESS; + NTSTATUS result = xbox::status_success; USHORT dstLen = Destination->Length; USHORT srcLen = Source->Length; if (srcLen > 0) { if ((srcLen + dstLen) > Destination->MaximumLength) { - result = STATUS_BUFFER_TOO_SMALL; + result = xbox::status_buffer_too_small; } else { WCHAR *dstBuf = (WCHAR*)(Destination->Buffer + (Destination->Length / sizeof(WCHAR))); @@ -190,7 +190,7 @@ XBSYSAPI EXPORTNUM(262) xbox::NTSTATUS NTAPI xbox::RtlAppendUnicodeStringToStrin // ****************************************************************** // * 0x0107 - RtlAppendUnicodeToString() // ****************************************************************** -XBSYSAPI EXPORTNUM(263) xbox::NTSTATUS NTAPI xbox::RtlAppendUnicodeToString +XBSYSAPI EXPORTNUM(263) xbox::ntstatus_xt NTAPI xbox::RtlAppendUnicodeToString ( IN OUT PUNICODE_STRING Destination, IN LPCWSTR Source @@ -201,7 +201,7 @@ XBSYSAPI EXPORTNUM(263) xbox::NTSTATUS NTAPI xbox::RtlAppendUnicodeToString LOG_FUNC_ARG(Source) LOG_FUNC_END; - NTSTATUS result = STATUS_SUCCESS; + NTSTATUS result = xbox::status_success; if (Source != NULL) { UNICODE_STRING unicodeString; RtlInitUnicodeString(&unicodeString, Source); @@ -216,11 +216,11 @@ XBSYSAPI EXPORTNUM(263) xbox::NTSTATUS NTAPI xbox::RtlAppendUnicodeToString // * 0x0108 - RtlAssert() // ****************************************************************** // Debug API? -XBSYSAPI EXPORTNUM(264) xbox::VOID NTAPI xbox::RtlAssert +XBSYSAPI EXPORTNUM(264) xbox::void_xt NTAPI xbox::RtlAssert ( PCHAR FailedAssertion, PCHAR FileName, - ULONG LineNumber, + ulong_xt LineNumber, PCHAR Message ) { @@ -246,7 +246,7 @@ XBSYSAPI EXPORTNUM(264) xbox::VOID NTAPI xbox::RtlAssert // * 0x0109 - RtlCaptureContext() // ****************************************************************** __declspec(naked) // REQUIRED - No registers can be touched by the compiler or the state will be corrupted. -XBSYSAPI EXPORTNUM(265) xbox::VOID NTAPI xbox::RtlCaptureContext +XBSYSAPI EXPORTNUM(265) xbox::void_xt NTAPI xbox::RtlCaptureContext ( IN PCONTEXT ContextRecord ) @@ -283,10 +283,10 @@ XBSYSAPI EXPORTNUM(265) xbox::VOID NTAPI xbox::RtlCaptureContext // ****************************************************************** // * 0x010A - RtlCaptureStackBackTrace() // ****************************************************************** -XBSYSAPI EXPORTNUM(266) xbox::USHORT NTAPI xbox::RtlCaptureStackBackTrace +XBSYSAPI EXPORTNUM(266) xbox::ushort_xt NTAPI xbox::RtlCaptureStackBackTrace ( - IN ULONG FramesToSkip, - IN ULONG FramesToCapture, + IN ulong_xt FramesToSkip, + IN ulong_xt FramesToCapture, OUT PVOID *BackTrace, OUT PULONG BackTraceHash ) @@ -306,10 +306,10 @@ XBSYSAPI EXPORTNUM(266) xbox::USHORT NTAPI xbox::RtlCaptureStackBackTrace // ****************************************************************** // * 0x010B - RtlCharToInteger() // ****************************************************************** -XBSYSAPI EXPORTNUM(267) xbox::NTSTATUS NTAPI xbox::RtlCharToInteger +XBSYSAPI EXPORTNUM(267) xbox::ntstatus_xt NTAPI xbox::RtlCharToInteger ( IN PCSZ String, - IN ULONG Base OPTIONAL, + IN ulong_xt Base OPTIONAL, OUT PULONG Value ) { @@ -387,7 +387,7 @@ XBSYSAPI EXPORTNUM(267) xbox::NTSTATUS NTAPI xbox::RtlCharToInteger } *Value = bMinus ? (0 - RunningTotal) : RunningTotal; - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** @@ -395,11 +395,11 @@ XBSYSAPI EXPORTNUM(267) xbox::NTSTATUS NTAPI xbox::RtlCharToInteger // ****************************************************************** // * compare block of memory, return number of equivalent bytes. // ****************************************************************** -XBSYSAPI EXPORTNUM(268) xbox::SIZE_T NTAPI xbox::RtlCompareMemory +XBSYSAPI EXPORTNUM(268) xbox::size_xt NTAPI xbox::RtlCompareMemory ( - IN CONST VOID *Source1, - IN CONST VOID *Source2, - IN SIZE_T Length + IN CONST void_xt *Source1, + IN CONST void_xt *Source2, + IN size_xt Length ) { LOG_FUNC_BEGIN @@ -425,11 +425,11 @@ XBSYSAPI EXPORTNUM(268) xbox::SIZE_T NTAPI xbox::RtlCompareMemory // ****************************************************************** // * 0x010D - RtlCompareMemoryUlong() // ****************************************************************** -XBSYSAPI EXPORTNUM(269) xbox::SIZE_T NTAPI xbox::RtlCompareMemoryUlong +XBSYSAPI EXPORTNUM(269) xbox::size_xt NTAPI xbox::RtlCompareMemoryUlong ( IN PVOID Source, - IN SIZE_T Length, - IN ULONG Pattern + IN size_xt Length, + IN ulong_xt Pattern ) { LOG_FUNC_BEGIN @@ -457,11 +457,11 @@ XBSYSAPI EXPORTNUM(269) xbox::SIZE_T NTAPI xbox::RtlCompareMemoryUlong // ****************************************************************** // * 0x010E - RtlCompareString() // ****************************************************************** -XBSYSAPI EXPORTNUM(270) xbox::LONG NTAPI xbox::RtlCompareString +XBSYSAPI EXPORTNUM(270) xbox::long_xt NTAPI xbox::RtlCompareString ( IN PSTRING String1, IN PSTRING String2, - IN BOOLEAN CaseInSensitive + IN boolean_xt CaseInSensitive ) { LOG_FUNC_BEGIN @@ -492,11 +492,11 @@ XBSYSAPI EXPORTNUM(270) xbox::LONG NTAPI xbox::RtlCompareString // ****************************************************************** // * 0x010F - RtlCompareUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(271) xbox::LONG NTAPI xbox::RtlCompareUnicodeString +XBSYSAPI EXPORTNUM(271) xbox::long_xt NTAPI xbox::RtlCompareUnicodeString ( IN PUNICODE_STRING String1, IN PUNICODE_STRING String2, - IN BOOLEAN CaseInSensitive + IN boolean_xt CaseInSensitive ) { LOG_FUNC_BEGIN @@ -527,7 +527,7 @@ XBSYSAPI EXPORTNUM(271) xbox::LONG NTAPI xbox::RtlCompareUnicodeString // ****************************************************************** // * 0x0110 - RtlCopyString() // ****************************************************************** -XBSYSAPI EXPORTNUM(272) xbox::VOID NTAPI xbox::RtlCopyString +XBSYSAPI EXPORTNUM(272) xbox::void_xt NTAPI xbox::RtlCopyString ( OUT PSTRING DestinationString, IN PSTRING SourceString OPTIONAL @@ -557,7 +557,7 @@ XBSYSAPI EXPORTNUM(272) xbox::VOID NTAPI xbox::RtlCopyString // ****************************************************************** // * 0x0111 - RtlCopyUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(273) xbox::VOID NTAPI xbox::RtlCopyUnicodeString +XBSYSAPI EXPORTNUM(273) xbox::void_xt NTAPI xbox::RtlCopyUnicodeString ( OUT PUNICODE_STRING DestinationString, IN PUNICODE_STRING SourceString OPTIONAL @@ -587,7 +587,7 @@ XBSYSAPI EXPORTNUM(273) xbox::VOID NTAPI xbox::RtlCopyUnicodeString // ****************************************************************** // * 0x0112 - RtlCreateUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(274) xbox::BOOLEAN NTAPI xbox::RtlCreateUnicodeString +XBSYSAPI EXPORTNUM(274) xbox::boolean_xt NTAPI xbox::RtlCreateUnicodeString ( OUT PUNICODE_STRING DestinationString, IN PCWSTR SourceString @@ -600,7 +600,7 @@ XBSYSAPI EXPORTNUM(274) xbox::BOOLEAN NTAPI xbox::RtlCreateUnicodeString BOOLEAN result = TRUE; - ULONG bufferSize = (wcslen(SourceString) + 1) * sizeof(WCHAR); + ULONG bufferSize = (std::u16string(SourceString).length() + 1) * sizeof(WCHAR); DestinationString->Buffer = (USHORT *)ExAllocatePoolWithTag(bufferSize, 'grtS'); if (!DestinationString->Buffer) { result = FALSE; @@ -617,9 +617,9 @@ XBSYSAPI EXPORTNUM(274) xbox::BOOLEAN NTAPI xbox::RtlCreateUnicodeString // ****************************************************************** // * 0x0113 - RtlDowncaseUnicodeChar() // ****************************************************************** -XBSYSAPI EXPORTNUM(275) xbox::WCHAR NTAPI xbox::RtlDowncaseUnicodeChar +XBSYSAPI EXPORTNUM(275) xbox::wchar_xt NTAPI xbox::RtlDowncaseUnicodeChar ( - IN WCHAR SourceCharacter + IN wchar_xt SourceCharacter ) { LOG_FUNC_ONE_ARG(SourceCharacter); @@ -632,11 +632,11 @@ XBSYSAPI EXPORTNUM(275) xbox::WCHAR NTAPI xbox::RtlDowncaseUnicodeChar // ****************************************************************** // * 0x0114 - RtlDowncaseUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(276) xbox::NTSTATUS NTAPI xbox::RtlDowncaseUnicodeString +XBSYSAPI EXPORTNUM(276) xbox::ntstatus_xt NTAPI xbox::RtlDowncaseUnicodeString ( OUT PUNICODE_STRING DestinationString, IN PUNICODE_STRING SourceString, - IN BOOLEAN AllocateDestinationString + IN boolean_xt AllocateDestinationString ) { LOG_FUNC_BEGIN @@ -645,18 +645,18 @@ XBSYSAPI EXPORTNUM(276) xbox::NTSTATUS NTAPI xbox::RtlDowncaseUnicodeString LOG_FUNC_ARG(AllocateDestinationString) LOG_FUNC_END; - NTSTATUS result = STATUS_SUCCESS; + NTSTATUS result = xbox::status_success; if (AllocateDestinationString) { DestinationString->MaximumLength = SourceString->Length; DestinationString->Buffer = (USHORT*)ExAllocatePoolWithTag((ULONG)DestinationString->MaximumLength, 'grtS'); if (DestinationString->Buffer == NULL) { - return STATUS_NO_MEMORY; + return xbox::status_no_memory; } } else { if (SourceString->Length > DestinationString->MaximumLength) { - return STATUS_BUFFER_OVERFLOW; + return xbox::status_buffer_overflow; } } @@ -675,7 +675,7 @@ XBSYSAPI EXPORTNUM(276) xbox::NTSTATUS NTAPI xbox::RtlDowncaseUnicodeString // ****************************************************************** // * 0x0115 - RtlEnterCriticalSection() // ****************************************************************** -XBSYSAPI EXPORTNUM(277) xbox::VOID NTAPI xbox::RtlEnterCriticalSection +XBSYSAPI EXPORTNUM(277) xbox::void_xt NTAPI xbox::RtlEnterCriticalSection ( IN PRTL_CRITICAL_SECTION CriticalSection ) @@ -697,10 +697,10 @@ XBSYSAPI EXPORTNUM(277) xbox::VOID NTAPI xbox::RtlEnterCriticalSection (PVOID)CriticalSection, (KWAIT_REASON)0, (KPROCESSOR_MODE)0, - (BOOLEAN)0, + (boolean_xt)0, (PLARGE_INTEGER)0 ); - if (!NT_SUCCESS(result)) + if (!nt_success(result)) { CxbxKrnlCleanup("Waiting for event of a critical section returned %lx.", result); }; @@ -717,7 +717,7 @@ XBSYSAPI EXPORTNUM(277) xbox::VOID NTAPI xbox::RtlEnterCriticalSection // ****************************************************************** // * 0x0116 - RtlEnterCriticalSectionAndRegion() // ****************************************************************** -XBSYSAPI EXPORTNUM(278) xbox::VOID NTAPI xbox::RtlEnterCriticalSectionAndRegion +XBSYSAPI EXPORTNUM(278) xbox::void_xt NTAPI xbox::RtlEnterCriticalSectionAndRegion ( IN PRTL_CRITICAL_SECTION CriticalSection ) @@ -731,11 +731,11 @@ XBSYSAPI EXPORTNUM(278) xbox::VOID NTAPI xbox::RtlEnterCriticalSectionAndRegion // ****************************************************************** // * 0x0117 - RtlEqualString() // ****************************************************************** -XBSYSAPI EXPORTNUM(279) xbox::BOOLEAN NTAPI xbox::RtlEqualString +XBSYSAPI EXPORTNUM(279) xbox::boolean_xt NTAPI xbox::RtlEqualString ( IN PSTRING String1, IN PSTRING String2, - IN BOOLEAN CaseInSensitive + IN boolean_xt CaseInSensitive ) { LOG_FUNC_BEGIN @@ -784,11 +784,11 @@ XBSYSAPI EXPORTNUM(279) xbox::BOOLEAN NTAPI xbox::RtlEqualString // ****************************************************************** // * 0x0118 - RtlEqualUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(280) xbox::BOOLEAN NTAPI xbox::RtlEqualUnicodeString +XBSYSAPI EXPORTNUM(280) xbox::boolean_xt NTAPI xbox::RtlEqualUnicodeString ( IN PUNICODE_STRING String1, IN PUNICODE_STRING String2, - IN BOOLEAN CaseInSensitive + IN boolean_xt CaseInSensitive ) { LOG_FUNC_BEGIN @@ -841,7 +841,7 @@ XBSYSAPI EXPORTNUM(280) xbox::BOOLEAN NTAPI xbox::RtlEqualUnicodeString XBSYSAPI EXPORTNUM(281) xbox::LARGE_INTEGER NTAPI xbox::RtlExtendedIntegerMultiply ( IN LARGE_INTEGER Multiplicand, - IN LONG Multiplier + IN long_xt Multiplier ) { LOG_FUNC_BEGIN @@ -862,7 +862,7 @@ XBSYSAPI EXPORTNUM(281) xbox::LARGE_INTEGER NTAPI xbox::RtlExtendedIntegerMultip XBSYSAPI EXPORTNUM(282) xbox::LARGE_INTEGER NTAPI xbox::RtlExtendedLargeIntegerDivide ( IN LARGE_INTEGER Dividend, - IN ULONG Divisor, + IN ulong_xt Divisor, IN OUT PULONG Remainder OPTIONAL ) { @@ -910,7 +910,7 @@ XBSYSAPI EXPORTNUM(283) xbox::LARGE_INTEGER NTAPI xbox::RtlExtendedMagicDivide ( IN LARGE_INTEGER Dividend, IN LARGE_INTEGER MagicDivisor, - IN CCHAR ShiftCount + IN cchar_xt ShiftCount ) { LOG_FUNC_BEGIN @@ -962,11 +962,11 @@ XBSYSAPI EXPORTNUM(283) xbox::LARGE_INTEGER NTAPI xbox::RtlExtendedMagicDivide // ****************************************************************** // * 0x011C - RtlFillMemory() // ****************************************************************** -XBSYSAPI EXPORTNUM(284) xbox::VOID NTAPI xbox::RtlFillMemory +XBSYSAPI EXPORTNUM(284) xbox::void_xt NTAPI xbox::RtlFillMemory ( - IN VOID UNALIGNED *Destination, - IN DWORD Length, - IN BYTE Fill + IN void_xt UNALIGNED *Destination, + IN dword_xt Length, + IN byte_xt Fill ) { LOG_FUNC_BEGIN @@ -981,11 +981,11 @@ XBSYSAPI EXPORTNUM(284) xbox::VOID NTAPI xbox::RtlFillMemory // ****************************************************************** // * 0x011D - RtlFillMemoryUlong() // ****************************************************************** -XBSYSAPI EXPORTNUM(285) xbox::VOID NTAPI xbox::RtlFillMemoryUlong +XBSYSAPI EXPORTNUM(285) xbox::void_xt NTAPI xbox::RtlFillMemoryUlong ( IN PVOID Destination, - IN SIZE_T Length, - IN ULONG Pattern + IN size_t Length, + IN ulong_xt Pattern ) { LOG_FUNC_BEGIN @@ -1013,7 +1013,7 @@ XBSYSAPI EXPORTNUM(285) xbox::VOID NTAPI xbox::RtlFillMemoryUlong // ****************************************************************** // * 0x011E - RtlFreeAnsiString() // ****************************************************************** -XBSYSAPI EXPORTNUM(286) xbox::VOID NTAPI xbox::RtlFreeAnsiString +XBSYSAPI EXPORTNUM(286) xbox::void_xt NTAPI xbox::RtlFreeAnsiString ( IN OUT PANSI_STRING AnsiString ) @@ -1029,7 +1029,7 @@ XBSYSAPI EXPORTNUM(286) xbox::VOID NTAPI xbox::RtlFreeAnsiString // ****************************************************************** // * 0x011F - RtlFreeUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(287) xbox::VOID NTAPI xbox::RtlFreeUnicodeString +XBSYSAPI EXPORTNUM(287) xbox::void_xt NTAPI xbox::RtlFreeUnicodeString ( IN OUT PUNICODE_STRING UnicodeString ) @@ -1045,7 +1045,7 @@ XBSYSAPI EXPORTNUM(287) xbox::VOID NTAPI xbox::RtlFreeUnicodeString // ****************************************************************** // * 0x0120 - RtlGetCallersAddress() // ****************************************************************** -XBSYSAPI EXPORTNUM(288) xbox::VOID NTAPI xbox::RtlGetCallersAddress +XBSYSAPI EXPORTNUM(288) xbox::void_xt NTAPI xbox::RtlGetCallersAddress ( OUT PVOID *CallersAddress, OUT PVOID *CallersCaller @@ -1062,7 +1062,7 @@ XBSYSAPI EXPORTNUM(288) xbox::VOID NTAPI xbox::RtlGetCallersAddress // ****************************************************************** // * 0x0121 - RtlInitAnsiString() // ****************************************************************** -XBSYSAPI EXPORTNUM(289) xbox::VOID NTAPI xbox::RtlInitAnsiString +XBSYSAPI EXPORTNUM(289) xbox::void_xt NTAPI xbox::RtlInitAnsiString ( IN OUT PANSI_STRING DestinationString, IN PCSZ SourceString @@ -1088,7 +1088,7 @@ XBSYSAPI EXPORTNUM(289) xbox::VOID NTAPI xbox::RtlInitAnsiString // ****************************************************************** // * 0x0122 - RtlInitUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(290) xbox::VOID NTAPI xbox::RtlInitUnicodeString +XBSYSAPI EXPORTNUM(290) xbox::void_xt NTAPI xbox::RtlInitUnicodeString ( IN OUT PUNICODE_STRING DestinationString, IN PCWSTR SourceString @@ -1102,7 +1102,7 @@ XBSYSAPI EXPORTNUM(290) xbox::VOID NTAPI xbox::RtlInitUnicodeString DestinationString->Buffer = (USHORT*)SourceString; if (SourceString != NULL) { DestinationString->Buffer = (USHORT*)SourceString; - DestinationString->Length = (USHORT)wcslen(SourceString) * 2; + DestinationString->Length = (USHORT)std::u16string(SourceString).length() * 2; DestinationString->MaximumLength = DestinationString->Length + 2; } else { @@ -1113,7 +1113,7 @@ XBSYSAPI EXPORTNUM(290) xbox::VOID NTAPI xbox::RtlInitUnicodeString // ****************************************************************** // * 0x0123 - RtlInitializeCriticalSection() // ****************************************************************** -XBSYSAPI EXPORTNUM(291) xbox::VOID NTAPI xbox::RtlInitializeCriticalSection +XBSYSAPI EXPORTNUM(291) xbox::void_xt NTAPI xbox::RtlInitializeCriticalSection ( IN PRTL_CRITICAL_SECTION CriticalSection ) @@ -1129,11 +1129,11 @@ XBSYSAPI EXPORTNUM(291) xbox::VOID NTAPI xbox::RtlInitializeCriticalSection // ****************************************************************** // * 0x0124 - RtlIntegerToChar() // ****************************************************************** -XBSYSAPI EXPORTNUM(292) xbox::NTSTATUS NTAPI xbox::RtlIntegerToChar +XBSYSAPI EXPORTNUM(292) xbox::ntstatus_xt NTAPI xbox::RtlIntegerToChar ( - IN ULONG Value, - IN ULONG Base, - IN LONG OutputLength, + IN ulong_xt Value, + IN ulong_xt Base, + IN long_xt OutputLength, IN PSZ String ) { @@ -1170,7 +1170,7 @@ XBSYSAPI EXPORTNUM(292) xbox::NTSTATUS NTAPI xbox::RtlIntegerToChar SIZE_T len = &buffer[32] - pos; if (len > (SIZE_T)OutputLength) { - return STATUS_BUFFER_OVERFLOW; + return xbox::status_buffer_overflow; } else if (String == NULL) { return STATUS_ACCESS_VIOLATION; @@ -1182,16 +1182,16 @@ XBSYSAPI EXPORTNUM(292) xbox::NTSTATUS NTAPI xbox::RtlIntegerToChar RtlCopyMemory(String, pos, len + 1); } - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x0125 - RtlIntegerToUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(293) xbox::NTSTATUS NTAPI xbox::RtlIntegerToUnicodeString +XBSYSAPI EXPORTNUM(293) xbox::ntstatus_xt NTAPI xbox::RtlIntegerToUnicodeString ( - IN ULONG Value, - IN ULONG Base, + IN ulong_xt Value, + IN ulong_xt Base, IN PUNICODE_STRING String ) { @@ -1204,7 +1204,7 @@ XBSYSAPI EXPORTNUM(293) xbox::NTSTATUS NTAPI xbox::RtlIntegerToUnicodeString CHAR Buffer[33]; NTSTATUS Status = RtlIntegerToChar(Value, Base, sizeof(Buffer), Buffer); - if (NT_SUCCESS(Status)) { + if (nt_success(Status)) { ANSI_STRING AnsiString; AnsiString.Buffer = Buffer; @@ -1220,7 +1220,7 @@ XBSYSAPI EXPORTNUM(293) xbox::NTSTATUS NTAPI xbox::RtlIntegerToUnicodeString // ****************************************************************** // * 0x0126 - RtlLeaveCriticalSection() // ****************************************************************** -XBSYSAPI EXPORTNUM(294) xbox::VOID NTAPI xbox::RtlLeaveCriticalSection +XBSYSAPI EXPORTNUM(294) xbox::void_xt NTAPI xbox::RtlLeaveCriticalSection ( IN PRTL_CRITICAL_SECTION CriticalSection ) @@ -1232,7 +1232,7 @@ XBSYSAPI EXPORTNUM(294) xbox::VOID NTAPI xbox::RtlLeaveCriticalSection if(CriticalSection->RecursionCount == 0) { CriticalSection->OwningThread = 0; if(CriticalSection->LockCount >= 0) { - KeSetEvent((PRKEVENT)CriticalSection, (KPRIORITY)1, (BOOLEAN)0); + KeSetEvent((PRKEVENT)CriticalSection, (KPRIORITY)1, (boolean_xt)0); } } } @@ -1240,7 +1240,7 @@ XBSYSAPI EXPORTNUM(294) xbox::VOID NTAPI xbox::RtlLeaveCriticalSection // ****************************************************************** // * 0x0127 - RtlLeaveCriticalSectionAndRegion() // ****************************************************************** -XBSYSAPI EXPORTNUM(295) xbox::VOID NTAPI xbox::RtlLeaveCriticalSectionAndRegion +XBSYSAPI EXPORTNUM(295) xbox::void_xt NTAPI xbox::RtlLeaveCriticalSectionAndRegion ( IN PRTL_CRITICAL_SECTION CriticalSection ) @@ -1257,14 +1257,14 @@ XBSYSAPI EXPORTNUM(295) xbox::VOID NTAPI xbox::RtlLeaveCriticalSectionAndRegion // ****************************************************************** // * 0x0128 - RtlLowerChar() // ****************************************************************** -XBSYSAPI EXPORTNUM(296) xbox::CHAR NTAPI xbox::RtlLowerChar +XBSYSAPI EXPORTNUM(296) xbox::char_xt NTAPI xbox::RtlLowerChar ( - CHAR Character + char_xt Character ) { LOG_FUNC_ONE_ARG(Character); - BYTE CharCode = (BYTE)Character; + byte_xt CharCode = (byte_xt)Character; if (CharCode >= 'A' && CharCode <= 'Z') { @@ -1277,13 +1277,13 @@ XBSYSAPI EXPORTNUM(296) xbox::CHAR NTAPI xbox::RtlLowerChar CharCode ^= 0x20; } - RETURN((CHAR)CharCode); + RETURN((char_xt)CharCode); } // ****************************************************************** // * 0x0129 - RtlMapGenericMask() // ****************************************************************** -XBSYSAPI EXPORTNUM(297) xbox::VOID NTAPI xbox::RtlMapGenericMask +XBSYSAPI EXPORTNUM(297) xbox::void_xt NTAPI xbox::RtlMapGenericMask ( IN PACCESS_MASK AccessMask, IN PGENERIC_MAPPING GenericMapping @@ -1313,11 +1313,11 @@ XBSYSAPI EXPORTNUM(297) xbox::VOID NTAPI xbox::RtlMapGenericMask // ****************************************************************** // * 0x012A - RtlMoveMemory() // ****************************************************************** -XBSYSAPI EXPORTNUM(298) xbox::VOID NTAPI xbox::RtlMoveMemory +XBSYSAPI EXPORTNUM(298) xbox::void_xt NTAPI xbox::RtlMoveMemory ( - IN VOID UNALIGNED *Destination, - IN CONST VOID UNALIGNED *Source, - IN SIZE_T Length + IN void_xt UNALIGNED *Destination, + IN CONST void_xt UNALIGNED *Source, + IN size_t Length ) { LOG_FUNC_BEGIN @@ -1332,13 +1332,13 @@ XBSYSAPI EXPORTNUM(298) xbox::VOID NTAPI xbox::RtlMoveMemory // ****************************************************************** // * 0x012B - RtlMultiByteToUnicodeN() // ****************************************************************** -XBSYSAPI EXPORTNUM(299) xbox::NTSTATUS NTAPI xbox::RtlMultiByteToUnicodeN +XBSYSAPI EXPORTNUM(299) xbox::ntstatus_xt NTAPI xbox::RtlMultiByteToUnicodeN ( IN PWSTR UnicodeString, - IN ULONG MaxBytesInUnicodeString, + IN ulong_xt MaxBytesInUnicodeString, IN PULONG BytesInUnicodeString, IN PCHAR MultiByteString, - IN ULONG BytesInMultiByteString + IN ulong_xt BytesInMultiByteString ) { LOG_FUNC_BEGIN @@ -1364,17 +1364,17 @@ XBSYSAPI EXPORTNUM(299) xbox::NTSTATUS NTAPI xbox::RtlMultiByteToUnicodeN numChars--; } - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x012C - RtlMultiByteToUnicodeSize() // ****************************************************************** -XBSYSAPI EXPORTNUM(300) xbox::NTSTATUS NTAPI xbox::RtlMultiByteToUnicodeSize +XBSYSAPI EXPORTNUM(300) xbox::ntstatus_xt NTAPI xbox::RtlMultiByteToUnicodeSize ( IN PULONG BytesInUnicodeString, IN PCHAR MultiByteString, - IN ULONG BytesInMultiByteString + IN ulong_xt BytesInMultiByteString ) { LOG_FUNC_BEGIN @@ -1385,15 +1385,15 @@ XBSYSAPI EXPORTNUM(300) xbox::NTSTATUS NTAPI xbox::RtlMultiByteToUnicodeSize *BytesInUnicodeString = BytesInMultiByteString * sizeof(WCHAR); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x012D - RtlNtStatusToDosError() // ****************************************************************** -XBSYSAPI EXPORTNUM(301) xbox::ULONG NTAPI xbox::RtlNtStatusToDosError +XBSYSAPI EXPORTNUM(301) xbox::ulong_xt NTAPI xbox::RtlNtStatusToDosError ( - IN NTSTATUS Status + IN ntstatus_xt Status ) { LOG_FUNC_ONE_ARG(Status); @@ -1482,7 +1482,7 @@ static inline BOOL IsLeapYear(int Year) // ****************************************************************** // * 0x012E - RtlRaiseException() // ****************************************************************** -XBSYSAPI EXPORTNUM(302) xbox::VOID NTAPI xbox::RtlRaiseException +XBSYSAPI EXPORTNUM(302) xbox::void_xt NTAPI xbox::RtlRaiseException ( IN PEXCEPTION_RECORD ExceptionRecord ) @@ -1495,9 +1495,9 @@ XBSYSAPI EXPORTNUM(302) xbox::VOID NTAPI xbox::RtlRaiseException // ****************************************************************** // * 0x012F - RtlRaiseStatus() // ****************************************************************** -XBSYSAPI EXPORTNUM(303) xbox::VOID NTAPI xbox::RtlRaiseStatus +XBSYSAPI EXPORTNUM(303) xbox::void_xt NTAPI xbox::RtlRaiseStatus ( - IN NTSTATUS Status + IN ntstatus_xt Status ) { LOG_FUNC_ONE_ARG(Status); @@ -1514,7 +1514,7 @@ XBSYSAPI EXPORTNUM(303) xbox::VOID NTAPI xbox::RtlRaiseStatus // ****************************************************************** // * 0x0130 - RtlTimeFieldsToTime() // ****************************************************************** -XBSYSAPI EXPORTNUM(304) xbox::BOOLEAN NTAPI xbox::RtlTimeFieldsToTime +XBSYSAPI EXPORTNUM(304) xbox::boolean_xt NTAPI xbox::RtlTimeFieldsToTime ( IN PTIME_FIELDS TimeFields, OUT PLARGE_INTEGER Time @@ -1574,7 +1574,7 @@ XBSYSAPI EXPORTNUM(304) xbox::BOOLEAN NTAPI xbox::RtlTimeFieldsToTime // ****************************************************************** // * 0x0131 - RtlTimeToTimeFields() // ****************************************************************** -XBSYSAPI EXPORTNUM(305) xbox::VOID NTAPI xbox::RtlTimeToTimeFields +XBSYSAPI EXPORTNUM(305) xbox::void_xt NTAPI xbox::RtlTimeToTimeFields ( IN PLARGE_INTEGER Time, OUT PTIME_FIELDS TimeFields @@ -1592,7 +1592,7 @@ XBSYSAPI EXPORTNUM(305) xbox::VOID NTAPI xbox::RtlTimeToTimeFields /* Extract millisecond from time and convert time into seconds */ TimeFields->Millisecond = - (CSHORT)((Time->QuadPart % TICKSPERSEC) / TICKSPERMSEC); + (cshort_xt)((Time->QuadPart % TICKSPERSEC) / TICKSPERMSEC); _Time = Time->QuadPart / TICKSPERSEC; /* The native version of RtlTimeToTimeFields does not take leap seconds @@ -1603,13 +1603,13 @@ XBSYSAPI EXPORTNUM(305) xbox::VOID NTAPI xbox::RtlTimeToTimeFields SecondsInDay = _Time % SECSPERDAY; /* compute time of day */ - TimeFields->Hour = (CSHORT)(SecondsInDay / SECSPERHOUR); + TimeFields->Hour = (cshort_xt)(SecondsInDay / SECSPERHOUR); SecondsInDay = SecondsInDay % SECSPERHOUR; - TimeFields->Minute = (CSHORT)(SecondsInDay / SECSPERMIN); - TimeFields->Second = (CSHORT)(SecondsInDay % SECSPERMIN); + TimeFields->Minute = (cshort_xt)(SecondsInDay / SECSPERMIN); + TimeFields->Second = (cshort_xt)(SecondsInDay % SECSPERMIN); /* compute day of week */ - TimeFields->Weekday = (CSHORT)((EPOCHWEEKDAY + Days) % DAYSPERWEEK); + TimeFields->Weekday = (cshort_xt)((EPOCHWEEKDAY + Days) % DAYSPERWEEK); /* compute year, month and day of month. */ cleaps = (3 * ((4 * Days + 1227) / DAYSPERQUADRICENTENNIUM) + 3) / 4; @@ -1637,7 +1637,7 @@ XBSYSAPI EXPORTNUM(305) xbox::VOID NTAPI xbox::RtlTimeToTimeFields // ****************************************************************** // * 0x0132 - RtlTryEnterCriticalSection() // ****************************************************************** -XBSYSAPI EXPORTNUM(306) xbox::BOOLEAN NTAPI xbox::RtlTryEnterCriticalSection +XBSYSAPI EXPORTNUM(306) xbox::boolean_xt NTAPI xbox::RtlTryEnterCriticalSection ( IN PRTL_CRITICAL_SECTION CriticalSection ) @@ -1647,7 +1647,7 @@ XBSYSAPI EXPORTNUM(306) xbox::BOOLEAN NTAPI xbox::RtlTryEnterCriticalSection BOOLEAN ret = false; HANDLE thread = (HANDLE)KeGetCurrentThread(); - if(InterlockedCompareExchange(&CriticalSection->LockCount, 0, -1) == -1) { + if(InterlockedCompareExchange((::PLONG)(&CriticalSection->LockCount), 0, -1) == -1) { CriticalSection->OwningThread = thread; CriticalSection->RecursionCount = 1; ret = true; @@ -1666,9 +1666,9 @@ XBSYSAPI EXPORTNUM(306) xbox::BOOLEAN NTAPI xbox::RtlTryEnterCriticalSection // ****************************************************************** // * 0x0133 - RtlUlongByteSwap() // ****************************************************************** -XBSYSAPI EXPORTNUM(307) xbox::ULONG FASTCALL xbox::RtlUlongByteSwap +XBSYSAPI EXPORTNUM(307) xbox::ulong_xt FASTCALL xbox::RtlUlongByteSwap ( - IN ULONG Source + IN ulong_xt Source ) { LOG_FUNC_ONE_ARG(Source); @@ -1678,21 +1678,21 @@ XBSYSAPI EXPORTNUM(307) xbox::ULONG FASTCALL xbox::RtlUlongByteSwap RETURN(ret); } -DWORD WINAPI RtlUnicodeStringToAnsiSize(const xbox::UNICODE_STRING *str) +xbox::dword_xt WINAPI RtlUnicodeStringToAnsiSize(const xbox::UNICODE_STRING *str) { const wchar_t *src = (const wchar_t *)(str->Buffer); - DWORD ret = wcsrtombs(nullptr, &src, (size_t)str->Length, nullptr); + xbox::dword_xt ret = wcsrtombs(nullptr, &src, (size_t)str->Length, nullptr); return ret + 1; // +1 for the terminating null character } // ****************************************************************** // * 0x0134 - RtlUnicodeStringToAnsiString() // ****************************************************************** -XBSYSAPI EXPORTNUM(308) xbox::NTSTATUS NTAPI xbox::RtlUnicodeStringToAnsiString +XBSYSAPI EXPORTNUM(308) xbox::ntstatus_xt NTAPI xbox::RtlUnicodeStringToAnsiString ( IN OUT PSTRING DestinationString, IN PUNICODE_STRING SourceString, - IN BOOLEAN AllocateDestinationString + IN boolean_xt AllocateDestinationString ) { LOG_FUNC_BEGIN @@ -1701,23 +1701,23 @@ XBSYSAPI EXPORTNUM(308) xbox::NTSTATUS NTAPI xbox::RtlUnicodeStringToAnsiString LOG_FUNC_ARG(AllocateDestinationString) LOG_FUNC_END; - NTSTATUS ret = STATUS_SUCCESS; - DWORD len = RtlUnicodeStringToAnsiSize(SourceString); + NTSTATUS ret = xbox::status_success; + dword_xt len = RtlUnicodeStringToAnsiSize(SourceString); DestinationString->Length = (USHORT)(len - 1); if (AllocateDestinationString) { DestinationString->MaximumLength = (USHORT)len; if (!(DestinationString->Buffer = (PCHAR)ExAllocatePoolWithTag(len, 'grtS'))) { - return STATUS_NO_MEMORY; + return xbox::status_no_memory; } } else if (DestinationString->MaximumLength < len) { if (!DestinationString->MaximumLength) { - return STATUS_BUFFER_OVERFLOW; + return xbox::status_buffer_overflow; } DestinationString->Length = DestinationString->MaximumLength - 1; - ret = STATUS_BUFFER_OVERFLOW; + ret = xbox::status_buffer_overflow; } RtlUnicodeToMultiByteN(DestinationString->Buffer, DestinationString->Length, NULL, (PWSTR)SourceString->Buffer, (ULONG)SourceString->Length); @@ -1729,10 +1729,10 @@ XBSYSAPI EXPORTNUM(308) xbox::NTSTATUS NTAPI xbox::RtlUnicodeStringToAnsiString // ****************************************************************** // * 0x0135 - RtlUnicodeStringToInteger() // ****************************************************************** -XBSYSAPI EXPORTNUM(309) xbox::NTSTATUS NTAPI xbox::RtlUnicodeStringToInteger +XBSYSAPI EXPORTNUM(309) xbox::ntstatus_xt NTAPI xbox::RtlUnicodeStringToInteger ( IN PUNICODE_STRING String, - IN ULONG Base, + IN ulong_xt Base, IN PULONG Value ) { @@ -1822,19 +1822,19 @@ XBSYSAPI EXPORTNUM(309) xbox::NTSTATUS NTAPI xbox::RtlUnicodeStringToInteger *Value = bMinus ? (0 - RunningTotal) : RunningTotal; - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x0136 - RtlUnicodeToMultiByteN() // ****************************************************************** -XBSYSAPI EXPORTNUM(310) xbox::NTSTATUS NTAPI xbox::RtlUnicodeToMultiByteN +XBSYSAPI EXPORTNUM(310) xbox::ntstatus_xt NTAPI xbox::RtlUnicodeToMultiByteN ( IN PCHAR MultiByteString, - IN ULONG MaxBytesInMultiByteString, + IN ulong_xt MaxBytesInMultiByteString, IN PULONG BytesInMultiByteString, IN PWSTR UnicodeString, - IN ULONG BytesInUnicodeString + IN ulong_xt BytesInUnicodeString ) { LOG_FUNC_BEGIN @@ -1860,17 +1860,17 @@ XBSYSAPI EXPORTNUM(310) xbox::NTSTATUS NTAPI xbox::RtlUnicodeToMultiByteN numChars--; } - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x0137 - RtlUnicodeToMultiByteSize() // ****************************************************************** -XBSYSAPI EXPORTNUM(311) xbox::NTSTATUS NTAPI xbox::RtlUnicodeToMultiByteSize +XBSYSAPI EXPORTNUM(311) xbox::ntstatus_xt NTAPI xbox::RtlUnicodeToMultiByteSize ( IN PULONG BytesInMultiByteString, IN PWSTR UnicodeString, - IN ULONG BytesInUnicodeString + IN ulong_xt BytesInUnicodeString ) { LOG_FUNC_BEGIN @@ -1881,13 +1881,13 @@ XBSYSAPI EXPORTNUM(311) xbox::NTSTATUS NTAPI xbox::RtlUnicodeToMultiByteSize *BytesInMultiByteString = BytesInUnicodeString * sizeof(WCHAR); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x0138 - RtlUnwind() // ****************************************************************** -XBSYSAPI EXPORTNUM(312) xbox::VOID NTAPI xbox::RtlUnwind +XBSYSAPI EXPORTNUM(312) xbox::void_xt NTAPI xbox::RtlUnwind ( IN PVOID TargetFrame OPTIONAL, IN PVOID TargetIp OPTIONAL, @@ -1908,9 +1908,9 @@ XBSYSAPI EXPORTNUM(312) xbox::VOID NTAPI xbox::RtlUnwind // ****************************************************************** // * 0x0139 - RtlUpcaseUnicodeChar() // ****************************************************************** -XBSYSAPI EXPORTNUM(313) xbox::WCHAR NTAPI xbox::RtlUpcaseUnicodeChar +XBSYSAPI EXPORTNUM(313) xbox::wchar_xt NTAPI xbox::RtlUpcaseUnicodeChar ( - IN WCHAR SourceCharacter + IN wchar_xt SourceCharacter ) { LOG_FUNC_ONE_ARG(SourceCharacter); @@ -1923,11 +1923,11 @@ XBSYSAPI EXPORTNUM(313) xbox::WCHAR NTAPI xbox::RtlUpcaseUnicodeChar // ****************************************************************** // * 0x013A - RtlUpcaseUnicodeString() // ****************************************************************** -XBSYSAPI EXPORTNUM(314) xbox::NTSTATUS NTAPI xbox::RtlUpcaseUnicodeString +XBSYSAPI EXPORTNUM(314) xbox::ntstatus_xt NTAPI xbox::RtlUpcaseUnicodeString ( OUT PUNICODE_STRING DestinationString, IN PUNICODE_STRING SourceString, - IN BOOLEAN AllocateDestinationString + IN boolean_xt AllocateDestinationString ) { LOG_FUNC_BEGIN @@ -1940,12 +1940,12 @@ XBSYSAPI EXPORTNUM(314) xbox::NTSTATUS NTAPI xbox::RtlUpcaseUnicodeString DestinationString->MaximumLength = SourceString->Length; DestinationString->Buffer = (USHORT*)ExAllocatePoolWithTag((ULONG)DestinationString->MaximumLength, 'grtS'); if (DestinationString->Buffer == NULL) { - return STATUS_NO_MEMORY; + return xbox::status_no_memory; } } else { if (SourceString->Length > DestinationString->MaximumLength) { - return STATUS_BUFFER_OVERFLOW; + return xbox::status_buffer_overflow; } } @@ -1958,19 +1958,19 @@ XBSYSAPI EXPORTNUM(314) xbox::NTSTATUS NTAPI xbox::RtlUpcaseUnicodeString DestinationString->Length = SourceString->Length; - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x013B - RtlUpcaseUnicodeToMultiByteN() // ****************************************************************** -XBSYSAPI EXPORTNUM(315) xbox::NTSTATUS NTAPI xbox::RtlUpcaseUnicodeToMultiByteN +XBSYSAPI EXPORTNUM(315) xbox::ntstatus_xt NTAPI xbox::RtlUpcaseUnicodeToMultiByteN ( IN OUT PCHAR MultiByteString, - IN ULONG MaxBytesInMultiByteString, + IN ulong_xt MaxBytesInMultiByteString, IN PULONG BytesInMultiByteString, IN PWSTR UnicodeString, - IN ULONG BytesInUnicodeString + IN ulong_xt BytesInUnicodeString ) { LOG_FUNC_BEGIN @@ -1999,20 +1999,20 @@ XBSYSAPI EXPORTNUM(315) xbox::NTSTATUS NTAPI xbox::RtlUpcaseUnicodeToMultiByteN numChars--; } - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // ****************************************************************** // * 0x013C - RtlUpperChar() // ****************************************************************** -XBSYSAPI EXPORTNUM(316) xbox::CHAR NTAPI xbox::RtlUpperChar +XBSYSAPI EXPORTNUM(316) xbox::char_xt NTAPI xbox::RtlUpperChar ( - CHAR Character + char_xt Character ) { LOG_FUNC_ONE_ARG(Character); - BYTE CharCode = (BYTE)Character; + byte_xt CharCode = (byte_xt)Character; if (CharCode >= 'a' && CharCode <= 'z') { @@ -2030,13 +2030,13 @@ XBSYSAPI EXPORTNUM(316) xbox::CHAR NTAPI xbox::RtlUpperChar CharCode = '?'; } - RETURN((CHAR)CharCode); + RETURN((char_xt)CharCode); } // ****************************************************************** // * 0x013D - RtlUpperString() // ****************************************************************** -XBSYSAPI EXPORTNUM(317) xbox::VOID NTAPI xbox::RtlUpperString +XBSYSAPI EXPORTNUM(317) xbox::void_xt NTAPI xbox::RtlUpperString ( OUT PSTRING DestinationString, IN PSTRING SourceString @@ -2047,8 +2047,8 @@ XBSYSAPI EXPORTNUM(317) xbox::VOID NTAPI xbox::RtlUpperString LOG_FUNC_ARG(SourceString) LOG_FUNC_END; - CHAR *pDst = DestinationString->Buffer; - CHAR *pSrc = SourceString->Buffer; + char_xt *pDst = DestinationString->Buffer; + char_xt *pSrc = SourceString->Buffer; ULONG length = SourceString->Length; if ((USHORT)length > DestinationString->MaximumLength) { length = DestinationString->MaximumLength; @@ -2064,9 +2064,9 @@ XBSYSAPI EXPORTNUM(317) xbox::VOID NTAPI xbox::RtlUpperString // ****************************************************************** // * 0x013E - RtlUshortByteSwap() // ****************************************************************** -XBSYSAPI EXPORTNUM(318) xbox::USHORT FASTCALL xbox::RtlUshortByteSwap +XBSYSAPI EXPORTNUM(318) xbox::ushort_xt FASTCALL xbox::RtlUshortByteSwap ( - IN USHORT Source + IN ushort_xt Source ) { LOG_FUNC_ONE_ARG(Source); @@ -2079,11 +2079,11 @@ XBSYSAPI EXPORTNUM(318) xbox::USHORT FASTCALL xbox::RtlUshortByteSwap // ****************************************************************** // * 0x013F - RtlWalkFrameChain() // ****************************************************************** -XBSYSAPI EXPORTNUM(319) xbox::ULONG NTAPI xbox::RtlWalkFrameChain +XBSYSAPI EXPORTNUM(319) xbox::ulong_xt NTAPI xbox::RtlWalkFrameChain ( OUT PVOID *Callers, - IN ULONG Count, - IN ULONG Flags + IN ulong_xt Count, + IN ulong_xt Flags ) { LOG_FUNC_BEGIN @@ -2100,10 +2100,10 @@ XBSYSAPI EXPORTNUM(319) xbox::ULONG NTAPI xbox::RtlWalkFrameChain // ****************************************************************** // * 0x0140 - RtlZeroMemory() // ****************************************************************** -XBSYSAPI EXPORTNUM(320) xbox::VOID NTAPI xbox::RtlZeroMemory +XBSYSAPI EXPORTNUM(320) xbox::void_xt NTAPI xbox::RtlZeroMemory ( - IN VOID UNALIGNED *Destination, - IN SIZE_T Length + IN void_xt UNALIGNED *Destination, + IN size_t Length ) { LOG_FUNC_BEGIN @@ -2117,7 +2117,7 @@ XBSYSAPI EXPORTNUM(320) xbox::VOID NTAPI xbox::RtlZeroMemory // ****************************************************************** // * 0x0160 - RtlRip // ****************************************************************** -XBSYSAPI EXPORTNUM(352) xbox::VOID NTAPI xbox::RtlRip +XBSYSAPI EXPORTNUM(352) xbox::void_xt NTAPI xbox::RtlRip ( PCHAR ApiName, PCHAR Expression, diff --git a/src/core/kernel/exports/EmuKrnlXbox.cpp b/src/core/kernel/exports/EmuKrnlXbox.cpp index 3a90962fe..a3efffd23 100644 --- a/src/core/kernel/exports/EmuKrnlXbox.cpp +++ b/src/core/kernel/exports/EmuKrnlXbox.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX CXBXR_MODULE::XBOX -#include // For XboxEEPROMKey, etc. +#include // For XboxEEPROMKey, etc. #include "Logging.h" // Certificate Key diff --git a/src/core/kernel/exports/EmuKrnlXc.cpp b/src/core/kernel/exports/EmuKrnlXc.cpp index 780268553..cb18a1bb3 100644 --- a/src/core/kernel/exports/EmuKrnlXc.cpp +++ b/src/core/kernel/exports/EmuKrnlXc.cpp @@ -31,7 +31,7 @@ #define LOG_PREFIX CXBXR_MODULE::XC -#include // For XcSHAInit, etc. +#include // For XcSHAInit, etc. #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" #include "common\crypto\EmuSha.h" // For A_SHAInit, etc. @@ -48,7 +48,7 @@ namespace NtDll // The following are the default implementations of the crypto functions -xbox::VOID NTAPI JumpedSHAInit +xbox::void_xt NTAPI JumpedSHAInit ( xbox::PUCHAR pbSHAContext ) @@ -59,17 +59,17 @@ xbox::VOID NTAPI JumpedSHAInit SHA1Init((SHA1_CTX*)(pbSHAContext + 24)); } -xbox::VOID NTAPI JumpedSHAUpdate +xbox::void_xt NTAPI JumpedSHAUpdate ( xbox::PUCHAR pbSHAContext, xbox::PUCHAR pbInput, - xbox::ULONG dwInputLength + xbox::ulong_xt dwInputLength ) { SHA1Update((SHA1_CTX*)(pbSHAContext + 24), pbInput, dwInputLength); } -xbox::VOID NTAPI JumpedSHAFinal +xbox::void_xt NTAPI JumpedSHAFinal ( xbox::PUCHAR pbSHAContext, xbox::PUCHAR pbDigest @@ -78,34 +78,34 @@ xbox::VOID NTAPI JumpedSHAFinal SHA1Final(pbDigest, (SHA1_CTX*)(pbSHAContext + 24)); } -xbox::VOID NTAPI JumpedRC4Key +xbox::void_xt NTAPI JumpedRC4Key ( xbox::PUCHAR pbKeyStruct, - xbox::ULONG dwKeyLength, + xbox::ulong_xt dwKeyLength, xbox::PUCHAR pbKey ) { Rc4Initialise((Rc4Context*)pbKeyStruct, pbKey, dwKeyLength, 0); } -xbox::VOID NTAPI JumpedRC4Crypt +xbox::void_xt NTAPI JumpedRC4Crypt ( xbox::PUCHAR pbKeyStruct, - xbox::ULONG dwInputLength, + xbox::ulong_xt dwInputLength, xbox::PUCHAR pbInput ) { Rc4Xor((Rc4Context*)pbKeyStruct, pbInput, pbInput, dwInputLength); } -xbox::VOID NTAPI JumpedHMAC +xbox::void_xt NTAPI JumpedHMAC ( xbox::PBYTE pbKeyMaterial, - xbox::ULONG cbKeyMaterial, + xbox::ulong_xt cbKeyMaterial, xbox::PBYTE pbData, - xbox::ULONG cbData, + xbox::ulong_xt cbData, xbox::PBYTE pbData2, - xbox::ULONG cbData2, + xbox::ulong_xt cbData2, xbox::PBYTE HmacData ) { @@ -147,7 +147,7 @@ xbox::VOID NTAPI JumpedHMAC SHA1Final(HmacData, &ShaContext); } -xbox::ULONG NTAPI JumpedPKEncPublic +xbox::ulong_xt NTAPI JumpedPKEncPublic ( xbox::PUCHAR pbPubKey, xbox::PUCHAR pbInput, @@ -161,7 +161,7 @@ xbox::ULONG NTAPI JumpedPKEncPublic return ret; } -xbox::ULONG NTAPI JumpedPKDecPrivate +xbox::ulong_xt NTAPI JumpedPKDecPrivate ( xbox::PUCHAR pbPrvKey, xbox::PUCHAR pbInput, @@ -175,7 +175,7 @@ xbox::ULONG NTAPI JumpedPKDecPrivate return ret; } -xbox::ULONG NTAPI JumpedPKGetKeyLen +xbox::ulong_xt NTAPI JumpedPKGetKeyLen ( xbox::PUCHAR pbPubKey ) @@ -187,7 +187,7 @@ xbox::ULONG NTAPI JumpedPKGetKeyLen return ret; } -xbox::BOOLEAN NTAPI JumpedVerifyPKCS1Signature +xbox::boolean_xt NTAPI JumpedVerifyPKCS1Signature ( xbox::PUCHAR pbSig, xbox::PUCHAR pbPubKey, @@ -201,13 +201,13 @@ xbox::BOOLEAN NTAPI JumpedVerifyPKCS1Signature return ret; } -xbox::ULONG NTAPI JumpedModExp +xbox::ulong_xt NTAPI JumpedModExp ( xbox::LPDWORD pA, xbox::LPDWORD pB, xbox::LPDWORD pC, xbox::LPDWORD pD, - xbox::ULONG dwN + xbox::ulong_xt dwN ) { unsigned int len = dwN * 4; @@ -218,18 +218,18 @@ xbox::ULONG NTAPI JumpedModExp return 0; } -xbox::VOID NTAPI JumpedDESKeyParity +xbox::void_xt NTAPI JumpedDESKeyParity ( xbox::PUCHAR pbKey, - xbox::ULONG dwKeyLength + xbox::ulong_xt dwKeyLength ) { mbedtls_des_key_set_parity(pbKey, dwKeyLength); } -xbox::VOID NTAPI JumpedKeyTable +xbox::void_xt NTAPI JumpedKeyTable ( - xbox::ULONG dwCipher, + xbox::ulong_xt dwCipher, xbox::PUCHAR pbKeyTable, xbox::PUCHAR pbKey ) @@ -242,13 +242,13 @@ xbox::VOID NTAPI JumpedKeyTable } } -xbox::VOID NTAPI JumpedBlockCrypt +xbox::void_xt NTAPI JumpedBlockCrypt ( - xbox::ULONG dwCipher, + xbox::ulong_xt dwCipher, xbox::PUCHAR pbOutput, xbox::PUCHAR pbInput, xbox::PUCHAR pbKeyTable, - xbox::ULONG dwOp + xbox::ulong_xt dwOp ) { if (dwCipher) { @@ -259,14 +259,14 @@ xbox::VOID NTAPI JumpedBlockCrypt } } -xbox::VOID NTAPI JumpedBlockCryptCBC +xbox::void_xt NTAPI JumpedBlockCryptCBC ( - xbox::ULONG dwCipher, - xbox::ULONG dwInputLength, + xbox::ulong_xt dwCipher, + xbox::ulong_xt dwInputLength, xbox::PUCHAR pbOutput, xbox::PUCHAR pbInput, xbox::PUCHAR pbKeyTable, - xbox::ULONG dwOp, + xbox::ulong_xt dwOp, xbox::PUCHAR pbFeedback ) { @@ -284,9 +284,9 @@ xbox::VOID NTAPI JumpedBlockCryptCBC } } -xbox::ULONG NTAPI JumpedCryptService +xbox::ulong_xt NTAPI JumpedCryptService ( - xbox::ULONG dwOp, + xbox::ulong_xt dwOp, xbox::PVOID pArgs ) { @@ -322,7 +322,7 @@ xbox::CRYPTO_VECTOR UpdatedCryptoStruct = DefaultCryptoStruct; // ****************************************************************** // * 0x015F - XcUpdateCrypto() // ****************************************************************** -XBSYSAPI EXPORTNUM(351) xbox::VOID NTAPI xbox::XcUpdateCrypto +XBSYSAPI EXPORTNUM(351) xbox::void_xt NTAPI xbox::XcUpdateCrypto ( IN PCRYPTO_VECTOR pNewVector, OUT PCRYPTO_VECTOR pROMVector OPTIONAL @@ -413,7 +413,7 @@ XBSYSAPI EXPORTNUM(351) xbox::VOID NTAPI xbox::XcUpdateCrypto // ****************************************************************** // * 0x014F - XcSHAInit() // ****************************************************************** -XBSYSAPI EXPORTNUM(335) xbox::VOID NTAPI xbox::XcSHAInit +XBSYSAPI EXPORTNUM(335) xbox::void_xt NTAPI xbox::XcSHAInit ( IN PUCHAR pbSHAContext ) @@ -426,11 +426,11 @@ XBSYSAPI EXPORTNUM(335) xbox::VOID NTAPI xbox::XcSHAInit // ****************************************************************** // * 0x0150 - XcSHAUpdate() // ****************************************************************** -XBSYSAPI EXPORTNUM(336) xbox::VOID NTAPI xbox::XcSHAUpdate +XBSYSAPI EXPORTNUM(336) xbox::void_xt NTAPI xbox::XcSHAUpdate ( PUCHAR pbSHAContext, PUCHAR pbInput, - ULONG dwInputLength + ulong_xt dwInputLength ) { LOG_FUNC_BEGIN @@ -445,7 +445,7 @@ XBSYSAPI EXPORTNUM(336) xbox::VOID NTAPI xbox::XcSHAUpdate // ****************************************************************** // * 0x0151 - XcSHAFinal() // ****************************************************************** -XBSYSAPI EXPORTNUM(337) xbox::VOID NTAPI xbox::XcSHAFinal +XBSYSAPI EXPORTNUM(337) xbox::void_xt NTAPI xbox::XcSHAFinal ( IN PUCHAR pbSHAContext, IN PUCHAR pbDigest @@ -462,10 +462,10 @@ XBSYSAPI EXPORTNUM(337) xbox::VOID NTAPI xbox::XcSHAFinal // ****************************************************************** // * 0x0152 - XcRC4Key() // ****************************************************************** -XBSYSAPI EXPORTNUM(338) xbox::VOID NTAPI xbox::XcRC4Key +XBSYSAPI EXPORTNUM(338) xbox::void_xt NTAPI xbox::XcRC4Key ( IN PUCHAR pbKeyStruct, - IN ULONG dwKeyLength, + IN ulong_xt dwKeyLength, IN PUCHAR pbKey ) { @@ -481,10 +481,10 @@ XBSYSAPI EXPORTNUM(338) xbox::VOID NTAPI xbox::XcRC4Key // ****************************************************************** // * 0x0153 - XcRC4Crypt // ****************************************************************** -XBSYSAPI EXPORTNUM(339) xbox::VOID NTAPI xbox::XcRC4Crypt +XBSYSAPI EXPORTNUM(339) xbox::void_xt NTAPI xbox::XcRC4Crypt ( IN PUCHAR pbKeyStruct, - IN ULONG dwInputLength, + IN ulong_xt dwInputLength, IN PUCHAR pbInput ) { @@ -500,14 +500,14 @@ XBSYSAPI EXPORTNUM(339) xbox::VOID NTAPI xbox::XcRC4Crypt // ****************************************************************** // * 0x0154 - XcHMAC() // ****************************************************************** -XBSYSAPI EXPORTNUM(340) xbox::VOID NTAPI xbox::XcHMAC +XBSYSAPI EXPORTNUM(340) xbox::void_xt NTAPI xbox::XcHMAC ( IN PBYTE pbKeyMaterial, - IN ULONG cbKeyMaterial, + IN ulong_xt cbKeyMaterial, IN PBYTE pbData, - IN ULONG cbData, + IN ulong_xt cbData, IN PBYTE pbData2, - IN ULONG cbData2, + IN ulong_xt cbData2, OUT PBYTE HmacData ) { @@ -527,7 +527,7 @@ XBSYSAPI EXPORTNUM(340) xbox::VOID NTAPI xbox::XcHMAC // ****************************************************************** // * 0x0155 - XcPKEncPublic() // ****************************************************************** -XBSYSAPI EXPORTNUM(341) xbox::ULONG NTAPI xbox::XcPKEncPublic +XBSYSAPI EXPORTNUM(341) xbox::ulong_xt NTAPI xbox::XcPKEncPublic ( IN PUCHAR pbPubKey, IN PUCHAR pbInput, @@ -548,7 +548,7 @@ XBSYSAPI EXPORTNUM(341) xbox::ULONG NTAPI xbox::XcPKEncPublic // ****************************************************************** // * 0x0156 - XcPKDecPrivate() // ****************************************************************** -XBSYSAPI EXPORTNUM(342) xbox::ULONG NTAPI xbox::XcPKDecPrivate +XBSYSAPI EXPORTNUM(342) xbox::ulong_xt NTAPI xbox::XcPKDecPrivate ( IN PUCHAR pbPrvKey, IN PUCHAR pbInput, @@ -569,7 +569,7 @@ XBSYSAPI EXPORTNUM(342) xbox::ULONG NTAPI xbox::XcPKDecPrivate // ****************************************************************** // * 0x0157 - XcPKGetKeyLen() // ****************************************************************** -XBSYSAPI EXPORTNUM(343) xbox::ULONG NTAPI xbox::XcPKGetKeyLen +XBSYSAPI EXPORTNUM(343) xbox::ulong_xt NTAPI xbox::XcPKGetKeyLen ( OUT PUCHAR pbPubKey ) @@ -584,7 +584,7 @@ XBSYSAPI EXPORTNUM(343) xbox::ULONG NTAPI xbox::XcPKGetKeyLen // ****************************************************************** // * 0x0158 - XcVerifyPKCS1Signature() // ****************************************************************** -XBSYSAPI EXPORTNUM(344) xbox::BOOLEAN NTAPI xbox::XcVerifyPKCS1Signature +XBSYSAPI EXPORTNUM(344) xbox::boolean_xt NTAPI xbox::XcVerifyPKCS1Signature ( IN PUCHAR pbSig, IN PUCHAR pbPubKey, @@ -597,7 +597,7 @@ XBSYSAPI EXPORTNUM(344) xbox::BOOLEAN NTAPI xbox::XcVerifyPKCS1Signature LOG_FUNC_ARG_TYPE(PBYTE, pbDigest) LOG_FUNC_END; - BOOLEAN ret = UpdatedCryptoStruct.pXcVerifyPKCS1Signature(pbSig, pbPubKey, pbDigest); + boolean_xt ret = UpdatedCryptoStruct.pXcVerifyPKCS1Signature(pbSig, pbPubKey, pbDigest); RETURN(ret); } @@ -605,13 +605,13 @@ XBSYSAPI EXPORTNUM(344) xbox::BOOLEAN NTAPI xbox::XcVerifyPKCS1Signature // ****************************************************************** // * 0x0159 - XcModExp() // ****************************************************************** -XBSYSAPI EXPORTNUM(345) xbox::ULONG NTAPI xbox::XcModExp +XBSYSAPI EXPORTNUM(345) xbox::ulong_xt NTAPI xbox::XcModExp ( IN LPDWORD pA, IN LPDWORD pB, IN LPDWORD pC, IN LPDWORD pD, - IN ULONG dwN + IN ulong_xt dwN ) { LOG_FUNC_BEGIN @@ -630,10 +630,10 @@ XBSYSAPI EXPORTNUM(345) xbox::ULONG NTAPI xbox::XcModExp // ****************************************************************** // * 0x015A - XcDESKeyParity() // ****************************************************************** -XBSYSAPI EXPORTNUM(346) xbox::VOID NTAPI xbox::XcDESKeyParity +XBSYSAPI EXPORTNUM(346) xbox::void_xt NTAPI xbox::XcDESKeyParity ( IN PUCHAR pbKey, - IN ULONG dwKeyLength + IN ulong_xt dwKeyLength ) { LOG_FUNC_BEGIN @@ -647,9 +647,9 @@ XBSYSAPI EXPORTNUM(346) xbox::VOID NTAPI xbox::XcDESKeyParity // ****************************************************************** // * 0x015B - XcKeyTable() // ****************************************************************** -XBSYSAPI EXPORTNUM(347) xbox::VOID NTAPI xbox::XcKeyTable +XBSYSAPI EXPORTNUM(347) xbox::void_xt NTAPI xbox::XcKeyTable ( - IN ULONG dwCipher, + IN ulong_xt dwCipher, OUT PUCHAR pbKeyTable, IN PUCHAR pbKey ) @@ -666,13 +666,13 @@ XBSYSAPI EXPORTNUM(347) xbox::VOID NTAPI xbox::XcKeyTable // ****************************************************************** // * 0x015C - XcBlockCrypt() // ****************************************************************** -XBSYSAPI EXPORTNUM(348) xbox::VOID NTAPI xbox::XcBlockCrypt +XBSYSAPI EXPORTNUM(348) xbox::void_xt NTAPI xbox::XcBlockCrypt ( - IN ULONG dwCipher, + IN ulong_xt dwCipher, OUT PUCHAR pbOutput, IN PUCHAR pbInput, IN PUCHAR pbKeyTable, - IN ULONG dwOp + IN ulong_xt dwOp ) { LOG_FUNC_BEGIN @@ -689,14 +689,14 @@ XBSYSAPI EXPORTNUM(348) xbox::VOID NTAPI xbox::XcBlockCrypt // ****************************************************************** // * 0x015D - XcBlockCryptCBC() // ****************************************************************** -XBSYSAPI EXPORTNUM(349) xbox::VOID NTAPI xbox::XcBlockCryptCBC +XBSYSAPI EXPORTNUM(349) xbox::void_xt NTAPI xbox::XcBlockCryptCBC ( - IN ULONG dwCipher, - IN ULONG dwInputLength, + IN ulong_xt dwCipher, + IN ulong_xt dwInputLength, OUT PUCHAR pbOutput, IN PUCHAR pbInput, IN PUCHAR pbKeyTable, - IN ULONG dwOp, + IN ulong_xt dwOp, IN PUCHAR pbFeedback ) { @@ -716,9 +716,9 @@ XBSYSAPI EXPORTNUM(349) xbox::VOID NTAPI xbox::XcBlockCryptCBC // ****************************************************************** // * 0x015E - XcCryptService() // ****************************************************************** -XBSYSAPI EXPORTNUM(350) xbox::ULONG NTAPI xbox::XcCryptService +XBSYSAPI EXPORTNUM(350) xbox::ulong_xt NTAPI xbox::XcCryptService ( - IN ULONG dwOp, + IN ulong_xt dwOp, IN PVOID pArgs ) { diff --git a/src/core/kernel/exports/EmuKrnlXe.cpp b/src/core/kernel/exports/EmuKrnlXe.cpp index 4adec8e2b..ef30a3ee3 100644 --- a/src/core/kernel/exports/EmuKrnlXe.cpp +++ b/src/core/kernel/exports/EmuKrnlXe.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX CXBXR_MODULE::XE -#include // For XeImageFileName, etc. +#include // For XeImageFileName, etc. #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnl_Xbe #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" @@ -55,7 +55,7 @@ XBSYSAPI EXPORTNUM(326) xbox::OBJECT_STRING xbox::XeImageFileName = // count is now above zero. // // New to the XBOX. -XBSYSAPI EXPORTNUM(327) xbox::NTSTATUS NTAPI xbox::XeLoadSection +XBSYSAPI EXPORTNUM(327) xbox::ntstatus_xt NTAPI xbox::XeLoadSection ( IN PXBEIMAGE_SECTION Section ) @@ -64,7 +64,7 @@ XBSYSAPI EXPORTNUM(327) xbox::NTSTATUS NTAPI xbox::XeLoadSection LOG_FUNC_ARG(Section) LOG_FUNC_END; - NTSTATUS ret = STATUS_SUCCESS; + NTSTATUS ret = xbox::status_success; void* sectionData = CxbxKrnl_Xbe->FindSection(Section); if (sectionData != nullptr) { @@ -80,7 +80,7 @@ XBSYSAPI EXPORTNUM(327) xbox::NTSTATUS NTAPI xbox::XeLoadSection size_t SectionSize = (VAddr)Section->VirtualSize; ret = g_VMManager.XbAllocateVirtualMemory(&BaseAddress, 0, &SectionSize, XBOX_MEM_COMMIT, XBOX_PAGE_EXECUTE_READWRITE); - if (ret != STATUS_SUCCESS) { + if (ret != xbox::status_success) { RETURN(ret); } @@ -108,7 +108,7 @@ XBSYSAPI EXPORTNUM(327) xbox::NTSTATUS NTAPI xbox::XeLoadSection // if the count is now zero. // // New to the XBOX. -XBSYSAPI EXPORTNUM(328) xbox::NTSTATUS NTAPI xbox::XeUnloadSection +XBSYSAPI EXPORTNUM(328) xbox::ntstatus_xt NTAPI xbox::XeUnloadSection ( IN PXBEIMAGE_SECTION Section ) @@ -154,7 +154,7 @@ XBSYSAPI EXPORTNUM(328) xbox::NTSTATUS NTAPI xbox::XeUnloadSection } } - ret = STATUS_SUCCESS; + ret = xbox::status_success; } RETURN(ret); @@ -164,10 +164,10 @@ XBSYSAPI EXPORTNUM(328) xbox::NTSTATUS NTAPI xbox::XeUnloadSection // * 0x0163 - XePublicKeyData // ****************************************************************** // Define XePublicKeyData: This will be overwritten by the correct key for the given Xbe at runtime -XBSYSAPI EXPORTNUM(355) xbox::UCHAR xbox::XePublicKeyData[284] = { 0 }; +XBSYSAPI EXPORTNUM(355) xbox::uchar_xt xbox::XePublicKeyData[284] = { 0 }; // We are allowed to use the real RSA public key since it cannot be used to sign data, only verify it -> it's not secret/private -xbox::UCHAR xbox::XePublicKeyDataRetail[284] = { +xbox::uchar_xt xbox::XePublicKeyDataRetail[284] = { 0x52,0x53,0x41,0x31, 0x08,0x01,0x00,0x00, 0x00,0x08,0x00,0x00, 0xff,0x00,0x00,0x00, 0x01,0x00,0x01,0x00, // Public Modulus "m" @@ -192,7 +192,7 @@ xbox::UCHAR xbox::XePublicKeyDataRetail[284] = { }; // Chihiro Game Public Key -xbox::UCHAR xbox::XePublicKeyDataChihiroGame[284] = { +xbox::uchar_xt xbox::XePublicKeyDataChihiroGame[284] = { 0x52, 0x53, 0x41, 0x31, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x9B, 0x83, 0xD4, 0xD5, 0xDE, 0x16, 0x25, 0x8E, 0xE5, 0x15, 0xF2, 0x18, 0x9D, 0x19, 0x1C, 0xF8, @@ -220,7 +220,7 @@ xbox::UCHAR xbox::XePublicKeyDataChihiroGame[284] = { }; // Chihiro bootloader public key (Segaboot) -xbox::UCHAR xbox::XePublicKeyDataChihiroBoot[284] = { +xbox::uchar_xt xbox::XePublicKeyDataChihiroBoot[284] = { 0x52, 0x53, 0x41, 0x31, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x6B, 0x7B, 0x38, 0x78, 0xE3, 0x16, 0x04, 0x88, 0x1D, 0xAF, 0x63, 0x4E, 0x23, 0xDB, 0x10, 0x14, diff --git a/src/core/kernel/exports/KernelThunk.cpp b/src/core/kernel/exports/KernelThunk.cpp index d42181f7a..f88a6ddb4 100644 --- a/src/core/kernel/exports/KernelThunk.cpp +++ b/src/core/kernel/exports/KernelThunk.cpp @@ -26,7 +26,7 @@ // ****************************************************************** -#include +#include #include "Cxbx.h" // For CxbxKrnl_KernelThunkTable #include "core\kernel\init\CxbxKrnl.h" // For UINT diff --git a/src/core/kernel/exports/xboxkrnl.h b/src/core/kernel/exports/xboxkrnl.h new file mode 100644 index 000000000..e90800882 --- /dev/null +++ b/src/core/kernel/exports/xboxkrnl.h @@ -0,0 +1,83 @@ +// ****************************************************************** +// * +// * This file is part of the Cxbx project. +// * +// * Cxbx and Cxbe are free software; you can redistribute them +// * and/or modify them under the terms of the GNU General Public +// * License as published by the Free Software Foundation; either +// * version 2 of the license, or (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have recieved a copy of the GNU General Public License +// * along with this program; see the file COPYING. +// * If not, write to the Free Software Foundation, Inc., +// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA. +// * +// * (c) 2020 ergo720 +// * +// * All rights reserved +// * +// ****************************************************************** + +#pragma once + +#include "core\kernel\common\types.h" + +// ****************************************************************** +// * Debug +// ****************************************************************** +#include "core\kernel\common\dbg.h" + +// ****************************************************************** +// * Executive +// ****************************************************************** +#include "core\kernel\common\ex.h" + +// ****************************************************************** +// * Hardware Abstraction Layer +// ****************************************************************** +#include "core\kernel\common\hal.h" + +// ****************************************************************** +// * I/O Manager +// ****************************************************************** +#include "core\kernel\common\io.h" + +// ****************************************************************** +// * Kernel +// ****************************************************************** +#include "core\kernel\common\kernel.h" + +// ****************************************************************** +// * Memory Manager +// ****************************************************************** +#include "core\kernel\common\mm.h" + +// ****************************************************************** +// * NT +// ****************************************************************** +#include "core\kernel\common\nt.h" + +// ****************************************************************** +// * Object Manager +// ****************************************************************** +#include "core\kernel\common\ob.h" + +// ****************************************************************** +// * Process Structure +// ****************************************************************** +#include "core\kernel\common\ps.h" + +// ****************************************************************** +// * Run-time Library +// ****************************************************************** +#include "core\kernel\common\rtl.h" + +// ****************************************************************** +// * XBox +// ****************************************************************** +#include "core\kernel\common\xbox.h" diff --git a/src/core/kernel/init/CxbxKrnl.cpp b/src/core/kernel/init/CxbxKrnl.cpp index 02a3af653..53c50b970 100644 --- a/src/core/kernel/init/CxbxKrnl.cpp +++ b/src/core/kernel/init/CxbxKrnl.cpp @@ -29,7 +29,7 @@ #define LOG_PREFIX_INIT CXBXR_MODULE::INIT -#include +#include #include "gui/resource/ResCxbx.h" #include "core\kernel\init\CxbxKrnl.h" #include "common\xbdm\CxbxXbdm.h" // For Cxbx_LibXbdmThunkTable @@ -41,11 +41,6 @@ #include "EmuEEPROM.h" // For CxbxRestoreEEPROM, EEPROM, XboxFactoryGameRegion #include "core\kernel\exports\EmuKrnl.h" #include "core\kernel\exports\EmuKrnlKi.h" - -#ifndef VOID -#define VOID void -#endif - #include "EmuShared.h" #include "core\hle\D3D8\Direct3D9\Direct3D9.h" // For CxbxInitWindow, EmuD3DInit #include "core\hle\DSOUND\DirectSound\DirectSound.hpp" // For CxbxInitAudio @@ -435,11 +430,11 @@ static void CxbxKrnlClockThread(void* pVoid) xbox::KiClockIsr(IncrementScaling); } -std::vector g_RdtscPatches; +std::vector g_RdtscPatches; #define OPCODE_PATCH_RDTSC 0x90EF // OUT DX, EAX; NOP -bool IsRdtscInstruction(xbox::addr addr) +bool IsRdtscInstruction(xbox::addr_xt addr) { // First the fastest check - does addr contain exact patch from PatchRdtsc? // Second check - is addr on the rdtsc patch list? @@ -450,7 +445,7 @@ bool IsRdtscInstruction(xbox::addr addr) && (std::find(g_RdtscPatches.begin(), g_RdtscPatches.end(), addr) != g_RdtscPatches.end()); } -void PatchRdtsc(xbox::addr addr) +void PatchRdtsc(xbox::addr_xt addr) { // Patch away rdtsc with an opcode we can intercept // We use a privilaged instruction rather than int 3 for debugging @@ -519,10 +514,10 @@ void PatchRdtscInstructions() } EmuLogInit(LOG_LEVEL::INFO, "Searching for rdtsc in section %s", CxbxKrnl_Xbe->m_szSectionName[sectionIndex]); - xbox::addr startAddr = CxbxKrnl_Xbe->m_SectionHeader[sectionIndex].dwVirtualAddr; + xbox::addr_xt startAddr = CxbxKrnl_Xbe->m_SectionHeader[sectionIndex].dwVirtualAddr; //rdtsc is two bytes instruction, it needs at least one opcode byte after it to finish a function, so the endAddr need to substract 3 bytes. - xbox::addr endAddr = startAddr + CxbxKrnl_Xbe->m_SectionHeader[sectionIndex].dwSizeofRaw-3; - for (xbox::addr addr = startAddr; addr <= endAddr; addr++) + xbox::addr_xt endAddr = startAddr + CxbxKrnl_Xbe->m_SectionHeader[sectionIndex].dwSizeofRaw-3; + for (xbox::addr_xt addr = startAddr; addr <= endAddr; addr++) { if (memcmp((void*)addr, rdtsc, 2) == 0) { @@ -598,8 +593,8 @@ void MapThunkTable(uint32_t* kt, uint32_t* pThunkTable) } typedef struct { - xbox::addr ThunkAddr; - xbox::addr LibNameAddr; + xbox::addr_xt ThunkAddr; + xbox::addr_xt LibNameAddr; } XbeImportEntry; void ImportLibraries(XbeImportEntry *pImportDirectory) @@ -1138,9 +1133,9 @@ void CxbxKrnlEmulate(unsigned int reserved_systems, blocks_reserved_t blocks_res } EmuLogInit(LOG_LEVEL::INFO, "Searching for XBEH in section %s", CxbxKrnl_Xbe->m_szSectionName[sectionIndex]); - xbox::addr startAddr = CxbxKrnl_Xbe->m_SectionHeader[sectionIndex].dwVirtualAddr; - xbox::addr endAddr = startAddr + CxbxKrnl_Xbe->m_SectionHeader[sectionIndex].dwSizeofRaw; - for (xbox::addr addr = startAddr; addr < endAddr; addr++) { + xbox::addr_xt startAddr = CxbxKrnl_Xbe->m_SectionHeader[sectionIndex].dwVirtualAddr; + xbox::addr_xt endAddr = startAddr + CxbxKrnl_Xbe->m_SectionHeader[sectionIndex].dwSizeofRaw; + for (xbox::addr_xt addr = startAddr; addr < endAddr; addr++) { if (*(uint32_t*)addr == 0x48454258) { EmuLogInit(LOG_LEVEL::INFO, "Patching XBEH at 0x%08X", addr); *((uint32_t*)addr) = *(uint32_t*)XBE_IMAGE_BASE; @@ -1157,7 +1152,7 @@ void CxbxKrnlEmulate(unsigned int reserved_systems, blocks_reserved_t blocks_res Xbe::TLS* XbeTls = (Xbe::TLS*)CxbxKrnl_Xbe->m_Header.dwTLSAddr; void* XbeTlsData = (XbeTls != nullptr) ? (void*)CxbxKrnl_Xbe->m_TLS->dwDataStartAddr : nullptr; // Decode Entry Point - xbox::addr EntryPoint = CxbxKrnl_Xbe->m_Header.dwEntryAddr; + xbox::addr_xt EntryPoint = CxbxKrnl_Xbe->m_Header.dwEntryAddr; EntryPoint ^= XOR_EP_KEY[to_underlying(CxbxKrnl_Xbe->GetXbeType())]; // Launch XBE CxbxKrnlInit( @@ -1488,7 +1483,7 @@ __declspec(noreturn) void CxbxKrnlInit InitXboxHardware(HardwareModel::Revision1_5); // TODO : Make configurable // Read Xbox video mode from the SMC, store it in HalBootSMCVideoMode - xbox::HalReadSMBusValue(SMBUS_ADDRESS_SYSTEM_MICRO_CONTROLLER, SMC_COMMAND_AV_PACK, FALSE, &xbox::HalBootSMCVideoMode); + xbox::HalReadSMBusValue(SMBUS_ADDRESS_SYSTEM_MICRO_CONTROLLER, SMC_COMMAND_AV_PACK, FALSE, (xbox::PULONG)&xbox::HalBootSMCVideoMode); g_InputDeviceManager.Initialize(false); @@ -1792,13 +1787,13 @@ void CxbxKrnlShutDown() void CxbxKrnlPrintUEM(ULONG ErrorCode) { - ULONG Type; + xbox::dword_xt Type; xbox::XBOX_EEPROM Eeprom; ULONG ResultSize; - xbox::NTSTATUS status = xbox::ExQueryNonVolatileSetting(xbox::XC_MAX_ALL, &Type, &Eeprom, sizeof(Eeprom), &ResultSize); + xbox::ntstatus_xt status = xbox::ExQueryNonVolatileSetting(xbox::XC_MAX_ALL, &Type, &Eeprom, sizeof(Eeprom), (xbox::PSIZE_T)&ResultSize); - if (status == STATUS_SUCCESS) + if (status == xbox::status_success) { xbox::XBOX_UEM_INFO* UEMInfo = (xbox::XBOX_UEM_INFO*)&(Eeprom.UEMInfo[0]); diff --git a/src/core/kernel/init/CxbxKrnl.h b/src/core/kernel/init/CxbxKrnl.h index 09990d4a4..490c9a95b 100644 --- a/src/core/kernel/init/CxbxKrnl.h +++ b/src/core/kernel/init/CxbxKrnl.h @@ -31,7 +31,6 @@ #include "common\xbe\Xbe.h" #include "Logging.h" -#undef FIELD_OFFSET // prevent macro redefinition warnings #include #include diff --git a/src/core/kernel/memory-manager/PhysicalMemory.h b/src/core/kernel/memory-manager/PhysicalMemory.h index 4283f9048..e952f293f 100644 --- a/src/core/kernel/memory-manager/PhysicalMemory.h +++ b/src/core/kernel/memory-manager/PhysicalMemory.h @@ -29,7 +29,7 @@ #define PHYSICAL_MEMORY_H -#include +#include #include "core\kernel\support\Emu.h" #include "core\kernel\init\CxbxKrnl.h" #include diff --git a/src/core/kernel/memory-manager/PoolManager.cpp b/src/core/kernel/memory-manager/PoolManager.cpp index d20bb25cd..5398c37ce 100644 --- a/src/core/kernel/memory-manager/PoolManager.cpp +++ b/src/core/kernel/memory-manager/PoolManager.cpp @@ -128,7 +128,7 @@ VAddr PoolManager::AllocatePool(size_t Size, uint32_t Tag) Entry -= 1; LookasideList->AllocateHits += 1; - Entry->PoolType = static_cast(1); + Entry->PoolType = static_cast(1); MARK_POOL_HEADER_ALLOCATED(Entry); Entry->PoolTag = Tag; @@ -158,8 +158,8 @@ VAddr PoolManager::AllocatePool(size_t Size, uint32_t Tag) if (Entry->BlockSize != NeededSize) { if (Entry->PreviousSize == 0) { SplitEntry = reinterpret_cast((reinterpret_cast(Entry) + NeededSize)); - SplitEntry->BlockSize = Entry->BlockSize - static_cast(NeededSize); - SplitEntry->PreviousSize = static_cast(NeededSize); + SplitEntry->BlockSize = Entry->BlockSize - static_cast(NeededSize); + SplitEntry->PreviousSize = static_cast(NeededSize); NextEntry = reinterpret_cast((reinterpret_cast(SplitEntry) + SplitEntry->BlockSize)); if (PAGE_END(NextEntry) == false) { @@ -168,16 +168,16 @@ VAddr PoolManager::AllocatePool(size_t Size, uint32_t Tag) } else { SplitEntry = Entry; - Entry->BlockSize -= static_cast(NeededSize); + Entry->BlockSize -= static_cast(NeededSize); Entry = reinterpret_cast(reinterpret_cast(Entry) + Entry->BlockSize); Entry->PreviousSize = SplitEntry->BlockSize; NextEntry = reinterpret_cast(reinterpret_cast(Entry) + NeededSize); if (PAGE_END(NextEntry) == false) { - NextEntry->PreviousSize = static_cast(NeededSize); + NextEntry->PreviousSize = static_cast(NeededSize); } } - Entry->BlockSize = static_cast(NeededSize); + Entry->BlockSize = static_cast(NeededSize); SplitEntry->PoolType = 0; Index = SplitEntry->BlockSize; @@ -185,7 +185,7 @@ VAddr PoolManager::AllocatePool(size_t Size, uint32_t Tag) + POOL_OVERHEAD)))); } - Entry->PoolType = static_cast(1); + Entry->PoolType = static_cast(1); MARK_POOL_HEADER_ALLOCATED(Entry); @@ -217,7 +217,7 @@ VAddr PoolManager::AllocatePool(size_t Size, uint32_t Tag) Entry->BlockSize = 255; } else { - Entry->BlockSize = static_cast((PAGE_SIZE / POOL_SMALLEST_BLOCK)); + Entry->BlockSize = static_cast((PAGE_SIZE / POOL_SMALLEST_BLOCK)); } Entry->PreviousSize = 0; diff --git a/src/core/kernel/memory-manager/PoolManager.h b/src/core/kernel/memory-manager/PoolManager.h index 2fc294d29..8dca8aadd 100644 --- a/src/core/kernel/memory-manager/PoolManager.h +++ b/src/core/kernel/memory-manager/PoolManager.h @@ -38,43 +38,43 @@ typedef struct _POOL_DESCRIPTOR { - ULONG RunningAllocs; - ULONG RunningDeAllocs; - ULONG TotalPages; - ULONG TotalBigPages; + xbox::ulong_xt RunningAllocs; + xbox::ulong_xt RunningDeAllocs; + xbox::ulong_xt TotalPages; + xbox::ulong_xt TotalBigPages; xbox::LIST_ENTRY ListHeads[POOL_LIST_HEADS]; } POOL_DESCRIPTOR, *PPOOL_DESCRIPTOR; typedef struct _POOL_LOOKASIDE_LIST { xbox::SLIST_HEADER ListHead; - USHORT Depth; - USHORT Padding; - ULONG TotalAllocates; - ULONG AllocateHits; + xbox::ushort_xt Depth; + xbox::ushort_xt Padding; + xbox::ulong_xt TotalAllocates; + xbox::ulong_xt AllocateHits; } POOL_LOOKASIDE_LIST, *PPOOL_LOOKASIDE_LIST; typedef struct _POOL_HEADER { union { struct { - UCHAR PreviousSize; - UCHAR PoolIndex; - UCHAR PoolType; - UCHAR BlockSize; + xbox::uchar_xt PreviousSize; + xbox::uchar_xt PoolIndex; + xbox::uchar_xt PoolType; + xbox::uchar_xt BlockSize; }; - ULONG Ulong1; + xbox::ulong_xt Ulong1; }; - ULONG PoolTag; + xbox::ulong_xt PoolTag; } POOL_HEADER, *PPOOL_HEADER; typedef struct _POOL_BLOCK { - UCHAR Fill[1 << POOL_BLOCK_SHIFT]; + xbox::uchar_xt Fill[1 << POOL_BLOCK_SHIFT]; } POOL_BLOCK, *PPOOL_BLOCK; -#define POOL_OVERHEAD (static_cast(sizeof(POOL_HEADER))) +#define POOL_OVERHEAD (static_cast(sizeof(POOL_HEADER))) #define POOL_SMALLEST_BLOCK (sizeof(POOL_BLOCK)) #define POOL_BUDDY_MAX (PAGE_SIZE - (POOL_OVERHEAD + POOL_SMALLEST_BLOCK )) #define MARK_POOL_HEADER_ALLOCATED(POOLHEADER) {(POOLHEADER)->PoolIndex = 0x80;} diff --git a/src/core/kernel/memory-manager/VMManager.cpp b/src/core/kernel/memory-manager/VMManager.cpp index 661bd4d2a..83af9d3ed 100644 --- a/src/core/kernel/memory-manager/VMManager.cpp +++ b/src/core/kernel/memory-manager/VMManager.cpp @@ -1372,7 +1372,7 @@ void VMManager::LockBufferOrSinglePage(PAddr paddr, VAddr addr, size_t Size, boo Unlock(); } -xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, size_t* Size, DWORD AllocationType, DWORD Protect) +xbox::ntstatus_xt VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, size_t* Size, DWORD AllocationType, DWORD Protect) { LOG_FUNC_BEGIN LOG_FUNC_ARG(*addr) @@ -1389,7 +1389,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s PFN_COUNT PteNumber = 0; PFN TempPfn; PageType BusyType; - xbox::NTSTATUS status; + xbox::ntstatus_xt status; VAddr CapturedBase = *addr; size_t CapturedSize = *Size; VAddr MaxAllowedAddress; @@ -1422,7 +1422,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s // At least MEM_RESET, MEM_COMMIT or MEM_RESERVE must be set if ((AllocationType & (XBOX_MEM_COMMIT | XBOX_MEM_RESERVE | XBOX_MEM_RESET)) == 0) { RETURN(STATUS_INVALID_PARAMETER); } - if (!ConvertXboxToPtePermissions(Protect, &TempPte)) { RETURN(STATUS_INVALID_PAGE_PROTECTION); } + if (!ConvertXboxToPtePermissions(Protect, &TempPte)) { RETURN(xbox::status_invalid_page_protection); } EmuLog(LOG_LEVEL::DEBUG, "%s requested range : 0x%.8X - 0x%.8X", __func__, CapturedBase, CapturedBase + CapturedSize); @@ -1452,7 +1452,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s AlignedCapturedBase = MapMemoryBlock(UserRegion, AlignedCapturedSize >> PAGE_SHIFT, MEM_RESERVE, false, MaxAllowedAddress); - if (!AlignedCapturedBase) { status = STATUS_NO_MEMORY; goto Exit; } + if (!AlignedCapturedBase) { status = xbox::status_no_memory; goto Exit; } } else { @@ -1464,7 +1464,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s { // Reserved vma or we are overflowing a free vma, report an error - status = STATUS_CONFLICTING_ADDRESSES; + status = xbox::status_conflicting_addresses; goto Exit; } @@ -1486,7 +1486,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s { // An host allocation is already mapped there, report an error - status = STATUS_CONFLICTING_ADDRESSES; + status = xbox::status_conflicting_addresses; goto Exit; } } @@ -1504,7 +1504,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s *addr = AlignedCapturedBase; *Size = AlignedCapturedSize; - status = STATUS_SUCCESS; + status = xbox::status_success; goto Exit; } bDestructVmaOnFailure = true; @@ -1525,7 +1525,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s { // The specified region is not completely inside a reserved vma or it's free - status = STATUS_CONFLICTING_ADDRESSES; + status = xbox::status_conflicting_addresses; goto Exit; } @@ -1537,7 +1537,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s *Size = AlignedCapturedSize; Unlock(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); } // Figure out the number of physical pages we need to allocate. Note that NtAllocateVirtualMemory can do overlapped allocations so we @@ -1557,7 +1557,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s if (!IsMappable(PteNumber, true, m_MmLayoutDebug && m_bAllowNonDebuggerOnTop64MiB ? true : false)) { - status = STATUS_NO_MEMORY; + status = xbox::status_no_memory; goto Exit; } @@ -1570,7 +1570,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s (ConvertXboxToWinPermissions(PatchXboxPermissions(Protect))) & ~(PAGE_WRITECOMBINE | PAGE_NOCACHE))) { EmuLog(LOG_LEVEL::DEBUG, "%s: VirtualAlloc failed to commit the memory! The error was 0x%08X", __func__, GetLastError()); - status = STATUS_NO_MEMORY; + status = xbox::status_no_memory; goto Exit; } } @@ -1579,7 +1579,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s if (!AllocatePT(AlignedCapturedSize, AlignedCapturedBase)) { - status = STATUS_NO_MEMORY; + status = xbox::status_no_memory; goto Exit; } @@ -1619,7 +1619,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s *addr = AlignedCapturedBase; *Size = AlignedCapturedSize; Unlock(); - RETURN(STATUS_SUCCESS); + RETURN(xbox::status_success); Exit: if (bDestructVmaOnFailure) @@ -1631,7 +1631,7 @@ xbox::NTSTATUS VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, s RETURN(status); } -xbox::NTSTATUS VMManager::XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWORD FreeType) +xbox::ntstatus_xt VMManager::XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWORD FreeType) { LOG_FUNC_BEGIN LOG_FUNC_ARG(*addr) @@ -1643,7 +1643,7 @@ xbox::NTSTATUS VMManager::XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWORD F size_t CapturedSize = *Size; VAddr AlignedCapturedBase; size_t AlignedCapturedSize; - xbox::NTSTATUS status; + xbox::ntstatus_xt status; PMMPTE PointerPte; PMMPTE EndingPte; PMMPTE StartingPte; @@ -1679,7 +1679,7 @@ xbox::NTSTATUS VMManager::XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWORD F { // Free vma, report an error - status = STATUS_MEMORY_NOT_ALLOCATED; + status = xbox::status_memory_not_allocated; goto Exit; } @@ -1687,7 +1687,7 @@ xbox::NTSTATUS VMManager::XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWORD F { // The provided ending adddress is beyond the end of the vma, report an error - status = STATUS_UNABLE_TO_FREE_VM; + status = xbox::status_unable_to_free_vm; goto Exit; } @@ -1701,7 +1701,7 @@ xbox::NTSTATUS VMManager::XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWORD F { // The provided base address is not the starting address of the vma, report an error - status = STATUS_FREE_VM_NOT_AT_BASE; + status = xbox::status_free_vm_not_at_base; goto Exit; } @@ -1782,14 +1782,14 @@ xbox::NTSTATUS VMManager::XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWORD F *addr = AlignedCapturedBase; *Size = AlignedCapturedSize; - status = STATUS_SUCCESS; + status = xbox::status_success; Exit: Unlock(); RETURN(status); } -xbox::NTSTATUS VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* Protect) +xbox::ntstatus_xt VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* Protect) { LOG_FUNC_BEGIN LOG_FUNC_ARG(*addr) @@ -1802,7 +1802,7 @@ xbox::NTSTATUS VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* Pro size_t CapturedSize = *Size; VAddr AlignedCapturedBase; size_t AlignedCapturedSize; - xbox::NTSTATUS status; + xbox::ntstatus_xt status; PMMPTE PointerPte; PMMPTE EndingPte; PMMPTE StartingPte; @@ -1823,7 +1823,7 @@ xbox::NTSTATUS VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* Pro // Size cannot be zero if (CapturedSize == 0) { RETURN(STATUS_INVALID_PARAMETER); } - if (!ConvertXboxToPtePermissions(NewPerms, &NewPermsPte)) { RETURN(STATUS_INVALID_PAGE_PROTECTION); } + if (!ConvertXboxToPtePermissions(NewPerms, &NewPermsPte)) { RETURN(xbox::status_invalid_page_protection); } AlignedCapturedBase = ROUND_DOWN_4K(CapturedBase); AlignedCapturedSize = (PAGES_SPANNED(CapturedBase, CapturedSize)) << PAGE_SHIFT; @@ -1836,7 +1836,7 @@ xbox::NTSTATUS VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* Pro { // Free vma or the requested ending address is beyond the vma, report an error - status = STATUS_CONFLICTING_ADDRESSES; + status = xbox::status_conflicting_addresses; goto Exit; } @@ -1856,7 +1856,7 @@ xbox::NTSTATUS VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* Pro { // Pde is not committed, report an error - status = STATUS_NOT_COMMITTED; + status = xbox::status_not_committed; goto Exit; } } @@ -1865,7 +1865,7 @@ xbox::NTSTATUS VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* Pro { // Pte is not committed, report an error - status = STATUS_NOT_COMMITTED; + status = xbox::status_not_committed; goto Exit; } @@ -1900,14 +1900,14 @@ xbox::NTSTATUS VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* Pro *addr = AlignedCapturedBase; *Size = AlignedCapturedSize; *Protect = ConvertPteToXboxPermissions(OldPermsPte.Default); - status = STATUS_SUCCESS; + status = xbox::status_success; Exit: Unlock(); RETURN(status); } -xbox::NTSTATUS VMManager::XbVirtualMemoryStatistics(VAddr addr, xbox::PMEMORY_BASIC_INFORMATION memory_statistics) +xbox::ntstatus_xt VMManager::XbVirtualMemoryStatistics(VAddr addr, xbox::PMEMORY_BASIC_INFORMATION memory_statistics) { VMAIter it; PMMPTE PointerPte; @@ -1946,7 +1946,7 @@ xbox::NTSTATUS VMManager::XbVirtualMemoryStatistics(VAddr addr, xbox::PMEMORY_BA memory_statistics->RegionSize = info.RegionSize; memory_statistics->State = info.State; memory_statistics->Type = info.Type; - return STATUS_SUCCESS; + return xbox::status_success; } else { return STATUS_INVALID_PARAMETER; @@ -1975,7 +1975,7 @@ xbox::NTSTATUS VMManager::XbVirtualMemoryStatistics(VAddr addr, xbox::PMEMORY_BA memory_statistics->Type = 0; Unlock(); - return STATUS_SUCCESS; + return xbox::status_success; } // The vma is in the reserved or allocated state @@ -2044,7 +2044,7 @@ xbox::NTSTATUS VMManager::XbVirtualMemoryStatistics(VAddr addr, xbox::PMEMORY_BA memory_statistics->Type = XBOX_MEM_PRIVATE; Unlock(); - return STATUS_SUCCESS; + return xbox::status_success; } VAddr VMManager::MapMemoryBlock(MemoryRegionType Type, PFN_COUNT PteNumber, DWORD Permissions, bool b64Blocks, VAddr HighestAddress) diff --git a/src/core/kernel/memory-manager/VMManager.h b/src/core/kernel/memory-manager/VMManager.h index b8818f4c1..8200ebb97 100644 --- a/src/core/kernel/memory-manager/VMManager.h +++ b/src/core/kernel/memory-manager/VMManager.h @@ -141,13 +141,13 @@ class VMManager : public PhysicalMemory // retrieves the number of free debugger pages PFN_COUNT QueryNumberOfFreeDebuggerPages(); // xbox implementation of NtAllocateVirtualMemory - xbox::NTSTATUS XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, size_t* Size, DWORD AllocationType, DWORD Protect); + xbox::ntstatus_xt XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits, size_t* Size, DWORD AllocationType, DWORD Protect); // xbox implementation of NtFreeVirtualMemory - xbox::NTSTATUS XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWORD FreeType); + xbox::ntstatus_xt XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWORD FreeType); // xbox implementation of NtProtectVirtualMemory - xbox::NTSTATUS XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* Protect); + xbox::ntstatus_xt XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* Protect); // xbox implementation of NtQueryVirtualMemory - xbox::NTSTATUS XbVirtualMemoryStatistics(VAddr addr, xbox::PMEMORY_BASIC_INFORMATION memory_statistics); + xbox::ntstatus_xt XbVirtualMemoryStatistics(VAddr addr, xbox::PMEMORY_BASIC_INFORMATION memory_statistics); // get persistent memory from previous process until RestorePersistentMemory is called void GetPersistentMemory(); // saves all persisted memory just before a quick reboot diff --git a/src/core/kernel/support/Emu.cpp b/src/core/kernel/support/Emu.cpp index 61dea7b1e..fe999d731 100644 --- a/src/core/kernel/support/Emu.cpp +++ b/src/core/kernel/support/Emu.cpp @@ -28,7 +28,7 @@ #define LOG_PREFIX CXBXR_MODULE::X86 -#include +#include #include "core\kernel\init\CxbxKrnl.h" #include "Emu.h" #include "devices\x86\EmuX86.h" @@ -88,7 +88,7 @@ std::string FormatTitleId(uint32_t title_id) return ss.str(); } -std::string EIPToString(xbox::addr EIP) +std::string EIPToString(xbox::addr_xt EIP) { char buffer[256]; @@ -207,7 +207,7 @@ void EmuExceptionNonBreakpointUnhandledShow(LPEXCEPTION_POINTERS e) } // Returns weither the given address is part of an Xbox managed memory region -bool IsXboxCodeAddress(xbox::addr addr) +bool IsXboxCodeAddress(xbox::addr_xt addr) { // TODO : Replace the following with a (fast) check weither // the given address lies in xbox allocated virtual memory, @@ -241,7 +241,7 @@ void genericException(EXCEPTION_POINTERS *e) { } } -bool IsRdtscInstruction(xbox::addr addr); // Implemented in CxbxKrnl.cpp +bool IsRdtscInstruction(xbox::addr_xt addr); // Implemented in CxbxKrnl.cpp void EmuX86_Opcode_RDTSC(EXCEPTION_POINTERS *e); // Implemented in EmuX86.cpp bool lleTryHandleException(EXCEPTION_POINTERS *e) { @@ -497,7 +497,7 @@ void EmuPrintStackTrace(PCONTEXT ContextRecord) // Try getting a symbol name from the HLE cache : int symbolOffset = 0; - symbolName = GetDetectedSymbolName((xbox::addr)frame.AddrPC.Offset, &symbolOffset); + symbolName = GetDetectedSymbolName((xbox::addr_xt)frame.AddrPC.Offset, &symbolOffset); if (symbolOffset < 1000) dwDisplacement = (DWORD64)symbolOffset; else diff --git a/src/core/kernel/support/Emu.h b/src/core/kernel/support/Emu.h index 2c41ce109..d221ecbee 100644 --- a/src/core/kernel/support/Emu.h +++ b/src/core/kernel/support/Emu.h @@ -28,7 +28,6 @@ #include "common\xbe\Xbe.h" #include "Logging.h" -#undef FIELD_OFFSET // prevent macro redefinition warnings #include #include diff --git a/src/core/kernel/support/EmuFS.cpp b/src/core/kernel/support/EmuFS.cpp index 9300ea167..38b43d746 100644 --- a/src/core/kernel/support/EmuFS.cpp +++ b/src/core/kernel/support/EmuFS.cpp @@ -28,7 +28,7 @@ #define LOG_PREFIX CXBXR_MODULE::FS -#include +#include #include "core\kernel\exports\EmuKrnl.h" // For InitializeListHead(), etc. #include "core\kernel\exports\EmuKrnlKe.h" #include "core\kernel\support\EmuFS.h" // For fs_instruction_t @@ -36,7 +36,6 @@ #include "core\kernel\memory-manager\VMManager.h" #include "Logging.h" -#undef FIELD_OFFSET // prevent macro redefinition warnings #include #include #include @@ -476,9 +475,9 @@ void EmuInitFS() } EmuLogEx(CXBXR_MODULE::INIT, LOG_LEVEL::DEBUG, "Searching for FS Instruction in section %s\n", CxbxKrnl_Xbe->m_szSectionName[sectionIndex]); - xbox::addr startAddr = CxbxKrnl_Xbe->m_SectionHeader[sectionIndex].dwVirtualAddr; - xbox::addr endAddr = startAddr + CxbxKrnl_Xbe->m_SectionHeader[sectionIndex].dwSizeofRaw; - for (xbox::addr addr = startAddr; addr < endAddr; addr++) + xbox::addr_xt startAddr = CxbxKrnl_Xbe->m_SectionHeader[sectionIndex].dwVirtualAddr; + xbox::addr_xt endAddr = startAddr + CxbxKrnl_Xbe->m_SectionHeader[sectionIndex].dwSizeofRaw; + for (xbox::addr_xt addr = startAddr; addr < endAddr; addr++) { for (int i = 0; i < numberOfInstructions; i++) { @@ -554,7 +553,7 @@ void EmuGenerateFS(Xbe::TLS *pTLS, void *pTLSData) uint8_t *bByte = (uint8_t*)pNewTLS + v; if (v % 0x10 == 0) { - EmuLog(LOG_LEVEL::DEBUG, "0x%.8X:", (xbox::addr)bByte); + EmuLog(LOG_LEVEL::DEBUG, "0x%.8X:", (xbox::addr_xt)bByte); } // Note : Use printf instead of EmuLog here, which prefixes with GetCurrentThreadId() : @@ -570,7 +569,7 @@ void EmuGenerateFS(Xbe::TLS *pTLS, void *pTLSData) // prepare TLS { if (pTLS->dwTLSIndexAddr != 0) { - *(xbox::addr*)pTLS->dwTLSIndexAddr = xbox::zero; + *(xbox::addr_xt*)pTLS->dwTLSIndexAddr = xbox::zero; } // dword @ pTLSData := pTLSData @@ -634,13 +633,13 @@ void EmuGenerateFS(Xbe::TLS *pTLS, void *pTLSData) Prcb->CurrentThread = (xbox::KTHREAD*)EThread; // Initialize the thread header and its wait list Prcb->CurrentThread->Header.Type = xbox::ThreadObject; - Prcb->CurrentThread->Header.Size = sizeof(xbox::KTHREAD) / sizeof(xbox::LONG); + Prcb->CurrentThread->Header.Size = sizeof(xbox::KTHREAD) / sizeof(xbox::long_xt); InitializeListHead(&Prcb->CurrentThread->Header.WaitListHead); // Also initialize the timer associated with the thread xbox::KeInitializeTimer(&Prcb->CurrentThread->Timer); xbox::PKWAIT_BLOCK WaitBlock = &Prcb->CurrentThread->TimerWaitBlock; WaitBlock->Object = &Prcb->CurrentThread->Timer; - WaitBlock->WaitKey = (xbox::CSHORT)STATUS_TIMEOUT; + WaitBlock->WaitKey = (xbox::cshort_xt)STATUS_TIMEOUT; WaitBlock->WaitType = xbox::WaitAny; WaitBlock->Thread = Prcb->CurrentThread; WaitBlock->WaitListEntry.Flink = &Prcb->CurrentThread->Timer.Header.WaitListHead; diff --git a/src/core/kernel/support/EmuFS.h b/src/core/kernel/support/EmuFS.h index aadd7483d..5f0053cf7 100644 --- a/src/core/kernel/support/EmuFS.h +++ b/src/core/kernel/support/EmuFS.h @@ -27,7 +27,6 @@ #include #include "common\xbe\Xbe.h" -#undef FIELD_OFFSET // prevent macro redefinition warnings #include // initialize fs segment selector emulation diff --git a/src/core/kernel/support/EmuFile.cpp b/src/core/kernel/support/EmuFile.cpp index fec49dbb6..edb76a138 100644 --- a/src/core/kernel/support/EmuFile.cpp +++ b/src/core/kernel/support/EmuFile.cpp @@ -256,7 +256,7 @@ NTSTATUS EmuHandle::NtClose() NTSTATUS EmuHandle::NtDuplicateObject(PHANDLE TargetHandle, DWORD Options) { *TargetHandle = NtObject->NtDuplicateObject(Options)->NewHandle(); - return STATUS_SUCCESS; + return xbox::status_success; } EmuNtObject::EmuNtObject() @@ -276,7 +276,7 @@ NTSTATUS EmuNtObject::NtClose() delete this; } - return STATUS_SUCCESS; + return xbox::status_success; } EmuNtObject* EmuNtObject::NtDuplicateObject(DWORD Options) @@ -477,7 +477,7 @@ NTSTATUS CxbxConvertFilePath( // Convert the relative path to unicode RelativeHostPath = string_to_wstring(RelativePath); - return STATUS_SUCCESS; + return xbox::status_success; } NTSTATUS CxbxObjectAttributesToNT( @@ -490,7 +490,7 @@ NTSTATUS CxbxObjectAttributesToNT( { // When the pointer is nil, make sure we pass nil to Windows too : nativeObjectAttributes.NtObjAttrPtr = nullptr; - return STATUS_SUCCESS; + return xbox::status_success; } // Pick up the ObjectName, and let's see what to make of it : @@ -522,7 +522,7 @@ NTSTATUS CxbxObjectAttributesToNT( // ObjectAttributes are given, so make sure the pointer we're going to pass to Windows is assigned : nativeObjectAttributes.NtObjAttrPtr = &nativeObjectAttributes.NtObjAttr; - return STATUS_SUCCESS; + return xbox::status_success; } int CxbxDeviceIndexByDevicePath(const char *XboxDevicePath) @@ -559,7 +559,7 @@ int CxbxRegisterDeviceHostPath(std::string XboxDevicePath, std::string HostDevic CxbxCreatePartitionHeaderFile(partitionHeaderPath, XboxDevicePath == DeviceHarddisk0Partition0); } - status = STATUS_SUCCESS; + status = xbox::status_success; } // If this path is not a raw file partition, create the directory for it @@ -567,7 +567,7 @@ int CxbxRegisterDeviceHostPath(std::string XboxDevicePath, std::string HostDevic status = SHCreateDirectoryEx(NULL, HostDevicePath.c_str(), NULL); } - if (status == STATUS_SUCCESS || status == ERROR_ALREADY_EXISTS) { + if (status == xbox::status_success || status == ERROR_ALREADY_EXISTS) { Devices.push_back(newDevice); result = Devices.size() - 1; } @@ -589,7 +589,7 @@ NTSTATUS CxbxCreateSymbolicLink(std::string SymbolicLinkName, std::string FullPa SymbolicLinkObject = new EmuNtSymbolicLinkObject(); result = SymbolicLinkObject->Init(SymbolicLinkName, FullPath); - if (result != STATUS_SUCCESS) + if (result != xbox::status_success) SymbolicLinkObject->NtClose(); return result; @@ -612,7 +612,7 @@ NTSTATUS EmuNtSymbolicLinkObject::Init(std::string aSymbolicLinkName, std::strin DriveLetter = SymbolicLinkToDriveLetter(aSymbolicLinkName); if (DriveLetter >= 'A' && DriveLetter <= 'Z') { - result = STATUS_OBJECT_NAME_COLLISION; + result = xbox::status_object_name_collision; if (FindNtSymbolicLinkObjectByDriveLetter(DriveLetter) == NULL) { // Look up the partition in the list of pre-registered devices : @@ -635,7 +635,7 @@ NTSTATUS EmuNtSymbolicLinkObject::Init(std::string aSymbolicLinkName, std::strin if (DeviceIndex >= 0) { - result = STATUS_SUCCESS; + result = xbox::status_success; SymbolicLinkName = aSymbolicLinkName; if (IsHostBasedPath) { @@ -813,8 +813,8 @@ NTSTATUS _ConvertXboxNameInfo(NtDll::FILE_NAME_INFORMATION *ntNameInfo, xbox::FI // Return the appropriate result depending on whether the string was fully copied return convertedChars == ntNameInfo->FileNameLength / sizeof(NtDll::WCHAR) - ? STATUS_SUCCESS - : STATUS_BUFFER_OVERFLOW; + ? xbox::status_success + : xbox::status_buffer_overflow; } // ---------------------------------------------------------------------------- @@ -829,7 +829,7 @@ NTSTATUS _NTToXboxNetOpenInfo(NtDll::FILE_NETWORK_OPEN_INFORMATION *ntNetOpenInf // Fix up attributes xboxNetOpenInfo->FileAttributes &= FILE_ATTRIBUTE_VALID_FLAGS; - return STATUS_SUCCESS; + return xbox::status_success; } NTSTATUS _NTToXboxBasicInfo(NtDll::FILE_BASIC_INFORMATION *ntBasicInfo, xbox::FILE_BASIC_INFORMATION *xboxBasicInfo, ULONG Length) @@ -839,7 +839,7 @@ NTSTATUS _NTToXboxBasicInfo(NtDll::FILE_BASIC_INFORMATION *ntBasicInfo, xbox::FI _ConvertXboxBasicInfo(xboxBasicInfo); - return STATUS_SUCCESS; + return xbox::status_success; } NTSTATUS _NTToXboxNameInfo(NtDll::FILE_NAME_INFORMATION *ntNameInfo, xbox::FILE_NAME_INFORMATION *xboxNameInfo, ULONG Length) @@ -931,7 +931,7 @@ NTSTATUS NTToXboxFileInformation // FileStandardInformation // FileReparsePointInformation - NTSTATUS result = STATUS_SUCCESS; + NTSTATUS result = xbox::status_success; switch (FileInformationClass) { @@ -1015,7 +1015,7 @@ NTSTATUS NTToXboxFileInformation { // No differences between structs; a simple copy should suffice memcpy_s(xboxFileInformation, Length, nativeFileInformation, Length); - result = STATUS_SUCCESS; + result = xbox::status_success; break; } } @@ -1213,7 +1213,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_ADDRESS_CLOSED); _CASE(STATUS_ADDRESS_NOT_ASSOCIATED); _CASE(STATUS_AGENTS_EXHAUSTED); - _CASE(STATUS_ALERTED); + _CASE(xbox::status_alerted); _CASE(STATUS_ALIAS_EXISTS); _CASE(STATUS_ALLOCATE_BUCKET); _CASE(STATUS_ALLOTTED_SPACE_EXCEEDED); @@ -1249,8 +1249,8 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT); _CASE(STATUS_BREAKPOINT); _CASE(STATUS_BUFFER_ALL_ZEROS); - _CASE(STATUS_BUFFER_OVERFLOW); - _CASE(STATUS_BUFFER_TOO_SMALL); + _CASE(xbox::status_buffer_overflow); + _CASE(xbox::status_buffer_too_small); _CASE(STATUS_BUS_RESET); _CASE(STATUS_CACHE_PAGE_LOCKED); _CASE(STATUS_CANCELLED); @@ -1269,7 +1269,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_CLIENT_SERVER_PARAMETERS_INVALID); _CASE(STATUS_COMMITMENT_LIMIT); _CASE(STATUS_COMMITMENT_MINIMUM); - _CASE(STATUS_CONFLICTING_ADDRESSES); + _CASE(xbox::status_conflicting_addresses); _CASE(STATUS_CONNECTION_ABORTED); _CASE(STATUS_CONNECTION_ACTIVE); _CASE(STATUS_CONNECTION_COUNT_LIMIT); @@ -1455,7 +1455,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_FLOPPY_VOLUME); _CASE(STATUS_FLOPPY_WRONG_CYLINDER); _CASE(STATUS_FOUND_OUT_OF_SCOPE); - _CASE(STATUS_FREE_VM_NOT_AT_BASE); + _CASE(xbox::status_free_vm_not_at_base); _CASE(STATUS_FS_DRIVER_REQUIRED); _CASE(STATUS_FT_MISSING_MEMBER); _CASE(STATUS_FT_ORPHANING); @@ -1491,7 +1491,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_INSTRUCTION_MISALIGNMENT); _CASE(STATUS_INSUFFICIENT_LOGON_INFO); _CASE(STATUS_INSUFFICIENT_POWER); - _CASE(STATUS_INSUFFICIENT_RESOURCES); + _CASE(xbox::status_insufficient_resources); _CASE(STATUS_INSUFF_SERVER_RESOURCES); _CASE(STATUS_INTEGER_DIVIDE_BY_ZERO); _CASE(STATUS_INTEGER_OVERFLOW); @@ -1520,7 +1520,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_INVALID_HANDLE); _CASE(STATUS_INVALID_HW_PROFILE); _CASE(STATUS_INVALID_ID_AUTHORITY); - _CASE(STATUS_INVALID_IMAGE_FORMAT); + _CASE(xbox::status_invalid_image_format); _CASE(STATUS_INVALID_IMAGE_LE_FORMAT); _CASE(STATUS_INVALID_IMAGE_NE_FORMAT); _CASE(STATUS_INVALID_IMAGE_NOT_MZ); @@ -1538,13 +1538,13 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_INVALID_NETWORK_RESPONSE); _CASE(STATUS_INVALID_OPLOCK_PROTOCOL); _CASE(STATUS_INVALID_OWNER); - _CASE(STATUS_INVALID_PAGE_PROTECTION); + _CASE(xbox::status_invalid_page_protection); _CASE(STATUS_INVALID_PARAMETER); _CASE(STATUS_INVALID_PARAMETER_1); _CASE(STATUS_INVALID_PARAMETER_10); _CASE(STATUS_INVALID_PARAMETER_11); _CASE(STATUS_INVALID_PARAMETER_12); - _CASE(STATUS_INVALID_PARAMETER_2); + _CASE(xbox::status_invalid_parameter_2); _CASE(STATUS_INVALID_PARAMETER_3); _CASE(STATUS_INVALID_PARAMETER_4); _CASE(STATUS_INVALID_PARAMETER_5); @@ -1622,14 +1622,14 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_MEMBER_IN_GROUP); _CASE(STATUS_MEMBER_NOT_IN_ALIAS); _CASE(STATUS_MEMBER_NOT_IN_GROUP); - _CASE(STATUS_MEMORY_NOT_ALLOCATED); + _CASE(xbox::status_memory_not_allocated); _CASE(STATUS_MESSAGE_NOT_FOUND); _CASE(STATUS_MISSING_SYSTEMFILE); _CASE(STATUS_MORE_ENTRIES); _CASE(STATUS_MORE_PROCESSING_REQUIRED); _CASE(STATUS_MP_PROCESSOR_MISMATCH); _CASE(STATUS_MULTIPLE_FAULT_VIOLATION); - _CASE(STATUS_MUTANT_LIMIT_EXCEEDED); + _CASE(xbox::status_mutant_limit_exceeded); _CASE(STATUS_MUTANT_NOT_OWNED); _CASE(STATUS_MUTUAL_AUTHENTICATION_FAILED); _CASE(STATUS_NAME_TOO_LONG); @@ -1654,7 +1654,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_NOT_A_DIRECTORY); _CASE(STATUS_NOT_A_REPARSE_POINT); _CASE(STATUS_NOT_CLIENT_SESSION); - _CASE(STATUS_NOT_COMMITTED); + _CASE(xbox::status_not_committed); _CASE(STATUS_NOT_EXPORT_FORMAT); _CASE(STATUS_NOT_FOUND); _CASE(STATUS_NOT_IMPLEMENTED); @@ -1683,7 +1683,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_NO_MATCH); _CASE(STATUS_NO_MEDIA); _CASE(STATUS_NO_MEDIA_IN_DEVICE); - _CASE(STATUS_NO_MEMORY); + _CASE(xbox::status_no_memory); _CASE(STATUS_NO_MORE_EAS); _CASE(STATUS_NO_MORE_ENTRIES); _CASE(STATUS_NO_MORE_FILES); @@ -1713,10 +1713,10 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_NT_CROSS_ENCRYPTION_REQUIRED); _CASE(STATUS_NULL_LM_PASSWORD); _CASE(STATUS_OBJECTID_EXISTS); - _CASE(STATUS_OBJECT_NAME_COLLISION); + _CASE(xbox::status_object_name_collision); _CASE(STATUS_OBJECT_NAME_EXISTS); _CASE(STATUS_OBJECT_NAME_INVALID); - _CASE(STATUS_OBJECT_NAME_NOT_FOUND); + _CASE(xbox::status_object_name_not_found); _CASE(STATUS_OBJECT_PATH_INVALID); _CASE(STATUS_OBJECT_PATH_NOT_FOUND); _CASE(STATUS_OBJECT_PATH_SYNTAX_BAD); @@ -1741,7 +1741,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_PASSWORD_MUST_CHANGE); _CASE(STATUS_PASSWORD_RESTRICTION); _CASE(STATUS_PATH_NOT_COVERED); - _CASE(STATUS_PENDING); + _CASE(xbox::status_pending); _CASE(STATUS_PIPE_BROKEN); _CASE(STATUS_PIPE_BUSY); _CASE(STATUS_PIPE_CLOSING); @@ -1836,7 +1836,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_SECTION_PROTECTION); _CASE(STATUS_SECTION_TOO_BIG); _CASE(STATUS_SEGMENT_NOTIFICATION); - _CASE(STATUS_SEMAPHORE_LIMIT_EXCEEDED); + _CASE(xbox::status_semaphore_limit_exceeded); _CASE(STATUS_SERIAL_COUNTER_TIMEOUT); _CASE(STATUS_SERIAL_MORE_WRITES); _CASE(STATUS_SERIAL_NO_DEVICE_INITED); @@ -1858,7 +1858,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_SPECIAL_USER); _CASE(STATUS_STACK_OVERFLOW); _CASE(STATUS_STACK_OVERFLOW_READ); - _CASE(STATUS_SUCCESS); + _CASE(xbox::status_success); _CASE(STATUS_SUSPEND_COUNT_EXCEEDED); _CASE(STATUS_SYNCHRONIZATION_REQUIRED); _CASE(STATUS_SYSTEM_IMAGE_BAD_SIGNATURE); @@ -1869,7 +1869,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_TIMEOUT); _CASE(STATUS_TIMER_NOT_CANCELED); _CASE(STATUS_TIMER_RESOLUTION_NOT_SET); - _CASE(STATUS_TIMER_RESUME_IGNORED); + _CASE(xbox::status_timer_resume_ignored); _CASE(STATUS_TIME_DIFFERENCE_AT_DC); _CASE(STATUS_TOKEN_ALREADY_IN_USE); _CASE(STATUS_TOO_LATE); @@ -1883,7 +1883,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_TOO_MANY_NODES); _CASE(STATUS_TOO_MANY_OPENED_FILES); _CASE(STATUS_TOO_MANY_PAGING_FILES); - _CASE(STATUS_TOO_MANY_SECRETS); + _CASE(xbox::status_too_many_secrets); _CASE(STATUS_TOO_MANY_SESSIONS); _CASE(STATUS_TOO_MANY_SIDS); _CASE(STATUS_TOO_MANY_THREADS); @@ -1901,7 +1901,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_TRUST_FAILURE); _CASE(STATUS_UNABLE_TO_DECOMMIT_VM); _CASE(STATUS_UNABLE_TO_DELETE_SECTION); - _CASE(STATUS_UNABLE_TO_FREE_VM); + _CASE(xbox::status_unable_to_free_vm); _CASE(STATUS_UNABLE_TO_LOCK_MEDIA); _CASE(STATUS_UNABLE_TO_UNLOAD_MEDIA); _CASE(STATUS_UNDEFINED_CHARACTER); @@ -1913,12 +1913,12 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_UNHANDLED_EXCEPTION); _CASE(STATUS_UNKNOWN_REVISION); _CASE(STATUS_UNMAPPABLE_CHARACTER); - _CASE(STATUS_UNRECOGNIZED_MEDIA); + _CASE(xbox::status_unrecognized_media); _CASE(STATUS_UNRECOGNIZED_VOLUME); - _CASE(STATUS_UNSUCCESSFUL); + _CASE(xbox::status_unsuccessful); _CASE(STATUS_UNSUPPORTED_COMPRESSION); _CASE(STATUS_UNWIND); - _CASE(STATUS_USER_APC); + _CASE(xbox::status_user_apc); _CASE(STATUS_USER_EXISTS); _CASE(STATUS_USER_MAPPED_FILE); _CASE(STATUS_USER_SESSION_DELETED); diff --git a/src/core/kernel/support/EmuFile.h b/src/core/kernel/support/EmuFile.h index a81afc556..2f351f399 100644 --- a/src/core/kernel/support/EmuFile.h +++ b/src/core/kernel/support/EmuFile.h @@ -25,7 +25,7 @@ #define EMUFILE_H -#include +#include #include #include #include diff --git a/src/core/kernel/support/EmuNtDll.h b/src/core/kernel/support/EmuNtDll.h index 252a3441f..6b6ec3b29 100644 --- a/src/core/kernel/support/EmuNtDll.h +++ b/src/core/kernel/support/EmuNtDll.h @@ -104,8 +104,6 @@ typedef long NTSTATUS; typedef __int64 LONGLONG; typedef unsigned __int64 ULONGLONG; -#define NT_SUCCESS(Status) ((NTSTATUS) (Status) >= 0) - #define DIRECTORY_QUERY 1 #define DIRECTORY_TRAVERSE 2 #define DIRECTORY_CREATE_OBJECT 4 diff --git a/src/devices/EmuNVNet.cpp b/src/devices/EmuNVNet.cpp index dae3a6d0f..33552a451 100644 --- a/src/devices/EmuNVNet.cpp +++ b/src/devices/EmuNVNet.cpp @@ -33,7 +33,7 @@ #define LOG_PREFIX CXBXR_MODULE::NET -#include // For PKINTERRUPT, etc. +#include // For PKINTERRUPT, etc. #include #include "core\kernel\init\CxbxKrnl.h" #include "core\kernel\support\Emu.h" @@ -157,7 +157,7 @@ struct RingDesc { uint16_t flags; }; -char* EmuNVNet_GetRegisterName(xbox::addr addr) +char* EmuNVNet_GetRegisterName(xbox::addr_xt addr) { switch (addr) { case NvRegIrqStatus: return "NvRegIrqStatus"; @@ -218,7 +218,7 @@ char* EmuNVNet_GetMiiRegisterName(uint8_t reg) } } -uint32_t EmuNVNet_GetRegister(xbox::addr addr, unsigned int size) +uint32_t EmuNVNet_GetRegister(xbox::addr_xt addr, unsigned int size) { switch (size) { case sizeof(uint32_t) : @@ -232,7 +232,7 @@ uint32_t EmuNVNet_GetRegister(xbox::addr addr, unsigned int size) return 0; } -void EmuNVNet_SetRegister(xbox::addr addr, uint32_t value, unsigned int size) +void EmuNVNet_SetRegister(xbox::addr_xt addr, uint32_t value, unsigned int size) { switch (size) { case sizeof(uint32_t): @@ -299,7 +299,7 @@ int EmuNVNet_MiiReadWrite(uint64_t val) return retval; } -uint32_t EmuNVNet_Read(xbox::addr addr, int size) +uint32_t EmuNVNet_Read(xbox::addr_xt addr, int size) { EmuLog(LOG_LEVEL::DEBUG, "Read%d: %s (0x%.8X)", size * 8, EmuNVNet_GetRegisterName(addr), addr); @@ -326,7 +326,7 @@ void EmuNVNet_DMAPacketFromGuest() for (int i = 0; i < s->tx_ring_size; i++) { /* Read ring descriptor */ s->tx_ring_index %= s->tx_ring_size; - xbox::addr tx_ring_addr = EmuNVNet_GetRegister(NvRegTxRingPhysAddr, 4); + xbox::addr_xt tx_ring_addr = EmuNVNet_GetRegister(NvRegTxRingPhysAddr, 4); tx_ring_addr += s->tx_ring_index * sizeof(desc); memcpy(&desc, (void*)(tx_ring_addr | CONTIGUOUS_MEMORY_BASE), sizeof(desc)); @@ -381,7 +381,7 @@ bool EmuNVNet_DMAPacketToGuest(void* packet, size_t size) for (int i = 0; i < s->rx_ring_size; i++) { /* Read current ring descriptor */ s->rx_ring_index %= s->rx_ring_size; - xbox::addr rx_ring_addr = EmuNVNet_GetRegister(NvRegRxRingPhysAddr, 4); + xbox::addr_xt rx_ring_addr = EmuNVNet_GetRegister(NvRegRxRingPhysAddr, 4); rx_ring_addr += s->rx_ring_index * sizeof(desc); memcpy(&desc, (void*)(rx_ring_addr | CONTIGUOUS_MEMORY_BASE), sizeof(desc)); @@ -423,7 +423,7 @@ bool EmuNVNet_DMAPacketToGuest(void* packet, size_t size) return false; } -void EmuNVNet_Write(xbox::addr addr, uint32_t value, int size) +void EmuNVNet_Write(xbox::addr_xt addr, uint32_t value, int size) { switch (addr) { case NvRegRingSizes: diff --git a/src/devices/SMCDevice.cpp b/src/devices/SMCDevice.cpp index 583f937f4..f4ff7b169 100644 --- a/src/devices/SMCDevice.cpp +++ b/src/devices/SMCDevice.cpp @@ -28,7 +28,7 @@ #define LOG_PREFIX CXBXR_MODULE::SMC -#include // For xbox.h:AV_PACK_HDTV +#include // For xbox.h:AV_PACK_HDTV #include "core\kernel\init\CxbxKrnl.h" #include "EmuShared.h" diff --git a/src/devices/usb/Hub.cpp b/src/devices/usb/Hub.cpp index 0b005c5b3..3cf90ff30 100644 --- a/src/devices/usb/Hub.cpp +++ b/src/devices/usb/Hub.cpp @@ -56,7 +56,7 @@ #define LOG_PREFIX CXBXR_MODULE::HUB -#include // For PKINTERRUPT, etc. +#include // For PKINTERRUPT, etc. #include // For memcpy #include "OHCI.h" #include "Hub.h" diff --git a/src/devices/usb/OHCI.cpp b/src/devices/usb/OHCI.cpp index 2262c9dfd..a4bde325f 100644 --- a/src/devices/usb/OHCI.cpp +++ b/src/devices/usb/OHCI.cpp @@ -52,7 +52,7 @@ #define LOG_PREFIX CXBXR_MODULE::OHCI -#include +#include #include "OHCI.h" #include "core\kernel\exports\EmuKrnl.h" // For HalSystemInterrupt #include "common\util\CxbxUtil.h" @@ -380,46 +380,46 @@ void OHCI::OHCI_FatalError() EmuLog(LOG_LEVEL::ERROR2, "An unrecoverable error has occoured!\n"); } -bool OHCI::OHCI_ReadHCCA(xbox::addr Paddr, OHCI_HCCA* Hcca) +bool OHCI::OHCI_ReadHCCA(xbox::addr_xt Paddr, OHCI_HCCA* Hcca) { return Memory_R(reinterpret_cast(Paddr), Hcca, sizeof(OHCI_HCCA)); } -bool OHCI::OHCI_WriteHCCA(xbox::addr Paddr, OHCI_HCCA* Hcca) +bool OHCI::OHCI_WriteHCCA(xbox::addr_xt Paddr, OHCI_HCCA* Hcca) { // We need to calculate the offset of the HccaFrameNumber member to avoid overwriting HccaInterrruptTable size_t OffsetOfFrameNumber = offsetof(OHCI_HCCA, HccaFrameNumber); return Memory_W(reinterpret_cast(Paddr + OffsetOfFrameNumber), reinterpret_cast(Hcca) + OffsetOfFrameNumber, 8); } -bool OHCI::OHCI_ReadED(xbox::addr Paddr, OHCI_ED* Ed) +bool OHCI::OHCI_ReadED(xbox::addr_xt Paddr, OHCI_ED* Ed) { return GetDwords(Paddr, reinterpret_cast(Ed), sizeof(*Ed) >> 2); // ED is 16 bytes large } -bool OHCI::OHCI_WriteED(xbox::addr Paddr, OHCI_ED* Ed) +bool OHCI::OHCI_WriteED(xbox::addr_xt Paddr, OHCI_ED* Ed) { // According to the standard, only the HeadP field is writable by the HC, so we'll write just that size_t OffsetOfHeadP = offsetof(OHCI_ED, HeadP); return WriteDwords(Paddr + OffsetOfHeadP, reinterpret_cast(reinterpret_cast(Ed) + OffsetOfHeadP), 1); } -bool OHCI::OHCI_ReadTD(xbox::addr Paddr, OHCI_TD* Td) +bool OHCI::OHCI_ReadTD(xbox::addr_xt Paddr, OHCI_TD* Td) { return GetDwords(Paddr, reinterpret_cast(Td), sizeof(*Td) >> 2); // TD is 16 bytes large } -bool OHCI::OHCI_WriteTD(xbox::addr Paddr, OHCI_TD* Td) +bool OHCI::OHCI_WriteTD(xbox::addr_xt Paddr, OHCI_TD* Td) { return WriteDwords(Paddr, reinterpret_cast(Td), sizeof(*Td) >> 2); } -bool OHCI::OHCI_ReadIsoTD(xbox::addr Paddr, OHCI_ISO_TD* td) +bool OHCI::OHCI_ReadIsoTD(xbox::addr_xt Paddr, OHCI_ISO_TD* td) { return GetDwords(Paddr, reinterpret_cast(td), 4) || GetWords(Paddr + 16, td->Offset, 8); } -bool OHCI::OHCI_WriteIsoTD(xbox::addr Paddr, OHCI_ISO_TD* td) +bool OHCI::OHCI_WriteIsoTD(xbox::addr_xt Paddr, OHCI_ISO_TD* td) { return WriteDwords(Paddr, reinterpret_cast(td), 4) || WriteWords(Paddr + 16, td->Offset, 8); } @@ -480,11 +480,11 @@ bool OHCI::OHCI_CopyIsoTDBuffer(uint32_t start_addr, uint32_t end_addr, uint8_t* return false; } -int OHCI::OHCI_ServiceEDlist(xbox::addr Head, int Completion) +int OHCI::OHCI_ServiceEDlist(xbox::addr_xt Head, int Completion) { OHCI_ED ed; - xbox::addr next_ed; - xbox::addr current; + xbox::addr_xt next_ed; + xbox::addr_xt current; int active; active = 0; @@ -507,7 +507,7 @@ int OHCI::OHCI_ServiceEDlist(xbox::addr Head, int Completion) if ((ed.HeadP & OHCI_ED_H) || (ed.Flags & OHCI_ED_K)) { // halted or skip // Cancel pending packets for ED that have been paused - xbox::addr addr = ed.HeadP & OHCI_DPTR_MASK; + xbox::addr_xt addr = ed.HeadP & OHCI_DPTR_MASK; if (m_AsyncTD && addr == m_AsyncTD) { m_UsbDevice->USB_CancelPacket(&m_UsbPacket); m_AsyncTD = xbox::zero; @@ -566,7 +566,7 @@ int OHCI::OHCI_ServiceTD(OHCI_ED* Ed) XboxDeviceState* dev; USBEndpoint* ep; OHCI_TD td; - xbox::addr addr; + xbox::addr_xt addr; int flag_r; int completion; @@ -951,7 +951,7 @@ void OHCI::OHCI_PacketInit(USBPacket* packet) vec->Size = 0; } -uint32_t OHCI::OHCI_ReadRegister(xbox::addr Addr) +uint32_t OHCI::OHCI_ReadRegister(xbox::addr_xt Addr) { uint32_t ret = 0xFFFFFFFF; @@ -1092,7 +1092,7 @@ uint32_t OHCI::OHCI_ReadRegister(xbox::addr Addr) } } -void OHCI::OHCI_WriteRegister(xbox::addr Addr, uint32_t Value) +void OHCI::OHCI_WriteRegister(xbox::addr_xt Addr, uint32_t Value) { if (Addr & 3) { // The standard allows only aligned writes to the registers diff --git a/src/devices/usb/OHCI.h b/src/devices/usb/OHCI.h index 889b7117f..92119ba0f 100644 --- a/src/devices/usb/OHCI.h +++ b/src/devices/usb/OHCI.h @@ -142,9 +142,9 @@ class OHCI // destructor ~OHCI() {} // read a register - uint32_t OHCI_ReadRegister(xbox::addr Addr); + uint32_t OHCI_ReadRegister(xbox::addr_xt Addr); // write a register - void OHCI_WriteRegister(xbox::addr Addr, uint32_t Value); + void OHCI_WriteRegister(xbox::addr_xt Addr, uint32_t Value); private: @@ -169,7 +169,7 @@ class OHCI // Done Queue Interrupt Counter int m_DoneCount; // the address of the pending TD - xbox::addr m_AsyncTD = xbox::zero; + xbox::addr_xt m_AsyncTD = xbox::zero; // indicates if there is a pending asynchronous packet to process int m_AsyncComplete = 0; @@ -209,27 +209,27 @@ class OHCI // if not set ConnectStatusChange flag; if flag is enabled return 1 int OHCI_PortSetIfConnected(int i, uint32_t Value); // read the HCCA structure in memory - bool OHCI_ReadHCCA(xbox::addr Paddr, OHCI_HCCA* Hcca); + bool OHCI_ReadHCCA(xbox::addr_xt Paddr, OHCI_HCCA* Hcca); // write the HCCA structure in memory - bool OHCI_WriteHCCA(xbox::addr Paddr, OHCI_HCCA* Hcca); + bool OHCI_WriteHCCA(xbox::addr_xt Paddr, OHCI_HCCA* Hcca); // read an ED in memory - bool OHCI_ReadED(xbox::addr Paddr, OHCI_ED* Ed); + bool OHCI_ReadED(xbox::addr_xt Paddr, OHCI_ED* Ed); // write an ED in memory - bool OHCI_WriteED(xbox::addr Paddr, OHCI_ED* Ed); + bool OHCI_WriteED(xbox::addr_xt Paddr, OHCI_ED* Ed); // read an TD in memory - bool OHCI_ReadTD(xbox::addr Paddr, OHCI_TD* Td); + bool OHCI_ReadTD(xbox::addr_xt Paddr, OHCI_TD* Td); // write a TD in memory - bool OHCI_WriteTD(xbox::addr Paddr, OHCI_TD* Td); + bool OHCI_WriteTD(xbox::addr_xt Paddr, OHCI_TD* Td); // read an iso TD in memory - bool OHCI_ReadIsoTD(xbox::addr Paddr, OHCI_ISO_TD* td); + bool OHCI_ReadIsoTD(xbox::addr_xt Paddr, OHCI_ISO_TD* td); // write an iso TD in memory - bool OHCI_WriteIsoTD(xbox::addr Paddr, OHCI_ISO_TD* td); + bool OHCI_WriteIsoTD(xbox::addr_xt Paddr, OHCI_ISO_TD* td); // read/write the user buffer pointed to by a TD from/to main memory bool OHCI_CopyTDBuffer(OHCI_TD* Td, uint8_t* Buffer, int Length, bool bIsWrite); // read/write the user buffer pointed to by a ISO TD from/to main memory bool OHCI_CopyIsoTDBuffer(uint32_t start_addr, uint32_t end_addr, uint8_t* Buffer, int Length, bool bIsWrite); // process an ED list. Returns nonzero if active TD was found - int OHCI_ServiceEDlist(xbox::addr Head, int Completion); + int OHCI_ServiceEDlist(xbox::addr_xt Head, int Completion); // process a TD. Returns nonzero to terminate processing of this endpoint int OHCI_ServiceTD(OHCI_ED* Ed); // process an isochronous TD diff --git a/src/devices/usb/USBDevice.cpp b/src/devices/usb/USBDevice.cpp index 26ed2fdbb..bf3b99b5c 100644 --- a/src/devices/usb/USBDevice.cpp +++ b/src/devices/usb/USBDevice.cpp @@ -58,7 +58,7 @@ #define LOG_PREFIX CXBXR_MODULE::USB -#include // For PKINTERRUPT, etc. +#include // For PKINTERRUPT, etc. #include #include "USBDevice.h" #include "OHCI.h" diff --git a/src/devices/usb/XidGamepad.cpp b/src/devices/usb/XidGamepad.cpp index d31e7e045..63d5b1331 100644 --- a/src/devices/usb/XidGamepad.cpp +++ b/src/devices/usb/XidGamepad.cpp @@ -53,7 +53,7 @@ #define LOG_PREFIX CXBXR_MODULE::XIDCTRL -#include // For PKINTERRUPT, etc. +#include // For PKINTERRUPT, etc. #include #include "XidGamepad.h" #include "USBDevice.h" diff --git a/src/devices/video/EmuNV2A_DEBUG.cpp b/src/devices/video/EmuNV2A_DEBUG.cpp index fa0e21500..221ba1335 100644 --- a/src/devices/video/EmuNV2A_DEBUG.cpp +++ b/src/devices/video/EmuNV2A_DEBUG.cpp @@ -34,7 +34,7 @@ // ****************************************************************** #define DEBUG_START(DEV) \ -const char *DebugNV_##DEV(xbox::addr addr) \ +const char *DebugNV_##DEV(xbox::addr_xt addr) \ { \ switch (addr) { #define DEBUG_CASE(a) \ diff --git a/src/devices/video/EmuNV2A_PFIFO.cpp b/src/devices/video/EmuNV2A_PFIFO.cpp index 15a6c8ec9..22ac06f3f 100644 --- a/src/devices/video/EmuNV2A_PFIFO.cpp +++ b/src/devices/video/EmuNV2A_PFIFO.cpp @@ -35,7 +35,7 @@ typedef struct RAMHTEntry { uint32_t handle; - xbox::addr instance; + xbox::addr_xt instance; enum FIFOEngine engine; unsigned int channel_id : 5; bool valid; @@ -499,7 +499,7 @@ static RAMHTEntry ramht_lookup(NV2AState *d, uint32_t handle) uint32_t hash = ramht_hash(d, handle); assert(hash * 8 < ramht_size(d)); - xbox::addr ramht_address = + xbox::addr_xt ramht_address = GET_MASK(d->pfifo.regs[NV_PFIFO_RAMHT], NV_PFIFO_RAMHT_BASE_ADDRESS_MASK) << 12; diff --git a/src/devices/video/EmuNV2A_PGRAPH.cpp b/src/devices/video/EmuNV2A_PGRAPH.cpp index 53925b039..2402b8c62 100644 --- a/src/devices/video/EmuNV2A_PGRAPH.cpp +++ b/src/devices/video/EmuNV2A_PGRAPH.cpp @@ -489,7 +489,7 @@ DEVICE_WRITE32(PGRAPH) } break; case NV_PGRAPH_CHANNEL_CTX_TRIGGER: { - xbox::addr context_address = + xbox::addr_xt context_address = GET_MASK(d->pgraph.regs[NV_PGRAPH_CHANNEL_CTX_POINTER], NV_PGRAPH_CHANNEL_CTX_POINTER_INST) << 4; if (value & NV_PGRAPH_CHANNEL_CTX_TRIGGER_READ_IN) { @@ -1192,7 +1192,7 @@ void pgraph_handle_method(NV2AState *d, break; } - xbox::addr source_dma_len, dest_dma_len; + xbox::addr_xt source_dma_len, dest_dma_len; uint8_t *source, *dest; source = (uint8_t*)nv_dma_map(d, context_surfaces->dma_image_source, @@ -2653,7 +2653,7 @@ void pgraph_handle_method(NV2AState *d, uint32_t semaphore_offset = pg->regs[NV_PGRAPH_SEMAPHOREOFFSET]; - xbox::addr semaphore_dma_len; + xbox::addr_xt semaphore_dma_len; uint8_t *semaphore_data = (uint8_t*)nv_dma_map(d, pg->dma_semaphore, &semaphore_dma_len); assert(semaphore_offset < semaphore_dma_len); diff --git a/src/devices/video/nv2a.cpp b/src/devices/video/nv2a.cpp index d7b45bd21..ddc8cef06 100644 --- a/src/devices/video/nv2a.cpp +++ b/src/devices/video/nv2a.cpp @@ -38,7 +38,7 @@ #define LOG_PREFIX CXBXR_MODULE::NV2A -#include // For PKINTERRUPT, etc. +#include // For PKINTERRUPT, etc. #ifdef _MSC_VER // Check if MS Visual C compiler # pragma comment(lib, "opengl32.lib") // Compiler-specific directive to avoid manually configuration @@ -161,12 +161,12 @@ static void update_irq(NV2AState *d) #define DEBUG_WRITE32(DEV) EmuLog(LOG_LEVEL::DEBUG, "Wr32 NV2A " #DEV "(0x%08X, 0x%08X) [Handled %s]", addr, value, DebugNV_##DEV(addr)) #define DEBUG_WRITE32_UNHANDLED(DEV) { EmuLog(LOG_LEVEL::DEBUG, "Wr32 NV2A " #DEV "(0x%08X, 0x%08X) [Unhandled %s]", addr, value, DebugNV_##DEV(addr)); return; } -#define DEVICE_READ32(DEV) uint32_t EmuNV2A_##DEV##_Read32(NV2AState *d, xbox::addr addr) +#define DEVICE_READ32(DEV) uint32_t EmuNV2A_##DEV##_Read32(NV2AState *d, xbox::addr_xt addr) #define DEVICE_READ32_SWITCH() uint32_t result = 0; switch (addr) #define DEVICE_READ32_REG(dev) result = d->dev.regs[addr] #define DEVICE_READ32_END(DEV) DEBUG_READ32(DEV); return result -#define DEVICE_WRITE32(DEV) void EmuNV2A_##DEV##_Write32(NV2AState *d, xbox::addr addr, uint32_t value) +#define DEVICE_WRITE32(DEV) void EmuNV2A_##DEV##_Write32(NV2AState *d, xbox::addr_xt addr, uint32_t value) #define DEVICE_WRITE32_REG(dev) d->dev.regs[addr] = value #define DEVICE_WRITE32_END(DEV) DEBUG_WRITE32(DEV) @@ -185,7 +185,7 @@ static inline void stl_le_p(uint32_t *p, uint32_t v) *p = v; } -static DMAObject nv_dma_load(NV2AState *d, xbox::addr dma_obj_address) +static DMAObject nv_dma_load(NV2AState *d, xbox::addr_xt dma_obj_address) { assert(dma_obj_address < d->pramin.ramin_size); @@ -203,7 +203,7 @@ static DMAObject nv_dma_load(NV2AState *d, xbox::addr dma_obj_address) return object; } -static void *nv_dma_map(NV2AState *d, xbox::addr dma_obj_address, xbox::addr *len) +static void *nv_dma_map(NV2AState *d, xbox::addr_xt dma_obj_address, xbox::addr_xt *len) { // assert(dma_obj_address < d->pramin.ramin_size); @@ -299,7 +299,7 @@ const NV2ABlockInfo regions[] = { // blocktable #undef ENTRY }; -const NV2ABlockInfo* EmuNV2A_Block(xbox::addr addr) +const NV2ABlockInfo* EmuNV2A_Block(xbox::addr_xt addr) { // Find the block in the block table const NV2ABlockInfo* block = ®ions[0]; @@ -1288,7 +1288,7 @@ void NV2ADevice::BlockWrite(const NV2ABlockInfo* block, uint32_t addr, uint32_t switch (size) { case sizeof(uint8_t) : { #if 0 - xbox::addr aligned_addr; + xbox::addr_xt aligned_addr; uint32_t aligned_value; int shift; uint32_t mask; @@ -1306,7 +1306,7 @@ void NV2ADevice::BlockWrite(const NV2ABlockInfo* block, uint32_t addr, uint32_t case sizeof(uint16_t) : { assert((addr & 1) == 0); // TODO : What if this fails? - xbox::addr aligned_addr; + xbox::addr_xt aligned_addr; uint32_t aligned_value; int shift; uint32_t mask; diff --git a/src/devices/video/nv2a.h b/src/devices/video/nv2a.h index d2972b069..fb774c3c3 100644 --- a/src/devices/video/nv2a.h +++ b/src/devices/video/nv2a.h @@ -79,7 +79,7 @@ typedef struct NV2ABlockInfo { MemoryRegionOps ops; } NV2ABlockInfo; -const NV2ABlockInfo* EmuNV2A_Block(xbox::addr addr); +const NV2ABlockInfo* EmuNV2A_Block(xbox::addr_xt addr); void CxbxReserveNV2AMemory(NV2AState *d); diff --git a/src/devices/video/nv2a_int.h b/src/devices/video/nv2a_int.h index 3d03d87e2..22630b146 100644 --- a/src/devices/video/nv2a_int.h +++ b/src/devices/video/nv2a_int.h @@ -29,7 +29,7 @@ #include #include -#include "xbox_types.h" // For xbox::addr +#include "xbox_types.h" // For xbox::addr_xt #include "qemu-thread.h" // For qemu_mutex, etc @@ -45,7 +45,7 @@ #include "nv2a_regs.h" // For NV2A_MAX_TEXTURES, etc -typedef xbox::addr hwaddr; // Compatibility; Cxbx uses xbox::addr, xqemu and OpenXbox use hwaddr +typedef xbox::addr_xt hwaddr; // Compatibility; Cxbx uses xbox::addr_xt, xqemu and OpenXbox use hwaddr typedef uint32_t value_t; // Compatibility; Cxbx values are uint32_t (xqemu and OpenXbox use uint64_t) #define NV_PMC_SIZE 0x001000 @@ -127,13 +127,13 @@ enum FIFOEngine { typedef struct DMAObject { unsigned int dma_class; unsigned int dma_target; - xbox::addr address; - xbox::addr limit; + xbox::addr_xt address; + xbox::addr_xt limit; } DMAObject; typedef struct VertexAttribute { bool dma_select; - xbox::addr offset; + xbox::addr_xt offset; /* inline arrays are packed in order? * Need to pass the offset to converted attributes */ @@ -168,7 +168,7 @@ typedef struct Surface { bool write_enabled_cache; unsigned int pitch; - xbox::addr offset; + xbox::addr_xt offset; } Surface; typedef struct SurfaceShape { @@ -206,21 +206,21 @@ typedef struct TextureBinding { } TextureBinding; typedef struct KelvinState { - xbox::addr object_instance; + xbox::addr_xt object_instance; } KelvinState; typedef struct ContextSurfaces2DState { - xbox::addr object_instance; - xbox::addr dma_image_source; - xbox::addr dma_image_dest; + xbox::addr_xt object_instance; + xbox::addr_xt dma_image_source; + xbox::addr_xt dma_image_dest; unsigned int color_format; unsigned int source_pitch, dest_pitch; - xbox::addr source_offset, dest_offset; + xbox::addr_xt source_offset, dest_offset; } ContextSurfaces2DState; typedef struct ImageBlitState { - xbox::addr object_instance; - xbox::addr context_surfaces; + xbox::addr_xt object_instance; + xbox::addr_xt context_surfaces; unsigned int operation; unsigned int in_x, in_y; unsigned int out_x, out_y; @@ -243,13 +243,13 @@ typedef struct PGRAPHState { QemuCond fifo_access_cond; QemuCond flip_3d; - xbox::addr dma_color, dma_zeta; + xbox::addr_xt dma_color, dma_zeta; Surface surface_color, surface_zeta; unsigned int surface_type; SurfaceShape surface_shape; SurfaceShape last_surface_shape; - xbox::addr dma_a, dma_b; + xbox::addr_xt dma_a, dma_b; #ifdef USE_TEXTURE_CACHE GLruCache *texture_cache; #endif @@ -270,18 +270,18 @@ typedef struct PGRAPHState { GLuint gl_framebuffer; GLuint gl_color_buffer, gl_zeta_buffer; - xbox::addr dma_state; - xbox::addr dma_notifies; - xbox::addr dma_semaphore; + xbox::addr_xt dma_state; + xbox::addr_xt dma_notifies; + xbox::addr_xt dma_semaphore; - xbox::addr dma_report; - xbox::addr report_offset; + xbox::addr_xt dma_report; + xbox::addr_xt report_offset; bool zpass_pixel_count_enable; unsigned int zpass_pixel_count_result; unsigned int gl_zpass_pixel_count_query_count; GLuint* gl_zpass_pixel_count_queries; - xbox::addr dma_vertex_a, dma_vertex_b; + xbox::addr_xt dma_vertex_a, dma_vertex_b; unsigned int primitive_mode; @@ -459,7 +459,7 @@ typedef struct { DWORD Ignored[0x10]; PPUSH Put; // On Xbox1, this field is only written to by the CPU (the GPU uses this as a trigger to start executing from the given address) PPUSH Get; // On Xbox1, this field is only read from by the CPU (the GPU reflects in here where it is/stopped executing) - PPUSH Reference; // TODO : xbox::addr / void* / DWORD ? + PPUSH Reference; // TODO : xbox::addr_xt / void* / DWORD ? DWORD Ignored2[0x7ED]; } Nv2AControlDma; #endif diff --git a/src/devices/x86/EmuX86.cpp b/src/devices/x86/EmuX86.cpp index 29ca5861f..0514d5132 100644 --- a/src/devices/x86/EmuX86.cpp +++ b/src/devices/x86/EmuX86.cpp @@ -59,7 +59,7 @@ static int field_pin = 0; static thread_local bool g_tls_isEmuX86Managed; -uint32_t EmuX86_IORead(xbox::addr addr, int size) +uint32_t EmuX86_IORead(xbox::addr_xt addr, int size) { switch (addr) { case 0x8008: { // TODO : Move 0x8008 TIMER to a device @@ -93,7 +93,7 @@ uint32_t EmuX86_IORead(xbox::addr addr, int size) return 0; } -void EmuX86_IOWrite(xbox::addr addr, uint32_t value, int size) +void EmuX86_IOWrite(xbox::addr_xt addr, uint32_t value, int size) { // Pass the IO Write to the PCI Bus, this will handle devices with BARs set to IO addresses if (g_PCIBus->IOWrite(addr, value, size)) { @@ -110,7 +110,7 @@ void EmuX86_IOWrite(xbox::addr addr, uint32_t value, int size) // to prevent recursive exceptions when accessing unallocated memory. // -uint32_t EmuX86_Mem_Read(xbox::addr addr, int size) +uint32_t EmuX86_Mem_Read(xbox::addr_xt addr, int size) { switch (size) { case sizeof(uint32_t) : @@ -126,7 +126,7 @@ uint32_t EmuX86_Mem_Read(xbox::addr addr, int size) } } -void EmuX86_Mem_Write(xbox::addr addr, uint32_t value, int size) +void EmuX86_Mem_Write(xbox::addr_xt addr, uint32_t value, int size) { switch (size) { case sizeof(uint32_t) : @@ -145,7 +145,7 @@ void EmuX86_Mem_Write(xbox::addr addr, uint32_t value, int size) } } -uint32_t EmuFlash_Read32(xbox::addr addr) // TODO : Move to EmuFlash.cpp +uint32_t EmuFlash_Read32(xbox::addr_xt addr) // TODO : Move to EmuFlash.cpp { uint32_t r; @@ -166,7 +166,7 @@ uint32_t EmuFlash_Read32(xbox::addr addr) // TODO : Move to EmuFlash.cpp // Read & write handlers for memory-mapped hardware devices // -uint32_t EmuX86_Read(xbox::addr addr, int size) +uint32_t EmuX86_Read(xbox::addr_xt addr, int size) { if ((addr & (size - 1)) != 0) { EmuLog(LOG_LEVEL::WARNING, "EmuX86_Read(0x%08X, %d) [Unaligned unimplemented]", addr, size); @@ -198,7 +198,7 @@ uint32_t EmuX86_Read(xbox::addr addr, int size) return 0; } -void EmuX86_Write(xbox::addr addr, uint32_t value, int size) +void EmuX86_Write(xbox::addr_xt addr, uint32_t value, int size) { if ((addr & (size - 1)) != 0) { EmuLog(LOG_LEVEL::WARNING, "EmuX86_Write(0x%08X, 0x%08X, %d) [Unaligned unimplemented]", addr, value, size); @@ -425,7 +425,7 @@ uint32_t EmuX86_Distorm_read_disp(const _DInst& info) } typedef struct { - xbox::addr addr = 0; + xbox::addr_xt addr = 0; bool is_internal_addr = false; // If set, addr points to a CPU context (or Distorm immedate value) member (instead of Xbox memory) int size = 0; // Expressed in bytes, not bits! } OperandAddress; @@ -446,7 +446,7 @@ bool EmuX86_Operand_Addr_ForReadOnly(const LPEXCEPTION_POINTERS e, const _DInst& assert(opAddr.size == EmuX86_DistormRegSize(info.ops[operand].index)); opAddr.is_internal_addr = true; - opAddr.addr = (xbox::addr)EmuX86_GetRegisterPointer(e, info.ops[operand].index); + opAddr.addr = (xbox::addr_xt)EmuX86_GetRegisterPointer(e, info.ops[operand].index); return true; } case O_IMM: // instruction.imm. @@ -454,7 +454,7 @@ bool EmuX86_Operand_Addr_ForReadOnly(const LPEXCEPTION_POINTERS e, const _DInst& assert(opAddr.size == sizeof(uint8_t) || opAddr.size == sizeof(uint16_t) || opAddr.size == sizeof(uint32_t)); opAddr.is_internal_addr = true; - opAddr.addr = (xbox::addr)(&info.imm); + opAddr.addr = (xbox::addr_xt)(&info.imm); return true; } case O_IMM1: // instruction.imm.ex.i1. @@ -462,7 +462,7 @@ bool EmuX86_Operand_Addr_ForReadOnly(const LPEXCEPTION_POINTERS e, const _DInst& assert(opAddr.size == sizeof(uint8_t) || opAddr.size == sizeof(uint16_t) || opAddr.size == sizeof(uint32_t)); opAddr.is_internal_addr = true; - opAddr.addr = (xbox::addr)(&info.imm.ex.i1); + opAddr.addr = (xbox::addr_xt)(&info.imm.ex.i1); return true; } case O_IMM2: // instruction.imm.ex.i2. @@ -470,7 +470,7 @@ bool EmuX86_Operand_Addr_ForReadOnly(const LPEXCEPTION_POINTERS e, const _DInst& assert(opAddr.size == sizeof(uint8_t) || opAddr.size == sizeof(uint16_t) || opAddr.size == sizeof(uint32_t)); opAddr.is_internal_addr = true; - opAddr.addr = (xbox::addr)(&info.imm.ex.i2); + opAddr.addr = (xbox::addr_xt)(&info.imm.ex.i2); return true; } case O_DISP: // memory dereference with displacement only, instruction.disp. @@ -513,7 +513,7 @@ bool EmuX86_Operand_Addr_ForReadOnly(const LPEXCEPTION_POINTERS e, const _DInst& assert(opAddr.size == sizeof(uint8_t) || opAddr.size == sizeof(uint32_t)); opAddr.is_internal_addr = false; - opAddr.addr = (xbox::addr)e->ContextRecord->Eip + (xbox::addr)INSTRUCTION_GET_TARGET(&info); + opAddr.addr = (xbox::addr_xt)e->ContextRecord->Eip + (xbox::addr_xt)INSTRUCTION_GET_TARGET(&info); return true; } case O_PTR: // the absolute target address of a far branch instruction(instruction.imm.ptr.seg / off). @@ -521,7 +521,7 @@ bool EmuX86_Operand_Addr_ForReadOnly(const LPEXCEPTION_POINTERS e, const _DInst& assert(opAddr.size == 0); opAddr.is_internal_addr = false; - opAddr.addr = (xbox::addr)info.imm.ptr.off; // TODO : Needs test-case. What about info.imm.ptr.seg ? + opAddr.addr = (xbox::addr_xt)info.imm.ptr.off; // TODO : Needs test-case. What about info.imm.ptr.seg ? return true; } default: @@ -2784,7 +2784,7 @@ void EmuX86_DistormLogInstruction(const uint8_t *Eip, _DInst &info, LOG_LEVEL lo std::stringstream output; output << "Disassembly : " - << std::setfill('0') << std::setw(8) << std::right << std::hex << std::uppercase << (xbox::addr)Eip; + << std::setfill('0') << std::setw(8) << std::right << std::hex << std::uppercase << (xbox::addr_xt)Eip; for (int b = 0; b < MAX(7, info.size); b++) { if (b < info.size) //output << " " << std::setfill('0') << std::setw(2) << std::right << std::hex << ((uint8_t)0+Eip[b]); // add 2 hex nibbles, not chars @@ -2871,7 +2871,7 @@ void EmuX86_DistormLogInstruction(const uint8_t *Eip, _DInst &info, LOG_LEVEL lo output << "]"; break; case O_PC: - output_value(output, 8, (xbox::addr)Eip + (xbox::addr)INSTRUCTION_GET_TARGET(&info)); + output_value(output, 8, (xbox::addr_xt)Eip + (xbox::addr_xt)INSTRUCTION_GET_TARGET(&info)); break; case O_PTR: // TODO : Needs test-case output << "+" << std::setfill('0') << info.imm.ptr.seg << "/"; diff --git a/src/devices/x86/EmuX86.h b/src/devices/x86/EmuX86.h index 4c1dcded9..fa94bf62b 100644 --- a/src/devices/x86/EmuX86.h +++ b/src/devices/x86/EmuX86.h @@ -51,8 +51,8 @@ void EmuX86_Init(); int EmuX86_OpcodeSize(uint8_t *Eip); bool EmuX86_DecodeException(LPEXCEPTION_POINTERS e); -uint32_t EmuX86_IORead(xbox::addr addr, int size); -void EmuX86_IOWrite(xbox::addr addr, uint32_t value, int size); -uint32_t EmuX86_Read(xbox::addr addr, int size); -void EmuX86_Write(xbox::addr addr, uint32_t value, int size); +uint32_t EmuX86_IORead(xbox::addr_xt addr, int size); +void EmuX86_IOWrite(xbox::addr_xt addr, uint32_t value, int size); +uint32_t EmuX86_Read(xbox::addr_xt addr, int size); +void EmuX86_Write(xbox::addr_xt addr, uint32_t value, int size); #endif diff --git a/src/gui/DlgAbout.cpp b/src/gui/DlgAbout.cpp index a2b29a35a..d0c1a3f02 100644 --- a/src/gui/DlgAbout.cpp +++ b/src/gui/DlgAbout.cpp @@ -44,7 +44,7 @@ unsigned int aboutCurrentTab = 0; /*! windows dialog procedure */ static INT_PTR CALLBACK DlgAboutProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -VOID ShowAboutDialog(HWND hwnd) +void ShowAboutDialog(HWND hwnd) { /*! show dialog box */ DialogBox(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_ABOUT), hwnd, DlgAboutProc); diff --git a/src/gui/DlgAbout.h b/src/gui/DlgAbout.h index b47633e10..6067944e1 100644 --- a/src/gui/DlgAbout.h +++ b/src/gui/DlgAbout.h @@ -28,6 +28,6 @@ #include /*! show About dialog */ -extern VOID ShowAboutDialog(HWND hwnd); +extern void ShowAboutDialog(HWND hwnd); #endif diff --git a/src/gui/DlgAudioConfig.cpp b/src/gui/DlgAudioConfig.cpp index a6aeb5b60..afa31f603 100644 --- a/src/gui/DlgAudioConfig.cpp +++ b/src/gui/DlgAudioConfig.cpp @@ -40,7 +40,7 @@ static INT_PTR CALLBACK DlgAudioConfigProc(HWND hWndDlg, UINT uMsg, WPARAM wPara /*! directsound audio devices procedure*/ static BOOL CALLBACK DSEnumProc(LPGUID lpGUID, LPCTSTR lpszDesc, LPCTSTR lpszDrvName, LPVOID lpContext); /*! refresh UI based on selected audio adapter */ -static VOID RefreshAudioAdapter(); +static void RefreshAudioAdapter(); /*! audio configuration */ static Settings::s_audio g_XBAudio; @@ -49,7 +49,7 @@ static BOOL g_bHasChanges = FALSE; /*! handle to audio adapter list window */ static HWND g_hAudioAdapter = nullptr; -VOID ShowAudioConfig(HWND hwnd) +void ShowAudioConfig(HWND hwnd) { /*! reset changes flag */ g_bHasChanges = FALSE; @@ -199,7 +199,7 @@ INT_PTR CALLBACK DlgAudioConfigProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPAR return FALSE; } -VOID RefreshAudioAdapter() +void RefreshAudioAdapter() { /*! save configured audio adapter */ { diff --git a/src/gui/DlgAudioConfig.h b/src/gui/DlgAudioConfig.h index 12df31402..1eb989089 100644 --- a/src/gui/DlgAudioConfig.h +++ b/src/gui/DlgAudioConfig.h @@ -28,6 +28,6 @@ #include /*! show audio configuration dialog */ -extern VOID ShowAudioConfig(HWND hwnd); +extern void ShowAudioConfig(HWND hwnd); #endif diff --git a/src/gui/DlgEepromConfig.h b/src/gui/DlgEepromConfig.h index ef70664a4..d34bee908 100644 --- a/src/gui/DlgEepromConfig.h +++ b/src/gui/DlgEepromConfig.h @@ -26,7 +26,7 @@ #define DLGEEPROMCONFIG_H -VOID ShowEepromConfig(HWND hwnd); +void ShowEepromConfig(HWND hwnd); #endif diff --git a/src/gui/DlgInputConfig.h b/src/gui/DlgInputConfig.h index a21b2f57d..a7c456561 100644 --- a/src/gui/DlgInputConfig.h +++ b/src/gui/DlgInputConfig.h @@ -28,7 +28,7 @@ #ifndef DLGINPUTCONFIG_H #define DLGINPUTCONFIG_H -VOID ShowInputConfig(HWND hwnd, HWND ChildWnd); +void ShowInputConfig(HWND hwnd, HWND ChildWnd); extern HWND g_ChildWnd; #endif diff --git a/src/gui/DlgLoggingConfig.cpp b/src/gui/DlgLoggingConfig.cpp index 35e36a5f0..5ca384a8f 100644 --- a/src/gui/DlgLoggingConfig.cpp +++ b/src/gui/DlgLoggingConfig.cpp @@ -103,7 +103,7 @@ static int g_DlgIndexes[] = { }; -VOID ShowLoggingConfig(HWND hwnd, HWND ChildWnd) +void ShowLoggingConfig(HWND hwnd, HWND ChildWnd) { g_ChildWnd = ChildWnd; DialogBox(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_LOGGING_CFG), hwnd, DlgLogConfigProc); diff --git a/src/gui/DlgLoggingConfig.h b/src/gui/DlgLoggingConfig.h index fb44a32c5..b0bdbbf57 100644 --- a/src/gui/DlgLoggingConfig.h +++ b/src/gui/DlgLoggingConfig.h @@ -26,6 +26,6 @@ #ifndef DLGLOGGINGCONFIG_H #define DLGLOGGINGCONFIG_H -VOID ShowLoggingConfig(HWND hwnd, HWND ChildWnd); +void ShowLoggingConfig(HWND hwnd, HWND ChildWnd); #endif diff --git a/src/gui/DlgNetworkConfig.cpp b/src/gui/DlgNetworkConfig.cpp index 2b4b99d80..c9573ff81 100644 --- a/src/gui/DlgNetworkConfig.cpp +++ b/src/gui/DlgNetworkConfig.cpp @@ -40,14 +40,14 @@ static Settings::s_network g_XBNetwork; /*! windows dialog procedure */ static INT_PTR CALLBACK DlgNetworkConfigProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -VOID ShowNetworkConfig(HWND hwnd) +void ShowNetworkConfig(HWND hwnd) { g_XBNetwork = g_Settings->m_network; /*! show dialog box */ DialogBox(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_NETWORK_CFG), hwnd, DlgNetworkConfigProc); } -VOID FetchNetworkInterfaces(HWND hwnd) +void FetchNetworkInterfaces(HWND hwnd) { static IP_ADAPTER_INFO AdapterInfo[128]; static PIP_ADAPTER_INFO pAdapterInfo; diff --git a/src/gui/DlgNetworkConfig.h b/src/gui/DlgNetworkConfig.h index 1b25aae2b..f6b22a92a 100644 --- a/src/gui/DlgNetworkConfig.h +++ b/src/gui/DlgNetworkConfig.h @@ -28,6 +28,6 @@ #include /*! show network configuration dialog */ -extern VOID ShowNetworkConfig(HWND hwnd); +extern void ShowNetworkConfig(HWND hwnd); #endif diff --git a/src/gui/DlgVideoConfig.cpp b/src/gui/DlgVideoConfig.cpp index 8d61f4714..9e2b240e9 100644 --- a/src/gui/DlgVideoConfig.cpp +++ b/src/gui/DlgVideoConfig.cpp @@ -40,11 +40,11 @@ /*! windows dialog procedure */ static INT_PTR CALLBACK DlgVideoConfigProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); /*! refresh UI based on selected display adapter */ -static VOID RefreshDisplayAdapter(); +static void RefreshDisplayAdapter(); /*! refresh UI based on selected device */ -static VOID RefreshDirect3DDevice(); +static void RefreshDirect3DDevice(); /*! refrehs UI based on selected Render Resolution */ -static VOID RefreshRenderResolution(); +static void RefreshRenderResolution(); /*! direct3d instance */ static IDirect3D *g_pDirect3D = nullptr; @@ -65,7 +65,7 @@ static HWND g_hRenderResolution = NULL; #pragma optimize("", off) -VOID ShowVideoConfig(HWND hwnd) +void ShowVideoConfig(HWND hwnd) { /*! reset changes flag */ g_bHasChanges = FALSE; @@ -271,7 +271,7 @@ INT_PTR CALLBACK DlgVideoConfigProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPAR return FALSE; } -VOID RefreshDisplayAdapter() +void RefreshDisplayAdapter() { /*! save configured display adapter */ { @@ -321,7 +321,7 @@ VOID RefreshDisplayAdapter() return; } -VOID RefreshDirect3DDevice() +void RefreshDirect3DDevice() { DWORD dwVideoResolution = 0; @@ -417,7 +417,7 @@ VOID RefreshDirect3DDevice() return; } -VOID RefreshRenderResolution() +void RefreshRenderResolution() { /*! save configured render resolution */ { diff --git a/src/gui/DlgVideoConfig.h b/src/gui/DlgVideoConfig.h index 0a06cad9d..7ee8a8e64 100644 --- a/src/gui/DlgVideoConfig.h +++ b/src/gui/DlgVideoConfig.h @@ -28,6 +28,6 @@ #include /*! show video configuration dialog */ -extern VOID ShowVideoConfig(HWND hwnd); +extern void ShowVideoConfig(HWND hwnd); #endif