Commit 1c85571e authored by Ben Avison's avatar Ben Avison

Correctly detect errors returned from Service_EnumerateFormats

SWI OS_ServiceCall has never propagated the PSR flags from callees back to
the caller, so testing the V flag is the wrong way to detect failures. Check
whether the service call has been claimed instead, since that is documented
as being part of the process of a callee returning an error.
parent 30d277db
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
GBLS Module_ComponentName GBLS Module_ComponentName
Module_MajorVersion SETS "1.13" Module_MajorVersion SETS "1.13"
Module_Version SETA 113 Module_Version SETA 113
Module_MinorVersion SETS "" Module_MinorVersion SETS "EnumFormatsErrors.1"
Module_Date SETS "22 Aug 2019" Module_Date SETS "23 Aug 2019"
Module_ApplicationDate SETS "22-Aug-19" Module_ApplicationDate SETS "23-Aug-19"
Module_ComponentName SETS "ADFSFiler" Module_ComponentName SETS "ADFSFiler"
Module_FullVersion SETS "1.13" Module_FullVersion SETS "1.13 (EnumFormatsErrors.1)"
Module_HelpVersion SETS "1.13 (22 Aug 2019)" Module_HelpVersion SETS "1.13 (23 Aug 2019) EnumFormatsErrors.1"
END END
...@@ -4,18 +4,18 @@ ...@@ -4,18 +4,18 @@
* *
*/ */
#define Module_MajorVersion_CMHG 1.13 #define Module_MajorVersion_CMHG 1.13
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG EnumFormatsErrors.1
#define Module_Date_CMHG 22 Aug 2019 #define Module_Date_CMHG 23 Aug 2019
#define Module_MajorVersion "1.13" #define Module_MajorVersion "1.13"
#define Module_Version 113 #define Module_Version 113
#define Module_MinorVersion "" #define Module_MinorVersion "EnumFormatsErrors.1"
#define Module_Date "22 Aug 2019" #define Module_Date "23 Aug 2019"
#define Module_ApplicationDate "22-Aug-19" #define Module_ApplicationDate "23-Aug-19"
#define Module_ComponentName "ADFSFiler" #define Module_ComponentName "ADFSFiler"
#define Module_FullVersion "1.13" #define Module_FullVersion "1.13 (EnumFormatsErrors.1)"
#define Module_HelpVersion "1.13 (22 Aug 2019)" #define Module_HelpVersion "1.13 (23 Aug 2019) EnumFormatsErrors.1"
#define Module_LibraryVersionInfo "1:13" #define Module_LibraryVersionInfo "1:13"
...@@ -3871,7 +3871,8 @@ BuildFormatMenu ROUT ...@@ -3871,7 +3871,8 @@ BuildFormatMenu ROUT
MOV r1,#Service_EnumerateFormats MOV r1,#Service_EnumerateFormats
MOV r2,#0 MOV r2,#0
SWI XOS_ServiceCall SWI XOS_ServiceCall
BVS BuildError TEQ r1,#Service_Serviced
BEQ BuildError
STR R2,FormatList STR R2,FormatList
......
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