--- SheepShaver/src/rsrc_patches.cpp	2005/07/02 17:51:43	1.16
+++ SheepShaver/src/rsrc_patches.cpp	2006/05/05 19:05:24	1.19
@@ -124,9 +124,9 @@ void CheckLoad(uint32 type, int16 id, ui
 		D(bug("boot 3 found\n"));
 		size >>= 1;
 		while (size--) {
-			if (PM(0,0x2e49)) {
-				// Set boot stack pointer (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6)
-				p[0] = htons(M68K_EMUL_OP_FIX_BOOTSTACK);
+			if (PM(0,0x51c9) && PM(2,0x2e49)) {
+				// Set boot stack pointer (7.5.2, 7.5.3, 7.5.5, 7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6, 9.0)
+				p[2] = htons(M68K_EMUL_OP_FIX_BOOTSTACK);
 				D(bug(" patch 1 applied\n"));
 			} else if (PM(0,0x4267) && PM(1,0x3f01) && PM(2,0x3f2a) && PM(3,0x0006) && PM(4,0x6100)) {
 				// Check when ntrb 17 is installed (for native Resource Manager patch) (7.5.3, 7.5.5)
@@ -144,29 +144,29 @@ void CheckLoad(uint32 type, int16 id, ui
 				// Check when ntrb 17 is installed (for native Resource Manager patch) (9.0)
 				p[7] = htons(M68K_EMUL_OP_NTRB_17_PATCH4);
 				p[8] = htons(ntohs(p[8]) & 0xf0ff); // bra
-				D(bug(" patch 8 applied\n"));
+				D(bug(" patch 5 applied\n"));
 			} else if (PM(0,0x0c39) && PM(1,0x0001) && PM(2,0xf800) && PM(3,0x0008) && PM(4,0x6f00)) {
-				// Don't read from 0xf8000008 (8.5 with Zanzibar ROM, 8.6)
+				// Don't read from 0xf8000008 (8.5 with Zanzibar ROM, 8.6, 9.0)
 				p[0] = htons(M68K_NOP);
 				p[1] = htons(M68K_NOP);
 				p[2] = htons(M68K_NOP);
 				p[3] = htons(M68K_NOP);
 				p[4] = htons(0x6000);	// bra
-				D(bug(" patch 5 applied\n"));
+				D(bug(" patch 6 applied\n"));
 			} else if (PM(0,0x2f3c) && PM(1,0x6b72) && PM(2,0x6e6c) && PM(3,0x4267) && PM(4,0xa9a0) && PM(5,0x265f) && PM(6,0x200b) && PM(7,0x6700)) {
-				// Don't replace nanokernel ("krnl" resource) (8.6)
+				// Don't replace nanokernel ("krnl" resource) (8.6, 9.0)
 				p[0] = htons(M68K_NOP);
 				p[1] = htons(M68K_NOP);
 				p[2] = htons(M68K_NOP);
 				p[3] = htons(M68K_NOP);
 				p[4] = htons(M68K_NOP);
 				p[7] = htons(0x6000);	// bra
-				D(bug(" patch 6 applied\n"));
+				D(bug(" patch 7 applied\n"));
 			} else if (PM(0,0xa8fe) && PM(1,0x3038) && PM(2,0x017a) && PM(3,0x0c40) && PM(4,0x8805) && PM(5,0x6710)) {
 				// No SCSI (calls via 0x205c jump vector which is not initialized in NewWorld ROM 1.6) (8.6)
 				if (ROMType == ROMTYPE_NEWWORLD) {
 					p[5] = htons(0x6010);	// bra
-					D(bug(" patch 7 applied\n"));
+					D(bug(" patch 8 applied\n"));
 				}
 			} else if (PM(0,0x2f3c) && PM(1,0x7665) && PM(2,0x7273) && PM(3,0x3f3c) && PM(4,0x0001) && PM(10,0x2041) && PM(11,0x2248) && PM(12,0x2050) && PM(20,0x7066) && PM(21,0xa9c9)) {
 				// Check when vers 1 is installed (for safe abort if MacOS < 8.1 is used with a NewWorld ROM)
@@ -230,7 +230,7 @@ void CheckLoad(uint32 type, int16 id, ui
 				D(bug(" patch 2 applied\n"));
 				break;
 			} else if (PM(0,0xa030) && PM(1,0x5240) && PM(2,0x7000) && PM(3,0x302e) && PM(4,0xfecc) && PM(5,0x323c) && PM(6,0x0100)) {
-				// Disable VM (8.5, 8.6)
+				// Disable VM (8.5, 8.6, 9.0)
 				p[8] = htons(M68K_NOP);
 				p[15] = htons(M68K_NOP);
 				D(bug(" patch 3 applied\n"));
@@ -273,7 +273,7 @@ void CheckLoad(uint32 type, int16 id, ui
 				p[0] = htons(0x606e);
 				D(bug(" patch 3 applied\n"));
 			} else if (PM(0,0x6400) && PM(1,0x011c) && PM(2,0x2278) && PM(3,0x0134)) {
-				// We don't have SonyVars (7.6.1, 8.0, 8.1, 8.5, 8.6)
+				// We don't have SonyVars (7.6.1, 8.0, 8.1, 8.5, 8.6, 9.0)
 				p[0] = htons(0x6000);
 				D(bug(" patch 4 applied\n"));
 			} else if (PM(0,0x6400) && PM(1,0x00e6) && PM(2,0x2278) && PM(3,0x0134)) {
@@ -346,17 +346,9 @@ void CheckLoad(uint32 type, int16 id, ui
 				p[2] = htons(M68K_NOP);
 				D(bug(" patch 2 applied\n"));
 			} else if (PM(0,0x700a) && PM(1,0xfe0a)) {
-				// Don't call FE0A opcode (7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6)
-				p[1] = htons(0x7000);
+				// Don't call FE0A opcode (7.6, 7.6.1, 8.0, 8.1, 8.5, 8.6, 9.0)
+				p[1] = htons(0x2008);	// move.l a0,d0
 				D(bug(" patch 3 applied\n"));
-			} else if (PM(0,0x6c00) && PM(1,0x016a) && PM(2,0x2278) && PM(3,0x0134)) {
-				// We don't have SonyVars (8.6)
-				p[-4] = htons(0x21fc);	// move.l $40810000,($0000)
-				p[-3] = htons(0x4081);
-				p[-2] = htons(0x0000);
-				p[-1] = htons(0x0000);
-				p[0] = htons(0x6000);
-				D(bug(" patch 4 applied\n"));
 			}
 			p++;
 		}
@@ -469,7 +461,7 @@ void CheckLoad(uint32 type, int16 id, ui
 		size >>= 1;
 		while (size--) {
 			if (PM(0,0x203c) && PM(1,0x0100) && PM(2,0x0000) && PM(3,0xc0ae) && PM(4,0xfffc)) {
-				// Don't replace SCSI Manager (8.1, 8.5, 8.6)
+				// Don't replace SCSI Manager (8.1, 8.5, 8.6, 9.0)
 				p[5] = htons((ntohs(p[5]) & 0xff) | 0x6000);		// beq
 				D(bug(" patch 1 applied\n"));
 				break;
@@ -528,7 +520,7 @@ void CheckLoad(uint32 type, int16 id, ui
 	} else if (type == FOURCC('s','c','o','d') && id == -16465) {
 		D(bug("scod -16465 found\n"));
 
-		// Don't crash in Process Manager on reset/shutdown (8.6)
+		// Don't crash in Process Manager on reset/shutdown (8.6, 9.0)
 		static const uint8 dat[] = {0x4e, 0x56, 0x00, 0x00, 0x48, 0xe7, 0x03, 0x18, 0x2c, 0x2e, 0x00, 0x10};
 		base = find_rsrc_data((uint8 *)p, size, dat, sizeof(dat));
 		if (base) {
@@ -581,6 +573,38 @@ void CheckLoad(uint32 type, int16 id, ui
 
 
 /*
+ *  Resource patches via GetNamedResource() and Get1NamedResource()
+ */
+
+void CheckLoad(uint32 type, const char *name, uint8 *p, uint32 size)
+{
+	uint16 *p16;
+	uint32 base;
+	D(bug("vCheckLoad %c%c%c%c (%08x) name \"%*s\", data %p, size %d\n", type >> 24, (type >> 16) & 0xff, (type >> 8) & 0xff, type & 0xff, type, name[0], &name[1], p, size));
+
+	// Don't modify resources in ROM
+	if ((uintptr)p >= (uintptr)ROMBaseHost && (uintptr)p <= (uintptr)(ROMBaseHost + ROM_SIZE))
+		return;
+
+	if (type == FOURCC('D','R','V','R') && strncmp(&name[1], ".AFPTranslator", name[0]) == 0) {
+		D(bug(" DRVR .AFPTranslator found\n"));
+		
+		// Don't access ROM85 as it it was a pointer to a ROM version number (8.0, 8.1)
+		static const uint8 dat[] = {0x3a, 0x2e, 0x00, 0x0a, 0x55, 0x4f, 0x3e, 0xb8, 0x02, 0x8e, 0x30, 0x1f, 0x48, 0xc0, 0x24, 0x40, 0x20, 0x40};
+		base = find_rsrc_data(p, size, dat, sizeof(dat));
+		if (base) {
+			p16 = (uint16 *)(p + base + 4);
+			*p16++ = htons(0x303c);		// move.l	#ROM85,%d0
+			*p16++ = htons(0x028e);
+			*p16++ = htons(M68K_NOP);
+			*p16++ = htons(M68K_NOP);
+			D(bug("  patch 1 applied\n"));
+		}
+	}
+}
+
+
+/*
  *  Native Resource Manager patches
  */
 
@@ -602,6 +626,23 @@ void check_load_invoc(uint32 type, int16
 }
 
 #ifdef __BEOS__
+static
+#else
+extern "C"
+#endif
+void named_check_load_invoc(uint32 type, uint32 name, uint32 h)
+{
+	if (h == 0)
+		return;
+	uint32 p = ReadMacInt32(h);
+	if (p == 0)
+		return;
+	uint32 size = ReadMacInt32(p - 2 * 4) & 0xffffff;
+
+	CheckLoad(type, (char *)Mac2HostAddr(name), Mac2HostAddr(p), size);
+}
+
+#ifdef __BEOS__
 static asm void **get_resource(register uint32 type, register int16 id)
 {
 	// Create stack frame
@@ -766,6 +807,72 @@ static asm void **r_get_resource(registe
 	addi	r1,r1,56+12
 	blr
 }
+
+static asm void **get_named_resource(register uint32 type, register uint32 name)
+{
+	// Create stack frame
+	mflr	r0
+	stw		r0,8(r1)
+	stwu	r1,-(56+12)(r1)
+
+	// Save type/ID
+	stw		r3,56(r1)
+	stw		r4,56+4(r1)
+
+	// Call old routine
+	lwz		r0,XLM_GET_NAMED_RESOURCE
+	lwz		r2,XLM_RES_LIB_TOC
+	mtctr	r0
+	bctrl
+	lwz		r2,XLM_TOC		// Get TOC
+	stw		r3,56+8(r1)		// Save handle
+
+	// Call CheckLoad
+	lwz		r3,56(r1)
+	lwz		r4,56+4(r1)
+	lwz		r5,56+8(r1)
+	bl		named_check_load_invoc
+	lwz		r3,56+8(r1)		// Restore handle
+
+	// Return to caller
+	lwz		r0,56+12+8(r1)
+	mtlr	r0
+	addi	r1,r1,56+12
+	blr
+}
+
+static asm void **get_1_named_resource(register uint32 type, register uint32 name)
+{
+	// Create stack frame
+	mflr	r0
+	stw		r0,8(r1)
+	stwu	r1,-(56+12)(r1)
+
+	// Save type/ID
+	stw		r3,56(r1)
+	stw		r4,56+4(r1)
+
+	// Call old routine
+	lwz		r0,XLM_GET_1_NAMED_RESOURCE
+	lwz		r2,XLM_RES_LIB_TOC
+	mtctr	r0
+	bctrl
+	lwz		r2,XLM_TOC		// Get TOC
+	stw		r3,56+8(r1)		// Save handle
+
+	// Call CheckLoad
+	lwz		r3,56(r1)
+	lwz		r4,56+4(r1)
+	lwz		r5,56+8(r1)
+	bl		named_check_load_invoc
+	lwz		r3,56+8(r1)		// Restore handle
+
+	// Return to caller
+	lwz		r0,56+12+8(r1)
+	mtlr	r0
+	addi	r1,r1,56+12
+	blr
+}
 #else
 // Routines in asm_linux.S
 extern "C" void get_resource(void);
@@ -773,6 +880,8 @@ extern "C" void get_1_resource(void);
 extern "C" void get_ind_resource(void);
 extern "C" void get_1_ind_resource(void);
 extern "C" void r_get_resource(void);
+extern "C" void get_named_resource(void);
+extern "C" void get_1_named_resource(void);
 #endif
 
 void PatchNativeResourceManager(void)
@@ -866,4 +975,38 @@ void PatchNativeResourceManager(void)
 	WriteMacInt32(tvec, (uint32)r_get_resource);
 #endif
 #endif
+
+	// Patch native GetNamedResource()
+	upp = ReadMacInt32(0x1484);
+	tvec = ReadMacInt32(upp + 5 * 4);
+	D(bug(" GetNamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
+	WriteMacInt32(XLM_GET_NAMED_RESOURCE, ReadMacInt32(tvec));
+#if EMULATED_PPC
+	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_NAMED_RESOURCE));
+#else
+#ifdef __BEOS__
+	tvec2 = (uint32 *)get_named_resource;
+	WriteMacInt32(tvec, tvec2[0]);
+	WriteMacInt32(tvec + 4, tvec2[1]);
+#else
+	WriteMacInt32(tvec, (uint32)get_named_resource);
+#endif
+#endif
+
+	// Patch native Get1NamedResource()
+	upp = ReadMacInt32(0x0e80);
+	tvec = ReadMacInt32(upp + 5 * 4);
+	D(bug(" Get1NamedResource() entry %08x, TOC %08x\n", ReadMacInt32(tvec), ReadMacInt32(tvec + 4)));
+	WriteMacInt32(XLM_GET_1_NAMED_RESOURCE, ReadMacInt32(tvec));
+#if EMULATED_PPC
+	WriteMacInt32(tvec, NativeFunction(NATIVE_GET_1_NAMED_RESOURCE));
+#else
+#ifdef __BEOS__
+	tvec2 = (uint32 *)get_1_named_resource;
+	WriteMacInt32(tvec, tvec2[0]);
+	WriteMacInt32(tvec + 4, tvec2[1]);
+#else
+	WriteMacInt32(tvec, (uint32)get_1_named_resource);
+#endif
+#endif
 }