Fix issue with pasting clipboard by non-RAMFetch data transfer

Detail:
  Send correct DataSaveAck message in response.

Version 5.75. Tagged as 'Wimp-5_75'

VersionASM

@@ -9,12 +9,12 @@
                         GBLS    Module_ApplicationDate
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
-Module_MajorVersion     SETS    "5.74"
-Module_Version          SETA    574
+Module_MajorVersion     SETS    "5.75"
+Module_Version          SETA    575
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "11 May 2020"
-Module_ApplicationDate  SETS    "11-May-20"
+Module_Date             SETS    "23 May 2020"
+Module_ApplicationDate  SETS    "23-May-20"
 Module_ComponentName    SETS    "Wimp"
-Module_FullVersion      SETS    "5.74"
-Module_HelpVersion      SETS    "5.74 (11 May 2020)"
+Module_FullVersion      SETS    "5.75"
+Module_HelpVersion      SETS    "5.75 (23 May 2020)"
                         END

VersionNum

-/* (5.74)
+/* (5.75)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        5.74
+#define Module_MajorVersion_CMHG        5.75
 #define Module_MinorVersion_CMHG
-#define Module_Date_CMHG                11 May 2020
+#define Module_Date_CMHG                23 May 2020
 
-#define Module_MajorVersion             "5.74"
-#define Module_Version                  574
+#define Module_MajorVersion             "5.75"
+#define Module_Version                  575
 #define Module_MinorVersion             ""
-#define Module_Date                     "11 May 2020"
+#define Module_Date                     "23 May 2020"
 
-#define Module_ApplicationDate          "11-May-20"
+#define Module_ApplicationDate          "23-May-20"
 
 #define Module_ComponentName            "Wimp"
 
-#define Module_FullVersion              "5.74"
-#define Module_HelpVersion              "5.74 (11 May 2020)"
-#define Module_LibraryVersionInfo       "5:74"
+#define Module_FullVersion              "5.75"
+#define Module_HelpVersion              "5.75 (23 May 2020)"
+#define Module_LibraryVersionInfo       "5:75"

s/CBTask

@@ -779,9 +779,12 @@ cbtask_datasave_transfer_perform
         LDR     R0,[R1,#ms_myref]
         STR     R0,[R1,#ms_yourref]
 
-        MOV     R0,#User_Message_Recorded
         LDR     R2,[R1,#ms_taskhandle]
+        Push    "R0,R2"                 ; we may need the task handle/ref later
+
+        MOV     R0,#User_Message_Recorded
         SWI     XWimp_SendMessage
+        ADDVS   sp,sp,#8
         BLVS    cbtask_report_error
         Pull    "R14",VS
         BVS     cbtask_poll
@@ -793,6 +796,7 @@ cbtask_datasave_transfer_perform
 
         TEQ     R0,#User_Message_Acknowledge
         BEQ     %FT50                   ; bounced message, so try file transfer protocol instead
+        ADD     sp,sp,#8                ; we don't need the stored bits now
 
         TEQ     R0,#User_Message
         TEQNE   R0,#User_Message_Recorded
@@ -819,11 +823,14 @@ cbtask_datasave_transfer_perform
 
 50
         ; start file transfer protocol as RAM one wasn't completed
-
         ; free clipboard block
         ; send datasaveack
         STR     R8,[R1,#msDataTransfer_window]
         STR     R9,[R1,#msDataTransfer_icon]
+        Pull    "R0"
+        STR     R0,[R1,#ms_yourref]
+        MOV     R0,#Message_DataSaveAck
+        STR     R0,[R1,#ms_action]
         MOV     R0,#-1
         STR     R0,[R1,#msDataTransfer_filesize] ; mark as 'unsafe'
         ADD     R0,R1,#msDataTransfer_filename
@@ -831,9 +838,17 @@ cbtask_datasave_transfer_perform
         ADRL    R2,cbtask_datafilename_end
         BL      cbtask_copy
 
+        ; sort out message length
+        SUB     R2,R2,R1
+        ADD     R2,R2,#3
+        BIC     R2,R2,#3
+        ADD     R2,R2,#msDataTransfer_filename
+        ADD     R1,R11,#cbtask_pollblock
+        STR     R2,[R1,#ms_size]
+
         MOV     R0,#User_Message
         ADD     R1,R11,#cbtask_pollblock
-        LDR     R2,[R1,#ms_taskhandle]
+        Pull    "R2"
         SWI     Wimp_SendMessage
 
         MOV     R0,#clipboard_flexblock_pastedata