From 1cd18d016a7a1b53832fdcacfb4cf1a9a4b0935d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 21 Aug 2016 17:22:27 +0000 Subject: [PATCH 1/1] [WIDL] Sync with Wine Staging 1.9.16. CORE-11866 svn path=/trunk/; revision=72409 --- reactos/media/doc/README.WINE | 2 +- reactos/sdk/tools/widl/expr.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 677ebfee810..cef06baf158 100644 --- 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 -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. diff --git a/reactos/sdk/tools/widl/expr.c b/reactos/sdk/tools/widl/expr.c index 0ada012c9cf..cf97c7ea20a 100644 --- 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)) { - 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; @@ -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 */ - 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; } } -- 2.17.1