Changeset 2190

Timestamp:

07/06/08 01:49:50 (5 months ago)

Author:

mdcurran

Message:

Put back support for reading embedded objects in some richEdit fields (e.g. Outlook Express and Windows Mail). The code was accidentily removed in r2176. Also reverted r2182 which disabled it to stop errors.

Files:

• trunk/source/NVDAObjects/IAccessible/edit.py (modified) (1 diff)

trunk/source/NVDAObjects/IAccessible/edit.py

@@ -275 +275 @@
                 return winUser.sendMessage(self.obj.windowHandle,EM_GETLINECOUNT,0,0)
 
+        def _getTextRangeWithEmbeddedObjects(self,start,end):
+                ptr=ctypes.POINTER(comInterfaces.tom.ITextDocument)()
+                ctypes.windll.oleacc.AccessibleObjectFromWindow(self.obj.windowHandle,-16,ctypes.byref(ptr._iid_),ctypes.byref(ptr))
+                r=ptr.Range(self._startOffset,self._endOffset)
+                bufText=r.text
+                if bufText is None:
+                        bufText=""
+                newTextList=[]
+                for offset in range(len(bufText)):
+                        if ord(bufText[offset])==0xfffc:
+                                embedRange=ptr.Range(start+offset,start+offset)
+                                o=embedRange.GetEmbeddedObject()
+                                o=o.QueryInterface(oleTypes.IOleObject)
+                                dataObj=o.GetClipboardData(0)
+                                dataObj=pythoncom._univgw.interface(hash(dataObj),pythoncom.IID_IDataObject)
+                                format=(win32clipboard.CF_UNICODETEXT, None, pythoncom.DVASPECT_CONTENT, -1, pythoncom.TYMED_HGLOBAL)
+                                medium=dataObj.GetData(format)
+                                buf=ctypes.create_string_buffer(medium.data)
+                                buf=ctypes.cast(buf,ctypes.c_wchar_p)
+                                newTextList.append(buf.value)
+                        else:
+                                newTextList.append(bufText[offset])
+                return "".join(newTextList)
+
         def _getTextRange(self,start,end):
                 if self.obj.editAPIVersion>=2:
+                        if self.obj.editAPIHasITextDocument:
+                                return self._getTextRangeWithEmbeddedObjects(start,end)
                         bufLen=((end-start)+1)*2
                         if self.obj.isWindowUnicode: