libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-26 19:46:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update native. some stubs and a buildfix.

Browse Source
This commit is contained in:
Henrik Rydgard 2013-03-21 19:28:20 +01:00
parent fdb9de2f86
commit f355137156
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/HLE/FunctionWrappers.h
View File

@ -353,6 +353,11 @@ template<u32 func(const char *, const char *, const char *, u32)> void WrapU_CCC
RETURN(retval);
}
template<int func(const char *)> void WrapI_C() {
int retval = func(Memory::GetCharPointer(PARAM(0)));
RETURN(retval);
}
template<int func(const char *, u32)> void WrapI_CU() {
int retval = func(Memory::GetCharPointer(PARAM(0)), PARAM(1));
RETURN(retval);

16
Core/HLE/scePspNpDrm_user.cpp
View File

@ -2,21 +2,21 @@
#include "HLE.h"
int sceNpDrmSetLicenseeKey()
int sceNpDrmSetLicenseeKey(u32 npDrmKeyAddr)
{
ERROR_LOG(HLE, "UNIMPL sceNpDrmSetLicenseeKey");
ERROR_LOG(HLE, "UNIMPL sceNpDrmSetLicenseeKey(%08x)", npDrmKeyAddr);
return 0;
}
int sceNpDrmClearLicenseeKey()
{
ERROR_LOG(HLE, "UNIMPL sceNpDrmClearLicenseeKey");
ERROR_LOG(HLE, "UNIMPL sceNpDrmClearLicenseeKey()");
return 0;
}
int sceNpDrmRenameCheck()
int sceNpDrmRenameCheck(const char *filename)
{
ERROR_LOG(HLE, "UNIMPL sceNpDrmRenameCheck");
ERROR_LOG(HLE, "UNIMPL sceNpDrmRenameCheck(%s)", filename);
return 0;
}
@ -52,9 +52,9 @@ int sceKernelLoadExecNpDrm()
const HLEFunction sceNpDrm[] =
{
{0xA1336091, 0, "sceNpDrmSetLicenseeKey"},
{0x9B745542, 0, "sceNpDrmClearLicenseeKey"},
{0x275987D1, 0, "sceNpDrmRenameCheck"},
{0xA1336091, WrapI_U<sceNpDrmSetLicenseeKey>, "sceNpDrmSetLicenseeKey"},
{0x9B745542, WrapI_V<sceNpDrmClearLicenseeKey>, "sceNpDrmClearLicenseeKey"},
{0x275987D1, WrapI_C<sceNpDrmRenameCheck>, "sceNpDrmRenameCheck"},
{0x08d98894, WrapI_U<sceNpDrmEdataSetupKey>, "sceNpDrmEdataSetupKey"},
{0x219EF5CC, WrapI_U<sceNpDrmEdataGetDataSize>, "sceNpDrmEdataGetDataSize"},
{0x2BAA4294, 0, "sceNpDrmOpen"},

7
android/jni/MenuScreens.cpp
View File

@ -17,6 +17,11 @@
#include <cmath>
#include <string>
#include <cstdio>
#ifdef _MSC_VER
#define snprintf _snprintf
#endif
#include "base/display.h"
#include "base/logging.h"
@ -570,7 +575,7 @@ static const char * credits[] = {
void CreditsScreen::render() {
// TODO: This is kinda ugly, done on every frame...
char temp[256];
snprintf(temp, 256, "PPSSPP %s", PPSSPP_GIT_VERSION);
sprintf(temp, "PPSSPP %s", PPSSPP_GIT_VERSION);
credits[0] = (const char *)temp;
UIShader_Prepare();

2
native

@ -1 +1 @@
Subproject commit 3c160ecb5a848d67e2be5a165ae3a81ff8401fae
Subproject commit b73af1e9c441e6667ab2f05df31cee90ce0cae2a