Fix off by one text length in EditTextInfo

source/NVDAObjects/window/edit.py

@@ -465,7 +465,7 @@ def _setCaretOffset(self, offset):
 
 	def _getStoryText(self):
 		if controlTypes.State.PROTECTED in self.obj.states:
-			return "*" * (self._getStoryLength() - 1)
+			return "*" * self._getStoryLength()
 		return self.obj.windowText
 
 	def _getStoryLength(self):
@@ -500,18 +500,12 @@ def _getStoryLength(self):
 				)
 			finally:
 				winKernel.virtualFreeEx(processHandle, internalInfo, 0, winKernel.MEM_RELEASE)
-			# Py3 review: investigation with Python 2 NVDA revealed that
-			# adding 1 to this creates an off by one error.
-			# Tested using Wordpad, enforcing EditTextInfo as the textInfo implementation.
-			return textLen + 1
+			return textLen
 		else:
 			# ForWM_GETTEXTLENGTH documentation, see
 			# https://docs.microsoft.com/en-us/windows/desktop/winmsg/wm-gettextlength
 			# It determines the length, in characters, of the text associated with a window.
-			# Py3 review: investigation with Python 2 NVDA revealed that
-			# adding 1 to this created an off by one error.
-			# Tested using Notepad
-			return watchdog.cancellableSendMessage(self.obj.windowHandle, winUser.WM_GETTEXTLENGTH, 0, 0) + 1
+			return watchdog.cancellableSendMessage(self.obj.windowHandle, winUser.WM_GETTEXTLENGTH, 0, 0)
 
 	def _getLineCount(self):
 		return self.obj.windowTextLineCount

source/textInfos/offsets.py

@@ -358,7 +358,7 @@ def _calculateUniscribeOffsets(
 			ctypes.byref(relEnd),
 		):
 			relStart = relStart.value
-			relEnd = min(lineLength, relEnd.value)
+			relEnd = relEnd.value
 			if self.encoding != textUtils.WCHAR_ENCODING:
 				# We need to convert the uniscribe based offsets to str offsets.
 				relStart, relEnd = offsetConverter.encodedToStrOffsets(relStart, relEnd)

tests/system/robot/symbolPronunciationTests.py

@@ -596,24 +596,13 @@ def test_symbolInSpeechUI():
 	"""Replace a translation string to include a character that is can be substituted,
 	check if the 'speech UI' translation string the character substituted.
 	"""
-	_notepad.prepareNotepad(
-		(
-			"t"  # Character doesn't matter, we just want to invoke "Right" speech UI.
-		),
-	)
+	character = "t"  # Character doesn't matter, we just want to invoke "Right" speech UI.
+	_notepad.prepareNotepad(character)
 	_setConfig(SymLevel.ALL)
 	spy = _NvdaLib.getSpyLib()
 	expected = "shouldn't sub tick symbol"
 	spy.override_translationString(EndSpeech.RIGHT.value, expected)
 
-	# get to the end char
-	actual = _pressKeyAndCollectSpeech(Move.REVIEW_CHAR.value, numberOfTimes=1)
-	_builtIn.should_be_equal(
-		actual,
-		["blank"],
-		msg="actual vs expected. Unexpected speech when moving to final character.",
-	)
-
 	actual = _pressKeyAndCollectSpeech(Move.REVIEW_CHAR.value, numberOfTimes=1)
 	_builtIn.should_be_equal(
 		actual,
@@ -622,7 +611,7 @@ def test_symbolInSpeechUI():
 		[
 			# todo: 'tick' is a bug
 			"shouldn tick t sub tick symbol"  # intentionally concatenate strings
-			"\nblank",
+			f"\n{character}",
 		],
 		msg="actual vs expected. NVDA speech UI substitutes symbols",
 	)
@@ -632,7 +621,7 @@ def test_symbolInSpeechUI():
 	actual = _pressKeyAndCollectSpeech(Move.REVIEW_CHAR.value, numberOfTimes=1)
 	_builtIn.should_be_equal(
 		actual,
-		[f"{expected}\nblank"],
+		[f"{expected}\n{character}"],
 		msg="actual vs expected. NVDA speech UI substitutes symbols",
 	)
 

user_docs/en/changes.md

@@ -26,6 +26,7 @@ We recommend using Windows 11, or if that is not possible, the latest Windows 10
 ### Bug Fixes
 
 * When unicode normalization is enabled for speech, navigating by character will again correctly announce combining diacritic characters like acute ( ́ ). (#18722, @LeonarddeR)
+* When reporting the location of the caret in classic versions of Notepad and other Win32 edit controls, text position is now more accurate. (#18767, @LeonarddeR)
 
 ### Changes for Developers