Merge pull request #313 from tmaul/master

Remove scesupPreAcc

CMakeLists.txt

@@ -718,8 +718,6 @@ add_library(${CoreLibName} ${CoreLinkType}
 	Core/HLE/sceSas.h
 	Core/HLE/sceSsl.cpp
 	Core/HLE/sceSsl.h
-	Core/HLE/scesupPreAcc.cpp
-	Core/HLE/scesupPreAcc.h
 	Core/HLE/sceUmd.cpp
 	Core/HLE/sceUmd.h
 	Core/HLE/sceUsb.cpp

Core/CMakeLists.txt

@@ -61,7 +61,6 @@ set(SRCS
   HLE/sceSsl.cpp
   HLE/sceParseUri.cpp
   HLE/sceParseHttp.cpp
-  HLE/scesupPreAcc.cpp
   HLE/sceVaudio.cpp
   HW/MemoryStick.cpp
   HW/SasAudio.cpp

Core/Core.vcxproj

@@ -171,7 +171,6 @@
     <ClCompile Include="HLE\sceRtc.cpp" />
     <ClCompile Include="HLE\sceSas.cpp" />
     <ClCompile Include="HLE\sceSsl.cpp" />
-    <ClCompile Include="HLE\scesupPreAcc.cpp" />
     <ClCompile Include="HLE\sceUmd.cpp" />
     <ClCompile Include="HLE\sceUsb.cpp" />
     <ClCompile Include="HLE\sceUtility.cpp" />
@@ -319,7 +318,6 @@
     <ClInclude Include="HLE\sceRtc.h" />
     <ClInclude Include="HLE\sceSas.h" />
     <ClInclude Include="HLE\sceSsl.h" />
-    <ClInclude Include="HLE\scesupPreAcc.h" />
     <ClInclude Include="HLE\sceUmd.h" />
     <ClInclude Include="HLE\sceUsb.h" />
     <ClInclude Include="HLE\sceUtility.h" />

Core/Core.vcxproj.filters

@@ -318,9 +318,6 @@
     <ClCompile Include="HLE\sceParseHttp.cpp">
       <Filter>HLE\Libraries</Filter>
     </ClCompile>
-    <ClCompile Include="HLE\scesupPreAcc.cpp">
-      <Filter>HLE\Libraries</Filter>
-    </ClCompile>
     <ClCompile Include="HLE\sceVaudio.cpp">
       <Filter>HLE\Libraries</Filter>
     </ClCompile>
@@ -614,9 +611,6 @@
     <ClInclude Include="HLE\sceParseHttp.h">
       <Filter>HLE\Libraries</Filter>
     </ClInclude>
-    <ClInclude Include="HLE\scesupPreAcc.h">
-      <Filter>HLE\Libraries</Filter>
-    </ClInclude>
     <ClInclude Include="HLE\sceVaudio.h">
       <Filter>HLE\Libraries</Filter>
     </ClInclude>

Core/HLE/HLETables.cpp

@@ -51,7 +51,6 @@
 #include "sceParseUri.h"
 #include "sceSsl.h"
 #include "sceParseHttp.h"
-#include "scesupPreAcc.h"
 #include "sceVaudio.h"
 #include "sceUsb.h"
 
@@ -243,7 +242,6 @@ void RegisterAllModules() {
 	Register_sceParseUri();
 	Register_sceSsl();
 	Register_sceParseHttp();
-	Register_scesupPreAcc();
 	Register_sceVaudio();
 	Register_sceUsb();
 

Core/HLE/sceFont.cpp

@@ -271,6 +271,19 @@ int sceFontGetFontInfo(u32 fontHandle, u32 fontInfoPtr)
 		fi.minGlyphCenterXF = 16;
 		fi.minGlyphCenterXI = 16;
 		fi.shadowMapLength = 0;
+		fi.fontStyle.fontAttributes=1;
+		fi.fontStyle.fontCountry= 1;
+		fi.fontStyle.fontExpire= 1;
+		fi.fontStyle.fontFamily= 1;
+		//fi.fontStyle.fontFileName="asd";
+		fi.fontStyle.fontH=32;
+		fi.fontStyle.fontHRes=32;
+		fi.fontStyle.fontLanguage=1;
+		//	fi.fontStyle.fontName="ppsspp";
+		fi.fontStyle.fontRegion=9;
+		fi.fontStyle.fontV=32;
+		fi.fontStyle.fontVRes=32;
+		fi.fontStyle.fontWeight= 32;
 		Memory::WriteStruct(fontInfoPtr, &fi);
 	}
 
@@ -316,7 +329,13 @@ int sceFontGetCharGlyphImage(u32 libHandler, u32 charCode, u32 glyphImagePtr)
 	int bytesPerLine = Memory::Read_U16(glyphImagePtr+16);
 	int buffer =Memory::Read_U32(glyphImagePtr+20);
 
-	Memory::Memset(buffer, 0x7F, bytesPerLine * bufHeight);
+	for (int y= 0; y < bufHeight; y++)
+	{
+		for (int x=0; x<bytesPerLine; x++)
+		{
+			Memory::Write_U8(0xff, buffer + (x * y));
+		}
+	}
 
 	return 0;
 }

Core/HLE/scesupPreAcc.cpp

@@ -1,38 +0,0 @@
-// 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 "HLE.h"
-
-#include "scesupPreAcc.h"
-
-const HLEFunction scesupPreAcc[] = 
-{
-	{0x110e318b, 0, "scesupPreAcc_0x110e318b"},
-	{0x13ae25b3, 0, "scesupPreAcc_0x13ae25b3"},
-	{0x28c5f696, 0, "scesupPreAcc_0x28c5f696"},
-	{0x348ba3e2, 0, "scesupPreAcc_0x348ba3e2"},
-	{0x86debd66, 0, "scesupPreAcc_0x86debd66"},
-	{0xa0eaf444, 0, "scesupPreAcc_0xa0eaf444"},
-	{0xb03ff882, 0, "scesupPreAcc_0xb03ff882"},
-	{0x2ec3f4d9, 0, "scesupPreAcc_0x2ec3f4d9"},
-	
-};
-
-void Register_scesupPreAcc()
-{
-	RegisterModule("scesupPreAcc",ARRAY_SIZE(scesupPreAcc), scesupPreAcc );
-}

Core/HLE/scesupPreAcc.h

@@ -1,21 +0,0 @@
-// 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_scesupPreAcc();
-

android/jni/Android.mk

@@ -148,7 +148,6 @@ LOCAL_SRC_FILES := \
   $(SRC)/Core/HLE/sceUsb.cpp \
   $(SRC)/Core/HLE/sceUtility.cpp \
   $(SRC)/Core/HLE/sceVaudio.cpp \
-  $(SRC)/Core/HLE/scesupPreAcc.cpp \
   $(SRC)/Core/FileSystems/BlockDevices.cpp \
   $(SRC)/Core/FileSystems/ISOFileSystem.cpp \
   $(SRC)/Core/FileSystems/MetaFileSystem.cpp \