widl: Check whether an expression is a constant one before assuming it is a…

widl: Check whether an expression is a constant one before assuming it is a toplevel conformance when writing conformance or variance descriptors.

widl: Check whether an expression is a constant one before assuming it is a…
0d88ba9e · Rob Shearman · Alexandre Julliard · c65d16e9 · 0d88ba9e
Commit 0d88ba9e authored Mar 23, 2010 by Rob Shearman Committed by Alexandre Julliard Mar 23, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 10 deletions

typegen.c tools/widl/typegen.c +10 -10

No files found.
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -985,16 +985,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure,
        return 4;
    }

-    if (!structure)
-    {
-        /* Top-level conformance calculations are done inline.  */
-        print_file (file, 2, "0x%x,\t/* Corr desc: parameter */\n",
-                    RPC_FC_TOP_LEVEL_CONFORMANCE);
-        print_file (file, 2, "0x0,\n");
-        print_file (file, 2, "NdrFcShort(0x0),\n");
-        return 4;
-    }
-
    if (expr->is_const)
    {
        if (expr->cval > UCHAR_MAX * (USHRT_MAX + 1) + USHRT_MAX)
@@ -1010,6 +1000,16 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure,
        return 4;
    }

+    if (!structure)
+    {
+        /* Top-level conformance calculations are done inline.  */
+        print_file (file, 2, "0x%x,\t/* Corr desc: parameter */\n",
+                    RPC_FC_TOP_LEVEL_CONFORMANCE);
+        print_file (file, 2, "0x0,\n");
+        print_file (file, 2, "NdrFcShort(0x0),\n");
+        return 4;
+    }
+
    if (is_ptr(type) || (is_array(type) && type_array_is_decl_as_ptr(type)))
    {
        conftype = RPC_FC_POINTER_CONFORMANCE;