Commit 4fb6d1d2 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix bad error pointer returned by Font_LoseFont

Detail:
  s/Fonts01 - Change a TEQ to a CMP to ensure the V flag is cleared; if a font handle like &80000000 was supplied then the opening CMP would set the V flag, accidentally causing the code to return a garbage error pointer.
  s/Errors - Apparently AddError requires '$' to be doubly-escaped to '$$$$' to stop objasm from throwing a warning.
Admin:
  Tested on wandboard
  Fixes AODT on SYS "Font_LoseFont",&80000000


Version 3.79. Tagged as 'Manager-3_79'
parent e05cf719
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "3.78"
Module_Version SETA 378
Module_MajorVersion SETS "3.79"
Module_Version SETA 379
Module_MinorVersion SETS ""
Module_Date SETS "28 Feb 2017"
Module_ApplicationDate SETS "28-Feb-17"
Module_Date SETS "04 Feb 2018"
Module_ApplicationDate SETS "04-Feb-18"
Module_ComponentName SETS "Manager"
Module_ComponentPath SETS "castle/RiscOS/Sources/Video/Render/Fonts/Manager"
Module_FullVersion SETS "3.78"
Module_HelpVersion SETS "3.78 (28 Feb 2017)"
Module_FullVersion SETS "3.79"
Module_HelpVersion SETS "3.79 (04 Feb 2018)"
END
/* (3.78)
/* (3.79)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 3.78
#define Module_MajorVersion_CMHG 3.79
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 28 Feb 2017
#define Module_Date_CMHG 04 Feb 2018
#define Module_MajorVersion "3.78"
#define Module_Version 378
#define Module_MajorVersion "3.79"
#define Module_Version 379
#define Module_MinorVersion ""
#define Module_Date "28 Feb 2017"
#define Module_Date "04 Feb 2018"
#define Module_ApplicationDate "28-Feb-17"
#define Module_ApplicationDate "04-Feb-18"
#define Module_ComponentName "Manager"
#define Module_ComponentPath "castle/RiscOS/Sources/Video/Render/Fonts/Manager"
#define Module_FullVersion "3.78"
#define Module_HelpVersion "3.78 (28 Feb 2017)"
#define Module_LibraryVersionInfo "3:78"
#define Module_FullVersion "3.79"
#define Module_HelpVersion "3.79 (04 Feb 2018)"
#define Module_LibraryVersionInfo "3:79"
......@@ -42,7 +42,7 @@
AddError FontBadCtrlChar, "ErrBadCtrlChar:Illegal control character in font string"
AddError FontsInUse, "ErrsInUse:Font manager in use"
AddError FontBadSegment, "ErrBadSegment:Illegal line segment in outline font"
AddError FontBadPrefix, "ErrBadPrefix:%1 (while scanning Font$$Path)"
AddError FontBadPrefix, "ErrBadPrefix:%1 (while scanning Font$$$$Path)"
AddError FontReserved, "ErrReserved:Reserved fields must be zero"
AddError FontBadCharCode, "ErrBadCharCode:Character code out of range"
AddError FontNoBitmaps, "ErrNoBitmaps:ROM font directory cannot contain bitmaps"
......
......@@ -4180,7 +4180,7 @@ SWIFont_CacheAddr ROUT
SWIFont_LoseFont Entry "R1-R3,R6"
CMP R0,#maxf
TEQCS R0,R0 ; don't bother with handles > 255
CMPCS R0,R0 ; don't bother with handles > 255
TEQNE R0,#0 ; don't bother with handle 0 either
LDRNE R2,cacheindex
TEQNE R2,#0
......
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