Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -74,8 +74,8 @@ int _wcsicmp( const wchar_t * dst, const wchar_t * src )
|
||||
wchar_t f,l;
|
||||
|
||||
// validation section
|
||||
// _VALIDATE_RETURN(dst != nullptr, EINVAL, _NLSCMPERROR);
|
||||
// _VALIDATE_RETURN(src != nullptr, EINVAL, _NLSCMPERROR);
|
||||
// _VALIDATE_RETURN(dst != NULL, EINVAL, _NLSCMPERROR);
|
||||
// _VALIDATE_RETURN(src != NULL, EINVAL, _NLSCMPERROR);
|
||||
|
||||
do {
|
||||
f = towlower(*dst);
|
||||
@@ -90,7 +90,7 @@ size_t wcsnlen(const wchar_t *wcs, size_t maxsize)
|
||||
{
|
||||
size_t n;
|
||||
|
||||
// Note that we do not check if s == nullptr, because we do not
|
||||
// Note that we do not check if s == NULL, because we do not
|
||||
// return errno_t...
|
||||
|
||||
for (n = 0; n < maxsize && *wcs; n++, wcs++)
|
||||
@@ -134,7 +134,7 @@ VOID GetLocalTime(LPSYSTEMTIME lpSystemTime)
|
||||
lpSystemTime->wMilliseconds = cellRtcGetMicrosecond(&dateTime)/1000;
|
||||
}
|
||||
|
||||
HANDLE CreateEvent(void* lpEventAttributes, BOOL bManualReset, BOOL bInitialState, LPCSTR lpName) { PS3_STUBBED; return nullptr; }
|
||||
HANDLE CreateEvent(void* lpEventAttributes, BOOL bManualReset, BOOL bInitialState, LPCSTR lpName) { PS3_STUBBED; return NULL; }
|
||||
VOID Sleep(DWORD dwMilliseconds)
|
||||
{
|
||||
C4JThread::Sleep(dwMilliseconds);
|
||||
@@ -267,8 +267,8 @@ BOOL TlsSetValue(DWORD dwTlsIndex, LPVOID lpTlsValue) { return TLSStoragePS3::In
|
||||
LPVOID VirtualAlloc(LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect)
|
||||
{
|
||||
int err;
|
||||
sys_addr_t newAddress = nullptr;
|
||||
if(lpAddress == nullptr)
|
||||
sys_addr_t newAddress = NULL;
|
||||
if(lpAddress == NULL)
|
||||
{
|
||||
// reserve, and possibly commit also
|
||||
int commitSize = 0;
|
||||
@@ -382,7 +382,7 @@ BOOL SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHi
|
||||
int fd = (int) hFile;
|
||||
uint64_t pos = 0, bitsToMove = (int64_t) lDistanceToMove;
|
||||
|
||||
if (lpDistanceToMoveHigh != nullptr)
|
||||
if (lpDistanceToMoveHigh != NULL)
|
||||
bitsToMove |= ((uint64_t) (*lpDistanceToMoveHigh)) << 32;
|
||||
|
||||
int whence = 0;
|
||||
@@ -490,7 +490,7 @@ HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
|
||||
}
|
||||
else
|
||||
{
|
||||
err = cellFsOpen(filePath, flags, &fd ,nullptr, 0);
|
||||
err = cellFsOpen(filePath, flags, &fd ,NULL, 0);
|
||||
iFilesOpen++;
|
||||
//printf("\n\nFiles Open - %d\n\n",iFilesOpen);
|
||||
}
|
||||
@@ -675,7 +675,7 @@ errno_t _i64toa_s(int64_t _Val, char * _DstBuf, size_t _Size, int _Radix) { if(_
|
||||
|
||||
int _wtoi(const wchar_t *_Str)
|
||||
{
|
||||
return wcstol(_Str, nullptr, 10);
|
||||
return wcstol(_Str, NULL, 10);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user