Skip to content

GitLab

Commit 58562a0c authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Be more specific when after all tries the sprites aren't found 

Messages updated to be more specific/helpful.
Magic numbers for OS_File swapped to use names from Hdr:HighFSI.

Version 5.15. Not tagged
parent 5283be1f
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 25 deletions
Resources/Denmark/Messages
View file @ 58562a0c
......@@ -15,7 +15,7 @@ WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadSprites:Sprites must be unsquashed before use
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
......
Resources/Finland/Messages
View file @ 58562a0c
......@@ -15,7 +15,7 @@ WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadSprites:Sprites must be unsquashed before use
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
......
Resources/France/Messages
View file @ 58562a0c
......@@ -15,7 +15,7 @@ WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadSprites:Sprites must be unsquashed before use
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
......
Resources/Germany/Messages
View file @ 58562a0c
......@@ -15,7 +15,7 @@ WSP:Sprite-Bereich
#{DictTokens}
NoClaim:Das WIMP konnte sich keinen Arbeitsbereich reservieren.
BadSprite:Sprite existiert nicht
BadSprites:Die Sprite-Datei ist entweder –gequetscht” oder nicht vorhanden.
BadSprites:Die Sprite-Datei muss nicht –gequetscht” sein
BadOp:Diese WIMP-Operation ist in diesem Kontext nicht erlaubt.
RectFull:Der Rechteck-Bereich ist voll.
TooBig:Es ist nicht genug freier Speicher für die Fenster- oder Menü-Definition vorhanden.
......
Resources/Italy/Messages
View file @ 58562a0c
......@@ -15,7 +15,7 @@ WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadSprites:Sprites must be unsquashed before use
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
......
Resources/Japan/Messages
View file @ 58562a0c
......@@ -14,7 +14,7 @@ WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadSprites:Sprites must be unsquashed before use
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
......
Resources/Korea/Messages
View file @ 58562a0c
......@@ -15,7 +15,7 @@ WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadSprites:Sprites must be unsquashed before use
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
......
Resources/Norway/Messages
View file @ 58562a0c
......@@ -15,7 +15,7 @@ WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadSprites:Sprites must be unsquashed before use
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
......
Resources/Spain/Messages
View file @ 58562a0c
......@@ -15,7 +15,7 @@ WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadSprites:Sprites must be unsquashed before use
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
......
Resources/Sweden/Messages
View file @ 58562a0c
......@@ -15,7 +15,7 @@ WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadSprites:Sprites must be unsquashed before use
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
......
Resources/Taiwan/Messages
View file @ 58562a0c
......@@ -15,7 +15,7 @@ WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadSprites:Sprites must be unsquashed before use
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
......
Resources/Turkey/Messages
View file @ 58562a0c
......@@ -15,7 +15,7 @@ WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadSprites:Sprites must be unsquashed before use
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
......
Resources/UK/Messages
View file @ 58562a0c
......@@ -15,7 +15,7 @@ WSP:Wimp sprite pool
#{DictTokens}
NoClaim:Wimp unable to claim work area
BadSprite:Sprite doesn't exist
BadSprites:Squashed or missing sprite file
BadSprites:Sprites must be unsquashed before use
BadOp:Invalid Wimp operation in this context
RectFull:Rectangle area full
TooBig:There is not enough memory to create this window or menu
......
VersionASM
View file @ 58562a0c
......@@ -14,10 +14,10 @@
Module_MajorVersion SETS "5.15"
Module_Version SETA 515
Module_MinorVersion SETS ""
Module_Date SETS "23 Jun 2012"
Module_ApplicationDate SETS "23-Jun-12"
Module_Date SETS "24 Jun 2012"
Module_ApplicationDate SETS "24-Jun-12"
Module_ComponentName SETS "Wimp"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Wimp"
Module_FullVersion SETS "5.15"
Module_HelpVersion SETS "5.15 (23 Jun 2012)"
Module_HelpVersion SETS "5.15 (24 Jun 2012)"
END
VersionNum
View file @ 58562a0c
......@@ -6,18 +6,18 @@
*/
#define Module_MajorVersion_CMHG 5.15
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 23 Jun 2012
#define Module_Date_CMHG 24 Jun 2012
#define Module_MajorVersion "5.15"
#define Module_Version 515
#define Module_MinorVersion ""
#define Module_Date "23 Jun 2012"
#define Module_Date "24 Jun 2012"
#define Module_ApplicationDate "23-Jun-12"
#define Module_ApplicationDate "24-Jun-12"
#define Module_ComponentName "Wimp"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Wimp"
#define Module_FullVersion "5.15"
#define Module_HelpVersion "5.15 (23 Jun 2012)"
#define Module_HelpVersion "5.15 (24 Jun 2012)"
#define Module_LibraryVersionInfo "5:15"
s/Wimp01
View file @ 58562a0c
......@@ -345,7 +345,7 @@ $lab
MACRO
$lab Dump $file,$reg,$size
Push "R0-R5,LR"
MOV R0,#0 ; save file
MOV R0,#OSFile_Save
ADR R1,%FT01
[ $reg=sp
ADD R4,$reg,#7*4 ; skip stacked registers
......@@ -3096,8 +3096,12 @@ int_merge_sprites
SWI XOS_File ; R4 = file length
Debug spr,"File size is ",r4
Debug spr,"Object type is ",r0
TEQ R0,#1 ; must be a file (NB doesn't affect V)
BNE %FT99 ; bound not to work!
TEQ R0,#object_file ; must be a file (NB doesn't affect V)
MOVNE R2,#object_nothing
MOVNE R0,#OSFile_MakeError ; state which file is missing
SWINE XOS_File
BVS %FT98
;
MOV R2,R2,LSL # 12
MOV R2,R2,LSR # 20
LDR R14,=FileType_Squash
......@@ -3189,13 +3193,14 @@ int_merge_sprites
;
BLVC freelist ; mark sprite cache list as invalid
;
98
Pull "R1-R5,PC"
99
MyXError WimpBadSprites
Pull "R1-R5,PC"
MakeErrorBlock WimpBadSprites
MakeErrorBlock WimpBadSprites
;............................................................................
......@@ -3218,9 +3223,11 @@ SWIWimp_BaseOfSprites
WimpVarPath DCB "WindowManager$Path", 0
WimpDefPath DCB "Resources:$.Resources.Wimp."
DCB 0
[ Sprites11
WimpVarTheme DCB "Wimp$IconTheme", 0
WimpDefTheme DCB UserIF
DCB 0
]
ALIGN
Init
......
s/Wimp02
View file @ 58562a0c
......@@ -2759,7 +2759,7 @@ close_swap
TEQ R14,#0
BNE %BT01
MOV R0,#6 ; Delete file
MOV R0,#OSFile_Delete
ADRL R1,swap_path
SWI XOS_File
ANDS R0,R0,#0 ; Ignore errors
......
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