Macintosh-SW
/
supermario
mirror of https://github.com/elliotnunn/supermario.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix all the remaining PACKs 

Now only 43 resources fail to match. (Of these, 20 are 'lpch's which
need to be addressed down the track.)
This commit is contained in:
Elliot Nunn 2019-04-14 23:03:55 +08:00
parent 0f2d4c304d
commit b129b601c7
3 changed files with 209 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patchset/Cube-E/2-build-system.patch
View File

@ -1701,6 +1701,18 @@ diff --git a/QuickDraw/PictUtilities/PictUtilities.make b/QuickDraw/PictUtilitie
"{LibDir}PictUtilities.lib" ƒ "{ObjDir}puPackEntry.a.o"
diff --git a/Toolbox/DataPubsMgr/EditionMgr.make b/Toolbox/DataPubsMgr/EditionMgr.make
--- a/Toolbox/DataPubsMgr/EditionMgr.make
+++ b/Toolbox/DataPubsMgr/EditionMgr.make
@@ -42,7 +42,7 @@ EditionMgrObjs = "{ObjDir}dpDispatcher.a.o" ∂
"{RsrcDir}EditionMgr.rsrc" ƒƒ {EditionMgrObjs}
- Link {StdLOpts} {StdAlign} -o "{Targ}" -rt PACK=11 -m PACKENTRY {EditionMgrObjs} || Exit 1
+ Link {StdLOpts} {StdAlign} -o "{Targ}" -rt PACK=11 -ra Main=resSysHeap,resPurgeable -m PACKENTRY {EditionMgrObjs} || Exit 1
"{ObjDir}dpPackEntry.a.o" ƒ "{ObjDir}StandardEqu.d" ∂
diff --git a/Toolbox/HelpMgr/HelpMgr.make b/Toolbox/HelpMgr/HelpMgr.make
--- a/Toolbox/HelpMgr/HelpMgr.make
+++ b/Toolbox/HelpMgr/HelpMgr.make

2
patchset/Cube-E/3-amphibian-dna.patch
View File

@ -11,7 +11,7 @@ new file mode 100644
--- /dev/null
+++ b/AmphibianDNA/AppleEventMgr.rsrc.rdump
@@ -0,0 +1,1480 @@
+data 'PACK' (8) {
+data 'PACK' (8, sysheap, purgeable) {
+ $"A9FF 5041 434B 0008 0001 0000 003E 12AE" /* ..PACK.......>.. */
+ $"1310 16DC 183A 262C 0AA6 1198 2536 4244" /* .....:&,....%6BD */
+ $"425E 427E 428C 26AA 297C 4206 4236 4274" /* B^B~B.&.)|B.B6Bt */

196
patchset/Cube-E/6-source.patch
View File

@ -8313,6 +8313,29 @@ diff --git a/OS/Keyboard/KbdInstall.a b/OS/Keyboard/KbdInstall.a
;_________________________________________________________________________________________
;_________________________________________________________________________________________
;_________________________________________________________________________________________
diff --git a/OS/PPC/PPCBrowser.c b/OS/PPC/PPCBrowser.c
--- a/OS/PPC/PPCBrowser.c
+++ b/OS/PPC/PPCBrowser.c
@@ -11,10 +11,7 @@
Change History (most recent first):
- <SM2> 11/18/92 GMA Set RomMapInsert to mapTrue before caliing GetResource on 'ppcc'
- -5856. we are trying to move these resources into ROM
- eventually.
- <36> 10/2/90 JAL Changed all occurances of GetMyZone to PPCGetMyZone because of conflict
+SM2 <36> 10/2/90 JAL Changed all occurances of GetMyZone to PPCGetMyZone because of conflict
with new AppleTalk Phase II. Screwed up version <35>.
<34> 9/21/90 JSM Update to use new "real" PPCToolbox.h (I checked, it generates
exactly the same object code as the last revision.)
@@ -265,7 +262,6 @@ MyPPCBrowser(const Str255 prompt, const Str255 applListLabel, Boolean defaultSpe
globs->thePortInfo = thePortInfo;
/* get NBP and PPC parameters from configuration resource */
- ROMMapInsert = mapTrue; // <SM2> <GMA>
h = GetResource(BrowseConfigType, BrowseConfigID);
if (h)
{
diff --git a/OS/SCSIMgr/SCSILinkPatch.a b/OS/SCSIMgr/SCSILinkPatch.a
--- a/OS/SCSIMgr/SCSILinkPatch.a
+++ b/OS/SCSIMgr/SCSILinkPatch.a
@ -16528,6 +16551,148 @@ diff --git a/Toolbox/HelpMgr/HelpMgr.make b/Toolbox/HelpMgr/HelpMgr.make
BalloonWDEFObjs = "{ObjDir}BalloonWDEF.a.o" ∂
diff --git a/Toolbox/ListMgr/ListMgrPACK.a b/Toolbox/ListMgr/ListMgrPACK.a
--- a/Toolbox/ListMgr/ListMgrPACK.a
+++ b/Toolbox/ListMgr/ListMgrPACK.a
@@ -11,30 +11,6 @@
;
; Change History (most recent first):
;
-; <SM7> 9/9/93 SAM Changed ShiftDown to not assume the PtInRect will leave
-; thePoint.v in D1 (good lord!).
-; <SM6> 8/16/93 fau Moved <LW3,4,5> to happen in the GetTheListProc routine, instead
-; of where they were. This is where the check should be
-; performed. This was exposed by a PageMaker bug, after Ludwig
-; shipped.
-; <SM5> 6/14/93 kc Roll in Ludwig.
-; <LW5> 5/3/93 chp Flush the caches for LDEF handles smaller than 32 bytes. It used
-; to be 16 bytes, but a 22-byte, unflushed, fake defproc has been
-; discovered in Software Ventures Microphone II and Microphone
-; Pro. (RADAR #1082386)
-; <LW4> 3/8/93 fau Made the compare in previous checkin be 16 bytes, instead of 12,
-; and unsigned.
-; <LW3> 3/6/93 fau Fixed bug 1070072. Essentially, a slimy developer was using a
-; fake LDEF to stuff their own code and NOT flushing the cache
-; afterwards. They relied on the HLOCK in the initlist routine to
-; flush it for them. We "fixed" them by checking the size of the
-; LDEF handle to see if it's less than 12 bytes. If so, we will
-; flush the cache for them. This penalizes developers who use
-; this method and do flush the cache. All for compatibility.
-; <SM4> 1/27/93 PN Add emStartTicks extended memory global to use in ListMgrPack to
-; replace the 'startTicks'.
-; <3> 11/11/92 GMA Set RomMapInsert to mapTrue before getting LDEF resources. fixes
-; bug # 1052658.
; <SM2> 11/5/92 SWC Changed PackMacs.a->Packages.a.
; <13> 3/4/91 dba dty: get rid of SysVers conditionals
; <12> 1/14/91 dba (stb) Restore the use of hilite value of 255 when there is no
@@ -722,11 +698,11 @@ clickWait
MOVE.L (SP)+, D1 ; Copy it into D1.
MOVE.L D1, 10(SP) ; And put it on the stack for ScrollDelay.
- move.l ExpandMem,A0 ; A0 -> ExpandedMem <SM4>
- move.l ExpandMemRec.emStartTicks(A0),D0 ; See if we need to set this. <SM4>
+ LEA startTicks,A0
+ MOVE.L (A0),D0 ; See if we need to set this.
BNE.S @startTicksOK ; Skip if not.
MOVE.L D1, D0 ; Use TickCount value.
- MOVE.L D0,ExpandMemRec.emStartTicks(A0) ; Put it in startTicks. <SM4>
+ MOVE.L D0,(A0) ; Put it in startTicks.
@startTicksOK
MOVE.L D0,14(SP) ; copy startTicks to stack for ScrollDelay.
@@ -739,8 +715,8 @@ clickWait
BRA.S @doneAutoScroll
@noAutoScroll
- move.l ExpandMem,A0 ; A0 -> ExpandedMem <SM4>
- move.l #0,ExpandMemRec.emStartTicks(A0) ; Clear out startTicks we're not scrolling anymore <SM4>
+ LEA startTicks,A0
+ CLR.L (A0) ; Clear out startTicks we're not scrolling anymore
@doneAutoScroll
@@ -1013,8 +989,8 @@ clickCont
SUBQ.L #4, SP
_TickCount ; Get a time stamp.
- move.l ExpandMem,A0 ; A0 -> ExpandedMem <SM4>
- move.l (SP)+,ExpandMemRec.emStartTicks(A0) ; Put it in startTicks. <SM4>
+ LEA startTicks,A0
+ MOVE.L (SP)+,(A0) ; Put it in startTicks.
SUBQ #2,SP
MOVE.L D7,-(SP) ; pass ctl Handle
@@ -1023,8 +999,8 @@ clickCont
_TrackControl
ADDQ #2,SP
clickExit
- move.l ExpandMem,A0 ; A0 -> ExpandedMem <SM4>
- move.l #0,ExpandMemRec.emStartTicks(A0) ; Clear out startTicks <SM4>
+ LEA startTicks,A0
+ CLR.L (A0) ; Clear out startTick
ADDQ #8,SP ; strip off the rect
Std10Exit
@@ -1134,7 +1110,7 @@ ShiftDown
@3
MOVE.B D0,-(SP) ; only on if in rect and turn on
MOVE.W D3,-(SP) ; push the cell again
- MOVE.W D5,-(SP) ; push point.v (dont assume PtInRect will leave it in D1! SHeesh!) <SM7> SAM
+ MOVE.W D1,-(SP) ; push point.v
MOVE.L A4,-(SP) ; and the handle
_LSetSelect ; and select/deselect the cell
@12
@@ -1152,6 +1128,8 @@ ShiftDown
RTS
+startTicks DC.L 0
+
;-------------------------------------------------------------------------------
; PROCEDURE ClickTrack( ctl: ControlHandle; part: INTEGER );
; 10 8
@@ -1209,8 +1187,7 @@ ClickTrack
@2
SUBQ.L #2, SP ; Make room for ScrollDelay return
- move.l ExpandMem,A0 ; A0 -> ExpandedMem <SM4>
- move.l ExpandMemRec.emStartTicks(A0),-(SP) ; startTicks for ScrollDelay <SM4>
+ MOVE.L startTicks,-(SP) ; startTicks for ScrollDelay
SUBQ.L #4, SP ; Reserve space for actionTicks
MOVE.W D0, -(SP) ; itemsVisible for ScrollDelay
@@ -1351,21 +1328,7 @@ DoDrExit
GetTheListProc
MOVE.L ListDefHandle(A3),D0 ; get the handle
BEQ.S @done ; => didn’t get one
-
-; Some programmers are pretty slimy and load an LDEF that is empty. They then <LW3> fau
-; stuff some code into it. However, since HLOCK does not flush the cache anymore, <LW3> fau
-; the code that they stuff into it might not get written back to memory. To solve this, <LW3> fau
-; we check here whether the LDEF resource size is less than, say, 32 bytes. If so, we <LW5> chp
-; assume that they have already loaded the LDEF and modified it, so we flush the cache <LW3> fau
-; for them.
-
- MOVE.L ListDefHandle(A3),A0 ; get the handle <LW3> fau
- _GetHandleSize ; How big is our LDEF Handle <LW3> fau
- cmp.l #32,D0 ; Is it "small" <LW5> chp
- bhi.s @RealLDEF ; no, don't flush the cache <LW3> fau
- jsr ([jCacheFlush]) ; else, flush the caches. <LW3> fau
-@RealLDEF ; <LW3> fau
- MOVE.L ListDefHandle(A3),A0 ; get the handle <LW3> fau
+ MOVE.L D0,A0
MOVE.L A0,-(SP) ; and load the defProc
_LoadResource
MOVE.L (A0),D0 ; Is the handle still empty? <S412 29Feb88>
@@ -1757,8 +1720,6 @@ ListNew ; don’t use StdEntry because no handles yet
; initialize the list defProc handle
- MOVE.W #MapTrue, RomMapInsert ; insert ROM map <SM3>
-
MOVE.W NLProc(A6),D3 ; get the defProc ID
SUBQ #4,SP ; make room for function result
diff --git a/Toolbox/ListMgr/TextLDEF.a b/Toolbox/ListMgr/TextLDEF.a
--- a/Toolbox/ListMgr/TextLDEF.a
+++ b/Toolbox/ListMgr/TextLDEF.a
@ -17868,6 +18033,37 @@ diff --git a/Toolbox/ShutDownMgr/ShutDownMgr.a b/Toolbox/ShutDownMgr/ShutDownMgr
MOVE.L A6,-(SP) ; push address of grafPort
_InitPort ; initialize the port. This particular case
; doesn’t move memory, even when it calls COPYRGN!
diff --git a/Toolbox/StandardFile/StandardFilePACK.a b/Toolbox/StandardFile/StandardFilePACK.a
--- a/Toolbox/StandardFile/StandardFilePACK.a
+++ b/Toolbox/StandardFile/StandardFilePACK.a
@@ -10,9 +10,6 @@
; Change History (most recent first):
;
; <SM6> 11/6/92 SWC Changed PackMacs.a->Packages.a.
-; <SM5> 10/14/92 CSS Change some branch short instructions to branches. Also,
-; check for .NewAge driver and display the proper icon if
-; present.
; <11> 8/25/92 DTY Always use the popup CDEF. Get rid of usePopUpCDEF conditional.
; <10> 7/5/92 csd #1034877 <gbm>: Reversed some of change <9> because the code to
; rebuild the popup menu gets called multiple times. If it doesn’t
@@ -4811,7 +4808,7 @@ CallActivate
_TEDeactivate ; deactivate the TE
; mark the dialog as not having active TE field
move.w #-1,editField(a3)
- bra @checkFileList ;<SM5> CSS
+ bra.s @checkFileList
@TEActivate
; switch to new item's text handle
move.l teHandle(a3),a0
@@ -7873,8 +7870,6 @@ GetVolIcon move.l a0,-(sp) ; don't trash a0
move.w #floppyIconResource,d0
cmp.l #'Sony',(a0) ; .Sony means use floppy icon
beq.s @done
- cmp.l #'NewA',(a0) ; .NewAge means use floppy icon <SM5> CSS
- beq.s @done
move.w #genericFileServerIconResource,d0
cmp.l #'AFPT',(a0) ; .AFPTranslator means use fileserver icon
beq.s @done
diff --git a/Toolbox/WindowMgr/StandardWDEF.a b/Toolbox/WindowMgr/StandardWDEF.a
--- a/Toolbox/WindowMgr/StandardWDEF.a
+++ b/Toolbox/WindowMgr/StandardWDEF.a