December 2005 - Wine-commits

Robert Shearman : widl: Fix merge conflict.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: f56737579e49aab5592a928d98d1e8c11d539368 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f56737579e49aab5592a928… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:22:46 2005 +0100 widl: Fix merge conflict. --- tools/widl/typegen.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index bc3710a..1346729 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -413,7 +413,6 @@ void marshall_arguments(FILE *file, int fprintf(file, "_StubMsg.Buffer += sizeof("); write_type(file, var->type, var, var->tname); fprintf(file, ");\n"); - fprintf(file, "\n"); last_size = size; } @@ -588,7 +587,6 @@ void unmarshall_arguments(FILE *file, in fprintf(file, "_StubMsg.Buffer += sizeof("); write_type(file, var->type, var, var->tname); fprintf(file, ");\n"); - fprintf(file, "\n"); last_size = size; }

1 0

Robert Shearman : widl: Follow type references in procformat and typeformat string generation.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 93775adf75342a673367ed17de2225f38f9fa697 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93775adf75342a673367ed1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:22:32 2005 +0100 widl: Follow type references in procformat and typeformat string generation. --- tools/widl/typegen.c | 103 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 73 insertions(+), 30 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f1f791d..bc3710a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -41,6 +41,9 @@ #include "widl.h" #include "typegen.h" +static size_t get_size_typeformatstring_type(const type_t *type, int ptr_level, + const expr_t *array, const char *name); + static int print_file(FILE *file, int indent, const char *format, ...) { va_list va; @@ -56,21 +59,34 @@ static int print_file(FILE *file, int in return r; } -static size_t write_procformatstring_var(FILE *file, int indent, var_t *var, int is_return, unsigned int *type_offset) +static inline int type_has_ref(const type_t *type) +{ + return (type->type == 0 && type->ref); +} + +static size_t write_procformatstring_type(FILE *file, int indent, + const type_t *type, int ptr_level, const expr_t *array, const char *name, + int is_in, int is_out, int is_return, unsigned int *type_offset) { size_t size; - if (var->ptr_level == 0 && !var->array) + + if (ptr_level == 0 && type_has_ref(type)) + return write_procformatstring_type(file, indent, type->ref, ptr_level, + array, name, is_in, is_out, + is_return, type_offset); + + if (ptr_level == 0 && !array) { if (is_return) print_file(file, indent, "0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); else print_file(file, indent, "0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - switch(var->type->type) + switch(type->type) { #define CASE_BASETYPE(fctype) \ case RPC_##fctype: \ - print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ + print_file(file, indent, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ size = 2; /* includes param type prefix */ \ break @@ -90,20 +106,17 @@ static size_t write_procformatstring_var CASE_BASETYPE(FC_ERROR_STATUS_T); #undef CASE_BASETYPE default: - error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + error("Unknown/unsupported type: %s (0x%02x)\n", name, type->type); size = 0; } } else { - int in_attr = is_attr(var->attrs, ATTR_IN); - int out_attr = is_attr(var->attrs, ATTR_OUT); - if (is_return) print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n"); - else if (in_attr && out_attr) + else if (is_in && is_out) print_file(file, indent, "0x50, /* FC_IN_OUT_PARAM */\n"); - else if (out_attr) + else if (is_out) print_file(file, indent, "0x51, /* FC_OUT_PARAM */\n"); else print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); @@ -112,7 +125,7 @@ static size_t write_procformatstring_var print_file(file, indent, "NdrFcShort(0x%x),\n", *type_offset); size = 4; /* includes param type prefix */ } - *type_offset += get_size_typeformatstring_var(var); + *type_offset += get_size_typeformatstring_type(type, ptr_level, array, name); return size; } @@ -142,7 +155,14 @@ void write_procformatstring(FILE *file, while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - write_procformatstring_var(file, indent, var, FALSE, &type_offset); + int is_in = is_attr(var->attrs, ATTR_IN); + int is_out = is_attr(var->attrs, ATTR_OUT); + + if (!is_in && !is_out) is_in = TRUE; + write_procformatstring_type(file, indent, var->type, + var->ptr_level, var->array, var->name, + is_in, is_out, FALSE, &type_offset); + var = PREV_LINK(var); } } @@ -155,7 +175,9 @@ void write_procformatstring(FILE *file, print_file(file, indent, "0x5c, /* FC_PAD */\n"); } else - write_procformatstring_var(file, indent, var, TRUE, &type_offset); + write_procformatstring_type(file, indent, var->type, + var->ptr_level, var->array, var->name, FALSE, FALSE, TRUE, + &type_offset); } } @@ -168,23 +190,26 @@ void write_procformatstring(FILE *file, } -static size_t write_typeformatstring_var(FILE *file, int indent, var_t *var) +static size_t write_typeformatstring_type(FILE *file, int indent, + const type_t *type, int ptr_level, const expr_t *array, const char *name) { - int ptr_level = var->ptr_level; + if (ptr_level == 0 && type_has_ref(type)) + return write_typeformatstring_type(file, indent, + type->ref, 0 /* FIXME */, array, name); /* basic types don't need a type format string */ - if (ptr_level == 0 && !var->array) + if (ptr_level == 0 && !array) return 0; - if (ptr_level == 1 || - (var->ptr_level == 0 && var->array && !NEXT_LINK(var->array))) + if ((ptr_level == 1 && !type_has_ref(type)) || + (ptr_level == 0 && array && !NEXT_LINK(array))) { - switch (var->type->type) + switch (type->type) { #define CASE_BASETYPE(fctype) \ case RPC_##fctype: \ print_file(file, indent, "0x11, 0x08, /* FC_RP [simple_pointer] */\n"); \ - print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ + print_file(file, indent, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ print_file(file, indent, "0x5c, /* FC_PAD */\n"); \ return 4 CASE_BASETYPE(FC_BYTE); @@ -204,10 +229,10 @@ static size_t write_typeformatstring_var CASE_BASETYPE(FC_IGNORE); CASE_BASETYPE(FC_ERROR_STATUS_T); default: - error("write_typeformatstring_var: Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + error("write_typeformatstring_var: Unknown/unsupported type: %s (0x%02x)\n", name, type->type); } } - error("write_typeformatstring_var: Pointer level %d not supported for variable %s\n", ptr_level, var->name); + error("write_typeformatstring_var: Pointer level %d not supported for variable %s\n", ptr_level, name); return 0; } @@ -237,7 +262,8 @@ void write_typeformatstring(FILE *file, while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - write_typeformatstring_var(file, indent, var); + write_typeformatstring_type(file, indent, var->type, + var->ptr_level, var->array, var->name); var = PREV_LINK(var); } } @@ -252,13 +278,14 @@ void write_typeformatstring(FILE *file, print_file(file, indent, "\n"); } - -unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment) +static unsigned int get_required_buffer_size_type( + const type_t *type, int ptr_level, const expr_t *array, + const char *name, unsigned int *alignment) { *alignment = 0; - if (var->ptr_level == 0 && !var->array) + if (ptr_level == 0 && !array && !type_has_ref(type)) { - switch (var->type->type) + switch (type->type) { case RPC_FC_BYTE: case RPC_FC_CHAR: @@ -285,13 +312,20 @@ unsigned int get_required_buffer_size(co return 8; default: - error("get_required_buffer_size: Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + error("get_required_buffer_size: Unknown/unsupported type: %s (0x%02x)\n", name, type->type); return 0; } } + if (ptr_level == 0 && type_has_ref(type)) + return get_required_buffer_size_type(type->ref, 0 /* FIXME */, array, name, alignment); return 0; } +unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment) +{ + return get_required_buffer_size_type(var->type, var->ptr_level, var->array, var->name, alignment); +} + void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass) { @@ -643,14 +677,23 @@ void unmarshall_arguments(FILE *file, in } +static size_t get_size_typeformatstring_type(const type_t *type, int ptr_level, + const expr_t *array, const char *name) +{ + return write_typeformatstring_type(NULL, 0, type, ptr_level, array, name); +} + + size_t get_size_procformatstring_var(var_t *var) { unsigned int type_offset = 2; - return write_procformatstring_var(NULL, 0, var, FALSE, &type_offset); + return write_procformatstring_type(NULL, 0, var->type, + var->ptr_level, var->array, var->name, FALSE, FALSE, FALSE, &type_offset); } size_t get_size_typeformatstring_var(var_t *var) { - return write_typeformatstring_var(NULL, 0, var); + return write_typeformatstring_type(NULL, 0, var->type, var->ptr_level, + var->array, var->name); }

1 0

Robert Shearman : widl: Handle marshaling and unmarshaling structures.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 7fb311b49f3c86ee78e4be97bbfee66e3ecc46b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7fb311b49f3c86ee78e4be9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:22:05 2005 +0100 widl: Handle marshaling and unmarshaling structures. --- tools/widl/typegen.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1ed4ec7..f1f791d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -428,11 +428,32 @@ void marshall_arguments(FILE *file, int } else { + const char *ndrtype; + switch (var->type->type) { + case RPC_FC_STRUCT: + ndrtype = "SimpleStruct"; + break; + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + ndrtype = "ConformantStruct"; + break; + case RPC_FC_CVSTRUCT: + ndrtype = "ConformantVaryingStruct"; + break; + case RPC_FC_BOGUS_STRUCT: + ndrtype = "ComplexStruct"; + break; default: - error("marshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + error("marshall_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", + var->name, var->type->type, var->ptr_level); + ndrtype = NULL; } + + print_file(file, indent, + "Ndr%sMarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", + ndrtype, var->name, *type_offset); } last_size = 1; } @@ -583,12 +604,32 @@ void unmarshall_arguments(FILE *file, in } else { + const char *ndrtype; + switch (var->type->type) { + case RPC_FC_STRUCT: + ndrtype = "SimpleStruct"; + break; + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + ndrtype = "ConformantStruct"; + break; + case RPC_FC_CVSTRUCT: + ndrtype = "ConformantVaryingStruct"; + break; + case RPC_FC_BOGUS_STRUCT: + ndrtype = "ComplexStruct"; + break; default: error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", var->name, var->type->type, var->ptr_level); + ndrtype = NULL; } + + print_file(file, indent, + "Ndr%sUnmarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d], 0);\n", + ndrtype, var->name, *type_offset); } last_size = 1; }

1 0

Robert Shearman : widl: Out parameters.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 4acabfd719b18e6529995ad9c961c0fa0ed55541 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4acabfd719b18e6529995ad… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:21:38 2005 +0100 widl: Out parameters. Marshall and unmarshall out parameters for servers and clients respectively. Write out array components for declared local variables in generated server code. --- tools/widl/client.c | 2 ++ tools/widl/header.c | 2 +- tools/widl/header.h | 1 + tools/widl/server.c | 3 +++ 4 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 2c85e4a..f2d8ea2 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -210,6 +210,8 @@ static void write_function_stubs(type_t print_client("_StubMsg.BufferStart = (unsigned char *)_RpcMessage.Buffer;\n"); print_client("_StubMsg.BufferEnd = _StubMsg.BufferStart + _RpcMessage.BufferLength;\n\n"); + unmarshall_arguments(client, indent, func, &type_offset, PASS_OUT); + /* unmarshal return value */ if (!is_void(def->type, NULL)) { diff --git a/tools/widl/header.c b/tools/widl/header.c index b60cf8e..3b85adb 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -115,7 +115,7 @@ const char* get_name(const var_t *v) return v->name; } -static void write_array(FILE *h, const expr_t *v, int field) +void write_array(FILE *h, const expr_t *v, int field) { if (!v) return; while (NEXT_LINK(v)) v = NEXT_LINK(v); diff --git a/tools/widl/header.h b/tools/widl/header.h index 8adf929..de38a70 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -32,6 +32,7 @@ extern int is_object(attr_t *a); extern int is_local(attr_t *a); extern var_t *is_callas(attr_t *a); extern void write_args(FILE *h, var_t *arg, const char *name, int obj, int do_indent); +extern void write_array(FILE *h, const expr_t *v, int field); extern void write_forward(type_t *iface); extern void write_interface(type_t *iface); extern void write_dispinterface(type_t *iface); diff --git a/tools/widl/server.c b/tools/widl/server.c index ca4d0bd..61c688a 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -153,6 +153,7 @@ static void write_function_stubs(type_t write_type(server, var->type, var, var->tname); fprintf(server, " "); write_name(server, var); + write_array(server, var->array, 0); fprintf(server, ";\n"); var = PREV_LINK(var); @@ -293,6 +294,8 @@ static void write_function_stubs(type_t fprintf(server, "\n"); } + marshall_arguments(server, indent, func, &type_offset, PASS_OUT); + /* marshall the return value */ if (!is_void(def->type, NULL)) {

1 0

Robert Shearman : widl: Remove some duplication.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: e0dd7b6ed862b551e8e57ae115087b51af277ab1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0dd7b6ed862b551e8e57ae… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:20:59 2005 +0100 widl: Remove some duplication. Remove some duplicated code by calling an improved get_required_buffer_size. Add some more newlines in the generated code to separate separate stages. Calculate the buffer size of [out] arguments in generated server code. Fix the direction passed into unmarshall_arguments. --- tools/widl/client.c | 46 +++++++--------------------------------------- tools/widl/server.c | 34 +++++++++++++++++++++++++++++++--- tools/widl/typegen.c | 23 +++++++++++++++++------ tools/widl/typegen.h | 2 +- 4 files changed, 56 insertions(+), 49 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 7bb5658..2c85e4a 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -76,43 +76,11 @@ static void print_message_buffer_size(fu while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - unsigned int alignment = 8; - - switch (var->type->type) - { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_USMALL: - case RPC_FC_SMALL: - total_size += 1; - alignment = 1; - break; - - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - total_size += 2 + alignment % 2; - alignment = 2; - break; - - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - case RPC_FC_ERROR_STATUS_T: - total_size += 4 + alignment % 4; - alignment = 4; - break; - - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - total_size += 8 + alignment % 8; - alignment = 8; - break; - - default: - alignment = 1; - } - + unsigned int alignment; + + total_size += get_required_buffer_size(var, &alignment); + total_size += alignment; + var = PREV_LINK(var); } } @@ -236,11 +204,11 @@ static void write_function_stubs(type_t print_client("NdrSendReceive(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(unsigned char *)_StubMsg.Buffer);\n"); + print_client("(unsigned char *)_StubMsg.Buffer);\n\n"); indent--; print_client("_StubMsg.BufferStart = (unsigned char *)_RpcMessage.Buffer;\n"); - print_client("_StubMsg.BufferEnd = _StubMsg.BufferStart + _RpcMessage.BufferLength;\n"); + print_client("_StubMsg.BufferEnd = _StubMsg.BufferStart + _RpcMessage.BufferLength;\n\n"); /* unmarshal return value */ if (!is_void(def->type, NULL)) diff --git a/tools/widl/server.c b/tools/widl/server.c index e62acce..ca4d0bd 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -101,6 +101,7 @@ static void write_function_stubs(type_t while (func) { var_t *def = func->def; + unsigned long buffer_size = 0; /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); @@ -198,7 +199,7 @@ static void write_function_stubs(type_t indent -= 2; fprintf(server, "\n"); - unmarshall_arguments(server, indent, func, &type_offset, PASS_OUT); + unmarshall_arguments(server, indent, func, &type_offset, PASS_IN); } print_server("if (_StubMsg.Buffer > _StubMsg.BufferEnd)\n"); @@ -252,11 +253,34 @@ static void write_function_stubs(type_t fprintf(server, "();\n"); } - /* marshall the return value */ + if (func->args) + { + var_t *var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (is_attr(var->attrs, ATTR_OUT)) + { + unsigned int alignment; + buffer_size += get_required_buffer_size(var, &alignment); + buffer_size += alignment; + } + + var = PREV_LINK(var); + } + } + if (!is_void(def->type, NULL)) { + unsigned int alignment; + buffer_size += get_required_buffer_size(def, &alignment); + buffer_size += alignment; + } + + if (buffer_size) + { fprintf(server, "\n"); - print_server("_StubMsg.BufferLength = %uU;\n", get_required_buffer_size(def->type)); + print_server("_StubMsg.BufferLength = %uU;\n", buffer_size); print_server("_pRpcMessage->BufferLength = _StubMsg.BufferLength;\n"); fprintf(server, "\n"); print_server("_Status = I_RpcGetBuffer(_pRpcMessage);\n"); @@ -267,7 +291,11 @@ static void write_function_stubs(type_t fprintf(server, "\n"); print_server("_StubMsg.Buffer = (unsigned char *)_pRpcMessage->Buffer;\n"); fprintf(server, "\n"); + } + /* marshall the return value */ + if (!is_void(def->type, NULL)) + { print_server("*("); write_type(server, def->type, def, def->tname); fprintf(server, " *)_StubMsg.Buffer = _RetVal;\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5248689..1ed4ec7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -253,32 +253,43 @@ void write_typeformatstring(FILE *file, } -unsigned int get_required_buffer_size(type_t *type) +unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment) { - switch(type->type) + *alignment = 0; + if (var->ptr_level == 0 && !var->array) { + switch (var->type->type) + { case RPC_FC_BYTE: case RPC_FC_CHAR: + case RPC_FC_USMALL: + case RPC_FC_SMALL: + return 1; + case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: - case RPC_FC_USMALL: - case RPC_FC_SMALL: + *alignment = 2; + return 2; + case RPC_FC_ULONG: case RPC_FC_LONG: case RPC_FC_FLOAT: - case RPC_FC_IGNORE: case RPC_FC_ERROR_STATUS_T: + *alignment = 4; return 4; case RPC_FC_HYPER: case RPC_FC_DOUBLE: + *alignment = 8; return 8; default: - error("Unknown/unsupported type: %s (0x%02x)\n", type->name, type->type); + error("get_required_buffer_size: Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); return 0; + } } + return 0; } void marshall_arguments(FILE *file, int indent, func_t *func, diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index e494383..2660400 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -29,7 +29,7 @@ enum pass void write_procformatstring(FILE *file, type_t *iface); void write_typeformatstring(FILE *file, type_t *iface); -unsigned int get_required_buffer_size(type_t *type); +unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment); void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass); void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass); size_t get_size_procformatstring_var(var_t *var);

1 0

Robert Shearman : widl: Pass a state into marshall_arguments and unmarshall_arguments to
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 7e5cf94f13e44b3e287958b3973ce6c587dc7759 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e5cf94f13e44b3e287958b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:14:28 2005 +0100 widl: Pass a state into marshall_arguments and unmarshall_arguments to decide which parameters should be considered based on their direction. --- tools/widl/client.c | 2 +- tools/widl/server.c | 2 +- tools/widl/typegen.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- tools/widl/typegen.h | 11 +++++++++-- 4 files changed, 55 insertions(+), 6 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 56b8f91..7bb5658 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -227,7 +227,7 @@ static void write_function_stubs(type_t /* marshal arguments */ - marshall_arguments(client, indent, func, &type_offset); + marshall_arguments(client, indent, func, &type_offset, PASS_IN); /* send/receive message */ /* print_client("NdrNsSendReceive(\n"); */ diff --git a/tools/widl/server.c b/tools/widl/server.c index 005d85b..e62acce 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -198,7 +198,7 @@ static void write_function_stubs(type_t indent -= 2; fprintf(server, "\n"); - unmarshall_arguments(server, indent, func, &type_offset); + unmarshall_arguments(server, indent, func, &type_offset, PASS_OUT); } print_server("if (_StubMsg.Buffer > _StubMsg.BufferEnd)\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1cf6c2d..5248689 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -281,7 +281,8 @@ unsigned int get_required_buffer_size(ty } } -void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset) +void marshall_arguments(FILE *file, int indent, func_t *func, + unsigned int *type_offset, enum pass pass) { unsigned int last_size = 0; var_t *var; @@ -293,6 +294,26 @@ void marshall_arguments(FILE *file, int while (NEXT_LINK(var)) var = NEXT_LINK(var); for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) { + int in_attr = is_attr(var->attrs, ATTR_IN); + int out_attr = is_attr(var->attrs, ATTR_OUT); + + if (!in_attr && !out_attr) + in_attr = 1; + + switch (pass) + { + case PASS_IN: + if (!in_attr) + continue; + break; + case PASS_OUT: + if (!out_attr) + continue; + break; + case PASS_RETURN: + break; + } + if (var->ptr_level == 0 && !var->array) { unsigned int size; @@ -413,7 +434,8 @@ void marshall_arguments(FILE *file, int } } -void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset) +void unmarshall_arguments(FILE *file, int indent, func_t *func, + unsigned int *type_offset, enum pass pass) { unsigned int last_size = 0; var_t *var; @@ -425,6 +447,26 @@ void unmarshall_arguments(FILE *file, in while (NEXT_LINK(var)) var = NEXT_LINK(var); for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) { + int in_attr = is_attr(var->attrs, ATTR_IN); + int out_attr = is_attr(var->attrs, ATTR_OUT); + + if (!in_attr && !out_attr) + in_attr = 1; + + switch (pass) + { + case PASS_IN: + if (!in_attr) + continue; + break; + case PASS_OUT: + if (!out_attr) + continue; + break; + case PASS_RETURN: + break; + } + if (var->ptr_level == 0 && !var->array) { unsigned int size; diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index c444132..e494383 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -20,10 +20,17 @@ */ +enum pass +{ + PASS_IN, + PASS_OUT, + PASS_RETURN +}; + void write_procformatstring(FILE *file, type_t *iface); void write_typeformatstring(FILE *file, type_t *iface); unsigned int get_required_buffer_size(type_t *type); -void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset); -void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset); +void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass); +void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass); size_t get_size_procformatstring_var(var_t *var); size_t get_size_typeformatstring_var(var_t *var);

1 0

Robert Shearman : widl: Generate marshaling and unmarshaling statements for arrays.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 24d1b71d918cbbe1e9fb0608d852a5c735a720b1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24d1b71d918cbbe1e9fb060… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:13:41 2005 +0100 widl: Generate marshaling and unmarshaling statements for arrays. --- tools/widl/typegen.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 62 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c68c4a6..1cf6c2d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -351,8 +351,8 @@ void marshall_arguments(FILE *file, int last_size = size; } - else if (var->ptr_level == 1 || - (var->ptr_level == 0 && var->array && !NEXT_LINK(var->array))) + else if ((var->ptr_level == 1 && !var->array) || + (var->ptr_level == 0 && var->array)) { if (is_attr(var->attrs, ATTR_STRING)) { @@ -368,6 +368,32 @@ void marshall_arguments(FILE *file, int error("marshall_arguments: Unsupported [string] type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); } } + else if (var->array) + { + const expr_t *length_is = get_attrp(var->attrs, ATTR_LENGTHIS); + const expr_t *size_is = get_attrp(var->attrs, ATTR_SIZEIS); + const char *array_type; + int has_length = length_is && (length_is->type != EXPR_VOID); + int has_size = size_is && (size_is->type != EXPR_VOID) && !var->array->is_const; + + if (NEXT_LINK(var->array)) /* multi-dimensional array */ + array_type = "ComplexArray"; + else + { + if (!has_length && !has_size) + array_type = "FixedArray"; + else if (has_length && !has_size) + array_type = "VaryingArray"; + else if (!has_length && has_size) + array_type = "ConformantArray"; + else + array_type = "ConformantVaryingArray"; + } + + print_file(file, indent, + "Ndr%sMarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", + array_type, var->name, *type_offset); + } else { switch (var->type->type) @@ -383,6 +409,7 @@ void marshall_arguments(FILE *file, int error("marshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); last_size = 1; } + fprintf(file, "\n"); } } @@ -457,8 +484,8 @@ void unmarshall_arguments(FILE *file, in last_size = size; } - else if (var->ptr_level == 1 || - (var->ptr_level == 0 && var->array && !NEXT_LINK(var->array))) + else if ((var->ptr_level == 1 && !var->array) || + (var->ptr_level == 0 && var->array)) { if (is_attr(var->attrs, ATTR_STRING)) { @@ -471,15 +498,43 @@ void unmarshall_arguments(FILE *file, in var->name, *type_offset); break; default: - error("unmarshall_arguments: Unsupported [string] type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + error("unmarshall_arguments: Unsupported [string] type: %s (0x%02x, ptr_level: %d)\n", + var->name, var->type->type, var->ptr_level); } } + else if (var->array) + { + const expr_t *length_is = get_attrp(var->attrs, ATTR_LENGTHIS); + const expr_t *size_is = get_attrp(var->attrs, ATTR_SIZEIS); + const char *array_type; + int has_length = length_is && (length_is->type != EXPR_VOID); + int has_size = size_is && (size_is->type != EXPR_VOID) && !var->array->is_const; + + if (NEXT_LINK(var->array)) /* multi-dimensional array */ + array_type = "ComplexArray"; + else + { + if (!has_length && !has_size) + array_type = "FixedArray"; + else if (has_length && !has_size) + array_type = "VaryingArray"; + else if (!has_length && has_size) + array_type = "ConformantArray"; + else + array_type = "ConformantVaryingArray"; + } + + print_file(file, indent, + "Ndr%sUnmarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d], 0);\n", + array_type, var->name, *type_offset); + } else { switch (var->type->type) { default: - error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", + var->name, var->type->type, var->ptr_level); } } last_size = 1; @@ -489,6 +544,7 @@ void unmarshall_arguments(FILE *file, in error("unmarshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); last_size = 1; } + fprintf(file, "\n"); } }

1 0

Robert Shearman : widl: Treat variables with array indices the same as pointers.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 25116ae360012e7568e091fd790eaf676e1d1ef9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25116ae360012e7568e091f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:13:04 2005 +0100 widl: Treat variables with array indices the same as pointers. --- tools/widl/typegen.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d20f566..c68c4a6 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -293,7 +293,7 @@ void marshall_arguments(FILE *file, int while (NEXT_LINK(var)) var = NEXT_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 alignment = 0; @@ -351,7 +351,8 @@ void marshall_arguments(FILE *file, int 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)) { @@ -397,7 +398,7 @@ void unmarshall_arguments(FILE *file, in while (NEXT_LINK(var)) var = NEXT_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 alignment = 0; @@ -456,7 +457,8 @@ void unmarshall_arguments(FILE *file, in 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)) {

1 0

Robert Shearman : widl: Advance the type format string whilst marshaling and
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: c0f4605b82528e5c27e2e07598fb848d7a296b91 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0f4605b82528e5c27e2e07… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:12:46 2005 +0100 widl: Advance the type format string whilst marshaling and unmarshaling arguments. --- tools/widl/typegen.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f082b8c..d20f566 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -291,7 +291,7 @@ void marshall_arguments(FILE *file, int var = func->args; while (NEXT_LINK(var)) var = NEXT_LINK(var); - for (; var; var = PREV_LINK(var)) + for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) { if (var->ptr_level == 0) { @@ -395,7 +395,7 @@ void unmarshall_arguments(FILE *file, in var = func->args; while (NEXT_LINK(var)) var = NEXT_LINK(var); - for (; var; var = PREV_LINK(var)) + for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) { if (var->ptr_level == 0) {

1 0

Robert Shearman : widl: Convert the main while loops in marshall_arguments and
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: c8703d17b0b6c1fd672f557a085f0bb6b37a7b79 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8703d17b0b6c1fd672f557… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:12:26 2005 +0100 widl: Convert the main while loops in marshall_arguments and unmarshall_arguments into for loops. --- tools/widl/typegen.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 48c18b4..f082b8c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -291,7 +291,7 @@ void marshall_arguments(FILE *file, int var = func->args; while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + for (; var; var = PREV_LINK(var)) { if (var->ptr_level == 0) { @@ -382,8 +382,6 @@ void marshall_arguments(FILE *file, int error("marshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); last_size = 1; } - - var = PREV_LINK(var); } } @@ -397,7 +395,7 @@ void unmarshall_arguments(FILE *file, in var = func->args; while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + for (; var; var = PREV_LINK(var)) { if (var->ptr_level == 0) { @@ -489,8 +487,6 @@ void unmarshall_arguments(FILE *file, in error("unmarshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); last_size = 1; } - - var = PREV_LINK(var); } }

1 0