tidy fixes in Wimp09 .

Detail:
	tidied up logic of wimp_addmessages memory salvage
Admin:
	(this is a file that built!)

Version 4.99. Tagged as 'Wimp-4_99'

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "4.98"
-Module_Version          SETA    498
+Module_MajorVersion     SETS    "4.99"
+Module_Version          SETA    499
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "11 Jan 2006"
-Module_ApplicationDate  SETS    "11-Jan-06"
+Module_Date             SETS    "17 Jan 2006"
+Module_ApplicationDate  SETS    "17-Jan-06"
 Module_ComponentName    SETS    "Wimp"
 Module_ComponentPath    SETS    "RiscOS/Sources/Desktop/Wimp"
-Module_FullVersion      SETS    "4.98"
-Module_HelpVersion      SETS    "4.98 (11 Jan 2006)"
+Module_FullVersion      SETS    "4.99"
+Module_HelpVersion      SETS    "4.99 (17 Jan 2006)"
                         END

VersionNum

-/* (4.98)
+/* (4.99)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.2.
  *
  */
-#define Module_MajorVersion_CMHG        4.98
+#define Module_MajorVersion_CMHG        4.99
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                11 Jan 2006
+#define Module_Date_CMHG                17 Jan 2006
 
-#define Module_MajorVersion             "4.98"
-#define Module_Version                  498
+#define Module_MajorVersion             "4.99"
+#define Module_Version                  499
 #define Module_MinorVersion             ""
-#define Module_Date                     "11 Jan 2006"
+#define Module_Date                     "17 Jan 2006"
 
-#define Module_ApplicationDate          "11-Jan-06"
+#define Module_ApplicationDate          "17-Jan-06"
 
 #define Module_ComponentName            "Wimp"
 #define Module_ComponentPath            "RiscOS/Sources/Desktop/Wimp"
 
-#define Module_FullVersion              "4.98"
-#define Module_HelpVersion              "4.98 (11 Jan 2006)"
-#define Module_LibraryVersionInfo       "4:98"
+#define Module_FullVersion              "4.99"
+#define Module_HelpVersion              "4.99 (17 Jan 2006)"
+#define Module_LibraryVersionInfo       "4:99"

s/Wimp09

@@ -645,7 +645,6 @@ addmoremessages
         Push    "R3"
         MOV     R0,#ModHandReason_ExtendBlock
         MOV     r3, r5                  ;  jb/ma 4/1/06 r5 is already the extra space required
-;        ADD     R3,R1,R5
         BL     XROS_Module              ; attempt to extend it
         Pull    "R3"                    ; preserve the list pointer
         EXIT    VS
@@ -672,11 +671,9 @@ addmoremessages
         BNE     %BT40                   ; loop back until found
         B       %BT30                   ; if it doesn't then try another entry
 
-50      LDR     r3,[r2,#-4]             ; jb/ma 4/1/06 check size block actually is
-        SUB     r3,r3,#4                ; jb/ma 4/1/06 compensate for this block count
-        SUBS    r3,r6,r3                ; jb/ma 4/1/06 check what we did not use
-                                        ; and give back any unused
-;        MOV     R3,R6
+50      ADD     r3,r1,r5                ; jb/ma 18/1/06 total needed + claimed
+        SUBS    r3,r6,r3                ; jb/ma 18/1/06 actual less above
+                                        ; so give back any not needed
         MOVNE   R0,#ModHandReason_ExtendBlock
         BLNE   XROS_Module              ; reduce back to a meaningful size
         EXIT    VS
@@ -686,7 +683,6 @@ addmoremessages
         STR     R2,[R4,#task_messages]  ; update to contain new size
         STR     R6,[R4,#task_messagessize] ; jb/ma 4/1/06 this is the actual size
                                            ; r3 is only the change in size
-;        STR     R3,[R4,#task_messagessize]
 
 sortmessages
         Debug   msgsel,"sort list at, size =",R2,R6