Commit 2ac764e3 authored by ROOL's avatar ROOL 🤖
Browse files

Substitute common SWI names for strings

Detail:
  During a build Squish will look up OS and Wimp SWIs (and others), so remove the run time lookup.
  SendMessage->Wimp_SendMessage; OS_File->OS_File; GetWindowOutline->Wimp_GetWindowOutline; unused SetColour deleted.

Version 2.04. Tagged as 'Maestro-2_04'
parent df537fce
/* (2.03)
/* (2.04)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 2.03
#define Module_MajorVersion_CMHG 2.04
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 10 Jun 2017
#define Module_MajorVersion "2.03"
#define Module_Version 203
#define Module_MajorVersion "2.04"
#define Module_Version 204
#define Module_MinorVersion ""
#define Module_Date "10 Jun 2017"
......@@ -18,6 +18,6 @@
#define Module_ComponentName "Maestro"
#define Module_ComponentPath "castle/RiscOS/Sources/Apps/Maestro"
#define Module_FullVersion "2.03"
#define Module_HelpVersion "2.03 (10 Jun 2017)"
#define Module_LibraryVersionInfo "2:3"
#define Module_FullVersion "2.04"
#define Module_HelpVersion "2.04 (10 Jun 2017)"
#define Module_LibraryVersionInfo "2:4"
......@@ -152,7 +152,7 @@ DEF PROCreceive
msg%!12= my_ref%
msg%!16=3 : REM DataLoad application to filer
msg%!36 = -1 : REM Say it's not safe data
SYS SendMessage,17,msg%,task%
SYS "Wimp_SendMessage",17,msg%,task%
AwaitingAck%=TRUE
PROCCloseMenu
ENDIF
......@@ -208,7 +208,7 @@ DEF PROCreceive
msg%!12 = 0
msg%!16 = 12
$(msg% + 28) = F$ + CHR$(0)
SYS SendMessage, 17, msg%, msg%!4
SYS "Wimp_SendMessage", 17, msg%, msg%!4
ENDIF
WHEN &502:
......@@ -313,7 +313,7 @@ DEF FNvalid_file_type (filename$)
LOCAL laddr%, type%, ret_code%
IF filename$ <> "" THEN
SYSOS_File,5,filename$ TO type%,,laddr%
SYS"OS_File",5,filename$ TO type%,,laddr%
ENDIF
CASE type% OF
......@@ -497,7 +497,7 @@ ENDCASE
$(block%+20)=text$
block%!0 = (((20+LEN(text$)+1)DIV4)*4)+4
$(block%+21+LEN(text$)) = CHR$(0) :REM null-terminate
SYS SendMessage,17,block% :REM acknowledge message
SYS "Wimp_SendMessage",17,block% :REM acknowledge message
ENDPROC
DEF PROCDataLoadAck(ref%)
......@@ -506,7 +506,7 @@ block=Window%
block!0 = 20
block!12 = ref%
block!16 = 4 :REM DataLoadAck
SYS SendMessage,17,block :REM acknowledge message
SYS "Wimp_SendMessage",17,block :REM acknowledge message
IF doing_scrap_load% THEN doing_scrap_load% = FALSE
ENDPROC
......@@ -920,7 +920,7 @@ IF SAVING% THEN
block!40=MusicFileType%
$(block+44)=FNGetLeafName(SaveText)+CHR$(0)
!block = 64
SYS SendMessage, 17, block, block!20, block!24
SYS "Wimp_SendMessage", 17, block, block!20, block!24
my_ref% = block!8
SYS &62401: REM DragASprite_Stop
ENDIF
......@@ -1143,7 +1143,7 @@ $ScoreTitle%=T$+CHR$(0)
SYS GetWindowState%,,buf%
a%=buf%!4 : b%=buf%!16 : c%=buf%!12 :REM get title area and force redraw
SYS GetWindowOutline,,buf%
SYS "Wimp_GetWindowOutline",,buf%
d%=buf%!16
SYS ForceRedraw,-1,a%+Hi%,b%+Vi%,c%-Hi%,d%+Vi%
ENDPROC
......@@ -1240,7 +1240,7 @@ DEF FNGetFileInfo(F$)
LOCAL nasty_time%
DIM nasty_time% 5
IF F$<>"" AND F$<>FNmessage_lookup(messagefile_handle%, "Untitled") THEN SYSOS_File,5,F$ TO T%,,laddr%,eaddr%,L%,A%
IF F$<>"" AND F$<>FNmessage_lookup(messagefile_handle%, "Untitled") THEN SYS"OS_File",5,F$ TO T%,,laddr%,eaddr%,L%,A%
IF (F$="") OR F$=FNmessage_lookup(messagefile_handle%, "Untitled") OR ((T%=1) AND (A% AND 1) AND (L%>8)) = 0 THEN
$ThisFile%=FNmessage_lookup(messagefile_handle%, "Untitled") + CHR$(0)
......@@ -1485,8 +1485,8 @@ CLOSE#FILE%:FILE%=FALSE
IF (NOT CHANGED%) AND (((laddr%>>20) AND &FFF) = &FFF) THEN
REM file not changed and was timestamped
REM preserve original timestamp
SYS OS_File,2,FF$,laddr% :REM re-stamp with old stamp
SYS OS_File,3,FF$,,eaddr% :REM nb eaddr% in r3
SYS "OS_File",2,FF$,laddr% :REM re-stamp with old stamp
SYS "OS_File",3,FF$,,eaddr% :REM nb eaddr% in r3
ENDIF
OSCLI("FX 229,1")
......@@ -2853,9 +2853,6 @@ OpenTemplate = W%+25
CloseTemplate = W%+26
LoadTemplate = W%+27
CloseDown = W%+29
SYS "OS_SWINumberFromString",0,"Wimp_SendMessage" TO SendMessage
SYS "OS_SWINumberFromString",0,"Wimp_GetWindowOutline" TO GetWindowOutline
SYS "OS_SWINumberFromString",0,"Wimp_SetColour" TO SetColour
LOCAL S0,S1,S2
SYS "OS_SWINumberFromString",0,"Sound_Configure" TO S0
......@@ -2920,7 +2917,6 @@ my_ref% = -1 : REM unset
DIM colour_temp% 16
DIM String_Space% 256
DIM sprite_factors% 16
OS_File=&8
Sprite$=Resourcedir$+".Sprites"
CHANGED%=FALSE
FILE%=FALSE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment