osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Update the X11 dissector to use the latest mesa and xcbproto. 

Change-Id: Ia1395cffaebbcf6585b9167861d8c3b4d86cf821
Reviewed-on: https://code.wireshark.org/review/15923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Jeff Morriss 2016-06-15 13:25:44 -04:00 committed by Anders Broman
parent d1d27bd95a
commit a38db78f7d
6 changed files with 107 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/dissectors/x11-declarations.h
View File

@ -6982,7 +6982,6 @@ static int hf_x11_xkb_GetNames_reply_Compat_compatName = -1;
static int hf_x11_xkb_GetNames_reply_KeyTypeNames_typeNames = -1;
static int hf_x11_xkb_GetNames_reply_KeyTypeNames_typeNames_item = -1;
static int hf_x11_xkb_GetNames_reply_KTLevelNames_nLevelsPerType = -1;
static int hf_x11_xkb_GetNames_reply_KTLevelNames_alignment_pad = -1;
static int hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames = -1;
static int hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item = -1;
static int hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames = -1;

2
epan/dissectors/x11-enum.h
View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It was automatically generated by ../../tools/process-x11-xcb.pl
using xcbproto version 1.11-97-g8d0c100 */
using xcbproto version 1.12-4-g95a262e */
/*
* Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
*

2
epan/dissectors/x11-extension-errors.h
View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It was automatically generated by ../../tools/process-x11-xcb.pl
using xcbproto version 1.11-97-g8d0c100 */
using xcbproto version 1.12-4-g95a262e */
/*
* Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
*

91
epan/dissectors/x11-extension-implementation.h
View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It was automatically generated by ../../tools/process-x11-xcb.pl
using xcbproto version 1.11-97-g8d0c100 */
using xcbproto version 1.12-4-g95a262e */
/*
* Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
*
@ -9927,6 +9927,7 @@ static int struct_size_sync_SYSTEMCOUNTER(tvbuff_t *tvb _U_, int *offsetp _U_, g
int f_name_len;
f_name_len = VALUE16(tvb, *offsetp + size + 12);
size += f_name_len * 1;
size = (size + 3) & ~3;
return size + 14;
}
@ -9947,6 +9948,9 @@ static void struct_sync_SYSTEMCOUNTER(tvbuff_t *tvb, int *offsetp, proto_tree *r
proto_tree_add_item(t, hf_x11_struct_sync_SYSTEMCOUNTER_name_len, tvb, *offsetp, 2, byte_order);
*offsetp += 2;
listOfByte(tvb, offsetp, t, hf_x11_struct_sync_SYSTEMCOUNTER_name, f_name_len, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
}
}
@ -10997,6 +11001,10 @@ static void randrSetCrtcTransform(tvbuff_t *tvb, packet_info *pinfo _U_, int *of
UNUSED(2);
listOfByte(tvb, offsetp, t, hf_x11_randr_SetCrtcTransform_filter_name, f_filter_len, byte_order);
length -= f_filter_len * 1;
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
length = ((length + 3) & ~3);
listOfInt32(tvb, offsetp, t, hf_x11_randr_SetCrtcTransform_filter_params, hf_x11_randr_SetCrtcTransform_filter_params_item, (length - 48) / 4, byte_order);
}
@ -11042,8 +11050,14 @@ static void randrGetCrtcTransform_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
proto_tree_add_item(t, hf_x11_randr_GetCrtcTransform_reply_current_nparams, tvb, *offsetp, 2, byte_order);
*offsetp += 2;
listOfByte(tvb, offsetp, t, hf_x11_randr_GetCrtcTransform_reply_pending_filter_name, f_pending_len, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
listOfInt32(tvb, offsetp, t, hf_x11_randr_GetCrtcTransform_reply_pending_params, hf_x11_randr_GetCrtcTransform_reply_pending_params_item, f_pending_nparams, byte_order);
listOfByte(tvb, offsetp, t, hf_x11_randr_GetCrtcTransform_reply_current_filter_name, f_current_len, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
listOfInt32(tvb, offsetp, t, hf_x11_randr_GetCrtcTransform_reply_current_params, hf_x11_randr_GetCrtcTransform_reply_current_params_item, f_current_nparams, byte_order);
}
@ -12595,6 +12609,10 @@ static void renderSetPictureFilter(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
UNUSED(2);
listOfByte(tvb, offsetp, t, hf_x11_render_SetPictureFilter_filter, f_filter_len, byte_order);
length -= f_filter_len * 1;
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
length = ((length + 3) & ~3);
listOfInt32(tvb, offsetp, t, hf_x11_render_SetPictureFilter_values, hf_x11_render_SetPictureFilter_values_item, (length - 12) / 4, byte_order);
}
@ -12891,7 +12909,7 @@ static int struct_size_res_ClientIdValue(tvbuff_t *tvb _U_, int *offsetp _U_, gu
int size = 0;
int f_length;
f_length = VALUE32(tvb, *offsetp + size + 8);
size += f_length * 4;
size += (f_length / 4) * 4;
return size + 12;
}
@ -12909,7 +12927,7 @@ static void struct_res_ClientIdValue(tvbuff_t *tvb, int *offsetp, proto_tree *ro
f_length = VALUE32(tvb, *offsetp);
proto_tree_add_item(t, hf_x11_struct_res_ClientIdValue_length, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
listOfCard32(tvb, offsetp, t, hf_x11_struct_res_ClientIdValue_value, hf_x11_struct_res_ClientIdValue_value_item, f_length, byte_order);
listOfCard32(tvb, offsetp, t, hf_x11_struct_res_ClientIdValue_value, hf_x11_struct_res_ClientIdValue_value_item, (f_length / 4), byte_order);
}
}
@ -20894,6 +20912,7 @@ static int struct_size_xkb_Listing(tvbuff_t *tvb _U_, int *offsetp _U_, guint by
int f_length;
f_length = VALUE16(tvb, *offsetp + size + 2);
size += f_length * 1;
size = (size + 1) & ~1;
return size + 4;
}
@ -20913,6 +20932,9 @@ static void struct_xkb_Listing(tvbuff_t *tvb, int *offsetp, proto_tree *root, gu
proto_tree_add_item(t, hf_x11_struct_xkb_Listing_length, tvb, *offsetp, 2, byte_order);
*offsetp += 2;
listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_Listing_string, f_length, byte_order);
if (*offsetp % 2) {
UNUSED(2 - *offsetp % 2);
}
}
}
@ -23136,6 +23158,10 @@ static void xkbSetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto
if (f_present & (1U << 4)) {
listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_KeyActions_actionsCount, f_nKeyActions, byte_order);
length -= f_nKeyActions * 1;
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
length = ((length + 3) & ~3);
struct_xkb_Action(tvb, offsetp, t, byte_order, f_totalActions);
length -= f_totalActions * 8;
}
@ -23146,6 +23172,10 @@ static void xkbSetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto
if (f_present & (1U << 6)) {
listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_VirtualMods_vmods, popcount(f_virtualMods), byte_order);
length -= popcount(f_virtualMods) * 1;
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
length = ((length + 3) & ~3);
}
if (f_present & (1U << 3)) {
struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
@ -23736,7 +23766,9 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
}
}
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_nLevelsPerType, f_nTypes, byte_order);
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_alignment_pad, (((f_nTypes + 3) & (~3)) - f_nTypes), byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order);
}
if (f_which & (1U << 8)) {
@ -23887,6 +23919,10 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
}
listOfByte(tvb, offsetp, t, hf_x11_xkb_SetNames_KTLevelNames_nLevelsPerType, f_nTypes, byte_order);
length -= f_nTypes * 1;
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
length = ((length + 3) & ~3);
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;
}
@ -24332,6 +24368,9 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
}
if (f_present & (1U << 4)) {
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_KeyActions_acts_rtrn_count, f_nKeyActions, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
struct_xkb_Action(tvb, offsetp, t, byte_order, f_totalActions);
}
if (f_present & (1U << 5)) {
@ -24339,12 +24378,21 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
}
if (f_present & (1U << 6)) {
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
}
if (f_present & (1U << 3)) {
struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
}
if (f_present & (1U << 2)) {
struct_xkb_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
}
if (f_present & (1U << 7)) {
struct_xkb_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
@ -24532,6 +24580,9 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
}
}
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_nLevelsPerType, f_nTypes, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
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 & (1U << 8)) {
@ -24688,6 +24739,9 @@ static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_nameLen, tvb, *offsetp, 2, byte_order);
*offsetp += 2;
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetDeviceInfo_reply_name, f_nameLen, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
struct_xkb_Action(tvb, offsetp, t, byte_order, f_nBtnsRtrn);
struct_xkb_DeviceLedInfo(tvb, offsetp, t, byte_order, f_nDeviceLedFBs);
}
@ -25557,8 +25611,10 @@ static int struct_size_xprint_PRINTER(tvbuff_t *tvb _U_, int *offsetp _U_, guint
int f_nameLen;
f_nameLen = VALUE32(tvb, *offsetp + size + 0);
size += f_nameLen * 1;
size = (size + 3) & ~3;
f_descLen = VALUE32(tvb, *offsetp + size + 4);
size += f_descLen * 1;
size = (size + 3) & ~3;
return size + 8;
}
@ -25577,10 +25633,16 @@ static void struct_xprint_PRINTER(tvbuff_t *tvb, int *offsetp, proto_tree *root,
proto_tree_add_item(t, hf_x11_struct_xprint_PRINTER_nameLen, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
listOfByte(tvb, offsetp, t, hf_x11_struct_xprint_PRINTER_name, f_nameLen, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
f_descLen = VALUE32(tvb, *offsetp);
proto_tree_add_item(t, hf_x11_struct_xprint_PRINTER_descLen, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
listOfByte(tvb, offsetp, t, hf_x11_struct_xprint_PRINTER_description, f_descLen, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
}
}
@ -25834,14 +25896,15 @@ static void xprintPrintInputSelected_Reply(tvbuff_t *tvb, packet_info *pinfo, in
col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintInputSelected");
REPLY(reply);
proto_tree_add_item(t, hf_x11_xprint_PrintInputSelected_reply_event_mask, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
UNUSED(1);
sequence_number = VALUE16(tvb, *offsetp);
proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
"sequencenumber: %d (xprint-PrintInputSelected)", sequence_number);
*offsetp += 2;
proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
proto_tree_add_item(t, hf_x11_xprint_PrintInputSelected_reply_event_mask, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
proto_tree_add_item(t, hf_x11_xprint_PrintInputSelected_reply_all_events_mask, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
}
@ -26356,7 +26419,9 @@ static int struct_size_xselinux_ListItem(tvbuff_t *tvb _U_, int *offsetp _U_, gu
f_object_context_len = VALUE32(tvb, *offsetp + size + 4);
f_data_context_len = VALUE32(tvb, *offsetp + size + 8);
size += f_object_context_len * 1;
size = (size + 3) & ~3;
size += f_data_context_len * 1;
size = (size + 3) & ~3;
return size + 12;
}
@ -26380,7 +26445,13 @@ static void struct_xselinux_ListItem(tvbuff_t *tvb, int *offsetp, proto_tree *ro
proto_tree_add_item(t, hf_x11_struct_xselinux_ListItem_data_context_len, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
listOfByte(tvb, offsetp, t, hf_x11_struct_xselinux_ListItem_object_context, f_object_context_len, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
listOfByte(tvb, offsetp, t, hf_x11_struct_xselinux_ListItem_data_context, f_data_context_len, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
}
}
@ -27070,6 +27141,7 @@ static int struct_size_xv_EncodingInfo(tvbuff_t *tvb _U_, int *offsetp _U_, guin
int f_name_size;
f_name_size = VALUE16(tvb, *offsetp + size + 4);
size += f_name_size * 1;
size = (size + 3) & ~3;
return size + 20;
}
@ -27095,6 +27167,9 @@ static void struct_xv_EncodingInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root
UNUSED(2);
struct_xv_Rational(tvb, offsetp, t, byte_order, 1);
listOfByte(tvb, offsetp, t, hf_x11_struct_xv_EncodingInfo_name, f_name_size, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
}
}
@ -27104,6 +27179,7 @@ static int struct_size_xv_AttributeInfo(tvbuff_t *tvb _U_, int *offsetp _U_, gui
int f_size;
f_size = VALUE32(tvb, *offsetp + size + 12);
size += f_size * 1;
size = (size + 3) & ~3;
return size + 16;
}
@ -27132,6 +27208,9 @@ static void struct_xv_AttributeInfo(tvbuff_t *tvb, int *offsetp, proto_tree *roo
proto_tree_add_item(t, hf_x11_struct_xv_AttributeInfo_size, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
listOfByte(tvb, offsetp, t, hf_x11_struct_xv_AttributeInfo_name, f_size, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
}
}

23
epan/dissectors/x11-glx-render-enum.h
View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It was automatically generated by ../../tools/process-x11-xcb.pl
using mesa version 11.0-branchpoint-1379-g6f39546 */
using mesa version 12.0-branchpoint-413-g44e0c0e */
/*
* Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
*
@ -1318,11 +1318,18 @@ static const value_string mesa_enum[] = {
{ 0x821F, "BUFFER_IMMUTABLE_STORAGE" },
{ 0x8220, "BUFFER_STORAGE_FLAGS" },
{ 0x4000, "CLIENT_MAPPED_BUFFER_BARRIER_BIT" },
/* OpenGL extension GL_ARB_query_buffer_object */
{ 0x9194, "QUERY_RESULT_NO_WAIT" },
{ 0x9192, "QUERY_BUFFER" },
{ 0x9193, "QUERY_BUFFER_BINDING" },
/* OpenGL extension GL_ARB_conditional_render_inverted */
{ 0x8E17, "QUERY_WAIT_INVERTED" },
{ 0x8E18, "QUERY_NO_WAIT_INVERTED" },
{ 0x8E19, "QUERY_BY_REGION_WAIT_INVERTED" },
{ 0x8E1A, "QUERY_BY_REGION_NO_WAIT_INVERTED" },
/* OpenGL extension ARB_cull_distance */
{ 0x82F9, "MAX_CULL_DISTANCES" },
{ 0x82FA, "MAX_COMBINED_CLIP_AND_CULL_DISTANCES" },
/* OpenGL extension GL_EXT_blend_color */
{ 0x8001, "CONSTANT_COLOR_EXT" },
{ 0x8002, "ONE_MINUS_CONSTANT_COLOR_EXT" },
@ -1544,8 +1551,8 @@ static const value_string mesa_enum[] = {
{ 0x81A9, "ARRAY_ELEMENT_LOCK_COUNT_EXT" },
/* OpenGL extension GL_EXT_cull_vertex */
{ 0x81AA, "CULL_VERTEX_EXT" },
{ 0x81AB, "CULL_VERTEX_OBJECT_POSITION_EXT" },
{ 0x81AC, "CULL_VERTEX_EYE_POSITION_EXT" },
{ 0x81AB, "CULL_VERTEX_EYE_POSITION_EXT" },
{ 0x81AC, "CULL_VERTEX_OBJECT_POSITION_EXT" },
/* OpenGL extension GL_SGIX_fragment_lighting */
/* OpenGL extension GL_IBM_rasterpos_clip */
{ 0x19262, "RASTER_POSITION_UNCLIPPED_IBM" },
@ -1968,6 +1975,10 @@ static const value_string mesa_enum[] = {
/* OpenGL extension GL_EXT_framebuffer_sRGB */
{ 0x8DB9, "FRAMEBUFFER_SRGB_EXT" },
{ 0x8DBA, "FRAMEBUFFER_SRGB_CAPABLE_EXT" },
/* OpenGL extension GL_ATI_meminfo */
{ 0x87FB, "VBO_FREE_MEMORY_ATI" },
{ 0x87FC, "TEXTURE_FREE_MEMORY_ATI" },
{ 0x87FD, "RENDERBUFFER_FREE_MEMORY_ATI" },
/* OpenGL extension GL_APPLE_texture_range */
{ 0x85BC, "TEXTURE_STORAGE_HINT_APPLE" },
{ 0x85BD, "STORAGE_PRIVATE_APPLE" },
@ -1981,6 +1992,12 @@ static const value_string mesa_enum[] = {
{ 0x8A4A, "SKIP_DECODE_EXT" },
/* OpenGL extension GL_AMD_pinned_memory */
{ 0x9160, "EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD" },
/* OpenGL extension GL_NVX_gpu_memory_info */
{ 0x9047, "GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX" },
{ 0x9048, "GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX" },
{ 0x9049, "GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX" },
{ 0x904A, "GPU_MEMORY_INFO_EVICTION_COUNT_NVX" },
{ 0x904B, "GPU_MEMORY_INFO_EVICTED_MEMORY_NVX" },
/* OpenGL extension GL_EXT_polygon_offset_clamp */
{ 0x8E1B, "POLYGON_OFFSET_CLAMP_EXT" },
/* OpenGL extension GL_ATI_blend_equation_separate */

1
epan/dissectors/x11-register-info.h
View File

@ -6982,7 +6982,6 @@
{ &hf_x11_xkb_GetNames_reply_KeyTypeNames_typeNames, { "typeNames", "x11.xkb.GetNames.reply.KeyTypeNames.typeNames", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_x11_xkb_GetNames_reply_KeyTypeNames_typeNames_item, { "typeNames", "x11.xkb.GetNames.reply.KeyTypeNames.typeNames", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_x11_xkb_GetNames_reply_KTLevelNames_nLevelsPerType, { "nLevelsPerType", "x11.xkb.GetNames.reply.KTLevelNames.nLevelsPerType", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xkb_GetNames_reply_KTLevelNames_alignment_pad, { "alignment_pad", "x11.xkb.GetNames.reply.KTLevelNames.alignment_pad", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, { "ktLevelNames", "x11.xkb.GetNames.reply.KTLevelNames.ktLevelNames", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, { "ktLevelNames", "x11.xkb.GetNames.reply.KTLevelNames.ktLevelNames", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, { "indicatorNames", "x11.xkb.GetNames.reply.IndicatorNames.indicatorNames", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},