murdle/mc-lce
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace all windows api types

Browse Source
This commit is contained in:
murdle
2026-03-01 20:06:25 +02:00
parent 768de6800c
commit 53bd1b7e5b
790 changed files with 11101 additions and 9193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/world/ConsoleSaveFileOriginal.cpp
View File

@@ -24,7 +24,7 @@
unsigned int ConsoleSaveFileOriginal::pagesCommitted = 0;
void *ConsoleSaveFileOriginal::pvHeap = NULL;
ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID pvSaveData /*= NULL*/, DWORD dFileSize /*= 0*/, bool forceCleanSave /*= false*/, ESavePlatform plat /*= SAVE_FILE_PLATFORM_LOCAL*/)
ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, void* pvSaveData /*= NULL*/, unsigned long dFileSize /*= 0*/, bool forceCleanSave /*= false*/, ESavePlatform plat /*= SAVE_FILE_PLATFORM_LOCAL*/)
{
InitializeCriticalSectionAndSpinCount(&m_lock,5120);
@@ -44,7 +44,7 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID
pvSaveMem = pvHeap;
m_fileName = fileName;
DWORD fileSize = dFileSize;
unsigned long fileSize = dFileSize;
// Load a save from the game rules
bool bLevelGenBaseSave = false;
@@ -61,7 +61,7 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID
if( forceCleanSave )
fileSize = 0;
DWORD heapSize = max( fileSize, (DWORD)(1024 * 1024 * 2)); // 4J Stu - Our files are going to be bigger than 2MB so allocate high to start with
unsigned long heapSize = max( fileSize, (unsigned long)(1024 * 1024 * 2)); // 4J Stu - Our files are going to be bigger than 2MB so allocate high to start with
// Initially committ enough room to store headSize bytes (using CSF_PAGE_SIZE pages, so rounding up here). We should only ever have one save file at a time,
// and the pages should be decommitted in the dtor, so pages committed should always be zero at this point.
@@ -173,9 +173,9 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID
}
// Only ReAlloc if we need to (we might already have enough) and align to 512 byte boundaries
DWORD currentHeapSize = pagesCommitted * CSF_PAGE_SIZE;
unsigned long currentHeapSize = pagesCommitted * CSF_PAGE_SIZE;
DWORD desiredSize = decompSize;
unsigned long desiredSize = decompSize;
if( desiredSize > currentHeapSize )
{
@@ -239,13 +239,13 @@ void ConsoleSaveFileOriginal::deleteFile( FileEntry *file )
LockSaveAccess();
DWORD numberOfBytesRead = 0;
DWORD numberOfBytesWritten = 0;
unsigned long numberOfBytesRead = 0;
unsigned long numberOfBytesWritten = 0;
const int bufferSize = 4096;
int amountToRead = bufferSize;
byte buffer[bufferSize];
DWORD bufferDataSize = 0;
unsigned long bufferDataSize = 0;
char *readStartOffset = (char *)pvSaveMem + file->data.startOffset + file->getFileSize();
@@ -299,7 +299,7 @@ void ConsoleSaveFileOriginal::deleteFile( FileEntry *file )
ReleaseSaveAccess();
}
void ConsoleSaveFileOriginal::setFilePointer(FileEntry *file,LONG lDistanceToMove,PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod)
void ConsoleSaveFileOriginal::setFilePointer(FileEntry *file,int32_t lDistanceToMove,PLONG lpDistanceToMoveHigh,unsigned long dwMoveMethod)
{
LockSaveAccess();
@@ -314,7 +314,7 @@ void ConsoleSaveFileOriginal::setFilePointer(FileEntry *file,LONG lDistanceToMov
}
// If this file needs to grow, move the data after along
void ConsoleSaveFileOriginal::PrepareForWrite( FileEntry *file, DWORD nNumberOfBytesToWrite )
void ConsoleSaveFileOriginal::PrepareForWrite( FileEntry *file, unsigned long nNumberOfBytesToWrite )
{
int bytesToGrowBy = ( (file->currentFilePointer - file->data.startOffset) + nNumberOfBytesToWrite) - file->getFileSize();
if( bytesToGrowBy <= 0 )
@@ -337,7 +337,7 @@ void ConsoleSaveFileOriginal::PrepareForWrite( FileEntry *file, DWORD nNumberOfB
finalizeWrite();
}
BOOL ConsoleSaveFileOriginal::writeFile(FileEntry *file,LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten)
bool ConsoleSaveFileOriginal::writeFile(FileEntry *file,const void* lpBuffer, unsigned long nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten)
{
assert( pvSaveMem != NULL );
if( pvSaveMem == NULL )
@@ -374,7 +374,7 @@ BOOL ConsoleSaveFileOriginal::writeFile(FileEntry *file,LPCVOID lpBuffer, DWORD
return 1;
}
BOOL ConsoleSaveFileOriginal::zeroFile(FileEntry *file, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten)
bool ConsoleSaveFileOriginal::zeroFile(FileEntry *file, unsigned long nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten)
{
assert( pvSaveMem != NULL );
if( pvSaveMem == NULL )
@@ -411,9 +411,9 @@ BOOL ConsoleSaveFileOriginal::zeroFile(FileEntry *file, DWORD nNumberOfBytesToWr
return 1;
}
BOOL ConsoleSaveFileOriginal::readFile( FileEntry *file, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead)
bool ConsoleSaveFileOriginal::readFile( FileEntry *file, void* lpBuffer, unsigned long nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead)
{
DWORD actualBytesToRead;
unsigned long actualBytesToRead;
assert( pvSaveMem != NULL );
if( pvSaveMem == NULL )
{
@@ -451,7 +451,7 @@ BOOL ConsoleSaveFileOriginal::readFile( FileEntry *file, LPVOID lpBuffer, DWORD
return 1;
}
BOOL ConsoleSaveFileOriginal::closeHandle( FileEntry *file )
bool ConsoleSaveFileOriginal::closeHandle( FileEntry *file )
{
LockSaveAccess();
finalizeWrite();
@@ -467,23 +467,23 @@ void ConsoleSaveFileOriginal::finalizeWrite()
ReleaseSaveAccess();
}
void ConsoleSaveFileOriginal::MoveDataBeyond(FileEntry *file, DWORD nNumberOfBytesToWrite)
void ConsoleSaveFileOriginal::MoveDataBeyond(FileEntry *file, unsigned long nNumberOfBytesToWrite)
{
DWORD numberOfBytesRead = 0;
DWORD numberOfBytesWritten = 0;
unsigned long numberOfBytesRead = 0;
unsigned long numberOfBytesWritten = 0;
const DWORD bufferSize = 4096;
DWORD amountToRead = bufferSize;
const unsigned long bufferSize = 4096;
unsigned long amountToRead = bufferSize;
//assert( nNumberOfBytesToWrite <= bufferSize );
static byte buffer1[bufferSize];
static byte buffer2[bufferSize];
DWORD buffer1Size = 0;
DWORD buffer2Size = 0;
unsigned long buffer1Size = 0;
unsigned long buffer2Size = 0;
// Only ReAlloc if we need to (we might already have enough) and align to 512 byte boundaries
DWORD currentHeapSize = pagesCommitted * CSF_PAGE_SIZE;
unsigned long currentHeapSize = pagesCommitted * CSF_PAGE_SIZE;
DWORD desiredSize = header.GetFileSize() + nNumberOfBytesToWrite;
unsigned long desiredSize = header.GetFileSize() + nNumberOfBytesToWrite;
if( desiredSize > currentHeapSize )
{
@@ -570,7 +570,7 @@ void ConsoleSaveFileOriginal::MoveDataBeyond(FileEntry *file, DWORD nNumberOfByt
// Fill buffer 1 from file
if( (readStartOffset - bufferSize) < spaceStartOffset )
{
amountToRead = (DWORD)(readStartOffset - spaceStartOffset);
amountToRead = (unsigned long)(readStartOffset - spaceStartOffset);
}
else
{
@@ -734,11 +734,11 @@ void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail )
app.DebugPrintf("Save data compressed from %d to %d\n", fileSize, compLength);
#endif
PBYTE pbThumbnailData=NULL;
DWORD dwThumbnailDataSize=0;
uint8_t* pbThumbnailData=NULL;
unsigned long dwThumbnailDataSize=0;
PBYTE pbDataSaveImage=NULL;
DWORD dwDataSizeSaveImage=0;
uint8_t* pbDataSaveImage=NULL;
unsigned long dwDataSizeSaveImage=0;
#if ( defined _XBOX || defined _DURANGO )
app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize);
@@ -746,10 +746,10 @@ void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail )
app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize,&pbDataSaveImage,&dwDataSizeSaveImage);
#endif
BYTE bTextMetadata[88];
uint8_t bTextMetadata[88];
ZeroMemory(bTextMetadata,88);
__int64 seed = 0;
int64_t seed = 0;
bool hasSeed = false;
if(MinecraftServer::getInstance()!= NULL && MinecraftServer::getInstance()->levels[0]!=NULL)
{
@@ -759,7 +759,7 @@ void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail )
int iTextMetadataBytes = app.CreateImageTextData(bTextMetadata, seed, hasSeed, app.GetGameHostOption(eGameHostOption_All), Minecraft::GetInstance()->getCurrentTexturePackId());
INT saveOrCheckpointId = 0;
int saveOrCheckpointId = 0;
bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId);
TelemetryManager->RecordLevelSaveOrCheckpoint(ProfileManager.GetPrimaryPad(), saveOrCheckpointId, compLength+8);
@@ -808,7 +808,7 @@ void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail )
#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || defined _DURANGO || defined _WINDOWS64)
int ConsoleSaveFileOriginal::SaveSaveDataCallback(LPVOID lpParam,bool bRes)
int ConsoleSaveFileOriginal::SaveSaveDataCallback(void* lpParam,bool bRes)
{
ConsoleSaveFile *pClass=(ConsoleSaveFile *)lpParam;
@@ -826,7 +826,7 @@ void ConsoleSaveFileOriginal::DebugFlushToFile(void *compressedData /*= NULL*/,
unsigned int fileSize = header.GetFileSize();
DWORD numberOfBytesWritten = 0;
unsigned long numberOfBytesWritten = 0;
#ifdef _XBOX
File targetFileDir(L"GAME:\\Saves");
#else
@@ -853,12 +853,12 @@ void ConsoleSaveFileOriginal::DebugFlushToFile(void *compressedData /*= NULL*/,
#ifdef _UNICODE
wstring wtemp = targetFileDir.getPath() + wstring(fileName);
LPCWSTR lpFileName = wtemp.c_str();
const wchar_t* lpFileName = wtemp.c_str();
#else
LPCSTR lpFileName = wstringtofilename( targetFileDir.getPath() + wstring(fileName) );
const char* lpFileName = wstringtofilename( targetFileDir.getPath() + wstring(fileName) );
#endif
#ifndef __PSVITA__
HANDLE hSaveFile = CreateFile( lpFileName, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, NULL);
void* hSaveFile = CreateFile( lpFileName, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, NULL);
#endif
if(compressedData != NULL && compressedDataSize > 0)
@@ -989,8 +989,8 @@ bool ConsoleSaveFileOriginal::isLocalEndianDifferent( ESavePlatform plat )
void ConsoleSaveFileOriginal::ConvertRegionFile(File sourceFile)
{
DWORD numberOfBytesWritten = 0;
DWORD numberOfBytesRead = 0;
unsigned long numberOfBytesWritten = 0;
unsigned long numberOfBytesRead = 0;
RegionFile sourceRegionFile(this, &sourceFile);