March 2006 - Wine-Commits - list.winehq.org

Robert Shearman : widl: Create the correct variable type for parameters with more than one level of indirection .
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: d82bb4ade916e3928537ba509090214d7a347618 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d82bb4ade916e3928537ba5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:49:57 2006 +0100 widl: Create the correct variable type for parameters with more than one level of indirection. --- tools/widl/server.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 8261dc7..b3c8c65 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -108,8 +108,11 @@ static void declare_args(const func_t *f if (!in_attr && !is_attr(var->attrs, ATTR_STRING)) { + int indirection; print_server(""); write_type(server, var->type, NULL, var->tname); + for (indirection = 0; indirection < var->ptr_level - 1; indirection++) + fprintf(server, "*"); fprintf(server, " _W%u;\n", i++); }

1 0

Robert Shearman : widl: Re-use print_phase_basetype for generating return value marshaling and unmarshaling code .
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: 27c3222715999782ece21eaa33427bf97ac04a2b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27c3222715999782ece21ea… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:49:36 2006 +0100 widl: Re-use print_phase_basetype for generating return value marshaling and unmarshaling code. --- tools/widl/client.c | 10 +--------- tools/widl/server.c | 13 +------------ tools/widl/typegen.h | 1 + 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index ee8a625..355da9b 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -272,15 +272,7 @@ static void write_function_stubs(type_t /* unmarshal return value */ if (!is_void(def->type, NULL)) - { - fprintf(client, "\n"); - print_client("_RetVal = *("); - write_type(client, def->type, def, def->tname); - fprintf(client, " *)_StubMsg.Buffer;\n"); - print_client("_StubMsg.Buffer += sizeof("); - write_type(client, def->type, def, def->tname); - fprintf(client, ");\n"); - } + print_phase_basetype(client, indent, PHASE_UNMARSHAL, PASS_RETURN, def, "_RetVal"); /* update proc_offset */ if (func->args) diff --git a/tools/widl/server.c b/tools/widl/server.c index d7a2d7e..8261dc7 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -388,18 +388,7 @@ static void write_function_stubs(type_t /* marshall the return value */ if (!is_void(def->type, NULL)) - { - unsigned int alignment; - unsigned int size = get_required_buffer_size(def, &alignment); - print_server("_StubMsg.Buffer += (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", - size - 1, size - 1); - print_server("*("); - write_type(server, def->type, def, def->tname); - fprintf(server, " *)_StubMsg.Buffer = _RetVal;\n"); - print_server("_StubMsg.Buffer += sizeof("); - write_type(server, def->type, def, def->tname); - fprintf(server, ");\n"); - } + print_phase_basetype(server, indent, PHASE_MARSHAL, PASS_RETURN, def, "_RetVal"); indent--; print_server("}\n"); diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 61e317c..ee2179c 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -39,6 +39,7 @@ void write_procformatstring(FILE *file, void write_typeformatstring(FILE *file, type_t *iface); size_t get_type_memsize(const type_t *type); unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment); +void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, enum pass pass, const var_t *var, const char *varname); void write_remoting_arguments(FILE *file, int indent, const func_t *func, unsigned int *type_offset, enum pass pass, enum remoting_phase phase); size_t get_size_procformatstring_var(const var_t *var); size_t get_size_typeformatstring_var(const var_t *var);

1 0

Robert Shearman : widl: Move handling of base type marshaling and unmarshaling to a separate function .
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: 3e065ab342019a934131705bb4988b13f22b1563 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3e065ab342019a934131705… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:48:24 2006 +0100 widl: Move handling of base type marshaling and unmarshaling to a separate function. Move handling of base type marshaling and unmarshaling to a separate function and improve it to support return values. --- tools/widl/typegen.c | 228 ++++++++++++++++++++------------------------------ 1 files changed, 92 insertions(+), 136 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 786217f..ed47c04 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1433,6 +1433,96 @@ static void print_phase_function(FILE *f indent--; } +void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, + enum pass pass, const var_t *var, + const char *varname) +{ + const type_t *type = var->type; + unsigned int size; + unsigned int alignment = 0; + + /* no work to do for other phases, buffer sizing is done elsewhere */ + if (phase != PHASE_MARSHAL && phase != PHASE_UNMARSHAL) + return; + + while (type_has_ref(type)) + type = type->ref; + + switch (type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + size = 1; + alignment = 1; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + alignment = 2; + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + case RPC_FC_ERROR_STATUS_T: + size = 4; + alignment = 4; + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + alignment = 8; + break; + + case RPC_FC_IGNORE: + case RPC_FC_BIND_PRIMITIVE: + /* no marshalling needed */ + return; + + default: + error("print_phase_basetype: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, type->type); + size = 0; + } + + print_file(file, indent, "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", + alignment - 1, alignment - 1); + + if (phase == PHASE_MARSHAL) + { + print_file(file, indent, "*("); + write_type(file, var->type, NULL, var->tname); + if (var->ptr_level) + fprintf(file, " *)_StubMsg.Buffer = *"); + else + fprintf(file, " *)_StubMsg.Buffer = "); + fprintf(file, varname); + fprintf(file, ";\n"); + } + else if (phase == PHASE_UNMARSHAL) + { + if (pass == PASS_IN || pass == PASS_RETURN) + print_file(file, indent, ""); + else + print_file(file, indent, "*"); + fprintf(file, varname); + if (pass == PASS_IN && var->ptr_level) + fprintf(file, " = ("); + else + fprintf(file, " = *("); + write_type(file, var->type, NULL, var->tname); + fprintf(file, " *)_StubMsg.Buffer;\n"); + } + + print_file(file, indent, "_StubMsg.Buffer += sizeof("); + write_type(file, var->type, NULL, var->tname); + fprintf(file, ");\n"); +} + /* returns whether the MaxCount, Offset or ActualCount members need to be * filled in for the specified phase */ static inline int is_size_needed_for_phase(enum remoting_phase phase) @@ -1559,77 +1649,7 @@ void write_remoting_arguments(FILE *file } else if (var->ptr_level == 0 && is_base_type(type->type)) { - unsigned int size; - unsigned int alignment = 0; - switch (type->type) - { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - case RPC_FC_USMALL: - size = 1; - alignment = 1; - break; - - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - alignment = 2; - break; - - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - case RPC_FC_ERROR_STATUS_T: - size = 4; - alignment = 4; - break; - - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - alignment = 8; - break; - - case RPC_FC_IGNORE: - case RPC_FC_BIND_PRIMITIVE: - /* no marshalling needed */ - continue; - - default: - error("write_remoting_arguments: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, type->type); - size = 0; - } - - if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) - { - print_file(file, indent, "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", - alignment - 1, alignment - 1); - - if (phase == PHASE_MARSHAL) - { - print_file(file, indent, "*("); - write_type(file, var->type, var, var->tname); - fprintf(file, " *)_StubMsg.Buffer = "); - write_name(file, var); - fprintf(file, ";\n"); - } - else if (phase == PHASE_UNMARSHAL) - { - print_file(file, indent, ""); - write_name(file, var); - fprintf(file, " = *("); - write_type(file, var->type, var, var->tname); - fprintf(file, " *)_StubMsg.Buffer;\n"); - } - else - error("write_remoting_arguments: Unimplemented for base types for phase %d\n", phase); - - print_file(file, indent, "_StubMsg.Buffer += sizeof("); - write_type(file, var->type, var, var->tname); - fprintf(file, ");\n"); - } + print_phase_basetype(file, indent, phase, pass, var, var->name); } else if (var->ptr_level == 0) { @@ -1662,71 +1682,7 @@ void write_remoting_arguments(FILE *file { if ((var->ptr_level == 1) && (pointer_type == RPC_FC_RP) && is_base_type(type->type)) { - unsigned int size; - switch (type->type) - { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - case RPC_FC_USMALL: - size = 1; - break; - - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - break; - - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - case RPC_FC_ERROR_STATUS_T: - size = 4; - break; - - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - break; - - case RPC_FC_IGNORE: - case RPC_FC_BIND_PRIMITIVE: - /* no marshalling needed */ - continue; - - default: - error("write_remoting_arguments: Unsupported type: %s (0x%02x, ptr_level: 1)\n", var->name, type->type); - size = 0; - } - - if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) - { - print_file(file, indent, - "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", - size - 1, size - 1); - - if (phase == PHASE_MARSHAL) - { - print_file(file, indent, "*("); - write_type(file, var->type, NULL, var->tname); - fprintf(file, " *)_StubMsg.Buffer = *"); - write_name(file, var); - fprintf(file, ";\n"); - } - else if (phase == PHASE_UNMARSHAL) - { - print_file(file, indent, (pass == PASS_IN) ? "" : "*"); - write_name(file, var); - fprintf(file, (pass == PASS_IN) ? " = (" : " = *("); - write_type(file, var->type, NULL, var->tname); - fprintf(file, " *)_StubMsg.Buffer;\n"); - } - - print_file(file, indent, "_StubMsg.Buffer += sizeof("); - write_type(file, var->type, NULL, var->tname); - fprintf(file, ");\n"); - } + print_phase_basetype(file, indent, phase, pass, var, var->name); } else {

1 0

Robert Shearman : widl: Use print_phase_function for printing NdrPointerFree call.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: eb000448a0f816e5d2acf6643355753e9d7b86ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb000448a0f816e5d2acf66… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:47:50 2006 +0100 widl: Use print_phase_function for printing NdrPointerFree call. --- tools/widl/typegen.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a284557..786217f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1501,20 +1501,11 @@ void write_remoting_arguments(FILE *file fprintf(file, ";\n"); } + /* FIXME: these can't both be correct */ if (phase == PHASE_FREE) - { - print_file(file, indent, "NdrPointerFree(\n"); - indent++; - print_file(file, indent, "&_StubMsg,\n"); - print_file(file, indent, "(unsigned char *)%s,\n", var->name); - print_file(file, indent, "&__MIDL_TypeFormatString.Format[%d]);\n", - *type_offset); - indent--; - } + print_phase_function(file, indent, "Pointer", phase, var->name, *type_offset); else - { print_phase_function(file, indent, "ConformantString", phase, var->name, *type_offset); - } } } else if (is_array_type(var->attrs, var->ptr_level, var->array))

1 0

Robert Shearman : widl: Add a function to generate the Ndr type calls.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: 04632f6ab716c4089f6d3e399d0a516f5c209107 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04632f6ab716c4089f6d3e3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:47:35 2006 +0100 widl: Add a function to generate the Ndr type calls. - Add a function to generate the Ndr type calls. - Fix a typo where the aligned buffer was added to itself, rather than assigned. --- tools/widl/typegen.c | 69 ++++++++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 36 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d31110a..a284557 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1396,20 +1396,41 @@ unsigned int get_required_buffer_size(co return get_required_buffer_size_type(var->type, var->ptr_level, var->array, var->name, alignment); } -static inline const char *function_from_phase(enum remoting_phase phase) +static void print_phase_function(FILE *file, int indent, const char *type, + enum remoting_phase phase, + const char *varname, unsigned int type_offset) { + const char *function; switch (phase) { case PHASE_BUFFERSIZE: - return "BufferSize"; + function = "BufferSize"; + break; case PHASE_MARSHAL: - return "Marshall"; + function = "Marshall"; + break; case PHASE_UNMARSHAL: - return "Unmarshall"; + function = "Unmarshall"; + break; case PHASE_FREE: - return "Free"; + function = "Free"; + break; + default: + assert(0); + return; } - return NULL; + + print_file(file, indent, "Ndr%s%s(\n", type, function); + indent++; + print_file(file, indent, "(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_file(file, indent, "%s%s,\n", + (phase == PHASE_UNMARSHAL) ? "(unsigned char **)&" : "(unsigned char *)", + varname); + print_file(file, indent, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]%s\n", + type_offset, (phase == PHASE_UNMARSHAL) ? "," : ");"); + if (phase == PHASE_UNMARSHAL) + print_file(file, indent, "0);\n"); + indent--; } /* returns whether the MaxCount, Offset or ActualCount members need to be @@ -1470,9 +1491,7 @@ void write_remoting_arguments(FILE *file if (is_string_type(var->attrs, var->ptr_level, var->array)) { if (var->array && var->array->is_const) - print_file(file, indent, - "NdrNonConformantString%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", - function_from_phase(phase), var->name, *type_offset); + print_phase_function(file, indent, "NonConformantString", phase, var->name, *type_offset); else { if (size_is && is_size_needed_for_phase(phase)) @@ -1494,16 +1513,7 @@ void write_remoting_arguments(FILE *file } else { - print_file(file, indent, "NdrConformantString%s(\n", function_from_phase(phase)); - indent++; - print_file(file, indent, "(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_file(file, indent, "(unsigned char *)%s,\n", var->name); - print_file(file, indent, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]%s\n", - *type_offset + (has_size ? 4 : 2), - (phase == PHASE_MARSHAL) ? ");" : ","); - if (phase == PHASE_UNMARSHAL) - print_file(file, indent, "(unsigned char)0);\n"); - indent--; + print_phase_function(file, indent, "ConformantString", phase, var->name, *type_offset); } } } @@ -1554,10 +1564,7 @@ void write_remoting_arguments(FILE *file } } - print_file(file, indent, - "Ndr%s%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", - array_type, function_from_phase(phase), var->name, - *type_offset); + print_phase_function(file, indent, array_type, phase, var->name, *type_offset); } else if (var->ptr_level == 0 && is_base_type(type->type)) { @@ -1606,7 +1613,7 @@ void write_remoting_arguments(FILE *file if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) { - print_file(file, indent, "_StubMsg.Buffer += (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", + print_file(file, indent, "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", alignment - 1, alignment - 1); if (phase == PHASE_MARSHAL) @@ -1658,9 +1665,7 @@ void write_remoting_arguments(FILE *file ndrtype = NULL; } - print_file(file, indent, - "Ndr%s%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", - ndrtype, function_from_phase(phase), var->name, *type_offset); + print_phase_function(file, indent, ndrtype, phase, var->name, *type_offset); } else { @@ -1734,15 +1739,7 @@ void write_remoting_arguments(FILE *file } else { - print_file(file, indent, "NdrPointer%s(\n", function_from_phase(phase)); - indent++; - print_file(file, indent, "(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_file(file, indent, "(unsigned char *)%s,\n", var->name); - print_file(file, indent, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]%s\n", - *type_offset, (phase == PHASE_MARSHAL) ? ");" : ","); - if (phase == PHASE_UNMARSHAL) - print_file(file, indent, "(unsigned char *)0);\n"); - indent--; + print_phase_function(file, indent, "Pointer", phase, var->name, *type_offset); } } fprintf(file, "\n");

1 0

Robert Shearman : widl: Only write the buffer incrementing code for the marshaling and unmarshaling phases .
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: 96f6a22ece54672c9e232d388c803646daab5881 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96f6a22ece54672c9e232d3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:47:22 2006 +0100 widl: Only write the buffer incrementing code for the marshaling and unmarshaling phases. Only write the buffer incrementing code for the marshaling and unmarshaling phases - buffer sizing is handled elsewhere and freeing isn't applicable. --- tools/widl/typegen.c | 45 ++++++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 21 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 096173f..d31110a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1704,30 +1704,33 @@ void write_remoting_arguments(FILE *file size = 0; } - print_file(file, indent, - "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", - size - 1, size - 1); - - if (phase == PHASE_MARSHAL) - { - print_file(file, indent, "*("); - write_type(file, var->type, NULL, var->tname); - fprintf(file, " *)_StubMsg.Buffer = *"); - write_name(file, var); - fprintf(file, ";\n"); - } - else if (phase == PHASE_UNMARSHAL) + if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) { - print_file(file, indent, (pass == PASS_IN) ? "" : "*"); - write_name(file, var); - fprintf(file, (pass == PASS_IN) ? " = (" : " = *("); + print_file(file, indent, + "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", + size - 1, size - 1); + + if (phase == PHASE_MARSHAL) + { + print_file(file, indent, "*("); + write_type(file, var->type, NULL, var->tname); + fprintf(file, " *)_StubMsg.Buffer = *"); + write_name(file, var); + fprintf(file, ";\n"); + } + else if (phase == PHASE_UNMARSHAL) + { + print_file(file, indent, (pass == PASS_IN) ? "" : "*"); + write_name(file, var); + fprintf(file, (pass == PASS_IN) ? " = (" : " = *("); + write_type(file, var->type, NULL, var->tname); + fprintf(file, " *)_StubMsg.Buffer;\n"); + } + + print_file(file, indent, "_StubMsg.Buffer += sizeof("); write_type(file, var->type, NULL, var->tname); - fprintf(file, " *)_StubMsg.Buffer;\n"); + fprintf(file, ");\n"); } - - print_file(file, indent, "_StubMsg.Buffer += sizeof("); - write_type(file, var->type, NULL, var->tname); - fprintf(file, ");\n"); } else {

1 0

Robert Shearman : widl: Output the necessary sizing information for other phases.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: 226c8f6b5215ec998fb48ee109d3dae745eb0d6e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=226c8f6b5215ec998fb48ee… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:47:08 2006 +0100 widl: Output the necessary sizing information for other phases. Output the necessary sizing information for PHASE_BUFFERSIZE and PHASE_FREE as well as PHASE_MARSHAL. Standardise this rule in a new function. --- tools/widl/typegen.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e92985c..096173f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1412,6 +1412,13 @@ static inline const char *function_from_ return NULL; } +/* returns whether the MaxCount, Offset or ActualCount members need to be + * filled in for the specified phase */ +static inline int is_size_needed_for_phase(enum remoting_phase phase) +{ + return (phase != PHASE_UNMARSHAL); +} + void write_remoting_arguments(FILE *file, int indent, const func_t *func, unsigned int *type_offset, enum pass pass, enum remoting_phase phase) @@ -1468,7 +1475,7 @@ void write_remoting_arguments(FILE *file function_from_phase(phase), var->name, *type_offset); else { - if (size_is && phase != PHASE_UNMARSHAL) + if (size_is && is_size_needed_for_phase(phase)) { print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); write_expr(file, size_is, 1); @@ -1512,7 +1519,7 @@ void write_remoting_arguments(FILE *file array_type = "FixedArray"; else if (has_length && !has_size) { - if (phase == PHASE_MARSHAL) + if (is_size_needed_for_phase(phase)) { print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); @@ -1523,7 +1530,7 @@ void write_remoting_arguments(FILE *file } else if (!has_length && has_size) { - if (phase == PHASE_MARSHAL) + if (is_size_needed_for_phase(phase)) { print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); write_expr(file, size_is ? size_is : var->array, 1); @@ -1533,7 +1540,7 @@ void write_remoting_arguments(FILE *file } else { - if (phase == PHASE_MARSHAL) + if (is_size_needed_for_phase(phase)) { print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); write_expr(file, size_is ? size_is : var->array, 1);

1 0

Robert Shearman : widl: Output NULL ref pointer check for pointer levels > 1 too.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: 4a67201b703d9d71f2b57d7d24ab3ed27071cf8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a67201b703d9d71f2b57d7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:46:56 2006 +0100 widl: Output NULL ref pointer check for pointer levels > 1 too. --- tools/widl/client.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index c9e99fb..ee8a625 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -105,7 +105,7 @@ static void check_pointers(const func_t if (pointer_type == RPC_FC_RP) { - if (var->ptr_level == 1) + if (var->ptr_level >= 1) { print_client("if (!%s)\n", var->name); print_client("{\n"); @@ -114,11 +114,6 @@ static void check_pointers(const func_t indent--; print_client("}\n\n"); } - else if (var->ptr_level > 1) - { - error("Pointer level %d not supported!\n", var->ptr_level); - return; - } } var = PREV_LINK(var);

1 0

Robert Shearman : widl: Fix a GCC warning in the generated client and server code.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: 73ff576554dc309b357a945433e703dbfba4f787 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73ff576554dc309b357a945… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:46:28 2006 +0100 widl: Fix a GCC warning in the generated client and server code. --- tools/widl/client.c | 4 ++++ tools/widl/server.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 528ffbf..c9e99fb 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -360,10 +360,14 @@ static void write_stubdescriptor(type_t print_client("(void *)& %s___RpcClientInterface,\n", iface->name); print_client("MIDL_user_allocate,\n"); print_client("MIDL_user_free,\n"); + print_client("{\n"); + indent++; if (implicit_handle) print_client("&%s,\n", implicit_handle); else print_client("&%s__MIDL_AutoBindHandle,\n", iface->name); + indent--; + print_client("},\n"); print_client("0,\n"); print_client("0,\n"); if (expr_eval_routines) diff --git a/tools/widl/server.c b/tools/widl/server.c index 3abd35e..d7a2d7e 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -494,7 +494,11 @@ static void write_stubdescriptor(type_t print_server("(void *)& %s___RpcServerInterface,\n", iface->name); print_server("MIDL_user_allocate,\n"); print_server("MIDL_user_free,\n"); + print_server("{\n"); + indent++; print_server("0,\n"); + indent--; + print_server("},\n"); print_server("0,\n"); print_server("0,\n"); if (expr_eval_routines)

1 0

Robert Shearman : widl: The lval member of var_t is essentially a duplicate of eval->cval.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: 4cd506b8fd14ecc7ddc031001348149b31048100 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4cd506b8fd14ecc7ddc0310… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:45:43 2006 +0100 widl: The lval member of var_t is essentially a duplicate of eval->cval. - Generate eval's for enums that don't explicitly have one. This means that enums written in header files won't match exactly what has been put into the IDL file, but the numeric constat is the same and MIDL does a similar thing. - Replace constant lookups with eval->cval instead of lval. --- tools/widl/parser.y | 14 ++++++-------- tools/widl/widltypes.h | 1 - tools/widl/write_msft.c | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index eb00304..7ab2edf 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -436,7 +436,6 @@ case: tCASE expr ':' field { attr_t constdef: tCONST type ident '=' expr_const { $$ = reg_const($3); set_type($$, $2, NULL); $$->eval = $5; - $$->lval = $5->cval; } ; @@ -445,20 +444,20 @@ enums: { $$ = NULL; } | enum_list ; -enum_list: enum +enum_list: enum { if (!$$->eval) + $$->eval = make_exprl(EXPR_NUM, 0 /* default for first enum entry */); + } | enum_list ',' enum { LINK($3, $1); $$ = $3; - if ($1 && !$3->eval) - $3->lval = $1->lval + 1; + if (!$$->eval) + $$->eval = make_exprl(EXPR_NUM, $1->eval->cval + 1); } ; enum: ident '=' expr_const { $$ = reg_const($1); $$->eval = $3; - $$->lval = $3->cval; $$->type = make_type(RPC_FC_LONG, &std_int); } | ident { $$ = reg_const($1); - $$->lval = 0; /* default for first enum entry */ $$->type = make_type(RPC_FC_LONG, &std_int); } ; @@ -875,7 +874,7 @@ static expr_t *make_exprs(enum expr_type e->u.sval = c->name; free(val); e->is_const = TRUE; - e->cval = c->lval; + e->cval = c->eval->cval; } } return e; @@ -1101,7 +1100,6 @@ static var_t *make_var(char *name) v->attrs = NULL; v->array = NULL; v->eval = NULL; - v->lval = 0; INIT_LINK(v); return v; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 30620d0..a2d917b 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -216,7 +216,6 @@ struct _var_t { const char *tname; attr_t *attrs; expr_t *eval; - long lval; /* parser-internal */ DECL_LINK(var_t) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index ffbe9f8..2af7d66 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1559,7 +1559,7 @@ static HRESULT add_var_desc(msft_typeinf switch(typeinfo->typeinfo->typekind & 0xf) { case TKIND_ENUM: - write_value(typeinfo->typelib, &typedata[4], VT_I4, &var->lval); + write_value(typeinfo->typelib, &typedata[4], VT_I4, &var->eval->cval); var_kind = 2; /* VAR_CONST */ var_type_size += 16; /* sizeof(VARIANT) */ typeinfo->datawidth = var_datawidth;

1 0