Build fixes for variants pre RISC OS 5

Minor fixups as part of univeral !Boot work.
Options no longer ASSERT on International_Help (which is a definition exported by the kernel, rather than a build switch), and instead define a switch which is true for > 3.50.
Non UTF8 supporting case has simple substitutes for Wimp_TextOp.
Legacy_DomainId and LegacyIRQsema no longer cause NULL pointer dereference.
MOVeQ => MOVEQ to placate ObjAsm.

Ursula_RPC version built and used briefly on RISC OS 4.02 host. No other run time testing.

Version 5.22. Tagged as 'Wimp-5_22'

Options/s/!Default

@@ -24,6 +24,7 @@
 
         Option  Medusa,                 true                    ; support Medusa Memory management
         Option  ServiceCallTable,       true                    ; Add Ursula kernel Service Call table
+        Option  international_help,     true                    ; Kernel looks up help in the Messages file
         Option  BounceClose,            false                   ; debounce close icon
         Option  windowsprite,           true                    ; use tile_1 for colour 1 work areas
         Option  outlinefont,            true                    ; replace VDU 5 rendering of text with outline font

Options/s/32

@@ -32,6 +32,4 @@ module_postfix  SETS    " 32-bit"
         Option  MultiClose,             true                    ; Allow Ctrl-Alt clicks on close/iconise buttons
         Option  PushBothBars,           true                    ; Push in both scrollbars on adjust-drags
 
-        ASSERT  International_Help <> 0
-
         END

Options/s/Morris4

@@ -18,6 +18,4 @@
 
 module_postfix	SETS	" Morris4"
 
- 	ASSERT	International_Help <> 0
-
         END

Options/s/RO310

@@ -21,6 +21,7 @@ module_postfix	SETS	" RISC OS 3.1"
 	Option	Stork,			false			; try saving power by calling Portable_Idle
 
 	Option	Medusa,			false			; support Medusa Memory management
+        Option  international_help,     false                   ; Kernel looks up help in the Messages file
 	Option	UseDynamicArea,		false    		; use a dynamic area on medusa for the sprite pool
 	Option	PlotSpritesFromPalette, false			; Use palette entries, not translation table
                                             			; (this means funny paletted sprites plot
@@ -42,6 +43,4 @@ module_postfix	SETS	" RISC OS 3.1"
 
         Option  RO4,                    true                    ; RISC OS 4 extensions
 
-	ASSERT	International_Help = 0
-
         END

Options/s/RO350

@@ -20,6 +20,7 @@ module_postfix	SETS	" RISC OS 3.5"
 
 	Option	Stork,			false			; try saving power by calling Portable_Idle
 
+        Option  international_help,     false                   ; Kernel looks up help in the Messages file
 	Option	PlotSpritesFromPalette, false			; Use palette entries, not translation table
                                             			; (this means funny paletted sprites plot
                                             			; better in 16bpp+ modes)
@@ -39,6 +40,4 @@ module_postfix	SETS	" RISC OS 3.5"
 
         Option  RO4,                    true                    ; RISC OS 4 extensions
 
-	ASSERT	International_Help = 0
-
         END

Options/s/RO360

@@ -34,6 +34,4 @@ module_postfix	SETS	" RISC OS 3.6"
 
         Option  RO4,                    true                    ; RISC OS 4 extensions
 
-	ASSERT	International_Help <> 0
-
         END

Options/s/RO370

@@ -31,6 +31,4 @@ module_postfix	SETS	" RISC OS 3.7"
 
         Option  RO4,                    true                    ; RISC OS 4 extensions
 
- 	ASSERT	International_Help <> 0
-
         END

Options/s/Ursula

@@ -36,8 +36,6 @@
 
         Option  RO4,                    true                    ; RISC OS 4 extensions
 
-        ASSERT  International_Help <> 0
-
 DefaultNextSlot SETA 1024*1024
 
         END

Options/s/Ursula_RPC

@@ -16,7 +16,7 @@
 ; Wimp options for an Ursula_RiscPC build of the Window Manager
 ;
 
-module_postfix  SETS     " Ursula (Risc PC)"
+module_postfix	SETS	" RISC OS 4.0"
 
         Option  ServiceCallTable,       true                    ; Add Ursula kernel Service Call table
         Option  ChocolateScreen,        true                    ; Clean cached screen after redraw loops
@@ -41,6 +41,4 @@ module_postfix  SETS     " Ursula (Risc PC)"
 
         Option  RO4,                    true                    ; RISC OS 4 extensions
 
-        ASSERT  International_Help <> 0
-
         END

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "5.21"
-Module_Version          SETA    521
+Module_MajorVersion     SETS    "5.22"
+Module_Version          SETA    522
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "31 Mar 2013"
-Module_ApplicationDate  SETS    "31-Mar-13"
+Module_Date             SETS    "10 Apr 2013"
+Module_ApplicationDate  SETS    "10-Apr-13"
 Module_ComponentName    SETS    "Wimp"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Desktop/Wimp"
-Module_FullVersion      SETS    "5.21"
-Module_HelpVersion      SETS    "5.21 (31 Mar 2013)"
+Module_FullVersion      SETS    "5.22"
+Module_HelpVersion      SETS    "5.22 (10 Apr 2013)"
                         END

VersionNum

-/* (5.21)
+/* (5.22)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        5.21
+#define Module_MajorVersion_CMHG        5.22
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                31 Mar 2013
+#define Module_Date_CMHG                10 Apr 2013
 
-#define Module_MajorVersion             "5.21"
-#define Module_Version                  521
+#define Module_MajorVersion             "5.22"
+#define Module_Version                  522
 #define Module_MinorVersion             ""
-#define Module_Date                     "31 Mar 2013"
+#define Module_Date                     "10 Apr 2013"
 
-#define Module_ApplicationDate          "31-Mar-13"
+#define Module_ApplicationDate          "10-Apr-13"
 
 #define Module_ComponentName            "Wimp"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Desktop/Wimp"
 
-#define Module_FullVersion              "5.21"
-#define Module_HelpVersion              "5.21 (31 Mar 2013)"
-#define Module_LibraryVersionInfo       "5:21"
+#define Module_FullVersion              "5.22"
+#define Module_HelpVersion              "5.22 (10 Apr 2013)"
+#define Module_LibraryVersionInfo       "5:22"

s/NewSWIs

@@ -274,7 +274,6 @@ textop_getsplitpoint
         SWI     XFont_ScanString
         ADD     sp,sp,#20
 
-        ASSERT  UTF8
         MOV     r2,sp
         MOV     r3,#0
         MOV     r6,#bignum
@@ -284,7 +283,11 @@ textop_getsplitpoint
         TEQ     r14,#26                 ; font change?
         ADDEQ   r2,r2,#2
         BEQ     %BT01                   ; skip it if so
+      [ UTF8
         BL      skipcharR
+      |
+        ADD     r2,r2,#1
+      ]
         CMP     r2,r1
         ADDLS   r3,r3,#1
         BLO     %BT02
@@ -294,7 +297,12 @@ textop_getsplitpoint
         ADD     sp,sp,#8                ; junk original r2,r3
         CMP     r3,#0
         BEQ     %FT12
-11      BL      skipcharR
+11
+      [ UTF8
+        BL      skipcharR
+      |
+        ADD     r2,r2,#1
+      ]
         SUBS    r3,r3,#1
         BNE     %BT11
 12      MOV     r0,r2
@@ -401,6 +409,7 @@ textop_truncate
 
 measure_ellipsis ; called from FindFont, sets things up for textop_truncate
         Entry   "r0-r5"
+      [ UTF8
         BL      read_current_alphabet
         LDREQ   r0,=&A680E2             ; lookup not appropriate for UTF-8 - use &E2 &80 &A6
         BEQ     %FT05
@@ -423,7 +432,9 @@ measure_ellipsis ; called from FindFont, sets things up for textop_truncate
         TEQ     r3,#0
         LDREQ   r0,=&2E2E2E             ; use "..." if not in alphabet
         RSBNE   r0,r3,#&100             ; else use appropriate character
-
+      |
+        LDR     r0,=&2E2E2E
+      ]
 05      STR     r0,ellipsis
 
       [ outlinefont

s/Wimp01

@@ -2000,7 +2000,7 @@ MySWIBase       *       Module_SWISystemBase + WimpSWI * Module_SWIChunkSize
         DCD     Wimp_SWIdecode - Module_BaseAddr
         DCD     Wimp_SWInames  - Module_BaseAddr
         DCD     0
- [ International_Help <> 0
+ [ international_help
         DCD     messfsp        - Module_BaseAddr
  |
         DCD     0
@@ -2021,7 +2021,7 @@ Helpstr =       "Window Manager",9,"$Module_HelpVersion"
 	=	module_postfix
         =       0
 
-        [ International_Help=0
+ [ international_help
 
 IconSprites_Help        DCB     "*IconSprites loads a sprite file into the "
                         DCB     "Wimp's common sprite pool",cr
@@ -3333,14 +3333,14 @@ gotwork
         SWI     XOS_ReadSysInfo
         MOVVS   R2,#0
         CMP     R2,#0
-        LDRVS   R2,=Legacy_IRQsema
+        LDREQ   R2,=Legacy_IRQsema
         STR     R0,ptr_IRQsema
         MOV     R0,#6
         MOV     R2,#OSRSI6_DomainId
         SWI     XOS_ReadSysInfo
         MOVVS   R2,#0
         CMP     R2,#0
-        LDRVS   R2,=Legacy_DomainId
+        LDREQ   R2,=Legacy_DomainId
         STR     R2,ptr_DomainId
 
         MOV     R1, #0

s/Wimp08

@@ -486,7 +486,7 @@ sendmemmessage
         Push    "R0-R6"
         MOVEQ   R0,#User_Message        ; don't bother getting reply
         MOVEQ   R1,sp
-        MOVeQ   R2,#0                   ; broadcast
+        MOVEQ   R2,#0                   ; broadcast
         BLEQ    int_sendmessage         ; fills in sender, myref
         ADD     sp,sp,#28