Macintosh-SW/supermario
1
0
Fork 0
mirror of https://github.com/elliotnunn/supermario.git synced 2024-11-25 09:30:50 +00:00
Code Issues Projects Releases Wiki Activity

Cube-E: fix especially the Comm Toolbox

Browse Source
This commit is contained in:
Elliot Nunn 2019-04-14 21:38:03 +08:00
parent e6ab3ce01a
commit 66cdc2bfb9
2 changed files with 793 additions and 29 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

@ -30,6 +30,18 @@ diff --git a/Drivers/Drivers.make b/Drivers/Drivers.make
#include {NewAgeDir}NewAge.make
#include {IOPDir}IOP.make
diff --git a/Libs/InterfaceSrcs/Interface.Make b/Libs/InterfaceSrcs/Interface.Make
--- a/Libs/InterfaceSrcs/Interface.Make
+++ b/Libs/InterfaceSrcs/Interface.Make
@@ -16,7 +16,7 @@
# <SM2> 11/11/92 RB Changed packages.a to PackagesGlue.a
IfAOpts = {StdAOpts}
-IfCOpts = {StdCOpts}
+IfCOpts = {StdCOpts} -mbg on
CTDir = {ToolBoxDir}CommToolbox:
diff --git a/Make/Build b/Make/Build
--- a/Make/Build
+++ b/Make/Build

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

@ -997,6 +997,50 @@ new file mode 100644
@@ -0,0 +1 @@
+TEXTMPS
\ No newline at end of file
diff --git a/Interfaces/RIncludes/Types.r b/Interfaces/RIncludes/Types.r
--- a/Interfaces/RIncludes/Types.r
+++ b/Interfaces/RIncludes/Types.r
@@ -145,7 +145,6 @@ type 'acur' {
fill word; /* Pad word to make longint */
};
};
-#ifdef oldTemp
/*--------------------------actb • Alert Color old Lookup Table--------------------------*/
type 'actb' {
unsigned hex longint = 0; /* ctSeed */
@@ -170,32 +169,6 @@ type 'acur' {
unsigned integer; /* blue */
};
};
-#else
-/*----------------------------actb • Alert Color Lookup Table----------------------------*/
- type 'actb' {
- unsigned hex longint = 0; /* ctSeed */
- integer = 1; /* ctFlags */
- integer = $$Countof(ColorSpec) - 1; /* ctSize */
- wide array ColorSpec {
- integer wContentColor, /* value */
- wFrameColor,
- wTextColor,
- wHiliteColor,
- wTitleBarColor,
- wHiliteLight,
- wHiliteDark,
- wTitleBarLight,
- wTitleBarDark,
- wDialogLight,
- wDialogDark,
- wTingeLight,
- wTingeDark;
- unsigned integer; /* RGB: red */
- unsigned integer; /* green */
- unsigned integer; /* blue */
- };
- };
-#endif
/*--------------------------aedt • Apple Events Template---------------------------------*/
/* Resource definition used for associating a value with an apple event */
/* This really only useful for general dispatching */
diff --git a/Internal/Asm/AppleDeskBusPriv.a b/Internal/Asm/AppleDeskBusPriv.a
--- a/Internal/Asm/AppleDeskBusPriv.a
+++ b/Internal/Asm/AppleDeskBusPriv.a
@ -6877,6 +6921,37 @@ diff --git a/Internal/Asm/egretequ.a b/Internal/Asm/egretequ.a
;
;__________________________________________________________________________________________________
diff --git a/Libs/InterfaceSrcs/piMAIN.a b/Libs/InterfaceSrcs/piMAIN.a
--- a/Libs/InterfaceSrcs/piMAIN.a
+++ b/Libs/InterfaceSrcs/piMAIN.a
@@ -12,9 +12,6 @@
;
; Change History (most recent first):
;
-; <SM3> 1/29/93 RB Do not move the SCCLockout value to the status register, always
-; do an ORI.W with it so that NuKernel works and the stack is not
-; changed.
; <SM2> 10/28/92 SWC Changed INCLUDEs to a LOAD of StandardEqu.d.
; <3> 7/24/91 MH also: MPPRefNum, ATPRefNum as per <2> below
; <2> 7/24/91 MH Added conditional wrapper(s) to prevent duplication of public
@@ -384,7 +381,7 @@ RemoveHdlBlks
LEA ListEl1,A1 ; Address of List Head
@00
MOVE SR,-(SP) ; Save old interrupt state
- ORI.W #SCCLockOut,SR ; Disable interrupts <SM2> rb
+ MOVE.W #SCCLockOut,SR ; Disable interrupts
MOVE.L (A1),A0 ; First Handle to Free
MOVE.L (A0),A2 ; Address of Block Text
MOVE.L A0,D0 ; Is List Empty?
@@ -521,7 +518,7 @@ UnlockAndLinkHdl PROC
MOVE.L (A0),A1 ; A1 -> memory block
MOVE SR,-(SP) ; turning off interrupts
- ORI.W #SCCLockOut,SR ; <SM2> rb
+ MOVE.W #SCCLockOut,SR
MOVE.L ListEl1,(A1) ; get first element ptr
LEA ListEl1,A1 ; address of variable
diff --git a/LinkedPatches/LinkedPatchLoader.a b/LinkedPatches/LinkedPatchLoader.a
--- a/LinkedPatches/LinkedPatchLoader.a
+++ b/LinkedPatches/LinkedPatchLoader.a
@ -6890,6 +6965,27 @@ diff --git a/LinkedPatches/LinkedPatchLoader.a b/LinkedPatches/LinkedPatchLoader
dsLinkedPatchReferenceTooFar equ 97 ; *** move into SysErr.a
k32BitCQDTrap equ $AB03 ; trap number for 32-bit QuickDraw
diff --git a/Make/System.make b/Make/System.make
--- a/Make/System.make
+++ b/Make/System.make
@@ -152,7 +152,7 @@ ResourceFiles = ∂
"{RsrcDir}SoundPFDProc.rsrc" ∂
"{RsrcDir}SoundInputProc.rsrc" ∂
"{RsrcDir}SnthLoading.rsrc" ∂
-# "{RsrcDir}StandardNBP.p.rsrc" ∂
+ "{RsrcDir}StandardNBP.p.rsrc" ∂
"{RsrcDir}StandardWDEF.a.rsrc" ∂
"{RsrcDir}StandardFile.rsrc" ∂
"{RsrcDir}TFBDriver.a.rsrc" ∂
@@ -687,7 +687,7 @@ LinkPatchToolObjs = "{Sources}LinkedPatches:LinkPatchLib.o" "{ObjDir}LinkPatch.a
"{IntRIncludes}CommToolboxPriv.r"
Rez {StdROpts} -o {Targ} "{CommChooseDir}Choose.r"
"{RsrcDir}StandardNBP.p.rsrc" ƒ {StandardNBPObjs}
- Link {StdLOpts} {StdAlign} -rt RSRC=0 -o {Targ} {StandardNBPObjs}
+ Link {StdLOpts} {StdAlign} -rt RSRC=0 -m MAIN -o {Targ} {StandardNBPObjs}
"{RsrcDir}StandardNBPHelp.r.rsrc" ƒ "{CommNBPDir}StandardNBPHelp.r" ∂
"{RIncludes}BalloonTypes.r" ∂
"{IntRIncludes}CommToolboxPriv.r"
diff --git a/OS/ADBMgr/ADBMgrPatch.a b/OS/ADBMgr/ADBMgrPatch.a
--- a/OS/ADBMgr/ADBMgrPatch.a
+++ b/OS/ADBMgr/ADBMgrPatch.a
@ -14697,15 +14793,6 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
} };
//__________________________________________________________________________________________________
@@ -1333,7 +1359,7 @@ resource 'PICT' (-16387) {
IncSys "Choose.r.rsrc" 'CNTL' (CTB_ChooseCNTLID) as 'CNTL' (CTB_ChooseCNTLID, sysHeap, purgeable);
IncSys "Choose.r.rsrc" 'MENU' (CTB_ChooseMENUID) as 'MENU' (CTB_ChooseMENUID, sysHeap);
- IncSys "StandardNBP.p.rsrc" codeAs CTB_NuLookupType (CTB_NuLookupID, sysHeap, purgeable, locked);
+// IncSys "StandardNBP.p.rsrc" codeAs CTB_NuLookupType (CTB_NuLookupID, sysHeap, purgeable, locked);
IncSys "StandardNBPHelp.r.rsrc" 'hdlg' (CTB_NulookuphdlgID) as 'hdlg' (CTB_NulookuphdlgID, sysHeap, purgeable);
IncSys "StandardNBP.r.rsrc" 'DLOG' (CTB_NulookupDLOGID) as 'DLOG' (CTB_NulookupDLOGID, sysHeap, purgeable);
IncSys "StandardNBP.r.rsrc" 'DITL' (CTB_NulookupDITLID) as 'DITL' (CTB_NulookupDITLID, sysHeap, purgeable);
@@ -1908,6 +1934,7 @@ resource 'STR ' (-16391, purgeable) { "Font Cache" };
data 'FONT' (384, "Geneva", purgeable) {};
IncSys "SystemFonts.rsrc" 'FONT' (393) as 'FONT' (393, purgeable);
@ -15171,20 +15258,655 @@ diff --git a/Tidbits/UserAlerts.a b/Tidbits/UserAlerts.a
; —————————————————————————————————————————————————
;
; DrawCurrentName is used to draw the name of the INIT or application which ate up too much memory.
diff --git a/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.c b/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.c
--- a/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.c
+++ b/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.c
@@ -225,8 +225,8 @@ err1:
DisposHandle( (Handle)hConn );
err0:
CRMReleaseRF(procID); /* close file or decrement useCount */
- GetMemErr() = savedMem; // restore the error values
- GetResErr() = savedRes;
+ //GetMemErr() = savedMem; // restore the error values
+ //GetResErr() = savedRes;
diff --git a/Toolbox/CommToolbox/CommResourceMgr/CommResourceMgr.a b/Toolbox/CommToolbox/CommResourceMgr/CommResourceMgr.a
--- a/Toolbox/CommToolbox/CommResourceMgr/CommResourceMgr.a
+++ b/Toolbox/CommToolbox/CommResourceMgr/CommResourceMgr.a
@@ -9,8 +9,6 @@
;
; Change History (most recent first):
;
-; <SM3> 9/28/93 PN Adding two new calls AddStdPort and RemoveStdPort to the
-; CommResourceManager from DBLite gibbly.
; <2> 8/12/93 kc <mb>: I deleted all of the "TheFuture" conditionals in all of
; the CommToolbox files per Mike Bell's instructions. I also
; deleted the code that was compiled under the "CubeE"
@@ -122,11 +120,6 @@ CRMStart
; new for 1.0.1
DC.W @CRMGetToolResource - CRMStart ; 23
DC.W @CRMReleaseToolResource - CRMStart ; 24
-
- DC.W @CRMParseCAPSResource - CRMStart ; 25
- DC.W @CRMGetToolNamedResource - CRMStart ; 26
- DC.W @CRMAddStdPort - CRMStart ; 27
- DC.W @CRMRemoveStdPort - CRMStart ; 28
return( nil );
@None
RTS
@@ -317,40 +310,4 @@ CRMStart
MOVE.L 2(A0), -(SP) ; theHandle
JSR __CRMReleaseToolResource ; call it
RTS
-
-@CRMParseCAPSResource ; 25
- CLR.W -(SP) ; make space for return value
- MOVE.L 10(A0),-(SP) ; value
- MOVE.L 6(A0), -(SP) ; selector
- MOVE.L 2(A0), -(SP) ; theHandle
- JSR __CRMParseCAPSResource ; call it
- MOVE.W (SP)+,D0 ; get the return value
- RTS
-
-@CRMGetToolNamedResource ; 26
- CLR.L -(SP) ; make space for return value
- MOVE.W 10(A0),-(SP) ; procID
- MOVE.L 6(A0), -(SP) ; type
- MOVE.L 2(A0), -(SP) ; name
- JSR __CRMGetToolNamedResource ; call it
- MOVE.L (SP)+,D0 ; get the return value
- RTS
-
-@CRMAddStdPort ; 27
- CLR.L -(SP) ; make space for return value
- MOVE.W 10(A0),-(SP) ; procID
- MOVE.L 6(A0), -(SP) ; type
- MOVE.L 2(A0), -(SP) ; name
- JSR AddPort ; call it
- MOVE.L (SP)+,D0 ; get the return value
- RTS
-
-@CRMRemoveStdPort ; 28
- CLR.L -(SP) ; make space for return value
- MOVE.W 10(A0),-(SP) ; procID
- MOVE.L 6(A0), -(SP) ; type
- MOVE.L 2(A0), -(SP) ; name
- JSR RemovePort ; call it
- MOVE.L (SP)+,D0 ; get the return value
- RTS
END
diff --git a/Toolbox/CommToolbox/CommResourceMgr/CommResourceMgrUtilities.a b/Toolbox/CommToolbox/CommResourceMgr/CommResourceMgrUtilities.a
--- a/Toolbox/CommToolbox/CommResourceMgr/CommResourceMgrUtilities.a
+++ b/Toolbox/CommToolbox/CommResourceMgr/CommResourceMgrUtilities.a
@@ -10,10 +10,6 @@
;
; Change History (most recent first):
;
-; <4> 8/12/93 kc <mb>: I deleted all of the "TheFuture" conditionals in all of
-; the CommToolbox per Mike Bell's instructions. I also had to
-; delete some old code that was compiled under the "CubeE"
-; conditional.
; <15> 6/8/92 JSM Fix ProcessMgrExists routine (already conditionalized for
; TheFuture) to match the one in FileMgrPatches.a that looks at
; emProcessMgrExists. Like that file, we may want to invert the
@@ -349,12 +345,14 @@ RetAddr DS.L 1 ; place holder for return address
move.l TheZone,d3
;================================================= start <10>
+ IF NOT CubeE THEN
@pmcheck ; check for process manager
moveq #1,d5 ; does not exist
bsr ProcessMgrExists
bne.s @afterpmcheck
moveq #0,d5 ; does exist
@afterpmcheck
+ ENDIF
;------------------------------------------------- end <10>
@tryAgain
@@ -419,11 +417,14 @@ RetAddr DS.L 1 ; place holder for return address
move.l a1,a3
moveq #32,d0
_BlockMove
- bra.s @tryAgain
+ bra @tryAgain
@gotRealFile
;================================================= start <10>
+ IF CubeE THEN
+ MOVEM.L D0-D2/A0-A2,-(SP)
+ ELSE
MOVEM.L D1-D2,-(SP) ; save registers for the duration of the open
; D1 is vrefnum, D2 is dirID
tst.l d5 ; process mgr?
@@ -436,6 +437,7 @@ RetAddr DS.L 1 ; place holder for return address
@afterbegin1
MOVEM.L (SP),D1-D2 ; changed number of saved registers from D0-D2/A0-A2
+ ENDIF
;------------------------------------------------- end <10>
@@ -449,6 +451,9 @@ RetAddr DS.L 1 ; place holder for return address
;================================================= start <10>
+ IF CubeE THEN
+ MOVEM.L (SP)+,D0-D2/A0-A2
+ ELSE
tst.l d5 ; process mgr?
bne.s @afterend1
@@ -458,6 +463,7 @@ RetAddr DS.L 1 ; place holder for return address
@afterend1
MOVEM.L (SP)+,D1-D2 ; restore vrefnum and dirID
+ ENDIF
;------------------------------------------------- end <10>
cmp.w #-1,D4 ; Did we have an error
@@ -513,6 +519,7 @@ RetAddr DS.L 1 ; place holder for return address
@problem ; let's close down the file now
;================================================= start <10>
+ IF NOT CubeE THEN
tst.l d5 ; process mgr?
bne.s @afterbegin2 ; <10>
@@ -520,12 +527,14 @@ RetAddr DS.L 1 ; place holder for return address
_BeginSystemMode
addq #2,sp
@afterbegin2
+ ENDIF
;------------------------------------------------- end <10>
move.w d4,-(SP)
_CloseResFile
;================================================= start <10>
+ IF NOT CubeE THEN
tst.l d5 ; process mgr?
bne.s @afterend2 ; <10>
@@ -533,6 +542,7 @@ RetAddr DS.L 1 ; place holder for return address
_EndSystemMode
addq #2,sp
@afterend2
+ ENDIF
;------------------------------------------------- end <10>
@problem1
@@ -641,6 +651,7 @@ refNum DS.W 1
move.w d1,-(sp) ; d1 is volatile. d1 is also the refnum so just save
; thepart we care about
+ IF NOT CubeE THEN
moveq #1,D3 ; no pm
bsr ProcessMgrExists
bne.s @afterbegin3
@@ -651,6 +662,7 @@ refNum DS.W 1
moveq #0,D3
@afterbegin3
+ ENDIF
;------------------------------------------------- end <10>
; refnum is already on stack (see above) <10>
@@ -658,6 +670,7 @@ refNum DS.W 1
;================================================= start <10>
+ IF NOT CubeE THEN
tst.l d3 ; process mgr?
bne.s @afterend1
@@ -665,6 +678,7 @@ refNum DS.W 1
_EndSystemMode
addq #2,sp
@afterend1
+ ENDIF
;------------------------------------------------- end <10>
@@ -1183,7 +1197,7 @@ RetAddr DS.L 1 ; place holder for return address
; Exit
; D0 - OSErr
__CRMGetIndToolName FUNC
- IMPORT CRMFindCommunications, CRMCreateCommunications, CRMGetIndFile
+ IMPORT CRMFindCommunications, CRMCreateCommunications, __CRMGetIndFile
Parms Record 0
sel ds.w 1
@@ -1221,11 +1235,6 @@ RetAddr DS.L 1 ; place holder for return address
bra.s @done ; just made -> no tools here yet
@FolderExists
-; pascal OSErr CRMGetIndFile(Str63 fName, OSType fType, short vRefNum, long dirID, short index);
-
-
- clr.w -(sp) ; return value
-
move.l Parms.toolName(a2),-(sp) ; Ok, now get the info on the file
move.l Parms.bundleType(a2),-(sp)
@@ -1233,8 +1242,12 @@ RetAddr DS.L 1 ; place holder for return address
move.l Locals.DirID(a6),-(sp)
move.w Parms.Index(a2),-(sp)
+ clr.w -(sp) ; return value
+ move.l sp,a0
- jsr CRMGetIndFile
+ jsr __CRMGetIndFile
+
+ add #4+4+2+4+2+2,sp
@done
diff --git a/Toolbox/CommToolbox/CommToolbox.make b/Toolbox/CommToolbox/CommToolbox.make
--- a/Toolbox/CommToolbox/CommToolbox.make
+++ b/Toolbox/CommToolbox/CommToolbox.make
@@ -32,8 +32,8 @@ ConnectionMgrObjs = "{ObjDir}ConnectionMgr.a.o" ∂
TerminalMgrObjs = "{ObjDir}TerminalMgr.a.o" ∂
"{ObjDir}TerminalMgr.c.o" ∂
+ "{IfObjDir}interface.o" ∂
"{ObjDir}CommToolboxUtilityRoutines.c.o" ∂
- "{IfObjDir}interface.o"
FileTransferMgrObjs = "{ObjDir}FileTransferMgr.a.o" ∂
@@ -45,8 +45,8 @@ FileTransferMgrObjs = "{ObjDir}FileTransferMgr.a.o" ∂
CommToolboxUtilitiesObjs = "{ObjDir}CommToolboxUtilities.a.o" ∂
"{ObjDir}CommToolboxUtilities.c.o" ∂
"{ObjDir}CommToolboxCore.c.o" ∂
+ "{IfObjDir}interface.o" ∂
"{ObjDir}CommToolboxUtilityRoutines.c.o" ∂
- "{IfObjDir}interface.o"
CommResourceMgrObjs = "{ObjDir}CommResourceMgr.a.o" ∂
@@ -69,8 +69,8 @@ CommToolboxLDEFObjs = "{ObjDir}CommToolboxLDEF.a.o" ∂
ChooseObjs = "{ObjDir}Choose.a.o" ∂
"{ObjDir}Choose.p.o" ∂
"{ObjDir}ChooseUtilities.a.o" ∂
+ "{IfObjDir}interface.o" ∂
"{ObjDir}CommToolboxUtilityRoutines.c.o" ∂
- "{IfObjDir}interface.o"
StandardNBPObjs = "{ObjDir}StandardNBP.a.o" ∂
@@ -80,7 +80,8 @@ StandardNBPObjs = "{ObjDir}StandardNBP.a.o" ∂
"{ObjDir}ZIPUtilities.p.o" ∂
"{ObjDir}NBPUtilities.p.o" ∂
"{ObjDir}CommToolboxUtilityRoutines.c.o" ∂
- "{IfObjDir}interface.o"
+ "{IfObjDir}interface.o" ∂
+ "{PLibraries}PasLib.o"
StandardNBPLDEFObjs = "{ObjDir}StandardNBPLDEF.a.o" ∂
diff --git a/Toolbox/CommToolbox/CommToolboxUtilities/Choose/Choose.p b/Toolbox/CommToolbox/CommToolboxUtilities/Choose/Choose.p
--- a/Toolbox/CommToolbox/CommToolboxUtilities/Choose/Choose.p
+++ b/Toolbox/CommToolbox/CommToolboxUtilities/Choose/Choose.p
@@ -409,12 +409,6 @@ BEGIN
IF theHandle = NIL THEN
cRec.msg := BOR(cRec.msg, ctbChooseNoChangeHandle); { app needs to allocate records}
- IF (BAND(cRec.msg, ctbChooseNoDialog) = ctbChooseNoDialog) THEN { check for special case }
- BEGIN
- ChooseEntry := DoBackDoor(msg, theHandle, cRec);
- Exit(ChooseEntry);
- END;
-
savedRes := CurResFile; { avoid application resources <AMR 25> }
UseResFile(0); { <AMR 25> }
{ preflight values }
@@ -445,7 +439,6 @@ BEGIN
{ we need to tell the StdFilterProc to handle the default and cancel buttons }
IF SetDialogDefaultItem(theDialog, ChooseItemOK) <> noErr THEN;
IF SetDialogCancelItem(theDialog, ChooseItemCancel) <> noErr THEN;
- IF SetDialogTracksCursor(theDialog, true) <> noErr THEN;
WITH infoP^ DO BEGIN
SetCursor(myWatch);
@@ -924,14 +917,6 @@ BEGIN
theErr := noErr;
WITH infoP^ DO BEGIN
-{begin addition <21>}
-{ this makes sure that the menu is empty so that after a crash we don't get the trailing X's }
- maxTools := CountMItems(hMenu);
- for theItem := 1 TO maxTools do
- DelMenuItem(hMenu, theItem);
- maxTools := 0;
- theItem := 1;
-{end addition <21>}
WHILE theErr = noErr DO BEGIN
theErr := CRMGetIndFile(tempTool,theType, vRefNum, dirID, theItem);
@@ -943,9 +928,6 @@ BEGIN
{ Call the App's filter proc }
includeIt := TRUE; { include it }
- IF cRec.filterProc <> NIL THEN
- includeIt:= DoAppFilter(@tempTool,msg,theHandle,cRec.filterProc);
-
IF includeIt THEN BEGIN
{ Is this the current tool? }
IF EqualString(tempTool, toolName, FALSE, TRUE) THEN
diff --git a/Toolbox/CommToolbox/CommToolboxUtilities/CommToolboxCore.c b/Toolbox/CommToolbox/CommToolboxUtilities/CommToolboxCore.c
--- a/Toolbox/CommToolbox/CommToolboxUtilities/CommToolboxCore.c
+++ b/Toolbox/CommToolbox/CommToolboxUtilities/CommToolboxCore.c
@@ -12,10 +12,6 @@
Change History (most recent first):
- <2> 8/12/93 kc <mb>: I deleted all of the "TheFuture" conditionals in all of
- the CommToolbox files per Mike Bell's instructions. I also had
- to delete some old code that was compiled under the "CubeE"
- conditional.
<11> 10/4/91 JSM Change PsychoticFarmerOrLater to TheFuture.
<10> 10/2/91 DTY Conditionalise <9> out of CubeE.
<9> 7/1/91 BH fix CTBGetErrorString to return empty string if the tool returns
@@ -568,11 +564,15 @@ pascal Boolean __CTBMenu(CoreHandle hCore,short menuid,short item )
pascal void __CTBGetErrorString(CoreHandle hCore,short id,Str255 errMsg,short MgrSel)
{
- long rval;
+#if !CubeE
+ long rval =
+#endif
- rval = CallToolProc(nil,hCore,(MgrSel == CMSel ? cmGetErrorStringMsg : CTBGetErrorStringMsg),
+ CallToolProc(nil,hCore,(MgrSel == CMSel ? cmGetErrorStringMsg : CTBGetErrorStringMsg),
id,(long) errMsg,0,nil);
+#if !CubeE
if (rval) errMsg[0] = 0; // return empty string if there is a problem
+#endif
}
pascal void __CTBEvent(CoreHandle hCore,EventRecord *theEvent)
diff --git a/Toolbox/CommToolbox/CommToolboxUtilities/StandardNBP/StandardNBP.r b/Toolbox/CommToolbox/CommToolboxUtilities/StandardNBP/StandardNBP.r
--- a/Toolbox/CommToolbox/CommToolboxUtilities/StandardNBP/StandardNBP.r
+++ b/Toolbox/CommToolbox/CommToolboxUtilities/StandardNBP/StandardNBP.r
@@ -140,7 +140,7 @@ resource 'DITL' (CTB_NulookupDITLID, purgeable) {
disabled
},
/* [9] version string */
-#ifdef Pre70
+#if Pre70
{194, 10, 207, 176},
#else
{197, 10, 207, 176}, // need more room for focus
@@ -168,7 +168,7 @@ resource 'DITL' (CTB_NulookupDITLID, purgeable) {
UserItem {
disabled
},
-#ifndef Pre70
+#if !Pre70
/* [14] hdlg ref */
{0, 0, 0, 0},
HelpItem {
diff --git a/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.a b/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.a
--- a/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.a
+++ b/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgr.a
@@ -80,6 +80,9 @@ CMEntry MAIN EXPORT
__CMAddSearch, __CMRemoveSearch, __CMClearSearch, __CMIOKill, \
__CMNewIOPB, __CMDisposeIOPB, __CMPBRead, __CMPBWrite, \
__CMPBIOKill
+ IF CubeE THEN
+ IMPORT __CM35, __CM36, __CM37, __CM38, __CM39, __CM3A, __CM3B
+ ENDIF
BRA.S start
@@ -154,6 +157,13 @@ CMStart
DC.W @CMPBRead - CMStart; 32
DC.W @CMPBWrite - CMStart; 33
DC.W @CMPBIOKill - CMStart; 34
+ DC.W @CM35 - CMStart; 35
+ DC.W @CM36 - CMStart; 36
+ DC.W @CM37 - CMStart; 37
+ DC.W @CM38 - CMStart; 38
+ DC.W @CM39 - CMStart; 39
+ DC.W @CM3A - CMStart; 3A
+ DC.W @CM3B - CMStart; 3B
@CMSetRefCon ; 258
_ExternalCore #$40A
@@ -380,6 +390,73 @@ CMStart
RTS
+ IF CubeE THEN
+@CM35
+ CLR.W -(SP) ; make room
+ MOVE.L 4(A0), -(SP) ; hConn
+ MOVE.B 2(A0), -(SP) ; async
+ JSR __CM35
+ MOVE.W (SP)+, D0 ; return point
+ RTS
+
+
+@CM36
+ CLR.W -(SP) ; make room
+ MOVE.L 4(A0), -(SP)
+ MOVE.B 2(A0), -(SP)
+ JSR __CM36
+ MOVE.W (SP)+, D0 ; return point
+ RTS
+
+
+@CM37
+ CLR.W -(SP) ; make room
+ MOVE.L 4(A0), -(SP)
+ MOVE.B 2(A0), -(SP)
+ JSR __CM37
+ MOVE.W (SP)+, D0 ; return point
+ RTS
+
+
+@CM38
+ CLR.W -(SP) ; make room
+ MOVE.L 6(A0), -(SP)
+ MOVE.B 4(A0), -(SP)
+ MOVE.B 2(A0), -(SP)
+ JSR __CM38
+ MOVE.W (SP)+, D0 ; return point
+ RTS
+
+
+@CM39
+ CLR.W -(SP) ; make room
+ MOVE.L 12(A0), -(SP)
+ MOVE.L 10(A0), -(SP)
+ MOVE.L 6(A0), -(SP)
+ MOVE.L 2(A0), -(SP)
+ JSR __CM39
+ MOVE.W (SP)+, D0 ; return point
+ RTS
+
+
+@CM3A
+ CLR.W -(SP) ; make room
+ MOVE.L 12(A0), -(SP)
+ MOVE.L 10(A0), -(SP)
+ MOVE.L 6(A0), -(SP)
+ MOVE.L 2(A0), -(SP)
+ JSR __CM3A
+ MOVE.W (SP)+, D0 ; return point
+ RTS
+
+
+@CM3B
+ MOVE.L 2(A0), -(SP)
+ JSR __CM3B
+ RTS
+ ENDIF
+
+
@CMPBIOKill
CLR.W -(SP) ; make room
MOVE.L 6(A0), -(SP) ; hConn
diff --git a/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgrExtensions.c b/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgrExtensions.c
--- a/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgrExtensions.c
+++ b/Toolbox/CommToolbox/ConnectionMgr/ConnectionMgrExtensions.c
@@ -148,3 +148,130 @@ pascal CMErr __CMPBIOKill(hConn, theIOPB)
(long) theIOPB, 0, 0 );
return(rval);
}
+
+#if CubeE
+pascal CMErr __CM35(hConn, async)
+ ConnHandle hConn;
+ Boolean async;
+{
+ CMErr rval;
+ pascal long (*callProc) (ConnHandle, short, long, long, long);
+
+ (ProcPtr) callProc = (**hConn).defProc;
+ rval = (CMErr)(*callProc) ( hConn, 116,
+ (async ? 1 : 0), 0, 0 );
+ return(rval);
+}
+
+pascal CMErr __CM36(hConn, async)
+ ConnHandle hConn;
+ Boolean async;
+{
+ CMErr rval;
+ pascal long (*callProc) (ConnHandle, short, long, long, long);
+
+ (ProcPtr) callProc = (**hConn).defProc;
+ rval = (CMErr)(*callProc) ( hConn, 117,
+ (async ? 1 : 0), 0, 0 );
+ return(rval);
+}
+
+pascal CMErr __CM37(hConn, async)
+ ConnHandle hConn;
+ Boolean async;
+{
+ CMErr rval;
+ pascal long (*callProc) (ConnHandle, short, long, long, long);
+
+ (ProcPtr) callProc = (**hConn).defProc;
+ rval = (CMErr)(*callProc) ( hConn, 118,
+ (async ? 1 : 0), 0, 0 );
+ return(rval);
+}
+
+pascal CMErr __CM38(hConn, async, bsync)
+ ConnHandle hConn;
+ Boolean async;
+ Boolean bsync;
+{
+ CMErr rval;
+ pascal long (*callProc) (ConnHandle, short, long, long, long);
+
+ (ProcPtr) callProc = (**hConn).defProc;
+ rval = (CMErr)(*callProc) ( hConn, 119,
+ (async ? 1 : 0), (bsync ? 1 : 0), 0 );
+ return(rval);
+}
+
+struct BoobTown {
+ Boolean a;
+ long b;
+};
+
+pascal CMErr __CM39(hConn, async, zoom1, zoom2)
+ ConnHandle hConn;
+ Boolean async;
+ long zoom1;
+ long zoom2;
+{
+ CMErr rval;
+ pascal long (*callProc) (ConnHandle, short, struct BoobTown *, long, long);
+ struct BoobTown MyStruct;
+ char theState;
+
+ MyStruct.a = async;
+ MyStruct.b = zoom1;
+
+ theState = HGetState(hConn);
+ (**hConn).flags &= ~cmStatusReserved0;
+
+ if(theState & 0x80) (**hConn).flags |= cmStatusReserved0;
+
+ HLock(hConn);
+
+ (ProcPtr) callProc = (**hConn).defProc;
+ rval = (CMErr)(*callProc) ( hConn, 120,
+ &MyStruct, zoom2, 0 );
+ return(rval);
+}
+
+pascal CMErr __CM3A(hConn, async, zoom1, zoom2) /* Identical to previous except that selector is 121 not 120 */
+ ConnHandle hConn;
+ Boolean async;
+ long zoom1;
+ long zoom2;
+{
+ CMErr rval;
+ pascal long (*callProc) (ConnHandle, short, struct BoobTown *, long, long);
+ struct BoobTown MyStruct;
+ char theState;
+
+ MyStruct.a = async;
+ MyStruct.b = zoom1;
+
+ theState = HGetState(hConn);
+ (**hConn).flags &= ~cmStatusReserved0;
+
+ if(theState & 0x80) (**hConn).flags |= cmStatusReserved0;
+
+ HLock(hConn);
+
+ (ProcPtr) callProc = (**hConn).defProc;
+ rval = (CMErr)(*callProc) ( hConn, 121,
+ &MyStruct, zoom2, 0 );
+ return(rval);
+}
+
+pascal void __CM3B(hConn)
+ ConnHandle hConn;
+{
+ CMErr rval;
+ pascal long (*callProc) (ConnHandle, short, long, long, long);
+
+ (ProcPtr) callProc = (**hConn).defProc;
+ rval = (CMErr)(*callProc) ( hConn, 122,
+ 0, 0, 0 );
+
+ if(!((**hConn).flags & cmStatusReserved0)) HUnlock(hConn);
+}
+#endif
diff --git a/Toolbox/CommToolbox/FileTransferMgr/FileTransferMgr.a b/Toolbox/CommToolbox/FileTransferMgr/FileTransferMgr.a
--- a/Toolbox/CommToolbox/FileTransferMgr/FileTransferMgr.a
+++ b/Toolbox/CommToolbox/FileTransferMgr/FileTransferMgr.a
@@ -105,8 +105,6 @@ FTList
DC.W @FTPChoose - FTList;21
DC.W @FTSetupXCleanup - FTList;22
DC.W @FTGetErrorString - FTList;23
- DC.W @FTSend - FTList;24
- DC.W @FTReceive - FTList;25
@FTSetRefCon ; 258
_ExternalCore #$40A
@@ -214,22 +212,4 @@ FTList
LEA Version, A0
MOVE.W (A0), D0 ; put version number
RTS
-
-@FTSend
- CLR.W -(SP)
- MOVE.L 12(a0),-(SP) ; hFT
- MOVE.W 10(A0),-(SP) ; numFiles
- MOVE.L 6(A0),-(SP) ; pFSpec
- MOVE.L 2(A0), -(SP) ; notifyProc
- JSR __FTSend
- MOVE.W (SP)+,D0
- RTS
-@FTReceive
- CLR.W -(SP)
- MOVE.L 10(a0),-(SP) ; hFT
- MOVE.L 6(A0),-(SP) ; pFSpec
- MOVE.L 2(A0), -(SP) ; notifyProc
- JSR __FTReceive
- MOVE.W (SP)+,D0
- RTS
END
diff --git a/Toolbox/ControlMgr/ButtonCDEF.a b/Toolbox/ControlMgr/ButtonCDEF.a
--- a/Toolbox/ControlMgr/ButtonCDEF.a
+++ b/Toolbox/ControlMgr/ButtonCDEF.a
@ -17012,24 +17734,45 @@ diff --git a/Toolbox/ShutDownMgr/ShutDownMgr.a b/Toolbox/ShutDownMgr/ShutDownMgr
diff --git a/Toolbox/WindowMgr/StandardWDEF.a b/Toolbox/WindowMgr/StandardWDEF.a
--- a/Toolbox/WindowMgr/StandardWDEF.a
+++ b/Toolbox/WindowMgr/StandardWDEF.a
@@ -446,7 +446,7 @@ IsNoZoom
@@ -11,18 +11,6 @@
;
; Change History (most recent first):
;
-; <SM5> 5/27/93 SAM Rereintroduced the change made in <34>. Now after all these
-; years, Paul W. can finally sleep at night.
-; <SM4> 12/16/92 HI Removed the the instruction which sets ROMMapInsert to mapTrue before
-; GetResource() for 'wctb'. 'wctb' resource is modified by
-; programs such as Color CDEV and the StandardWDEF should read
-; the modified 'wctb' instead of the unmodifiable one from the
-; ROM. Previously, this prevented changing the window colors.
-; (Hoon Im)
-; <SM3> 11/19/92 RB Set ROMMapInsert to mapTrue before doing GetResource calls to
-; look in ROM first.
-; <SM1> 10/22/92 CSS Changed some short branches to regular branches as ROM direct
-; trap calling expanded code.
; <37> 10/6/91 DTY #1005945: Put <34> back into the WDEF, conditionalized for
; TheFuture.
; <36> 3/26/91 KSM jdr+vl,#84033: To check for zoom flag, you MUST: (1) Decide that
@@ -446,7 +434,7 @@ IsNoZoom
move.l WMgrPort,-(SP) ; B&W, set to window manager port
_SetPort ;
- bra @CommonSys ; done for the B&W environment <SM1> CSS
+ bra.s @CommonSys ; done for the B&W environment <SM1> CSS
+ bra.s @CommonSys ; done for the B&W environment
; ------------- doin it with color -------------
; when using the WMgrCPort, it is the defproc’s responsibility to reconcile
@@ -538,7 +538,6 @@ IsNoZoom
@@ -538,8 +526,7 @@ IsNoZoom
subq.l #4, SP ; room for a PixMapHandle
move.l #'pmap', -(SP) ; the Pixmap resource type
move.w #kPixmapID, -(SP) ; ID of working pixmap
- move.w #MapTrue,RomMapInsert ; <SM3> rb
_GetResource ; look in ROM first <SM3> rb
- _GetResource ; look in ROM first <SM3> rb
+ _GetResource ; look
move.l (SP)+, workPixmap(A6) ; save it for later
move.l #16,D0 ; allocate a bogus ctab <21>
@@ -1663,11 +1662,8 @@ WDefDrawGIcon
_NewHandle ,SYS,CLEAR ; in sys heap with 0 entries <21>
@@ -1663,11 +1650,8 @@ WDefDrawGIcon
move.l portRect+botRight(windowReg),(rectReg) ; botRight=topLeft
move.l (rectReg),botRight(rectReg) ; copy into botRight, too
@ -17038,12 +17781,21 @@ diff --git a/Toolbox/WindowMgr/StandardWDEF.a b/Toolbox/WindowMgr/StandardWDEF.a
- swap d4 ; <SM5>
- add.w d4,top(rectReg) ; <SM5>
- add.w d4,bottom(rectReg) ; <SM5>
+ add.l d4,0(a4)
+ add.l d4,4(a4)
+ add.l d4,topLeft(a4) ; offset the grow icon
+ add.l d4,botRight(a4)
sub.w #scrollBarSize-2,top(rectReg) ; remove scroll area
sub.w #scrollBarSize-2,left(rectReg)
@@ -2359,7 +2355,6 @@ SetupColorPict
@@ -2309,7 +2293,7 @@ SetUpColor
subq.l #4,SP ; leave space for results <22>
move.l #'wctb',-(SP) ; try to get the system wctb <22>
clr.w -(SP) ; <22>
- _GetResource ; look in ROM first <22><SM3> rb
+ _GetResource ; look <22>
move.l (SP)+,A0 ; get the wctb resource <22>
move.w (SP)+,D0 ; retrieve the index <22>
cmp.l #0,A0 ; did we really get the wctb resource <22>
@@ -2359,7 +2343,6 @@ SetupColorPict
move.w (A2, D0.w), -(SP) ; push the resource ID
cmpi.w #kHighlightPix,(sp)
seq gadgetHighlight(a6) ; Set if we’re highlighting