[PATCH 6/7] cabinet: Change black-/whitelist to more neutral words

[André Hentschel]

Signed-off-by: André Hentschel <nerv(a)dawncrow.de>
---
 dlls/cabinet/deflate.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/cabinet/deflate.c b/dlls/cabinet/deflate.c
index 681f187ecda..891bdc985f2 100644
--- a/dlls/cabinet/deflate.c
+++ b/dlls/cabinet/deflate.c
@@ -715,9 +715,9 @@ static void compress_block( deflate_state *s, const ct_data *ltree, const ct_dat
  * Check if the data type is TEXT or BINARY, using the following algorithm:
  * - TEXT if the two conditions below are satisfied:
  *    a) There are no non-portable control characters belonging to the
- *       "black list" (0..6, 14..25, 28..31).
+ *       "block list" (0..6, 14..25, 28..31).
  *    b) There is at least one printable character belonging to the
- *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
+ *       "allow list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
  * - BINARY otherwise.
  * - The following partially-portable control characters form a
  *   "gray list" that is ignored in this detection algorithm:
@@ -726,19 +726,19 @@ static void compress_block( deflate_state *s, const ct_data *ltree, const ct_dat
  */
 static int detect_data_type( deflate_state *s )
 {
-    /* black_mask is the bit mask of black-listed bytes
+    /* block_mask is the bit mask of block-listed bytes
      * set bits 0..6, 14..25, and 28..31
      * 0xf3ffc07f = binary 11110011111111111100000001111111
      */
-    unsigned long black_mask = 0xf3ffc07fUL;
+    unsigned long block_mask = 0xf3ffc07fUL;
     int n;
 
-    /* Check for non-textual ("black-listed") bytes. */
-    for (n = 0; n <= 31; n++, black_mask >>= 1)
-        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
+    /* Check for non-textual ("block-listed") bytes. */
+    for (n = 0; n <= 31; n++, block_mask >>= 1)
+        if ((block_mask & 1) && (s->dyn_ltree[n].Freq != 0))
             return Z_BINARY;
 
-    /* Check for textual ("white-listed") bytes. */
+    /* Check for textual ("allow-listed") bytes. */
     if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
             || s->dyn_ltree[13].Freq != 0)
         return Z_TEXT;
@@ -746,7 +746,7 @@ static int detect_data_type( deflate_state *s )
         if (s->dyn_ltree[n].Freq != 0)
             return Z_TEXT;
 
-    /* There are no "black-listed" or "white-listed" bytes:
+    /* There are no "block-listed" or "allow-listed" bytes:
      * this stream either is empty or has tolerated ("gray-listed") bytes only.
      */
     return Z_BINARY;
-- 
2.17.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=73536

Your paranoid android.


=== debiant (32 bit WoW report) ===

user32:
win.c:10185: Test failed: Expected foreground window 000D0120, got 00E300D4
win.c:10187: Test failed: GetActiveWindow() = 00000000
win.c:10187: Test failed: GetFocus() = 00000000
win.c:10188: Test failed: Received WM_ACTIVATEAPP(1), did not expect it.
win.c:10232: Test failed: Expected foreground window 008B00CC, got 00E300D4
win.c:10234: Test failed: GetActiveWindow() = 00000000
win.c:10234: Test failed: GetFocus() = 00000000
win.c:10236: Test failed: Received WM_ACTIVATEAPP(0), did not expect it.