From c08e00a9ecbecbe3339e7243ed51e42f96b5024a Mon Sep 17 00:00:00 2001
From: Robert Shearman <rob@codeweavers.com>
Date: Tue, 31 Jan 2006 18:05:43 +0100
Subject: [PATCH] widl: Implement constant conformance.

---
 tools/widl/typegen.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c
index f03cef3bca3..2f7824a87dc 100644
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -296,6 +296,21 @@ static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const type_
 
     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 @@ static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const type_
         }
         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;
         }