widl: Use expr_resolve_type to get the type of the identifier in write_conf_or_var_desc.

Remove the conversion of pointer types into base types as this was only needed due to lack of proper type resolving.

widl: Use expr_resolve_type to get the type of the identifier in write_conf_or_var_desc.
39a1fa67 · Rob Shearman · Alexandre Julliard · 80ab2a7c · 39a1fa67
Commit 39a1fa67 authored Apr 22, 2008 by Rob Shearman Committed by Alexandre Julliard Apr 22, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 9 deletions

typegen.c tools/widl/typegen.c +2 -9

No files found.
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -655,6 +655,8 @@ static size_t write_conf_or_var_desc(FILE *file, const type_t *structure,
            error("write_conf_or_var_desc: couldn't find variable %s in structure\n",
                  subexpr->u.sval);

+        correlation_variable = expr_resolve_type(NULL, structure, expr);
+
        offset -= baseoff;
        correlation_variable_type = correlation_variable->type;

@@ -683,15 +685,6 @@ static size_t write_conf_or_var_desc(FILE *file, const type_t *structure,
        case RPC_FC_ULONG:
            param_type = RPC_FC_ULONG;
            break;
-        case RPC_FC_RP:
-        case RPC_FC_UP:
-        case RPC_FC_OP:
-        case RPC_FC_FP:
-            if (sizeof(void *) == 4)  /* FIXME */
-                param_type = RPC_FC_LONG;
-            else
-                param_type = RPC_FC_HYPER;
-            break;
        default:
            error("write_conf_or_var_desc: conformance variable type not supported 0x%x\n",
                correlation_variable_type);