wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 721065. (Bv2a) pyxpt: Report true Typelib filename for both files, when IIDs/names differ. r=ted.mielczarek.

Browse Source
This commit is contained in:
Serge Gautherie 2012-02-17 19:37:52 +01:00
parent 80f2d0e592
commit c31d0e5c9d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xpcom/typelib/xpt/tools/xpt.py
View File

@ -870,6 +870,7 @@ class Interface(object):
self._descriptor_offset = 0
self._name_offset = 0
self._namespace_offset = 0
self.xpt_filename = None
def __repr__(self):
return "Interface('%s', '%s', '%s', methods=%s)" % (self.name, self.iid, self.namespace, self.methods)
@ -1095,6 +1096,7 @@ class Typelib(object):
namespace = Typelib.read_string(map, data_pool_offset, ide[2])
iface = Interface(name, iid, namespace)
iface._descriptor_offset = ide[3]
iface.xpt_filename = xpt.filename
xpt.interfaces.append(iface)
for iface in xpt.interfaces:
iface.read_descriptor(xpt, map, data_pool_offset)
@ -1217,7 +1219,8 @@ class Typelib(object):
raise DataError, \
"Typelibs contain definitions of interface %s" \
" with different IIDs (%s (%s) vs %s (%s))!" % \
(i.name, i.iid, other.filename, j.iid, self.filename)
(i.name, i.iid, i.xpt_filename or other.filename, \
j.iid, j.xpt_filename or self.filename)
elif i.iid == j.iid and i.iid != Interface.UNRESOLVED_IID:
# Same IID but different names: raise an exception.
# self.* is the (target) Typelib being merged into,
@ -1225,7 +1228,8 @@ class Typelib(object):
raise DataError, \
"Typelibs contain definitions of interface %s" \
" with different names (%s (%s) vs %s (%s))!" % \
(i.iid, i.name, other.filename, j.name, self.filename)
(i.iid, i.name, i.xpt_filename or other.filename, \
j.name, j.xpt_filename or self.filename)
if not merged:
# No partially matching interfaces, so just take this interface
self.interfaces.append(i)