X11: Update generated dissector

Change-Id: Id3fbc64b4d797d50e935223c40c5c2321a1c8198
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-on: https://code.wireshark.org/review/2148
Reviewed-by: Anders Broman <a.broman58@gmail.com>

6 files changed, 42 insertions, 83 deletions

diff --git a/epan/dissectors/x11-declarations.h b/epan/dissectors/x11-declarations.h
index 71d8362da4..597ae33a19 100644
--- a/epan/dissectors/x11-declarations.h
+++ b/epan/dissectors/x11-declarations.h
@@ -1,6 +1,5 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-fields.pl. */
-
 /*
  * Copyright 2000, Christophe Tronche <ch.tronche[AT]computer.org>
  *
@@ -6218,7 +6217,6 @@ static int hf_x11_xkb_GetMap_reply_virtualMods = -1;
 static int hf_x11_xkb_GetMap_reply_KeyTypes_types_rtrn = -1;
 static int hf_x11_xkb_GetMap_reply_KeySyms_syms_rtrn = -1;
 static int hf_x11_xkb_GetMap_reply_KeyActions_acts_rtrn_count = -1;
-static int hf_x11_xkb_GetMap_reply_KeyActions_alignment_pad = -1;
 static int hf_x11_xkb_GetMap_reply_KeyActions_acts_rtrn_acts = -1;
 static int hf_x11_xkb_GetMap_reply_KeyActions_acts_rtrn_acts_item = -1;
 static int hf_x11_xkb_GetMap_reply_KeyBehaviors_behaviors_rtrn = -1;
@@ -6233,15 +6231,10 @@ static int hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn_mask_4 = -1;
 static int hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn_mask_5 = -1;
 static int hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn_mask_Any = -1;
 static int hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn = -1;
-static int hf_x11_xkb_GetMap_reply_VirtualMods_alignment_pad2 = -1;
 static int hf_x11_xkb_GetMap_reply_ExplicitComponents_explicit_rtrn = -1;
 static int hf_x11_xkb_GetMap_reply_ExplicitComponents_explicit_rtrn_item = -1;
-static int hf_x11_xkb_GetMap_reply_ExplicitComponents_alignment_pad3 = -1;
-static int hf_x11_xkb_GetMap_reply_ExplicitComponents_alignment_pad3_item = -1;
 static int hf_x11_xkb_GetMap_reply_ModifierMap_modmap_rtrn = -1;
 static int hf_x11_xkb_GetMap_reply_ModifierMap_modmap_rtrn_item = -1;
-static int hf_x11_xkb_GetMap_reply_ModifierMap_alignment_pad4 = -1;
-static int hf_x11_xkb_GetMap_reply_ModifierMap_alignment_pad4_item = -1;
 static int hf_x11_xkb_GetMap_reply_VirtualModMap_vmodmap_rtrn = -1;
 static int hf_x11_xkb_GetMap_reply_VirtualModMap_vmodmap_rtrn_item = -1;
 static int hf_x11_xkb_SetMap_deviceSpec = -1;
diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h
index 77280cd70e..af8f9198f1 100644
--- a/epan/dissectors/x11-enum.h
+++ b/epan/dissectors/x11-enum.h
@@ -1,9 +1,8 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using xcbproto version xcb-proto-1.9-11-g2817903 */
-
+   using xcbproto version 1.10-9-g84bfd90 */
 /*
- * Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
+ * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald[AT]wireshark.org>
diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h
index 9b5ecbc0d3..0319006755 100644
--- a/epan/dissectors/x11-extension-errors.h
+++ b/epan/dissectors/x11-extension-errors.h
@@ -1,9 +1,8 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using xcbproto version xcb-proto-1.9-11-g2817903 */
-
+   using xcbproto version 1.10-9-g84bfd90 */
 /*
- * Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
+ * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald[AT]wireshark.org>
diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h
index f905b847f5..207f394682 100644
--- a/epan/dissectors/x11-extension-implementation.h
+++ b/epan/dissectors/x11-extension-implementation.h
@@ -1,9 +1,8 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using xcbproto version xcb-proto-1.9-11-g2817903 */
-
+   using xcbproto version 1.10-9-g84bfd90 */
 /*
- * Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
+ * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald[AT]wireshark.org>
@@ -5865,7 +5864,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, byte_order);
-    listOfByte(tvb, offsetp, t, hf_x11_dri2_Connect_reply_alignment_pad, (((f_driver_name_length +  3 ) & (~3)) - f_driver_name_length), byte_order);
+    listOfByte(tvb, offsetp, t, hf_x11_dri2_Connect_reply_alignment_pad, (((f_driver_name_length + 3) & (~3)) - f_driver_name_length), byte_order);
     listOfByte(tvb, offsetp, t, hf_x11_dri2_Connect_reply_device_name, f_device_name_length, byte_order);
 }
 
@@ -14980,7 +14979,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, byte_order);
     listOfCard32(tvb, offsetp, t, hf_x11_xf86vidmode_GetMonitor_reply_vsync, hf_x11_xf86vidmode_GetMonitor_reply_vsync_item, f_num_vsync, byte_order);
     listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_GetMonitor_reply_vendor, f_vendor_length, byte_order);
-    listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_GetMonitor_reply_alignment_pad, (((f_vendor_length +  3 ) & (~3)) - f_vendor_length), byte_order);
+    listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_GetMonitor_reply_alignment_pad, (((f_vendor_length + 3) & (~3)) - f_vendor_length), byte_order);
     listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_GetMonitor_reply_model, f_model_length, byte_order);
 }
 
@@ -22052,7 +22051,9 @@ static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     }
     if ((f_present & (1 << 4)) != 0) {
         listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_KeyActions_acts_rtrn_count, f_nKeyActions, byte_order);
-        listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_KeyActions_alignment_pad, (((f_nKeyActions + 3) & (~3)) - f_nKeyActions), byte_order);
+        if (*offsetp % 4) {
+            UNUSED(4 - *offsetp % 4);
+        }
         struct_xkb_Action(tvb, offsetp, t, byte_order, f_totalActions);
     }
     if ((f_present & (1 << 5)) != 0) {
@@ -22060,15 +22061,21 @@ static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     }
     if ((f_present & (1 << 6)) != 0) {
         listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order);
-        listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_alignment_pad2, (((popcount(f_virtualMods) + 3) & (~3)) - popcount(f_virtualMods)), byte_order);
+        if (*offsetp % 4) {
+            UNUSED(4 - *offsetp % 4);
+        }
     }
     if ((f_present & (1 << 3)) != 0) {
         struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
-        listOfCard16(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_ExplicitComponents_alignment_pad3, hf_x11_xkb_GetMap_reply_ExplicitComponents_alignment_pad3_item, (((f_totalKeyExplicit + 1) & (~1)) - f_totalKeyExplicit), byte_order);
+        if (*offsetp % 4) {
+            UNUSED(4 - *offsetp % 4);
+        }
     }
     if ((f_present & (1 << 2)) != 0) {
         struct_xkb_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
-        listOfCard16(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_ModifierMap_alignment_pad4, hf_x11_xkb_GetMap_reply_ModifierMap_alignment_pad4_item, (((f_totalModMapKeys + 1) & (~1)) - f_totalModMapKeys), byte_order);
+        if (*offsetp % 4) {
+            UNUSED(4 - *offsetp % 4);
+        }
     }
     if ((f_present & (1 << 7)) != 0) {
         struct_xkb_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
@@ -22823,7 +22830,6 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
     int f_virtualMods;
     int f_which;
     int f_nTypes;
-    int f_nKTLevels;
     int f_indicators;
     int f_groupNames;
     int f_nRadioGroups;
@@ -22880,7 +22886,6 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
     *offsetp += 1;
     proto_tree_add_item(t, hf_x11_xkb_SetNames_firstKTLevelt, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKTLevels = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_nKTLevels, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_indicators = VALUE32(tvb, *offsetp);
@@ -22942,12 +22947,12 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
         int sumof_nLevelsPerType = 0;
         {
             int i;
-            for (i = 0; i < f_nKTLevels; i++) {
+            for (i = 0; i < f_nTypes; i++) {
                 sumof_nLevelsPerType += VALUE8(tvb, *offsetp + i * 1);
             }
         }
-        listOfByte(tvb, offsetp, t, hf_x11_xkb_SetNames_KTLevelNames_nLevelsPerType, f_nKTLevels, byte_order);
-        length -= f_nKTLevels * 1;
+        listOfByte(tvb, offsetp, t, hf_x11_xkb_SetNames_KTLevelNames_nLevelsPerType, f_nTypes, byte_order);
+        length -= f_nTypes * 1;
         listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_KTLevelNames_ktLevelNames, hf_x11_xkb_SetNames_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order);
         length -= sumof_nLevelsPerType * 4;
     }
@@ -23473,7 +23478,6 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         int f_indicators;
         int f_nRadioGroups;
         int f_nKeyAliases;
-        int f_nKTLevels;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_keyname_type, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_keyDeviceID, tvb, *offsetp, 1, byte_order);
@@ -23555,7 +23559,6 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         f_nKeyAliases = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_nKeyAliases, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nKTLevels = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_nKTLevels, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         UNUSED(4);
@@ -23590,11 +23593,11 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
             int sumof_nLevelsPerType = 0;
             {
                 int i;
-                for (i = 0; i < f_nKTLevels; i++) {
+                for (i = 0; i < f_nTypes; i++) {
                     sumof_nLevelsPerType += VALUE8(tvb, *offsetp + i * 1);
                 }
             }
-            listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_nLevelsPerType, f_nKTLevels, byte_order);
+            listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_nLevelsPerType, f_nTypes, byte_order);
             listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order);
         }
         if ((f_which & (1 << 8)) != 0) {
@@ -24909,6 +24912,7 @@ static void xprintPrintGetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int
 static void xprintPrintGetAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
     int sequence_number;
+    int f_stringLen;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintGetAttributes");
 
@@ -24920,11 +24924,11 @@ static void xprintPrintGetAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
+    f_stringLen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetAttributes_reply_stringLen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    proto_tree_add_item(t, hf_x11_xprint_PrintGetAttributes_reply_attributes, tvb, *offsetp, 1, ENC_ASCII|ENC_NA);
-    *offsetp += 1;
+    listOfByte(tvb, offsetp, t, hf_x11_xprint_PrintGetAttributes_reply_attributes, f_stringLen, byte_order);
 }
 
 static void xprintPrintGetOneAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
@@ -26070,6 +26074,7 @@ static int struct_size_xv_AdaptorInfo(tvbuff_t *tvb, int *offsetp, guint byte_or
     f_name_size = VALUE16(tvb, *offsetp + size + 4);
     f_num_formats = VALUE16(tvb, *offsetp + size + 8);
     size += f_name_size * 1;
+    size = (size + 3) & ~3;
     size += f_num_formats * 8;
     return size + 12;
 }
@@ -26107,6 +26112,9 @@ static void struct_xv_AdaptorInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root,
 	*offsetp += 1;
 	UNUSED(1);
 	listOfByte(tvb, offsetp, t, hf_x11_struct_xv_AdaptorInfo_name, f_name_size, byte_order);
+	if (*offsetp % 4) {
+	    UNUSED(4 - *offsetp % 4);
+	}
 	struct_xv_Format(tvb, offsetp, t, byte_order, f_num_formats);
     }
 }
diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h
index 8159895473..a90106ee9c 100644
--- a/epan/dissectors/x11-glx-render-enum.h
+++ b/epan/dissectors/x11-glx-render-enum.h
@@ -1,9 +1,8 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using mesa version snb-magic-19685-g149140e */
-
+   using mesa version 10.2-branchpoint-592-g63117ac */
 /*
- * Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
+ * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald[AT]wireshark.org>
@@ -1307,46 +1306,14 @@ static const value_string mesa_enum[] = {
 /* OpenGL extension GL_ARB_transform_feedback_instanced */
 /* OpenGL extension GL_ARB_map_buffer_alignment */
   { 0x90BC, "MIN_MAP_BUFFER_ALIGNMENT" },
-/* OpenGL extension GL_KHR_debug */
-  { 0x92E0, "DEBUG_OUTPUT" },
-  { 0x8242, "DEBUG_OUTPUT_SYNCHRONOUS" },
-  { 0x9143, "MAX_DEBUG_MESSAGE_LENGTH" },
-  { 0x9144, "MAX_DEBUG_LOGGED_MESSAGES" },
-  { 0x9145, "DEBUG_LOGGED_MESSAGES" },
-  { 0x8243, "DEBUG_NEXT_LOGGED_MESSAGE_LENGTH" },
-  { 0x826C, "MAX_DEBUG_GROUP_STACK_DEPTH" },
-  { 0x826D, "DEBUG_GROUP_STACK_DEPTH" },
-  { 0x82E8, "MAX_LABEL_LENGTH" },
-  { 0x8244, "DEBUG_CALLBACK_FUNCTION" },
-  { 0x8245, "DEBUG_CALLBACK_USER_PARAM" },
-  { 0x8246, "DEBUG_SOURCE_API" },
-  { 0x8247, "DEBUG_SOURCE_WINDOW_SYSTEM" },
-  { 0x8248, "DEBUG_SOURCE_SHADER_COMPILER" },
-  { 0x8249, "DEBUG_SOURCE_THIRD_PARTY" },
-  { 0x824A, "DEBUG_SOURCE_APPLICATION" },
-  { 0x824B, "DEBUG_SOURCE_OTHER" },
-  { 0x824C, "DEBUG_TYPE_ERROR" },
-  { 0x824D, "DEBUG_TYPE_DEPRECATED_BEHAVIOR" },
-  { 0x824E, "DEBUG_TYPE_UNDEFINED_BEHAVIOR" },
-  { 0x824F, "DEBUG_TYPE_PORTABILITY" },
-  { 0x8250, "DEBUG_TYPE_PERFORMANCE" },
-  { 0x8251, "DEBUG_TYPE_OTHER" },
-  { 0x8268, "DEBUG_TYPE_MARKER" },
-  { 0x8269, "DEBUG_TYPE_PUSH_GROUP" },
-  { 0x826A, "DEBUG_TYPE_POP_GROUP" },
-  { 0x9146, "DEBUG_SEVERITY_HIGH" },
-  { 0x9147, "DEBUG_SEVERITY_MEDIUM" },
-  { 0x9148, "DEBUG_SEVERITY_LOW" },
-  { 0x826B, "DEBUG_SEVERITY_NOTIFICATION" },
-  { 0x0504, "STACK_UNDERFLOW" },
-  { 0x0503, "STACK_OVERFLOW" },
-  { 0x82E0, "BUFFER" },
-  { 0x82E1, "SHADER" },
-  { 0x82E2, "PROGRAM" },
-  { 0x82E3, "QUERY" },
-  { 0x82E4, "PROGRAM_PIPELINE" },
-  { 0x82E6, "SAMPLER" },
-  { 0x82E7, "DISPLAY_LIST" },
+/* OpenGL extension GL_ARB_buffer_storage */
+  { 0x40, "MAP_PERSISTENT_BIT" },
+  { 0x80, "MAP_COHERENT_BIT" },
+  { 0x100, "DYNAMIC_STORAGE_BIT" },
+  { 0x200, "CLIENT_STORAGE_BIT" },
+  { 0x821F, "BUFFER_IMMUTABLE_STORAGE" },
+  { 0x8220, "BUFFER_STORAGE_FLAGS" },
+  { 0x4000, "CLIENT_MAPPED_BUFFER_BARRIER_BIT" },
 /* OpenGL extension GL_EXT_blend_color */
   { 0x8001, "CONSTANT_COLOR_EXT" },
   { 0x8002, "ONE_MINUS_CONSTANT_COLOR_EXT" },
diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h
index 45b0486bab..86a6786685 100644
--- a/epan/dissectors/x11-register-info.h
+++ b/epan/dissectors/x11-register-info.h
@@ -1,6 +1,5 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-fields.pl. */
-
 /*
  * Copyright 2000, Christophe Tronche <ch.tronche[AT]computer.org>
  *
@@ -6218,7 +6217,6 @@
 { &hf_x11_xkb_GetMap_reply_KeyTypes_types_rtrn, { "types_rtrn", "x11.xkb.GetMap.reply.KeyTypes.types_rtrn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_KeySyms_syms_rtrn, { "syms_rtrn", "x11.xkb.GetMap.reply.KeySyms.syms_rtrn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_KeyActions_acts_rtrn_count, { "acts_rtrn_count", "x11.xkb.GetMap.reply.KeyActions.acts_rtrn_count", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetMap_reply_KeyActions_alignment_pad, { "alignment_pad", "x11.xkb.GetMap.reply.KeyActions.alignment_pad", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_KeyActions_acts_rtrn_acts, { "acts_rtrn_acts", "x11.xkb.GetMap.reply.KeyActions.acts_rtrn_acts", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_KeyActions_acts_rtrn_acts_item, { "acts_rtrn_acts", "x11.xkb.GetMap.reply.KeyActions.acts_rtrn_acts", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_KeyBehaviors_behaviors_rtrn, { "behaviors_rtrn", "x11.xkb.GetMap.reply.KeyBehaviors.behaviors_rtrn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -6233,15 +6231,10 @@
 { &hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn_mask_5, { "5", "x11.xkb.GetMap.reply.VirtualMods.vmods_rtrn.5", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn_mask_Any, { "Any", "x11.xkb.GetMap.reply.VirtualMods.vmods_rtrn.Any", FT_BOOLEAN, 8, NULL, 1 << 15, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, { "vmods_rtrn", "x11.xkb.GetMap.reply.VirtualMods.vmods_rtrn", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetMap_reply_VirtualMods_alignment_pad2, { "alignment_pad2", "x11.xkb.GetMap.reply.VirtualMods.alignment_pad2", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_ExplicitComponents_explicit_rtrn, { "explicit_rtrn", "x11.xkb.GetMap.reply.ExplicitComponents.explicit_rtrn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_ExplicitComponents_explicit_rtrn_item, { "explicit_rtrn", "x11.xkb.GetMap.reply.ExplicitComponents.explicit_rtrn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetMap_reply_ExplicitComponents_alignment_pad3, { "alignment_pad3", "x11.xkb.GetMap.reply.ExplicitComponents.alignment_pad3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetMap_reply_ExplicitComponents_alignment_pad3_item, { "alignment_pad3", "x11.xkb.GetMap.reply.ExplicitComponents.alignment_pad3", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_ModifierMap_modmap_rtrn, { "modmap_rtrn", "x11.xkb.GetMap.reply.ModifierMap.modmap_rtrn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_ModifierMap_modmap_rtrn_item, { "modmap_rtrn", "x11.xkb.GetMap.reply.ModifierMap.modmap_rtrn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetMap_reply_ModifierMap_alignment_pad4, { "alignment_pad4", "x11.xkb.GetMap.reply.ModifierMap.alignment_pad4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetMap_reply_ModifierMap_alignment_pad4_item, { "alignment_pad4", "x11.xkb.GetMap.reply.ModifierMap.alignment_pad4", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_VirtualModMap_vmodmap_rtrn, { "vmodmap_rtrn", "x11.xkb.GetMap.reply.VirtualModMap.vmodmap_rtrn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_VirtualModMap_vmodmap_rtrn_item, { "vmodmap_rtrn", "x11.xkb.GetMap.reply.VirtualModMap.vmodmap_rtrn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetMap_deviceSpec, { "deviceSpec", "x11.xkb.SetMap.deviceSpec", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},