From 5c122668c36deadb788b3c151c543158e6a0d39b Mon Sep 17 00:00:00 2001
From: Elliot Nunn <elliotnunn@me.com>
Date: Sun, 14 Apr 2019 22:06:41 +0800
Subject: [PATCH] Cube-E: fix PACK 14 (Help Mgr)

---
 patchset/Cube-E/6-source.patch | 85 ++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/patchset/Cube-E/6-source.patch b/patchset/Cube-E/6-source.patch
index 0d68de3..153342a 100644
--- a/patchset/Cube-E/6-source.patch
+++ b/patchset/Cube-E/6-source.patch
@@ -16464,6 +16464,91 @@ diff --git a/Toolbox/DiskInit/DiskInitBadBlock.c b/Toolbox/DiskInit/DiskInitBadB
  #define	BUFSIZE		18				/* test buffer size, in sectors (mb >=18) */ 
  							/* 18 is bad 'cause it's greater than a track (KSCT) */
  #define	CLUMP		1				/* coallesce badspots only if they are contig */
+diff --git a/Toolbox/HelpMgr/BalloonPACK.a b/Toolbox/HelpMgr/BalloonPACK.a
+--- a/Toolbox/HelpMgr/BalloonPACK.a
++++ b/Toolbox/HelpMgr/BalloonPACK.a
+@@ -13,7 +13,6 @@
+ ;
+ ;	Change History (most recent first):
+ ;
+-;		<SM3>	10/22/92	CSS		Change some branch short instructions to word branches.
+ ;		<72>	 5/14/92	KST		#1027497 <JH>: #1025797,#1027497: In '__HMScanHWinResource', we
+ ;									ask TSM if the mouse is over a floating window. If it is, then
+ ;									TSM will try to locate and open the resource file to load the
+@@ -2789,7 +2788,7 @@ workString		ds.w		128							; space for a STR255 work area
+ 				MOVE.L	origString(A6),A2				; A2-> string beginning (len byte)
+ 				MOVEQ	#0,D3							; clear some hibits
+ 				MOVE.B	(A2),D3							; get length
+-				BEQ 	@ExitFCS						; exit if original string was zero <SM3> CSS 
++				BEQ.S	@ExitFCS						; exit if original string was zero
+ 				
+ 				MOVE.B	#'^',D0							; look for citation caret character
+ 				LEA		1(A2),A1						; A1 -> string data
+diff --git a/Toolbox/HelpMgr/BalloonPACK.p b/Toolbox/HelpMgr/BalloonPACK.p
+--- a/Toolbox/HelpMgr/BalloonPACK.p
++++ b/Toolbox/HelpMgr/BalloonPACK.p
+@@ -9,8 +9,6 @@
+ 
+ 	Change History (most recent first):
+ 
+-	   <SM3>	 2/17/93	kc		Allocate pictures in the System Heap because they persist longer
+-									than the application heap.
+ 		<81>	  6/2/92	KST		#1030643 <JH>: We have only 1 default message for the floating
+ 									window instead of two (floating windows are all active).
+ 		<80>	 5/14/92	KST		#1027497 <JH>: #1025797,#1027497: In '__HMGetWindowPartCode',
+@@ -2185,7 +2183,6 @@ FUNCTION  __HMCalculateBalloon(	aHelpMsg: HMMessageRecord;
+ 		tix				: LongInt;
+ 		sloppy			: BOOLEAN;
+ 		hasColorQD		: BOOLEAN;
+-		oldZone			: THz;				{ <SM2> }
+ 			
+ 	BEGIN
+ 		__HMCalculateBalloon	:= hmBalloonAborted;		{ make default case aborted }
+@@ -2326,15 +2323,10 @@ FUNCTION  __HMCalculateBalloon(	aHelpMsg: HMMessageRecord;
+ 												inPort	:= @picPort;
+ 											end;
+ 											
+-										oldZone := GetZone;		{ get the current heap zone }	{ <SM2> }										
+-										SetZone(SystemZone);	{ point at the system heap } 	{ <SM2> }
+-										          												{ <SM2> }
+ 										pic := OpenPicture(visibleRect);
+ 										TEUpdate(visibleRect,aTE);
+ 										ClosePicture;
+ 
+-										SetZone(oldZone);										{ <SM2> }
+-																								{ <SM2> }
+ 										with aTE^^ do
+ 											inPort := tPort;
+ 									end;
+@@ -2343,15 +2335,9 @@ FUNCTION  __HMCalculateBalloon(	aHelpMsg: HMMessageRecord;
+ 						otherwise
+ 							if aTE<>NIL then
+ 								begin
+-									oldZone := GetZone;		{ get the current heap zone }		{ <SM2> }										
+-									SetZone(SystemZone);	{ point at the system heap } 		{ <SM2> }
+-																								{ <SM2> }
+ 									pic := OpenPicture(visibleRect);
+ 									TEUpdate(visibleRect,aTE);
+ 									ClosePicture;
+-																								{ <SM2> }
+-									SetZone(oldZone);											{ <SM2> }
+-																								{ <SM2> }
+ 								end;
+ 					end;
+ 
+diff --git a/Toolbox/HelpMgr/HelpMgr.make b/Toolbox/HelpMgr/HelpMgr.make
+--- a/Toolbox/HelpMgr/HelpMgr.make
++++ b/Toolbox/HelpMgr/HelpMgr.make
+@@ -17,8 +17,8 @@
+ 
+ BalloonPackObjs					=	"{ObjDir}BalloonPack.a.o"						∂
+ 									"{ObjDir}BalloonPack.p.o"						∂
++									"{PLibraries}PasLib.o"							∂
+ 									"{IfObjDir}interface.o"							∂
+-									"{PLibraries}PasLib.o"
+ 
+ 
+ BalloonWDEFObjs					=	"{ObjDir}BalloonWDEF.a.o"						∂
 diff --git a/Toolbox/ListMgr/TextLDEF.a b/Toolbox/ListMgr/TextLDEF.a
 --- a/Toolbox/ListMgr/TextLDEF.a
 +++ b/Toolbox/ListMgr/TextLDEF.a