Skip to content

W
wine-winehq
Commit 25116ae3 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

widl: Treat variables with array indices the same as pointers.

parent c0f4605b
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
tools/widl/typegen.c
View file @ 25116ae3
...@@ -293,7 +293,7 @@ void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type ...@@ -293,7 +293,7 @@ void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type
while (NEXT_LINK(var)) var = NEXT_LINK(var); while (NEXT_LINK(var)) var = NEXT_LINK(var);
for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var))
{ {
if (var->ptr_level == 0) if (var->ptr_level == 0 && !var->array)
{ {
unsigned int size; unsigned int size;
unsigned int alignment = 0; unsigned int alignment = 0;
...@@ -351,7 +351,8 @@ void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type ...@@ -351,7 +351,8 @@ void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type
last_size = size; last_size = size;
} }
else if (var->ptr_level == 1) else if (var->ptr_level == 1 ||
(var->ptr_level == 0 && var->array && !NEXT_LINK(var->array)))
{ {
if (is_attr(var->attrs, ATTR_STRING)) if (is_attr(var->attrs, ATTR_STRING))
{ {
...@@ -397,7 +398,7 @@ void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *ty ...@@ -397,7 +398,7 @@ void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *ty
while (NEXT_LINK(var)) var = NEXT_LINK(var); while (NEXT_LINK(var)) var = NEXT_LINK(var);
for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var))
{ {
if (var->ptr_level == 0) if (var->ptr_level == 0 && !var->array)
{ {
unsigned int size; unsigned int size;
unsigned int alignment = 0; unsigned int alignment = 0;
...@@ -456,7 +457,8 @@ void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *ty ...@@ -456,7 +457,8 @@ void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *ty
last_size = size; last_size = size;
} }
else if (var->ptr_level == 1) else if (var->ptr_level == 1 ||
(var->ptr_level == 0 && var->array && !NEXT_LINK(var->array)))
{ {
if (is_attr(var->attrs, ATTR_STRING)) if (is_attr(var->attrs, ATTR_STRING))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment