From 29e1dc865dc6f83d89600bd6d68a7cb555c5ba7f Mon Sep 17 00:00:00 2001 From: ergo720 <45463469+ergo720@users.noreply.github.com> Date: Tue, 30 Nov 2021 14:58:31 +0100 Subject: [PATCH] Switched to uppercase for xbox ntstatuses --- src/core/hle/D3D8/Direct3D9/Direct3D9.cpp | 2 - .../DSOUND/DirectSound/DirectSoundBuffer.cpp | 2 +- .../DSOUND/DirectSound/DirectSoundStream.cpp | 6 +- .../DSOUND/DirectSound/XFileMediaObject.cpp | 10 +- src/core/hle/XAPI/Xapi.cpp | 18 ++-- src/core/kernel/common/types.h | 72 ++++++++------- src/core/kernel/exports/EmuKrnlAv.cpp | 8 +- src/core/kernel/exports/EmuKrnlDbg.cpp | 4 +- src/core/kernel/exports/EmuKrnlEx.cpp | 22 ++--- src/core/kernel/exports/EmuKrnlFs.cpp | 2 +- src/core/kernel/exports/EmuKrnlHal.cpp | 12 +-- src/core/kernel/exports/EmuKrnlIo.cpp | 8 +- src/core/kernel/exports/EmuKrnlKe.cpp | 48 +++++----- src/core/kernel/exports/EmuKrnlKi.h | 4 +- src/core/kernel/exports/EmuKrnlLogging.cpp | 30 +++--- src/core/kernel/exports/EmuKrnlMm.cpp | 2 +- src/core/kernel/exports/EmuKrnlNt.cpp | 92 +++++++++---------- src/core/kernel/exports/EmuKrnlOb.cpp | 54 +++++------ src/core/kernel/exports/EmuKrnlPhy.cpp | 2 +- src/core/kernel/exports/EmuKrnlPs.cpp | 14 +-- src/core/kernel/exports/EmuKrnlRtl.cpp | 60 ++++++------ src/core/kernel/exports/EmuKrnlXe.cpp | 8 +- src/core/kernel/init/CxbxKrnl.cpp | 2 +- src/core/kernel/memory-manager/VMManager.cpp | 46 +++++----- src/core/kernel/support/EmuFS.cpp | 6 +- src/core/kernel/support/EmuFile.cpp | 78 ++++++++-------- 26 files changed, 306 insertions(+), 306 deletions(-) diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp index 8cfeec77d..663a0b282 100644 --- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp +++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp @@ -4033,8 +4033,6 @@ xbox::X_D3DSurface* WINAPI xbox::EMUPATCH(D3DDevice_GetBackBuffer2) static X_D3DSurface *pXboxBackBuffer = EmuNewD3DSurface(); IDirect3DSurface *pCurrentHostBackBuffer = nullptr; - xbox::status_success; - if (BackBuffer == -1) { BackBuffer = 0; } diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp index d301ab418..1f9634a88 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp @@ -1673,7 +1673,7 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundBuffer_Set3DVoiceData) LOG_UNIMPLEMENTED(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp index 991a2eeec..9678f2cd1 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp @@ -652,7 +652,7 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(CDirectSoundStream_Pause) if (!pThis) { LOG_TEST_CASE("CDirectSoundStream_Pause called with pThis = nullptr"); - return xbox::status_success; + return X_STATUS_SUCCESS; } HRESULT hRet = CxbxrImpl_CDirectSoundStream_PauseEx(pThis, 0LL, dwPause); @@ -1514,7 +1514,7 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundStream_Set3DVoiceData) LOG_UNIMPLEMENTED(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -1535,5 +1535,5 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(IDirectSoundStream_Use3DVoiceData) LOG_UNIMPLEMENTED(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } diff --git a/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp b/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp index e4a2c8333..72e1766af 100644 --- a/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp +++ b/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp @@ -121,7 +121,7 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(XAudioDownloadEffectsImage) if (dwFlags & 1) { // load from xbe section. Test case: Halo 2 PXBEIMAGE_SECTION pSection = CxbxKrnl_Xbe->FindSection(pszImageName); if (pSection != nullptr) { - if (XeLoadSection(pSection) == xbox::status_success) { + if (XeLoadSection(pSection) == X_STATUS_SUCCESS) { result = xbox::EMUPATCH(CDirectSound_DownloadEffectsImage)(zeroptr, pSection->VirtualAddress, pSection->VirtualSize, pImageLoc, ppImageDesc); XeUnloadSection(pSection); } @@ -151,10 +151,10 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(XAudioDownloadEffectsImage) if (NtStatusCreateFile < 0) { //ULONG DOSERRORNtCreateFile=RtlNtStatusToDosError(NtStatusCreateFile); EmuLog(LOG_LEVEL::WARNING, "%s: Image file NtCreateFile() error", __func__); - if (NtStatusCreateFile == status_object_name_collision) { + if (NtStatusCreateFile == X_STATUS_OBJECT_NAME_COLLISION) { EmuLog(LOG_LEVEL::WARNING, "%s: Image file name collision", __func__); } - else if (NtStatusCreateFile == status_file_is_a_directory) { + else if (NtStatusCreateFile == X_STATUS_FILE_IS_A_DIRECTORY) { EmuLog(LOG_LEVEL::WARNING, "%s: Image file name is a directory or invalid", __func__); } hFile= INVALID_HANDLE_VALUE; @@ -193,11 +193,11 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(XAudioDownloadEffectsImage) zeroptr); // ByteOffset OPTIONAL DWORD dwBytesRead = 0; - if (NtStatusReadFile == status_pending) { + if (NtStatusReadFile == X_STATUS_PENDING) { NtStatusReadFile = NtWaitForSingleObject(hFile, 0, 0); if (NtStatusReadFile < 0){ //something wrong EmuLog(LOG_LEVEL::WARNING, "%s: Image file NtReadFile error", __func__); - if (NtStatusReadFile != status_end_of_file) { + if (NtStatusReadFile != X_STATUS_END_OF_FILE) { if ((NtStatusReadFile & 0xC0000000) == 0x80000000) { //Error happened during file reading dwBytesRead = io_status_block.Information; EmuLog(LOG_LEVEL::WARNING, "%s: NtReadFile read file end", __func__); diff --git a/src/core/hle/XAPI/Xapi.cpp b/src/core/hle/XAPI/Xapi.cpp index 56e874e14..8ebce53ee 100644 --- a/src/core/hle/XAPI/Xapi.cpp +++ b/src/core/hle/XAPI/Xapi.cpp @@ -1235,7 +1235,7 @@ xbox::dword_xt WINAPI xbox::EMUPATCH(XLaunchNewImageA) PVOID LaunchDataVAddr = xbox::MmAllocateContiguousMemory(sizeof(xbox::LAUNCH_DATA_PAGE)); if (!LaunchDataVAddr) { - RETURN(xbox::status_no_memory); + RETURN(X_STATUS_NO_MEMORY); } xbox::LaunchDataPage = (xbox::LAUNCH_DATA_PAGE*)LaunchDataVAddr; } @@ -1481,7 +1481,7 @@ xbox::dword_xt WINAPI xbox::EMUPATCH(XMountMUA) ntstatus_xt status = XB_TRMP(XapiMapLetterToDirectory)(&mu_path, &mu_dev, title_id_buff, 1, reinterpret_cast(CxbxKrnl_Xbe->m_Certificate.wsTitleName), 0); - if (!nt_success(status)) { + if (!X_NT_SUCCESS(status)) { RETURN(RtlNtStatusToDosError(status)); } @@ -1526,7 +1526,7 @@ xbox::dword_xt WINAPI xbox::EMUPATCH(XMountMURootA) RtlInitAnsiString(&mu_dev, mu_dev_str.data()); ntstatus_xt status = IoCreateSymbolicLink(&mu_path, &mu_dev); - if (!nt_success(status)) { + if (!X_NT_SUCCESS(status)) { if (pchDrive != zeroptr) { *pchDrive = 0; } @@ -1571,7 +1571,7 @@ xbox::dword_xt WINAPI xbox::EMUPATCH(XUnmountMU) RtlInitAnsiString(&mu_path, mu_path_str.data()); ntstatus_xt status = IoDeleteSymbolicLink(&mu_path); - if (!nt_success(status)) { + if (!X_NT_SUCCESS(status)) { RETURN(RtlNtStatusToDosError(status)); } @@ -1632,7 +1632,7 @@ xbox::dword_xt WINAPI xbox::EMUPATCH(XReadMUMetaData) FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_ALERT); - if (nt_success(status)) { + if (X_NT_SUCCESS(status)) { fatx_volume_metadata volume; volume.offset = dwByteOffset; volume.length = dwNumberOfBytesToRead; @@ -1649,19 +1649,19 @@ xbox::dword_xt WINAPI xbox::EMUPATCH(XReadMUMetaData) zeroptr, 0); - if (nt_success(status)) { + if (X_NT_SUCCESS(status)) { std::memcpy(lpBuffer, volume.buffer, dwNumberOfBytesToRead); - status = status_success; + status = X_STATUS_SUCCESS; } else { - status = status_unrecognized_volume; + status = X_STATUS_UNRECOGNIZED_VOLUME; } delete[] volume.buffer; NtClose(handle); } else { - status = status_unrecognized_volume; + status = X_STATUS_UNRECOGNIZED_VOLUME; } if (unmount) { diff --git a/src/core/kernel/common/types.h b/src/core/kernel/common/types.h index b7afa1bbd..717799939 100644 --- a/src/core/kernel/common/types.h +++ b/src/core/kernel/common/types.h @@ -66,41 +66,43 @@ namespace xbox // ****************************************************************** typedef void* LPSECURITY_ATTRIBUTES; -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_invalid_handle = 0xC0000008; -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!) -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_invalid = 0xC0000033L; -inline constexpr dword_xt status_object_name_not_found = 0xC0000034L; -inline constexpr dword_xt status_object_name_collision = 0xC0000035L; -inline constexpr dword_xt status_file_is_a_directory = 0xC00000BAL; -inline constexpr dword_xt status_end_of_file = 0xC0000011L; -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; -inline constexpr dword_xt status_unrecognized_volume = 0xC000014FL; +// ****************************************************************** +// * NTSTATUS codes +// ****************************************************************** +#define X_NT_SUCCESS(Status) (((xbox::ntstatus_xt)(Status)) >= 0) +#define X_STATUS_SUCCESS 0x00000000L +#define X_STATUS_ABANDONED 0x00000080L +#define X_STATUS_MUTANT_LIMIT_EXCEEDED 0xC0000191L +#define X_STATUS_PENDING 0x00000103L +#define X_STATUS_TIMER_RESUME_IGNORED 0x40000025L +#define X_STATUS_BUFFER_OVERFLOW 0x80000005L +#define X_STATUS_UNSUCCESSFUL 0xC0000001L +#define X_STATUS_INVALID_HANDLE 0xC0000008L +#define X_STATUS_UNRECOGNIZED_MEDIA 0xC0000014L +#define X_STATUS_NO_MEMORY 0xC0000017L +#define X_STATUS_BUFFER_TOO_SMALL 0xC0000023L +#define X_STATUS_INVALID_PARAMETER_2 0xC00000F0L +#define X_STATUS_ALERTED 0x00000101L +#define X_STATUS_USER_APC 0x000000C0L +#define X_STATUS_DATA_OVERRUN 0xC000003CL // The SCSI input buffer was too large (not necessarily an error!) +#define X_STATUS_SEMAPHORE_LIMIT_EXCEEDED 0xC0000047L +#define X_STATUS_INVALID_IMAGE_FORMAT 0xC000007BL +#define X_STATUS_INSUFFICIENT_RESOURCES 0xC000009AL +#define X_STATUS_TOO_MANY_SECRETS 0xC0000156L +#define X_STATUS_XBE_REGION_MISMATCH 0xC0050001L +#define X_STATUS_XBE_MEDIA_MISMATCH 0xC0050002L +#define X_STATUS_OBJECT_NAME_INVALID 0xC0000033L +#define X_STATUS_OBJECT_NAME_NOT_FOUND 0xC0000034L +#define X_STATUS_OBJECT_NAME_COLLISION 0xC0000035L +#define X_STATUS_FILE_IS_A_DIRECTORY 0xC00000BAL +#define X_STATUS_END_OF_FILE 0xC0000011L +#define X_STATUS_INVALID_PAGE_PROTECTION 0xC0000045L +#define X_STATUS_CONFLICTING_ADDRESSES 0xC0000018L +#define X_STATUS_UNABLE_TO_FREE_VM 0xC000001AL +#define X_STATUS_FREE_VM_NOT_AT_BASE 0xC000009FL +#define X_STATUS_MEMORY_NOT_ALLOCATED 0xC00000A0L +#define X_STATUS_NOT_COMMITTED 0xC000002DL +#define X_STATUS_UNRECOGNIZED_VOLUME 0xC000014FL // ****************************************************************** // * Registry value types diff --git a/src/core/kernel/exports/EmuKrnlAv.cpp b/src/core/kernel/exports/EmuKrnlAv.cpp index a71f8aa7d..84ee2ef92 100644 --- a/src/core/kernel/exports/EmuKrnlAv.cpp +++ b/src/core/kernel/exports/EmuKrnlAv.cpp @@ -131,7 +131,7 @@ ULONG AvQueryAvCapabilities() (xbox::PSIZE_T)&resultSize); // If this failed, default to AV_STANDARD_NTSC_M | AV_FLAGS_60Hz - if (result != xbox::status_success || resultSize != sizeof(ULONG)) { + if (result != X_STATUS_SUCCESS || resultSize != sizeof(ULONG)) { avRegion = AV_STANDARD_NTSC_M | AV_FLAGS_60Hz; } @@ -145,7 +145,7 @@ ULONG AvQueryAvCapabilities() (xbox::PSIZE_T)&resultSize); // If this failed, default to no user-options set - if (result != xbox::status_success || resultSize != sizeof(ULONG)) { + if (result != X_STATUS_SUCCESS || resultSize != sizeof(ULONG)) { userSettings = 0; } @@ -311,7 +311,7 @@ XBSYSAPI EXPORTNUM(3) xbox::ulong_xt NTAPI xbox::AvSetDisplayMode AvSendTVEncoderOption(RegisterBase, AV_OPTION_FLICKER_FILTER, 5, NULL); AvSendTVEncoderOption(RegisterBase, AV_OPTION_ENABLE_LUMA_FILTER, FALSE, NULL); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } CRTC_WR(RegisterBase, NV_CIO_CRE_PIXEL_INDEX /*=0x28*/, 0x80 | CR28Depth); @@ -389,7 +389,7 @@ XBSYSAPI EXPORTNUM(3) xbox::ulong_xt NTAPI xbox::AvSetDisplayMode REG_WR32(RegisterBase, NV_PCRTC_START, FrameBuffer); AvpCurrentMode = Mode; - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** diff --git a/src/core/kernel/exports/EmuKrnlDbg.cpp b/src/core/kernel/exports/EmuKrnlDbg.cpp index 3b7962b4f..14392013a 100644 --- a/src/core/kernel/exports/EmuKrnlDbg.cpp +++ b/src/core/kernel/exports/EmuKrnlDbg.cpp @@ -117,7 +117,7 @@ XBSYSAPI EXPORTNUM(8) xbox::ulong_xt _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 xbox::status_success; + return X_STATUS_SUCCESS; } // Perform the actual print operation @@ -130,7 +130,7 @@ XBSYSAPI EXPORTNUM(8) xbox::ulong_xt _cdecl xbox::DbgPrint fflush(stdout); } - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** diff --git a/src/core/kernel/exports/EmuKrnlEx.cpp b/src/core/kernel/exports/EmuKrnlEx.cpp index f91cb4f7a..8eb59a5b4 100644 --- a/src/core/kernel/exports/EmuKrnlEx.cpp +++ b/src/core/kernel/exports/EmuKrnlEx.cpp @@ -47,7 +47,7 @@ namespace NtDll #include // for std::atomic #pragma warning(disable:4005) // Ignore redefined status values -#include // For xbox::status_buffer_too_small +#include // For X_STATUS_BUFFER_TOO_SMALL #pragma warning(default:4005) static CRITICAL_SECTION eeprom_crit_section; @@ -408,7 +408,7 @@ XBSYSAPI EXPORTNUM(24) xbox::ntstatus_xt NTAPI xbox::ExQueryNonVolatileSetting LOG_FUNC_ARG_OUT(ResultLength) LOG_FUNC_END; - NTSTATUS Status = xbox::status_success; + NTSTATUS Status = X_STATUS_SUCCESS; void * value_addr = nullptr; int value_type; int result_length; @@ -455,11 +455,11 @@ XBSYSAPI EXPORTNUM(24) xbox::ntstatus_xt NTAPI xbox::ExQueryNonVolatileSetting UnlockEeprom(); } else { - Status = xbox::status_buffer_too_small; + Status = X_STATUS_BUFFER_TOO_SMALL; } } else { - Status = xbox::status_object_name_not_found; + Status = X_STATUS_OBJECT_NAME_NOT_FOUND; } RETURN(Status); @@ -481,7 +481,7 @@ XBSYSAPI EXPORTNUM(25) xbox::ntstatus_xt NTAPI xbox::ExReadWriteRefurbInfo LOG_FUNC_ARG(bIsWriteMode) LOG_FUNC_END; - NTSTATUS Result = xbox::status_success; + NTSTATUS Result = X_STATUS_SUCCESS; /* TODO: Port this Dxbx code : if (pRefurbInfo) @@ -506,7 +506,7 @@ XBSYSAPI EXPORTNUM(25) xbox::ntstatus_xt NTAPI xbox::ExReadWriteRefurbInfo &IoStatusBlock, FILE_SHARE_READ or FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_ALERT); - if (nt_success(Result)) + if (X_NT_SUCCESS(Result)) { LARGE_INTEGER ByteOffset; ByteOffset.QuadPart = XBOX_REFURB_INFO_SECTOR_INDEX * XBOX_HD_SECTOR_SIZE; @@ -521,7 +521,7 @@ XBSYSAPI EXPORTNUM(25) xbox::ntstatus_xt NTAPI xbox::ExReadWriteRefurbInfo else { Result = xbox::NtReadFile(ConfigPartitionHandle, 0, NULL, NULL, &IoStatusBlock, &RefurbInfoCopy, XBOX_HD_SECTOR_SIZE, &ByteOffset); - if (nt_success(Result)) + if (X_NT_SUCCESS(Result)) { if (RefurbInfoCopy.Signature_ == XBOX_REFURB_INFO_SIGNATURE) // No signature - clear output buffer : @@ -536,7 +536,7 @@ XBSYSAPI EXPORTNUM(25) xbox::ntstatus_xt NTAPI xbox::ExReadWriteRefurbInfo } } else - Result = xbox::status_unsuccessful; // This may never happen! + Result = X_STATUS_UNSUCCESSFUL; // This may never happen! */ LOG_IGNORED(); @@ -632,13 +632,13 @@ XBSYSAPI EXPORTNUM(29) xbox::ntstatus_xt NTAPI xbox::ExSaveNonVolatileSetting LOG_FUNC_ARG(ValueLength) LOG_FUNC_END; - NTSTATUS Status = xbox::status_success; + NTSTATUS Status = X_STATUS_SUCCESS; void * value_addr = nullptr; DWORD result_length; // Don't allow writing to the eeprom encrypted area if (ValueIndex == XC_ENCRYPTED_SECTION) - RETURN(xbox::status_object_name_not_found); + RETURN(X_STATUS_OBJECT_NAME_NOT_FOUND); // handle eeprom write if (g_bIsDebug || ValueIndex <= XC_MAX_OS || ValueIndex > XC_MAX_FACTORY) @@ -680,7 +680,7 @@ XBSYSAPI EXPORTNUM(29) xbox::ntstatus_xt NTAPI xbox::ExSaveNonVolatileSetting } } else { - Status = xbox::status_object_name_not_found; + Status = X_STATUS_OBJECT_NAME_NOT_FOUND; } RETURN(Status); diff --git a/src/core/kernel/exports/EmuKrnlFs.cpp b/src/core/kernel/exports/EmuKrnlFs.cpp index cb5e8b30d..0b3043803 100644 --- a/src/core/kernel/exports/EmuKrnlFs.cpp +++ b/src/core/kernel/exports/EmuKrnlFs.cpp @@ -82,7 +82,7 @@ XBSYSAPI EXPORTNUM(37) xbox::ntstatus_xt NTAPI xbox::FscSetCacheSize { LOG_FUNC_ONE_ARG(NumberOfCachePages); - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_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 987405ba4..130a561c0 100644 --- a/src/core/kernel/exports/EmuKrnlHal.cpp +++ b/src/core/kernel/exports/EmuKrnlHal.cpp @@ -92,7 +92,7 @@ XBSYSAPI EXPORTNUM(9) xbox::ntstatus_xt NTAPI xbox::HalReadSMCTrayState DWORD orig_TrayCount = g_TrayCount; KfLowerIrql(orig_irql); - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_STATUS_SUCCESS; if (TrayState == INIT_TRAY_STATE) { 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. @@ -276,7 +276,7 @@ XBSYSAPI EXPORTNUM(45) xbox::ntstatus_xt NTAPI xbox::HalReadSMBusValue // TODO : Prevent interrupts - NTSTATUS Status = xbox::status_success; + NTSTATUS Status = X_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 @@ -291,7 +291,7 @@ XBSYSAPI EXPORTNUM(45) xbox::ntstatus_xt NTAPI xbox::HalReadSMBusValue // Check if the command was executed successfully if (g_SMBus->IORead(1, SMB_GLOBAL_STATUS) & GS_PRERR_STS) { - Status = xbox::status_unsuccessful; + Status = X_STATUS_UNSUCCESSFUL; } else { *DataValue = g_SMBus->IORead(1, SMB_HOST_DATA); @@ -628,7 +628,7 @@ XBSYSAPI EXPORTNUM(50) xbox::ntstatus_xt NTAPI xbox::HalWriteSMBusValue // TODO : Prevent interrupts - NTSTATUS Status = xbox::status_success; + NTSTATUS Status = X_STATUS_SUCCESS; g_SMBus->IOWrite(1, SMB_HOST_ADDRESS, Address); g_SMBus->IOWrite(1, SMB_HOST_COMMAND, Command); @@ -643,7 +643,7 @@ XBSYSAPI EXPORTNUM(50) xbox::ntstatus_xt NTAPI xbox::HalWriteSMBusValue // Check if the command was executed successfully if (g_SMBus->IORead(1, SMB_GLOBAL_STATUS) & GS_PRERR_STS) { - Status = xbox::status_unsuccessful; + Status = X_STATUS_UNSUCCESSFUL; } // TODO : Reenable interrupts @@ -836,7 +836,7 @@ XBSYSAPI EXPORTNUM(365) xbox::void_xt NTAPI xbox::HalEnableSecureTrayEject do { // TODO: Implement SMC_COMMAND_RESET_ON_EJECT in the SMC. retcode = HalWriteSMBusValue(SMBUS_ADDRESS_SYSTEM_MICRO_CONTROLLER, SMC_COMMAND_RESET_ON_EJECT, write_word, disable_reset_on_eject); - } while (retcode != xbox::status_success); + } while (retcode != X_STATUS_SUCCESS); } } diff --git a/src/core/kernel/exports/EmuKrnlIo.cpp b/src/core/kernel/exports/EmuKrnlIo.cpp index cce67332f..fcd3c6f66 100644 --- a/src/core/kernel/exports/EmuKrnlIo.cpp +++ b/src/core/kernel/exports/EmuKrnlIo.cpp @@ -215,7 +215,7 @@ XBSYSAPI EXPORTNUM(65) xbox::ntstatus_xt NTAPI xbox::IoCreateDevice // Find a way to coexist with host interface from here. LOG_UNIMPLEMENTED(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -347,7 +347,7 @@ XBSYSAPI EXPORTNUM(69) xbox::ntstatus_xt NTAPI xbox::IoDeleteSymbolicLink EmuNtSymbolicLinkObject* symbolicLink = FindNtSymbolicLinkObjectByName(PSTRING_to_string(SymbolicLinkName)); - NTSTATUS ret = xbox::status_object_name_not_found; + NTSTATUS ret = X_STATUS_OBJECT_NAME_NOT_FOUND; if (symbolicLink != NULL) // Destroy the object once all handles to it are closed too : @@ -728,7 +728,7 @@ XBSYSAPI EXPORTNUM(90) xbox::ntstatus_xt NTAPI xbox::IoDismountVolume { LOG_FUNC_ONE_ARG(DeviceObject); - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_STATUS_SUCCESS; LOG_UNIMPLEMENTED(); @@ -745,7 +745,7 @@ XBSYSAPI EXPORTNUM(91) xbox::ntstatus_xt NTAPI xbox::IoDismountVolumeByName { LOG_FUNC_ONE_ARG(VolumeName); - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_STATUS_SUCCESS; // TODO: Anything? LOG_UNIMPLEMENTED(); diff --git a/src/core/kernel/exports/EmuKrnlKe.cpp b/src/core/kernel/exports/EmuKrnlKe.cpp index f0f6fcd63..338d27288 100644 --- a/src/core/kernel/exports/EmuKrnlKe.cpp +++ b/src/core/kernel/exports/EmuKrnlKe.cpp @@ -109,20 +109,20 @@ xbox::ulonglong_xt LARGE_INTEGER2ULONGLONG(xbox::LARGE_INTEGER value) if (Alertable) { \ if (Thread->Alerted[WaitMode] != FALSE) { \ Thread->Alerted[WaitMode] = FALSE; \ - WaitStatus = xbox::status_alerted; \ + WaitStatus = X_STATUS_ALERTED; \ break; \ } else if ((WaitMode != KernelMode) && \ (IsListEmpty(&Thread->ApcState.ApcListHead[UserMode])) == FALSE) { \ Thread->ApcState.UserApcPending = TRUE; \ - WaitStatus = xbox::status_user_apc; \ + WaitStatus = X_STATUS_USER_APC; \ break; \ } else if (Thread->Alerted[KernelMode] != FALSE) { \ Thread->Alerted[KernelMode] = FALSE; \ - WaitStatus = xbox::status_alerted; \ + WaitStatus = X_STATUS_ALERTED; \ break; \ } \ } else if ((WaitMode != KernelMode) && (Thread->ApcState.UserApcPending)) { \ - WaitStatus = xbox::status_user_apc; \ + WaitStatus = X_STATUS_USER_APC; \ break; \ } @@ -1299,7 +1299,7 @@ XBSYSAPI EXPORTNUM(132) xbox::long_xt NTAPI xbox::KeReleaseSemaphore BOOL signalstate_overflow = adjusted_signalstate < initial_state; if (limit_reached || signalstate_overflow) { KiUnlockDispatcherDatabase(orig_irql); - ExRaiseStatus(xbox::status_semaphore_limit_exceeded); + ExRaiseStatus(X_STATUS_SEMAPHORE_LIMIT_EXCEEDED); } Semaphore->Header.SignalState = adjusted_signalstate; @@ -1505,7 +1505,7 @@ XBSYSAPI EXPORTNUM(139) xbox::ntstatus_xt NTAPI xbox::KeRestoreFloatingPointStat { LOG_FUNC_ONE_ARG(PublicFloatSave); - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_STATUS_SUCCESS; LOG_UNIMPLEMENTED(); @@ -1522,7 +1522,7 @@ XBSYSAPI EXPORTNUM(140) xbox::ulong_xt NTAPI xbox::KeResumeThread { LOG_FUNC_ONE_ARG(Thread); - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_STATUS_SUCCESS; LOG_UNIMPLEMENTED(); @@ -1551,7 +1551,7 @@ XBSYSAPI EXPORTNUM(142) xbox::ntstatus_xt NTAPI xbox::KeSaveFloatingPointState { LOG_FUNC_ONE_ARG_OUT(PublicFloatSave); - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_STATUS_SUCCESS; LOG_UNIMPLEMENTED(); @@ -1698,7 +1698,7 @@ XBSYSAPI EXPORTNUM(146) xbox::void_xt NTAPI xbox::KeSetEventBoostPriority } WaitThread->Quantum = WaitThread->ApcState.Process->ThreadQuantum; - // TODO: KiUnwaitThread(WaitThread, xbox::status_success, 1); + // TODO: KiUnwaitThread(WaitThread, X_STATUS_SUCCESS, 1); // For now, we just sleep to give other threads time to wake // See KePulseEvent Sleep(1); @@ -1848,7 +1848,7 @@ XBSYSAPI EXPORTNUM(152) xbox::ulong_xt NTAPI xbox::KeSuspendThread { LOG_FUNC_ONE_ARG(Thread); - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_STATUS_SUCCESS; LOG_UNIMPLEMENTED(); @@ -1981,7 +1981,7 @@ XBSYSAPI EXPORTNUM(158) xbox::ntstatus_xt NTAPI xbox::KeWaitForMultipleObjects } else { WaitSatisfied = TRUE; - Thread->WaitStatus = xbox::status_success; + Thread->WaitStatus = X_STATUS_SUCCESS; for (ULONG Index = 0; Index < Count; Index += 1) { ObjectMutant = (PKMUTANT)Object[Index]; @@ -1997,21 +1997,21 @@ XBSYSAPI EXPORTNUM(158) xbox::ntstatus_xt NTAPI xbox::KeWaitForMultipleObjects } else { KiUnlockDispatcherDatabase(Thread->WaitIrql); - ExRaiseStatus(xbox::status_mutant_limit_exceeded); + ExRaiseStatus(X_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 = xbox::status_success; + WaitStatus = X_STATUS_SUCCESS; goto NoWait; } } else { if (ObjectMutant->Header.Type == MutantObject) { if ((Thread == ObjectMutant->OwnerThread) && (ObjectMutant->Header.SignalState == MINLONG)) { KiUnlockDispatcherDatabase(Thread->WaitIrql); - ExRaiseStatus(xbox::status_mutant_limit_exceeded); + ExRaiseStatus(X_STATUS_MUTANT_LIMIT_EXCEEDED); } else if ((ObjectMutant->Header.SignalState <= 0) && (Thread != ObjectMutant->OwnerThread)) { WaitSatisfied = FALSE; } @@ -2117,7 +2117,7 @@ XBSYSAPI EXPORTNUM(158) xbox::ntstatus_xt NTAPI xbox::KeWaitForMultipleObjects //WaitStatus = (NTSTATUS)KiSwapThread(); - //if (WaitStatus == xbox::status_user_apc) { + //if (WaitStatus == X_STATUS_USER_APC) { // TODO: KiDeliverUserApc(); //} @@ -2148,7 +2148,7 @@ XBSYSAPI EXPORTNUM(158) xbox::ntstatus_xt 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 == xbox::status_user_apc) { + if (WaitStatus == X_STATUS_USER_APC) { //TODO: KiDeliverUserApc(); } @@ -2169,7 +2169,7 @@ NoWait: KiUnlockDispatcherDatabase(Thread->WaitIrql); - if (WaitStatus == xbox::status_user_apc) { + if (WaitStatus == X_STATUS_USER_APC) { // TODO: KiDeliverUserApc(); } @@ -2220,7 +2220,7 @@ XBSYSAPI EXPORTNUM(159) xbox::ntstatus_xt NTAPI xbox::KeWaitForSingleObject KiUnlockDispatcherDatabase(Thread->WaitIrql); } else { PKMUTANT ObjectMutant = (PKMUTANT)Object; - Thread->WaitStatus = xbox::status_success; + Thread->WaitStatus = X_STATUS_SUCCESS; if (ObjectMutant->Header.Type == MutantObject) { // If the object is a mutant object and it has been acquired MINGLONG times, raise an exception @@ -2233,21 +2233,21 @@ XBSYSAPI EXPORTNUM(159) xbox::ntstatus_xt NTAPI xbox::KeWaitForSingleObject } else { KiUnlockDispatcherDatabase(Thread->WaitIrql); - ExRaiseStatus(xbox::status_mutant_limit_exceeded); + ExRaiseStatus(X_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 = xbox::status_success; + WaitStatus = X_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_xt)(xbox::status_success); + WaitBlock->WaitKey = (cshort_xt)(X_STATUS_SUCCESS); WaitBlock->WaitType = WaitAny; WaitBlock->Thread = Thread; @@ -2322,7 +2322,7 @@ XBSYSAPI EXPORTNUM(159) xbox::ntstatus_xt NTAPI xbox::KeWaitForSingleObject /* WaitStatus = (NTSTATUS)KiSwapThread(); - if (WaitStatus == xbox::status_user_apc) { + if (WaitStatus == X_STATUS_USER_APC) { // TODO: KiDeliverUserApc(); } @@ -2353,7 +2353,7 @@ XBSYSAPI EXPORTNUM(159) xbox::ntstatus_xt 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 == xbox::status_user_apc) { + if (WaitStatus == X_STATUS_USER_APC) { //TODO: KiDeliverUserApc(); } @@ -2374,7 +2374,7 @@ NoWait: KiUnlockDispatcherDatabase(Thread->WaitIrql); - if (WaitStatus == xbox::status_user_apc) { + if (WaitStatus == X_STATUS_USER_APC) { // TODO: KiDeliverUserApc(); } diff --git a/src/core/kernel/exports/EmuKrnlKi.h b/src/core/kernel/exports/EmuKrnlKi.h index 51ed230fb..159230e49 100644 --- a/src/core/kernel/exports/EmuKrnlKi.h +++ b/src/core/kernel/exports/EmuKrnlKi.h @@ -165,7 +165,7 @@ extern xbox::KI_TIMER_LOCK KiTimerMtx; (_Object_)->OwnerThread = (_Thread_); \ if ((_Object_)->Abandoned == TRUE) { \ (_Object_)->Abandoned = FALSE; \ - (_Thread_)->WaitStatus = xbox::status_abandoned; \ + (_Thread_)->WaitStatus = X_STATUS_ABANDONED; \ } \ \ InsertHeadList((_Thread_)->MutantListHead.Blink, \ @@ -196,7 +196,7 @@ extern xbox::KI_TIMER_LOCK KiTimerMtx; (_Object_)->OwnerThread = (_Thread_); \ if ((_Object_)->Abandoned == TRUE) { \ (_Object_)->Abandoned = FALSE; \ - (_Thread_)->WaitStatus = xbox::status_abandoned; \ + (_Thread_)->WaitStatus = X_STATUS_ABANDONED; \ } \ \ InsertHeadList((_Thread_)->MutantListHead.Blink, \ diff --git a/src/core/kernel/exports/EmuKrnlLogging.cpp b/src/core/kernel/exports/EmuKrnlLogging.cpp index 842b5d4ca..cc8b42247 100644 --- a/src/core/kernel/exports/EmuKrnlLogging.cpp +++ b/src/core/kernel/exports/EmuKrnlLogging.cpp @@ -272,21 +272,21 @@ ENUM2STR_END_and_LOGRENDER(MODE) /* TODO : Fix error C2593 "'operator <<' is ambiguous", // because often NtDLL::NTSTATUS is used instead of xbox::ntstatus_xt ENUM2STR_START(NTSTATUS) // Not really an enum - 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(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_CASE(X_STATUS_SUCCESS) + ENUM2STR_CASE(X_STATUS_PENDING) + ENUM2STR_CASE(X_STATUS_TIMER_RESUME_IGNORED) + ENUM2STR_CASE(X_STATUS_UNSUCCESSFUL) + ENUM2STR_CASE(X_STATUS_UNRECOGNIZED_MEDIA) + ENUM2STR_CASE(X_STATUS_NO_MEMORY) + ENUM2STR_CASE(X_STATUS_ALERTED) + ENUM2STR_CASE(X_STATUS_USER_APC) + ENUM2STR_CASE(X_STATUS_DATA_OVERRUN) + ENUM2STR_CASE(X_STATUS_INVALID_IMAGE_FORMAT) + ENUM2STR_CASE(X_STATUS_INSUFFICIENT_RESOURCES) + ENUM2STR_CASE(X_STATUS_XBE_REGION_MISMATCH) + ENUM2STR_CASE(X_STATUS_XBE_MEDIA_MISMATCH) + ENUM2STR_CASE(X_STATUS_OBJECT_NAME_NOT_FOUND) + ENUM2STR_CASE(X_STATUS_OBJECT_NAME_COLLISION) ENUM2STR_END_and_LOGRENDER(NTSTATUS) */ diff --git a/src/core/kernel/exports/EmuKrnlMm.cpp b/src/core/kernel/exports/EmuKrnlMm.cpp index 3ca239736..49f749fff 100644 --- a/src/core/kernel/exports/EmuKrnlMm.cpp +++ b/src/core/kernel/exports/EmuKrnlMm.cpp @@ -416,7 +416,7 @@ XBSYSAPI EXPORTNUM(181) xbox::ntstatus_xt NTAPI xbox::MmQueryStatistics EmuLog(LOG_LEVEL::DEBUG, " MemoryStatistics->StackPagesCommitted = 0x%.08X", MemoryStatistics->StackPagesCommitted); EmuLog(LOG_LEVEL::DEBUG, " MemoryStatistics->ImagePagesCommitted = 0x%.08X", MemoryStatistics->ImagePagesCommitted); - ret = xbox::status_success; + ret = X_STATUS_SUCCESS; } else { diff --git a/src/core/kernel/exports/EmuKrnlNt.cpp b/src/core/kernel/exports/EmuKrnlNt.cpp index f821a18be..223a05585 100644 --- a/src/core/kernel/exports/EmuKrnlNt.cpp +++ b/src/core/kernel/exports/EmuKrnlNt.cpp @@ -140,7 +140,7 @@ XBSYSAPI EXPORTNUM(187) xbox::ntstatus_xt NTAPI xbox::NtClose { LOG_FUNC_ONE_ARG(Handle); - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_STATUS_SUCCESS; if (EmuHandle::IsEmuHandle(Handle)) { @@ -196,7 +196,7 @@ XBSYSAPI EXPORTNUM(188) xbox::ntstatus_xt NTAPI xbox::NtCreateDirectoryObject nativeObjectAttributes, "NtCreateDirectoryObject"); - if (ret == xbox::status_success) + if (ret == X_STATUS_SUCCESS) { // TODO : Is this the correct ACCESS_MASK? : const ACCESS_MASK DesiredAccess = DIRECTORY_CREATE_OBJECT; @@ -242,7 +242,7 @@ XBSYSAPI EXPORTNUM(189) xbox::ntstatus_xt NTAPI xbox::NtCreateEvent PKEVENT Event; result = ObCreateObject(&ExEventObjectType, ObjectAttributes, sizeof(KEVENT), (PVOID *)&Event); - if (nt_success(result)) { + if (X_NT_SUCCESS(result)) { KeInitializeEvent(Event, EventType, InitialState); result = ObInsertObject(Event, ObjectAttributes, 0, EventHandle); } @@ -376,7 +376,7 @@ XBSYSAPI EXPORTNUM(192) xbox::ntstatus_xt NTAPI xbox::NtCreateMutant PKMUTANT Mutant; Status = ObCreateObject(&ExMutantObjectType, ObjectAttributes, sizeof(KMUTANT), (PVOID *)&Mutant); - if (nt_success(Status)) { + if (X_NT_SUCCESS(Status)) { KeInitializeMutant(Mutant, InitialOwner); Status = ObInsertObject(Mutant, ObjectAttributes, 0, /*OUT* /MutantHandle); } @@ -450,7 +450,7 @@ XBSYSAPI EXPORTNUM(193) xbox::ntstatus_xt NTAPI xbox::NtCreateSemaphore PKSEMAPHORE Semaphore; Status = ObCreateObject(&ExSemaphoreObjectType, ObjectAttributes, sizeof(KSEMAPHORE), (PVOID *)&Semaphore); - if (nt_success(Status)) { + if (X_NT_SUCCESS(Status)) { KeInitializeSemaphore(Semaphore, InitialCount, /*Limit=* /MaximumCount); Status = ObInsertObject(Semaphore, ObjectAttributes, 0, /*OUT* /SemaphoreHandle); } @@ -523,7 +523,7 @@ XBSYSAPI EXPORTNUM(194) xbox::ntstatus_xt NTAPI xbox::NtCreateTimer PKTIMER Timer; Status = ObCreateObject(&ExTimerType, ObjectAttributes, sizeof(KTIMER), (PVOID *)&Timer); - if (nt_success(Status)) { + if (X_NT_SUCCESS(Status)) { KeInitializeTimerEx(Timer, TimerType); Status = ObInsertObject(Timer, ObjectAttributes, 0, /*OUT* /TimerHandle); } @@ -573,7 +573,7 @@ XBSYSAPI EXPORTNUM(195) xbox::ntstatus_xt NTAPI xbox::NtDeleteFile nativeObjectAttributes, "NtDeleteFile"); - if (ret == xbox::status_success) + if (ret == X_STATUS_SUCCESS) { ret = NtDll::NtDeleteFile( nativeObjectAttributes.NtObjAttrPtr); @@ -615,7 +615,7 @@ XBSYSAPI EXPORTNUM(196) xbox::ntstatus_xt NTAPI xbox::NtDeviceIoControlFile LOG_FUNC_ARG(OutputBufferLength) LOG_FUNC_END; - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_STATUS_SUCCESS; switch (IoControlCode) { @@ -650,7 +650,7 @@ XBSYSAPI EXPORTNUM(196) xbox::ntstatus_xt NTAPI xbox::NtDeviceIoControlFile } else { EmuLog(LOG_LEVEL::WARNING, "%s: Unrecongnized handle 0x%X with IoControlCode IOCTL_DISK_GET_DRIVE_GEOMETRY.", __func__, FileHandle); - ret = status_invalid_handle; + ret = X_STATUS_INVALID_HANDLE; } } break; @@ -679,7 +679,7 @@ XBSYSAPI EXPORTNUM(196) xbox::ntstatus_xt NTAPI xbox::NtDeviceIoControlFile } else { EmuLog(LOG_LEVEL::WARNING, "%s: Unrecongnized handle 0x%X with IoControlCode IOCTL_DISK_GET_PARTITION_INFO.", __func__, FileHandle); - ret = status_invalid_handle; + ret = X_STATUS_INVALID_HANDLE; } } break; @@ -707,13 +707,13 @@ XBSYSAPI EXPORTNUM(197) xbox::ntstatus_xt NTAPI xbox::NtDuplicateObject LOG_FUNC_ARG(Options) LOG_FUNC_END; - NTSTATUS result = xbox::status_success; + NTSTATUS result = X_STATUS_SUCCESS; #ifdef CXBX_KERNEL_REWORK_ENABLED PVOID Object; result = ObReferenceObjectByHandle(SourceHandle, /*ObjectType=*/nullptr, &Object); - if (nt_success(result)) { + if (X_NT_SUCCESS(result)) { if (ObpIsFlagSet(Options, DUPLICATE_CLOSE_SOURCE)) NtClose(SourceHandle); @@ -746,7 +746,7 @@ XBSYSAPI EXPORTNUM(197) xbox::ntstatus_xt NTAPI xbox::NtDuplicateObject Options); } - if (result != xbox::status_success) + if (result != X_STATUS_SUCCESS) EmuLog(LOG_LEVEL::WARNING, "Object was not duplicated!"); #endif @@ -766,7 +766,7 @@ XBSYSAPI EXPORTNUM(198) xbox::ntstatus_xt NTAPI xbox::NtFlushBuffersFile LOG_FUNC_ARG(FileHandle) LOG_FUNC_ARG_OUT(IoStatusBlock) LOG_FUNC_END; - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_STATUS_SUCCESS; if (EmuHandle::IsEmuHandle(FileHandle)) LOG_UNIMPLEMENTED(); @@ -839,7 +839,7 @@ XBSYSAPI EXPORTNUM(200) xbox::ntstatus_xt NTAPI xbox::NtFsControlFile int partitionNumber = CxbxGetPartitionNumberFromHandle(FileHandle); if (partitionNumber > 0) { CxbxFormatPartitionByHandle(FileHandle); - ret = xbox::status_success; + ret = X_STATUS_SUCCESS; } } break; @@ -852,10 +852,10 @@ XBSYSAPI EXPORTNUM(200) xbox::ntstatus_xt NTAPI xbox::NtFsControlFile pfatx_volume_metadata volume = static_cast(InputBuffer); assert(InputBufferLength == sizeof(fatx_volume_metadata)); g_io_mu_metadata->read(path[pos + 7], volume->offset, static_cast(volume->buffer), volume->length); - ret = xbox::status_success; + ret = X_STATUS_SUCCESS; } else { - ret = status_invalid_handle; + ret = X_STATUS_INVALID_HANDLE; } } break; @@ -868,10 +868,10 @@ XBSYSAPI EXPORTNUM(200) xbox::ntstatus_xt NTAPI xbox::NtFsControlFile pfatx_volume_metadata volume = static_cast(InputBuffer); assert(InputBufferLength == sizeof(fatx_volume_metadata)); g_io_mu_metadata->write(path[pos + 7], volume->offset, static_cast(volume->buffer), volume->length); - ret = xbox::status_success; + ret = X_STATUS_SUCCESS; } else { - ret = status_invalid_handle; + ret = X_STATUS_INVALID_HANDLE; } } break; @@ -1190,7 +1190,7 @@ XBSYSAPI EXPORTNUM(208) xbox::ntstatus_xt NTAPI xbox::NtQueryDirectoryObject LOG_UNIMPLEMENTED(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -1214,7 +1214,7 @@ XBSYSAPI EXPORTNUM(209) xbox::ntstatus_xt NTAPI xbox::NtQueryEvent sizeof(EVENT_BASIC_INFORMATION), /*ReturnLength=*/nullptr); - if (ret != xbox::status_success) + if (ret != X_STATUS_SUCCESS) EmuLog(LOG_LEVEL::WARNING, "NtQueryEvent failed! (%s)", NtStatusToString(ret)); RETURN(ret); @@ -1243,7 +1243,7 @@ XBSYSAPI EXPORTNUM(210) xbox::ntstatus_xt NTAPI xbox::NtQueryFullAttributesFile /*var*/nativeObjectAttributes, "NtQueryFullAttributesFile"); - if (ret == xbox::status_success) + if (ret == X_STATUS_SUCCESS) ret = NtDll::NtQueryFullAttributesFile( nativeObjectAttributes.NtObjAttrPtr, &nativeNetOpenInfo); @@ -1296,7 +1296,7 @@ XBSYSAPI EXPORTNUM(211) xbox::ntstatus_xt NTAPI xbox::NtQueryInformationFile (NtDll::FILE_INFORMATION_CLASS)FileInformationClass); // Buffer is too small; make a larger one - if (ret == xbox::status_buffer_overflow) + if (ret == X_STATUS_BUFFER_OVERFLOW) { free(ntFileInfo); @@ -1305,7 +1305,7 @@ XBSYSAPI EXPORTNUM(211) xbox::ntstatus_xt NTAPI xbox::NtQueryInformationFile if (bufferSize > 65536) return STATUS_INVALID_PARAMETER; // TODO: what's the appropriate error code to return here? } - } while (ret == xbox::status_buffer_overflow); + } while (ret == X_STATUS_BUFFER_OVERFLOW); // Convert and copy NT data to the given Xbox struct NTSTATUS convRet = NTToXboxFileInformation(ntFileInfo, FileInformation, FileInformationClass, Length); @@ -1318,7 +1318,7 @@ XBSYSAPI EXPORTNUM(211) xbox::ntstatus_xt 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 == xbox::status_buffer_overflow) + if (convRet == X_STATUS_BUFFER_OVERFLOW) return convRet; RETURN(ret); @@ -1340,7 +1340,7 @@ XBSYSAPI EXPORTNUM(212) xbox::ntstatus_xt NTAPI xbox::NtQueryIoCompletion LOG_UNIMPLEMENTED(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -1364,7 +1364,7 @@ XBSYSAPI EXPORTNUM(213) xbox::ntstatus_xt NTAPI xbox::NtQueryMutant sizeof(MUTANT_BASIC_INFORMATION), /*ReturnLength=*/nullptr); - if (ret != xbox::status_success) + if (ret != X_STATUS_SUCCESS) EmuLog(LOG_LEVEL::WARNING, "NtQueryMutant failed! (%s)", NtStatusToString(ret)); RETURN(ret); @@ -1391,7 +1391,7 @@ XBSYSAPI EXPORTNUM(214) xbox::ntstatus_xt NTAPI xbox::NtQuerySemaphore sizeof(SEMAPHORE_BASIC_INFORMATION), /*ReturnLength=*/nullptr); - if (ret != xbox::status_success) + if (ret != X_STATUS_SUCCESS) EmuLog(LOG_LEVEL::WARNING, "NtQuerySemaphore failed! (%s)", NtStatusToString(ret)); RETURN(ret); @@ -1424,7 +1424,7 @@ XBSYSAPI EXPORTNUM(215) xbox::ntstatus_xt NTAPI xbox::NtQuerySymbolicLinkObject auto iEmuHandle = (EmuHandle*)LinkHandle; // Retrieve the NtSymbolicLinkObject and populate the output arguments : - ret = xbox::status_success; + ret = X_STATUS_SUCCESS; symbolicLinkObject = (EmuNtSymbolicLinkObject*)iEmuHandle->NtObject; if (symbolicLinkObject->IsHostBasedPath) { @@ -1437,7 +1437,7 @@ XBSYSAPI EXPORTNUM(215) xbox::ntstatus_xt NTAPI xbox::NtQuerySymbolicLinkObject copy_string_to_PSTRING_to(symbolicLinkObject->XboxSymbolicLinkPath, LinkTarget); } else { - ret = xbox::status_buffer_too_small; + ret = X_STATUS_BUFFER_TOO_SMALL; } } @@ -1446,7 +1446,7 @@ XBSYSAPI EXPORTNUM(215) xbox::ntstatus_xt NTAPI xbox::NtQuerySymbolicLinkObject *ReturnedLength = symbolicLinkObject->XboxSymbolicLinkPath.length(); // Return full length (even if buffer was too small) } } - if (ret != xbox::status_success) + if (ret != X_STATUS_SUCCESS) EmuLog(LOG_LEVEL::WARNING, "NtQuerySymbolicLinkObject failed! (%s)", NtStatusToString(ret)); RETURN(ret); @@ -1502,7 +1502,7 @@ XBSYSAPI EXPORTNUM(217) xbox::ntstatus_xt NTAPI xbox::NtQueryVirtualMemory NTSTATUS ret = g_VMManager.XbVirtualMemoryStatistics((VAddr)BaseAddress, Buffer); - if (ret == xbox::status_success) + if (ret == X_STATUS_SUCCESS) { EmuLog(LOG_LEVEL::DEBUG, " Buffer->AllocationBase = 0x%.08X", Buffer->AllocationBase); EmuLog(LOG_LEVEL::DEBUG, " Buffer->AllocationProtect = 0x%.08X", Buffer->AllocationProtect); @@ -1532,7 +1532,7 @@ XBSYSAPI EXPORTNUM(217) xbox::ntstatus_xt 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) - result = xbox::status_success; + result = X_STATUS_SUCCESS; EmuLog(LOG_LEVEL::DEBUG, "NtQueryVirtualMemory: Applied fix for Forza Motorsport!"); } @@ -1589,7 +1589,7 @@ XBSYSAPI EXPORTNUM(218) xbox::ntstatus_xt NTAPI xbox::NtQueryVolumeInformationFi XboxSizeInfo->TotalAllocationUnits.QuadPart = partitionTable.TableEntries[partitionNumber - 1].LBASize / XboxSizeInfo->SectorsPerAllocationUnit; XboxSizeInfo->AvailableAllocationUnits.QuadPart = partitionTable.TableEntries[partitionNumber - 1].LBASize / XboxSizeInfo->SectorsPerAllocationUnit; - status = status_success; + status = X_STATUS_SUCCESS; } else if (type == DeviceType::MU) { @@ -1598,7 +1598,7 @@ XBSYSAPI EXPORTNUM(218) xbox::ntstatus_xt NTAPI xbox::NtQueryVolumeInformationFi XboxSizeInfo->TotalAllocationUnits.QuadPart = 512; // 8MB -> ((1024)^2 * 8) / (BytesPerSector * SectorsPerAllocationUnit) XboxSizeInfo->AvailableAllocationUnits.QuadPart = 512; // constant, so there's always free space available to write stuff - status = status_success; + status = X_STATUS_SUCCESS; } else if (type == DeviceType::Cdrom0) { @@ -1606,11 +1606,11 @@ XBSYSAPI EXPORTNUM(218) xbox::ntstatus_xt NTAPI xbox::NtQueryVolumeInformationFi XboxSizeInfo->SectorsPerAllocationUnit = 1; XboxSizeInfo->TotalAllocationUnits.QuadPart = 3820880; // assuming DVD-9 (dual layer), redump reports a total size in bytes of 7825162240 - status = status_success; + status = X_STATUS_SUCCESS; } else { EmuLog(LOG_LEVEL::WARNING, "%s: Unrecongnized handle 0x%X with class FileFsSizeInformation.", __func__, FileHandle); - status = status_invalid_handle; + status = X_STATUS_INVALID_HANDLE; } RETURN(status); @@ -1651,7 +1651,7 @@ XBSYSAPI EXPORTNUM(218) xbox::ntstatus_xt NTAPI xbox::NtQueryVolumeInformationFi (NtDll::FS_INFORMATION_CLASS)FileInformationClass); // Convert Xbox NativeFileInformation to FileInformation - if (ret == xbox::status_success) { + if (ret == X_STATUS_SUCCESS) { switch ((DWORD)FileInformationClass) { case FileFsVolumeInformation: { PFILE_FS_VOLUME_INFORMATION XboxVolumeInfo = (PFILE_FS_VOLUME_INFORMATION)FileInformation; @@ -1776,7 +1776,7 @@ XBSYSAPI EXPORTNUM(220) xbox::ntstatus_xt NTAPI xbox::NtReadFileScatter LOG_UNIMPLEMENTED(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -1799,7 +1799,7 @@ XBSYSAPI EXPORTNUM(221) xbox::ntstatus_xt NTAPI xbox::NtReleaseMutant if (FAILED(ret)) EmuLog(LOG_LEVEL::WARNING, "NtReleaseMutant Failed!"); - RETURN(xbox::status_success); // TODO : RETURN(result); + RETURN(X_STATUS_SUCCESS); // TODO : RETURN(result); } // ****************************************************************** @@ -1851,7 +1851,7 @@ XBSYSAPI EXPORTNUM(223) xbox::ntstatus_xt NTAPI xbox::NtRemoveIoCompletion LOG_UNIMPLEMENTED(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -1957,7 +1957,7 @@ XBSYSAPI EXPORTNUM(227) xbox::ntstatus_xt NTAPI xbox::NtSetIoCompletion LOG_UNIMPLEMENTED(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -1974,7 +1974,7 @@ XBSYSAPI EXPORTNUM(228) xbox::ntstatus_xt NTAPI xbox::NtSetSystemTime LOG_FUNC_ARG_OUT(PreviousTime) LOG_FUNC_END; - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_STATUS_SUCCESS; LARGE_INTEGER NewSystemTime, OldSystemTime; // LARGE_INTEGER LocalTime; // TIME_FIELDS TimeFields; @@ -2074,7 +2074,7 @@ XBSYSAPI EXPORTNUM(230) xbox::ntstatus_xt NTAPI xbox::NtSignalAndWaitForSingleOb LOG_UNIMPLEMENTED(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -2119,7 +2119,7 @@ XBSYSAPI EXPORTNUM(232) xbox::void_xt NTAPI xbox::NtUserIoApcDispatcher ULONG dwErrorCode = 0; ULONG dwTransferred = 0; - if (nt_success(IoStatusBlock->Status)) { + if (X_NT_SUCCESS(IoStatusBlock->Status)) { dwTransferred = (ULONG)IoStatusBlock->Information; } else { dwErrorCode = RtlNtStatusToDosError(IoStatusBlock->Status); @@ -2302,7 +2302,7 @@ XBSYSAPI EXPORTNUM(237) xbox::ntstatus_xt NTAPI xbox::NtWriteFileGather LOG_UNIMPLEMENTED(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** diff --git a/src/core/kernel/exports/EmuKrnlOb.cpp b/src/core/kernel/exports/EmuKrnlOb.cpp index f2a747b1f..0912173ad 100644 --- a/src/core/kernel/exports/EmuKrnlOb.cpp +++ b/src/core/kernel/exports/EmuKrnlOb.cpp @@ -87,13 +87,13 @@ xbox::boolean_xt xbox::ObpCreatePermanentDirectoryObject( HANDLE Handle; NTSTATUS status = NtCreateDirectoryObject(&Handle, &ObjectAttributes); - if (!nt_success(status)) { + if (!X_NT_SUCCESS(status)) { RETURN(FALSE); } status = ObReferenceObjectByHandle(Handle, &ObDirectoryObjectType, (PVOID *)DirectoryObject); - if (!nt_success(status)) { + if (!X_NT_SUCCESS(status)) { RETURN(FALSE); } @@ -135,14 +135,14 @@ xbox::ntstatus_xt xbox::ObpReferenceObjectByName( FoundObject = (POBJECT_DIRECTORY)ObpGetObjectHandleContents(RootDirectoryHandle); if (FoundObject == NULL) { - status = xbox::status_invalid_handle; + status = X_STATUS_INVALID_HANDLE; goto CleanupAndExit; } } if ((RemainingName.Length != 0) && (RemainingName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR)) { - status = xbox::status_object_name_invalid; + status = X_STATUS_OBJECT_NAME_INVALID; goto CleanupAndExit; } @@ -153,7 +153,7 @@ xbox::ntstatus_xt xbox::ObpReferenceObjectByName( if ((RemainingName.Length == 0) || (RemainingName.Buffer[0] != OBJ_NAME_PATH_SEPARATOR)) { - status = xbox::status_object_name_invalid; + status = X_STATUS_OBJECT_NAME_INVALID; goto CleanupAndExit; } @@ -171,7 +171,7 @@ xbox::ntstatus_xt xbox::ObpReferenceObjectByName( if (RemainingName.Length != 0) { if (RemainingName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR) { - status = xbox::status_object_name_invalid; + status = X_STATUS_OBJECT_NAME_INVALID; goto CleanupAndExit; } } else { @@ -182,7 +182,7 @@ xbox::ntstatus_xt xbox::ObpReferenceObjectByName( if (!ObpLookupElementNameInDirectory(Directory, &ElementName, ResolveSymbolicLink, &FoundObject)) { - status = (RemainingName.Length != 0) ? STATUS_OBJECT_PATH_NOT_FOUND : xbox::status_object_name_not_found; + status = (RemainingName.Length != 0) ? STATUS_OBJECT_PATH_NOT_FOUND : X_STATUS_OBJECT_NAME_NOT_FOUND; goto CleanupAndExit; } @@ -201,7 +201,7 @@ OpenRootDirectory: ObjectHeader->PointerCount++; *ReturnedObject = FoundObject; - status = xbox::status_success; + status = X_STATUS_SUCCESS; goto CleanupAndExit; } @@ -225,10 +225,10 @@ InvokeParseProcedure: status = ObjectHeader->Type->ParseProcedure(FoundObject, ObjectType, Attributes, ObjectName, &RemainingName, ParseContext, &ParsedObject); ObfDereferenceObject(FoundObject); - if (nt_success(status)) { + if (X_NT_SUCCESS(status)) { if ((ObjectType == NULL) || (ObjectType == OBJECT_TO_OBJECT_HEADER(ParsedObject)->Type)) { *ReturnedObject = ParsedObject; - status = xbox::status_success; + status = X_STATUS_SUCCESS; } else { ObfDereferenceObject(ParsedObject); status = STATUS_OBJECT_TYPE_MISMATCH; @@ -392,7 +392,7 @@ xbox::void_xt xbox::ObDissectName(OBJECT_STRING Path, POBJECT_STRING FirstName, static inline xbox::HANDLE ObpGetHandleByObjectThenDereferenceInline(const xbox::PVOID Object, xbox::ntstatus_xt& result) { xbox::HANDLE newHandle = nullptr; - if (xbox::nt_success(result)) { + if (X_NT_SUCCESS(result)) { xbox::KIRQL oldIrql = xbox::KeRaiseIrqlToDpcLevel(); newHandle = xbox::ObpCreateObjectHandle(Object); @@ -401,7 +401,7 @@ static inline xbox::HANDLE ObpGetHandleByObjectThenDereferenceInline(const xbox: if (newHandle == nullptr) { xbox::ObfDereferenceObject(Object); - result = xbox::status_insufficient_resources; + result = X_STATUS_INSUFFICIENT_RESOURCES; } } @@ -430,7 +430,7 @@ XBSYSAPI EXPORTNUM(239) xbox::ntstatus_xt NTAPI xbox::ObCreateObject POBJECT_HEADER ObjectHeader = (POBJECT_HEADER)ObjectType->AllocateProcedure(offsetof(OBJECT_HEADER, Body) + ObjectBodySize, ObjectType->PoolTag); if (ObjectHeader == nullptr) { - RETURN(xbox::status_insufficient_resources); + RETURN(X_STATUS_INSUFFICIENT_RESOURCES); } ObjectHeader->PointerCount = 1; @@ -440,7 +440,7 @@ XBSYSAPI EXPORTNUM(239) xbox::ntstatus_xt NTAPI xbox::ObCreateObject *Object = &ObjectHeader->Body; - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } OBJECT_STRING RemainingName = *ObjectAttributes->ObjectName; @@ -466,7 +466,7 @@ XBSYSAPI EXPORTNUM(239) xbox::ntstatus_xt NTAPI xbox::ObCreateObject ObjectBodySize + ElementName.Length, ObjectType->PoolTag); if (ObjectNameInfo == NULL) { - return xbox::status_insufficient_resources; + return X_STATUS_INSUFFICIENT_RESOURCES; } POBJECT_HEADER ObjectHeader = (POBJECT_HEADER)(ObjectNameInfo + 1); @@ -485,7 +485,7 @@ XBSYSAPI EXPORTNUM(239) xbox::ntstatus_xt NTAPI xbox::ObCreateObject *Object = &ObjectHeader->Body; - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -690,7 +690,7 @@ XBSYSAPI EXPORTNUM(241) xbox::ntstatus_xt NTAPI xbox::ObInsertObject goto CleanupAndExit; } } else { - status = xbox::status_object_name_collision; + status = X_STATUS_OBJECT_NAME_COLLISION; goto CleanupAndExit; } } @@ -718,7 +718,7 @@ XBSYSAPI EXPORTNUM(241) xbox::ntstatus_xt NTAPI xbox::ObInsertObject Handle = ObpCreateObjectHandle(InsertObject); if (Handle == NULL) { - status = xbox::status_insufficient_resources; + status = X_STATUS_INSUFFICIENT_RESOURCES; goto CleanupAndExit; } @@ -758,7 +758,7 @@ XBSYSAPI EXPORTNUM(241) xbox::ntstatus_xt NTAPI xbox::ObInsertObject ObjectHeader->Flags |= OB_FLAG_PERMANENT_OBJECT; } - status = (Object == InsertObject) ? xbox::status_success : STATUS_OBJECT_NAME_EXISTS; + status = (Object == InsertObject) ? X_STATUS_SUCCESS : STATUS_OBJECT_NAME_EXISTS; CleanupAndExit: KfLowerIrql(OldIrql); @@ -822,10 +822,10 @@ XBSYSAPI EXPORTNUM(243) xbox::ntstatus_xt NTAPI xbox::ObOpenObjectByName { // Return a new handle (which is an EmuHandle, actually) : *Handle = symbolicLinkObject->NewHandle(); - result = xbox::status_success; + result = X_STATUS_SUCCESS; } - if (!nt_success(result)) { + if (!X_NT_SUCCESS(result)) { EmuLog(LOG_LEVEL::WARNING, "NtOpenSymbolicLinkObject failed! (%s)", NtStatusToString(result)); } else { @@ -835,7 +835,7 @@ XBSYSAPI EXPORTNUM(243) xbox::ntstatus_xt NTAPI xbox::ObOpenObjectByName else { LOG_UNIMPLEMENTED(); assert(false); - result = xbox::status_success; + result = X_STATUS_SUCCESS; } #endif @@ -867,7 +867,7 @@ XBSYSAPI EXPORTNUM(244) xbox::ntstatus_xt NTAPI xbox::ObOpenObjectByPointer LOG_UNIMPLEMENTED(); assert(false); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); #endif } @@ -903,7 +903,7 @@ XBSYSAPI EXPORTNUM(246) xbox::ntstatus_xt NTAPI xbox::ObReferenceObjectByHandle ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); InterlockedIncrement((::PLONG)(&ObjectHeader->PointerCount)); *ReturnedObject = Object; - return xbox::status_success; + return X_STATUS_SUCCESS; } else { status = STATUS_OBJECT_TYPE_MISMATCH; } @@ -915,7 +915,7 @@ XBSYSAPI EXPORTNUM(246) xbox::ntstatus_xt NTAPI xbox::ObReferenceObjectByHandle if ((ObjectType == ObjectHeader->Type) || (ObjectType == NULL)) { *ReturnedObject = Object; - return xbox::status_success; + return X_STATUS_SUCCESS; } else { ObfDereferenceObject(Object); status = STATUS_OBJECT_TYPE_MISMATCH; @@ -928,7 +928,7 @@ XBSYSAPI EXPORTNUM(246) xbox::ntstatus_xt NTAPI xbox::ObReferenceObjectByHandle if (GetHandleInformation(Handle, &flags)) { // This was a Windows Handle, so return it. *ReturnedObject = Handle; - return xbox::status_success; + return X_STATUS_SUCCESS; } status = STATUS_INVALID_HANDLE; @@ -982,7 +982,7 @@ XBSYSAPI EXPORTNUM(248) xbox::ntstatus_xt NTAPI xbox::ObReferenceObjectByPointer if (ObjectType == ObjectHeader->Type) { InterlockedIncrement((::PLONG)(&ObjectHeader->PointerCount)); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } RETURN(STATUS_OBJECT_TYPE_MISMATCH); diff --git a/src/core/kernel/exports/EmuKrnlPhy.cpp b/src/core/kernel/exports/EmuKrnlPhy.cpp index b43689c04..c2aee1080 100644 --- a/src/core/kernel/exports/EmuKrnlPhy.cpp +++ b/src/core/kernel/exports/EmuKrnlPhy.cpp @@ -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 xbox::status_success +#define NETERR_OK X_STATUS_SUCCESS #define NETERR_HARDWARE 0x801f0001 // hardware not responding #define BIT(n) (1u << (n)) diff --git a/src/core/kernel/exports/EmuKrnlPs.cpp b/src/core/kernel/exports/EmuKrnlPs.cpp index db23f8fa8..2fa2f9564 100644 --- a/src/core/kernel/exports/EmuKrnlPs.cpp +++ b/src/core/kernel/exports/EmuKrnlPs.cpp @@ -119,7 +119,7 @@ static unsigned int WINAPI PCSTProxy // This will also handle thread notification : LOG_TEST_CASE("Thread returned from SystemRoutine"); - xbox::PsTerminateSystemThread(xbox::status_success); + xbox::PsTerminateSystemThread(X_STATUS_SUCCESS); return 0; // will never be reached } @@ -134,7 +134,7 @@ void PspSystemThreadStartup // TODO : Call PspUnhandledExceptionInSystemThread(GetExceptionInformation()) (StartRoutine)(StartContext); - xbox::PsTerminateSystemThread(xbox::status_success); + xbox::PsTerminateSystemThread(X_STATUS_SUCCESS); } // ****************************************************************** @@ -256,7 +256,7 @@ XBSYSAPI EXPORTNUM(255) xbox::ntstatus_xt NTAPI xbox::PsCreateSystemThreadEx HANDLE handle = reinterpret_cast(_beginthreadex(NULL, KernelStackSize, PCSTProxy, iPCSTProxyParam, CREATE_SUSPENDED, reinterpret_cast(&dwThreadId))); if (handle == NULL) { delete iPCSTProxyParam; - RETURN(xbox::status_insufficient_resources); + RETURN(X_STATUS_INSUFFICIENT_RESOURCES); } *ThreadHandle = handle; if (ThreadId != NULL) @@ -276,7 +276,7 @@ XBSYSAPI EXPORTNUM(255) xbox::ntstatus_xt NTAPI xbox::PsCreateSystemThreadEx EmuLog(LOG_LEVEL::DEBUG, "Created Xbox proxy thread. Handle : 0x%X, ThreadId : [0x%.4X]", handle, dwThreadId); } - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -289,7 +289,7 @@ XBSYSAPI EXPORTNUM(256) xbox::ntstatus_xt NTAPI xbox::PsQueryStatistics { LOG_FUNC_ONE_ARG_OUT(ProcessStatistics); - NTSTATUS ret = xbox::status_success; + NTSTATUS ret = X_STATUS_SUCCESS; if (ProcessStatistics->Length == sizeof(PS_STATISTICS)) { LOG_INCOMPLETE(); // TODO : Return number of threads and handles that currently exist @@ -312,7 +312,7 @@ XBSYSAPI EXPORTNUM(257) xbox::ntstatus_xt NTAPI xbox::PsSetCreateThreadNotifyRou { LOG_FUNC_ONE_ARG(NotifyRoutine); - NTSTATUS ret = xbox::status_insufficient_resources; + NTSTATUS ret = X_STATUS_INSUFFICIENT_RESOURCES; // Taken from xbox::EmuXRegisterThreadNotifyRoutine (perhaps that can be removed now) : @@ -329,7 +329,7 @@ XBSYSAPI EXPORTNUM(257) xbox::ntstatus_xt NTAPI xbox::PsSetCreateThreadNotifyRou { g_pfnThreadNotification[i] = (PVOID)NotifyRoutine; g_iThreadNotificationCount++; - ret = xbox::status_success; + ret = X_STATUS_SUCCESS; break; } } diff --git a/src/core/kernel/exports/EmuKrnlRtl.cpp b/src/core/kernel/exports/EmuKrnlRtl.cpp index 614d21601..f3799713a 100644 --- a/src/core/kernel/exports/EmuKrnlRtl.cpp +++ b/src/core/kernel/exports/EmuKrnlRtl.cpp @@ -97,26 +97,26 @@ XBSYSAPI EXPORTNUM(260) xbox::ntstatus_xt NTAPI xbox::RtlAnsiStringToUnicodeStri dword_xt total = RtlAnsiStringToUnicodeSize(SourceString); if (total > 0xffff) { - return xbox::status_invalid_parameter_2; + return X_STATUS_INVALID_PARAMETER_2; } DestinationString->Length = (USHORT)(total - sizeof(WCHAR)); if (AllocateDestinationString) { DestinationString->MaximumLength = (USHORT)total; if (!(DestinationString->Buffer = (USHORT*)ExAllocatePoolWithTag(total, 'grtS'))) { - return xbox::status_no_memory; + return X_STATUS_NO_MEMORY; } } else { if (total > DestinationString->MaximumLength) { - return xbox::status_buffer_overflow; + return X_STATUS_BUFFER_OVERFLOW; } } RtlMultiByteToUnicodeN((PWSTR)DestinationString->Buffer, (ULONG)DestinationString->Length, NULL, SourceString->Buffer, SourceString->Length); DestinationString->Buffer[DestinationString->Length / sizeof(WCHAR)] = 0; - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -133,13 +133,13 @@ XBSYSAPI EXPORTNUM(261) xbox::ntstatus_xt NTAPI xbox::RtlAppendStringToString LOG_FUNC_ARG(Source) LOG_FUNC_END; - NTSTATUS result = xbox::status_success; + NTSTATUS result = X_STATUS_SUCCESS; USHORT dstLen = Destination->Length; USHORT srcLen = Source->Length; if (srcLen > 0) { if ((srcLen + dstLen) > Destination->MaximumLength) { - result = xbox::status_buffer_too_small; + result = X_STATUS_BUFFER_TOO_SMALL; } else { CHAR *dstBuf = Destination->Buffer + Destination->Length; @@ -166,13 +166,13 @@ XBSYSAPI EXPORTNUM(262) xbox::ntstatus_xt NTAPI xbox::RtlAppendUnicodeStringToSt LOG_FUNC_ARG(Source) LOG_FUNC_END; - NTSTATUS result = xbox::status_success; + NTSTATUS result = X_STATUS_SUCCESS; USHORT dstLen = Destination->Length; USHORT srcLen = Source->Length; if (srcLen > 0) { if ((srcLen + dstLen) > Destination->MaximumLength) { - result = xbox::status_buffer_too_small; + result = X_STATUS_BUFFER_TOO_SMALL; } else { WCHAR *dstBuf = (WCHAR*)(Destination->Buffer + (Destination->Length / sizeof(WCHAR))); @@ -201,7 +201,7 @@ XBSYSAPI EXPORTNUM(263) xbox::ntstatus_xt NTAPI xbox::RtlAppendUnicodeToString LOG_FUNC_ARG(Source) LOG_FUNC_END; - NTSTATUS result = xbox::status_success; + NTSTATUS result = X_STATUS_SUCCESS; if (Source != NULL) { UNICODE_STRING unicodeString; RtlInitUnicodeString(&unicodeString, Source); @@ -387,7 +387,7 @@ XBSYSAPI EXPORTNUM(267) xbox::ntstatus_xt NTAPI xbox::RtlCharToInteger } *Value = bMinus ? (0 - RunningTotal) : RunningTotal; - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -645,18 +645,18 @@ XBSYSAPI EXPORTNUM(276) xbox::ntstatus_xt NTAPI xbox::RtlDowncaseUnicodeString LOG_FUNC_ARG(AllocateDestinationString) LOG_FUNC_END; - NTSTATUS result = xbox::status_success; + NTSTATUS result = X_STATUS_SUCCESS; if (AllocateDestinationString) { DestinationString->MaximumLength = SourceString->Length; DestinationString->Buffer = (USHORT*)ExAllocatePoolWithTag((ULONG)DestinationString->MaximumLength, 'grtS'); if (DestinationString->Buffer == NULL) { - return xbox::status_no_memory; + return X_STATUS_NO_MEMORY; } } else { if (SourceString->Length > DestinationString->MaximumLength) { - return xbox::status_buffer_overflow; + return X_STATUS_BUFFER_OVERFLOW; } } @@ -699,7 +699,7 @@ XBSYSAPI EXPORTNUM(277) xbox::void_xt NTAPI xbox::RtlEnterCriticalSection (boolean_xt)0, (PLARGE_INTEGER)0 ); - if (!nt_success(result)) + if (!X_NT_SUCCESS(result)) { CxbxrKrnlAbort("Waiting for event of a critical section returned %lx.", result); }; @@ -1169,7 +1169,7 @@ XBSYSAPI EXPORTNUM(292) xbox::ntstatus_xt NTAPI xbox::RtlIntegerToChar SIZE_T len = &buffer[32] - pos; if (len > (SIZE_T)OutputLength) { - return xbox::status_buffer_overflow; + return X_STATUS_BUFFER_OVERFLOW; } else if (String == NULL) { return STATUS_ACCESS_VIOLATION; @@ -1181,7 +1181,7 @@ XBSYSAPI EXPORTNUM(292) xbox::ntstatus_xt NTAPI xbox::RtlIntegerToChar RtlCopyMemory(String, pos, len + 1); } - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -1203,7 +1203,7 @@ XBSYSAPI EXPORTNUM(293) xbox::ntstatus_xt NTAPI xbox::RtlIntegerToUnicodeString CHAR Buffer[33]; NTSTATUS Status = RtlIntegerToChar(Value, Base, sizeof(Buffer), Buffer); - if (nt_success(Status)) { + if (X_NT_SUCCESS(Status)) { ANSI_STRING AnsiString; AnsiString.Buffer = Buffer; @@ -1363,7 +1363,7 @@ XBSYSAPI EXPORTNUM(299) xbox::ntstatus_xt NTAPI xbox::RtlMultiByteToUnicodeN numChars--; } - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -1384,7 +1384,7 @@ XBSYSAPI EXPORTNUM(300) xbox::ntstatus_xt NTAPI xbox::RtlMultiByteToUnicodeSize *BytesInUnicodeString = BytesInMultiByteString * sizeof(WCHAR); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -1699,19 +1699,19 @@ XBSYSAPI EXPORTNUM(308) xbox::ntstatus_xt NTAPI xbox::RtlUnicodeStringToAnsiStri LOG_FUNC_ARG(AllocateDestinationString) LOG_FUNC_END; - ntstatus_xt ret = xbox::status_success; + ntstatus_xt ret = X_STATUS_SUCCESS; dword_xt AnsiMaxLength = RtlUnicodeStringToAnsiSize(SourceString); DestinationString->Length = (ushort_xt)(AnsiMaxLength - 1); if (AllocateDestinationString) { DestinationString->MaximumLength = (ushort_xt)AnsiMaxLength; if (!(DestinationString->Buffer = (PCHAR)ExAllocatePoolWithTag(AnsiMaxLength, 'grtS'))) { - ret = xbox::status_no_memory; + ret = X_STATUS_NO_MEMORY; goto forceReturn; } } else if (DestinationString->MaximumLength < AnsiMaxLength) { - ret = xbox::status_buffer_overflow; + ret = X_STATUS_BUFFER_OVERFLOW; if (!DestinationString->MaximumLength) { goto forceReturn; @@ -1723,7 +1723,7 @@ XBSYSAPI EXPORTNUM(308) xbox::ntstatus_xt NTAPI xbox::RtlUnicodeStringToAnsiStri xbox::ulong_xt index = 0; ntstatus_xt result = RtlUnicodeToMultiByteN(DestinationString->Buffer, DestinationString->Length, &index, (PWSTR)SourceString->Buffer, SourceString->Length); - if (nt_success(result)) { + if (X_NT_SUCCESS(result)) { DestinationString->Buffer[index] = 0; } else { @@ -1834,7 +1834,7 @@ XBSYSAPI EXPORTNUM(309) xbox::ntstatus_xt NTAPI xbox::RtlUnicodeStringToInteger *Value = bMinus ? (0 - RunningTotal) : RunningTotal; - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -1872,7 +1872,7 @@ XBSYSAPI EXPORTNUM(310) xbox::ntstatus_xt NTAPI xbox::RtlUnicodeToMultiByteN numChars--; } - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -1893,7 +1893,7 @@ XBSYSAPI EXPORTNUM(311) xbox::ntstatus_xt NTAPI xbox::RtlUnicodeToMultiByteSize *BytesInMultiByteString = BytesInUnicodeString * sizeof(WCHAR); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -1952,12 +1952,12 @@ XBSYSAPI EXPORTNUM(314) xbox::ntstatus_xt NTAPI xbox::RtlUpcaseUnicodeString DestinationString->MaximumLength = SourceString->Length; DestinationString->Buffer = (USHORT*)ExAllocatePoolWithTag((ULONG)DestinationString->MaximumLength, 'grtS'); if (DestinationString->Buffer == NULL) { - return xbox::status_no_memory; + return X_STATUS_NO_MEMORY; } } else { if (SourceString->Length > DestinationString->MaximumLength) { - return xbox::status_buffer_overflow; + return X_STATUS_BUFFER_OVERFLOW; } } @@ -1970,7 +1970,7 @@ XBSYSAPI EXPORTNUM(314) xbox::ntstatus_xt NTAPI xbox::RtlUpcaseUnicodeString DestinationString->Length = SourceString->Length; - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** @@ -2011,7 +2011,7 @@ XBSYSAPI EXPORTNUM(315) xbox::ntstatus_xt NTAPI xbox::RtlUpcaseUnicodeToMultiByt numChars--; } - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // ****************************************************************** diff --git a/src/core/kernel/exports/EmuKrnlXe.cpp b/src/core/kernel/exports/EmuKrnlXe.cpp index 978660fe0..e7e0258a0 100644 --- a/src/core/kernel/exports/EmuKrnlXe.cpp +++ b/src/core/kernel/exports/EmuKrnlXe.cpp @@ -64,7 +64,7 @@ XBSYSAPI EXPORTNUM(327) xbox::ntstatus_xt NTAPI xbox::XeLoadSection LOG_FUNC_ARG(Section) LOG_FUNC_END; - NTSTATUS ret = status_success; + NTSTATUS ret = X_STATUS_SUCCESS; void* sectionData = CxbxKrnl_Xbe->FindSection(Section); if (sectionData != nullptr) { @@ -80,7 +80,7 @@ XBSYSAPI EXPORTNUM(327) xbox::ntstatus_xt 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 != xbox::status_success) { + if (ret != X_STATUS_SUCCESS) { RETURN(ret); } @@ -98,7 +98,7 @@ XBSYSAPI EXPORTNUM(327) xbox::ntstatus_xt NTAPI xbox::XeLoadSection Section->SectionReferenceCount++; } else { - ret = status_invalid_handle; + ret = X_STATUS_INVALID_HANDLE; } RETURN(ret); @@ -156,7 +156,7 @@ XBSYSAPI EXPORTNUM(328) xbox::ntstatus_xt NTAPI xbox::XeUnloadSection } } - ret = xbox::status_success; + ret = X_STATUS_SUCCESS; } RETURN(ret); diff --git a/src/core/kernel/init/CxbxKrnl.cpp b/src/core/kernel/init/CxbxKrnl.cpp index 723068cf9..ca7ef6e65 100644 --- a/src/core/kernel/init/CxbxKrnl.cpp +++ b/src/core/kernel/init/CxbxKrnl.cpp @@ -1686,7 +1686,7 @@ void CxbxKrnlPrintUEM(ULONG ErrorCode) xbox::ntstatus_xt status = xbox::ExQueryNonVolatileSetting(xbox::XC_MAX_ALL, &Type, &Eeprom, sizeof(Eeprom), (xbox::PSIZE_T)&ResultSize); - if (status == xbox::status_success) + if (status == X_STATUS_SUCCESS) { xbox::XBOX_UEM_INFO* UEMInfo = (xbox::XBOX_UEM_INFO*)&(Eeprom.UEMInfo[0]); diff --git a/src/core/kernel/memory-manager/VMManager.cpp b/src/core/kernel/memory-manager/VMManager.cpp index 8927722c0..308d33db0 100644 --- a/src/core/kernel/memory-manager/VMManager.cpp +++ b/src/core/kernel/memory-manager/VMManager.cpp @@ -1320,7 +1320,7 @@ xbox::ntstatus_xt VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits // 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(xbox::status_invalid_page_protection); } + if (!ConvertXboxToPtePermissions(Protect, &TempPte)) { RETURN(X_STATUS_INVALID_PAGE_PROTECTION); } EmuLog(LOG_LEVEL::DEBUG, "%s requested range : 0x%.8X - 0x%.8X", __func__, CapturedBase, CapturedBase + CapturedSize); @@ -1350,7 +1350,7 @@ xbox::ntstatus_xt VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits AlignedCapturedBase = MapMemoryBlock(UserRegion, AlignedCapturedSize >> PAGE_SHIFT, MEM_RESERVE, false, MaxAllowedAddress); - if (!AlignedCapturedBase) { status = xbox::status_no_memory; goto Exit; } + if (!AlignedCapturedBase) { status = X_STATUS_NO_MEMORY; goto Exit; } } else { @@ -1362,7 +1362,7 @@ xbox::ntstatus_xt VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits { // Reserved vma or we are overflowing a free vma, report an error - status = xbox::status_conflicting_addresses; + status = X_STATUS_CONFLICTING_ADDRESSES; goto Exit; } @@ -1384,7 +1384,7 @@ xbox::ntstatus_xt VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits { // An host allocation is already mapped there, report an error - status = xbox::status_conflicting_addresses; + status = X_STATUS_CONFLICTING_ADDRESSES; goto Exit; } } @@ -1402,7 +1402,7 @@ xbox::ntstatus_xt VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits *addr = AlignedCapturedBase; *Size = AlignedCapturedSize; - status = xbox::status_success; + status = X_STATUS_SUCCESS; goto Exit; } bDestructVmaOnFailure = true; @@ -1423,7 +1423,7 @@ xbox::ntstatus_xt VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits { // The specified region is not completely inside a reserved vma or it's free - status = xbox::status_conflicting_addresses; + status = X_STATUS_CONFLICTING_ADDRESSES; goto Exit; } @@ -1435,7 +1435,7 @@ xbox::ntstatus_xt VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits *Size = AlignedCapturedSize; Unlock(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); } // Figure out the number of physical pages we need to allocate. Note that NtAllocateVirtualMemory can do overlapped allocations so we @@ -1455,7 +1455,7 @@ xbox::ntstatus_xt VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits if (!IsMappable(PteNumber, true, m_MmLayoutDebug && m_bAllowNonDebuggerOnTop64MiB ? true : false)) { - status = xbox::status_no_memory; + status = X_STATUS_NO_MEMORY; goto Exit; } @@ -1468,7 +1468,7 @@ xbox::ntstatus_xt VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits (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 = xbox::status_no_memory; + status = X_STATUS_NO_MEMORY; goto Exit; } } @@ -1477,7 +1477,7 @@ xbox::ntstatus_xt VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits if (!AllocatePT(AlignedCapturedSize, AlignedCapturedBase)) { - status = xbox::status_no_memory; + status = X_STATUS_NO_MEMORY; goto Exit; } @@ -1517,7 +1517,7 @@ xbox::ntstatus_xt VMManager::XbAllocateVirtualMemory(VAddr* addr, ULONG ZeroBits *addr = AlignedCapturedBase; *Size = AlignedCapturedSize; Unlock(); - RETURN(xbox::status_success); + RETURN(X_STATUS_SUCCESS); Exit: if (bDestructVmaOnFailure) @@ -1577,7 +1577,7 @@ xbox::ntstatus_xt VMManager::XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWOR { // Free vma, report an error - status = xbox::status_memory_not_allocated; + status = X_STATUS_MEMORY_NOT_ALLOCATED; goto Exit; } @@ -1585,7 +1585,7 @@ xbox::ntstatus_xt VMManager::XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWOR { // The provided ending adddress is beyond the end of the vma, report an error - status = xbox::status_unable_to_free_vm; + status = X_STATUS_UNABLE_TO_FREE_VM; goto Exit; } @@ -1599,7 +1599,7 @@ xbox::ntstatus_xt VMManager::XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWOR { // The provided base address is not the starting address of the vma, report an error - status = xbox::status_free_vm_not_at_base; + status = X_STATUS_FREE_VM_NOT_AT_BASE; goto Exit; } @@ -1680,7 +1680,7 @@ xbox::ntstatus_xt VMManager::XbFreeVirtualMemory(VAddr* addr, size_t* Size, DWOR *addr = AlignedCapturedBase; *Size = AlignedCapturedSize; - status = xbox::status_success; + status = X_STATUS_SUCCESS; Exit: Unlock(); @@ -1721,7 +1721,7 @@ xbox::ntstatus_xt VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* // Size cannot be zero if (CapturedSize == 0) { RETURN(STATUS_INVALID_PARAMETER); } - if (!ConvertXboxToPtePermissions(NewPerms, &NewPermsPte)) { RETURN(xbox::status_invalid_page_protection); } + if (!ConvertXboxToPtePermissions(NewPerms, &NewPermsPte)) { RETURN(X_STATUS_INVALID_PAGE_PROTECTION); } AlignedCapturedBase = ROUND_DOWN_4K(CapturedBase); AlignedCapturedSize = (PAGES_SPANNED(CapturedBase, CapturedSize)) << PAGE_SHIFT; @@ -1734,7 +1734,7 @@ xbox::ntstatus_xt VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* { // Free vma or the requested ending address is beyond the vma, report an error - status = xbox::status_conflicting_addresses; + status = X_STATUS_CONFLICTING_ADDRESSES; goto Exit; } @@ -1754,7 +1754,7 @@ xbox::ntstatus_xt VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* { // Pde is not committed, report an error - status = xbox::status_not_committed; + status = X_STATUS_NOT_COMMITTED; goto Exit; } } @@ -1763,7 +1763,7 @@ xbox::ntstatus_xt VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* { // Pte is not committed, report an error - status = xbox::status_not_committed; + status = X_STATUS_NOT_COMMITTED; goto Exit; } @@ -1798,7 +1798,7 @@ xbox::ntstatus_xt VMManager::XbVirtualProtect(VAddr* addr, size_t* Size, DWORD* *addr = AlignedCapturedBase; *Size = AlignedCapturedSize; *Protect = ConvertPteToXboxPermissions(OldPermsPte.Default); - status = xbox::status_success; + status = X_STATUS_SUCCESS; Exit: Unlock(); @@ -1844,7 +1844,7 @@ xbox::ntstatus_xt VMManager::XbVirtualMemoryStatistics(VAddr addr, xbox::PMEMORY memory_statistics->RegionSize = info.RegionSize; memory_statistics->State = info.State; memory_statistics->Type = info.Type; - return xbox::status_success; + return X_STATUS_SUCCESS; } else { return STATUS_INVALID_PARAMETER; @@ -1873,7 +1873,7 @@ xbox::ntstatus_xt VMManager::XbVirtualMemoryStatistics(VAddr addr, xbox::PMEMORY memory_statistics->Type = 0; Unlock(); - return xbox::status_success; + return X_STATUS_SUCCESS; } // The vma is in the reserved or allocated state @@ -1942,7 +1942,7 @@ xbox::ntstatus_xt VMManager::XbVirtualMemoryStatistics(VAddr addr, xbox::PMEMORY memory_statistics->Type = XBOX_MEM_PRIVATE; Unlock(); - return xbox::status_success; + return X_STATUS_SUCCESS; } VAddr VMManager::MapMemoryBlock(MemoryRegionType Type, PFN_COUNT PteNumber, DWORD Permissions, bool b64Blocks, VAddr HighestAddress) diff --git a/src/core/kernel/support/EmuFS.cpp b/src/core/kernel/support/EmuFS.cpp index a667b91ad..651fd1a39 100644 --- a/src/core/kernel/support/EmuFS.cpp +++ b/src/core/kernel/support/EmuFS.cpp @@ -204,16 +204,16 @@ void EmuKeFreePcr() Dummy = static_cast(Pcr->NtTib.StackBase) - 12; Size = xbox::zero; Status = xbox::NtFreeVirtualMemory(&Dummy, &Size, XBOX_MEM_RELEASE); // free tls - assert(Status == xbox::status_success); + assert(Status == X_STATUS_SUCCESS); } Dummy = Pcr->Prcb->CurrentThread; Size = xbox::zero; Status = xbox::NtFreeVirtualMemory(&Dummy, &Size, XBOX_MEM_RELEASE); // free ethread - assert(Status == xbox::status_success); + assert(Status == X_STATUS_SUCCESS); Dummy = Pcr; Size = xbox::zero; Status = xbox::NtFreeVirtualMemory(&Dummy, &Size, XBOX_MEM_RELEASE); // free pcr - assert(Status == xbox::status_success); + assert(Status == X_STATUS_SUCCESS); __writefsdword(TIB_ArbitraryDataSlot, NULL); } else { diff --git a/src/core/kernel/support/EmuFile.cpp b/src/core/kernel/support/EmuFile.cpp index bca69a3a3..b7b057e47 100644 --- a/src/core/kernel/support/EmuFile.cpp +++ b/src/core/kernel/support/EmuFile.cpp @@ -463,7 +463,7 @@ bool EmuHandle::IsEmuHandle(HANDLE Handle) NTSTATUS EmuHandle::NtDuplicateObject(PHANDLE TargetHandle, DWORD Options) { *TargetHandle = NtObject->NtDuplicateObject(Options)->NewHandle(); - return xbox::status_success; + return X_STATUS_SUCCESS; } EmuNtObject::EmuNtObject() @@ -483,7 +483,7 @@ NTSTATUS EmuNtObject::NtClose() delete this; } - return xbox::status_success; + return X_STATUS_SUCCESS; } EmuNtObject* EmuNtObject::NtDuplicateObject(DWORD Options) @@ -698,7 +698,7 @@ NTSTATUS CxbxConvertFilePath( // Convert the relative path to unicode RelativeHostPath = string_to_wstring(RelativePath); - return xbox::status_success; + return X_STATUS_SUCCESS; } NTSTATUS CxbxObjectAttributesToNT( @@ -711,7 +711,7 @@ NTSTATUS CxbxObjectAttributesToNT( { // When the pointer is nil, make sure we pass nil to Windows too : nativeObjectAttributes.NtObjAttrPtr = nullptr; - return xbox::status_success; + return X_STATUS_SUCCESS; } // Pick up the ObjectName, and let's see what to make of it : @@ -743,7 +743,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 xbox::status_success; + return X_STATUS_SUCCESS; } int CxbxDeviceIndexByDevicePath(const char *XboxDevicePath) @@ -853,14 +853,14 @@ xbox::ntstatus_xt CxbxCreateSymbolicLink(std::string SymbolicLinkName, std::stri // If symbolic link exist, return object name collsion. Do NOT delete existing symlink object! if (SymbolicLinkObject != NULL) { - return xbox::status_object_name_collision; + return X_STATUS_OBJECT_NAME_COLLISION; } // Now (re)create a symbolic link object, and initialize it with the new definition : SymbolicLinkObject = new EmuNtSymbolicLinkObject(); result = SymbolicLinkObject->Init(SymbolicLinkName, FullPath); - if (result != xbox::status_success) { + if (result != X_STATUS_SUCCESS) { SymbolicLinkObject->NtClose(); } // TODO: Remove whole else if statement below, see g_hCurDir_hack's comment for remark. @@ -888,7 +888,7 @@ NTSTATUS EmuNtSymbolicLinkObject::Init(std::string aSymbolicLinkName, std::strin DriveLetter = SymbolicLinkToDriveLetter(aSymbolicLinkName); if (DriveLetter >= 'A' && DriveLetter <= 'Z') { - result = xbox::status_object_name_collision; + result = X_STATUS_OBJECT_NAME_COLLISION; if (FindNtSymbolicLinkObjectByDriveLetter(DriveLetter) == NULL) { // Look up the partition in the list of pre-registered devices : @@ -913,7 +913,7 @@ NTSTATUS EmuNtSymbolicLinkObject::Init(std::string aSymbolicLinkName, std::strin if (DeviceIndex >= 0) { - result = xbox::status_success; + result = X_STATUS_SUCCESS; SymbolicLinkName = aSymbolicLinkName; if (IsHostBasedPath) { // Handle the case where a sub folder of the partition is mounted (instead of it's root) : @@ -1100,8 +1100,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) - ? xbox::status_success - : xbox::status_buffer_overflow; + ? X_STATUS_SUCCESS + : X_STATUS_BUFFER_OVERFLOW; } // ---------------------------------------------------------------------------- @@ -1116,7 +1116,7 @@ NTSTATUS _NTToXboxNetOpenInfo(NtDll::FILE_NETWORK_OPEN_INFORMATION *ntNetOpenInf // Fix up attributes xboxNetOpenInfo->FileAttributes &= FILE_ATTRIBUTE_VALID_FLAGS; - return xbox::status_success; + return X_STATUS_SUCCESS; } NTSTATUS _NTToXboxBasicInfo(NtDll::FILE_BASIC_INFORMATION *ntBasicInfo, xbox::FILE_BASIC_INFORMATION *xboxBasicInfo, ULONG Length) @@ -1126,7 +1126,7 @@ NTSTATUS _NTToXboxBasicInfo(NtDll::FILE_BASIC_INFORMATION *ntBasicInfo, xbox::FI _ConvertXboxBasicInfo(xboxBasicInfo); - return xbox::status_success; + return X_STATUS_SUCCESS; } NTSTATUS _NTToXboxNameInfo(NtDll::FILE_NAME_INFORMATION *ntNameInfo, xbox::FILE_NAME_INFORMATION *xboxNameInfo, ULONG Length) @@ -1218,7 +1218,7 @@ NTSTATUS NTToXboxFileInformation // FileStandardInformation // FileReparsePointInformation - NTSTATUS result = xbox::status_success; + NTSTATUS result = X_STATUS_SUCCESS; switch (FileInformationClass) { @@ -1302,7 +1302,7 @@ NTSTATUS NTToXboxFileInformation { // No differences between structs; a simple copy should suffice memcpy_s(xboxFileInformation, Length, nativeFileInformation, Length); - result = xbox::status_success; + result = X_STATUS_SUCCESS; break; } } @@ -1546,7 +1546,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_ADDRESS_CLOSED); _CASE(STATUS_ADDRESS_NOT_ASSOCIATED); _CASE(STATUS_AGENTS_EXHAUSTED); - _CASE(xbox::status_alerted); + _CASE(X_STATUS_ALERTED); _CASE(STATUS_ALIAS_EXISTS); _CASE(STATUS_ALLOCATE_BUCKET); _CASE(STATUS_ALLOTTED_SPACE_EXCEEDED); @@ -1582,8 +1582,8 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT); _CASE(STATUS_BREAKPOINT); _CASE(STATUS_BUFFER_ALL_ZEROS); - _CASE(xbox::status_buffer_overflow); - _CASE(xbox::status_buffer_too_small); + _CASE(X_STATUS_BUFFER_OVERFLOW); + _CASE(X_STATUS_BUFFER_TOO_SMALL); _CASE(STATUS_BUS_RESET); _CASE(STATUS_CACHE_PAGE_LOCKED); _CASE(STATUS_CANCELLED); @@ -1602,7 +1602,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_CLIENT_SERVER_PARAMETERS_INVALID); _CASE(STATUS_COMMITMENT_LIMIT); _CASE(STATUS_COMMITMENT_MINIMUM); - _CASE(xbox::status_conflicting_addresses); + _CASE(X_STATUS_CONFLICTING_ADDRESSES); _CASE(STATUS_CONNECTION_ABORTED); _CASE(STATUS_CONNECTION_ACTIVE); _CASE(STATUS_CONNECTION_COUNT_LIMIT); @@ -1788,7 +1788,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_FLOPPY_VOLUME); _CASE(STATUS_FLOPPY_WRONG_CYLINDER); _CASE(STATUS_FOUND_OUT_OF_SCOPE); - _CASE(xbox::status_free_vm_not_at_base); + _CASE(X_STATUS_FREE_VM_NOT_AT_BASE); _CASE(STATUS_FS_DRIVER_REQUIRED); _CASE(STATUS_FT_MISSING_MEMBER); _CASE(STATUS_FT_ORPHANING); @@ -1824,7 +1824,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_INSTRUCTION_MISALIGNMENT); _CASE(STATUS_INSUFFICIENT_LOGON_INFO); _CASE(STATUS_INSUFFICIENT_POWER); - _CASE(xbox::status_insufficient_resources); + _CASE(X_STATUS_INSUFFICIENT_RESOURCES); _CASE(STATUS_INSUFF_SERVER_RESOURCES); _CASE(STATUS_INTEGER_DIVIDE_BY_ZERO); _CASE(STATUS_INTEGER_OVERFLOW); @@ -1853,7 +1853,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_INVALID_HANDLE); _CASE(STATUS_INVALID_HW_PROFILE); _CASE(STATUS_INVALID_ID_AUTHORITY); - _CASE(xbox::status_invalid_image_format); + _CASE(X_STATUS_INVALID_IMAGE_FORMAT); _CASE(STATUS_INVALID_IMAGE_LE_FORMAT); _CASE(STATUS_INVALID_IMAGE_NE_FORMAT); _CASE(STATUS_INVALID_IMAGE_NOT_MZ); @@ -1871,13 +1871,13 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_INVALID_NETWORK_RESPONSE); _CASE(STATUS_INVALID_OPLOCK_PROTOCOL); _CASE(STATUS_INVALID_OWNER); - _CASE(xbox::status_invalid_page_protection); + _CASE(X_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(xbox::status_invalid_parameter_2); + _CASE(X_STATUS_INVALID_PARAMETER_2); _CASE(STATUS_INVALID_PARAMETER_3); _CASE(STATUS_INVALID_PARAMETER_4); _CASE(STATUS_INVALID_PARAMETER_5); @@ -1955,14 +1955,14 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_MEMBER_IN_GROUP); _CASE(STATUS_MEMBER_NOT_IN_ALIAS); _CASE(STATUS_MEMBER_NOT_IN_GROUP); - _CASE(xbox::status_memory_not_allocated); + _CASE(X_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(xbox::status_mutant_limit_exceeded); + _CASE(X_STATUS_MUTANT_LIMIT_EXCEEDED); _CASE(STATUS_MUTANT_NOT_OWNED); _CASE(STATUS_MUTUAL_AUTHENTICATION_FAILED); _CASE(STATUS_NAME_TOO_LONG); @@ -1987,7 +1987,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_NOT_A_DIRECTORY); _CASE(STATUS_NOT_A_REPARSE_POINT); _CASE(STATUS_NOT_CLIENT_SESSION); - _CASE(xbox::status_not_committed); + _CASE(X_STATUS_NOT_COMMITTED); _CASE(STATUS_NOT_EXPORT_FORMAT); _CASE(STATUS_NOT_FOUND); _CASE(STATUS_NOT_IMPLEMENTED); @@ -2016,7 +2016,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_NO_MATCH); _CASE(STATUS_NO_MEDIA); _CASE(STATUS_NO_MEDIA_IN_DEVICE); - _CASE(xbox::status_no_memory); + _CASE(X_STATUS_NO_MEMORY); _CASE(STATUS_NO_MORE_EAS); _CASE(STATUS_NO_MORE_ENTRIES); _CASE(STATUS_NO_MORE_FILES); @@ -2046,10 +2046,10 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_NT_CROSS_ENCRYPTION_REQUIRED); _CASE(STATUS_NULL_LM_PASSWORD); _CASE(STATUS_OBJECTID_EXISTS); - _CASE(xbox::status_object_name_collision); + _CASE(X_STATUS_OBJECT_NAME_COLLISION); _CASE(STATUS_OBJECT_NAME_EXISTS); _CASE(STATUS_OBJECT_NAME_INVALID); - _CASE(xbox::status_object_name_not_found); + _CASE(X_STATUS_OBJECT_NAME_NOT_FOUND); _CASE(STATUS_OBJECT_PATH_INVALID); _CASE(STATUS_OBJECT_PATH_NOT_FOUND); _CASE(STATUS_OBJECT_PATH_SYNTAX_BAD); @@ -2074,7 +2074,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_PASSWORD_MUST_CHANGE); _CASE(STATUS_PASSWORD_RESTRICTION); _CASE(STATUS_PATH_NOT_COVERED); - _CASE(xbox::status_pending); + _CASE(X_STATUS_PENDING); _CASE(STATUS_PIPE_BROKEN); _CASE(STATUS_PIPE_BUSY); _CASE(STATUS_PIPE_CLOSING); @@ -2169,7 +2169,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_SECTION_PROTECTION); _CASE(STATUS_SECTION_TOO_BIG); _CASE(STATUS_SEGMENT_NOTIFICATION); - _CASE(xbox::status_semaphore_limit_exceeded); + _CASE(X_STATUS_SEMAPHORE_LIMIT_EXCEEDED); _CASE(STATUS_SERIAL_COUNTER_TIMEOUT); _CASE(STATUS_SERIAL_MORE_WRITES); _CASE(STATUS_SERIAL_NO_DEVICE_INITED); @@ -2191,7 +2191,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_SPECIAL_USER); _CASE(STATUS_STACK_OVERFLOW); _CASE(STATUS_STACK_OVERFLOW_READ); - _CASE(xbox::status_success); + _CASE(X_STATUS_SUCCESS); _CASE(STATUS_SUSPEND_COUNT_EXCEEDED); _CASE(STATUS_SYNCHRONIZATION_REQUIRED); _CASE(STATUS_SYSTEM_IMAGE_BAD_SIGNATURE); @@ -2202,7 +2202,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_TIMEOUT); _CASE(STATUS_TIMER_NOT_CANCELED); _CASE(STATUS_TIMER_RESOLUTION_NOT_SET); - _CASE(xbox::status_timer_resume_ignored); + _CASE(X_STATUS_TIMER_RESUME_IGNORED); _CASE(STATUS_TIME_DIFFERENCE_AT_DC); _CASE(STATUS_TOKEN_ALREADY_IN_USE); _CASE(STATUS_TOO_LATE); @@ -2216,7 +2216,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_TOO_MANY_NODES); _CASE(STATUS_TOO_MANY_OPENED_FILES); _CASE(STATUS_TOO_MANY_PAGING_FILES); - _CASE(xbox::status_too_many_secrets); + _CASE(X_STATUS_TOO_MANY_SECRETS); _CASE(STATUS_TOO_MANY_SESSIONS); _CASE(STATUS_TOO_MANY_SIDS); _CASE(STATUS_TOO_MANY_THREADS); @@ -2234,7 +2234,7 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_TRUST_FAILURE); _CASE(STATUS_UNABLE_TO_DECOMMIT_VM); _CASE(STATUS_UNABLE_TO_DELETE_SECTION); - _CASE(xbox::status_unable_to_free_vm); + _CASE(X_STATUS_UNABLE_TO_FREE_VM); _CASE(STATUS_UNABLE_TO_LOCK_MEDIA); _CASE(STATUS_UNABLE_TO_UNLOAD_MEDIA); _CASE(STATUS_UNDEFINED_CHARACTER); @@ -2246,12 +2246,12 @@ CHAR* NtStatusToString(IN NTSTATUS Status) _CASE(STATUS_UNHANDLED_EXCEPTION); _CASE(STATUS_UNKNOWN_REVISION); _CASE(STATUS_UNMAPPABLE_CHARACTER); - _CASE(xbox::status_unrecognized_media); + _CASE(X_STATUS_UNRECOGNIZED_MEDIA); _CASE(STATUS_UNRECOGNIZED_VOLUME); - _CASE(xbox::status_unsuccessful); + _CASE(X_STATUS_UNSUCCESSFUL); _CASE(STATUS_UNSUPPORTED_COMPRESSION); _CASE(STATUS_UNWIND); - _CASE(xbox::status_user_apc); + _CASE(X_STATUS_USER_APC); _CASE(STATUS_USER_EXISTS); _CASE(STATUS_USER_MAPPED_FILE); _CASE(STATUS_USER_SESSION_DELETED);