From: elasota 1137273+elasota@users.noreply.github.com
--- dlls/cabinet/liblzx_compiler.h | 5 ++++- dlls/cabinet/liblzx_compress_common.c | 2 +- dlls/cabinet/liblzx_lzx_compress.c | 17 +++++++++-------- 3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/dlls/cabinet/liblzx_compiler.h b/dlls/cabinet/liblzx_compiler.h index e492874cc12..a5f834e84bc 100644 --- a/dlls/cabinet/liblzx_compiler.h +++ b/dlls/cabinet/liblzx_compiler.h @@ -190,11 +190,14 @@
/* STATIC_ASSERT() - verify the truth of an expression at compilation time. */ #ifdef __CHECKER__ -# define STATIC_ASSERT(expr) +#define STATIC_ASSERT(expr) +#define STATIC_ASSERT_STMT(expr) #elif __STDC_VERSION__ >= 201112L # define STATIC_ASSERT(expr) _Static_assert((expr), "") +# define STATIC_ASSERT_STMT(expr) ({_Static_assert((expr), "");}) #else # define STATIC_ASSERT(expr) ((void)sizeof(char[1 - 2 * !(expr)])) +# define STATIC_ASSERT_STMT(expr) STATIC_ASSERT(expr) #endif
/* STATIC_ASSERT_ZERO() - verify the truth of an expression at compilation time diff --git a/dlls/cabinet/liblzx_compress_common.c b/dlls/cabinet/liblzx_compress_common.c index 824ebc70f92..be88df26b85 100644 --- a/dlls/cabinet/liblzx_compress_common.c +++ b/dlls/cabinet/liblzx_compress_common.c @@ -602,7 +602,7 @@ make_canonical_huffman_code(unsigned num_syms, unsigned max_codeword_len, unsigned num_used_syms;
assert(num_syms <= MAX_NUM_SYMS); - STATIC_ASSERT(MAX_NUM_SYMS <= 1 << NUM_SYMBOL_BITS); + STATIC_ASSERT_STMT(MAX_NUM_SYMS <= 1 << NUM_SYMBOL_BITS); assert(max_codeword_len <= MAX_CODEWORD_LEN);
/* diff --git a/dlls/cabinet/liblzx_lzx_compress.c b/dlls/cabinet/liblzx_lzx_compress.c index 77092969839..85a13b032d3 100644 --- a/dlls/cabinet/liblzx_lzx_compress.c +++ b/dlls/cabinet/liblzx_lzx_compress.c @@ -756,7 +756,7 @@ lzx_build_huffman_codes(struct liblzx_compressor *c) const struct lzx_freqs *freqs = &c->freqs; struct lzx_codes *codes = &c->codes[c->codes_index];
- STATIC_ASSERT(MAIN_CODEWORD_LIMIT >= 9 && + STATIC_ASSERT_STMT(MAIN_CODEWORD_LIMIT >= 9 && MAIN_CODEWORD_LIMIT <= LZX_MAX_MAIN_CODEWORD_LEN); make_canonical_huffman_code(c->num_main_syms, MAIN_CODEWORD_LIMIT, @@ -764,7 +764,7 @@ lzx_build_huffman_codes(struct liblzx_compressor *c) codes->lens.main, codes->codewords.main);
- STATIC_ASSERT(LENGTH_CODEWORD_LIMIT >= 8 && + STATIC_ASSERT_STMT(LENGTH_CODEWORD_LIMIT >= 8 && LENGTH_CODEWORD_LIMIT <= LZX_MAX_LEN_CODEWORD_LEN); make_canonical_huffman_code(LZX_LENCODE_NUM_SYMBOLS, LENGTH_CODEWORD_LIMIT, @@ -772,7 +772,8 @@ lzx_build_huffman_codes(struct liblzx_compressor *c) codes->lens.len, codes->codewords.len);
- STATIC_ASSERT(ALIGNED_CODEWORD_LIMIT >= LZX_NUM_ALIGNED_OFFSET_BITS && + STATIC_ASSERT_STMT( + ALIGNED_CODEWORD_LIMIT >= LZX_NUM_ALIGNED_OFFSET_BITS && ALIGNED_CODEWORD_LIMIT <= LZX_MAX_ALIGNED_CODEWORD_LEN); make_canonical_huffman_code(LZX_ALIGNEDCODE_NUM_SYMBOLS, ALIGNED_CODEWORD_LIMIT, @@ -944,7 +945,7 @@ lzx_write_compressed_code(struct lzx_output_bitstream *os, precode_items);
/* Build the precode. */ - STATIC_ASSERT(PRE_CODEWORD_LIMIT >= 5 && + STATIC_ASSERT_STMT(PRE_CODEWORD_LIMIT >= 5 && PRE_CODEWORD_LIMIT <= LZX_MAX_PRE_CODEWORD_LEN); make_canonical_huffman_code(LZX_PRECODE_NUM_SYMBOLS, PRE_CODEWORD_LIMIT, precode_freqs, precode_lens, @@ -972,7 +973,7 @@ lzx_write_compressed_code(struct lzx_output_bitstream *os, precode_lens[precode_sym]); } } - STATIC_ASSERT(CAN_BUFFER(2 * PRE_CODEWORD_LIMIT + 1)); + STATIC_ASSERT_STMT(CAN_BUFFER(2 * PRE_CODEWORD_LIMIT + 1)); lzx_flush_bits(os, 2 * PRE_CODEWORD_LIMIT + 1); }
@@ -1094,7 +1095,7 @@ lzx_write_sequences(struct lzx_output_bitstream *os, int block_type, ALIGNED_CODEWORD_LIMIT)
/* Verify optimization is enabled on 64-bit */ - STATIC_ASSERT(WORDBITS < 64 || CAN_BUFFER(MAX_MATCH_BITS)); + STATIC_ASSERT_STMT(WORDBITS < 64 || CAN_BUFFER(MAX_MATCH_BITS));
/* Output the main symbol for the match. */
@@ -1757,7 +1758,7 @@ lzx_find_min_cost_path(struct liblzx_compressor * const restrict c, matchptr = in_next - lzx_lru_queue_R0(QUEUE(cur_node)); if (load_u16_unaligned(matchptr) != load_u16_unaligned(in_next)) goto rep0_done; - STATIC_ASSERT(LZX_MIN_MATCH_LEN == 2); + STATIC_ASSERT_STMT(LZX_MIN_MATCH_LEN == 2); do { uint32_t cost = cur_node->cost + c->costs.match_cost[0][ @@ -2393,7 +2394,7 @@ lzx_set_default_costs(struct liblzx_compressor *c) fixed_set_fraction(&frac_15_100, 15, 100);
/* Some numbers here have been hardcoded to assume a bit cost of 64. */ - STATIC_ASSERT(BIT_COST == 64); + STATIC_ASSERT_STMT(BIT_COST == 64);
/* Estimate the number of literals that will used. 'num_literals' is * the total number, whereas 'num_used_literals' is the number of