From ff69c53710aaf1855f7db9ac15972c7783041050 Mon Sep 17 00:00:00 2001
From: TMaul <kja@blueyonder.co.uk>
Date: Sat, 8 Dec 2012 15:22:29 +0000
Subject: [PATCH] sceKernelGetModuleIdByAddress update

sceKernelGetModuleIdByAddress will now look in the loaded modules and
find the one with the correct entry address. Makes no difference to any
games i've noticed so left marked as hack just in case it's wrong.
---
 Core/HLE/sceKernel.h         | 18 ++++++++++++++++++
 Core/HLE/sceKernelModule.cpp | 27 +++++++++++++++++++--------
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/Core/HLE/sceKernel.h b/Core/HLE/sceKernel.h
index 51b3eb151c..2876906894 100644
--- a/Core/HLE/sceKernel.h
+++ b/Core/HLE/sceKernel.h
@@ -362,6 +362,24 @@ public:
 			return t;
 		}
 	}
+	template <class T>
+	T* GetByModuleByEntryAddr(u32 entryAddr)
+	{
+		for (int i=0; i <4096; i++)
+		{
+			T* t = dynamic_cast<T*>(pool[i]);
+
+			if (t)
+			{
+				if (t->nm.entry_addr == entryAddr)
+				{
+					return t;
+				}
+			}
+		}
+		return 0;
+	}
+
 	static u32 GetMissingErrorCode() { return -1; }	// TODO
 
 	bool GetIDType(SceUID handle, int *type) const
diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp
index bc5baa2e1d..fe3359de9f 100644
--- a/Core/HLE/sceKernelModule.cpp
+++ b/Core/HLE/sceKernelModule.cpp
@@ -723,13 +723,24 @@ void sceKernelUnloadModule()
 	RETURN(0);
 }
 
-void sceKernelGetModuleIdByAddress()
+u32 sceKernelGetModuleIdByAddress(u32 moduleAddr)
 {
 	ERROR_LOG(HLE,"HACKIMPL sceKernelGetModuleIdByAddress(%08x)", PARAM(0));
-	if ((PARAM(0) & 0xFFFF0000) == 0x08800000)
-		RETURN(mainModuleID);
+
+	if ((moduleAddr & 0xFFFF0000) == 0x08800000)
+	{
+		return mainModuleID;
+	}
 	else
-		RETURN(0);
+	{
+		Module* foundMod= kernelObjects.GetByModuleByEntryAddr<Module>(moduleAddr);
+
+		if(foundMod)
+		{
+			return foundMod->GetUID();
+		}
+	}
+	return 0;
 }
 
 void sceKernelGetModuleId()
@@ -744,8 +755,8 @@ void sceKernelFindModuleByName()
 	RETURN(1);
 }
 
-u32 sceKernelLoadModuleByID(u32 id) {
-	ERROR_LOG(HLE,"UNIMPL sceKernelLoadModuleById(%08x)", id);
+u32 sceKernelLoadModuleByID(u32 id, u32 lmoptionPtr) {
+	ERROR_LOG(HLE,"UNIMPL sceKernelLoadModuleById(%08x, %08x)", id, lmoptionPtr);
 	// Apparenty, ID is a sceIo File UID. So this shouldn't be too hard when needed.
 	return 0;
 }
@@ -753,7 +764,7 @@ u32 sceKernelLoadModuleByID(u32 id) {
 const HLEFunction ModuleMgrForUser[] = 
 {
 	{0x977DE386,&WrapU_CU<sceKernelLoadModule>,"sceKernelLoadModule"},
-	{0xb7f46618,&WrapU_U<sceKernelLoadModuleByID>,"sceKernelLoadModuleByID"},
+	{0xb7f46618,&WrapU_UU<sceKernelLoadModuleByID>,"sceKernelLoadModuleByID"},
 	{0x50F0C1EC,&WrapV_UUUUU<sceKernelStartModule>,"sceKernelStartModule"},
 	{0xD675EBB8,&sceKernelExitGame,"sceKernelSelfStopUnloadModule"}, //HACK
 	{0xd1ff982a,&WrapV_UUUUU<sceKernelStopModule>,"sceKernelStopModule"},
@@ -762,7 +773,7 @@ const HLEFunction ModuleMgrForUser[] =
 	{0xF9275D98,0,"sceKernelLoadModuleBufferUsbWlan"}, ///???
 	{0xCC1D3699,0,"sceKernelStopUnloadSelfModule"},
 	{0x748CBED9,0,"sceKernelQueryModuleInfo"},
-	{0xd8b73127,&sceKernelGetModuleIdByAddress, "sceKernelGetModuleIdByAddress"},
+	{0xd8b73127,&WrapU_U<sceKernelGetModuleIdByAddress>, "sceKernelGetModuleIdByAddress"},
 	{0xf0a26395,&sceKernelGetModuleId, "sceKernelGetModuleId"},
 	{0x8f2df740,0,"sceKernelStopUnloadSelfModuleWithStatus"},
 };