Use standard screenshot buffer types

This commit is contained in:
notmatthewbeshay 2026-03-10 19:27:44 +11:00
parent d2db55e050
commit c4947ce99a
16 changed files with 20 additions and 20 deletions

View file

@ -610,7 +610,7 @@ public:
virtual void CaptureSaveThumbnail() =0; virtual void CaptureSaveThumbnail() =0;
virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize)=0; virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize)=0;
virtual void ReleaseSaveThumbnail()=0; virtual void ReleaseSaveThumbnail()=0;
virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize)=0; virtual void GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize)=0;
virtual void ReadBannedList(int iPad, eTMSAction action=(eTMSAction)0, bool bCallback=false)=0; virtual void ReadBannedList(int iPad, eTMSAction action=(eTMSAction)0, bool bCallback=false)=0;

View file

@ -146,7 +146,7 @@ void CConsoleMinecraftApp::ReleaseSaveThumbnail()
} }
void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize) void CConsoleMinecraftApp::GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize)
{ {
} }

View file

@ -25,7 +25,7 @@ public:
virtual void CaptureSaveThumbnail(); virtual void CaptureSaveThumbnail();
virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize); virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize);
virtual void ReleaseSaveThumbnail(); virtual void ReleaseSaveThumbnail();
virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize); virtual void GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize);
virtual int LoadLocalTMSFile(WCHAR *wchTMSFile); virtual int LoadLocalTMSFile(WCHAR *wchTMSFile);
virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt); virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt);

View file

@ -46,7 +46,7 @@ void CConsoleMinecraftApp::ReleaseSaveThumbnail()
{ {
} }
void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize) void CConsoleMinecraftApp::GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize)
{ {
} }

View file

@ -14,7 +14,7 @@ public:
virtual void CaptureSaveThumbnail(); virtual void CaptureSaveThumbnail();
virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize); virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize);
virtual void ReleaseSaveThumbnail(); virtual void ReleaseSaveThumbnail();
virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize); virtual void GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize);
virtual int LoadLocalTMSFile(WCHAR *wchTMSFile); virtual int LoadLocalTMSFile(WCHAR *wchTMSFile);
virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt); virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt);

View file

@ -284,7 +284,7 @@ void CConsoleMinecraftApp::ReleaseSaveThumbnail()
} }
void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize) void CConsoleMinecraftApp::GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize)
{ {
} }

View file

@ -71,7 +71,7 @@ public:
virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize) {}; // NOT USED virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize) {}; // NOT USED
virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize, std::uint8_t **saveImageData, unsigned int *saveImageSize); virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize, std::uint8_t **saveImageData, unsigned int *saveImageSize);
virtual void ReleaseSaveThumbnail(); virtual void ReleaseSaveThumbnail();
virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize); virtual void GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize);
int LoadLocalTMSFile(char *chTMSFile); int LoadLocalTMSFile(char *chTMSFile);
int LoadLocalDLCImage(SONYDLC *pDLCInfo); int LoadLocalDLCImage(SONYDLC *pDLCInfo);

View file

@ -450,7 +450,7 @@ void CConsoleMinecraftApp::ReleaseSaveThumbnail()
} }
} }
void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize) void CConsoleMinecraftApp::GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize)
{ {
} }

View file

@ -71,7 +71,7 @@ public:
virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize) {}; // NOT USED virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize) {}; // NOT USED
virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize, std::uint8_t **saveImageData, unsigned int *saveImageSize); virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize, std::uint8_t **saveImageData, unsigned int *saveImageSize);
virtual void ReleaseSaveThumbnail(); virtual void ReleaseSaveThumbnail();
virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize); virtual void GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize);
// BANNED LEVEL LIST // BANNED LEVEL LIST
virtual void ReadBannedList(int iPad, eTMSAction action=(eTMSAction)0, bool bCallback=false) {} virtual void ReadBannedList(int iPad, eTMSAction action=(eTMSAction)0, bool bCallback=false) {}

View file

@ -265,7 +265,7 @@ void CConsoleMinecraftApp::ReleaseSaveThumbnail()
} }
void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize) void CConsoleMinecraftApp::GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize)
{ {
} }

View file

@ -73,7 +73,7 @@ public:
virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize) {}; // NOT USED virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize) {}; // NOT USED
virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize, std::uint8_t **saveImageData, unsigned int *saveImageSize); virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize, std::uint8_t **saveImageData, unsigned int *saveImageSize);
virtual void ReleaseSaveThumbnail(); virtual void ReleaseSaveThumbnail();
virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize); virtual void GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize);
virtual int LoadLocalTMSFile(WCHAR *wchTMSFile); virtual int LoadLocalTMSFile(WCHAR *wchTMSFile);
virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt); virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt);

View file

@ -44,7 +44,7 @@ void CConsoleMinecraftApp::ReleaseSaveThumbnail()
{ {
} }
void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize) void CConsoleMinecraftApp::GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize)
{ {
} }

View file

@ -14,7 +14,7 @@ public:
virtual void CaptureSaveThumbnail(); virtual void CaptureSaveThumbnail();
virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize); virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize);
virtual void ReleaseSaveThumbnail(); virtual void ReleaseSaveThumbnail();
virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize); virtual void GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize);
virtual int LoadLocalTMSFile(WCHAR *wchTMSFile); virtual int LoadLocalTMSFile(WCHAR *wchTMSFile);
virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt); virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt);

View file

@ -459,8 +459,8 @@ bool CSocialManager::PostImageToSocialNetwork( ESocialNetwork eSocialNetwork, DW
bool bResult = false; bool bResult = false;
PBYTE pbData=NULL; std::uint8_t *pbData = NULL;
DWORD dwDataSize; unsigned int dwDataSize = 0;
app.GetScreenshot(dwUserIndex,&pbData,&dwDataSize); app.GetScreenshot(dwUserIndex,&pbData,&dwDataSize);
app.GetPreviewImage(dwUserIndex,&m_PostPreviewImage); app.GetPreviewImage(dwUserIndex,&m_PostPreviewImage);

View file

@ -1472,14 +1472,14 @@ void CConsoleMinecraftApp::ReleaseSaveThumbnail()
} }
} }
void CConsoleMinecraftApp::GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize) void CConsoleMinecraftApp::GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize)
{ {
// on a save caused by a create world, the thumbnail capture won't have happened // on a save caused by a create world, the thumbnail capture won't have happened
if(m_ScreenshotBuffer[iPad]!=NULL) if(m_ScreenshotBuffer[iPad]!=NULL)
{ {
*pbData= new BYTE [m_ScreenshotBuffer[iPad]->GetBufferSize()]; *screenshotData = new std::uint8_t[m_ScreenshotBuffer[iPad]->GetBufferSize()];
*pdwSize=m_ScreenshotBuffer[iPad]->GetBufferSize(); *screenshotSize = static_cast<unsigned int>(m_ScreenshotBuffer[iPad]->GetBufferSize());
memcpy(*pbData,m_ScreenshotBuffer[iPad]->GetBufferPointer(),*pdwSize); memcpy(*screenshotData, m_ScreenshotBuffer[iPad]->GetBufferPointer(), *screenshotSize);
m_ScreenshotBuffer[iPad]->Release(); m_ScreenshotBuffer[iPad]->Release();
m_ScreenshotBuffer[iPad]=NULL; m_ScreenshotBuffer[iPad]=NULL;
} }

View file

@ -52,7 +52,7 @@ public:
virtual void CaptureSaveThumbnail(); virtual void CaptureSaveThumbnail();
virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize); virtual void GetSaveThumbnail(std::uint8_t **thumbnailData, unsigned int *thumbnailSize);
virtual void ReleaseSaveThumbnail(); virtual void ReleaseSaveThumbnail();
virtual void GetScreenshot(int iPad,PBYTE *pbData,DWORD *pdwSize); virtual void GetScreenshot(int iPad, std::uint8_t **screenshotData, unsigned int *screenshotSize);
virtual void RunFrame(); virtual void RunFrame();