commit c08e00a9ecbecbe3339e7243ed51e42f96b5024a
author Robert Shearman <rob@codeweavers.com> Tue Jan 31 18:05:43 2006 +0100
committer Alexandre Julliard <julliard@winehq.org> Tue Jan 31 18:05:43 2006 +0100
tree 5edbecafb9e7ce17341c0b4dddcd8a29ae3ba932
parent 35d1347cfacdc64499ee59877bf25ec4507dd4f5

widl: Implement constant conformance.

tools/widl/typegen.c

diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c
index f03cef3..2f7824a 100644
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -296,6 +296,21 @@
 
     if (!file) return 4; /* optimisation for sizing pass */
 
+    if (expr->is_const)
+    {
+        if (expr->cval > UCHAR_MAX * (USHRT_MAX + 1) + USHRT_MAX)
+            error("write_conf_or_var_desc: constant value %ld is greater than "
+                  "the maximum constant size of %d\n", expr->cval,
+                  UCHAR_MAX * (USHRT_MAX + 1) + USHRT_MAX);
+
+        print_file(file, 2, "0x%x, /* Corr desc: constant, val = %ld */\n",
+                   RPC_FC_CONSTANT_CONFORMANCE, expr->cval);
+        print_file(file, 2, "0x%x,\n", expr->cval & ~USHRT_MAX);
+        print_file(file, 2, "NdrShort(0x%x),\n", expr->cval & USHRT_MAX);
+
+        return 4;
+    }
+
     switch (subexpr->type)
     {
     case EXPR_PPTR:
@@ -466,7 +481,7 @@
         }
         else
         {
-            error("write_conf_or_var_desc: expression type %d\n", subexpr->type);
+            error("write_conf_or_var_desc: top-level callback conformance unimplemented\n");
             correlation_type = RPC_FC_TOP_LEVEL_CONFORMANCE;
         }