diff --git a/Core/FileSystems/BlockDevices.cpp b/Core/FileSystems/BlockDevices.cpp index 6a883fb6b5..1b16d1cb15 100644 --- a/Core/FileSystems/BlockDevices.cpp +++ b/Core/FileSystems/BlockDevices.cpp @@ -314,7 +314,7 @@ bool NPDRMDemoBlockDevice::ReadBlock(int blockNumber, u8 *outPtr) readBuf = blockBuf; readSize = fread(readBuf, 1, table[block].size, f); - if(readSize!=table[block].size){ + if(readSize != (size_t)table[block].size){ if(block==(numBlocks-1)) return true; else diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp index b3a0aae8dc..b1ef6e5227 100644 --- a/Core/HLE/scePsmf.cpp +++ b/Core/HLE/scePsmf.cpp @@ -114,7 +114,7 @@ public: void DoState(PointerWrap &p); bool isValidCurrentStreamNumber() { - return currentStreamNum >= 0 && currentStreamNum < streamMap.size(); // urgh, checking size isn't really right here. + return currentStreamNum >= 0 && currentStreamNum < (int)streamMap.size(); // urgh, checking size isn't really right here. } void setStreamNum(int num); @@ -467,7 +467,7 @@ u32 scePsmfGetNumberOfStreams(u32 psmfStruct) return psmf->numStreams; } -u32 scePsmfGetNumberOfSpecificStreams(u32 psmfStruct, u32 streamType) +u32 scePsmfGetNumberOfSpecificStreams(u32 psmfStruct, int streamType) { Psmf *psmf = getPsmf(psmfStruct); if (!psmf) { @@ -630,7 +630,7 @@ u32 scePsmfGetPsmfVersion(u32 psmfStruct) u32 scePsmfVerifyPsmf(u32 psmfAddr) { - int magic = Memory::Read_U32(psmfAddr); + u32 magic = Memory::Read_U32(psmfAddr); if (magic != PSMF_MAGIC) { ERROR_LOG(HLE, "scePsmfVerifyPsmf(%08x): bad magic %08x", psmfAddr, magic); return ERROR_PSMF_NOT_FOUND; @@ -1263,7 +1263,7 @@ const HLEFunction scePsmf[] = { {0x0BA514E5, WrapU_UU, "scePsmfGetVideoInfo"}, {0xA83F7113, WrapU_UU, "scePsmfGetAudioInfo"}, {0x971A3A90, WrapU_U, "scePsmfCheckEPmap"}, - {0x68d42328, WrapU_UU, "scePsmfGetNumberOfSpecificStreams"}, + {0x68d42328, WrapU_UI, "scePsmfGetNumberOfSpecificStreams"}, {0x5b70fcc1, WrapU_UU, "scePsmfQueryStreamOffset"}, {0x9553cc91, WrapU_UU, "scePsmfQueryStreamSize"}, {0xB78EB9E9, WrapU_UU, "scePsmfGetHeaderSize"},