diff options
Diffstat (limited to '')
| -rw-r--r-- | epan/dissectors/packet-x11.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index c4dcf9b4..1c520cde 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -3689,32 +3689,24 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, case X_ConfigureWindow: { guint16 bitmask16; - static int * const window_attributes_flags[] = { - &hf_x11_window_value_mask_background_pixmap, - &hf_x11_window_value_mask_background_pixel, - &hf_x11_window_value_mask_border_pixmap, - &hf_x11_window_value_mask_border_pixel, - &hf_x11_window_value_mask_bit_gravity, - &hf_x11_window_value_mask_win_gravity, - &hf_x11_window_value_mask_backing_store, - &hf_x11_window_value_mask_backing_planes, - &hf_x11_window_value_mask_backing_pixel, - &hf_x11_window_value_mask_override_redirect, - &hf_x11_window_value_mask_save_under, - &hf_x11_window_value_mask_event_mask, - &hf_x11_window_value_mask_do_not_propagate_mask, - &hf_x11_window_value_mask_colormap, - &hf_x11_window_value_mask_cursor, + static int * const configure_window_mask_flags[] = { + &hf_x11_configure_window_mask_x, + &hf_x11_configure_window_mask_y, + &hf_x11_configure_window_mask_width, + &hf_x11_configure_window_mask_height, + &hf_x11_configure_window_mask_border_width, + &hf_x11_configure_window_mask_sibling, + &hf_x11_configure_window_mask_stack_mode, NULL }; proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA); *offsetp += 1; requestLength(tvb, offsetp, t, byte_order); - proto_tree_add_item(t, hf_x11_window, tvb, *offsetp, 1, byte_order); + proto_tree_add_item(t, hf_x11_window, tvb, *offsetp, 4, byte_order); *offsetp += 4; bitmask16 = tvb_get_guint16(tvb, *offsetp, byte_order); - proto_tree_add_bitmask(t, tvb, *offsetp, hf_x11_configure_window_mask, ett_x11_configure_window_mask, window_attributes_flags, byte_order); + proto_tree_add_bitmask(t, tvb, *offsetp, hf_x11_configure_window_mask, ett_x11_configure_window_mask, configure_window_mask_flags, byte_order); *offsetp += 2; proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; |