diff options
author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-06-03 02:05:52 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-06-03 02:05:52 +0000 |
commit | 584595fab3592502a684200154e545a22483cee8 (patch) | |
tree | 2308b0afeb4ef22123eaaa62df5d2e12ee9331a8 /epan | |
parent | 9c859f5f10195dac1a5ebc92d664d636f4a543ad (diff) |
From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4820 :
Mesa moved its API description file again.
Also, while I'm here, I noticed that they stopped using signed tags, so add
--tags to "git describe" for a better description of the mesa version used to
build the X11 dissector.
svn path=/trunk/; revision=33067
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/x11-declarations.h | 1 | ||||
-rw-r--r-- | epan/dissectors/x11-enum.h | 2 | ||||
-rw-r--r-- | epan/dissectors/x11-extension-errors.h | 2 | ||||
-rw-r--r-- | epan/dissectors/x11-extension-implementation.h | 23 | ||||
-rw-r--r-- | epan/dissectors/x11-glx-render-enum.h | 2 | ||||
-rw-r--r-- | epan/dissectors/x11-register-info.h | 1 |
6 files changed, 17 insertions, 14 deletions
diff --git a/epan/dissectors/x11-declarations.h b/epan/dissectors/x11-declarations.h index c448c6a064..39b117117c 100644 --- a/epan/dissectors/x11-declarations.h +++ b/epan/dissectors/x11-declarations.h @@ -1860,6 +1860,7 @@ static int hf_x11_dri2_Connect_driver_type = -1; static int hf_x11_dri2_Connect_reply_driver_name_length = -1; static int hf_x11_dri2_Connect_reply_device_name_length = -1; static int hf_x11_dri2_Connect_reply_driver_name = -1; +static int hf_x11_dri2_Connect_reply_alignment_pad = -1; static int hf_x11_dri2_Connect_reply_device_name = -1; static int hf_x11_dri2_Authenticate_window = -1; static int hf_x11_dri2_Authenticate_magic = -1; diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h index 03b2f03633..488c3d7b4f 100644 --- a/epan/dissectors/x11-enum.h +++ b/epan/dissectors/x11-enum.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-xcb.pl - using xcbproto version 1.6-4-g2d873a3 */ + using xcbproto version 1.6-8-gf91186b */ /* $Id$ */ /* diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h index 8685cfd6ea..7b730fe5da 100644 --- a/epan/dissectors/x11-extension-errors.h +++ b/epan/dissectors/x11-extension-errors.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-xcb.pl - using xcbproto version 1.6-4-g2d873a3 */ + using xcbproto version 1.6-8-gf91186b */ /* $Id$ */ /* diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h index 48eced50fe..3b04cc5754 100644 --- a/epan/dissectors/x11-extension-implementation.h +++ b/epan/dissectors/x11-extension-implementation.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-xcb.pl - using xcbproto version 1.6-4-g2d873a3 */ + using xcbproto version 1.6-8-gf91186b */ /* $Id$ */ /* @@ -6095,6 +6095,7 @@ static void dri2Connect_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p *offsetp += 4; UNUSED(16); listOfByte(tvb, offsetp, t, hf_x11_dri2_Connect_reply_driver_name, f_driver_name_length, little_endian); + listOfByte(tvb, offsetp, t, hf_x11_dri2_Connect_reply_alignment_pad, (((f_driver_name_length + 3 ) & (~3)) - f_driver_name_length), little_endian); listOfByte(tvb, offsetp, t, hf_x11_dri2_Connect_reply_device_name, f_device_name_length, little_endian); } @@ -15813,7 +15814,7 @@ static void xf86vidmodeGetMonitor_Reply(tvbuff_t *tvb, packet_info *pinfo, int * listOfCard32(tvb, offsetp, t, hf_x11_xf86vidmode_GetMonitor_reply_hsync, hf_x11_xf86vidmode_GetMonitor_reply_hsync_item, f_num_hsync, little_endian); listOfCard32(tvb, offsetp, t, hf_x11_xf86vidmode_GetMonitor_reply_vsync, hf_x11_xf86vidmode_GetMonitor_reply_vsync_item, f_num_vsync, little_endian); listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_GetMonitor_reply_vendor, f_vendor_length, little_endian); - listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_GetMonitor_reply_alignment_pad, (((f_vendor_length + 3 ) & 0xFFFFFFFC) - f_vendor_length), little_endian); + listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_GetMonitor_reply_alignment_pad, (((f_vendor_length + 3 ) & (~3)) - f_vendor_length), little_endian); listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_GetMonitor_reply_model, f_model_length, little_endian); } @@ -16455,9 +16456,9 @@ static void xf86vidmodeGetGammaRamp_Reply(tvbuff_t *tvb, packet_info *pinfo, int proto_tree_add_item(t, hf_x11_xf86vidmode_GetGammaRamp_reply_size, tvb, *offsetp, 2, little_endian); *offsetp += 2; UNUSED(22); - listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_GetGammaRamp_reply_red, hf_x11_xf86vidmode_GetGammaRamp_reply_red_item, ((f_size + 1) & 0xFFFFFFFE), little_endian); - listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_GetGammaRamp_reply_green, hf_x11_xf86vidmode_GetGammaRamp_reply_green_item, ((f_size + 1) & 0xFFFFFFFE), little_endian); - listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_GetGammaRamp_reply_blue, hf_x11_xf86vidmode_GetGammaRamp_reply_blue_item, ((f_size + 1) & 0xFFFFFFFE), little_endian); + listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_GetGammaRamp_reply_red, hf_x11_xf86vidmode_GetGammaRamp_reply_red_item, ((f_size + 1) & (~1)), little_endian); + listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_GetGammaRamp_reply_green, hf_x11_xf86vidmode_GetGammaRamp_reply_green_item, ((f_size + 1) & (~1)), little_endian); + listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_GetGammaRamp_reply_blue, hf_x11_xf86vidmode_GetGammaRamp_reply_blue_item, ((f_size + 1) & (~1)), little_endian); } static void xf86vidmodeSetGammaRamp(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) @@ -16470,12 +16471,12 @@ static void xf86vidmodeSetGammaRamp(tvbuff_t *tvb, packet_info *pinfo _U_, int * f_size = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xf86vidmode_SetGammaRamp_size, tvb, *offsetp, 2, little_endian); *offsetp += 2; - listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_SetGammaRamp_red, hf_x11_xf86vidmode_SetGammaRamp_red_item, ((f_size + 1) & 0xFFFFFFFE), little_endian); - length -= ((f_size + 1) & 0xFFFFFFFE) * 2; - listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_SetGammaRamp_green, hf_x11_xf86vidmode_SetGammaRamp_green_item, ((f_size + 1) & 0xFFFFFFFE), little_endian); - length -= ((f_size + 1) & 0xFFFFFFFE) * 2; - listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_SetGammaRamp_blue, hf_x11_xf86vidmode_SetGammaRamp_blue_item, ((f_size + 1) & 0xFFFFFFFE), little_endian); - length -= ((f_size + 1) & 0xFFFFFFFE) * 2; + listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_SetGammaRamp_red, hf_x11_xf86vidmode_SetGammaRamp_red_item, ((f_size + 1) & (~1)), little_endian); + length -= ((f_size + 1) & (~1)) * 2; + listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_SetGammaRamp_green, hf_x11_xf86vidmode_SetGammaRamp_green_item, ((f_size + 1) & (~1)), little_endian); + length -= ((f_size + 1) & (~1)) * 2; + listOfCard16(tvb, offsetp, t, hf_x11_xf86vidmode_SetGammaRamp_blue, hf_x11_xf86vidmode_SetGammaRamp_blue_item, ((f_size + 1) & (~1)), little_endian); + length -= ((f_size + 1) & (~1)) * 2; } static void xf86vidmodeGetGammaRampSize(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h index f98dc21b72..f7dc28b814 100644 --- a/epan/dissectors/x11-glx-render-enum.h +++ b/epan/dissectors/x11-glx-render-enum.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It was automatically generated by ../../tools/process-x11-xcb.pl - using mesa version mesa_7_6_1_rc1-7349-g4c93cd1 */ + using mesa version mesa_7_6_1_rc1-8582-ge0d7281 */ /* $Id$ */ /* diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h index 4d1dc2f493..3c74451860 100644 --- a/epan/dissectors/x11-register-info.h +++ b/epan/dissectors/x11-register-info.h @@ -1860,6 +1860,7 @@ { &hf_x11_dri2_Connect_reply_driver_name_length, { "driver_name_length", "x11.dri2.Connect.reply.driver_name_length", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_dri2_Connect_reply_device_name_length, { "device_name_length", "x11.dri2.Connect.reply.device_name_length", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_dri2_Connect_reply_driver_name, { "driver_name", "x11.dri2.Connect.reply.driver_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dri2_Connect_reply_alignment_pad, { "alignment_pad", "x11.dri2.Connect.reply.alignment_pad", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_dri2_Connect_reply_device_name, { "device_name", "x11.dri2.Connect.reply.device_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_dri2_Authenticate_window, { "window", "x11.dri2.Authenticate.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_dri2_Authenticate_magic, { "magic", "x11.dri2.Authenticate.magic", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, |