[WIDL] Sync with Wine Staging 1.9.16. CORE-11866

svn path=/trunk/; revision=72409

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 677ebfe..cef06ba 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -16,7 +16,7 @@ wine-patches@winehq.com and ros-dev@reactos.org
 The following build tools are shared with Wine.
 
 reactos/sdk/tools/unicode               # Synced to WineStaging-1.9.16
 The following build tools are shared with Wine.
 
 reactos/sdk/tools/unicode               # Synced to WineStaging-1.9.16

-reactos/sdk/tools/widl                  # Synced to WineStaging-1.9.11
+reactos/sdk/tools/widl                  # Synced to WineStaging-1.9.16

 reactos/sdk/tools/wpp                   # Synced to WineStaging-1.9.11
 
 The following libraries are shared with Wine.
 reactos/sdk/tools/wpp                   # Synced to WineStaging-1.9.11
 
 The following libraries are shared with Wine.

diff --git a/reactos/sdk/tools/widl/expr.c b/reactos/sdk/tools/widl/expr.c
index 0ada012..cf97c7e 100644 (file)
--- a/reactos/sdk/tools/widl/expr.c
+++ b/reactos/sdk/tools/widl/expr.c
@@ -222,8 +222,8 @@ expr_t *make_exprt(enum expr_type type, var_t *var, expr_t *expr)
             e->is_const = TRUE;
             if (is_signed_integer_type(tref))
             {
             e->is_const = TRUE;
             if (is_signed_integer_type(tref))
             {

-                cast_mask = (1 << (cast_type_bits - 1)) - 1;
-                if (expr->cval & (1 << (cast_type_bits - 1)))
+                cast_mask = (1u << (cast_type_bits - 1)) - 1;
+                if (expr->cval & (1u << (cast_type_bits - 1)))

                     e->cval = -((-expr->cval) & cast_mask);
                 else
                     e->cval = expr->cval & cast_mask;
                     e->cval = -((-expr->cval) & cast_mask);
                 else
                     e->cval = expr->cval & cast_mask;


@@ -231,8 +231,8 @@ expr_t *make_exprt(enum expr_type type, var_t *var, expr_t *expr)
             else
             {
                 /* calculate ((1 << cast_type_bits) - 1) avoiding overflow */
             else
             {
                 /* calculate ((1 << cast_type_bits) - 1) avoiding overflow */

-                cast_mask = ((1 << (cast_type_bits - 1)) - 1) |
-                            1 << (cast_type_bits - 1);
+                cast_mask = ((1u << (cast_type_bits - 1)) - 1) |
+                            1u << (cast_type_bits - 1);

                 e->cval = expr->cval & cast_mask;
             }
         }
                 e->cval = expr->cval & cast_mask;
             }
         }