Introduced RETURN macro, applied in all Emu* files (again except DSound and D3D).

Also renamed UNIMPLEMENTED to LOG_UNIMPLEMENTED, applied in more places.

Also introduced LOG_IGNORED, applied where appropriate.
This commit is contained in:
PatrickvL 2016-11-20 14:43:38 +01:00
parent 133f6f8d4b
commit ef9c55f373
18 changed files with 204 additions and 245 deletions

View File

@ -92,11 +92,16 @@ extern thread_local std::string _logPrefix;
msg << ");\n"; \
std::cout << msg.str(); \
} } while (0)
// LOG_FUNC_RESULT logs the function return result
#define LOG_FUNC_RESULT(r) \
std::cout << _logPrefix << " returns " << r;
#else
#define LOG_FUNC_BEGIN ;
#define LOG_FUNC_ARG(arg);
#define LOG_FUNC_ARG_OUT(arg);
#define LOG_FUNC_END ;
#define LOG_FUNC_BEGIN
#define LOG_FUNC_ARG(arg)
#define LOG_FUNC_ARG_OUT(arg)
#define LOG_FUNC_END
#define LOG_FUNC_RESULT(r)
#endif
// Short hand defines :
@ -109,9 +114,16 @@ extern thread_local std::string _logPrefix;
// Log function with one out argument
#define LOG_FUNC_ONE_ARG_OUT(arg) LOG_FUNC_BEGIN LOG_FUNC_ARG_OUT(arg) LOG_FUNC_END
#define UNIMPLEMENTED() \
#define LOG_IGNORED() \
do { if(g_bPrintfOn) { \
std::cout << __func__ << " ignored!\n"; \
} } while (0)
#define LOG_UNIMPLEMENTED() \
do { if(g_bPrintfOn) { \
std::cout << __func__ << " unimplemented!\n"; \
} } while (0)
#define RETURN(r) do { LOG_FUNC_RESULT(r) return r; } while (0)
#endif _LOGGING_H

View File

@ -137,7 +137,7 @@ XBSYSAPI EXPORTNUM(160) xboxkrnl::UCHAR* NTAPI xboxkrnl::KfRaiseIrql
LOG_FUNC_ONE_ARG(NewIrql);
// Return addr where old irq level should be stored
return &previousIrqlValue;
RETURN(&previousIrqlValue);
}
// ******************************************************************
@ -150,7 +150,7 @@ XBSYSAPI EXPORTNUM(161) VOID NTAPI xboxkrnl::KfLowerIrql
{
LOG_FUNC_ONE_ARG(NewIrql);
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}
// Source:ReactOS

View File

@ -97,7 +97,7 @@ XBSYSAPI EXPORTNUM(1) xboxkrnl::PVOID NTAPI xboxkrnl::AvGetSavedDataAddress()
fclose(fp);
}*/
return NULL;//g_pPersistedData;
RETURN (NULL); //g_pPersistedData;
}
// ******************************************************************
@ -121,7 +121,7 @@ XBSYSAPI EXPORTNUM(2) VOID NTAPI xboxkrnl::AvSendTVEncoderOption
// "Run Like Hell" (5233) calls this from a routine at 0x11FCD0 - See XTL_EmuIDirect3DDevice_Unknown1
// TODO: What does this do?
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}
XBSYSAPI EXPORTNUM(3) xboxkrnl::ULONG NTAPI xboxkrnl::AvSetDisplayMode
@ -145,9 +145,9 @@ XBSYSAPI EXPORTNUM(3) xboxkrnl::ULONG NTAPI xboxkrnl::AvSetDisplayMode
ULONG result = S_OK;
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
return result;
RETURN(result);
}
XBSYSAPI EXPORTNUM(4) VOID NTAPI xboxkrnl::AvSetSavedDataAddress
@ -159,5 +159,5 @@ XBSYSAPI EXPORTNUM(4) VOID NTAPI xboxkrnl::AvSetSavedDataAddress
LOG_FUNC_ARG(Address)
LOG_FUNC_END;
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}

View File

@ -50,7 +50,7 @@ XBSYSAPI EXPORTNUM(5) VOID NTAPI xboxkrnl::DbgBreakPoint()
{
LOG_FUNC();
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}
XBSYSAPI EXPORTNUM(6) VOID NTAPI xboxkrnl::DbgBreakPointWithStatus
@ -60,7 +60,7 @@ XBSYSAPI EXPORTNUM(6) VOID NTAPI xboxkrnl::DbgBreakPointWithStatus
{
LOG_FUNC_ONE_ARG(Status);
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}
XBSYSAPI EXPORTNUM(7) xboxkrnl::NTSTATUS NTAPI xboxkrnl::DbgLoadImageSymbols
@ -78,9 +78,9 @@ XBSYSAPI EXPORTNUM(7) xboxkrnl::NTSTATUS NTAPI xboxkrnl::DbgLoadImageSymbols
NTSTATUS result = S_OK;
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
return result;
RETURN(result);
}
// ******************************************************************
@ -112,7 +112,7 @@ XBSYSAPI EXPORTNUM(8) xboxkrnl::ULONG _cdecl xboxkrnl::DbgPrint
//DbgPrintf(szBuffer);
}
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}
// Source:ReactOS
@ -131,9 +131,9 @@ XBSYSAPI EXPORTNUM(10) xboxkrnl::ULONG NTAPI xboxkrnl::DbgPrompt
NTSTATUS result = S_OK;
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
return result;
RETURN(result);
}
// Source:ReactOS
@ -150,5 +150,5 @@ XBSYSAPI EXPORTNUM(11) VOID NTAPI xboxkrnl::DbgUnLoadImageSymbols
LOG_FUNC_ARG(ProcessId)
LOG_FUNC_END;
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}

View File

@ -59,9 +59,9 @@ XBSYSAPI EXPORTNUM(14) xboxkrnl::PVOID NTAPI xboxkrnl::ExAllocatePool
{
LOG_FUNC_ONE_ARG(NumberOfBytes);
PVOID pRet = ExAllocatePoolWithTag(NumberOfBytes, (ULONG)"enoN");
PVOID pRet = ExAllocatePoolWithTag(NumberOfBytes, (ULONG)"enoN"); // "None" in reverse?
return pRet;
RETURN(pRet);
}
// ******************************************************************
@ -84,7 +84,7 @@ XBSYSAPI EXPORTNUM(15) xboxkrnl::PVOID NTAPI xboxkrnl::ExAllocatePoolWithTag
// TODO: Actually implement this
PVOID pRet = CxbxMalloc(NumberOfBytes);
return pRet;
RETURN(pRet);
}
// TODO : What should we initialize this to?
@ -117,7 +117,9 @@ XBSYSAPI EXPORTNUM(23) xboxkrnl::ULONG NTAPI xboxkrnl::ExQueryPoolBlockSize
LOG_FUNC_ONE_ARG(PoolBlock);
// Not strictly correct, but it will do for now
return MmQueryAllocationSize(PoolBlock);
ULONG ret = MmQueryAllocationSize(PoolBlock);
RETURN(ret);
}
// ******************************************************************
@ -236,9 +238,7 @@ XBSYSAPI EXPORTNUM(24) xboxkrnl::NTSTATUS NTAPI xboxkrnl::ExQueryNonVolatileSett
break;
}
return ret;
RETURN(ret);
}
// ******************************************************************
@ -258,9 +258,9 @@ XBSYSAPI EXPORTNUM(25) xboxkrnl::NTSTATUS NTAPI xboxkrnl::ExReadWriteRefurbInfo
LOG_FUNC_END;
// TODO: What does this do?
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}
// ******************************************************************
@ -283,7 +283,7 @@ XBSYSAPI EXPORTNUM(29) xboxkrnl::NTSTATUS NTAPI xboxkrnl::ExSaveNonVolatileSetti
// TODO: Later.
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}
// TODO : What should we initialize this to?

View File

@ -55,14 +55,14 @@ XBSYSAPI EXPORTNUM(35) xboxkrnl::DWORD NTAPI xboxkrnl::FscGetCacheSize()
EmuWarning("FscGetCacheSize returning default 64kb");
return 64 * 1024;
RETURN(64 * 1024);
}
XBSYSAPI EXPORTNUM(36) VOID NTAPI xboxkrnl::FscInvalidateIdleBlocks()
{
LOG_FUNC();
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}
@ -76,8 +76,8 @@ XBSYSAPI EXPORTNUM(37) xboxkrnl::LONG NTAPI xboxkrnl::FscSetCacheSize
{
LOG_FUNC_ONE_ARG(uCachePages);
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
return 0;
RETURN(0);
}

View File

@ -103,7 +103,7 @@ XBSYSAPI EXPORTNUM(44) xboxkrnl::ULONG NTAPI xboxkrnl::HalGetInterruptVector
EmuWarning("HalGetInterruptVector(): If this is NOT a Chihiro game, tell blueshogun!");
return 1;
RETURN(1);
}
// ******************************************************************
@ -131,8 +131,7 @@ XBSYSAPI EXPORTNUM(45) xboxkrnl::NTSTATUS NTAPI xboxkrnl::HalReadSMBusValue
// Write BYTE
}
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}
// ******************************************************************
@ -149,9 +148,7 @@ XBSYSAPI EXPORTNUM(47) VOID xboxkrnl::HalRegisterShutdownNotification
LOG_FUNC_ARG(Register)
LOG_FUNC_END;
UNIMPLEMENTED();
return;
LOG_UNIMPLEMENTED();
}
@ -170,7 +167,7 @@ XBSYSAPI EXPORTNUM(49) VOID DECLSPEC_NORETURN xboxkrnl::HalReturnToFirmware
CxbxKrnlCleanup("Xbe has rebooted : HalReturnToFirmware(%d)", Routine);
}
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}
// ******************************************************************
@ -192,8 +189,9 @@ XBSYSAPI EXPORTNUM(50) xboxkrnl::NTSTATUS NTAPI xboxkrnl::HalWriteSMBusValue
LOG_FUNC_END;
// TODO: Later.
LOG_UNIMPLEMENTED();
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}
// ******************************************************************

View File

@ -86,9 +86,9 @@ XBSYSAPI EXPORTNUM(66) xboxkrnl::NTSTATUS NTAPI xboxkrnl::IoCreateFile
// TODO: Try redirecting to NtCreateFile if this function ever is run into
CxbxKrnlCleanup("IoCreateFile not implemented");
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
return ret;
RETURN(ret);
}
// ******************************************************************
@ -107,7 +107,7 @@ XBSYSAPI EXPORTNUM(67) xboxkrnl::NTSTATUS NTAPI xboxkrnl::IoCreateSymbolicLink
NTSTATUS ret = CxbxCreateSymbolicLink(std::string(SymbolicLinkName->Buffer, SymbolicLinkName->Length), std::string(DeviceName->Buffer, DeviceName->Length));
return ret;
RETURN(ret);
}
// ******************************************************************
@ -127,7 +127,7 @@ XBSYSAPI EXPORTNUM(69) xboxkrnl::NTSTATUS NTAPI xboxkrnl::IoDeleteSymbolicLink
if ((symbolicLink != NULL))
ret = symbolicLink->NtClose();
return ret;
RETURN(ret);
}
// TODO : What should we initialize this to?
@ -149,8 +149,8 @@ XBSYSAPI EXPORTNUM(91) xboxkrnl::NTSTATUS NTAPI xboxkrnl::IoDismountVolumeByName
NTSTATUS ret = STATUS_SUCCESS;
// TODO: Anything?
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
return ret;
RETURN(ret);
}

View File

@ -72,7 +72,7 @@ XBSYSAPI EXPORTNUM(95) VOID NTAPI xboxkrnl::KeBugCheck
LOG_FUNC_ONE_ARG(BugCheckMode);
// TODO: Investigate XapiFiberStartup maybe?
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}
// ******************************************************************
@ -85,9 +85,9 @@ XBSYSAPI EXPORTNUM(98) xboxkrnl::LONG NTAPI xboxkrnl::KeConnectInterrupt
{
LOG_FUNC_ONE_ARG(InterruptObject);
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
return 0;
RETURN(0);
}
// ******************************************************************
@ -108,7 +108,7 @@ XBSYSAPI EXPORTNUM(99) xboxkrnl::NTSTATUS NTAPI xboxkrnl::KeDelayExecutionThread
NTSTATUS ret = NtDll::NtDelayExecution(Alertable, (NtDll::LARGE_INTEGER*)Interval);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -132,8 +132,6 @@ XBSYSAPI EXPORTNUM(107) VOID NTAPI xboxkrnl::KeInitializeDpc
Dpc->Type = DpcObject;
Dpc->DeferredContext = DeferredContext;
Dpc->Inserted = FALSE;
return;
}
// ******************************************************************
@ -160,7 +158,7 @@ XBSYSAPI EXPORTNUM(109) VOID NTAPI xboxkrnl::KeInitializeInterrupt
LOG_FUNC_ARG(ShareVector)
LOG_FUNC_END;
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}
// ******************************************************************
@ -189,10 +187,6 @@ XBSYSAPI EXPORTNUM(113) VOID NTAPI xboxkrnl::KeInitializeTimerEx
Timer->DueTime.QuadPart = 0;
Timer->Period = 0;
return;
}
// Dxbx note : This was once a value, but instead we now point to
@ -210,7 +204,7 @@ XBSYSAPI EXPORTNUM(126) xboxkrnl::ULONGLONG NTAPI xboxkrnl::KeQueryPerformanceCo
QueryPerformanceCounter(&Counter);
return Counter.QuadPart;
RETURN(Counter.QuadPart);
}
// ******************************************************************
@ -225,7 +219,7 @@ XBSYSAPI EXPORTNUM(127) xboxkrnl::ULONGLONG NTAPI xboxkrnl::KeQueryPerformanceFr
QueryPerformanceFrequency(&Frequency);
return Frequency.QuadPart;
RETURN(Frequency.QuadPart);
}
// ******************************************************************
@ -245,8 +239,6 @@ XBSYSAPI EXPORTNUM(128) VOID NTAPI xboxkrnl::KeQuerySystemTime
GetSystemTime(&SystemTime);
SystemTimeToFileTime(&SystemTime, (FILETIME*)CurrentTime);
return;
}
// ******************************************************************
@ -259,9 +251,9 @@ XBSYSAPI EXPORTNUM(129) xboxkrnl::UCHAR NTAPI xboxkrnl::KeRaiseIrqlToDpcLevel()
// I really tried to avoid adding this...
// __asm int 3;
// CxbxKrnlCleanup("KeRaiseIrqlToDpcLevel not implemented! (Tell blueshogun -_-)");
// UNIMPLEMENTED();
// LOG_UNIMPLEMENTED();
return 0;
RETURN(0);
}
// ******************************************************************
@ -283,7 +275,7 @@ XBSYSAPI EXPORTNUM(149) xboxkrnl::BOOLEAN NTAPI xboxkrnl::KeSetTimer
// Call KeSetTimerEx with a period of zero
BOOLEAN bRet = KeSetTimerEx(Timer, DueTime, 0, Dpc);
return bRet;
RETURN(bRet);
}
// ******************************************************************
@ -346,7 +338,7 @@ XBSYSAPI EXPORTNUM(150) xboxkrnl::BOOLEAN NTAPI xboxkrnl::KeSetTimerEx
}
}
return Inserted;
RETURN(Inserted);
}
// Dxbx note : This was once a value, but instead we now point to
@ -389,7 +381,9 @@ XBSYSAPI EXPORTNUM(158) xboxkrnl::NTSTATUS xboxkrnl::KeWaitForMultipleObjects
EmuWarning("EmuKrnl: Redirecting KeWaitForMultipleObjects to NtWaitForMultipleObjectsEx");
return NtWaitForMultipleObjectsEx(Count, Object, WaitType, WaitMode, Alertable, Timeout);
NTSTATUS ret = NtWaitForMultipleObjectsEx(Count, Object, WaitType, WaitMode, Alertable, Timeout);
RETURN(ret);
}
// ******************************************************************
@ -414,6 +408,8 @@ XBSYSAPI EXPORTNUM(159) xboxkrnl::NTSTATUS xboxkrnl::KeWaitForSingleObject
EmuWarning("EmuKrnl: Redirecting KeWaitForSingleObject to NtWaitForSingleObjectEx");
return NtWaitForSingleObjectEx(Object, WaitMode, Alertable, Timeout);
NTSTATUS ret = NtWaitForSingleObjectEx(Object, WaitMode, Alertable, Timeout);
RETURN(ret);
}

View File

@ -110,7 +110,7 @@ XBSYSAPI EXPORTNUM(165) xboxkrnl::PVOID NTAPI xboxkrnl::MmAllocateContiguousMemo
DbgPrintf("EmuKrnl (0x%X): MmAllocateContiguousMemory returned 0x%.08X\n", GetCurrentThreadId(), pRet);
return pRet;
RETURN(pRet);
}
// ******************************************************************
@ -155,9 +155,7 @@ XBSYSAPI EXPORTNUM(166) xboxkrnl::PVOID NTAPI xboxkrnl::MmAllocateContiguousMemo
static int count = 0;
DbgPrintf("EmuKrnl (0x%X): MmAllocateContiguousMemoryEx returned 0x%.08X\n", GetCurrentThreadId(), pRet);
return pRet;
RETURN(pRet);
}
// ******************************************************************
@ -177,7 +175,7 @@ XBSYSAPI EXPORTNUM(167) xboxkrnl::PVOID NTAPI xboxkrnl::MmAllocateSystemMemory
// TODO: should this be aligned?
PVOID pRet = CxbxMalloc(NumberOfBytes);
return pRet;
RETURN(pRet);
}
// ******************************************************************
@ -220,7 +218,7 @@ XBSYSAPI EXPORTNUM(169) xboxkrnl::PVOID NTAPI xboxkrnl::MmCreateKernelStack
else
pRet = (PVOID)((ULONG)pRet + NumberOfBytes);
return pRet;
RETURN(pRet);
}
// ******************************************************************
@ -242,8 +240,6 @@ XBSYSAPI EXPORTNUM(170) VOID NTAPI xboxkrnl::MmDeleteKernelStack
ULONG RegionSize = 0;
if (FAILED(NtDll::NtFreeVirtualMemory(GetCurrentProcess(), &BaseAddress, &RegionSize, MEM_RELEASE)))
EmuWarning("MmDeleteKernelStack failed!\n");
}
// ******************************************************************
@ -273,8 +269,6 @@ XBSYSAPI EXPORTNUM(171) VOID NTAPI xboxkrnl::MmFreeContiguousMemory
{
DbgPrintf("Ignored MmFreeContiguousMemory(&xLaunchDataPage)\n");
}
return;
}
// ******************************************************************
@ -293,7 +287,7 @@ XBSYSAPI EXPORTNUM(172) xboxkrnl::NTSTATUS NTAPI xboxkrnl::MmFreeSystemMemory
CxbxFree(BaseAddress);
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}
// ******************************************************************
@ -312,7 +306,7 @@ XBSYSAPI EXPORTNUM(175) void NTAPI xboxkrnl::MmLockUnlockBufferPages
LOG_FUNC_ARG(Protect)
LOG_FUNC_END;
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}
// ******************************************************************
@ -334,7 +328,7 @@ XBSYSAPI EXPORTNUM(177) xboxkrnl::PVOID NTAPI xboxkrnl::MmMapIoSpace
// TODO: should this be aligned?
PVOID pRet = CxbxMalloc(NumberOfBytes);
return pRet;
RETURN(pRet);
}
// ******************************************************************
@ -354,7 +348,7 @@ XBSYSAPI EXPORTNUM(178) VOID NTAPI xboxkrnl::MmPersistContiguousMemory
LOG_FUNC_END;
// TODO: Actually set this up to be remember across a "reboot"
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}
// ******************************************************************
@ -369,7 +363,7 @@ XBSYSAPI EXPORTNUM(180) xboxkrnl::ULONG NTAPI xboxkrnl::MmQueryAllocationSize
ULONG uiSize = EmuCheckAllocationSize(BaseAddress, false);
return uiSize;
RETURN(uiSize);
}
// ******************************************************************
@ -425,9 +419,7 @@ XBSYSAPI EXPORTNUM(181) xboxkrnl::NTSTATUS NTAPI xboxkrnl::MmQueryStatistics
ret = STATUS_INVALID_PARAMETER;
}
return ret;
RETURN(ret);
}
// ******************************************************************
@ -452,8 +444,6 @@ XBSYSAPI EXPORTNUM(182) VOID NTAPI xboxkrnl::MmSetAddressProtect
EmuWarning("VirtualProtect Failed!");
DbgPrintf("EmuKrnl (0x%X): VirtualProtect was 0x%.08X -> 0x%.08X\n", GetCurrentThreadId(), dwOldProtect, NewProtect & (~PAGE_WRITECOMBINE));
return;
}
// ******************************************************************
@ -472,6 +462,6 @@ XBSYSAPI EXPORTNUM(183) xboxkrnl::NTSTATUS NTAPI xboxkrnl::MmUnmapIoSpace
CxbxFree(BaseAddress);
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}

View File

@ -1009,7 +1009,7 @@ NTSTATUS CxbxObjectAttributesToNT(xboxkrnl::POBJECT_ATTRIBUTES ObjectAttributes,
{
// When the pointer is nil, make sure we pass nil to Windows too :
nativeObjectAttributes.NtObjAttrPtr = NULL;
return result;
RETURN(result);
}
// ObjectAttributes are given, so make sure the pointer we're going to pass to Windows is assigned :
@ -1077,7 +1077,7 @@ NTSTATUS CxbxObjectAttributesToNT(xboxkrnl::POBJECT_ATTRIBUTES ObjectAttributes,
{
result = STATUS_UNRECOGNIZED_VOLUME; // TODO : Is this the correct error?
EmuWarning((("Path not available : ") + OriginalPath).c_str());
return result;
RETURN(result);
}
XboxFullPath = RelativePath;
@ -1112,7 +1112,7 @@ NTSTATUS CxbxObjectAttributesToNT(xboxkrnl::POBJECT_ATTRIBUTES ObjectAttributes,
// Initialize the NT ObjectAttributes :
InitializeObjectAttributes(&nativeObjectAttributes.NtObjAttr, &nativeObjectAttributes.NtUnicodeString, ObjectAttributes->Attributes, ObjectAttributes->RootDirectory, NULL);
return result;
RETURN(result);
}
@ -1154,7 +1154,7 @@ XBSYSAPI EXPORTNUM(184) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtAllocateVirtualMemo
if (ret == 0xC00000F3)
EmuWarning("Invalid Param!");
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1172,7 +1172,7 @@ XBSYSAPI EXPORTNUM(186) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtClearEvent
if (FAILED(ret))
EmuWarning("NtClearEvent Failed!");
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1199,7 +1199,7 @@ XBSYSAPI EXPORTNUM(187) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtClose
ret = NtDll::NtClose(Handle);
}
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1235,7 +1235,7 @@ XBSYSAPI EXPORTNUM(188) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtCreateDirectoryObje
DbgPrintf("EmuKrnl (0x%X): NtCreateDirectoryObject DirectoryHandle = 0x%.08X\n", GetCurrentThreadId(), *DirectoryHandle);
return ret;
RETURN(ret);
}
@ -1278,7 +1278,7 @@ XBSYSAPI EXPORTNUM(189) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtCreateEvent
DbgPrintf("EmuKrnl (0x%X): NtCreateEvent EventHandle = 0x%.08X\n", GetCurrentThreadId(), *EventHandle);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1330,7 +1330,7 @@ XBSYSAPI EXPORTNUM(190) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtCreateFile
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1376,7 +1376,7 @@ XBSYSAPI EXPORTNUM(192) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtCreateMutant
DbgPrintf("EmuKrnl (0x%X): NtCreateMutant MutantHandle = 0x%.08X\n", GetCurrentThreadId(), *MutantHandle);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1412,7 +1412,7 @@ XBSYSAPI EXPORTNUM(193) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtCreateSemaphore
DbgPrintf("EmuKrnl (0x%X): NtCreateSemaphore SemaphoreHandle = 0x%.08X\n", GetCurrentThreadId(), *SemaphoreHandle);
return ret;
RETURN(ret);
}
XBSYSAPI EXPORTNUM(196) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtDeviceIoControlFile
@ -1457,10 +1457,10 @@ XBSYSAPI EXPORTNUM(196) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtDeviceIoControlFile
break;
}
default:
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}
// ******************************************************************
@ -1500,7 +1500,7 @@ XBSYSAPI EXPORTNUM(197) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtDuplicateObject
if (ret != STATUS_SUCCESS)
EmuWarning("Object was not duplicated!");
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1519,7 +1519,7 @@ XBSYSAPI EXPORTNUM(198) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtFlushBuffersFile
NTSTATUS ret = NtDll::NtFlushBuffersFile(FileHandle, (NtDll::IO_STATUS_BLOCK*)IoStatusBlock);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1540,7 +1540,7 @@ XBSYSAPI EXPORTNUM(199) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtFreeVirtualMemory
NTSTATUS ret = NtDll::NtFreeVirtualMemory(GetCurrentProcess(), BaseAddress, FreeSize, FreeType);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1568,7 +1568,9 @@ XBSYSAPI EXPORTNUM(202) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtOpenFile
//*/
return NtCreateFile(FileHandle, DesiredAccess, ObjectAttributes, IoStatusBlock, NULL, 0, ShareAccess, FILE_OPEN, OpenOptions);
NTSTATUS ret = NtCreateFile(FileHandle, DesiredAccess, ObjectAttributes, IoStatusBlock, NULL, 0, ShareAccess, FILE_OPEN, OpenOptions);
RETURN(ret);
}
@ -1602,7 +1604,7 @@ XBSYSAPI EXPORTNUM(203) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtOpenSymbolicLinkObj
else
DbgPrintf("EmuKrnl : NtOpenSymbolicLinkObject LinkHandle^ = 0x%.08X", *LinkHandle);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1623,9 +1625,9 @@ XBSYSAPI EXPORTNUM(205) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtProtectVirtualMemor
LOG_FUNC_ARG_OUT(OldProtect)
LOG_FUNC_END;
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}
// ******************************************************************
@ -1658,7 +1660,7 @@ XBSYSAPI EXPORTNUM(206) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtQueueApcThread
if (FAILED(ret))
EmuWarning("NtQueueApcThread failed!");
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1742,7 +1744,7 @@ XBSYSAPI EXPORTNUM(207) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtQueryDirectoryFile
// TODO: Cache the last search result for quicker access with CreateFile (xbox does this internally!)
CxbxFree(FileDirInfo);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1769,7 +1771,7 @@ XBSYSAPI EXPORTNUM(210) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtQueryFullAttributes
if (FAILED(ret))
EmuWarning("NtQueryFullAttributesFile failed! (0x%.08X)\n", ret);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1831,7 +1833,7 @@ XBSYSAPI EXPORTNUM(211) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtQueryInformationFil
if (FAILED(ret))
EmuWarning("NtQueryInformationFile failed! (0x%.08X)", ret);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1879,7 +1881,7 @@ XBSYSAPI EXPORTNUM(215) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtQuerySymbolicLinkOb
if (result != STATUS_SUCCESS)
EmuWarning("NtQuerySymbolicLinkObject failed! (%s)", NtStatusToString(result));
return result;
RETURN(result);
}
@ -1931,7 +1933,7 @@ XBSYSAPI EXPORTNUM(217) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtQueryVirtualMemory
}
}
return ret;
RETURN(ret);
}
// ******************************************************************
@ -1981,7 +1983,7 @@ XBSYSAPI EXPORTNUM(218) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtQueryVolumeInformat
EmuWarning("NtQueryVolumeInformationFile failed! (%s)\n", NtStatusToString(ret));
}
return ret;
RETURN(ret);
}
// ******************************************************************
@ -2019,7 +2021,7 @@ XBSYSAPI EXPORTNUM(219) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtReadFile
if (FAILED(ret))
EmuWarning("NtReadFile Failed! (0x%.08X)", ret);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -2042,7 +2044,7 @@ XBSYSAPI EXPORTNUM(221) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtReleaseMutant
if (FAILED(ret))
EmuWarning("NtReleaseMutant Failed!");
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS); // TODO : RETURN(ret);
}
// ******************************************************************
@ -2066,7 +2068,7 @@ XBSYSAPI EXPORTNUM(222) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtReleaseSemaphore
if (FAILED(ret))
EmuWarning("NtReleaseSemaphore failed!");
return ret;
RETURN(ret);
}
// ******************************************************************
@ -2087,7 +2089,7 @@ XBSYSAPI EXPORTNUM(224) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtResumeThread
Sleep(10);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -2109,7 +2111,7 @@ XBSYSAPI EXPORTNUM(225) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtSetEvent
if (FAILED(ret))
EmuWarning("NtSetEvent Failed!");
return ret;
RETURN(ret);
}
// ******************************************************************
@ -2134,7 +2136,7 @@ XBSYSAPI EXPORTNUM(226) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtSetInformationFile
NTSTATUS ret = NtDll::NtSetInformationFile(FileHandle, IoStatusBlock, FileInformation, Length, FileInformationClass);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -2154,11 +2156,11 @@ XBSYSAPI EXPORTNUM(228) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtSetSystemTime
// Maybe it's not such a good idea to allow Cxbx to change your time
// clock. Might need admin privileges to do this.... dunno.
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
NTSTATUS ret = STATUS_SUCCESS;
return ret;
RETURN(ret);
}
// ******************************************************************
@ -2177,7 +2179,7 @@ XBSYSAPI EXPORTNUM(231) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtSuspendThread
NTSTATUS ret = NtDll::NtSuspendThread(ThreadHandle, PreviousSuspendCount);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -2251,8 +2253,6 @@ XBSYSAPI EXPORTNUM(232) VOID NTAPI xboxkrnl::NtUserIoApcDispatcher
}
DbgPrintf("EmuKrnl (0x%X): NtUserIoApcDispatcher Completed\n", GetCurrentThreadId());
return;
}
// ******************************************************************
@ -2289,7 +2289,7 @@ XBSYSAPI EXPORTNUM(234) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtWaitForSingleObject
if (ret == WAIT_FAILED)
EmuWarning("NtWaitForSingleObjectEx failed! (%s)", NtStatusToString(ret));
return ret;
RETURN(ret);
}
// ******************************************************************
@ -2317,7 +2317,7 @@ XBSYSAPI EXPORTNUM(235) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtWaitForMultipleObje
// TODO: Process EmuHandle
NTSTATUS ret = NtDll::NtWaitForMultipleObjects(Count, Handles, (NtDll::OBJECT_WAIT_TYPE)WaitType, Alertable, (NtDll::PLARGE_INTEGER)Timeout);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -2355,7 +2355,7 @@ XBSYSAPI EXPORTNUM(236) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtWriteFile
if (FAILED(ret))
EmuWarning("NtWriteFile Failed! (0x%.08X)", ret);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -2367,7 +2367,5 @@ XBSYSAPI EXPORTNUM(238) VOID NTAPI xboxkrnl::NtYieldExecution()
//LOG_FUNC();
NtDll::NtYieldExecution();
return;
}

View File

@ -257,7 +257,7 @@ XBSYSAPI EXPORTNUM(255) xboxkrnl::NTSTATUS NTAPI xboxkrnl::PsCreateSystemThreadE
*ThreadId = dwThreadId;
}
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}
// ******************************************************************
@ -293,7 +293,5 @@ XBSYSAPI EXPORTNUM(258) VOID NTAPI xboxkrnl::PsTerminateSystemThread
_endthreadex(ExitStatus);
//ExitThread(ExitStatus);
return;
}

View File

@ -115,7 +115,7 @@ XBSYSAPI EXPORTNUM(260) xboxkrnl::NTSTATUS NTAPI xboxkrnl::RtlAnsiStringToUnicod
NTSTATUS ret = NtDll::RtlAnsiStringToUnicodeString((NtDll::UNICODE_STRING*)DestinationString, (NtDll::STRING*)SourceString, AllocateDestinationString);
return ret;
RETURN(ret);
}
XBSYSAPI EXPORTNUM(261) xboxkrnl::NTSTATUS NTAPI xboxkrnl::RtlAppendStringToString
@ -131,7 +131,7 @@ XBSYSAPI EXPORTNUM(261) xboxkrnl::NTSTATUS NTAPI xboxkrnl::RtlAppendStringToStri
NTSTATUS result = NtDll::RtlAppendStringToString((NtDll::PSTRING)Destination, (NtDll::PSTRING)Source);
return result;
RETURN(result);
}
XBSYSAPI EXPORTNUM(262) xboxkrnl::NTSTATUS NTAPI xboxkrnl::RtlAppendUnicodeStringToString
@ -147,9 +147,9 @@ XBSYSAPI EXPORTNUM(262) xboxkrnl::NTSTATUS NTAPI xboxkrnl::RtlAppendUnicodeStrin
NTSTATUS result = 0; // TODO : NtDll::RtlAppendUnicodeStringToString(Destination, Source);
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
return result;
RETURN(result);
}
XBSYSAPI EXPORTNUM(263) xboxkrnl::NTSTATUS NTAPI xboxkrnl::RtlAppendUnicodeToString
@ -165,9 +165,9 @@ XBSYSAPI EXPORTNUM(263) xboxkrnl::NTSTATUS NTAPI xboxkrnl::RtlAppendUnicodeToStr
NTSTATUS result = 0; // TODO : NtDll::RtlAppendUnicodeToString(Destination, Source);
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
return result;
RETURN(result);
}
// ******************************************************************
@ -189,8 +189,6 @@ XBSYSAPI EXPORTNUM(264) VOID NTAPI xboxkrnl::RtlAssert
LOG_FUNC_END;
CxbxKrnlCleanup("RtlAssert() raised by emulated program - consult Debug log");
return;
}
// ******************************************************************
@ -230,8 +228,6 @@ XBSYSAPI EXPORTNUM(277) VOID NTAPI xboxkrnl::RtlEnterCriticalSection
//NtDll::RtlEnterCriticalSection((NtDll::_RTL_CRITICAL_SECTION*)CriticalSection);
}
return;
}
// ******************************************************************
@ -252,7 +248,7 @@ XBSYSAPI EXPORTNUM(279) xboxkrnl::BOOLEAN NTAPI xboxkrnl::RtlEqualString
BOOLEAN bRet = NtDll::RtlEqualString((NtDll::PSTRING)String1, (NtDll::PSTRING)String2, (NtDll::BOOLEAN)CaseSensitive);
return bRet;
RETURN(bRet);
}
// ******************************************************************
@ -266,8 +262,6 @@ XBSYSAPI EXPORTNUM(286) VOID NTAPI xboxkrnl::RtlFreeAnsiString
LOG_FUNC_ONE_ARG(AnsiString);
NtDll::RtlFreeAnsiString((NtDll::PANSI_STRING)AnsiString);
return;
}
// ******************************************************************
@ -285,8 +279,6 @@ XBSYSAPI EXPORTNUM(289) VOID NTAPI xboxkrnl::RtlInitAnsiString
LOG_FUNC_END;
NtDll::RtlInitAnsiString((NtDll::PANSI_STRING)DestinationString, (NtDll::PCSZ)SourceString);
return;
}
// ******************************************************************
@ -304,8 +296,6 @@ XBSYSAPI EXPORTNUM(290) VOID NTAPI xboxkrnl::RtlInitUnicodeString
LOG_FUNC_END;
NtDll::RtlInitUnicodeString((NtDll::PUNICODE_STRING)DestinationString, (NtDll::PCWSTR)SourceString);
return;
}
// ******************************************************************
@ -336,8 +326,6 @@ XBSYSAPI EXPORTNUM(291) VOID NTAPI xboxkrnl::RtlInitializeCriticalSection
}
//NtDll::RtlInitializeCriticalSection((NtDll::_RTL_CRITICAL_SECTION*)CriticalSection);
return;
}
// ******************************************************************
@ -369,8 +357,6 @@ XBSYSAPI EXPORTNUM(294) VOID NTAPI xboxkrnl::RtlLeaveCriticalSection
/* sorta pointless
LOG_FUNC_ONE_ARG(CriticalSection);
//*/
return;
}
// ******************************************************************
@ -385,7 +371,7 @@ XBSYSAPI EXPORTNUM(296) xboxkrnl::CHAR NTAPI xboxkrnl::RtlLowerChar
CHAR ret = tolower(Character);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -400,7 +386,7 @@ XBSYSAPI EXPORTNUM(301) xboxkrnl::ULONG NTAPI xboxkrnl::RtlNtStatusToDosError
ULONG ret = NtDll::RtlNtStatusToDosError(Status);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -419,7 +405,7 @@ XBSYSAPI EXPORTNUM(304) xboxkrnl::BOOLEAN NTAPI xboxkrnl::RtlTimeFieldsToTime
BOOLEAN bRet = NtDll::RtlTimeFieldsToTime((NtDll::TIME_FIELDS*)TimeFields, (NtDll::LARGE_INTEGER*)Time);
return bRet;
RETURN(bRet);
}
// ******************************************************************
@ -437,8 +423,6 @@ XBSYSAPI EXPORTNUM(305) VOID NTAPI xboxkrnl::RtlTimeToTimeFields
LOG_FUNC_END;
NtDll::RtlTimeToTimeFields((NtDll::LARGE_INTEGER*)Time, (NtDll::TIME_FIELDS*)TimeFields);
return;
}
// ******************************************************************
@ -475,7 +459,7 @@ XBSYSAPI EXPORTNUM(306) xboxkrnl::BOOLEAN NTAPI xboxkrnl::RtlTryEnterCriticalSec
//bRet = NtDll::RtlTryEnterCriticalSection((NtDll::PRTL_CRITICAL_SECTION)CriticalSection);
return bRet;
RETURN(bRet);
}
// ******************************************************************
@ -496,6 +480,6 @@ XBSYSAPI EXPORTNUM(308) xboxkrnl::NTSTATUS NTAPI xboxkrnl::RtlUnicodeStringToAns
NTSTATUS ret = NtDll::RtlUnicodeStringToAnsiString((NtDll::STRING*)DestinationString, (NtDll::UNICODE_STRING*)SourceString, AllocateDestinationString);
return ret;
RETURN(ret);
}

View File

@ -56,9 +56,7 @@ XBSYSAPI EXPORTNUM(335) VOID NTAPI xboxkrnl::XcSHAInit
{
LOG_FUNC_ONE_ARG(pbSHAContext);
UNIMPLEMENTED();
return;
LOG_UNIMPLEMENTED();
}
// ******************************************************************
@ -77,9 +75,7 @@ XBSYSAPI EXPORTNUM(336) VOID NTAPI xboxkrnl::XcSHAUpdate
LOG_FUNC_ARG(dwInputLength)
LOG_FUNC_END;
UNIMPLEMENTED();
return;
LOG_UNIMPLEMENTED();
}
// ******************************************************************
@ -101,7 +97,5 @@ XBSYSAPI EXPORTNUM(337) VOID NTAPI xboxkrnl::XcSHAFinal
{
pbDigest[v] = 0;
}
return;
}

View File

@ -65,12 +65,12 @@ XBSYSAPI EXPORTNUM(327) xboxkrnl::NTSTATUS NTAPI xboxkrnl::XeLoadSection
if (((Xbe::SectionHeader*)section)->dwSectionRefCount > 0) {
((Xbe::SectionHeader*)section)->dwSectionRefCount++;
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}
EmuWarning("XeLoadSection lied");
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}
XBSYSAPI EXPORTNUM(328) xboxkrnl::NTSTATUS NTAPI xboxkrnl::XeUnloadSection
@ -83,12 +83,12 @@ XBSYSAPI EXPORTNUM(328) xboxkrnl::NTSTATUS NTAPI xboxkrnl::XeUnloadSection
LOG_FUNC_END;
if (((Xbe::SectionHeader*)section)->dwSectionRefCount == 0) {
return STATUS_INVALID_PARAMETER;
RETURN(STATUS_INVALID_PARAMETER);
}
EmuWarning("XeUnloadSection lied");
return STATUS_SUCCESS;
RETURN(STATUS_SUCCESS);
}
// TODO : What should we initialize this to?

View File

@ -61,7 +61,7 @@ PVOID WINAPI XTL::EmuXGIsSwizzledFormat
{
LOG_FUNC_ONE_ARG(Format);
return FALSE;
RETURN(FALSE);
}
// ******************************************************************
@ -121,10 +121,6 @@ VOID WINAPI XTL::EmuXGSwizzleRect
pDst += Pitch;
}
}
return;
}
// ******************************************************************
@ -192,10 +188,6 @@ VOID WINAPI XTL::EmuXGSwizzleBox
}
}
}
return;
}
// ******************************************************************
@ -325,10 +317,10 @@ HRESULT WINAPI XTL::EmuXGWriteSurfaceOrTextureToXPR
// and write the surface/texture to a file, or output a generic .xbx
// file and be done with it.
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
// (Temporarily) ignoring EmuXGWriteSurfaceOrTextureToXPR. Need file specs.
return S_OK;
RETURN(S_OK);
}
// ******************************************************************

View File

@ -64,7 +64,7 @@ int WINAPI XTL::EmuWSAStartup
int ret = WSAStartup(wVersionRequested, lpWSAData);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -80,7 +80,7 @@ INT WINAPI XTL::EmuXNetStartup
// Fake Successfull...hehehe...sucker...hehehehehe
INT ret = 0;
return ret;
RETURN(ret);
}
// ******************************************************************
@ -93,7 +93,7 @@ DWORD WINAPI XTL::EmuXNetGetEthernetLinkStatus()
// for now, no ethernet connection is available
DWORD ret = XNET_ETHERNET_LINK_ACTIVE | XNET_ETHERNET_LINK_100MBPS;
return ret;
RETURN(ret);
}
// ******************************************************************
@ -115,7 +115,7 @@ SOCKET XTL::EmuThis::Emusocket
SOCKET ret = socket(af, type, protocol);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -139,7 +139,7 @@ int XTL::EmuThis::Emubind
int ret = bind(s, name, namelen);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -161,7 +161,7 @@ int XTL::EmuThis::Emulisten
int ret = listen(s, backlog);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -183,7 +183,7 @@ int XTL::EmuThis::Emuioctlsocket
int ret = ioctlsocket(s, cmd, argp);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -204,7 +204,7 @@ HRESULT WINAPI XOnlineLaunchNewImage
HRESULT ret = E_FAIL;
return ret;
RETURN(ret);
}
// ******************************************************************
@ -231,5 +231,5 @@ HRESULT WINAPI XTL::EmuXOnlineLogon
HRESULT ret = HRESULT(0x80151000L); // XONLINE_E_LOGON_NO_NETWORK_CONNECTION
return ret;
RETURN(ret);
}

View File

@ -89,7 +89,7 @@ BOOL WINAPI XTL::EmuXFormatUtilityDrive()
// TODO: yeah... we'll format... riiiiight
return TRUE;
RETURN(TRUE);
}
// ******************************************************************
@ -104,7 +104,7 @@ DWORD WINAPI XTL::EmuGetTimeZoneInformation
DWORD dwRet = GetTimeZoneInformation(lpTimeZoneInformation);
return dwRet;
RETURN(dwRet);
}
// ******************************************************************
@ -122,7 +122,7 @@ BOOL WINAPI XTL::EmuQueryPerformanceCounter
// debug - 4x speed
//lpPerformanceCount->QuadPart *= 4;
return bRet;
RETURN(bRet);
}
// ******************************************************************
@ -137,7 +137,7 @@ BOOL WINAPI XTL::EmuQueryPerformanceFrequency
BOOL bRet = QueryPerformanceFrequency(lpFrequency);
return bRet;
RETURN(bRet);
}
// ******************************************************************
@ -152,7 +152,7 @@ BOOL WINAPI XTL::EmuXMountUtilityDrive
CxbxMountUtilityDrive(fFormatClean);
return TRUE;
RETURN(TRUE);
}
// ******************************************************************
@ -190,8 +190,6 @@ VOID WINAPI XTL::EmuXInitDevices
{
g_hInputHandle[v] = 0;
}
return;
}
// ******************************************************************
@ -211,7 +209,7 @@ DWORD WINAPI XTL::EmuXGetDevices
else
EmuWarning("Unknown DeviceType (0x%.08X, 0x%.08X, 0x%.08X)\n", DeviceType->Reserved[0], DeviceType->Reserved[1], DeviceType->Reserved[2]);
return ret;
RETURN(ret);
}
// ******************************************************************
@ -255,7 +253,7 @@ BOOL WINAPI XTL::EmuXGetDeviceChanges
*pdwRemovals = 0;
}
return TRUE; //bRet;
RETURN(TRUE); // TODO : RETURN(bRet);
}
// ******************************************************************
@ -326,7 +324,7 @@ HANDLE WINAPI XTL::EmuXInputOpen
g_bXInputOpenCalled = true;
return (HANDLE)pph;
RETURN((HANDLE)pph);
}
// ******************************************************************
@ -365,8 +363,6 @@ VOID WINAPI XTL::EmuXInputClose
delete pph;
}
//*/
return;
}
// ******************************************************************
@ -418,9 +414,7 @@ DWORD WINAPI XTL::EmuXInputPoll
}
}
return ERROR_SUCCESS;
RETURN(ERROR_SUCCESS);
}
// ******************************************************************
@ -455,7 +449,7 @@ DWORD WINAPI XTL::EmuXInputGetCapabilities
}
}
return ret;
RETURN(ret);
}
// ******************************************************************
@ -507,7 +501,7 @@ DWORD WINAPI XTL::EmuXInputGetState
else
EmuWarning( "EmuXInputGetState(): pph == NULL!" );
return ret;
RETURN(ret);
}
// ******************************************************************
@ -583,7 +577,7 @@ DWORD WINAPI XTL::EmuXInputSetState
}
}
return ret;
RETURN(ret);
}
@ -606,7 +600,7 @@ BOOL WINAPI XTL::EmuSetThreadPriorityBoost
if(bRet == FALSE)
EmuWarning("SetThreadPriorityBoost Failed!");
return bRet;
RETURN(bRet);
}
// ******************************************************************
@ -628,7 +622,7 @@ BOOL WINAPI XTL::EmuSetThreadPriority
if(bRet == FALSE)
EmuWarning("SetThreadPriority Failed!");
return bRet;
RETURN(bRet);
}
@ -647,7 +641,7 @@ int WINAPI XTL::EmuGetThreadPriority
if(iRet == THREAD_PRIORITY_ERROR_RETURN)
EmuWarning("GetThreadPriority Failed!");
return iRet;
RETURN(iRet);
}
// ******************************************************************
@ -666,7 +660,7 @@ BOOL WINAPI XTL::EmuGetExitCodeThread
BOOL bRet = GetExitCodeThread(hThread, lpExitCode);
return bRet;
RETURN(bRet);
}
// ******************************************************************
@ -700,8 +694,6 @@ VOID WINAPI XTL::EmuXapiThreadStartup
*/
//_asm int 3;
return;
}
// ******************************************************************
@ -784,7 +776,7 @@ DWORD WINAPI XTL::EmuQueueUserAPC
if(!dwRet)
EmuWarning("QueueUserAPC failed!");
return dwRet;
RETURN(dwRet);
}
// ******************************************************************
@ -810,7 +802,7 @@ BOOL WINAPI XTL::EmuGetOverlappedResult
// if(bWait)
// bRet = TRUE; // Sucker...
return bRet;
RETURN(bRet);
}
// ******************************************************************
@ -889,9 +881,8 @@ DWORD WINAPI XTL::EmuXLaunchNewImage
}
ExitProcess(EXIT_SUCCESS);
return dwRet;
RETURN(dwRet);
}
// ******************************************************************
@ -955,9 +946,7 @@ DWORD WINAPI XTL::EmuXGetLaunchInfo
dwRet = ERROR_SUCCESS;
}
return dwRet;
RETURN(dwRet);
}
// ******************************************************************
@ -971,7 +960,7 @@ VOID WINAPI XTL::EmuXSetProcessQuantumLength
LOG_FUNC_ONE_ARG(dwMilliseconds);
// TODO: Implement?
UNIMPLEMENTED();
LOG_UNIMPLEMENTED();
}
// ******************************************************************
@ -985,7 +974,7 @@ DWORD WINAPI XTL::EmuXGetFileCacheSize()
// TODO: Save the file cache size if/when set.
DWORD dwRet = 64 * 1024;
return dwRet;
RETURN(dwRet);
}
// ******************************************************************
@ -1008,7 +997,7 @@ DWORD WINAPI XTL::EmuSignalObjectAndWait
DWORD dwRet = SignalObjectAndWait( hObjectToSignal, hObjectToWaitOn, dwMilliseconds, bAlertable );
return dwRet;
RETURN(dwRet);
}
// ******************************************************************
@ -1026,7 +1015,7 @@ BOOL WINAPI XTL::EmuPulseEvent
BOOL bRet = PulseEvent( hEvent );
return bRet;
RETURN(bRet);
}
// ******************************************************************
@ -1051,7 +1040,7 @@ MMRESULT WINAPI XTL::EmutimeSetEvent
MMRESULT Ret = timeSetEvent( uDelay, uResolution, fptc, (DWORD_PTR) dwUser, fuEvent );
return Ret;
RETURN(Ret);
}
// ******************************************************************
@ -1066,7 +1055,7 @@ MMRESULT WINAPI XTL::EmutimeKillEvent
MMRESULT Ret = timeKillEvent( uTimerID );
return Ret;
RETURN(Ret);
}
// ******************************************************************
@ -1089,6 +1078,8 @@ VOID WINAPI XTL::EmuRaiseException
// TODO: Implement or not?
// RaiseException(dwExceptionCode, dwExceptionFlags, nNumberOfArguments, (*(ULONG_PTR**) &lpArguments));
LOG_UNIMPLEMENTED();
}
// ******************************************************************
@ -1125,7 +1116,7 @@ DWORD WINAPI XTL::EmuGetFileAttributesA
return dwRet;
RETURN(dwRet);
}
// ******************************************************************
@ -1147,7 +1138,7 @@ DWORD WINAPI XTL::EmuXMountMUA
// TODO: Actually allow memory card emulation? This might make transferring
// game saves a bit easier if the memory card directory was configurable. =]
return E_FAIL;
RETURN(E_FAIL);
}
// ******************************************************************
@ -1172,9 +1163,7 @@ HANDLE WINAPI XTL::EmuCreateWaitableTimerA
HANDLE hRet = CreateWaitableTimerA( NULL, bManualReset, lpTimerName );
return hRet;
RETURN(hRet);
}
// ******************************************************************
@ -1204,7 +1193,7 @@ BOOL WINAPI XTL::EmuSetWaitableTimer
if(!Ret)
EmuWarning("SetWaitableTimer failed!");
return Ret;
RETURN(Ret);
}
// ******************************************************************
@ -1224,8 +1213,9 @@ DWORD WINAPI XTL::EmuXMountAlternateTitle
LOG_FUNC_END;
// TODO: Anything?
LOG_UNIMPLEMENTED();
return ERROR_SUCCESS;
RETURN(ERROR_SUCCESS);
}
// ******************************************************************
@ -1238,7 +1228,9 @@ DWORD WINAPI XTL::EmuXUnmountAlternateTitle
{
LOG_FUNC_ONE_ARG(chDrive);
return ERROR_SUCCESS;
LOG_UNIMPLEMENTED();
RETURN(ERROR_SUCCESS);
}
// ******************************************************************
@ -1248,7 +1240,9 @@ DWORD WINAPI XTL::EmuXGetDeviceEnumerationStatus()
{
LOG_FUNC();
return XDEVICE_ENUMERATION_IDLE;
LOG_UNIMPLEMENTED();
RETURN(XDEVICE_ENUMERATION_IDLE);
}
// ******************************************************************
@ -1266,8 +1260,9 @@ DWORD WINAPI XTL::EmuXInputGetDeviceDescription
LOG_FUNC_END;
// TODO: Lightgun support?
LOG_UNIMPLEMENTED();
return ERROR_NOT_SUPPORTED; // ERROR_DEVICE_NOT_CONNECTED;
RETURN(ERROR_NOT_SUPPORTED); // ERROR_DEVICE_NOT_CONNECTED;
}
// ******************************************************************
@ -1278,8 +1273,9 @@ int WINAPI XTL::EmuXAutoPowerDownResetTimer()
LOG_FUNC();
// Meh, that's what the 'X' is for! =]
LOG_UNIMPLEMENTED();
return TRUE;
RETURN(TRUE);
}
// ******************************************************************
@ -1299,6 +1295,7 @@ DWORD WINAPI XTL::EmuXMountMURootA
LOG_FUNC_END;
// TODO: The params are probably wrong...
LOG_UNIMPLEMENTED();
return ERROR_SUCCESS;
RETURN(ERROR_SUCCESS);
}