system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-05 16:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

widl: Sanity check string and pointer attrs. Don't assign string as type.

Browse source
This commit is contained in:
Dan Hipschman 2006-09-01 16:35:49 -07:00 committed by Alexandre Julliard
parent 180ede5bfe
commit a407da4775
3 changed files with 47 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
tools/widl/parser.y
View file

@ -1285,29 +1285,26 @@ static type_t *reg_type(type_t *type, const char *name, int t)
return type;
}
/* determine pointer type from attrs */
static unsigned char get_pointer_type( type_t *type )
{
int t;
if (is_attr( type->attrs, ATTR_STRING ))
{
switch( type->ref->type )
{
case RPC_FC_CHAR:
return RPC_FC_C_CSTRING;
case RPC_FC_WCHAR:
return RPC_FC_C_WSTRING;
}
}
t = get_attrv( type->attrs, ATTR_POINTERTYPE );
if (t) return t;
return RPC_FC_FP;
}
static type_t *reg_typedefs(type_t *type, var_t *names, attr_t *attrs)
{
type_t *ptr = type;
int ptrc = 0;
int is_str = is_attr(attrs, ATTR_STRING);
unsigned char ptr_type = get_attrv(attrs, ATTR_POINTERTYPE);
if (is_str)
{
type_t *t = type;
unsigned char c;
while (is_ptr(t))
t = t->ref;
c = t->type;
if (c != RPC_FC_CHAR && c != RPC_FC_BYTE && c != RPC_FC_WCHAR)
yyerror("'%s': [string] attribute is only valid on 'char', 'byte', or 'wchar_t' pointers and arrays",
names->name);
}
/* We must generate names for tagless enum, struct or union.
Typedef-ing a tagless enum, struct or union means we want the typedef
@ -1343,8 +1340,18 @@ static type_t *reg_typedefs(type_t *type, var_t *names, attr_t *attrs)
}
cur = alias(cur, names->name);
cur->attrs = attrs;
if (is_ptr(cur))
cur->type = get_pointer_type(cur);
if (ptr_type)
{
if (is_ptr(cur))
cur->type = ptr_type;
else
yyerror("'%s': pointer attribute applied to non-pointer type",
cur->name);
}
else if (is_str && ! is_ptr(cur))
yyerror("'%s': [string] attribute applied to non-pointer type",
cur->name);
reg_type(cur, cur->name, 0);
}
names = next;
@ -1485,11 +1492,6 @@ static int get_struct_type(var_t *field)
yyerror("field '%s' deriving from a conformant array must be the last field in the structure",
field->name);
break;
case RPC_FC_C_CSTRING:
case RPC_FC_C_WSTRING:
has_conformance = 1;
has_variance = 1;
break;
/*
* Propagate member attributes

24
tools/widl/proxy.c
View file

@ -224,6 +224,12 @@ static void marshall_size_arg( var_t *arg )
return;
}
if (is_string_type(arg->attrs, arg->ptr_level, arg->array))
{
print_proxy("NdrConformantStringBufferSize( &_StubMsg, (unsigned char*)s, ", arg->name);
fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d] );\n", index);
}
switch( type->type )
{
case RPC_FC_BYTE:
@ -249,8 +255,6 @@ static void marshall_size_arg( var_t *arg )
fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d] );\n", index );
break;
case RPC_FC_C_CSTRING:
case RPC_FC_C_WSTRING:
case RPC_FC_CARRAY:
print_proxy( "NdrConformantArrayBufferSize( &_StubMsg, (unsigned char*)%s, ", arg->name );
fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index );
@ -323,6 +327,12 @@ static void marshall_copy_arg( var_t *arg )
return;
}
if (is_string_type(arg->attrs, arg->ptr_level, arg->array))
{
print_proxy("NdrConformantStringMarshall( &_StubMsg, (unsigned char*)s, ", arg->name);
fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d] );\n", index);
}
switch( type->type )
{
case RPC_FC_BYTE:
@ -348,8 +358,6 @@ static void marshall_copy_arg( var_t *arg )
fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index );
break;
case RPC_FC_C_CSTRING:
case RPC_FC_C_WSTRING:
case RPC_FC_CARRAY:
break;
@ -429,6 +437,12 @@ static void unmarshall_copy_arg( var_t *arg )
return;
}
if (is_string_type(arg->attrs, arg->ptr_level, arg->array))
{
print_proxy("NdrConformantStringUnmarshall( &_StubMsg, (unsigned char**)&s, ", arg->name);
fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], 0 );\n", index);
}
switch( type->type )
{
case RPC_FC_BYTE:
@ -453,8 +467,6 @@ static void unmarshall_copy_arg( var_t *arg )
fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], 0);\n", index );
break;
case RPC_FC_C_CSTRING:
case RPC_FC_C_WSTRING:
case RPC_FC_CARRAY:
print_proxy( "NdrConformantArrayUnmarshall( &_StubMsg, (unsigned char**)&%s, ", arg->name );
fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], 0);\n", index );

4
tools/widl/typelib.c
View file

@ -79,9 +79,7 @@ int is_ptr(type_t *t)
return c == RPC_FC_RP
|| c == RPC_FC_UP
|| c == RPC_FC_FP
|| c == RPC_FC_OP
|| c == RPC_FC_C_CSTRING
|| c == RPC_FC_C_WSTRING;
|| c == RPC_FC_OP;
}
/* List of oleauto types that should be recognized by name.