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

PVOID casts where necessary

This commit is contained in:
darkf 2020-04-07 01:56:22 -07:00
parent 21733cc594
commit 95f6966a43
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/XAPI/Xapi.cpp
View File

@ -958,7 +958,7 @@ VOID WINAPI XTL::EMUPATCH(XRegisterThreadNotifyRoutine)
// that we don't accidently register the same routine twice! // that we don't accidently register the same routine twice!
if(g_pfnThreadNotification[i] == NULL) if(g_pfnThreadNotification[i] == NULL)
{ {
g_pfnThreadNotification[i] = pThreadNotification->pfnNotifyRoutine; g_pfnThreadNotification[i] = (PVOID)pThreadNotification->pfnNotifyRoutine;
g_iThreadNotificationCount++; g_iThreadNotificationCount++;
break; break;
} }

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

@ -1655,7 +1655,7 @@ XBSYSAPI EXPORTNUM(219) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtReadFile
NTSTATUS ret = NtDll::NtReadFile( NTSTATUS ret = NtDll::NtReadFile(
FileHandle, FileHandle,
Event, Event,
ApcRoutine, (PVOID)ApcRoutine,
ApcContext, ApcContext,
IoStatusBlock, IoStatusBlock,
Buffer, Buffer,
@ -2175,7 +2175,7 @@ XBSYSAPI EXPORTNUM(236) xboxkrnl::NTSTATUS NTAPI xboxkrnl::NtWriteFile
NTSTATUS ret = NtDll::NtWriteFile( NTSTATUS ret = NtDll::NtWriteFile(
FileHandle, FileHandle,
Event, Event,
ApcRoutine, (PVOID)ApcRoutine,
ApcContext, ApcContext,
IoStatusBlock, IoStatusBlock,
Buffer, Buffer,

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

@ -274,9 +274,9 @@ XBSYSAPI EXPORTNUM(255) xboxkrnl::NTSTATUS NTAPI xboxkrnl::PsCreateSystemThreadE
// PCSTProxy is responsible for cleaning up this pointer // PCSTProxy is responsible for cleaning up this pointer
PCSTProxyParam *iPCSTProxyParam = (PCSTProxyParam*)malloc(sizeof(PCSTProxyParam)); PCSTProxyParam *iPCSTProxyParam = (PCSTProxyParam*)malloc(sizeof(PCSTProxyParam));
iPCSTProxyParam->StartRoutine = StartRoutine; iPCSTProxyParam->StartRoutine = (PVOID)StartRoutine;
iPCSTProxyParam->StartContext = StartContext; iPCSTProxyParam->StartContext = StartContext;
iPCSTProxyParam->SystemRoutine = SystemRoutine; // NULL, XapiThreadStartup or unknown? iPCSTProxyParam->SystemRoutine = (PVOID)SystemRoutine; // NULL, XapiThreadStartup or unknown?
iPCSTProxyParam->StartSuspended = CreateSuspended; iPCSTProxyParam->StartSuspended = CreateSuspended;
iPCSTProxyParam->hStartedEvent = hStartedEvent; iPCSTProxyParam->hStartedEvent = hStartedEvent;
@ -399,7 +399,7 @@ XBSYSAPI EXPORTNUM(257) xboxkrnl::NTSTATUS NTAPI xboxkrnl::PsSetCreateThreadNoti
// that we don't accidently register the same routine twice! // that we don't accidently register the same routine twice!
if (g_pfnThreadNotification[i] == NULL) if (g_pfnThreadNotification[i] == NULL)
{ {
g_pfnThreadNotification[i] = NotifyRoutine; g_pfnThreadNotification[i] = (PVOID)NotifyRoutine;
g_iThreadNotificationCount++; g_iThreadNotificationCount++;
ret = STATUS_SUCCESS; ret = STATUS_SUCCESS;
break; break;