Commit ffdef992 authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Made 32-bit compatible.

Version 2.58. Tagged as 'Desktop-2_58'
parent 6c9ac427
......@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "2.57"
Module_Version SETA 257
Module_MajorVersion SETS "2.58"
Module_Version SETA 258
Module_MinorVersion SETS ""
Module_Date SETS "03 Mar 2000"
Module_FullVersion SETS "2.57"
Module_Date SETS "20 Apr 2000"
Module_FullVersion SETS "2.58"
END
/* (2.57)
/* (2.58)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.57
#define Module_MajorVersion_CMHG 2.58
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 03 Mar 2000
#define Module_Date_CMHG 20 Apr 2000
#define Module_MajorVersion "2.57"
#define Module_Version 257
#define Module_MajorVersion "2.58"
#define Module_Version 258
#define Module_MinorVersion ""
#define Module_Date "03 Mar 2000"
#define Module_Date "20 Apr 2000"
#define Module_FullVersion "2.57"
#define Module_FullVersion "2.58"
......@@ -18,37 +18,38 @@
; *** C h a n g e L i s t ***
; *********************************
; Date Description
; ---- -----------
; 9-Feb-90 File created from old Desktop 2.23
; 22-Feb-90 Changed to use Resources:
; 2.24 Filer_Boot's files in Resources:$.Apps
; 27-Feb-90 2.25 Removed desktop files for Filer/Act
; 28-Feb-90 Removed desktop files for !Configure,!Draw,!Edit,TinyDirs
; 2.26 Removed all references to Wimp$Path
; 1-Mar-90 2.27 Removed all references to ResourceFS
; 29-Apr-91 2.28 Corrected list of auto start applications
; 29-May-91 2.29 Added startup screen and Service_DesktopWelcome
; 18-Jan-92 General tinkering about with the module
; 17-Feb-92 2.36 Pump startup through NULL events
; Pass strings through MessageTrans
; Allocate workspace during startup only.
; 26-Feb-92 2.37 Fix bug preventing restart from working.
; 28-Feb-92 2.40 Remove check for workspace presence to enable
; multiple *Desktop commands to be active at once
; (prevents breakage of some deskboot files).
; 11-Mar-92 2.41 OSS Look auto-start strings etc. up in Messages file.
; Allows ROM app names to be localised, part of
; fix to RP-0716.
; 02-Apr-92 2.43 LRust Re-introduce check for exec file open on desktop startup.
; Allows *Exec !boot files to work correctly on shift-break
; and fixes RP-2176
; 12-Jul-93 BCockburn Removed GET of Hdr:Compress
; 26-Jul-93 JRoach If OS_GBPB on Resources:$.Apps gives trouble then stop pumping
; ROM apps rather than giving an error
; 26-Jan-95 JRH Quick hack to stop filer_booting files in Resources:$.Apps
; 15-May-95 RWB Make welcome banner not appear
; 03-Mar-2000 SAR Change Boot$Error box to only have a 'Reboot' button on STBs
; Date Description
; ---- -----------
; 9-Feb-90 File created from old Desktop 2.23
; 22-Feb-90 Changed to use Resources:
; 2.24 Filer_Boot's files in Resources:$.Apps
; 27-Feb-90 2.25 Removed desktop files for Filer/Act
; 28-Feb-90 Removed desktop files for !Configure,!Draw,!Edit,TinyDirs
; 2.26 Removed all references to Wimp$Path
; 1-Mar-90 2.27 Removed all references to ResourceFS
; 29-Apr-91 2.28 Corrected list of auto start applications
; 29-May-91 2.29 Added startup screen and Service_DesktopWelcome
; 18-Jan-92 General tinkering about with the module
; 17-Feb-92 2.36 Pump startup through NULL events
; Pass strings through MessageTrans
; Allocate workspace during startup only.
; 26-Feb-92 2.37 Fix bug preventing restart from working.
; 28-Feb-92 2.40 Remove check for workspace presence to enable
; multiple *Desktop commands to be active at once
; (prevents breakage of some deskboot files).
; 11-Mar-92 2.41 OSS Look auto-start strings etc. up in Messages file.
; Allows ROM app names to be localised, part of
; fix to RP-0716.
; 02-Apr-92 2.43 LRust Re-introduce check for exec file open on desktop startup.
; Allows *Exec !boot files to work correctly on shift-break
; and fixes RP-2176
; 12-Jul-93 BCockburn Removed GET of Hdr:Compress
; 26-Jul-93 JRoach If OS_GBPB on Resources:$.Apps gives trouble then stop pumping
; ROM apps rather than giving an error
; 26-Jan-95 JRH Quick hack to stop filer_booting files in Resources:$.Apps
; 15-May-95 RWB Make welcome banner not appear
; 03-Mar-00 SAR Change Boot$Error box to only have a 'Reboot' button on STBs
; 20-Apr-00 2.58 KJB Made 32-bit compatible.
;NK version, uses template for welcome banner
......@@ -153,6 +154,7 @@ Desktop_WorkspaceSize * :INDEX: @
|
DCD 0
]
DCD Desktop_Flags - Module_BaseAddr
Desktop_Title
= "Desktop", 0
......@@ -167,6 +169,14 @@ Desktop_HelpStr
;
ALIGN
Desktop_Flags
[ No32bitCode
DCD 0
|
DCD ModuleFlag_32bit
]
Desktop_HC_Table
Command Desktop, 255, 0, International_Help
& 0
......@@ -1032,10 +1042,10 @@ PumpOneDesktopCommand ALTENTRY
40
; Close file on completion or error
MOV r4, r0 ; NB STACK CANNOT BE USED !!!!
MOV r5, pc
SavePSR r5
MOV r0, #0 ; close file
SWI XOS_Find ; errors blow up again
TEQP r5, #0
RestPSR r5,,f
MOVVS r0, r4
EXIT VS
......@@ -1418,7 +1428,7 @@ WelcomeError_OneFont
SWI XFont_LoseFont
WelcomeError_NoFont
EXITS
EXIT
]
[ debug
InsertNDRDebugRoutines
......
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