Added sceZlibDecompress and VS2010 build fix

Fixes ULUS10121 Bomberman

Common/CommonFuncs.h

@@ -89,6 +89,8 @@ inline u64 __rotr64(u64 x, unsigned int shift){
 	#define unlink _unlink
 	#define snprintf _snprintf
 	#define vscprintf _vscprintf
+	#define __rotr _rotr
+	#define __rotl _rotl
 
 // 64 bit offsets for windows
 	#define fseeko _fseeki64

Core/Core.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -170,6 +170,7 @@
     <ClCompile Include="HLE\sceAudio.cpp" />
     <ClCompile Include="HLE\sceChnnlsv.cpp" />
     <ClCompile Include="HLE\sceCtrl.cpp" />
+    <ClCompile Include="HLE\sceDeflt.cpp" />
     <ClCompile Include="HLE\sceDisplay.cpp" />
     <ClCompile Include="HLE\sceDmac.cpp" />
     <ClCompile Include="HLE\sceFont.cpp" />
@@ -344,6 +345,7 @@
     <ClInclude Include="HLE\sceAudio.h" />
     <ClInclude Include="HLE\sceCtrl.h" />
     <ClInclude Include="HLE\sceChnnlsv.h" />
+    <ClInclude Include="HLE\sceDeflt.h" />
     <ClInclude Include="HLE\sceDisplay.h" />
     <ClInclude Include="HLE\sceDmac.h" />
     <ClInclude Include="HLE\sceFont.h" />

Core/Core.vcxproj.filters

@@ -397,6 +397,9 @@
     <ClCompile Include="HLE\sceChnnlsv.cpp">
       <Filter>HLE\Libraries</Filter>
     </ClCompile>
+    <ClCompile Include="HLE\sceDeflt.cpp">
+      <Filter>HLE\Libraries</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ELF\ElfReader.h">
@@ -732,6 +735,9 @@
     <ClInclude Include="HLE\sceChnnlsv.h">
       <Filter>HLE\Libraries</Filter>
     </ClInclude>
+    <ClInclude Include="HLE\sceDeflt.h">
+      <Filter>HLE\Libraries</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="CMakeLists.txt" />

Core/HLE/FunctionWrappers.h

@@ -601,3 +601,8 @@ template<u32 func(u32, u32, u32, u32, u32, u32, u32)> void WrapU_UUUUUUU() {
   u32 retval = func(PARAM(0), PARAM(1), PARAM(2), PARAM(3), PARAM(4), PARAM(5), PARAM(6));
   RETURN(retval);
 }
+
+template<int func(u32, int, u32, u32)> void WrapI_UIUU() {
+	u32 retval = func(PARAM(0), PARAM(1), PARAM(2), PARAM(3));
+	RETURN(retval);
+}

Core/HLE/HLETables.cpp

@@ -57,6 +57,7 @@
 #include "scePspNpDrm_user.h"
 #include "sceP3da.h"
 #include "sceGameUpdate.h"
+#include "sceDeflt.h"
 
 #define N(s) s
 
@@ -252,6 +253,7 @@ void RegisterAllModules() {
 	Register_sceNpDrm();
 	Register_sceP3da();
 	Register_sceGameUpdate();
+	Register_sceDeflt();
 
 	for (int i = 0; i < numModules; i++)
 	{

Core/HLE/sceDeflt.cpp

@@ -0,0 +1,92 @@
+// Copyright (c) 2012- PPSSPP Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0 or later versions.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official git repository and contact information can be found at
+// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
+
+#include "Globals.h"
+#include "HLE.h"
+#include "..\..\ext\zlib\zlib.h"
+
+int sceZlibDecompress(u32 OutBuffer, int OutBufferLength, u32 InBuffer, u32 Crc32Addr)
+{
+    int err;
+	uLong crc;
+    z_stream stream;
+	u8 *outBufferPtr;
+	u32 *crc32AddrPtr = 0;
+
+	if( !Memory::IsValidAddress( OutBuffer ) || !Memory::IsValidAddress( InBuffer ) )
+	{
+		ERROR_LOG( HLE, "sceZlibDecompress: Bad address %08x %08x", OutBuffer, InBuffer );
+		return 0;
+	}
+	if( Crc32Addr )
+	{
+		if( !Memory::IsValidAddress( Crc32Addr ) )
+		{
+			ERROR_LOG( HLE, "sceZlibDecompress: Bad address %08x", Crc32Addr );
+			return 0;
+		}
+		crc32AddrPtr = (u32 *)Memory::GetPointer( Crc32Addr );
+	}
+	outBufferPtr = Memory::GetPointer( OutBuffer );
+	stream.next_in = (Bytef*)Memory::GetPointer(InBuffer);
+    stream.avail_in = (uInt)OutBufferLength;
+    stream.next_out = outBufferPtr;
+    stream.avail_out = (uInt)OutBufferLength;
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    err = inflateInit(&stream);
+    if( err != Z_OK ) 
+	{
+		ERROR_LOG( HLE, "sceZlibDecompress: inflateInit failed %08x", err );
+		return 0;
+	}
+    err = inflate( &stream, Z_FINISH );
+    if( err != Z_STREAM_END ) 
+	{
+        inflateEnd( &stream );
+		ERROR_LOG( HLE, "sceZlibDecompress: inflate failed %08x", err );
+		return 0;
+	}
+    inflateEnd( &stream );
+	if( crc32AddrPtr )
+	{
+		crc = crc32( 0L, Z_NULL, 0 );
+		*crc32AddrPtr = crc32( crc, outBufferPtr, stream.total_out );
+	}
+	return stream.total_out;
+}
+
+const HLEFunction sceDeflt[] =
+{
+	{0x0BA3B9CC, 0,	"sceGzipGetCompressedData"},
+	{0x106A3552, 0,	"sceGzipGetName"},
+	{0x1B5B82BC, 0,	"sceGzipIsValid"},
+	{0x2EE39A64, 0, "sceZlibAdler32"},
+	{0x44054E03, 0, "sceDeflateDecompress"},
+	{0x6A548477, 0,	"sceZlibGetCompressedData"},
+	{0x6DBCF897, 0, "sceGzipDecompress"},
+	{0x8AA82C92, 0,	"sceGzipGetInfo"},
+	{0xA9E4FB28, WrapI_UIUU<sceZlibDecompress>,	"sceZlibDecompress"},
+	{0xAFE01FD3, 0,	"sceZlibGetInfo"},
+	{0xB767F9A0, 0,	"sceGzipGetComment"},
+	{0xE46EB986, 0,	"sceZlibIsValid"},
+};
+
+void Register_sceDeflt()
+{
+	RegisterModule("sceDeflt", ARRAY_SIZE(sceDeflt), sceDeflt);
+}

Core/HLE/sceDeflt.h

@@ -0,0 +1,20 @@
+// Copyright (c) 2012- PPSSPP Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0 or later versions.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official git repository and contact information can be found at
+// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
+
+#pragma once
+
+void Register_sceDeflt();