Support size_is(*Length) attributes for strings.

svn path=/trunk/; revision=17158
This commit is contained in:
Eric Kohl 2005-08-07 11:44:41 +00:00
parent 9a462169de
commit 6ab29bbd4b
2 changed files with 21 additions and 3 deletions

View file

@ -1,5 +1,11 @@
ChangeLog
2005-08-07 ekohl
tools/widl/server.c
- Support size_is(*Length) attributes for strings.
2005-07-30 ekohl
tools/widl/client.c

View file

@ -833,7 +833,11 @@ static void print_message_buffer_size(func_t *func, unsigned int *type_offset)
var->type->type == RPC_FC_CHAR ||
var->type->type == RPC_FC_WCHAR)
{
print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name);
if (((var_t *)sizeis_attr)->ptr_level == 0)
print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name);
else
print_server("_StubMsg.MaxCount = %s ? *%s : 0;\n",
((var_t *)sizeis_attr)->name, ((var_t *)sizeis_attr)->name);
fprintf(server, "\n");
print_server("NdrConformantStringBufferSize(\n");
indent++;
@ -1232,7 +1236,11 @@ static void marshall_out_arguments(func_t *func, unsigned int *type_offset)
if (string_attr)
{
fprintf(server, "\n");
print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name);
if (((var_t *)sizeis_attr)->ptr_level == 0)
print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name);
else
print_server("_StubMsg.MaxCount = %s ? *%s : 0;\n",
((var_t *)sizeis_attr)->name, ((var_t *)sizeis_attr)->name);
fprintf(server, "\n");
print_server("NdrConformantStringMarshall(\n");
indent++;
@ -1452,7 +1460,11 @@ static void cleanup_return_buffer(func_t *func, unsigned int *type_offset)
indent++;
if (string_attr)
{
print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name);
if (((var_t *)sizeis_attr)->ptr_level == 0)
print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name);
else
print_server("_StubMsg.MaxCount = %s ? *%s : 0;\n",
((var_t *)sizeis_attr)->name, ((var_t *)sizeis_attr)->name);
fprintf(server, "\n");
print_server("NdrPointerFree(\n");
indent++;