ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

widl: Rename ifref_t iface member to type. 

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-02-17 19:33:30 +01:00 committed by Alexandre Julliard
parent 943d48896e
commit db580fe9db
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/widl/parser.y
View File

@ -1826,10 +1826,10 @@ static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface)
return list;
}
static ifref_t *make_ifref(type_t *iface)
static ifref_t *make_ifref(type_t *type)
{
ifref_t *l = xmalloc(sizeof(ifref_t));
l->iface = iface;
l->type = type;
l->attrs = NULL;
return l;
}

8
tools/widl/typetree.c
View File

@ -565,19 +565,19 @@ type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref
/* FIXME: this should probably not be allowed, here or in coclass, */
/* but for now there's too many places in Wine IDL where it is to */
/* even print a warning. */
if (!(ifref->iface->defined)) continue;
if (!(requires = type_iface_get_requires(ifref->iface))) continue;
if (!(ifref->type->defined)) continue;
if (!(requires = type_iface_get_requires(ifref->type))) continue;
LIST_FOR_EACH_ENTRY(required, requires, ifref_t, entry)
{
int found = 0;
LIST_FOR_EACH_ENTRY(tmp, ifaces, ifref_t, entry)
if ((found = type_is_equal(tmp->iface, required->iface))) break;
if ((found = type_is_equal(tmp->type, required->type))) break;
if (!found)
error_loc("interface '%s' also requires interface '%s', "
"but runtimeclass '%s' does not implement it.\n",
ifref->iface->name, required->iface->name, runtimeclass->name);
ifref->type->name, required->type->name, runtimeclass->name);
}
}

2
tools/widl/typetree.h
View File

@ -363,7 +363,7 @@ static inline type_t *type_runtimeclass_get_default_iface(const type_t *type)
if (!ifaces) return NULL;
LIST_FOR_EACH_ENTRY(entry, ifaces, ifref_t, entry)
if (is_attr(entry->attrs, ATTR_DEFAULT))
return entry->iface;
return entry->type;
return NULL;
}

2
tools/widl/widltypes.h
View File

@ -538,7 +538,7 @@ struct _declarator_t {
};
struct _ifref_t {
type_t *iface;
type_t *type;
attr_list_t *attrs;
/* parser-internal */

6
tools/widl/write_msft.c
View File

@ -2352,10 +2352,10 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls)
i = 0;
if (ifaces) LIST_FOR_EACH_ENTRY( iref, ifaces, ifref_t, entry ) {
if(iref->iface->typelib_idx == -1)
add_interface_typeinfo(typelib, iref->iface);
if(iref->type->typelib_idx == -1)
add_interface_typeinfo(typelib, iref->type);
ref = (MSFT_RefRecord*) (typelib->typelib_segment_data[MSFT_SEG_REFERENCES] + offset + i * sizeof(*ref));
ref->reftype = typelib->typelib_typeinfo_offsets[iref->iface->typelib_idx];
ref->reftype = typelib->typelib_typeinfo_offsets[iref->type->typelib_idx];
ref->flags = 0;
ref->oCustData = -1;
ref->onext = -1;