marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

widl: Remove redundant get_var_vt function.

oldstable
Dan Hipschman 2007-05-09 20:47:24 -07:00 committed by Alexandre Julliard
parent 933ca7b126
commit e7495555a0
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/widl/typelib.c
View File

@ -212,20 +212,6 @@ unsigned short get_type_vt(type_t *t)
return 0;
}
unsigned short get_var_vt(var_t *v)
{
unsigned short vt;
const char *tname = v->type->name;
chat("get_var_vt: var %p type->name %s\n", v, tname ? tname : "NULL");
if (tname) {
vt = builtin_vt(tname);
if (vt) return vt;
}
return get_type_vt(v->type);
}
void start_typelib(char *name, attr_list_t *attrs)
{
in_typelib++;

1
tools/widl/typelib.h
View File

@ -82,7 +82,6 @@ enum VARENUM {
VT_TYPEMASK = 0xfff
};
extern unsigned short get_type_vt(type_t *t);
extern unsigned short get_var_vt(var_t *v);
extern int create_msft_typelib(typelib_t *typelib);
#endif

6
tools/widl/write_msft.c
View File

@ -1155,7 +1155,7 @@ static int encode_var(
}
dump_type(var->type);
vt = get_var_vt(var);
vt = get_type_vt(var->type);
type = var->type;
while(!vt) {
if(type->ref == NULL) {
@ -1445,7 +1445,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int
if (arg->type->type == RPC_FC_ENUM16)
vt = VT_INT;
else
vt = get_var_vt(arg);
vt = get_type_vt(arg->type);
paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */
chat("default value %ld\n", expr->cval);
write_value(typeinfo->typelib, defaultdata, vt, &expr->cval);
@ -1458,7 +1458,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int
if (arg->type->type == RPC_FC_ENUM16)
vt = VT_INT;
else
vt = get_var_vt(arg);
vt = get_type_vt(arg->type);
paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */
chat("default value '%s'\n", s);
write_value(typeinfo->typelib, defaultdata, vt, s);