Fix freezes in MS Word which would result when it took more than 2 seconds to fetch...

diff --git a/nvdaHelper/remote/winword.cpp b/nvdaHelper/remote/winword.cpp
index 6a24bb8..dd36736 100644 (file)
--- a/nvdaHelper/remote/winword.cpp
+++ b/nvdaHelper/remote/winword.cpp
@@ -556,9 +556,9 @@ LRESULT CALLBACK winword_callWndProcHook(int code, WPARAM wParam, LPARAM lParam)
 }\r
 \r
 error_status_t nvdaInProcUtils_winword_expandToLine(handle_t bindingHandle, const long windowHandle, const int offset, int* lineStart, int* lineEnd) {\r
-       winword_expandToLine_args args={offset,3,4};\r
+       winword_expandToLine_args args={offset,offset,offset+1};\r
        DWORD_PTR wmRes=0;\r
-       SendMessageTimeout((HWND)windowHandle,wm_winword_expandToLine,(WPARAM)&args,0,SMTO_ABORTIFHUNG,2000,&wmRes);\r
+       SendMessage((HWND)windowHandle,wm_winword_expandToLine,(WPARAM)&args,0);\r
        *lineStart=args.lineStart;\r
        *lineEnd=args.lineEnd;\r
        return RPC_S_OK;\r
@@ -566,8 +566,7 @@ error_status_t nvdaInProcUtils_winword_expandToLine(handle_t bindingHandle, cons
 \r
 error_status_t nvdaInProcUtils_winword_getTextInRange(handle_t bindingHandle, const long windowHandle, const int startOffset, const int endOffset, const long formatConfig, BSTR* text) { \r
        winword_getTextInRange_args args={startOffset,endOffset,formatConfig,NULL};\r
-       DWORD_PTR wmRes=0;\r
-       SendMessageTimeout((HWND)windowHandle,wm_winword_getTextInRange,(WPARAM)&args,0,SMTO_ABORTIFHUNG,2000,&wmRes);\r
+       SendMessage((HWND)windowHandle,wm_winword_getTextInRange,(WPARAM)&args,0);\r
        *text=args.text;\r
        return RPC_S_OK;\r
 }\r

diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
index 2c9bfe0..29bb859 100644 (file)
--- a/user_docs/en/changes.t2t
+++ b/user_docs/en/changes.t2t
@@ -9,6 +9,7 @@
 - With auto language switching enabled, Content such as alt text for graphics and labels for other certain controls in Mozilla Gecko (e.g. Firefox) are now reported in the correct language if marked up appropriately.\r
 - SayAll in BibleSeeker (and other TRxRichEdit controls) no longer stops in the middle of a passage.\r
 - Lists found in the Windows 8 Explorer file properties (permitions tab) and in Windows 8 Windows Update now read correctly.\r
+- Fixed possible freezes in MS Word which would result when it took more than 2 seconds to fetch text from a document (extremely long lines or tables of contents). (#2191)\r
 \r
 \r
 = 2012.1 =\r