x11: proto_tree_add_uint_format -> proto_tree_add_uint_format_value

Change-Id: Ib8b80b2c4a79941cf56d8add783c88d1078f079a
Reviewed-on: https://code.wireshark.org/review/21104
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>

8 files changed, 651 insertions, 637 deletions

diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index b9b62ef06b..d8f0b1f5c2 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -42,10 +42,10 @@ add_custom_command(
 
 add_custom_target(x11-dissector
 	COMMAND ${PERL_EXECUTABLE}
-		${CMAKE_SOURCE_DIR}/tools/process-x11-fields.pl ${CMAKE_CURRENT_SOURCE_DIR}/dissectors
+		${CMAKE_SOURCE_DIR}/tools/process-x11-fields.pl ${CMAKE_CURRENT_SOURCE_DIR}
 		< ${CMAKE_CURRENT_SOURCE_DIR}/x11-fields
 	COMMAND ${PERL_EXECUTABLE}
-		${CMAKE_SOURCE_DIR}/tools/process-x11-xcb.pl ${CMAKE_CURRENT_SOURCE_DIR}/dissectors
+		${CMAKE_SOURCE_DIR}/tools/process-x11-xcb.pl ${CMAKE_CURRENT_SOURCE_DIR}
 	DEPENDS
 		x11-fields
 		${CMAKE_SOURCE_DIR}/tools/process-x11-fields.pl
diff --git a/epan/dissectors/x11-declarations.h b/epan/dissectors/x11-declarations.h
index cb78a6115c..37b041a91f 100644
--- a/epan/dissectors/x11-declarations.h
+++ b/epan/dissectors/x11-declarations.h
@@ -4546,14 +4546,6 @@ static int hf_x11_xinput_QueryDeviceState_device_id = -1;
 static int hf_x11_xinput_QueryDeviceState_reply_xi_reply_type = -1;
 static int hf_x11_xinput_QueryDeviceState_reply_num_classes = -1;
 static int hf_x11_xinput_QueryDeviceState_reply_classes = -1;
-static int hf_x11_xinput_SendExtensionEvent_destination = -1;
-static int hf_x11_xinput_SendExtensionEvent_device_id = -1;
-static int hf_x11_xinput_SendExtensionEvent_propagate = -1;
-static int hf_x11_xinput_SendExtensionEvent_num_classes = -1;
-static int hf_x11_xinput_SendExtensionEvent_num_events = -1;
-static int hf_x11_xinput_SendExtensionEvent_events = -1;
-static int hf_x11_xinput_SendExtensionEvent_classes = -1;
-static int hf_x11_xinput_SendExtensionEvent_classes_item = -1;
 static int hf_x11_xinput_DeviceBell_device_id = -1;
 static int hf_x11_xinput_DeviceBell_feedback_id = -1;
 static int hf_x11_xinput_DeviceBell_feedback_class = -1;
@@ -5142,6 +5134,14 @@ static int hf_x11_xinput_BarrierHit_root_x = -1;
 static int hf_x11_xinput_BarrierHit_root_y = -1;
 static int hf_x11_xinput_BarrierHit_dx = -1;
 static int hf_x11_xinput_BarrierHit_dy = -1;
+static int hf_x11_xinput_SendExtensionEvent_destination = -1;
+static int hf_x11_xinput_SendExtensionEvent_device_id = -1;
+static int hf_x11_xinput_SendExtensionEvent_propagate = -1;
+static int hf_x11_xinput_SendExtensionEvent_num_classes = -1;
+static int hf_x11_xinput_SendExtensionEvent_num_events = -1;
+static int hf_x11_xinput_SendExtensionEvent_events = -1;
+static int hf_x11_xinput_SendExtensionEvent_classes = -1;
+static int hf_x11_xinput_SendExtensionEvent_classes_item = -1;
 static int hf_x11_xinput_extension_minor = -1;
 
 static int hf_x11_struct_xkb_IndicatorMap = -1;
diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h
index 904e5ab250..c66ff7220e 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.12-4-g95a262e */
+   using xcbproto version 1.12-9-g97fbba2 */
 /*
  * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
  *
diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h
index 4a65fdfb04..4fb4256bee 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.12-4-g95a262e */
+   using xcbproto version 1.12-9-g97fbba2 */
 /*
  * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
  *
diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h
index ae0a323b69..e9d93c2585 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.12-4-g95a262e */
+   using xcbproto version 1.12-9-g97fbba2 */
 /*
  * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
  *
@@ -4879,8 +4879,8 @@ static void bigreqEnable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (bigreq-Enable)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (bigreq-Enable)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5318,8 +5318,8 @@ static void compositeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (composite-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (composite-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5392,8 +5392,8 @@ static void compositeGetOverlayWindow_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (composite-GetOverlayWindow)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (composite-GetOverlayWindow)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5491,8 +5491,8 @@ static void damageQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (damage-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (damage-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5601,8 +5601,8 @@ static void dpmsGetVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dpms-GetVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dpms-GetVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5624,8 +5624,8 @@ static void dpmsCapable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dpms-Capable)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dpms-Capable)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5646,8 +5646,8 @@ static void dpmsGetTimeouts_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dpms-GetTimeouts)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dpms-GetTimeouts)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5695,8 +5695,8 @@ static void dpmsInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dpms-Info)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dpms-Info)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5823,8 +5823,8 @@ static void dri2QueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri2-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri2-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5851,8 +5851,8 @@ static void dri2Connect_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri2-Connect)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri2-Connect)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5884,8 +5884,8 @@ static void dri2Authenticate_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri2-Authenticate)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri2-Authenticate)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5923,8 +5923,8 @@ static void dri2GetBuffers_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri2-GetBuffers)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri2-GetBuffers)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5959,8 +5959,8 @@ static void dri2CopyRegion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri2-CopyRegion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri2-CopyRegion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -5984,8 +5984,8 @@ static void dri2GetBuffersWithFormat_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri2-GetBuffersWithFormat)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri2-GetBuffersWithFormat)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6026,8 +6026,8 @@ static void dri2SwapBuffers_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri2-SwapBuffers)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri2-SwapBuffers)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6051,8 +6051,8 @@ static void dri2GetMSC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pr
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri2-GetMSC)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri2-GetMSC)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6096,8 +6096,8 @@ static void dri2WaitMSC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri2-WaitMSC)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri2-WaitMSC)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6133,8 +6133,8 @@ static void dri2WaitSBC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri2-WaitSBC)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri2-WaitSBC)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6177,8 +6177,8 @@ static void dri2GetParam_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     proto_tree_add_item(t, hf_x11_dri2_GetParam_reply_is_param_recognized, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri2-GetParam)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri2-GetParam)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6310,8 +6310,8 @@ static void dri3QueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri3-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri3-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6338,8 +6338,8 @@ static void dri3Open_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
     proto_tree_add_item(t, hf_x11_dri3_Open_reply_nfd, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri3-Open)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri3-Open)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6381,8 +6381,8 @@ static void dri3BufferFromPixmap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_item(t, hf_x11_dri3_BufferFromPixmap_reply_nfd, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri3-BufferFromPixmap)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri3-BufferFromPixmap)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6429,8 +6429,8 @@ static void dri3FDFromFence_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_item(t, hf_x11_dri3_FDFromFence_reply_nfd, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (dri3-FDFromFence)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (dri3-FDFromFence)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6510,8 +6510,8 @@ static void geQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (ge-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (ge-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6640,8 +6640,8 @@ static void glxMakeCurrent_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-MakeCurrent)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-MakeCurrent)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6664,8 +6664,8 @@ static void glxIsDirect_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-IsDirect)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-IsDirect)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6690,8 +6690,8 @@ static void glxQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6775,8 +6775,8 @@ static void glxGetVisualConfigs_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetVisualConfigs)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetVisualConfigs)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -6822,8 +6822,8 @@ static void glxVendorPrivateWithReply_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-VendorPrivateWithReply)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-VendorPrivateWithReply)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -6848,8 +6848,8 @@ static void glxQueryExtensionsString_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-QueryExtensionsString)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-QueryExtensionsString)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6876,8 +6876,8 @@ static void glxQueryServerString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-QueryServerString)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-QueryServerString)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -6918,8 +6918,8 @@ static void glxGetFBConfigs_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetFBConfigs)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetFBConfigs)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -6988,8 +6988,8 @@ static void glxQueryContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-QueryContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-QueryContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7020,8 +7020,8 @@ static void glxMakeContextCurrent_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-MakeContextCurrent)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-MakeContextCurrent)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7067,8 +7067,8 @@ static void glxGetDrawableAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetDrawableAttributes)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetDrawableAttributes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7230,8 +7230,8 @@ static void glxGenLists_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GenLists)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GenLists)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7274,8 +7274,8 @@ static void glxRenderMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-RenderMode)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-RenderMode)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7304,8 +7304,8 @@ static void glxFinish_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-Finish)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-Finish)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7362,8 +7362,8 @@ static void glxReadPixels_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-ReadPixels)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-ReadPixels)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -7389,8 +7389,8 @@ static void glxGetBooleanv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetBooleanv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetBooleanv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7421,8 +7421,8 @@ static void glxGetClipPlane_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetClipPlane)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetClipPlane)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -7448,8 +7448,8 @@ static void glxGetDoublev_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetDoublev)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetDoublev)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7477,8 +7477,8 @@ static void glxGetError_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetError)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetError)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7503,8 +7503,8 @@ static void glxGetFloatv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetFloatv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetFloatv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7535,8 +7535,8 @@ static void glxGetIntegerv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetIntegerv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetIntegerv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7569,8 +7569,8 @@ static void glxGetLightfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetLightfv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetLightfv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7603,8 +7603,8 @@ static void glxGetLightiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetLightiv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetLightiv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7637,8 +7637,8 @@ static void glxGetMapdv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetMapdv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetMapdv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7671,8 +7671,8 @@ static void glxGetMapfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetMapfv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetMapfv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7705,8 +7705,8 @@ static void glxGetMapiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetMapiv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetMapiv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7739,8 +7739,8 @@ static void glxGetMaterialfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetMaterialfv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetMaterialfv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7773,8 +7773,8 @@ static void glxGetMaterialiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetMaterialiv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetMaterialiv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7805,8 +7805,8 @@ static void glxGetPixelMapfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetPixelMapfv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetPixelMapfv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7837,8 +7837,8 @@ static void glxGetPixelMapuiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetPixelMapuiv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetPixelMapuiv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7869,8 +7869,8 @@ static void glxGetPixelMapusv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetPixelMapusv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetPixelMapusv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7901,8 +7901,8 @@ static void glxGetPolygonStipple_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetPolygonStipple)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetPolygonStipple)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -7928,8 +7928,8 @@ static void glxGetString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetString)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetString)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7960,8 +7960,8 @@ static void glxGetTexEnvfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetTexEnvfv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetTexEnvfv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -7994,8 +7994,8 @@ static void glxGetTexEnviv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetTexEnviv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetTexEnviv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8028,8 +8028,8 @@ static void glxGetTexGendv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetTexGendv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetTexGendv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8062,8 +8062,8 @@ static void glxGetTexGenfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetTexGenfv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetTexGenfv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8096,8 +8096,8 @@ static void glxGetTexGeniv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetTexGeniv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetTexGeniv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8136,8 +8136,8 @@ static void glxGetTexImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetTexImage)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetTexImage)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -8172,8 +8172,8 @@ static void glxGetTexParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetTexParameterfv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetTexParameterfv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8206,8 +8206,8 @@ static void glxGetTexParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetTexParameteriv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetTexParameteriv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8242,8 +8242,8 @@ static void glxGetTexLevelParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetTexLevelParameterfv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetTexLevelParameterfv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8278,8 +8278,8 @@ static void glxGetTexLevelParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetTexLevelParameteriv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetTexLevelParameteriv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8309,8 +8309,8 @@ static void glxIsEnabled_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-IsEnabled)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-IsEnabled)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8334,8 +8334,8 @@ static void glxIsList_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-IsList)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-IsList)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8370,8 +8370,8 @@ static void glxAreTexturesResident_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-AreTexturesResident)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-AreTexturesResident)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -8411,8 +8411,8 @@ static void glxGenTextures_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GenTextures)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GenTextures)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -8437,8 +8437,8 @@ static void glxIsTexture_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-IsTexture)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-IsTexture)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8469,8 +8469,8 @@ static void glxGetColorTable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetColorTable)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetColorTable)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -8501,8 +8501,8 @@ static void glxGetColorTableParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetColorTableParameterfv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetColorTableParameterfv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8535,8 +8535,8 @@ static void glxGetColorTableParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetColorTableParameteriv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetColorTableParameteriv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8573,8 +8573,8 @@ static void glxGetConvolutionFilter_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetConvolutionFilter)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetConvolutionFilter)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -8607,8 +8607,8 @@ static void glxGetConvolutionParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetConvolutionParameterfv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetConvolutionParameterfv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8641,8 +8641,8 @@ static void glxGetConvolutionParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetConvolutionParameteriv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetConvolutionParameteriv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8679,8 +8679,8 @@ static void glxGetSeparableFilter_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetSeparableFilter)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetSeparableFilter)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -8719,8 +8719,8 @@ static void glxGetHistogram_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetHistogram)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetHistogram)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -8751,8 +8751,8 @@ static void glxGetHistogramParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetHistogramParameterfv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetHistogramParameterfv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8785,8 +8785,8 @@ static void glxGetHistogramParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetHistogramParameteriv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetHistogramParameteriv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8825,8 +8825,8 @@ static void glxGetMinmax_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetMinmax)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetMinmax)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -8854,8 +8854,8 @@ static void glxGetMinmaxParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetMinmaxParameterfv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetMinmaxParameterfv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8888,8 +8888,8 @@ static void glxGetMinmaxParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetMinmaxParameteriv)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetMinmaxParameteriv)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -8922,8 +8922,8 @@ static void glxGetCompressedTexImageARB_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetCompressedTexImageARB)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetCompressedTexImageARB)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -8964,8 +8964,8 @@ static void glxGenQueriesARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GenQueriesARB)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GenQueriesARB)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -8990,8 +8990,8 @@ static void glxIsQueryARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-IsQueryARB)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-IsQueryARB)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -9018,8 +9018,8 @@ static void glxGetQueryivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetQueryivARB)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetQueryivARB)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -9052,8 +9052,8 @@ static void glxGetQueryObjectivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetQueryObjectivARB)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetQueryObjectivARB)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -9086,8 +9086,8 @@ static void glxGetQueryObjectuivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (glx-GetQueryObjectuivARB)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (glx-GetQueryObjectuivARB)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10017,8 +10017,8 @@ static void presentQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (present-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (present-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10108,8 +10108,8 @@ static void presentQueryCapabilities_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (present-QueryCapabilities)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (present-QueryCapabilities)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10119,8 +10119,8 @@ static void presentQueryCapabilities_Reply(tvbuff_t *tvb, packet_info *pinfo, in
 
 static void presentCompleteNotify(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
 {
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 1,
-                               "opcode: CompleteNotify (1)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 1,
+                               "CompleteNotify (1)");
     field8(tvb, offsetp, t, hf_x11_present_CompleteNotify_kind, byte_order);
     field8(tvb, offsetp, t, hf_x11_present_CompleteNotify_mode, byte_order);
     proto_tree_add_item(t, hf_x11_present_CompleteNotify_event, tvb, *offsetp, 4, byte_order);
@@ -10138,8 +10138,8 @@ static void presentCompleteNotify(tvbuff_t *tvb, int length _U_, int *offsetp, p
 
 static void presentIdleNotify(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
 {
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 2,
-                               "opcode: IdleNotify (2)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 2,
+                               "IdleNotify (2)");
     UNUSED(2);
     proto_tree_add_item(t, hf_x11_present_IdleNotify_event, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10156,8 +10156,8 @@ static void presentIdleNotify(tvbuff_t *tvb, int length _U_, int *offsetp, proto
 
 static void presentRedirectNotify(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
 {
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 3,
-                               "opcode: RedirectNotify (3)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 3,
+                               "RedirectNotify (3)");
     proto_tree_add_item(t, hf_x11_present_RedirectNotify_update_window, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
@@ -10274,8 +10274,8 @@ static void randrQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10320,8 +10320,8 @@ static void randrSetScreenConfig_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_randr_SetScreenConfig_reply_status, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-SetScreenConfig)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-SetScreenConfig)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10380,8 +10380,8 @@ static void randrGetScreenInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     }
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetScreenInfo)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetScreenInfo)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10431,8 +10431,8 @@ static void randrGetScreenSizeRange_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetScreenSizeRange)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetScreenSizeRange)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10479,8 +10479,8 @@ static void randrGetScreenResources_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetScreenResources)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetScreenResources)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10527,8 +10527,8 @@ static void randrGetOutputInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_status, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetOutputInfo)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetOutputInfo)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10577,8 +10577,8 @@ static void randrListOutputProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-ListOutputProperties)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-ListOutputProperties)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10606,8 +10606,8 @@ static void randrQueryOutputProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-QueryOutputProperty)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-QueryOutputProperty)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -10696,8 +10696,8 @@ static void randrGetOutputProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_reply_format, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetOutputProperty)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetOutputProperty)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10727,8 +10727,8 @@ static void randrCreateMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-CreateMode)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-CreateMode)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10777,8 +10777,8 @@ static void randrGetCrtcInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_randr_GetCrtcInfo_reply_status, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetCrtcInfo)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetCrtcInfo)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10863,8 +10863,8 @@ static void randrSetCrtcConfig_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_randr_SetCrtcConfig_reply_status, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-SetCrtcConfig)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-SetCrtcConfig)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10887,8 +10887,8 @@ static void randrGetCrtcGammaSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetCrtcGammaSize)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetCrtcGammaSize)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10912,8 +10912,8 @@ static void randrGetCrtcGamma_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetCrtcGamma)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetCrtcGamma)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -10961,8 +10961,8 @@ static void randrGetScreenResourcesCurrent_Reply(tvbuff_t *tvb, packet_info *pin
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetScreenResourcesCurrent)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetScreenResourcesCurrent)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -11026,8 +11026,8 @@ static void randrGetCrtcTransform_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetCrtcTransform)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetCrtcTransform)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -11075,8 +11075,8 @@ static void randrGetPanning_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_randr_GetPanning_reply_status, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetPanning)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetPanning)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -11148,8 +11148,8 @@ static void randrSetPanning_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_randr_SetPanning_reply_status, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-SetPanning)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-SetPanning)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -11179,8 +11179,8 @@ static void randrGetOutputPrimary_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetOutputPrimary)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetOutputPrimary)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -11203,8 +11203,8 @@ static void randrGetProviders_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetProviders)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetProviders)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -11238,8 +11238,8 @@ static void randrGetProviderInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_status, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetProviderInfo)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetProviderInfo)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -11309,8 +11309,8 @@ static void randrListProviderProperties_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-ListProviderProperties)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-ListProviderProperties)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -11338,8 +11338,8 @@ static void randrQueryProviderProperty_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-QueryProviderProperty)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-QueryProviderProperty)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -11430,8 +11430,8 @@ static void randrGetProviderProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_reply_format, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetProviderProperty)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetProviderProperty)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -11498,8 +11498,8 @@ static void randrGetMonitors_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (randr-GetMonitors)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (randr-GetMonitors)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -11869,8 +11869,8 @@ static void recordQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (record-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (record-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -11950,8 +11950,8 @@ static void recordGetContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_item(t, hf_x11_record_GetContext_reply_enabled, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (record-GetContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (record-GetContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -11981,8 +11981,8 @@ static void recordEnableContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     proto_tree_add_item(t, hf_x11_record_EnableContext_reply_category, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (record-EnableContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (record-EnableContext)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -12094,8 +12094,8 @@ static void renderQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (render-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (render-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -12121,8 +12121,8 @@ static void renderQueryPictFormats_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (render-QueryPictFormats)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (render-QueryPictFormats)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -12160,8 +12160,8 @@ static void renderQueryPictIndexValues_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (render-QueryPictIndexValues)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (render-QueryPictIndexValues)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -12582,8 +12582,8 @@ static void renderQueryFilters_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (render-QueryFilters)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (render-QueryFilters)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13009,8 +13009,8 @@ static void resQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (res-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (res-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13033,8 +13033,8 @@ static void resQueryClients_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (res-QueryClients)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (res-QueryClients)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13060,8 +13060,8 @@ static void resQueryClientResources_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (res-QueryClientResources)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (res-QueryClientResources)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13086,8 +13086,8 @@ static void resQueryClientPixmapBytes_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (res-QueryClientPixmapBytes)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (res-QueryClientPixmapBytes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13116,8 +13116,8 @@ static void resQueryClientIds_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (res-QueryClientIds)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (res-QueryClientIds)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13149,8 +13149,8 @@ static void resQueryResourceBytes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (res-QueryResourceBytes)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (res-QueryResourceBytes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13237,8 +13237,8 @@ static void screensaverQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (screensaver-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (screensaver-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13264,8 +13264,8 @@ static void screensaverQueryInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_item(t, hf_x11_screensaver_QueryInfo_reply_state, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (screensaver-QueryInfo)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (screensaver-QueryInfo)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13526,8 +13526,8 @@ static void shapeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (shape-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (shape-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13608,8 +13608,8 @@ static void shapeQueryExtents_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (shape-QueryExtents)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (shape-QueryExtents)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13660,8 +13660,8 @@ static void shapeInputSelected_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     proto_tree_add_item(t, hf_x11_shape_InputSelected_reply_enabled, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (shape-InputSelected)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (shape-InputSelected)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13684,8 +13684,8 @@ static void shapeGetRectangles_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_shape_GetRectangles_reply_ordering, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (shape-GetRectangles)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (shape-GetRectangles)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13778,8 +13778,8 @@ static void shmQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_item(t, hf_x11_shm_QueryVersion_reply_shared_pixmaps, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (shm-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (shm-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13880,8 +13880,8 @@ static void shmGetImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_item(t, hf_x11_shm_GetImage_reply_depth, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (shm-GetImage)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (shm-GetImage)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -13939,8 +13939,8 @@ static void shmCreateSegment_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_item(t, hf_x11_shm_CreateSegment_reply_nfd, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (shm-CreateSegment)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (shm-CreateSegment)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14027,8 +14027,8 @@ static void syncInitialize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (sync-Initialize)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (sync-Initialize)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14052,8 +14052,8 @@ static void syncListSystemCounters_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (sync-ListSystemCounters)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (sync-ListSystemCounters)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14091,8 +14091,8 @@ static void syncQueryCounter_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (sync-QueryCounter)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (sync-QueryCounter)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14216,8 +14216,8 @@ static void syncQueryAlarm_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (sync-QueryAlarm)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (sync-QueryAlarm)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14251,8 +14251,8 @@ static void syncGetPriority_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (sync-GetPriority)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (sync-GetPriority)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14302,8 +14302,8 @@ static void syncQueryFence_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (sync-QueryFence)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (sync-QueryFence)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14465,8 +14465,8 @@ static void xc_miscGetVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xc_misc-GetVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xc_misc-GetVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14488,8 +14488,8 @@ static void xc_miscGetXIDRange_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xc_misc-GetXIDRange)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xc_misc-GetXIDRange)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14514,8 +14514,8 @@ static void xc_miscGetXIDList_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xc_misc-GetXIDList)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xc_misc-GetXIDList)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14586,8 +14586,8 @@ static void xevieQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xevie-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xevie-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14612,8 +14612,8 @@ static void xevieStart_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pr
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xevie-Start)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xevie-Start)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14634,8 +14634,8 @@ static void xevieEnd_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xevie-End)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xevie-End)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14671,8 +14671,8 @@ static void xevieSend_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xevie-Send)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xevie-Send)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14693,8 +14693,8 @@ static void xevieSelectInput_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xevie-SelectInput)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xevie-SelectInput)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14787,8 +14787,8 @@ static void xf86driQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86dri-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86dri-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14814,8 +14814,8 @@ static void xf86driQueryDirectRenderingCapable_Reply(tvbuff_t *tvb, packet_info
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86dri-QueryDirectRenderingCapable)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86dri-QueryDirectRenderingCapable)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14838,8 +14838,8 @@ static void xf86driOpenConnection_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86dri-OpenConnection)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86dri-OpenConnection)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14875,8 +14875,8 @@ static void xf86driGetClientDriverName_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86dri-GetClientDriverName)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86dri-GetClientDriverName)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14911,8 +14911,8 @@ static void xf86driCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86dri-CreateContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86dri-CreateContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14944,8 +14944,8 @@ static void xf86driCreateDrawable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86dri-CreateDrawable)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86dri-CreateDrawable)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -14979,8 +14979,8 @@ static void xf86driGetDrawableInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86dri-GetDrawableInfo)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86dri-GetDrawableInfo)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15025,8 +15025,8 @@ static void xf86driGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86dri-GetDeviceInfo)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86dri-GetDeviceInfo)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15062,8 +15062,8 @@ static void xf86driAuthConnection_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86dri-AuthConnection)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86dri-AuthConnection)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15223,8 +15223,8 @@ static void xf86vidmodeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86vidmode-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86vidmode-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15250,8 +15250,8 @@ static void xf86vidmodeGetModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86vidmode-GetModeLine)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86vidmode-GetModeLine)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15378,8 +15378,8 @@ static void xf86vidmodeGetMonitor_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86vidmode-GetMonitor)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86vidmode-GetMonitor)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15427,8 +15427,8 @@ static void xf86vidmodeGetAllModeLines_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86vidmode-GetAllModeLines)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86vidmode-GetAllModeLines)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15643,8 +15643,8 @@ static void xf86vidmodeValidateModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86vidmode-ValidateModeLine)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86vidmode-ValidateModeLine)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15720,8 +15720,8 @@ static void xf86vidmodeGetViewPort_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86vidmode-GetViewPort)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86vidmode-GetViewPort)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15760,8 +15760,8 @@ static void xf86vidmodeGetDotClocks_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86vidmode-GetDotClocks)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86vidmode-GetDotClocks)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15818,8 +15818,8 @@ static void xf86vidmodeGetGamma_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86vidmode-GetGamma)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86vidmode-GetGamma)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15849,8 +15849,8 @@ static void xf86vidmodeGetGammaRamp_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86vidmode-GetGammaRamp)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86vidmode-GetGammaRamp)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15894,8 +15894,8 @@ static void xf86vidmodeGetGammaRampSize_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86vidmode-GetGammaRampSize)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86vidmode-GetGammaRampSize)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -15919,8 +15919,8 @@ static void xf86vidmodeGetPermissions_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xf86vidmode-GetPermissions)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xf86vidmode-GetPermissions)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -16074,8 +16074,8 @@ static void xfixesQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xfixes-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xfixes-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -16153,8 +16153,8 @@ static void xfixesGetCursorImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xfixes-GetCursorImage)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xfixes-GetCursorImage)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -16312,8 +16312,8 @@ static void xfixesFetchRegion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xfixes-FetchRegion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xfixes-FetchRegion)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -16386,8 +16386,8 @@ static void xfixesGetCursorName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xfixes-GetCursorName)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xfixes-GetCursorName)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -16414,8 +16414,8 @@ static void xfixesGetCursorImageAndName_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xfixes-GetCursorImageAndName)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xfixes-GetCursorImageAndName)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -16734,8 +16734,8 @@ static void xineramaQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinerama-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinerama-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -16760,8 +16760,8 @@ static void xineramaGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_item(t, hf_x11_xinerama_GetState_reply_state, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinerama-GetState)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinerama-GetState)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -16784,8 +16784,8 @@ static void xineramaGetScreenCount_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_item(t, hf_x11_xinerama_GetScreenCount_reply_screen_count, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinerama-GetScreenCount)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinerama-GetScreenCount)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -16809,8 +16809,8 @@ static void xineramaGetScreenSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinerama-GetScreenSize)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinerama-GetScreenSize)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -16836,8 +16836,8 @@ static void xineramaIsActive_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinerama-IsActive)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinerama-IsActive)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -16858,8 +16858,8 @@ static void xineramaQueryScreens_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinerama-QueryScreens)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinerama-QueryScreens)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -16965,8 +16965,8 @@ static void xinputGetExtensionVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_item(t, hf_x11_xinput_GetExtensionVersion_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-GetExtensionVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-GetExtensionVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17077,8 +17077,8 @@ static void xinputListInputDevices_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_item(t, hf_x11_xinput_ListInputDevices_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-ListInputDevices)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-ListInputDevices)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17126,8 +17126,8 @@ static void xinputOpenDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_item(t, hf_x11_xinput_OpenDevice_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-OpenDevice)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-OpenDevice)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17165,8 +17165,8 @@ static void xinputSetDeviceMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceMode_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-SetDeviceMode)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-SetDeviceMode)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17204,8 +17204,8 @@ static void xinputGetSelectedExtensionEvents_Reply(tvbuff_t *tvb, packet_info *p
     proto_tree_add_item(t, hf_x11_xinput_GetSelectedExtensionEvents_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-GetSelectedExtensionEvents)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-GetSelectedExtensionEvents)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17250,8 +17250,8 @@ static void xinputGetDeviceDontPropagateList_Reply(tvbuff_t *tvb, packet_info *p
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceDontPropagateList_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-GetDeviceDontPropagateList)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-GetDeviceDontPropagateList)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17305,8 +17305,8 @@ static void xinputGetDeviceMotionEvents_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-GetDeviceMotionEvents)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-GetDeviceMotionEvents)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17337,8 +17337,8 @@ static void xinputChangeKeyboardDevice_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_item(t, hf_x11_xinput_ChangeKeyboardDevice_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-ChangeKeyboardDevice)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-ChangeKeyboardDevice)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17366,8 +17366,8 @@ static void xinputChangePointerDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_item(t, hf_x11_xinput_ChangePointerDevice_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-ChangePointerDevice)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-ChangePointerDevice)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17404,8 +17404,8 @@ static void xinputGrabDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_item(t, hf_x11_xinput_GrabDevice_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-GrabDevice)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-GrabDevice)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17565,8 +17565,8 @@ static void xinputGetDeviceFocus_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceFocus_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-GetDeviceFocus)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-GetDeviceFocus)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17687,8 +17687,8 @@ static void xinputGetFeedbackControl_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_item(t, hf_x11_xinput_GetFeedbackControl_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-GetFeedbackControl)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-GetFeedbackControl)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17821,8 +17821,8 @@ static void xinputGetDeviceKeyMapping_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceKeyMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-GetDeviceKeyMapping)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-GetDeviceKeyMapping)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -17868,8 +17868,8 @@ static void xinputGetDeviceModifierMapping_Reply(tvbuff_t *tvb, packet_info *pin
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceModifierMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-GetDeviceModifierMapping)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-GetDeviceModifierMapping)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17902,8 +17902,8 @@ static void xinputSetDeviceModifierMapping_Reply(tvbuff_t *tvb, packet_info *pin
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceModifierMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-SetDeviceModifierMapping)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-SetDeviceModifierMapping)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17928,8 +17928,8 @@ static void xinputGetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceButtonMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-GetDeviceButtonMapping)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-GetDeviceButtonMapping)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -17965,8 +17965,8 @@ static void xinputSetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceButtonMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-SetDeviceButtonMapping)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-SetDeviceButtonMapping)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -18039,8 +18039,8 @@ static void xinputQueryDeviceState_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_item(t, hf_x11_xinput_QueryDeviceState_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-QueryDeviceState)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-QueryDeviceState)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -18051,29 +18051,6 @@ static void xinputQueryDeviceState_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     struct_xinput_InputState(tvb, offsetp, t, byte_order, f_num_classes);
 }
 
-static void xinputSendExtensionEvent(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
-{
-    int f_num_classes;
-    int f_num_events;
-    proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_destination, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_device_id, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_propagate, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_num_classes = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_num_classes, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_num_events = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_num_events, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    UNUSED(3);
-    listOfByte(tvb, offsetp, t, hf_x11_xinput_SendExtensionEvent_events, (f_num_events * 32), byte_order);
-    length -= (f_num_events * 32) * 1;
-    listOfCard32(tvb, offsetp, t, hf_x11_xinput_SendExtensionEvent_classes, hf_x11_xinput_SendExtensionEvent_classes_item, f_num_classes, byte_order);
-    length -= f_num_classes * 4;
-}
-
 static void xinputDeviceBell(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     proto_tree_add_item(t, hf_x11_xinput_DeviceBell_device_id, tvb, *offsetp, 1, byte_order);
@@ -18110,8 +18087,8 @@ static void xinputSetDeviceValuators_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceValuators_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-SetDeviceValuators)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-SetDeviceValuators)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -18211,8 +18188,8 @@ static void xinputGetDeviceControl_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceControl_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-GetDeviceControl)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-GetDeviceControl)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -18313,8 +18290,8 @@ static void xinputChangeDeviceControl_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceControl_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-ChangeDeviceControl)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-ChangeDeviceControl)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -18339,8 +18316,8 @@ static void xinputListDeviceProperties_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_item(t, hf_x11_xinput_ListDeviceProperties_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-ListDeviceProperties)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-ListDeviceProperties)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -18426,8 +18403,8 @@ static void xinputGetDeviceProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_reply_xi_reply_type, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-GetDeviceProperty)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-GetDeviceProperty)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -18516,8 +18493,8 @@ static void xinputXIQueryPointer_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-XIQueryPointer)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-XIQueryPointer)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -18660,8 +18637,8 @@ static void xinputXIGetClientPointer_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-XIGetClientPointer)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-XIGetClientPointer)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -18728,8 +18705,8 @@ static void xinputXIQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-XIQueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-XIQueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -18874,8 +18851,8 @@ static void xinputXIQueryDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-XIQueryDevice)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-XIQueryDevice)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -18909,8 +18886,8 @@ static void xinputXIGetFocus_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-XIGetFocus)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-XIGetFocus)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -18947,8 +18924,8 @@ static void xinputXIGrabDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-XIGrabDevice)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-XIGrabDevice)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -19028,8 +19005,8 @@ static void xinputXIPassiveGrabDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-XIPassiveGrabDevice)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-XIPassiveGrabDevice)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -19072,8 +19049,8 @@ static void xinputXIListProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-XIListProperties)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-XIListProperties)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -19154,8 +19131,8 @@ static void xinputXIGetProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-XIGetProperty)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-XIGetProperty)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -19200,8 +19177,8 @@ static void xinputXIGetSelectedEvents_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xinput-XIGetSelectedEvents)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xinput-XIGetSelectedEvents)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -19409,8 +19386,8 @@ static void xinputDevicePropertyNotify(tvbuff_t *tvb, int *offsetp, proto_tree *
 static void xinputDeviceChanged(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
 {
     int f_num_classes;
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 1,
-                               "opcode: DeviceChanged (1)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 1,
+                               "DeviceChanged (1)");
     field16(tvb, offsetp, t, hf_x11_xinput_DeviceChanged_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_DeviceChanged_time, byte_order);
     f_num_classes = VALUE16(tvb, *offsetp);
@@ -19428,8 +19405,8 @@ static void xinputKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tr
     int f_buttons_len;
     int f_valuators_len;
     int sumof_valuator_mask = 0;
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 2,
-                               "opcode: KeyPress (2)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 2,
+                               "KeyPress (2)");
     field16(tvb, offsetp, t, hf_x11_xinput_KeyPress_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_KeyPress_time, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_KeyPress_detail, tvb, *offsetp, 4, byte_order);
@@ -19481,8 +19458,8 @@ static void xinputButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto
     int f_buttons_len;
     int f_valuators_len;
     int sumof_valuator_mask = 0;
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 4,
-                               "opcode: ButtonPress (4)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 4,
+                               "ButtonPress (4)");
     field16(tvb, offsetp, t, hf_x11_xinput_ButtonPress_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_ButtonPress_time, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_ButtonPress_detail, tvb, *offsetp, 4, byte_order);
@@ -19532,8 +19509,8 @@ static void xinputButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto
 static void xinputEnter(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
 {
     int f_buttons_len;
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 7,
-                               "opcode: Enter (7)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 7,
+                               "Enter (7)");
     field16(tvb, offsetp, t, hf_x11_xinput_Enter_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_Enter_time, byte_order);
     field16(tvb, offsetp, t, hf_x11_xinput_Enter_sourceid, byte_order);
@@ -19600,8 +19577,8 @@ static void struct_xinput_HierarchyInfo(tvbuff_t *tvb, int *offsetp, proto_tree
 static void xinputHierarchy(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
 {
     int f_num_infos;
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 11,
-                               "opcode: Hierarchy (11)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 11,
+                               "Hierarchy (11)");
     field16(tvb, offsetp, t, hf_x11_xinput_Hierarchy_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_Hierarchy_time, byte_order);
     {
@@ -19627,8 +19604,8 @@ static void xinputHierarchy(tvbuff_t *tvb, int length _U_, int *offsetp, proto_t
 
 static void xinputProperty(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
 {
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 12,
-                               "opcode: Property (12)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 12,
+                               "Property (12)");
     field16(tvb, offsetp, t, hf_x11_xinput_Property_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_Property_time, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_Property_property, tvb, *offsetp, 4, byte_order);
@@ -19642,8 +19619,8 @@ static void xinputRawKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto
 {
     int f_valuators_len;
     int sumof_valuator_mask = 0;
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 13,
-                               "opcode: RawKeyPress (13)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 13,
+                               "RawKeyPress (13)");
     field16(tvb, offsetp, t, hf_x11_xinput_RawKeyPress_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_RawKeyPress_time, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_RawKeyPress_detail, tvb, *offsetp, 4, byte_order);
@@ -19676,8 +19653,8 @@ static void xinputRawButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, pr
 {
     int f_valuators_len;
     int sumof_valuator_mask = 0;
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 15,
-                               "opcode: RawButtonPress (15)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 15,
+                               "RawButtonPress (15)");
     field16(tvb, offsetp, t, hf_x11_xinput_RawButtonPress_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_RawButtonPress_time, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_RawButtonPress_detail, tvb, *offsetp, 4, byte_order);
@@ -19711,8 +19688,8 @@ static void xinputTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, proto_
     int f_buttons_len;
     int f_valuators_len;
     int sumof_valuator_mask = 0;
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 18,
-                               "opcode: TouchBegin (18)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 18,
+                               "TouchBegin (18)");
     field16(tvb, offsetp, t, hf_x11_xinput_TouchBegin_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_TouchBegin_time, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_TouchBegin_detail, tvb, *offsetp, 4, byte_order);
@@ -19762,8 +19739,8 @@ static void xinputTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, proto_
 
 static void xinputTouchOwnership(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
 {
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 21,
-                               "opcode: TouchOwnership (21)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 21,
+                               "TouchOwnership (21)");
     field16(tvb, offsetp, t, hf_x11_xinput_TouchOwnership_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_TouchOwnership_time, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_TouchOwnership_touchid, tvb, *offsetp, 4, byte_order);
@@ -19785,8 +19762,8 @@ static void xinputRawTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, pro
 {
     int f_valuators_len;
     int sumof_valuator_mask = 0;
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 22,
-                               "opcode: RawTouchBegin (22)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 22,
+                               "RawTouchBegin (22)");
     field16(tvb, offsetp, t, hf_x11_xinput_RawTouchBegin_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_RawTouchBegin_time, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_RawTouchBegin_detail, tvb, *offsetp, 4, byte_order);
@@ -19818,8 +19795,8 @@ static void xinputRawTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, pro
 
 static void xinputBarrierHit(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
 {
-    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 25,
-                               "opcode: BarrierHit (25)");
+    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 25,
+                               "BarrierHit (25)");
     field16(tvb, offsetp, t, hf_x11_xinput_BarrierHit_deviceid, byte_order);
     field32(tvb, offsetp, t, hf_x11_xinput_BarrierHit_time, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_BarrierHit_eventid, tvb, *offsetp, 4, byte_order);
@@ -19849,6 +19826,28 @@ static void xinputBarrierHit(tvbuff_t *tvb, int length _U_, int *offsetp, proto_
     struct_xinput_FP3232(tvb, offsetp, t, byte_order, 1);
 }
 
+
+static void xinputSendExtensionEvent(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    int f_num_classes;
+    int f_num_events;
+    proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_destination, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_device_id, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_propagate, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    f_num_classes = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_num_classes, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    f_num_events = VALUE8(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_num_events, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(3);
+    length -= f_num_events * 1;
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_SendExtensionEvent_classes, hf_x11_xinput_SendExtensionEvent_classes_item, f_num_classes, byte_order);
+    length -= f_num_classes * 4;
+}
 static const value_string xinput_extension_minor[] = {
     { 1, "GetExtensionVersion" },
     { 2, "ListInputDevices" },
@@ -21673,8 +21672,8 @@ static void xkbUseExtension_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_item(t, hf_x11_xkb_UseExtension_reply_supported, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-UseExtension)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-UseExtension)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -22024,8 +22023,8 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_item(t, hf_x11_xkb_GetState_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-GetState)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-GetState)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -22256,8 +22255,8 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-GetControls)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-GetControls)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -22902,8 +22901,8 @@ static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-GetMap)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-GetMap)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -23223,8 +23222,8 @@ static void xkbGetCompatMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-GetCompatMap)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-GetCompatMap)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -23300,8 +23299,8 @@ static void xkbGetIndicatorState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorState_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-GetIndicatorState)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-GetIndicatorState)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -23329,8 +23328,8 @@ static void xkbGetIndicatorMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-GetIndicatorMap)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-GetIndicatorMap)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -23378,8 +23377,8 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-GetNamedIndicator)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-GetNamedIndicator)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -23649,8 +23648,8 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-GetNames)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-GetNames)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -24042,8 +24041,8 @@ static void xkbPerClientFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-PerClientFlags)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-PerClientFlags)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -24129,8 +24128,8 @@ static void xkbListComponents_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-ListComponents)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-ListComponents)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -24208,8 +24207,8 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-GetKbdByName)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-GetKbdByName)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -24679,8 +24678,8 @@ static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-GetDeviceInfo)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-GetDeviceInfo)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -24803,8 +24802,8 @@ static void xkbSetDebuggingFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-SetDebuggingFlags)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xkb-SetDebuggingFlags)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -25658,8 +25657,8 @@ static void xprintPrintQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     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-PrintQueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xprint-PrintQueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -25694,8 +25693,8 @@ static void xprintPrintGetPrinterList_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     REPLY(reply);
     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-PrintGetPrinterList)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xprint-PrintGetPrinterList)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -25746,8 +25745,8 @@ static void xprintPrintGetContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     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-PrintGetContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xprint-PrintGetContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -25773,8 +25772,8 @@ static void xprintPrintGetScreenOfContext_Reply(tvbuff_t *tvb, packet_info *pinf
     REPLY(reply);
     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-PrintGetScreenOfContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xprint-PrintGetScreenOfContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -25847,8 +25846,8 @@ static void xprintPrintGetDocumentData_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     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-PrintGetDocumentData)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xprint-PrintGetDocumentData)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -25898,8 +25897,8 @@ static void xprintPrintInputSelected_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     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);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xprint-PrintInputSelected)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -25927,8 +25926,8 @@ static void xprintPrintGetAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     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-PrintGetAttributes)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xprint-PrintGetAttributes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -25963,8 +25962,8 @@ static void xprintPrintGetOneAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     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-PrintGetOneAttributes)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xprint-PrintGetOneAttributes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26003,8 +26002,8 @@ static void xprintPrintGetPageDimensions_Reply(tvbuff_t *tvb, packet_info *pinfo
     REPLY(reply);
     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-PrintGetPageDimensions)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xprint-PrintGetPageDimensions)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26035,8 +26034,8 @@ static void xprintPrintQueryScreens_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     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-PrintQueryScreens)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xprint-PrintQueryScreens)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26064,8 +26063,8 @@ static void xprintPrintSetImageResolution_Reply(tvbuff_t *tvb, packet_info *pinf
     proto_tree_add_item(t, hf_x11_xprint_PrintSetImageResolution_reply_status, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xprint-PrintSetImageResolution)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xprint-PrintSetImageResolution)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26087,8 +26086,8 @@ static void xprintPrintGetImageResolution_Reply(tvbuff_t *tvb, packet_info *pinf
     REPLY(reply);
     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-PrintGetImageResolution)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xprint-PrintGetImageResolution)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26264,8 +26263,8 @@ static void xselinuxQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26298,8 +26297,8 @@ static void xselinuxGetDeviceCreateContext_Reply(tvbuff_t *tvb, packet_info *pin
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetDeviceCreateContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetDeviceCreateContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26337,8 +26336,8 @@ static void xselinuxGetDeviceContext_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetDeviceContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetDeviceContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26372,8 +26371,8 @@ static void xselinuxGetWindowCreateContext_Reply(tvbuff_t *tvb, packet_info *pin
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetWindowCreateContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetWindowCreateContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26399,8 +26398,8 @@ static void xselinuxGetWindowContext_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetWindowContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetWindowContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26478,8 +26477,8 @@ static void xselinuxGetPropertyCreateContext_Reply(tvbuff_t *tvb, packet_info *p
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetPropertyCreateContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetPropertyCreateContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26513,8 +26512,8 @@ static void xselinuxGetPropertyUseContext_Reply(tvbuff_t *tvb, packet_info *pinf
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetPropertyUseContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetPropertyUseContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26542,8 +26541,8 @@ static void xselinuxGetPropertyContext_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetPropertyContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetPropertyContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26571,8 +26570,8 @@ static void xselinuxGetPropertyDataContext_Reply(tvbuff_t *tvb, packet_info *pin
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetPropertyDataContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetPropertyDataContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26598,8 +26597,8 @@ static void xselinuxListProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-ListProperties)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-ListProperties)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26633,8 +26632,8 @@ static void xselinuxGetSelectionCreateContext_Reply(tvbuff_t *tvb, packet_info *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetSelectionCreateContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetSelectionCreateContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26668,8 +26667,8 @@ static void xselinuxGetSelectionUseContext_Reply(tvbuff_t *tvb, packet_info *pin
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetSelectionUseContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetSelectionUseContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26695,8 +26694,8 @@ static void xselinuxGetSelectionContext_Reply(tvbuff_t *tvb, packet_info *pinfo,
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetSelectionContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetSelectionContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26722,8 +26721,8 @@ static void xselinuxGetSelectionDataContext_Reply(tvbuff_t *tvb, packet_info *pi
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetSelectionDataContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetSelectionDataContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26747,8 +26746,8 @@ static void xselinuxListSelections_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-ListSelections)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-ListSelections)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26774,8 +26773,8 @@ static void xselinuxGetClientContext_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xselinux-GetClientContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xselinux-GetClientContext)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26941,8 +26940,8 @@ static void xtestGetVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_item(t, hf_x11_xtest_GetVersion_reply_major_version, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xtest-GetVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xtest-GetVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -26967,8 +26966,8 @@ static void xtestCompareCursor_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     proto_tree_add_item(t, hf_x11_xtest_CompareCursor_reply_same, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xtest-CompareCursor)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xtest-CompareCursor)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -27296,8 +27295,8 @@ static void xvQueryExtension_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xv-QueryExtension)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xv-QueryExtension)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -27322,8 +27321,8 @@ static void xvQueryAdaptors_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xv-QueryAdaptors)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xv-QueryAdaptors)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -27349,8 +27348,8 @@ static void xvQueryEncodings_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xv-QueryEncodings)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xv-QueryEncodings)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -27376,8 +27375,8 @@ static void xvGrabPort_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pr
     REPLY(reply);
     field8(tvb, offsetp, t, hf_x11_xv_GrabPort_reply_result, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xv-GrabPort)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xv-GrabPort)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -27545,8 +27544,8 @@ static void xvQueryBestSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xv-QueryBestSize)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xv-QueryBestSize)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -27582,8 +27581,8 @@ static void xvGetPortAttribute_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xv-GetPortAttribute)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xv-GetPortAttribute)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -27606,8 +27605,8 @@ static void xvQueryPortAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xv-QueryPortAttributes)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xv-QueryPortAttributes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -27635,8 +27634,8 @@ static void xvListImageFormats_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xv-ListImageFormats)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xv-ListImageFormats)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -27668,8 +27667,8 @@ static void xvQueryImageAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xv-QueryImageAttributes)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xv-QueryImageAttributes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -27920,8 +27919,8 @@ static void xvmcQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xvmc-QueryVersion)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xvmc-QueryVersion)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -27946,8 +27945,8 @@ static void xvmcListSurfaceTypes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xvmc-ListSurfaceTypes)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xvmc-ListSurfaceTypes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
@@ -27983,8 +27982,8 @@ static void xvmcCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xvmc-CreateContext)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xvmc-CreateContext)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -28022,8 +28021,8 @@ static void xvmcCreateSurface_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xvmc-CreateSurface)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xvmc-CreateSurface)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -28061,8 +28060,8 @@ static void xvmcCreateSubpicture_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xvmc-CreateSubpicture)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xvmc-CreateSubpicture)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
@@ -28103,8 +28102,8 @@ static void xvmcListSubpictureTypes_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     REPLY(reply);
     UNUSED(1);
     sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xvmc-ListSubpictureTypes)", sequence_number);
+    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "%d (xvmc-ListSubpictureTypes)", sequence_number);
     *offsetp += 2;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h
index 1b6ff9a22b..c0698c0e68 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 12.0-branchpoint-2878-g15804c4 */
+   using mesa version 17.0-branchpoint-2874-g9f0dd85 */
 /*
  * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
  *
@@ -1330,6 +1330,7 @@ static const value_string mesa_enum[] = {
 /* OpenGL extension ARB_cull_distance */
   { 0x82F9, "MAX_CULL_DISTANCES" },
   { 0x82FA, "MAX_COMBINED_CLIP_AND_CULL_DISTANCES" },
+/* OpenGL extension es3.2 */
 /* OpenGL extension KHR_blend_equation_advanced */
   { 0x9285, "BLEND_ADVANCED_COHERENT_KHR" },
   { 0x9294, "MULTIPLY_KHR" },
@@ -2019,6 +2020,10 @@ static const value_string mesa_enum[] = {
   { 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_NV_fill_rectangle */
+  { 0x933C, "FILL_RECTANGLE_NV" },
+/* OpenGL extension GL_INTEL_conservative_rasterization */
+  { 0x83FE, "CONSERVATIVE_RASTERIZATION_INTEL" },
 /* OpenGL extension GL_EXT_polygon_offset_clamp */
   { 0x8E1B, "POLYGON_OFFSET_CLAMP_EXT" },
 /* OpenGL extension GL_ATI_blend_equation_separate */
diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h
index 171c6e081f..ad7ce35bcd 100644
--- a/epan/dissectors/x11-register-info.h
+++ b/epan/dissectors/x11-register-info.h
@@ -4546,14 +4546,6 @@
 { &hf_x11_xinput_QueryDeviceState_reply_xi_reply_type, { "xi_reply_type", "x11.xinput.QueryDeviceState.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_QueryDeviceState_reply_num_classes, { "num_classes", "x11.xinput.QueryDeviceState.reply.num_classes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_QueryDeviceState_reply_classes, { "classes", "x11.xinput.QueryDeviceState.reply.classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xinput_SendExtensionEvent_destination, { "destination", "x11.xinput.SendExtensionEvent.destination", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xinput_SendExtensionEvent_device_id, { "device_id", "x11.xinput.SendExtensionEvent.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xinput_SendExtensionEvent_propagate, { "propagate", "x11.xinput.SendExtensionEvent.propagate", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xinput_SendExtensionEvent_num_classes, { "num_classes", "x11.xinput.SendExtensionEvent.num_classes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xinput_SendExtensionEvent_num_events, { "num_events", "x11.xinput.SendExtensionEvent.num_events", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xinput_SendExtensionEvent_events, { "events", "x11.xinput.SendExtensionEvent.events", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xinput_SendExtensionEvent_classes, { "classes", "x11.xinput.SendExtensionEvent.classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xinput_SendExtensionEvent_classes_item, { "classes", "x11.xinput.SendExtensionEvent.classes", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_DeviceBell_device_id, { "device_id", "x11.xinput.DeviceBell.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_DeviceBell_feedback_id, { "feedback_id", "x11.xinput.DeviceBell.feedback_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_DeviceBell_feedback_class, { "feedback_class", "x11.xinput.DeviceBell.feedback_class", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -5142,6 +5134,14 @@
 { &hf_x11_xinput_BarrierHit_root_y, { "root_y", "x11.xinput.BarrierHit.root_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_BarrierHit_dx, { "dx", "x11.xinput.BarrierHit.dx", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_BarrierHit_dy, { "dy", "x11.xinput.BarrierHit.dy", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_SendExtensionEvent_destination, { "destination", "x11.xinput.SendExtensionEvent.destination", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_SendExtensionEvent_device_id, { "device_id", "x11.xinput.SendExtensionEvent.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_SendExtensionEvent_propagate, { "propagate", "x11.xinput.SendExtensionEvent.propagate", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_SendExtensionEvent_num_classes, { "num_classes", "x11.xinput.SendExtensionEvent.num_classes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_SendExtensionEvent_num_events, { "num_events", "x11.xinput.SendExtensionEvent.num_events", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_SendExtensionEvent_events, { "events", "x11.xinput.SendExtensionEvent.events", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_SendExtensionEvent_classes, { "classes", "x11.xinput.SendExtensionEvent.classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_SendExtensionEvent_classes_item, { "classes", "x11.xinput.SendExtensionEvent.classes", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(xinput_extension_minor), 0, "minor opcode", HFILL }},
 
 { &hf_x11_struct_xkb_IndicatorMap, { "xkb_IndicatorMap", "x11.struct.xkb_IndicatorMap", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
diff --git a/tools/process-x11-xcb.pl b/tools/process-x11-xcb.pl
index 18f4db8aa3..6e6b48b19e 100755
--- a/tools/process-x11-xcb.pl
+++ b/tools/process-x11-xcb.pl
@@ -723,7 +723,7 @@ sub register_element($$$$;$)
     }
 
     print $decl "static int $regname = -1;\n";
-    if ($e->name() eq 'list' and $info->{'size'} > 1) {
+    if ($e->name() eq 'list' and defined $info->{'size'} and $info->{'size'} > 1) {
         print $reg "{ &$regname, { \"$fieldname\", \"$humanname\", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},\n";
         $regname .= '_item';
         print $decl "static int $regname = -1;\n";
@@ -841,8 +841,13 @@ sub dissect_element($$$$$;$$)
             my $type = $e->att('type');
 
             my $info = getinfo($type);
-            my $lencalc = "(length - $length) / $info->{'size'}";
+            my $lencalc;
             my $lentype = $e->first_child();
+            if (defined $info->{'size'}) {
+                $lencalc = "(length - $length) / $info->{'size'}";
+            } else {
+                $lencalc = "(length - $length)";
+            }
             if (defined $lentype) {
                 given ($lentype->name()) {
                     when ('value') { $lencalc = $lentype->text(); }
@@ -879,13 +884,18 @@ sub dissect_element($$$$$;$$)
 
                 print $impl $indent."struct_$info->{'name'}(tvb, offsetp, t, byte_order, $lencalc$prefs);\n";
             } else {
-                die ("Unrecognized type: $type\n");
+                # TODO: Fix unrecognized type. Comment out for now to generate dissector
+                # die ("Unrecognized type: $type\n");
             }
 
             if ($adjustlength && defined($lentype)) {
               # Some requests end with a list of unspecified length
               # Adjust the length field here so that the next $lencalc will be accurate
-              say $impl $indent."length -= $lencalc * $info->{'size'};";
+              if (defined $info->{'size'}) {
+                  say $impl $indent."length -= $lencalc * $info->{'size'};";
+              } else {
+                  say $impl $indent."length -= $lencalc * 1;";
+              }
             }
         }
         when ('switch') {
@@ -1418,8 +1428,8 @@ eot
             if ($first) {
                 $first = 0;
                 say $impl '    sequence_number = VALUE16(tvb, *offsetp);';
-                say $impl '    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,';
-                say $impl '            "sequencenumber: %d ('.$header.'-'.$name.')", sequence_number);';
+                say $impl '    proto_tree_add_uint_format_value(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,';
+                say $impl '            "%d ('.$header.'-'.$name.')", sequence_number);';
                 say $impl '    *offsetp += 2;';
 
                 if ($refs->{field}{length}) {
@@ -1554,8 +1564,8 @@ eot
     }
 
     if ($xge) {
-        say $impl "    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, $number,";
-        say $impl "                               \"opcode: $name ($number)\");";
+        say $impl "    proto_tree_add_uint_format_value(t, hf_x11_minor_opcode, tvb, *offsetp, 2, $number,";
+        say $impl "                               \"$name ($number)\");";
         foreach my $e (@elements) {
             $length = dissect_element($e, $varpat, $humanpat, $length, $refs);
         }