FIX unintelligible sequence of decimal characters on savedialog.

ppge_atlas JPN font define ShiftJIS -> UTF8 is all ok. but, cannot use all of chinese character. bacause blockAlloc failed.　 So no change drawing Kanji. you can try to change native/tools/atlastool.cpp USE_LEVEL for all of chinese character. FIX savedialog XXXGetStatus() loop. for daungeon traveler 2. 　　　　Can now be saved it. FIX sceAtrac getCodec InvalidMemory
igorcalabria · May 1, 2013 · eac08a4 · eac08a4
1 parent 74b55cc
commit eac08a4
Show file tree

Hide file tree

Showing 7 changed files with 23,316 additions and 21,713 deletions.
diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp
@@ -819,8 +819,8 @@ int PSPSaveDialog::Update()
 
 int PSPSaveDialog::Shutdown()
 {
-	if (status != SCE_UTILITY_STATUS_FINISHED)
-		return SCE_ERROR_UTILITY_INVALID_STATUS;
+	//if (status != SCE_UTILITY_STATUS_FINISHED)
+	//	return SCE_ERROR_UTILITY_INVALID_STATUS;
 
 	PSPDialog::Shutdown();
 	param.SetPspParam(0);

diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp
@@ -158,7 +158,7 @@ void deleteAtrac(int atracID) {
 	}
 }
 
-int getCodecType(int addr) {
+int getCodecType(const u32 addr) {
 	int at3magic = Memory::Read_U16(addr + 20);
 	if (at3magic == AT3_MAGIC) {
 		return PSP_MODE_AT_3;
@@ -212,7 +212,8 @@ void Atrac::Analyze()
 		switch (chunkMagic) {
 			case FMT_CHUNK_MAGIC: {
 					if (chunkSize >= 16) {
-						atracChannels = (getCodecType(Memory::Read_U16(first.addr + offset )) == PSP_MODE_AT_3_PLUS) ?  Memory::Read_U16(first.addr + offset + 2) : 2 ;
+						atracChannels = Memory::Read_U16(first.addr + offset + 2);
+						//atracChannels = (getCodecType(Memory::Read_U32(first.addr + offset )) == PSP_MODE_AT_3_PLUS) ?  Memory::Read_U16(first.addr + offset + 2) : 2 ;
 						atracSampleRate = Memory::Read_U32(first.addr + offset + 4);  
 						atracBitrate = Memory::Read_U32(first.addr + offset + 8);
 						atracBytesPerFrame = Memory::Read_U16(first.addr + offset + 12);

diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp
@@ -83,6 +83,16 @@ void __UtilityShutdown()
 	netDialog.Shutdown();
 }
 
+int __UtilityGetStatus()
+{
+	if (currentDialogType == UTILITY_DIALOG_NONE) {
+		return 0;
+	} else {
+		WARN_LOG(HLE, "__UtilityGetStatus() Faked dialog : wrong dialog type");
+		return SCE_ERROR_UTILITY_WRONG_TYPE;
+	}
+}
+
 int sceUtilitySavedataInitStart(u32 paramAddr)
 {
 	if (currentDialogActive && currentDialogType != UTILITY_DIALOG_SAVEDATA)
@@ -369,7 +379,7 @@ int sceUtilityNetconfGetStatus()
 
 int sceUtilityScreenshotGetStatus()
 {
-	u32 retval =  0;//__UtilityGetStatus();
+	u32 retval =  __UtilityGetStatus();
 	ERROR_LOG(HLE, "UNIMPL %i=sceUtilityScreenshotGetStatus()", retval);
 	return retval;
 }
@@ -381,7 +391,7 @@ void sceUtilityGamedataInstallInitStart(u32 unkown)
 
 int sceUtilityGamedataInstallGetStatus()
 {
-	u32 retval = 0;//__UtilityGetStatus();
+	u32 retval = __UtilityGetStatus();
 	ERROR_LOG(HLE, "UNIMPL %i=sceUtilityGamedataInstallGetStatus()", retval);
 	return retval;
 }

diff --git a/Core/Util/ppge_atlas.cpp b/Core/Util/ppge_atlas.cpp
diff --git a/android/assets/ppge_atlas.zim b/android/assets/ppge_atlas.zim
diff --git a/assets/ppge_atlas.zim b/assets/ppge_atlas.zim
diff --git a/ppge_atlasscript.txt b/ppge_atlasscript.txt
@@ -1,5 +1,5 @@
 2048
-font UBUNTU24 C:/Windows/Fonts/KozGoPro-Medium.otf UWkhcGR 24
+font UBUNTU24 C:/Windows/Fonts/KozGoPro-Medium.otf UWkhcsGR 24
 image I_CROSS source_assets/image/cross.png copy
 image I_CIRCLE source_assets/image/circle.png copy
 image I_SQUARE source_assets/image/square.png copy