Commit 1475387a authored by Andy Vawer's avatar Andy Vawer Committed by ROOL
Browse files

Fix issue where dragging text from icon caused a crash in foreground task

When releasing claim, use of stale register meant that the foreground task wasn't correctly bouncing Message_Dragging when the pointer moved out of range. Also added a sanity check in get_selected_text so that if for some reason the selection window disappears mid action it will be caught and not cause a crash.

Version 5.71. Tagged as 'Wimp-5_71'
parent 0941dd09
......@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "5.70"
Module_Version SETA 570
Module_MajorVersion SETS "5.71"
Module_Version SETA 571
Module_MinorVersion SETS ""
Module_Date SETS "25 Jan 2020"
Module_ApplicationDate SETS "25-Jan-20"
Module_Date SETS "30 Jan 2020"
Module_ApplicationDate SETS "30-Jan-20"
Module_ComponentName SETS "Wimp"
Module_FullVersion SETS "5.70"
Module_HelpVersion SETS "5.70 (25 Jan 2020)"
Module_FullVersion SETS "5.71"
Module_HelpVersion SETS "5.71 (30 Jan 2020)"
END
/* (5.70)
/* (5.71)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 5.70
#define Module_MajorVersion_CMHG 5.71
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 25 Jan 2020
#define Module_Date_CMHG 30 Jan 2020
#define Module_MajorVersion "5.70"
#define Module_Version 570
#define Module_MajorVersion "5.71"
#define Module_Version 571
#define Module_MinorVersion ""
#define Module_Date "25 Jan 2020"
#define Module_Date "30 Jan 2020"
#define Module_ApplicationDate "25-Jan-20"
#define Module_ApplicationDate "30-Jan-20"
#define Module_ComponentName "Wimp"
#define Module_FullVersion "5.70"
#define Module_HelpVersion "5.70 (25 Jan 2020)"
#define Module_LibraryVersionInfo "5:70"
#define Module_FullVersion "5.71"
#define Module_HelpVersion "5.71 (30 Jan 2020)"
#define Module_LibraryVersionInfo "5:71"
......@@ -1252,6 +1252,7 @@ cbtask_message_dragging_rx
; if we originated it, we'll need to let ourself know manually
ADRL R14,clipboard_taskhandle
LDR R14,[R14]
ADD R1,R11,#cbtask_pollblock
LDR R2,[R1,#ms_taskhandle]
TEQ R2,R14
BNE cbtask_poll
......@@ -1904,6 +1905,10 @@ cbtask_get_selected_text
; obtain the data we want to send so we can work out length etc
; get pointer to icon data
LDR R10,selectionwindow ; selection window handle
CMP R10,#-1 ; for some reason, it's no longer valid
SETV EQ
Pull "PC",VS ; bail out with error
Abs R10,R10
LDR R6,[R10,#w_seldata+wselicon] ; icon handle of selected text
MOV R7,#clipboard_flexblock_dragdata
......
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