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

widl: Handle top-level conformance for complex arrays.

Browse Source
This commit is contained in:
Dan Hipschman 2007-09-19 17:05:38 -07:00 committed by Alexandre Julliard
parent dbfabf68a2
commit 767a1f26f6
3 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/rpcrt4/tests/server.c
View File

@ -356,6 +356,16 @@ s_sum_padded2(padded_t ps[2])
return s_sum_padded(&ps[0]) + s_sum_padded(&ps[1]);
}
int
s_sum_padded_conf(padded_t *ps, int n)
{
int sum = 0;
int i;
for (i = 0; i < n; ++i)
sum += s_sum_padded(&ps[i]);
return sum;
}
int
s_sum_bogus(bogus_t *b)
{
@ -501,6 +511,11 @@ basic_tests(void)
padded2[1].i = 3;
padded2[1].c = 7;
ok(sum_padded2(padded2) == 6, "RPC sum_padded2\n");
padded2[0].i = -5;
padded2[0].c = 1;
padded2[1].i = 3;
padded2[1].c = 7;
ok(sum_padded_conf(padded2, 2) == 6, "RPC sum_padded_conf\n");
i1 = 14;
i2 = -7;

1
dlls/rpcrt4/tests/server.idl
View File

@ -208,6 +208,7 @@ interface IServer
int sum_padded(padded_t *p);
int sum_padded2(padded_t ps[2]);
int sum_padded_conf([size_is(n)] padded_t *ps, int n);
typedef struct
{

34
tools/widl/typegen.c
View File

@ -2580,11 +2580,9 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func,
else if (is_array(type))
{
unsigned char tc = type->type;
const char *array_type;
const char *array_type = "FixedArray";
if (tc == RPC_FC_SMFARRAY || tc == RPC_FC_LGFARRAY)
array_type = "FixedArray";
else if (tc == RPC_FC_SMVARRAY || tc == RPC_FC_LGVARRAY)
if (tc == RPC_FC_SMVARRAY || tc == RPC_FC_LGVARRAY)
{
if (is_size_needed_for_phase(phase))
{
@ -2605,22 +2603,28 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func,
}
array_type = "ConformantArray";
}
else if (tc == RPC_FC_CVARRAY)
else if (tc == RPC_FC_CVARRAY || tc == RPC_FC_BOGUS_ARRAY)
{
if (is_size_needed_for_phase(phase))
{
print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)");
write_expr(file, type->size_is, 1);
fprintf(file, ";\n");
print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */
print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)");
write_expr(file, type->length_is, 1);
fprintf(file, ";\n\n");
if (type->size_is)
{
print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)");
write_expr(file, type->size_is, 1);
fprintf(file, ";\n");
}
if (type->length_is)
{
print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */
print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)");
write_expr(file, type->length_is, 1);
fprintf(file, ";\n\n");
}
}
array_type = "ConformantVaryingArray";
array_type = (tc == RPC_FC_BOGUS_ARRAY
? "ComplexArray"
: "ConformantVaryingArray");
}
else
array_type = "ComplexArray";
if (!in_attr && phase == PHASE_FREE)
{