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

Added support to Ps notification routines

This commit is contained in:
ergo720 2022-01-27 14:59:17 +01:00
parent e9cc351bba
commit ec6b16c68a
3 changed files with 28 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,10 +136,8 @@ xbox::ulonglong_xt LARGE_INTEGER2ULONGLONG(xbox::LARGE_INTEGER value)
// ****************************************************************** // ******************************************************************
xbox::KPCR* WINAPI EmuKeGetPcr() xbox::KPCR* WINAPI EmuKeGetPcr()
{ {
xbox::PKPCR Pcr;
// See EmuKeSetPcr() // See EmuKeSetPcr()
Pcr = (xbox::PKPCR)__readfsdword(TIB_ArbitraryDataSlot); xbox::PKPCR Pcr = (xbox::PKPCR)__readfsdword(TIB_ArbitraryDataSlot);
// If this fails, it's a bug: it means we are executing xbox code from a host thread, and we have forgotten to initialize // If this fails, it's a bug: it means we are executing xbox code from a host thread, and we have forgotten to initialize
// the xbox thread first // the xbox thread first

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

@ -50,7 +50,7 @@ namespace NtDll
#include "core\kernel\support\EmuNtDll.h" #include "core\kernel\support\EmuNtDll.h"
}; };
#define PSP_MAX_CREATE_THREAD_NOTIFY 16 /* TODO : Should be 8 */ #define PSP_MAX_CREATE_THREAD_NOTIFY 8
// PsCreateSystemThread proxy parameters // PsCreateSystemThread proxy parameters
typedef struct _PCSTProxyParam typedef struct _PCSTProxyParam
@ -62,9 +62,8 @@ typedef struct _PCSTProxyParam
} }
PCSTProxyParam; PCSTProxyParam;
// Global Variable(s) xbox::PCREATE_THREAD_NOTIFY_ROUTINE g_pfnThreadNotification[PSP_MAX_CREATE_THREAD_NOTIFY] = { xbox::zeroptr };
extern PVOID g_pfnThreadNotification[PSP_MAX_CREATE_THREAD_NOTIFY] = { NULL }; int g_iThreadNotificationCount = 0;
extern int g_iThreadNotificationCount = 0;
// Separate function for logging, otherwise in PCSTProxy __try wont work (Compiler Error C2712) // Separate function for logging, otherwise in PCSTProxy __try wont work (Compiler Error C2712)
void LOG_PCSTProxy void LOG_PCSTProxy
@ -251,6 +250,16 @@ XBSYSAPI EXPORTNUM(255) xbox::ntstatus_xt NTAPI xbox::PsCreateSystemThreadEx
RETURN(result); RETURN(result);
} }
// Call thread notification routine(s)
if (g_iThreadNotificationCount) {
for (int i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++) {
if (g_pfnThreadNotification[i]) {
EmuLog(LOG_LEVEL::DEBUG, "Calling pfnNotificationRoutine[%d] (0x%.8X)", i, g_pfnThreadNotification[i]);
(*g_pfnThreadNotification[i])(eThread, eThread->UniqueThread, TRUE);
}
}
}
// Create another handle to pass back to the title in the ThreadHandle argument // Create another handle to pass back to the title in the ThreadHandle argument
result = ObOpenObjectByPointer(eThread, &PsThreadObjectType, ThreadHandle); result = ObOpenObjectByPointer(eThread, &PsThreadObjectType, ThreadHandle);
if (!X_NT_SUCCESS(result)) { if (!X_NT_SUCCESS(result)) {
@ -270,28 +279,6 @@ XBSYSAPI EXPORTNUM(255) xbox::ntstatus_xt NTAPI xbox::PsCreateSystemThreadEx
iPCSTProxyParam->SystemRoutine = (PVOID)SystemRoutine; // NULL, XapiThreadStartup or unknown? iPCSTProxyParam->SystemRoutine = (PVOID)SystemRoutine; // NULL, XapiThreadStartup or unknown?
iPCSTProxyParam->Ethread = eThread; iPCSTProxyParam->Ethread = eThread;
/*
// call thread notification routine(s)
if (g_iThreadNotificationCount != 0)
{
for (int i = 0; i < 16; i++)
{
// TODO: This is *very* wrong, ps notification routines are NOT the same as XApi notification routines
// TODO: XAPI notification routines are already handeld by XapiThreadStartup and don't need to be called by us
// TODO: This type of notification routine is PCREATE_THREAD_NOTIFY_ROUTINE, which takes an ETHREAD pointer as well as Thread ID as input
// TODO: This is impossible to support currently, as we do not create or register Xbox ETHREAD objects, so we're better to skip it entirely!
xbox::XTHREAD_NOTIFY_PROC pfnNotificationRoutine = (xbox::XTHREAD_NOTIFY_PROC)g_pfnThreadNotification[i];
// If the routine doesn't exist, don't execute it!
if (pfnNotificationRoutine == NULL)
continue;
EmuLog(LOG_LEVEL::DEBUG, "Calling pfnNotificationRoutine[%d] (0x%.8X)", g_iThreadNotificationCount, pfnNotificationRoutine);
pfnNotificationRoutine(TRUE);
}
}*/
unsigned int ThreadId; unsigned int ThreadId;
HANDLE handle = reinterpret_cast<HANDLE>(_beginthreadex(NULL, KernelStackSize, PCSTProxy, iPCSTProxyParam, CREATE_SUSPENDED, &ThreadId)); HANDLE handle = reinterpret_cast<HANDLE>(_beginthreadex(NULL, KernelStackSize, PCSTProxy, iPCSTProxyParam, CREATE_SUSPENDED, &ThreadId));
if (handle == NULL) { if (handle == NULL) {
@ -352,29 +339,15 @@ XBSYSAPI EXPORTNUM(257) xbox::ntstatus_xt NTAPI xbox::PsSetCreateThreadNotifyRou
{ {
LOG_FUNC_ONE_ARG(NotifyRoutine); LOG_FUNC_ONE_ARG(NotifyRoutine);
NTSTATUS ret = X_STATUS_INSUFFICIENT_RESOURCES; for (int i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++) {
if (g_pfnThreadNotification[i] == zeroptr) {
// Taken from xbox::EmuXRegisterThreadNotifyRoutine (perhaps that can be removed now) : g_pfnThreadNotification[i] = NotifyRoutine;
// I honestly don't expect this to happen, but if it does...
if (g_iThreadNotificationCount >= PSP_MAX_CREATE_THREAD_NOTIFY)
CxbxrKrnlAbort("Too many thread notification routines installed\n");
// Find an empty spot in the thread notification array
for (int i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++)
{
// If we find one, then add it to the array, and break the loop so
// that we don't accidently register the same routine twice!
if (g_pfnThreadNotification[i] == NULL)
{
g_pfnThreadNotification[i] = (PVOID)NotifyRoutine;
g_iThreadNotificationCount++; g_iThreadNotificationCount++;
ret = X_STATUS_SUCCESS; RETURN(X_STATUS_SUCCESS);
break;
} }
} }
RETURN(ret); RETURN(X_STATUS_INSUFFICIENT_RESOURCES);
} }
// ****************************************************************** // ******************************************************************
@ -390,23 +363,16 @@ XBSYSAPI EXPORTNUM(258) xbox::void_xt NTAPI xbox::PsTerminateSystemThread
{ {
LOG_FUNC_ONE_ARG(ExitStatus); LOG_FUNC_ONE_ARG(ExitStatus);
/* // Call thread notification routine(s)
// call thread notification routine(s) xbox::PETHREAD eThread = xbox::PspGetCurrentThread();
if (g_iThreadNotificationCount != 0) if (eThread->UniqueThread && g_iThreadNotificationCount) {
{ for (int i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++) {
for (int i = 0; i < 16; i++) if (g_pfnThreadNotification[i]) {
{ EmuLog(LOG_LEVEL::DEBUG, "Calling pfnNotificationRoutine[%d] (0x%.8X)", i, g_pfnThreadNotification[i]);
xbox::XTHREAD_NOTIFY_PROC pfnNotificationRoutine = (xbox::XTHREAD_NOTIFY_PROC)g_pfnThreadNotification[i]; (*g_pfnThreadNotification[i])(eThread, eThread->UniqueThread, FALSE);
}
// If the routine doesn't exist, don't execute it! }
if (pfnNotificationRoutine == NULL)
continue;
EmuLog(LOG_LEVEL::DEBUG, "Calling pfnNotificationRoutine[%d] (0x%.8X)", g_iThreadNotificationCount, pfnNotificationRoutine);
pfnNotificationRoutine(FALSE);
} }
}*/
EmuKeFreeThread(ExitStatus); EmuKeFreeThread(ExitStatus);
KiUniqueProcess.StackCount--; KiUniqueProcess.StackCount--;

4
src/core/kernel/support/Emu.h
View File

@ -66,10 +66,6 @@ extern HWND g_hEmuWindow;
#define GET_FRONT_WINDOW_HANDLE ((CxbxKrnl_hEmuParent != nullptr) ? CxbxKrnl_hEmuParent : g_hEmuWindow) #define GET_FRONT_WINDOW_HANDLE ((CxbxKrnl_hEmuParent != nullptr) ? CxbxKrnl_hEmuParent : g_hEmuWindow)
// thread notification routine
extern PVOID g_pfnThreadNotification[16];
extern int g_iThreadNotificationCount;
extern HANDLE g_CurrentProcessHandle; // Set in CxbxKrnlMain extern HANDLE g_CurrentProcessHandle; // Set in CxbxKrnlMain
// Delta added to host SystemTime, used in KiClockIsr and KeSetSystemTime // Delta added to host SystemTime, used in KiClockIsr and KeSetSystemTime