WHY??? git add -f bin/default/librpc/gen_ndr/packet-dcerpc-*

[metze/samba/wip.git] / bin / default / librpc / gen_ndr / packet-dcerpc-spoolss.c

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c b/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c
index a03868cc381e6ae0daeae512256972eb4e4ce32c..4abc88d2cf79406df3fe13065109f4641142ceef 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c
@@ -198,9 +198,9 @@ static gint hf_spoolss_spoolss_RouterReplyPrinterEx_reply_result = -1;
 static gint hf_spoolss_spoolss_GetJob_buffer = -1;
 static gint hf_spoolss_spoolss_DriverInfo5_driver_path = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_drivername = -1;
-static gint hf_spoolss_spoolss_DocumentInfo_info1 = -1;
 static gint hf_spoolss_spoolss_AddFormInfo2_ressource_id = -1;
 static gint hf_spoolss_spoolss_UserLevel3_reserved = -1;
+static gint hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_TIME_time = -1;
 static gint hf_spoolss_spoolss_FormInfo2_keyword = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_NOT_SHAREABLE = -1;
 static gint hf_spoolss_spoolss_JobInfo2_start_time = -1;
@@ -210,7 +210,6 @@ static gint hf_spoolss_spoolss_XcvData_handle = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_total_pages = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_data_file = -1;
 static gint hf_spoolss_spoolss_SetPortInfo2_monitor_name = -1;
-static gint hf_spoolss_spoolss_PortInfo_infoFF = -1;
 static gint hf_spoolss_spoolss_JobInfo2_submitted = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_architecture = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo9_devmode_ptr = -1;
@@ -225,28 +224,29 @@ static gint hf_spoolss___spoolss_EnumPrintProcDataTypes_level = -1;
 static gint hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_STRICT_DOWNGRADE = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_location = -1;
 static gint hf_spoolss_spoolss_EnumPrinterData_data_needed = -1;
-static gint hf_spoolss_spoolss_NotifyData_integer = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo2_architecture = -1;
+static gint hf_spoolss_spoolss_PrinterData_valREG_SZ_string = -1;
 static gint hf_spoolss_spoolss_SetPrinter_devmode_ctr = -1;
 static gint hf_spoolss_RPC_BIDI_RESPONSE_DATA_pSchema = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_document_name = -1;
 static gint hf_spoolss_spoolss_DriverInfo7_inf_name = -1;
 static gint hf_spoolss_spoolss_SetPrinter_command = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_CONNECTIONS = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_info2 = -1;
 static gint hf_spoolss_spoolss_RpcGetJobNamedPropertyValue_JobId = -1;
 static gint hf_spoolss_spoolss_DeviceMode___driverextra_length = -1;
 static gint hf_spoolss_spoolss_XcvData_function_name = -1;
-static gint hf_spoolss_spoolss_AddDriverInfo_info1 = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_position = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_sepfile = -1;
 static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_RESTART = -1;
 static gint hf_spoolss___spoolss_EnumPrinterDataEx_count = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2__devmode_ptr = -1;
+static gint hf_spoolss_spoolss_Field_valdefault_field = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_val9_info9 = -1;
 static gint hf_spoolss_spoolss_JobInfo1_submitted = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo5_driver_attributes = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_monitor_name = -1;
 static gint hf_spoolss_spoolss_PortData2_size = -1;
+static gint hf_spoolss_spoolss_FormInfo_val1_info1 = -1;
 static gint hf_spoolss___spoolss_EnumPrintProcDataTypes_count = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PORT = -1;
 static gint hf_spoolss_spoolss_StringArray_string = -1;
@@ -254,11 +254,13 @@ static gint hf_spoolss_spoolss_PSDRVEXTRA400_aubOptions = -1;
 static gint hf_spoolss___spoolss_EnumPorts_level = -1;
 static gint hf_spoolss_spoolss_JobInfo4_until_time = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_SOFT_RESET_REQUIRED = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_val5_info5 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_config_file = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_wFeedDirection = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_averageppm = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_provider = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_text_status = -1;
+static gint hf_spoolss_spoolss_JobInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_EnumPorts_level = -1;
 static gint hf_spoolss_spoolss_EnumForms_count = -1;
 static gint hf_spoolss_spoolss_PortData2_snmpcommunity = -1;
@@ -303,6 +305,7 @@ static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON7 = -1;
 static gint hf_spoolss_spoolss_GetForm_buffer = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_devmode_ = -1;
 static gint hf_spoolss_spoolss_Notify_variable_type = -1;
+static gint hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo1_description = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_number_of_processors = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDrivers_environment = -1;
@@ -335,16 +338,17 @@ static gint hf_spoolss_spoolss_PrinterInfo2_starttime = -1;
 static gint hf_spoolss_spoolss_RpcDeleteJobNamedProperty_hPrinter = -1;
 static gint hf_spoolss_spoolss_JobInfo1_pages_printed = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA351_caColorfulness = -1;
+static gint hf_spoolss_spoolss_AddFormInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDrivers_buffer = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverPackagePath_language = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_dependent_files = -1;
-static gint hf_spoolss_spoolss_FormInfo_info1 = -1;
-static gint hf_spoolss_spoolss_SetJobInfo_info3 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_dwReserved3 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_wReserved1 = -1;
+static gint hf_spoolss_spoolss_MonitorInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo5_config_version = -1;
 static gint hf_spoolss_spoolss_JobInfo2_status = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON2 = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_val0_info0 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_bReversePrint = -1;
 static gint hf_spoolss_spoolss_GetPrintProcessorDirectory_offered = -1;
 static gint hf_spoolss_spoolss_ReplyOpenPrinter_printer_local = -1;
@@ -356,7 +360,6 @@ static gint hf_spoolss_spoolss_AddDriverInfo4_help_file = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_reserved2 = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_info = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_JOB = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_info9 = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_driver_name = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_sharename = -1;
 static gint hf_spoolss_spoolss_RpcEnumJobNamedProperties_ppProperties = -1;
@@ -367,19 +370,22 @@ static gint hf_spoolss_spoolss_PortInfo2_description = -1;
 static gint hf_spoolss__spoolss_EnumJobs_count = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_session_counter = -1;
 static gint hf_spoolss_spoolss_DocumentInfo1_output_file = -1;
+static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_STRING_sData = -1;
 static gint hf_spoolss_spoolss_UserLevel3_user = -1;
-static gint hf_spoolss_spoolss_DriverInfo_info7 = -1;
 static gint hf_spoolss_spoolss_UserLevel1_minor = -1;
+static gint hf_spoolss_spoolss_JobInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDataEx_info = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver_handle = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_server_name = -1;
 static gint hf_spoolss_spoolss_UserLevelCtr_level = -1;
 static gint hf_spoolss_spoolss_OpenPrinterEx_access_mask = -1;
 static gint hf_spoolss_spoolss_AddFormInfo1_form_name = -1;
+static gint hf_spoolss_spoolss_UserLevel_val3_level3 = -1;
 static gint hf_spoolss_spoolss_PortData2_version = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_ORIENTATION = -1;
 static gint hf_spoolss_spoolss_OpenPrinter_handle = -1;
 static gint hf_spoolss_spoolss_AccessRights_JOB_ACCESS_READ = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0600_unidrvextra = -1;
 static gint hf_spoolss_RPC_BIDI_RESPONSE_DATA_dwResult = -1;
 static gint hf_spoolss_spoolss_DeletePerMachineConnection_server = -1;
 static gint hf_spoolss_spoolss_JobInfoContainer_level = -1;
@@ -395,6 +401,7 @@ static gint hf_spoolss_spoolss_SetPrinterData_value_name = -1;
 static gint hf_spoolss_spoolss_PortData1_queue = -1;
 static gint hf_spoolss_spoolss_PortData2_reserved = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_location = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PELSHEIGHT = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcDataTypes_servername = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_submitted = -1;
@@ -405,15 +412,14 @@ static gint hf_spoolss_spoolss_JobInfo4_devmode_ = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwReserved2 = -1;
 static gint hf_spoolss_spoolss_Time_month = -1;
 static gint hf_spoolss_spoolss_OpenPrinter_datatype = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_info0 = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDataEx_needed = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcDataTypes_buffer = -1;
 static gint hf_spoolss_spoolss_PortData2_hostaddress = -1;
-static gint hf_spoolss_spoolss_UserLevel_level2 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_min_inbox_driver_ver_date = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo3_config_file = -1;
 static gint hf_spoolss_spoolss_NotifyInfo_version = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_needed = -1;
+static gint hf_spoolss_spoolss_AddDriverInfo_val4_info4 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_scale = -1;
 static gint hf_spoolss_spoolss_DeletePrinterData_handle = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_core_driver_dependencies = -1;
@@ -435,11 +441,14 @@ static gint hf_spoolss__spoolss_EnumJobs_offered = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_WORK_OFFLINE = -1;
 static gint hf_spoolss_spoolss_DriverInfo3_version = -1;
 static gint hf_spoolss_spoolss_GetJob_handle = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_val4_info4 = -1;
 static gint hf_spoolss_spoolss_AddPrinter_secdesc_ctr = -1;
 static gint hf_spoolss_spoolss_DeviceMode_duplex = -1;
 static gint hf_spoolss_spoolss_RouterReplyPrinterEx_color = -1;
 static gint hf_spoolss_spoolss_DeletePort_port_name = -1;
+static gint hf_spoolss_spoolss_AddDriverInfo_val1_info1 = -1;
 static gint hf_spoolss__spoolss_EnumForms_handle = -1;
+static gint hf_spoolss_spoolss_UserLevel_val2_level2 = -1;
 static gint hf_spoolss_spoolss_FormInfo2_flags = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_status = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo2_config_file = -1;
@@ -458,20 +467,19 @@ static gint hf_spoolss_spoolss_EnumPrinterDrivers_level = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_default_datatype = -1;
 static gint hf_spoolss_spoolss_Time_millisecond = -1;
 static gint hf_spoolss_spoolss_EnumForms_needed = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_val9_info9 = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_dwNupDirection = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_min_inbox_driver_ver_version = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_driver_path = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_time = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_architecture = -1;
 static gint hf_spoolss_spoolss_GetPrinter_buffer = -1;
-static gint hf_spoolss_spoolss_PrinterData_string = -1;
 static gint hf_spoolss_spoolss_JobInfo4_print_processor = -1;
 static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_DELETED = -1;
 static gint hf_spoolss_spoolss_OEM_DMEXTRA_dwVersion = -1;
-static gint hf_spoolss_spoolss_SetPortInfo_info2 = -1;
-static gint hf_spoolss_spoolss_JobInfo_info3 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo4_architecture = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_PUBLISHED = -1;
+static gint hf_spoolss_spoolss_DriverInfo_val8_info8 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterKey__ndr_size = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDataEx_count = -1;
 static gint hf_spoolss_spoolss_FormInfo2_display_name = -1;
@@ -491,7 +499,6 @@ static gint hf_spoolss_spoolss_JobInfo4_size = -1;
 static gint hf_spoolss_spoolss_EnumPrinters_level = -1;
 static gint hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_DONT_COPY_FILES_TO_CLUSTER = -1;
 static gint hf_spoolss_spoolss_UserLevel3_client = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psblob = -1;
 static gint hf_spoolss_spoolss_PlayGDIScriptOnPrinterIC_cOut = -1;
 static gint hf_spoolss_spoolss_JobInfo4_status = -1;
 static gint hf_spoolss_spoolss_OSVersion_platform_id = -1;
@@ -502,6 +509,7 @@ static gint hf_spoolss_spoolss_PortData2_device_type = -1;
 static gint hf_spoolss_spoolss_PortType_SPOOLSS_PORT_TYPE_REDIRECTED = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_devmode_ptr = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_status = -1;
+static gint hf_spoolss_spoolss_PrinterData_valdefault_data = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_NAME = -1;
 static gint hf_spoolss_spoolss_RpcSendRecvBidiData_pReqData = -1;
 static gint hf_spoolss_spoolss_ClosePrinter_handle = -1;
@@ -514,13 +522,15 @@ static gint hf_spoolss_spoolss_PSDRVEXTRA400_dwFlags = -1;
 static gint hf_spoolss_spoolss_PrinterInfo5_attributes = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA351_caRedGamma = -1;
 static gint hf_spoolss_spoolss_JobInfo1_priority = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0501_psdrvextra500 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo1_name = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_OUT_OF_MEMORY = -1;
 static gint hf_spoolss_spoolss_JobInfo1_data_type = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON5 = -1;
+static gint hf_spoolss_spoolss_ReplyPrinterInfo_val0_info0 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_bitsperpel = -1;
 static gint hf_spoolss_spoolss_OSVersionEx_extra_string = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_info0 = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_dwOptions = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caRedGreenTint = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_QUEUED = -1;
@@ -531,7 +541,6 @@ static gint hf_spoolss_spoolss_AddMonitorInfo1_monitor_name = -1;
 static gint hf_spoolss_spoolss_EnumPrintProcDataTypes_offered = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcDataTypes_level = -1;
 static gint hf_spoolss_spoolss_DevmodeContainer_devmode = -1;
-static gint hf_spoolss_RPC_BIDI_DATA_u_sData = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwNupBorderFlags = -1;
 static gint hf_spoolss_spoolss_JobInfo3_reserved = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_version = -1;
@@ -568,14 +577,13 @@ static gint hf_spoolss_spoolss_PSDRVEXTRA500_caBrightness = -1;
 static gint hf_spoolss_spoolss_PlayGDIScriptOnPrinterIC_cIn = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo1_flags = -1;
 static gint hf_spoolss_spoolss_AddFormInfo2_form_name = -1;
-static gint hf_spoolss_spoolss_MonitorInfo_info2 = -1;
-static gint hf_spoolss_spoolss_SetJobInfo_info4 = -1;
-static gint hf_spoolss_RPC_PrintPropertyValueUnion_propertyInt64 = -1;
 static gint hf_spoolss_spoolss_JTEXP_wCoreMFOSize = -1;
 static gint hf_spoolss_spoolss_DeletePrinterKey_handle = -1;
+static gint hf_spoolss_spoolss_DriverDirectoryInfo_valdefault_info1 = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_reserved2 = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_SERVER = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_print_processor = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_EnumPrinters_server = -1;
 static gint hf_spoolss_spoolss_EnumMonitors_count = -1;
 static gint hf_spoolss_spoolss_JobInfo2_secdesc = -1;
@@ -593,13 +601,12 @@ static gint hf_spoolss_spoolss_RouterReplyPrinter_buffer = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo6_status = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_free_build = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_buffer = -1;
-static gint hf_spoolss_spoolss_AddDriverInfo_info3 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_hardware_id = -1;
 static gint hf_spoolss___spoolss_EnumPrinters_info = -1;
 static gint hf_spoolss_spoolss_DriverInfo7_install_source_root = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_position = -1;
+static gint hf_spoolss_spoolss_MonitorInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PRINTQUALITY = -1;
-static gint hf_spoolss_spoolss_PrinterData_string_array = -1;
 static gint hf_spoolss_spoolss_AddFormInfoCtr_info = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverPackagePath_driver_package_cab = -1;
 static gint hf_spoolss_spoolss_EnumPorts_count = -1;
@@ -629,7 +636,6 @@ static gint hf_spoolss_spoolss_JobInfo2_text_status = -1;
 static gint hf_spoolss_spoolss_AddPrinterDriver_info_ctr = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_printer_driver_attributes = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_DOOR_OPEN = -1;
-static gint hf_spoolss_spoolss_MonitorInfo_info1 = -1;
 static gint hf_spoolss___spoolss_EnumPrinterDrivers_info = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_previous_names = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_dependent_files = -1;
@@ -638,12 +644,15 @@ static gint hf_spoolss_spoolss_AddDriverInfo2_version = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_aOptions = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PRINTER = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_high_part_total_bytes = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_val0_info0 = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_time = -1;
 static gint hf_spoolss__spoolss_EnumForms_level = -1;
+static gint hf_spoolss_spoolss_PrintProcessorDirectoryInfo_valdefault_info1 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_manufacturer_url = -1;
 static gint hf_spoolss_spoolss_AddForm_info_ctr = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_cjobs = -1;
 static gint hf_spoolss_spoolss_GetForm_needed = -1;
+static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_BLOB_biData = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_wCoreFullSize = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_info_ = -1;
 static gint hf_spoolss_spoolss_SetPrinterData_handle = -1;
@@ -656,13 +665,14 @@ static gint hf_spoolss_spoolss_JobInfo2_secdesc_ = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_caBlueGamma = -1;
 static gint hf_spoolss_spoolss_JobInfo4_data_type = -1;
 static gint hf_spoolss_spoolss_EnumJobs_firstjob = -1;
-static gint hf_spoolss_spoolss_DriverInfo_info4 = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_valdefault_psblob = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_enumerate_network_printers = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDrivers_needed = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_printer_name = -1;
 static gint hf_spoolss_spoolss_JobInfo2_printer_name = -1;
 static gint hf_spoolss_spoolss_EnumPrinterKey_offered = -1;
 static gint hf_spoolss__spoolss_EnumPorts_offered = -1;
+static gint hf_spoolss_spoolss_AddDriverInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_yresolution = -1;
 static gint hf_spoolss_spoolss_EnumPrinters_info = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo4_default_datatype = -1;
@@ -675,6 +685,7 @@ static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_PAUSED = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_change_id = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo4_previous_names = -1;
 static gint hf_spoolss_spoolss_DeletePrinterData_value_name = -1;
+static gint hf_spoolss_spoolss_SetJobInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwSignature = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_ERROR = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST = -1;
@@ -684,12 +695,14 @@ static gint hf_spoolss_spoolss_DeviceModeInfo_devmode_ = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PRINTER_DRIVER = -1;
 static gint hf_spoolss_spoolss_NotifyOptionType_u3 = -1;
 static gint hf_spoolss_spoolss_JobInfo1_server_name = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_val8_info8 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caColorfulness = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_dwOptions = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo8_devmode_ptr = -1;
 static gint hf_spoolss_spoolss_DriverInfo6_provider = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_USER_INTERVENTION = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverDirectory_server = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_notify_name = -1;
 static gint hf_spoolss___spoolss_EnumPrintProcDataTypes_info = -1;
 static gint hf_spoolss_spoolss_JobInfo2_data_type = -1;
@@ -706,19 +719,21 @@ static gint hf_spoolss_spoolss_GetJob_info_ = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_manufacturer_name = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDrivers_offered = -1;
 static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_SPOOLING = -1;
+static gint hf_spoolss_spoolss_JobInfo_val4_info4 = -1;
 static gint hf_spoolss_RPC_BIDI_RESPONSE_CONTAINER_Count = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_parameters = -1;
 static gint hf_spoolss_spoolss_DriverInfo101_file_info = -1;
 static gint hf_spoolss_spoolss_GetPrinter_level = -1;
 static gint hf_spoolss_spoolss_DeviceMode_papersize = -1;
+static gint hf_spoolss_spoolss_Field_valPRINTER_NOTIFY_TYPE_field = -1;
 static gint hf_spoolss_spoolss_DeletePrinterKey_key_name = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA351_caContrast = -1;
 static gint hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_COPY_NEW_FILES = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2__secdesc_ptr = -1;
+static gint hf_spoolss_spoolss_DriverInfo_val7_info7 = -1;
 static gint hf_spoolss_spoolss_AddPerMachineConnection_printername = -1;
 static gint hf_spoolss_spoolss_GetPrintProcessorDirectory_server = -1;
 static gint hf_spoolss_spoolss_SetPrinterDataEx_value_name = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_info5 = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_wReserved = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_pages_printed = -1;
 static gint hf_spoolss_spoolss_XcvData_out_data_size = -1;
@@ -731,7 +746,7 @@ static gint hf_spoolss___spoolss_EnumJobs_level = -1;
 static gint hf_spoolss_spoolss_RpcDeleteJobNamedProperty_JobId = -1;
 static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_USER_INTERVENTION = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcessors_needed = -1;
-static gint hf_spoolss_spoolss_PrintProcDataTypesInfo_info1 = -1;
+static gint hf_spoolss_spoolss_AddDriverInfo_val8_info8 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON6 = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_SERVICE = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_total_pages = -1;
@@ -752,14 +767,14 @@ static gint hf_spoolss_spoolss_AddDriverInfo3_monitor_name = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_version = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_WARMING_UP = -1;
 static gint hf_spoolss_spoolss_AddPrinterEx_devmode_ctr = -1;
+static gint hf_spoolss_spoolss_DriverInfo_val2_info2 = -1;
+static gint hf_spoolss_spoolss_JobInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_SetPrinterDataEx_data = -1;
 static gint hf_spoolss_spoolss_CreatePrinterIC_handle = -1;
 static gint hf_spoolss_spoolss_DriverInfo6_help_file = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8__ndr_size_color_profiles = -1;
 static gint hf_spoolss__spoolss_EnumPrinters_flags = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra500 = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_info2 = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_info6 = -1;
+static gint hf_spoolss_spoolss_AddDriverInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_EnumPrintProcessors_environment = -1;
 static gint hf_spoolss_spoolss_OSVersion_build = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_last_error = -1;
@@ -768,8 +783,10 @@ static gint hf_spoolss_spoolss_WritePrinter_data = -1;
 static gint hf_spoolss__spoolss_EnumJobs_info = -1;
 static gint hf_spoolss_spoolss_DriverInfo7_size = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caIlluminantIndex = -1;
+static gint hf_spoolss_spoolss_FormInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_EnumPorts_offered = -1;
 static gint hf_spoolss_spoolss_PortData1_ip_address = -1;
+static gint hf_spoolss_spoolss_PortInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_Time_minute = -1;
 static gint hf_spoolss_spoolss_AddPortEx_monitor_name = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_iQuality = -1;
@@ -790,12 +807,12 @@ static gint hf_spoolss_spoolss_GetPrinterDataEx_handle = -1;
 static gint hf_spoolss_spoolss_GetJob_info = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caContrast = -1;
 static gint hf_spoolss_spoolss_AddPrinterEx_info_ctr = -1;
+static gint hf_spoolss_spoolss_PrintProcessorInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_wFeedDirection = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcessors_buffer = -1;
 static gint hf_spoolss_UNIVERSAL_FONT_ID_ctr_count = -1;
 static gint hf_spoolss_spoolss_NotifyString_size = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_status = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_info3 = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_c_setprinter = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcessors_environment = -1;
 static gint hf_spoolss_spoolss_GetForm_offered = -1;
@@ -822,17 +839,13 @@ static gint hf_spoolss_spoolss_PortData1_size = -1;
 static gint hf_spoolss_spoolss_DeleteDriverFlags_DPD_DELETE_UNUSED_FILES = -1;
 static gint hf_spoolss_spoolss_PortData1_snmpcommunity = -1;
 static gint hf_spoolss_spoolss_UserLevel1_client = -1;
-static gint hf_spoolss_spoolss_KeyNames_string_array = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverPackagePath_architecture = -1;
 static gint hf_spoolss__spoolss_EnumMonitors_servername = -1;
-static gint hf_spoolss_spoolss_AddMonitorInfo_info2 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_sharename = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_info4 = -1;
 static gint hf_spoolss_spoolss_EnumForms_level = -1;
 static gint hf_spoolss_spoolss_ReadPrinter_handle = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_inf_path = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_driver_version = -1;
-static gint hf_spoolss_spoolss_SetJobInfo_info2 = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverDirectory_environment = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_DERIVED = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_color_profiles = -1;
@@ -844,22 +857,21 @@ static gint hf_spoolss_spoolss_StartDocPrinter_job_id = -1;
 static gint hf_spoolss__spoolss_EnumPrinters_count = -1;
 static gint hf_spoolss_spoolss_AddFormInfo2_lang_id = -1;
 static gint hf_spoolss_spoolss_FormStringType_SPOOLSS_FORM_STRING_TYPE_LANG_PAIR = -1;
-static gint hf_spoolss_spoolss_JobInfo_info2 = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDrivers_count = -1;
-static gint hf_spoolss_spoolss_PortInfo_info1 = -1;
+static gint hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_DWORD_integer = -1;
 static gint hf_spoolss_spoolss_EnumForms_buffer = -1;
 static gint hf_spoolss_spoolss_PortData1_snmp_enabled = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_COLOR = -1;
 static gint hf_spoolss_spoolss_SetPortInfo2_port_name = -1;
 static gint hf_spoolss_spoolss_EnumMonitors_buffer = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_parameters = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0600_psdrvextra = -1;
 static gint hf_spoolss_spoolss_CorePrinterDriver_driver_date = -1;
 static gint hf_spoolss_spoolss_EnumPrinters_flags = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_attributes = -1;
 static gint hf_spoolss___spoolss_EnumJobs_info = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_dwChecksum32 = -1;
 static gint hf_spoolss_spoolss_ReadPrinter_data = -1;
-static gint hf_spoolss_spoolss_DriverInfo_info2 = -1;
 static gint hf_spoolss_spoolss_DriverInfo5_version = -1;
 static gint hf_spoolss_spoolss_JobInfo4_start_time = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_config_file = -1;
@@ -887,6 +899,7 @@ static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_DELETING = -1;
 static gint hf_spoolss__spoolss_EnumForms_needed = -1;
 static gint hf_spoolss_spoolss_Notify_type = -1;
 static gint hf_spoolss_spoolss_PortData2_port_number = -1;
+static gint hf_spoolss_spoolss_DriverInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_max_spooling = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caColorfulness = -1;
 static gint hf_spoolss_spoolss_JobInfo2_parameters = -1;
@@ -900,16 +913,18 @@ static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_VIRTUAL
 static gint hf_spoolss_spoolss_GetPrinterDriverPackagePath_servername = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_wOEMExtra = -1;
 static gint hf_spoolss_spoolss_DriverFileInfo_file_type = -1;
-static gint hf_spoolss_RPC_BIDI_DATA_u_iData = -1;
+static gint hf_spoolss_spoolss_AddMonitorInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_driver_path = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_XPS = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_iDialect = -1;
 static gint hf_spoolss__spoolss_EnumMonitors_info = -1;
+static gint hf_spoolss_spoolss_DriverInfo_val4_info4 = -1;
 static gint hf_spoolss_spoolss_AddPrinterEx_handle = -1;
 static gint hf_spoolss_spoolss_JobInfo1_status = -1;
 static gint hf_spoolss_spoolss_PortType_SPOOLSS_PORT_TYPE_WRITE = -1;
 static gint hf_spoolss_spoolss_JobInfo4_secdesc = -1;
 static gint hf_spoolss_spoolss_AddFormInfo1_size = -1;
+static gint hf_spoolss_spoolss_SetJobInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8__ndr_size_core_driver_dependencies = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDrivers_server = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_processor_level = -1;
@@ -918,12 +933,9 @@ static gint hf_spoolss__spoolss_EnumMonitors_count = -1;
 static gint hf_spoolss_spoolss_JobInfo4_pages_printed = -1;
 static gint hf_spoolss_spoolss_NotifyOptionType_fields = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_FAX = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra351 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_dwX = -1;
 static gint hf_spoolss_spoolss_DevmodeContainer_devmode_ = -1;
 static gint hf_spoolss_spoolss_GetPrinter_info = -1;
-static gint hf_spoolss_RPC_PrintPropertyValueUnion_propertyInt32 = -1;
-static gint hf_spoolss_spoolss_NotifyData_devmode = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_config_file = -1;
 static gint hf_spoolss_spoolss_SetPrinterDataEx_key_name = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_iPSLevel = -1;
@@ -943,26 +955,27 @@ static gint hf_spoolss_spoolss_NotifyInfo_count = -1;
 static gint hf_spoolss_spoolss_FormArea_left = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_iLayout = -1;
 static gint hf_spoolss_spoolss_SetForm_info_ctr = -1;
-static gint hf_spoolss_spoolss_AddFormInfo_info1 = -1;
 static gint hf_spoolss_spoolss_Time_year = -1;
 static gint hf_spoolss_spoolss_EnumPorts_servername = -1;
 static gint hf_spoolss_spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_DRV_ERROR_HANDLER = -1;
+static gint hf_spoolss_spoolss_SetJobInfo_val4_info4 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo4_data_file = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON4 = -1;
 static gint hf_spoolss_spoolss_JobInfo4_parameters = -1;
 static gint hf_spoolss__spoolss_EnumPorts_info = -1;
 static gint hf_spoolss_RPC_BIDI_REQUEST_CONTAINER_Version = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_info7 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_caContrast = -1;
 static gint hf_spoolss_spoolss_OSVersionEx_suite_mask = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_wCutSheet = -1;
 static gint hf_spoolss_spoolss_RouterReplyPrinter_handle = -1;
+static gint hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_DEVMODE_devmode = -1;
 static gint hf_spoolss_spoolss_DriverInfo7_version = -1;
 static gint hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_COPY_ALL_FILES = -1;
 static gint hf_spoolss_spoolss_JobInfo4_notify_name = -1;
 static gint hf_spoolss___spoolss_EnumPrintProcessors_info = -1;
 static gint hf_spoolss_spoolss_OpenPrinterEx_printername = -1;
 static gint hf_spoolss_spoolss_DeletePrinterDataEx_value_name = -1;
+static gint hf_spoolss_spoolss_AddMonitorInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_EnumPrintProcDataTypes_count = -1;
 static gint hf_spoolss_UNIVERSAL_FONT_ID_Index = -1;
 static gint hf_spoolss_spoolss_DeviceMode_reserved2 = -1;
@@ -970,7 +983,6 @@ static gint hf_spoolss_spoolss_AddDriverInfo3_dependent_files = -1;
 static gint hf_spoolss_spoolss_DeletePrinterDriverEx_delete_flags = -1;
 static gint hf_spoolss_spoolss_OSVersion_major = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PAPERLENGTH = -1;
-static gint hf_spoolss_spoolss_NotifyData_string = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_NETWORK = -1;
 static gint hf_spoolss__spoolss_EnumMonitors_level = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_global_counter = -1;
@@ -982,6 +994,7 @@ static gint hf_spoolss_spoolss_PrinterInfo2_untiltime = -1;
 static gint hf_spoolss_spoolss_SetPrinterDataEx_type = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA351_caGreenGamma = -1;
 static gint hf_spoolss___spoolss_EnumPorts_count = -1;
+static gint hf_spoolss_spoolss_KeyNames_valdefault_string_array = -1;
 static gint hf_spoolss_spoolss_EnumPrinters_needed = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINTER = -1;
 static gint hf_spoolss_spoolss_FormArea_right = -1;
@@ -993,14 +1006,15 @@ static gint hf_spoolss_spoolss_AddMonitorInfo2_dll_name = -1;
 static gint hf_spoolss_spoolss_JobInfo2_pages_printed = -1;
 static gint hf_spoolss_spoolss_JobInfo4_driver_name = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_iDialect = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_val6_info6 = -1;
 static gint hf_spoolss_spoolss_JobInfo4_time = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_SET_PRINTER_DRIVER = -1;
 static gint hf_spoolss_spoolss_GetForm_form_name = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA351_caReferenceBlack = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_info1 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_logpixels = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo3_default_datatype = -1;
 static gint hf_spoolss_spoolss_DeletePort_ptr = -1;
+static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_ENUM_sData = -1;
 static gint hf_spoolss_spoolss_PrinterEnumValues_data_length = -1;
 static gint hf_spoolss_RPC_BIDI_REQUEST_DATA_pSchema = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo3_version = -1;
@@ -1020,7 +1034,7 @@ static gint hf_spoolss_spoolss_ReadPrinter_data_size = -1;
 static gint hf_spoolss_spoolss_EnumPrintProcDataTypes_info = -1;
 static gint hf_spoolss_spoolss_DeleteDriverFlags_DPD_DELETE_SPECIFIC_VERSION = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_driver_path = -1;
-static gint hf_spoolss_spoolss_AddFormInfo_info2 = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_printername = -1;
 static gint hf_spoolss_spoolss_XcvData_in_data = -1;
 static gint hf_spoolss_spoolss_Notify_data = -1;
@@ -1054,8 +1068,6 @@ static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_COPIES = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caBlueGamma = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA3_4_wReserved = -1;
 static gint hf_spoolss_spoolss_AddPrinter_info_ctr = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra3_4 = -1;
-static gint hf_spoolss_spoolss_PrinterData_value = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_inf_path = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_wCoreJTExpSize = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_help_file = -1;
@@ -1064,15 +1076,14 @@ static gint hf_spoolss_spoolss_EnumMonitors_needed = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_fxScrFreq = -1;
 static gint hf_spoolss_spoolss_PrinterInfo5_device_not_selected_timeout = -1;
 static gint hf_spoolss_spoolss_DeviceModeInfo_devmode = -1;
+static gint hf_spoolss_spoolss_PrinterData_valREG_BINARY_binary = -1;
 static gint hf_spoolss_spoolss_OSVersion_extra_string = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_SCALE = -1;
 static gint hf_spoolss_spoolss_SetPortInfo3_severity = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_wchEPSFile = -1;
 static gint hf_spoolss_spoolss_DriverInfo101_previous_names = -1;
-static gint hf_spoolss_spoolss_SetPortInfo_info1 = -1;
 static gint hf_spoolss_spoolss_AddPrintProcessor_print_processor_name = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_reserved3 = -1;
-static gint hf_spoolss_spoolss_DriverInfo_info8 = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_drivername = -1;
 static gint hf_spoolss_spoolss_RemoteFindFirstPrinterChangeNotifyEx_flags = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caGreenGamma = -1;
@@ -1090,18 +1101,21 @@ static gint hf_spoolss_spoolss_EnumJobs_needed = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDataEx_key_name = -1;
 static gint hf_spoolss_spoolss_MonitorInfo2_environment = -1;
 static gint hf_spoolss_spoolss_DriverInfo3_data_file = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0350_psdrvextra351 = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_LOCAL = -1;
 static gint hf_spoolss_spoolss_CorePrinterDriver_formname = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcDataTypes_count = -1;
+static gint hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte_propertyByte = -1;
+static gint hf_spoolss_spoolss_DriverDirectoryInfo_val1_info1 = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_val7_info7 = -1;
 static gint hf_spoolss_spoolss_AddPortEx_port_ctr = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverPackagePath_package_id = -1;
 static gint hf_spoolss_spoolss_GetForm_info = -1;
 static gint hf_spoolss_spoolss_TimeCtr_size = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_iQuality = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_info8 = -1;
+static gint hf_spoolss_spoolss_Field_valJOB_NOTIFY_TYPE_field = -1;
 static gint hf_spoolss_spoolss_PrinterEnumValues_value_name_len = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDrivers_info = -1;
-static gint hf_spoolss_spoolss_PrintProcessorDirectoryInfo_info1 = -1;
 static gint hf_spoolss___spoolss_EnumForms_info = -1;
 static gint hf_spoolss_spoolss_SetPrinterDataEx_handle = -1;
 static gint hf_spoolss_spoolss_UserLevel1_major = -1;
@@ -1132,11 +1146,13 @@ static gint hf_spoolss_spoolss_DeviceMode_paperwidth = -1;
 static gint hf_spoolss_spoolss_JTEXP_wJTHdrSize = -1;
 static gint hf_spoolss_spoolss_DriverInfo4_version = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_size_high = -1;
+static gint hf_spoolss_spoolss_PrintProcessorDirectoryInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_STRICT_UPGRADE = -1;
 static gint hf_spoolss_spoolss_ReplyClosePrinter_handle = -1;
 static gint hf_spoolss_spoolss_AddPrintProcessor_server = -1;
 static gint hf_spoolss_spoolss_DsPrintAction_DSPRINT_UNPUBLISH = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_monitor_name = -1;
+static gint hf_spoolss_spoolss_DriverInfo_val6_info6 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_devicename = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_driver_name = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_document_name = -1;
@@ -1148,9 +1164,11 @@ static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_CONTAINER = -1;
 static gint hf_spoolss_spoolss_UserLevel1_processor = -1;
 static gint hf_spoolss_spoolss_PrinterInfo4_servername = -1;
 static gint hf_spoolss_spoolss_RpcDeleteJobNamedProperty_pszName = -1;
+static gint hf_spoolss_spoolss_SetPortInfo_val2_info2 = -1;
 static gint hf_spoolss__spoolss_EnumPorts_servername = -1;
 static gint hf_spoolss_spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_COMPRESS_BITMAP = -1;
 static gint hf_spoolss_spoolss_GetJob_needed = -1;
+static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_INT_iData = -1;
 static gint hf_spoolss_spoolss_PortData1_reserved = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_status = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver_buffer = -1;
@@ -1159,6 +1177,7 @@ static gint hf_spoolss_spoolss_SetPrinterInfo3_sec_desc_ptr = -1;
 static gint hf_spoolss_spoolss_SetPrinterData_offered = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_BUSY = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_NETWORK = -1;
+static gint hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_STRING_string = -1;
 static gint hf_spoolss_spoolss_DriverInfo6_dependent_files = -1;
 static gint hf_spoolss_spoolss_FormSize_height = -1;
 static gint hf_spoolss_spoolss_PortData2_dblspool = -1;
@@ -1175,18 +1194,18 @@ static gint hf_spoolss_spoolss_AccessRights_PRINTER_ACCESS_ADMINISTER = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_wchEPSFile = -1;
 static gint hf_spoolss_spoolss_AddFormInfo2_keyword = -1;
 static gint hf_spoolss_spoolss_DriverInfo4_monitor_name = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_val5_info5 = -1;
 static gint hf_spoolss_spoolss_DocumentInfo1_datatype = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo5_driver_name = -1;
+static gint hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32_propertyInt32 = -1;
 static gint hf_spoolss_spoolss_RpcSetJobNamedProperty_hPrinter = -1;
 static gint hf_spoolss_spoolss_AddPrintProcessor_architecture = -1;
-static gint hf_spoolss_spoolss_UserLevel_level3 = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PROCESSING = -1;
 static gint hf_spoolss_spoolss_PortData2_snmp_enabled = -1;
 static gint hf_spoolss_spoolss_OEM_DMEXTRA_Data = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDataEx_handle = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PAPER_OUT = -1;
 static gint hf_spoolss_spoolss_FormInfo1_area = -1;
-static gint hf_spoolss_RPC_PrintPropertyValueUnion_propertyByte = -1;
 static gint hf_spoolss_spoolss_PortData2_protocol = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_wOEMExtra = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caReferenceWhite = -1;
@@ -1198,7 +1217,6 @@ static gint hf_spoolss_spoolss_AddJob_offered = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverDirectory_needed = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caBrightness = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_EXPAND = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra = -1;
 static gint hf_spoolss_spoolss_JTEXP_dwVersion = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo4_driver_name = -1;
 static gint hf_spoolss_spoolss_UserLevel1_user = -1;
@@ -1208,19 +1226,19 @@ static gint hf_spoolss_spoolss_JobInfo1_total_pages = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_priority = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_data_type = -1;
 static gint hf_spoolss_spoolss_EnumPrinterKey_key_name = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_info3 = -1;
 static gint hf_spoolss_spoolss_JobInfo1_printer_name = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_start_time = -1;
-static gint hf_spoolss_spoolss_AddDriverInfo_info4 = -1;
+static gint hf_spoolss_spoolss_PortInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_RemoteFindFirstPrinterChangeNotifyEx_notify_options = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PAUSED = -1;
+static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_BOOL_bData = -1;
+static gint hf_spoolss_spoolss_SetJobInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_fields = -1;
 static gint hf_spoolss_RPC_BIDI_RESPONSE_CONTAINER_Version = -1;
 static gint hf_spoolss_spoolss_EnumPrinterKey_needed = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_servername = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_wReserved = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_job_error = -1;
-static gint hf_spoolss_spoolss_DriverInfo_info1 = -1;
 static gint hf_spoolss_spoolss_StartDocPrinter_info_ctr = -1;
 static gint hf_spoolss_spoolss_MonitorUi_dll_name = -1;
 static gint hf_spoolss_spoolss_JobInfo1_position = -1;
@@ -1230,13 +1248,14 @@ static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_MEDIATYPE = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_total_jobs = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_datatype = -1;
 static gint hf_spoolss_spoolss_DsPrintAction_DSPRINT_PUBLISH = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_valdefault_uniblob = -1;
 static gint hf_spoolss_spoolss_JobInfoContainer_info = -1;
 static gint hf_spoolss_spoolss_XcvData_needed = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_position = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_notify_name = -1;
+static gint hf_spoolss_spoolss_SetPortInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_GetPrinterDataEx_needed = -1;
 static gint hf_spoolss_spoolss_DeletePrinterDriver_driver = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra500 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caReferenceBlack = -1;
 static gint hf_spoolss_spoolss_AddPort_unknown = -1;
 static gint hf_spoolss_spoolss_DriverInfo5_driver_name = -1;
@@ -1249,14 +1268,12 @@ static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PENDING_DELETION = -
 static gint hf_spoolss___spoolss_EnumForms_level = -1;
 static gint hf_spoolss___spoolss_EnumPrinterDataEx_info = -1;
 static gint hf_spoolss_spoolss_OSVersionEx_extra_string_ = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_info7 = -1;
+static gint hf_spoolss_spoolss_AddDriverInfo_val6_info6 = -1;
 static gint hf_spoolss_spoolss_DriverInfo6_monitor_name = -1;
 static gint hf_spoolss_spoolss_OSVersion__ndr_size = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_hardware_id = -1;
 static gint hf_spoolss_spoolss_EnumJobs_handle = -1;
-static gint hf_spoolss_spoolss_DriverInfo_info6 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterKey_handle = -1;
-static gint hf_spoolss_spoolss_SetPortInfo_infoFF = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6__ndr_size_dependent_files = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver_offered = -1;
 static gint hf_spoolss_spoolss_OpenPrinter_devmode_ctr = -1;
@@ -1266,16 +1283,12 @@ static gint hf_spoolss_spoolss_PrinterInfo0_reserved3 = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDataEx_info = -1;
 static gint hf_spoolss_spoolss_AddPortEx_servername = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_fxScrAngle = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_info8 = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_manufacturer_url = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra = -1;
 static gint hf_spoolss_spoolss_JobInfo4_position = -1;
 static gint hf_spoolss__spoolss_EnumJobs_handle = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_defaultpriority = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo7_action = -1;
-static gint hf_spoolss_spoolss_PrinterData_data = -1;
 static gint hf_spoolss_spoolss_AbortPrinter_handle = -1;
-static gint hf_spoolss_RPC_BIDI_DATA_u_bData = -1;
 static gint hf_spoolss_spoolss_FormInfo1_flags = -1;
 static gint hf_spoolss_spoolss_PortData1_portname = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_starttime = -1;
@@ -1287,6 +1300,7 @@ static gint hf_spoolss_spoolss_RpcSetJobNamedProperty_pProperty = -1;
 static gint hf_spoolss_spoolss_AddPortEx_port_var_ctr = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PAGE_PUNT = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_version = -1;
+static gint hf_spoolss_spoolss_DriverInfo_val5_info5 = -1;
 static gint hf_spoolss_spoolss_OSVersionEx_minor = -1;
 static gint hf_spoolss_RPC_BIDI_REQUEST_CONTAINER_aData = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_wVer = -1;
@@ -1298,13 +1312,11 @@ static gint hf_spoolss_spoolss_AddPrinterDriverEx_flags = -1;
 static gint hf_spoolss_spoolss_RouterReplyPrinter_bufsize = -1;
 static gint hf_spoolss_spoolss_SetPortInfoFF_port_name = -1;
 static gint hf_spoolss_spoolss_AddPerMachineConnection_provider = -1;
-static gint hf_spoolss_spoolss_UserLevel_level1 = -1;
 static gint hf_spoolss_spoolss_AccessRights_JOB_ACCESS_ADMINISTER = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_DITHERTYPE = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PRINT_PROCESSOR = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4__secdesc_ptr = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PANNINGWIDTH = -1;
-static gint hf_spoolss_spoolss_SetPortInfo_info3 = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_total_bytes = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_driver_name = -1;
 static gint hf_spoolss_spoolss_PlayGDIScriptOnPrinterIC_pIn = -1;
@@ -1333,7 +1345,6 @@ static gint hf_spoolss_spoolss_SetPrinterInfo5_printername = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDataEx_offered = -1;
 static gint hf_spoolss_spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_PRINT_NEGATIVE = -1;
 static gint hf_spoolss_spoolss_FindClosePrinterNotify_handle = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_info1 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo2_driver_name = -1;
 static gint hf_spoolss_spoolss_EnumForms_handle = -1;
 static gint hf_spoolss_spoolss_JobInfo2_document_name = -1;
@@ -1357,8 +1368,6 @@ static gint hf_spoolss_spoolss_PortInfo2_reserved = -1;
 static gint hf_spoolss_propertyBlob_cbBuf = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_enumerate_network_printers = -1;
 static gint hf_spoolss_spoolss_GetPrinter_needed = -1;
-static gint hf_spoolss_spoolss_JobInfo_info4 = -1;
-static gint hf_spoolss_spoolss_DriverInfo_info5 = -1;
 static gint hf_spoolss_spoolss_JobInfo1_job_id = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_FORMNAME = -1;
 static gint hf_spoolss__spoolss_EnumPrinters_level = -1;
@@ -1368,8 +1377,6 @@ static gint hf_spoolss_spoolss_MonitorInfo2_monitor_name = -1;
 static gint hf_spoolss_spoolss_StartDocPrinter_handle = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_job_id = -1;
 static gint hf_spoolss_spoolss_RouterRefreshPrinterChangeNotify_options = -1;
-static gint hf_spoolss_spoolss_PortInfo_info3 = -1;
-static gint hf_spoolss_RPC_BIDI_DATA_u_biData = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_dwSignature = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_caReferenceBlack = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDrivers_server = -1;
@@ -1378,6 +1385,7 @@ static gint hf_spoolss_spoolss_NotifyOptionType_count = -1;
 static gint hf_spoolss_spoolss_DriverInfo3_driver_path = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverDirectory_level = -1;
 static gint hf_spoolss_spoolss_OpenPrinter_printername = -1;
+static gint hf_spoolss_spoolss_PortInfo_val0xff_infoFF = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_total_pages = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo5_driver_version = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_cjobs = -1;
@@ -1390,7 +1398,6 @@ static gint hf_spoolss_spoolss_PSDRVEXTRA500_caIlluminantIndex = -1;
 static gint hf_spoolss_spoolss_RemoteFindFirstPrinterChangeNotifyEx_handle = -1;
 static gint hf_spoolss_spoolss_Time_second = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_FILE = -1;
-static gint hf_spoolss_spoolss_DriverDirectoryInfo_info1 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_cjobs = -1;
 static gint hf_spoolss_spoolss_DsPrintAction_DSPRINT_UPDATE = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo1_comment = -1;
@@ -1409,6 +1416,7 @@ static gint hf_spoolss_spoolss_SetPrinterInfo0_servername = -1;
 static gint hf_spoolss_spoolss_TimeCtr_time = -1;
 static gint hf_spoolss_spoolss_DriverInfo3_help_file = -1;
 static gint hf_spoolss_spoolss_DriverInfo4_dependent_files = -1;
+static gint hf_spoolss_spoolss_PortInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo5_config_file = -1;
 static gint hf_spoolss_RPC_BIDI_DATA_dwBidiType = -1;
 static gint hf_spoolss_spoolss_GetForm_level = -1;
@@ -1423,23 +1431,24 @@ static gint hf_spoolss_spoolss_SetPortInfo2_port_type = -1;
 static gint hf_spoolss_spoolss_EnumJobs_level = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_iTTDLFmt = -1;
 static gint hf_spoolss_spoolss_DriverInfo101_manufacturer_name = -1;
-static gint hf_spoolss_spoolss_NotifyData_sd = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_printprocessor = -1;
 static gint hf_spoolss_spoolss_CreatePrinterIC_gdi_handle = -1;
 static gint hf_spoolss_spoolss_EnumJobs_buffer = -1;
 static gint hf_spoolss_spoolss_AccessRights_SERVER_ACCESS_ENUMERATE = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_val6_info6 = -1;
 static gint hf_spoolss_spoolss_DMUNI_Flags_SPOOLSS_DM_UNI_FLAGS_PRINT_TEXT_AS_GRAPHICS = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_servername = -1;
 static gint hf_spoolss_spoolss_UserLevel3_size2 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfoCtr_info = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_info4 = -1;
+static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_TEXT_sData = -1;
 static gint hf_spoolss_spoolss_NotifyOption_count = -1;
 static gint hf_spoolss_spoolss_GetJob_offered = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo7_guid = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_total_jobs = -1;
+static gint hf_spoolss_spoolss_UserLevel_val1_level1 = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0500_unidrvextra500 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_parameters = -1;
 static gint hf_spoolss_spoolss_DeletePort_server_name = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_info5 = -1;
 static gint hf_spoolss_spoolss_AddFormInfo2_string_type = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_NUP = -1;
 static gint hf_spoolss_spoolss_RpcSetJobNamedProperty_JobId = -1;
@@ -1457,6 +1466,7 @@ static gint hf_spoolss_spoolss_CorePrinterDriver_driver_version = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_DIRECT = -1;
 static gint hf_spoolss_spoolss_DriverInfo101_driver_date = -1;
 static gint hf_spoolss_spoolss_SetForm_handle = -1;
+static gint hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64_propertyInt64 = -1;
 static gint hf_spoolss_spoolss_DriverInfo4_architecture = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_num_error_out_of_paper = -1;
 static gint hf_spoolss_spoolss_DsPrintAction_DSPRINT_PENDING = -1;
@@ -1471,6 +1481,7 @@ static gint hf_spoolss_spoolss_UserLevel3_processor = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caRedGamma = -1;
 static gint hf_spoolss_spoolss_EnumPrinterData_handle = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_job_error = -1;
+static gint hf_spoolss_spoolss_SetPortInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_PACKAGE_AWARE = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PAPER_PROBLEM = -1;
 static gint hf_spoolss_spoolss_SetPortInfoContainer_level = -1;
@@ -1480,12 +1491,10 @@ static gint hf_spoolss_spoolss_DeviceMode_defaultsource = -1;
 static gint hf_spoolss_spoolss_FormSize_width = -1;
 static gint hf_spoolss_spoolss_SetPrinter_handle = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_caRedGamma = -1;
-static gint hf_spoolss_RPC_PrintPropertyValueUnion_propertyString = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_portname = -1;
 static gint hf_spoolss_spoolss_EnumPrinterData_data = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcessors_info = -1;
 static gint hf_spoolss_spoolss_DocumentInfoCtr_info = -1;
-static gint hf_spoolss_spoolss_PrinterData_binary = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caRedGreenTint = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_RAW_ONLY = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_min_inbox_driver_ver_version = -1;
@@ -1515,15 +1524,17 @@ static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_OFFLINE = -1;
 static gint hf_spoolss_spoolss_EndPagePrinter_handle = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_DEFAULT = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo3__ndr_size_dependent_files = -1;
+static gint hf_spoolss_spoolss_DriverInfo_val101_info101 = -1;
 static gint hf_spoolss_spoolss_SetForm_form_name = -1;
 static gint hf_spoolss_spoolss_GetPrintProcessorDirectory_level = -1;
 static gint hf_spoolss_spoolss_AddPrintProcessor_path_name = -1;
 static gint hf_spoolss_spoolss_PortData2_port_monitor_mib_index = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo4_driver_path = -1;
-static gint hf_spoolss_spoolss_AddDriverInfo_info6 = -1;
 static gint hf_spoolss_spoolss_DriverInfo4_help_file = -1;
 static gint hf_spoolss___spoolss_EnumJobs_count = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_val8_info8 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_caReferenceWhite = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_val4_info4 = -1;
 static gint hf_spoolss_spoolss_GetCorePrinterDrivers_core_printer_driver_count = -1;
 static gint hf_spoolss_spoolss_ReplyOpenPrinter_handle = -1;
 static gint hf_spoolss_spoolss_JobInfo2_time = -1;
@@ -1537,24 +1548,24 @@ static gint hf_spoolss_spoolss_SetJobInfo4__devmode_ptr = -1;
 static gint hf_spoolss_spoolss_GetJob_level = -1;
 static gint hf_spoolss_spoolss_DeviceMode_ttoption = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver_info_ = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_aOptions = -1;
 static gint hf_spoolss_spoolss_RpcGetJobNamedPropertyValue_pValue = -1;
-static gint hf_spoolss_spoolss_DriverInfo_info3 = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_wVer = -1;
+static gint hf_spoolss_spoolss_PrinterData_valREG_DWORD_value = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_iLayout = -1;
 static gint hf_spoolss_spoolss_PortData1_device_type = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcDataTypes_info = -1;
 static gint hf_spoolss_spoolss_DeviceMode_displayflags = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA351_wchEPSFile = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_info9 = -1;
 static gint hf_spoolss_spoolss_Time_day_of_week = -1;
+static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_NULL_bData = -1;
 static gint hf_spoolss_spoolss_JobInfo1_text_status = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_servername = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_WRITE_JOB = -1;
 static gint hf_spoolss_spoolss_SetPrinterData_type = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_processor_type = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo5_transmission_retry_timeout = -1;
-static gint hf_spoolss_spoolss_FormInfo_info2 = -1;
 static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_ERROR = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDrivers_needed = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_iPSLevel = -1;
@@ -1577,10 +1588,9 @@ static gint hf_spoolss_spoolss_SetJobInfo4_print_processor = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caBlueGamma = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_until_time = -1;
 static gint hf_spoolss___spoolss_EnumForms_count = -1;
-static gint hf_spoolss_spoolss_DriverInfo_info101 = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINTER_DRIVER = -1;
-static gint hf_spoolss_spoolss_SetJobInfo_info1 = -1;
 static gint hf_spoolss_spoolss_MonitorInfo2_dll_name = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0400_psdrvextra400 = -1;
 static gint hf_spoolss_spoolss_RouterReplyPrinter_flags = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_client_minor_version = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_dwBookletFlags = -1;
@@ -1600,6 +1610,7 @@ static gint hf_spoolss_spoolss_JTEXP_dwSize = -1;
 static gint hf_spoolss_spoolss_PortVarContainer_monitor_data_size = -1;
 static gint hf_spoolss_spoolss_EnumJobs_numjobs = -1;
 static gint hf_spoolss__spoolss_EnumJobs_firstjob = -1;
+static gint hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer_propertyBlob = -1;
 static gint hf_spoolss_spoolss_XcvData__in_data_length = -1;
 static gint hf_spoolss_spoolss_SetPrinter_info_ctr = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_processor_architecture = -1;
@@ -1610,6 +1621,7 @@ static gint hf_spoolss_spoolss_OpenPrinterEx_userlevel_ctr = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8__ndr_size_dependent_files = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_dwOptions = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwX = -1;
+static gint hf_spoolss_spoolss_PrinterData_valREG_MULTI_SZ_string_array = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_cjobs = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_JOB = -1;
 static gint hf_spoolss___spoolss_EnumMonitors_count = -1;
@@ -1619,6 +1631,7 @@ static gint hf_spoolss_werror = -1;
 static gint hf_spoolss_spoolss_EnumMonitors_servername = -1;
 static gint hf_spoolss_spoolss_AddJob_level = -1;
 static gint hf_spoolss_spoolss_AccessRights_PRINTER_ACCESS_USE = -1;
+static gint hf_spoolss_spoolss_PrintProcDataTypesInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_data_type = -1;
 static gint hf_spoolss_spoolss_AddMonitorInfo2_environment = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8__ndr_size_previous_names = -1;
@@ -1643,24 +1656,20 @@ static gint hf_spoolss_spoolss_UNIDRVEXTRA500_aOptions = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_text_status = -1;
 static gint hf_spoolss_spoolss_RpcEnumJobNamedProperties_pcProperties = -1;
 static gint hf_spoolss_spoolss_JTEXP_ModelName = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_val7_info7 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caFlags = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_SHARED = -1;
 static gint hf_spoolss_spoolss_RouterReplyPrinterEx_handle = -1;
-static gint hf_spoolss_spoolss_PrintProcessorInfo_info1 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_DEFAULT = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_server_minor_version = -1;
 static gint hf_spoolss_spoolss_EnumJobs_offered = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINT_PROCESSOR = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_COLLATE = -1;
 static gint hf_spoolss_spoolss_EnumMonitors_offered = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_uniblob = -1;
 static gint hf_spoolss_spoolss_WritePrinter_handle = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_dwSignature = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo5_driver_path = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo5_portname = -1;
-static gint hf_spoolss_spoolss_Field_field = -1;
-static gint hf_spoolss_spoolss_AddDriverInfo_info2 = -1;
-static gint hf_spoolss_spoolss_AddMonitorInfo_info1 = -1;
 static gint hf_spoolss_spoolss_OSVersionEx_major = -1;
 static gint hf_spoolss_spoolss_AddFormInfo2_mui_dll = -1;
 static gint hf_spoolss_spoolss_SetPortInfo2_reserved = -1;
@@ -1679,13 +1688,12 @@ static gint hf_spoolss_spoolss_PrinterInfo2_devmode = -1;
 static gint hf_spoolss_spoolss_GetPrinterData_data = -1;
 static gint hf_spoolss_spoolss_RouterRefreshPrinterChangeNotify_handle = -1;
 static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_COMPLETE = -1;
-static gint hf_spoolss_spoolss_AddDriverInfo_info8 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_collate = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0301_unidrvextra3_4 = -1;
 static gint hf_spoolss_spoolss_DeleteForm_form_name = -1;
 static gint hf_spoolss_spoolss_Time_day = -1;
 static gint hf_spoolss_spoolss_DriverDirectoryInfo1_directory_name = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_start_time = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_info6 = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_printprocessor = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwWidthOffset = -1;
 static gint hf_spoolss_spoolss_ReplyOpenPrinter_server_name = -1;
@@ -1704,6 +1712,7 @@ static gint hf_spoolss_spoolss_UNIDRVEXTRA500_dwFlags = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_IO_ACTIVE = -1;
 static gint hf_spoolss_spoolss_PrinterInfo1_name = -1;
 static gint hf_spoolss_spoolss_PortData2_portname = -1;
+static gint hf_spoolss_spoolss_DocumentInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PORT = -1;
 static gint hf_spoolss_spoolss_OEM_DMEXTRA_dwSize = -1;
 static gint hf_spoolss_spoolss_AddPort_server_name = -1;
@@ -1719,19 +1728,17 @@ static gint hf_spoolss_spoolss_SetJobInfo4_submitted = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PELSWIDTH = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_server_name = -1;
 static gint hf_spoolss_spoolss_DeviceMode_color = -1;
-static gint hf_spoolss_spoolss_ReplyPrinterInfo_info0 = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_OFFLINE = -1;
 static gint hf_spoolss_spoolss_GetPrinterData_needed = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDrivers_info = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_fxScrFreq = -1;
 static gint hf_spoolss_spoolss_ReplyOpenPrinter_buffer = -1;
 static gint hf_spoolss_spoolss_AccessRights_SERVER_ACCESS_ADMINISTER = -1;
-static gint hf_spoolss_spoolss_JobInfo_info1 = -1;
 static gint hf_spoolss_spoolss_GetPrintProcessorDirectory_environment = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caReferenceWhite = -1;
 static gint hf_spoolss_spoolss_MonitorContainer_info = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra400 = -1;
 static gint hf_spoolss_spoolss_DriverInfo5_data_file = -1;
+static gint hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR_sd = -1;
 static gint hf_spoolss_spoolss_JobInfo2_total_pages = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_priority = -1;
 static gint hf_spoolss_opnum = -1;
@@ -1750,13 +1757,13 @@ static gint hf_spoolss_spoolss_PrinterInfo3_secdesc_ = -1;
 static gint hf_spoolss_spoolss_DeleteForm_handle = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_NO_TONER = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwOptions = -1;
-static gint hf_spoolss_spoolss_NotifyData_time = -1;
 static gint hf_spoolss_spoolss_AddPrinter_devmode_ctr = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caFlags = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_POSITION = -1;
 static gint hf_spoolss_spoolss_NotifyOption_flags = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_parameters = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_ENABLE_DEVQ = -1;
+static gint hf_spoolss_spoolss_DriverInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_EnumPorts_info = -1;
 static gint hf_spoolss_spoolss_DeviceMode_paperlength = -1;
 static gint hf_spoolss_spoolss_DriverInfo5_driver_version = -1;
@@ -1765,10 +1772,8 @@ static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_FAILED_CONNECTI
 static gint hf_spoolss_spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_ROTATE_180 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo2_data_file = -1;
 static gint hf_spoolss_spoolss_DeviceMode_specversion = -1;
-static gint hf_spoolss_spoolss_PortInfo_info2 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON1 = -1;
 static gint hf_spoolss_spoolss_WritePrinter__data_size = -1;
-static gint hf_spoolss_RPC_PrintPropertyValueUnion_propertyBlob = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_SANDBOX_ENABLED = -1;
 static gint hf_spoolss_spoolss_GetCorePrinterDrivers_core_printer_drivers = -1;
 static gint hf_spoolss_spoolss_UserLevel1_size = -1;
@@ -1782,6 +1787,7 @@ static gint hf_spoolss_spoolss_AddDriverInfo4_dependent_files = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_num_error_not_ready = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_defaultpriority = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_printername = -1;
+static gint hf_spoolss_spoolss_AddFormInfo_val2_info2 = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcDataTypes_offered = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwNupDirection = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PRINTING = -1;
@@ -1789,6 +1795,7 @@ static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_SET_JOB = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_caFlags = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_status = -1;
 static gint hf_spoolss_spoolss_GetForm_info_ = -1;
+static gint hf_spoolss_spoolss_SetPortInfo_val0xff_infoFF = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_wChecksum = -1;
 static gint hf_spoolss_RPC_PrintNamedProperty_propertyName = -1;
 
@@ -2302,15 +2309,15 @@ static int spoolss_dissect_element_OEM_DMEXTRA_dwSize(tvbuff_t *tvb _U_, int off
 static int spoolss_dissect_element_OEM_DMEXTRA_dwSignature(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_OEM_DMEXTRA_dwVersion(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_OEM_DMEXTRA_Data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra351(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra400(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataPostScript_psblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra3_4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_uniblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0350_psdrvextra351(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0400_psdrvextra400(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0501_psdrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0600_psdrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataPostScript_valdefault_psblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0301_unidrvextra3_4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0500_unidrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0600_unidrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_valdefault_uniblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string spoolss_DeviceModeFields_DEVMODE_ORIENTATION_tfs = {
    "DEVMODE_ORIENTATION is SET",
    "DEVMODE_ORIENTATION is NOT SET",
@@ -2875,16 +2882,16 @@ static int spoolss_dissect_element_PrinterInfo7_action(tvbuff_t *tvb _U_, int of
 static int spoolss_dissect_element_DeviceModeInfo_devmode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DeviceModeInfo_devmode_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DeviceModeInfo_devmode__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_val9_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DevmodeContainer__ndr_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DevmodeContainer_devmode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DevmodeContainer_devmode_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2986,10 +2993,10 @@ static int spoolss_dissect_element_JobInfo4_submitted(tvbuff_t *tvb _U_, int off
 static int spoolss_dissect_element_JobInfo4_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_JobInfo4_pages_printed(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_JobInfo4_size_high(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_JobInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_JobInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_JobInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_JobInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_JobInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_JobInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_JobInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_JobInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetJobInfo1_job_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetJobInfo1_printer_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetJobInfo1_printer_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3080,14 +3087,14 @@ static int spoolss_dissect_element_SetJobInfo4_submitted(tvbuff_t *tvb _U_, int
 static int spoolss_dissect_element_SetJobInfo4_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetJobInfo4_pages_printed(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetJobInfo4_size_high(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_JobInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_JobInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 const value_string spoolss_spoolss_JobControl_vals[] = {
@@ -3204,26 +3211,26 @@ static int spoolss_dissect_element_SetPrinterInfo8_devmode_ptr(tvbuff_t *tvb _U_
 static int spoolss_dissect_element_SetPrinterInfo8_devmode_ptr_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPrinterInfo9_devmode_ptr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPrinterInfo9_devmode_ptr_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info7_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_info9_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val5_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val6_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val7_info7_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val8_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val9_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_val9_info9_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPrinterInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_SetPrinterInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_StringArray__ndr_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3431,18 +3438,18 @@ static int spoolss_dissect_element_AddDriverInfo8_core_driver_dependencies(tvbuf
 static int spoolss_dissect_element_AddDriverInfo8_core_driver_dependencies_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddDriverInfo8_min_inbox_driver_ver_date(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddDriverInfo8_min_inbox_driver_ver_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_val6_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_val8_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddDriverInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_AddDriverInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_DriverInfo1_driver_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3632,32 +3639,32 @@ static int spoolss_dissect_element_DriverInfo101_hardware_id(tvbuff_t *tvb _U_,
 static int spoolss_dissect_element_DriverInfo101_hardware_id_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DriverInfo101_provider(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DriverInfo101_provider_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_val101_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DriverDirectoryInfo1_directory_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverDirectoryInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverDirectoryInfo_valdefault_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrintProcessorInfo1_print_processor_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrintProcessorInfo1_print_processor_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrintProcessorInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrintProcessorInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrintProcessorDirectoryInfo1_directory_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrintProcessorDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrintProcessorDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrintProcessorDirectoryInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrintProcessorDirectoryInfo_valdefault_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo1_document_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo1_document_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo1_output_file(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo1_output_file_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo1_datatype(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo1_datatype_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DocumentInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DocumentInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DocumentInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DocumentInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_DocumentInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_OSVersion__ndr_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3679,11 +3686,11 @@ static int spoolss_dissect_element_OSVersionEx_service_pack_minor(tvbuff_t *tvb
 static int spoolss_dissect_element_OSVersionEx_suite_mask(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_OSVersionEx_product_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_OSVersionEx_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterData_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterData_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterData_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterData_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterData_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterData_valREG_SZ_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterData_valREG_BINARY_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterData_valREG_DWORD_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterData_valREG_MULTI_SZ_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterData_valdefault_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string spoolss_spoolss_FormFlags_vals[] = {
        { SPOOLSS_FORM_USER, "SPOOLSS_FORM_USER" },
        { SPOOLSS_FORM_BUILTIN, "SPOOLSS_FORM_BUILTIN" },
@@ -3728,8 +3735,8 @@ static int spoolss_dissect_element_FormInfo2_display_name(tvbuff_t *tvb _U_, int
 static int spoolss_dissect_element_FormInfo2_display_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_FormInfo2_lang_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_FormInfo2_unused(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_FormInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_FormInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_FormInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_FormInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfo1_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfo1_form_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfo1_form_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3749,10 +3756,10 @@ static int spoolss_dissect_element_AddFormInfo2_ressource_id(tvbuff_t *tvb _U_,
 static int spoolss_dissect_element_AddFormInfo2_display_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfo2_display_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfo2_lang_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddFormInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddFormInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddFormInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddFormInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddFormInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddFormInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddFormInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddFormInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_AddFormInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_PortInfo1_port_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3810,10 +3817,10 @@ static int spoolss_dissect_element_PortInfo3_severity(tvbuff_t *tvb _U_, int off
 static int spoolss_dissect_element_PortInfoFF_port_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PortInfoFF_port_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PortInfoFF_monitor_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PortInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PortInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PortInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PortInfo_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PortInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PortInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PortInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PortInfo_val0xff_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_MonitorInfo1_monitor_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_MonitorInfo1_monitor_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_MonitorInfo2_monitor_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3822,8 +3829,8 @@ static int spoolss_dissect_element_MonitorInfo2_environment(tvbuff_t *tvb _U_, i
 static int spoolss_dissect_element_MonitorInfo2_environment_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_MonitorInfo2_dll_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_MonitorInfo2_dll_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_MonitorInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_MonitorInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_MonitorInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_MonitorInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfo1_port_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfo1_port_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfo2_port_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3841,14 +3848,14 @@ static int spoolss_dissect_element_SetPortInfo3_severity(tvbuff_t *tvb _U_, int
 static int spoolss_dissect_element_SetPortInfoFF_port_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfoFF_port_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfoFF_monitor_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_infoFF_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_val0xff_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_val0xff_infoFF_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_SetPortInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_UNIVERSAL_FONT_ID_Checksum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3864,15 +3871,15 @@ static int spoolss_dissect_element_AddMonitorInfo2_environment(tvbuff_t *tvb _U_
 static int spoolss_dissect_element_AddMonitorInfo2_environment_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddMonitorInfo2_dll_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddMonitorInfo2_dll_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddMonitorInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddMonitorInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddMonitorInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddMonitorInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddMonitorInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddMonitorInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddMonitorInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddMonitorInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_MonitorContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_MonitorContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_PrintProcDataTypesInfo1_name_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrintProcDataTypesInfo1_name_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrintProcDataTypesInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrintProcDataTypesInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINTER_tfs = {
    "PRINTER_CHANGE_ADD_PRINTER is SET",
    "PRINTER_CHANGE_ADD_PRINTER is NOT SET",
@@ -4024,9 +4031,9 @@ const value_string spoolss_spoolss_NotifyType_vals[] = {
        { JOB_NOTIFY_TYPE, "JOB_NOTIFY_TYPE" },
 { 0, NULL }
 };
-static int spoolss_dissect_element_Field_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_Field_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_Field_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_Field_valPRINTER_NOTIFY_TYPE_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_Field_valJOB_NOTIFY_TYPE_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_Field_valdefault_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_NotifyOptionType_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *type);
 static int spoolss_dissect_element_NotifyOptionType_u1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_NotifyOptionType_u2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -4057,12 +4064,12 @@ const value_string spoolss_spoolss_NotifyTable_vals[] = {
        { NOTIFY_TABLE_SECURITYDESCRIPTOR, "NOTIFY_TABLE_SECURITYDESCRIPTOR" },
 { 0, NULL }
 };
-static int spoolss_dissect_element_NotifyData_integer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_NotifyData_integer_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_NotifyData_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_NotifyData_devmode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_NotifyData_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_NotifyData_sd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DWORD_integer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DWORD_integer_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_STRING_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DEVMODE_devmode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_TIME_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR_sd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_Notify_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_Notify_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 static int spoolss_dissect_element_Notify_variable_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *variable_type);
@@ -4073,8 +4080,8 @@ static int spoolss_dissect_element_NotifyInfo_flags(tvbuff_t *tvb _U_, int offse
 static int spoolss_dissect_element_NotifyInfo_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_NotifyInfo_notifies(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_NotifyInfo_notifies_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_ReplyPrinterInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_ReplyPrinterInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_ReplyPrinterInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_ReplyPrinterInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string spoolss_PrinterNotifyFlags_PRINTER_NOTIFY_INFO_DISCARDED_tfs = {
    "PRINTER_NOTIFY_INFO_DISCARDED is SET",
    "PRINTER_NOTIFY_INFO_DISCARDED is NOT SET",
@@ -4109,12 +4116,12 @@ static int spoolss_dissect_element_UserLevel3_major(tvbuff_t *tvb _U_, int offse
 static int spoolss_dissect_element_UserLevel3_minor(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_UserLevel3_processor(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_UserLevel3_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevel_level1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevel_level1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevel_level2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevel_level2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevel_level3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevel_level3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_UserLevel_val1_level1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_UserLevel_val1_level1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_UserLevel_val2_level2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_UserLevel_val2_level2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_UserLevel_val3_level3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_UserLevel_val3_level3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_UserLevelCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_UserLevelCtr_user_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static const true_false_string spoolss_AccessRights_SERVER_ACCESS_ADMINISTER_tfs = {
@@ -4149,7 +4156,7 @@ static int spoolss_dissect_element_PrinterEnumValues_data(tvbuff_t *tvb _U_, int
 static int spoolss_dissect_element_PrinterEnumValues_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrinterEnumValues_data__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrinterEnumValues_data_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_KeyNames_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_KeyNames_valdefault_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string spoolss_DeleteDriverFlags_DPD_DELETE_UNUSED_FILES_tfs = {
    "DPD_DELETE_UNUSED_FILES is SET",
    "DPD_DELETE_UNUSED_FILES is NOT SET",
@@ -4256,16 +4263,16 @@ static int spoolss_dissect_element_RPC_BINARY_CONTAINER_cbBuf(tvbuff_t *tvb _U_,
 static int spoolss_dissect_element_RPC_BINARY_CONTAINER_pszString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_RPC_BINARY_CONTAINER_pszString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_RPC_BINARY_CONTAINER_pszString__(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_iData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_biData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_NULL_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_BOOL_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_INT_iData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_STRING_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_STRING_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_TEXT_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_TEXT_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_ENUM_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_ENUM_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_BLOB_biData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_RPC_BIDI_DATA_dwBidiType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dwBidiType);
 static int spoolss_dissect_element_RPC_BIDI_DATA_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dwBidiType);
 static int spoolss_dissect_element_RPC_BIDI_REQUEST_DATA_dwReqNumber(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -4306,12 +4313,12 @@ static int spoolss_dissect_element_propertyBlob_cbBuf(tvbuff_t *tvb _U_, int off
 static int spoolss_dissect_element_propertyBlob_pBuf(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_propertyBlob_pBuf_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_propertyBlob_pBuf__(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyInt32(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyInt64(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyByte(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32_propertyInt32(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64_propertyInt64(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte_propertyByte(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer_propertyBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_RPC_PrintPropertyValue_ePropertyType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *ePropertyType);
 static int spoolss_dissect_element_RPC_PrintPropertyValue_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *ePropertyType);
 static int spoolss_dissect_element_RPC_PrintNamedProperty_propertyName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -8665,41 +8672,41 @@ spoolss_dissect_struct_OEM_DMEXTRA(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 /* IDL: } */
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra351(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0350_psdrvextra351(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PSDRVEXTRA351(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra351,0);
+       offset = spoolss_dissect_struct_PSDRVEXTRA351(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0350_psdrvextra351,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra400(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0400_psdrvextra400(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PSDRVEXTRA400(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra400,0);
+       offset = spoolss_dissect_struct_PSDRVEXTRA400(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0400_psdrvextra400,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0501_psdrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PSDRVEXTRA500(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra500,0);
+       offset = spoolss_dissect_struct_PSDRVEXTRA500(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0501_psdrvextra500,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0600_psdrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PSDRVEXTRA(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra,0);
+       offset = spoolss_dissect_struct_PSDRVEXTRA(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0600_psdrvextra,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataPostScript_psblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataPostScript_valdefault_psblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psblob, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_DeviceModeExtraDataPostScript_valdefault_psblob, 1);
 
        return offset;
 }
@@ -8720,23 +8727,23 @@ spoolss_dissect_DeviceModeExtraDataPostScript(tvbuff_t *tvb _U_, int offset _U_,
 
        switch(level) {
                case 0x0350:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra351(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0350_psdrvextra351(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x0400:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra400(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0400_psdrvextra400(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x0501:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra500(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0501_psdrvextra500(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x0600:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0600_psdrvextra(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_psblob(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_valdefault_psblob(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -8753,33 +8760,33 @@ spoolss_dissect_DeviceModeExtraDataPostScript(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: } */
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra3_4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0301_unidrvextra3_4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_UNIDRVEXTRA3_4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra3_4,0);
+       offset = spoolss_dissect_struct_UNIDRVEXTRA3_4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0301_unidrvextra3_4,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0500_unidrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_UNIDRVEXTRA500(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra500,0);
+       offset = spoolss_dissect_struct_UNIDRVEXTRA500(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0500_unidrvextra500,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0600_unidrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_UNIDRVEXTRA(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra,0);
+       offset = spoolss_dissect_struct_UNIDRVEXTRA(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0600_unidrvextra,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataUniDriver_uniblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataUniDriver_valdefault_uniblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_uniblob, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_valdefault_uniblob, 1);
 
        return offset;
 }
@@ -8800,19 +8807,19 @@ spoolss_dissect_DeviceModeExtraDataUniDriver(tvbuff_t *tvb _U_, int offset _U_,
 
        switch(level) {
                case 0x0301:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra3_4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0301_unidrvextra3_4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x0500:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra500(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0500_unidrvextra500(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x0600:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0600_unidrvextra(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_uniblob(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_valdefault_uniblob(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -11365,81 +11372,81 @@ spoolss_dissect_struct_DeviceModeInfo(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-spoolss_dissect_element_PrinterInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo0(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info0,0);
+       offset = spoolss_dissect_struct_PrinterInfo0(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val0_info0,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info1,0);
+       offset = spoolss_dissect_struct_PrinterInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info2,0);
+       offset = spoolss_dissect_struct_PrinterInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val2_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info3,0);
+       offset = spoolss_dissect_struct_PrinterInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val3_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info4,0);
+       offset = spoolss_dissect_struct_PrinterInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val4_info4,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo5(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info5,0);
+       offset = spoolss_dissect_struct_PrinterInfo5(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val5_info5,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info6,0);
+       offset = spoolss_dissect_struct_PrinterInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val6_info6,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo7(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info7,0);
+       offset = spoolss_dissect_struct_PrinterInfo7(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val7_info7,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DeviceModeInfo(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info8,0);
+       offset = spoolss_dissect_struct_DeviceModeInfo(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val8_info8,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_val9_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DeviceModeInfo(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info9,0);
+       offset = spoolss_dissect_struct_DeviceModeInfo(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val9_info9,0);
 
        return offset;
 }
@@ -11460,43 +11467,43 @@ spoolss_dissect_PrinterInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 0:
-                       offset = spoolss_dissect_element_PrinterInfo_info0(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_val0_info0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = spoolss_dissect_element_PrinterInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_PrinterInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_PrinterInfo_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_val3_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = spoolss_dissect_element_PrinterInfo_info4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_val4_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 5:
-                       offset = spoolss_dissect_element_PrinterInfo_info5(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_val5_info5(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = spoolss_dissect_element_PrinterInfo_info6(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_val6_info6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 7:
-                       offset = spoolss_dissect_element_PrinterInfo_info7(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_val7_info7(tvb, offset, pinfo, tree, drep);
                break;
 
                case 8:
-                       offset = spoolss_dissect_element_PrinterInfo_info8(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_val8_info8(tvb, offset, pinfo, tree, drep);
                break;
 
                case 9:
-                       offset = spoolss_dissect_element_PrinterInfo_info9(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_val9_info9(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -12745,33 +12752,33 @@ spoolss_dissect_struct_JobInfo4(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 /* IDL: } */
 
 static int
-spoolss_dissect_element_JobInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_JobInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_JobInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_info1,0);
+       offset = spoolss_dissect_struct_JobInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_JobInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_JobInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_JobInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_info2,0);
+       offset = spoolss_dissect_struct_JobInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_val2_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_JobInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_JobInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_JobInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_info3,0);
+       offset = spoolss_dissect_struct_JobInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_val3_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_JobInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_JobInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_JobInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_info4,0);
+       offset = spoolss_dissect_struct_JobInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_val4_info4,0);
 
        return offset;
 }
@@ -12792,19 +12799,19 @@ spoolss_dissect_JobInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_JobInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_JobInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_JobInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_JobInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_JobInfo_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_JobInfo_val3_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = spoolss_dissect_element_JobInfo_info4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_JobInfo_val4_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -13899,65 +13906,65 @@ spoolss_dissect_struct_SetJobInfo4(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 /* IDL: } */
 
 static int
-spoolss_dissect_element_SetJobInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetJobInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_SetJobInfo1)",hf_spoolss_spoolss_SetJobInfo_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetJobInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_SetJobInfo1)",hf_spoolss_spoolss_SetJobInfo_val1_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetJobInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_info1,0);
+       offset = spoolss_dissect_struct_SetJobInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetJobInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_SetJobInfo2)",hf_spoolss_spoolss_SetJobInfo_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetJobInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_SetJobInfo2)",hf_spoolss_spoolss_SetJobInfo_val2_info2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetJobInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_info2,0);
+       offset = spoolss_dissect_struct_SetJobInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_val2_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetJobInfo_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_JobInfo3)",hf_spoolss_spoolss_SetJobInfo_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetJobInfo_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_JobInfo3)",hf_spoolss_spoolss_SetJobInfo_val3_info3);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_JobInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_info3,0);
+       offset = spoolss_dissect_struct_JobInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_val3_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetJobInfo_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (spoolss_SetJobInfo4)",hf_spoolss_spoolss_SetJobInfo_info4);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetJobInfo_val4_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (spoolss_SetJobInfo4)",hf_spoolss_spoolss_SetJobInfo_val4_info4);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetJobInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_info4,0);
+       offset = spoolss_dissect_struct_SetJobInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_val4_info4,0);
 
        return offset;
 }
@@ -13981,19 +13988,19 @@ spoolss_dissect_SetJobInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_SetJobInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetJobInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_SetJobInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetJobInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_SetJobInfo_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetJobInfo_val3_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = spoolss_dissect_element_SetJobInfo_info4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetJobInfo_val4_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -15464,161 +15471,161 @@ spoolss_dissect_struct_SetPrinterInfo9(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: } */
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (spoolss_SetPrinterInfo0)",hf_spoolss_spoolss_SetPrinterInfo_info0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_val0_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (spoolss_SetPrinterInfo0)",hf_spoolss_spoolss_SetPrinterInfo_val0_info0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo0(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info0,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo0(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val0_info0,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_SetPrinterInfo1)",hf_spoolss_spoolss_SetPrinterInfo_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_SetPrinterInfo1)",hf_spoolss_spoolss_SetPrinterInfo_val1_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info1,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_SetPrinterInfo2)",hf_spoolss_spoolss_SetPrinterInfo_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_SetPrinterInfo2)",hf_spoolss_spoolss_SetPrinterInfo_val2_info2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info2,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val2_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_SetPrinterInfo3)",hf_spoolss_spoolss_SetPrinterInfo_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_SetPrinterInfo3)",hf_spoolss_spoolss_SetPrinterInfo_val3_info3);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info3,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val3_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (spoolss_SetPrinterInfo4)",hf_spoolss_spoolss_SetPrinterInfo_info4);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_val4_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (spoolss_SetPrinterInfo4)",hf_spoolss_spoolss_SetPrinterInfo_val4_info4);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info4,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val4_info4,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info5_, NDR_POINTER_UNIQUE, "Pointer to Info5 (spoolss_SetPrinterInfo5)",hf_spoolss_spoolss_SetPrinterInfo_info5);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_val5_info5_, NDR_POINTER_UNIQUE, "Pointer to Info5 (spoolss_SetPrinterInfo5)",hf_spoolss_spoolss_SetPrinterInfo_val5_info5);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val5_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo5(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info5,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo5(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val5_info5,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info6_, NDR_POINTER_UNIQUE, "Pointer to Info6 (spoolss_SetPrinterInfo6)",hf_spoolss_spoolss_SetPrinterInfo_info6);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_val6_info6_, NDR_POINTER_UNIQUE, "Pointer to Info6 (spoolss_SetPrinterInfo6)",hf_spoolss_spoolss_SetPrinterInfo_val6_info6);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val6_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info6,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val6_info6,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info7_, NDR_POINTER_UNIQUE, "Pointer to Info7 (spoolss_SetPrinterInfo7)",hf_spoolss_spoolss_SetPrinterInfo_info7);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_val7_info7_, NDR_POINTER_UNIQUE, "Pointer to Info7 (spoolss_SetPrinterInfo7)",hf_spoolss_spoolss_SetPrinterInfo_val7_info7);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info7_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val7_info7_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo7(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info7,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo7(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val7_info7,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info8_, NDR_POINTER_UNIQUE, "Pointer to Info8 (spoolss_SetPrinterInfo8)",hf_spoolss_spoolss_SetPrinterInfo_info8);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_val8_info8_, NDR_POINTER_UNIQUE, "Pointer to Info8 (spoolss_SetPrinterInfo8)",hf_spoolss_spoolss_SetPrinterInfo_val8_info8);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val8_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo8(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info8,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo8(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val8_info8,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val9_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info9_, NDR_POINTER_UNIQUE, "Pointer to Info9 (spoolss_SetPrinterInfo9)",hf_spoolss_spoolss_SetPrinterInfo_info9);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_val9_info9_, NDR_POINTER_UNIQUE, "Pointer to Info9 (spoolss_SetPrinterInfo9)",hf_spoolss_spoolss_SetPrinterInfo_val9_info9);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_info9_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_val9_info9_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo9(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info9,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo9(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val9_info9,0);
 
        return offset;
 }
@@ -15642,43 +15649,43 @@ spoolss_dissect_SetPrinterInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 
        switch(level) {
                case 0:
-                       offset = spoolss_dissect_element_SetPrinterInfo_info0(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_val0_info0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = spoolss_dissect_element_SetPrinterInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_SetPrinterInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_SetPrinterInfo_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_val3_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = spoolss_dissect_element_SetPrinterInfo_info4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_val4_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 5:
-                       offset = spoolss_dissect_element_SetPrinterInfo_info5(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_val5_info5(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = spoolss_dissect_element_SetPrinterInfo_info6(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_val6_info6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 7:
-                       offset = spoolss_dissect_element_SetPrinterInfo_info7(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_val7_info7(tvb, offset, pinfo, tree, drep);
                break;
 
                case 8:
-                       offset = spoolss_dissect_element_SetPrinterInfo_info8(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_val8_info8(tvb, offset, pinfo, tree, drep);
                break;
 
                case 9:
-                       offset = spoolss_dissect_element_SetPrinterInfo_info9(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_val9_info9(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -17820,97 +17827,97 @@ spoolss_dissect_struct_AddDriverInfo8(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-spoolss_dissect_element_AddDriverInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_AddDriverInfo1)",hf_spoolss_spoolss_AddDriverInfo_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_AddDriverInfo1)",hf_spoolss_spoolss_AddDriverInfo_val1_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddDriverInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_info1,0);
+       offset = spoolss_dissect_struct_AddDriverInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_AddDriverInfo2)",hf_spoolss_spoolss_AddDriverInfo_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_AddDriverInfo2)",hf_spoolss_spoolss_AddDriverInfo_val2_info2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddDriverInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_info2,0);
+       offset = spoolss_dissect_struct_AddDriverInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_val2_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_AddDriverInfo3)",hf_spoolss_spoolss_AddDriverInfo_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_AddDriverInfo3)",hf_spoolss_spoolss_AddDriverInfo_val3_info3);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddDriverInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_info3,0);
+       offset = spoolss_dissect_struct_AddDriverInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_val3_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (spoolss_AddDriverInfo4)",hf_spoolss_spoolss_AddDriverInfo_info4);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_val4_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (spoolss_AddDriverInfo4)",hf_spoolss_spoolss_AddDriverInfo_val4_info4);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddDriverInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_info4,0);
+       offset = spoolss_dissect_struct_AddDriverInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_val4_info4,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_info6_, NDR_POINTER_UNIQUE, "Pointer to Info6 (spoolss_AddDriverInfo6)",hf_spoolss_spoolss_AddDriverInfo_info6);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_val6_info6_, NDR_POINTER_UNIQUE, "Pointer to Info6 (spoolss_AddDriverInfo6)",hf_spoolss_spoolss_AddDriverInfo_val6_info6);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_val6_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddDriverInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_info6,0);
+       offset = spoolss_dissect_struct_AddDriverInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_val6_info6,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_info8_, NDR_POINTER_UNIQUE, "Pointer to Info8 (spoolss_AddDriverInfo8)",hf_spoolss_spoolss_AddDriverInfo_info8);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_val8_info8_, NDR_POINTER_UNIQUE, "Pointer to Info8 (spoolss_AddDriverInfo8)",hf_spoolss_spoolss_AddDriverInfo_val8_info8);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_val8_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddDriverInfo8(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_info8,0);
+       offset = spoolss_dissect_struct_AddDriverInfo8(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_val8_info8,0);
 
        return offset;
 }
@@ -17934,27 +17941,27 @@ spoolss_dissect_AddDriverInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_AddDriverInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddDriverInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_AddDriverInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddDriverInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_AddDriverInfo_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddDriverInfo_val3_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = spoolss_dissect_element_AddDriverInfo_info4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddDriverInfo_val4_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = spoolss_dissect_element_AddDriverInfo_info6(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddDriverInfo_val6_info6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 8:
-                       offset = spoolss_dissect_element_AddDriverInfo_info8(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddDriverInfo_val8_info8(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -20110,73 +20117,73 @@ spoolss_dissect_struct_DriverInfo101(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-spoolss_dissect_element_DriverInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info1,0);
+       offset = spoolss_dissect_struct_DriverInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info2,0);
+       offset = spoolss_dissect_struct_DriverInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val2_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info3,0);
+       offset = spoolss_dissect_struct_DriverInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val3_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info4,0);
+       offset = spoolss_dissect_struct_DriverInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val4_info4,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo5(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info5,0);
+       offset = spoolss_dissect_struct_DriverInfo5(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val5_info5,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info6,0);
+       offset = spoolss_dissect_struct_DriverInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val6_info6,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo7(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info7,0);
+       offset = spoolss_dissect_struct_DriverInfo7(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val7_info7,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo8(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info8,0);
+       offset = spoolss_dissect_struct_DriverInfo8(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val8_info8,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_val101_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo101(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info101,0);
+       offset = spoolss_dissect_struct_DriverInfo101(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val101_info101,0);
 
        return offset;
 }
@@ -20197,39 +20204,39 @@ spoolss_dissect_DriverInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_DriverInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_DriverInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_DriverInfo_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_val3_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = spoolss_dissect_element_DriverInfo_info4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_val4_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 5:
-                       offset = spoolss_dissect_element_DriverInfo_info5(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_val5_info5(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = spoolss_dissect_element_DriverInfo_info6(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_val6_info6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 7:
-                       offset = spoolss_dissect_element_DriverInfo_info7(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_val7_info7(tvb, offset, pinfo, tree, drep);
                break;
 
                case 8:
-                       offset = spoolss_dissect_element_DriverInfo_info8(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_val8_info8(tvb, offset, pinfo, tree, drep);
                break;
 
                case 101:
-                       offset = spoolss_dissect_element_DriverInfo_info101(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_val101_info101(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -20290,17 +20297,17 @@ spoolss_dissect_struct_DriverDirectoryInfo1(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-spoolss_dissect_element_DriverDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverDirectoryInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverDirectoryInfo_info1,0);
+       offset = spoolss_dissect_struct_DriverDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverDirectoryInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverDirectoryInfo_valdefault_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverDirectoryInfo_info1,0);
+       offset = spoolss_dissect_struct_DriverDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverDirectoryInfo_valdefault_info1,0);
 
        return offset;
 }
@@ -20321,11 +20328,11 @@ spoolss_dissect_DriverDirectoryInfo(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_DriverDirectoryInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverDirectoryInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = spoolss_dissect_element_DriverDirectoryInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverDirectoryInfo_valdefault_info1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -20391,9 +20398,9 @@ spoolss_dissect_struct_PrintProcessorInfo1(tvbuff_t *tvb _U_, int offset _U_, pa
 /* IDL: } */
 
 static int
-spoolss_dissect_element_PrintProcessorInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrintProcessorInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrintProcessorInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcessorInfo_info1,0);
+       offset = spoolss_dissect_struct_PrintProcessorInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcessorInfo_val1_info1,0);
 
        return offset;
 }
@@ -20414,7 +20421,7 @@ spoolss_dissect_PrintProcessorInfo(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_PrintProcessorInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrintProcessorInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -20475,17 +20482,17 @@ spoolss_dissect_struct_PrintProcessorDirectoryInfo1(tvbuff_t *tvb _U_, int offse
 /* IDL: } */
 
 static int
-spoolss_dissect_element_PrintProcessorDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrintProcessorDirectoryInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrintProcessorDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcessorDirectoryInfo_info1,0);
+       offset = spoolss_dissect_struct_PrintProcessorDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcessorDirectoryInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrintProcessorDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrintProcessorDirectoryInfo_valdefault_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrintProcessorDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcessorDirectoryInfo_info1,0);
+       offset = spoolss_dissect_struct_PrintProcessorDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcessorDirectoryInfo_valdefault_info1,0);
 
        return offset;
 }
@@ -20506,11 +20513,11 @@ spoolss_dissect_PrintProcessorDirectoryInfo(tvbuff_t *tvb _U_, int offset _U_, p
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_PrintProcessorDirectoryInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrintProcessorDirectoryInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = spoolss_dissect_element_PrintProcessorDirectoryInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrintProcessorDirectoryInfo_valdefault_info1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -20625,17 +20632,17 @@ spoolss_dissect_struct_DocumentInfo1(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-spoolss_dissect_element_DocumentInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DocumentInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_DocumentInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_DocumentInfo1)",hf_spoolss_spoolss_DocumentInfo_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_DocumentInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_DocumentInfo1)",hf_spoolss_spoolss_DocumentInfo_val1_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DocumentInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DocumentInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DocumentInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DocumentInfo_info1,0);
+       offset = spoolss_dissect_struct_DocumentInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DocumentInfo_val1_info1,0);
 
        return offset;
 }
@@ -20659,7 +20666,7 @@ spoolss_dissect_DocumentInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_DocumentInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DocumentInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
@@ -21035,41 +21042,41 @@ spoolss_dissect_struct_OSVersionEx(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 /* IDL: } */
 
 static int
-spoolss_dissect_element_PrinterData_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterData_valREG_SZ_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_string , 0);
+       offset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_valREG_SZ_string , 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterData_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterData_valREG_BINARY_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_binary, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_valREG_BINARY_binary, 1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterData_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterData_valREG_DWORD_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_value, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_valREG_DWORD_value, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterData_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterData_valREG_MULTI_SZ_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_string_array(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterData_string_array,0);
+       offset = spoolss_dissect_struct_string_array(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterData_valREG_MULTI_SZ_string_array,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterData_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterData_valdefault_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_data, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_valdefault_data, 1);
 
        return offset;
 }
@@ -21093,23 +21100,23 @@ spoolss_dissect_PrinterData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
                break;
 
                case REG_SZ:
-                       offset = spoolss_dissect_element_PrinterData_string(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterData_valREG_SZ_string(tvb, offset, pinfo, tree, drep);
                break;
 
                case REG_BINARY:
-                       offset = spoolss_dissect_element_PrinterData_binary(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterData_valREG_BINARY_binary(tvb, offset, pinfo, tree, drep);
                break;
 
                case REG_DWORD:
-                       offset = spoolss_dissect_element_PrinterData_value(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterData_valREG_DWORD_value(tvb, offset, pinfo, tree, drep);
                break;
 
                case REG_MULTI_SZ:
-                       offset = spoolss_dissect_element_PrinterData_string_array(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterData_valREG_MULTI_SZ_string_array(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = spoolss_dissect_element_PrinterData_data(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterData_valdefault_data(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -21603,17 +21610,17 @@ spoolss_dissect_struct_FormInfo2(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-spoolss_dissect_element_FormInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_FormInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_FormInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_FormInfo_info1,0);
+       offset = spoolss_dissect_struct_FormInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_FormInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_FormInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_FormInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_FormInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_FormInfo_info2,0);
+       offset = spoolss_dissect_struct_FormInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_FormInfo_val2_info2,0);
 
        return offset;
 }
@@ -21634,11 +21641,11 @@ spoolss_dissect_FormInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_FormInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_FormInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_FormInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_FormInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -21929,33 +21936,33 @@ spoolss_dissect_struct_AddFormInfo2(tvbuff_t *tvb _U_, int offset _U_, packet_in
 /* IDL: } */
 
 static int
-spoolss_dissect_element_AddFormInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddFormInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddFormInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_AddFormInfo1)",hf_spoolss_spoolss_AddFormInfo_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddFormInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_AddFormInfo1)",hf_spoolss_spoolss_AddFormInfo_val1_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddFormInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddFormInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddFormInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddFormInfo_info1,0);
+       offset = spoolss_dissect_struct_AddFormInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddFormInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddFormInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddFormInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddFormInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_AddFormInfo2)",hf_spoolss_spoolss_AddFormInfo_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddFormInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_AddFormInfo2)",hf_spoolss_spoolss_AddFormInfo_val2_info2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddFormInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddFormInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddFormInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddFormInfo_info2,0);
+       offset = spoolss_dissect_struct_AddFormInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddFormInfo_val2_info2,0);
 
        return offset;
 }
@@ -21979,11 +21986,11 @@ spoolss_dissect_AddFormInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_AddFormInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddFormInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_AddFormInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddFormInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -22472,33 +22479,33 @@ spoolss_dissect_struct_PortInfoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-spoolss_dissect_element_PortInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PortInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PortInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_info1,0);
+       offset = spoolss_dissect_struct_PortInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PortInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PortInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PortInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_info2,0);
+       offset = spoolss_dissect_struct_PortInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_val2_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PortInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PortInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PortInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_info3,0);
+       offset = spoolss_dissect_struct_PortInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_val3_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PortInfo_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PortInfo_val0xff_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PortInfoFF(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_infoFF,0);
+       offset = spoolss_dissect_struct_PortInfoFF(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_val0xff_infoFF,0);
 
        return offset;
 }
@@ -22519,19 +22526,19 @@ spoolss_dissect_PortInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_PortInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PortInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_PortInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PortInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_PortInfo_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PortInfo_val3_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xff:
-                       offset = spoolss_dissect_element_PortInfo_infoFF(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PortInfo_val0xff_infoFF(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -22690,17 +22697,17 @@ spoolss_dissect_struct_MonitorInfo2(tvbuff_t *tvb _U_, int offset _U_, packet_in
 /* IDL: } */
 
 static int
-spoolss_dissect_element_MonitorInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_MonitorInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_MonitorInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_MonitorInfo_info1,0);
+       offset = spoolss_dissect_struct_MonitorInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_MonitorInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_MonitorInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_MonitorInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_MonitorInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_MonitorInfo_info2,0);
+       offset = spoolss_dissect_struct_MonitorInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_MonitorInfo_val2_info2,0);
 
        return offset;
 }
@@ -22721,11 +22728,11 @@ spoolss_dissect_MonitorInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_MonitorInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_MonitorInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_MonitorInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_MonitorInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -23060,65 +23067,65 @@ spoolss_dissect_struct_SetPortInfoFF(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-spoolss_dissect_element_SetPortInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPortInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_SetPortInfo1)",hf_spoolss_spoolss_SetPortInfo_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPortInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_SetPortInfo1)",hf_spoolss_spoolss_SetPortInfo_val1_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPortInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_info1,0);
+       offset = spoolss_dissect_struct_SetPortInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPortInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_SetPortInfo2)",hf_spoolss_spoolss_SetPortInfo_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPortInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_SetPortInfo2)",hf_spoolss_spoolss_SetPortInfo_val2_info2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPortInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_info2,0);
+       offset = spoolss_dissect_struct_SetPortInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_val2_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPortInfo_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_SetPortInfo3)",hf_spoolss_spoolss_SetPortInfo_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPortInfo_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_SetPortInfo3)",hf_spoolss_spoolss_SetPortInfo_val3_info3);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPortInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_info3,0);
+       offset = spoolss_dissect_struct_SetPortInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_val3_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_val0xff_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPortInfo_infoFF_, NDR_POINTER_UNIQUE, "Pointer to Infoff (spoolss_SetPortInfoFF)",hf_spoolss_spoolss_SetPortInfo_infoFF);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPortInfo_val0xff_infoFF_, NDR_POINTER_UNIQUE, "Pointer to Infoff (spoolss_SetPortInfoFF)",hf_spoolss_spoolss_SetPortInfo_val0xff_infoFF);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_infoFF_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_val0xff_infoFF_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPortInfoFF(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_infoFF,0);
+       offset = spoolss_dissect_struct_SetPortInfoFF(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_val0xff_infoFF,0);
 
        return offset;
 }
@@ -23142,19 +23149,19 @@ spoolss_dissect_SetPortInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_SetPortInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPortInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_SetPortInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPortInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_SetPortInfo_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPortInfo_val3_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xff:
-                       offset = spoolss_dissect_element_SetPortInfo_infoFF(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPortInfo_val0xff_infoFF(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -23491,33 +23498,33 @@ spoolss_dissect_struct_AddMonitorInfo2(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: } */
 
 static int
-spoolss_dissect_element_AddMonitorInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddMonitorInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddMonitorInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_AddMonitorInfo1)",hf_spoolss_spoolss_AddMonitorInfo_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddMonitorInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_AddMonitorInfo1)",hf_spoolss_spoolss_AddMonitorInfo_val1_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddMonitorInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddMonitorInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddMonitorInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddMonitorInfo_info1,0);
+       offset = spoolss_dissect_struct_AddMonitorInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddMonitorInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddMonitorInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddMonitorInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddMonitorInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_AddMonitorInfo2)",hf_spoolss_spoolss_AddMonitorInfo_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddMonitorInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_AddMonitorInfo2)",hf_spoolss_spoolss_AddMonitorInfo_val2_info2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddMonitorInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddMonitorInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddMonitorInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddMonitorInfo_info2,0);
+       offset = spoolss_dissect_struct_AddMonitorInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddMonitorInfo_val2_info2,0);
 
        return offset;
 }
@@ -23541,11 +23548,11 @@ spoolss_dissect_AddMonitorInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_AddMonitorInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddMonitorInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_AddMonitorInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddMonitorInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -23666,9 +23673,9 @@ spoolss_dissect_struct_PrintProcDataTypesInfo1(tvbuff_t *tvb _U_, int offset _U_
 /* IDL: } */
 
 static int
-spoolss_dissect_element_PrintProcDataTypesInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrintProcDataTypesInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrintProcDataTypesInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcDataTypesInfo_info1,0);
+       offset = spoolss_dissect_struct_PrintProcDataTypesInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcDataTypesInfo_val1_info1,0);
 
        return offset;
 }
@@ -23689,7 +23696,7 @@ spoolss_dissect_PrintProcDataTypesInfo(tvbuff_t *tvb _U_, int offset _U_, packet
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_PrintProcDataTypesInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrintProcDataTypesInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -24106,25 +24113,25 @@ spoolss_dissect_enum_NotifyType(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 /* IDL: } */
 
 static int
-spoolss_dissect_element_Field_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_Field_valPRINTER_NOTIFY_TYPE_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_enum_JobNotifyField(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Field_field, 0);
+       offset = spoolss_dissect_enum_JobNotifyField(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Field_valPRINTER_NOTIFY_TYPE_field, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_Field_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_Field_valJOB_NOTIFY_TYPE_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_enum_PrintNotifyField(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Field_field, 0);
+       offset = spoolss_dissect_enum_PrintNotifyField(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Field_valJOB_NOTIFY_TYPE_field, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_Field_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_Field_valdefault_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Field_field, 0);
+       offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Field_valdefault_field, 0);
 
        return offset;
 }
@@ -24145,15 +24152,15 @@ spoolss_dissect_Field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_,
 
        switch(level) {
                case PRINTER_NOTIFY_TYPE:
-                       offset = spoolss_dissect_element_Field_field(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_Field_valPRINTER_NOTIFY_TYPE_field(tvb, offset, pinfo, tree, drep);
                break;
 
                case JOB_NOTIFY_TYPE:
-                       offset = spoolss_dissect_element_Field_field(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_Field_valJOB_NOTIFY_TYPE_field(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = spoolss_dissect_element_Field_field(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_Field_valdefault_field(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -24511,53 +24518,53 @@ spoolss_dissect_enum_NotifyTable(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-spoolss_dissect_element_NotifyData_integer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DWORD_integer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        int conformant = di->conformant_run;
        if (!conformant) {
-               offset = spoolss_dissect_element_NotifyData_integer_(tvb, offset, pinfo, tree, drep);
+               offset = spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DWORD_integer_(tvb, offset, pinfo, tree, drep);
        }
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_NotifyData_integer_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DWORD_integer_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_NotifyData_integer, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_DWORD_integer, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_NotifyData_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_STRING_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_NotifyString(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_string,0);
+       offset = spoolss_dissect_struct_NotifyString(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_STRING_string,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_NotifyData_devmode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DEVMODE_devmode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DevmodeContainer(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_devmode,0);
+       offset = spoolss_dissect_struct_DevmodeContainer(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_DEVMODE_devmode,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_NotifyData_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_TIME_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_TimeCtr(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_time,0);
+       offset = spoolss_dissect_struct_TimeCtr(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_TIME_time,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_NotifyData_sd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR_sd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_sec_desc_buf(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_sd,0);
+       offset = spoolss_dissect_struct_sec_desc_buf(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR_sd,0);
 
        return offset;
 }
@@ -24581,23 +24588,23 @@ spoolss_dissect_NotifyData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case NOTIFY_TABLE_DWORD:
-                       offset = spoolss_dissect_element_NotifyData_integer(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DWORD_integer(tvb, offset, pinfo, tree, drep);
                break;
 
                case NOTIFY_TABLE_STRING:
-                       offset = spoolss_dissect_element_NotifyData_string(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_STRING_string(tvb, offset, pinfo, tree, drep);
                break;
 
                case NOTIFY_TABLE_DEVMODE:
-                       offset = spoolss_dissect_element_NotifyData_devmode(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DEVMODE_devmode(tvb, offset, pinfo, tree, drep);
                break;
 
                case NOTIFY_TABLE_TIME:
-                       offset = spoolss_dissect_element_NotifyData_time(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_TIME_time(tvb, offset, pinfo, tree, drep);
                break;
 
                case NOTIFY_TABLE_SECURITYDESCRIPTOR:
-                       offset = spoolss_dissect_element_NotifyData_sd(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR_sd(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -24783,17 +24790,17 @@ spoolss_dissect_struct_NotifyInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-spoolss_dissect_element_ReplyPrinterInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_ReplyPrinterInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_ReplyPrinterInfo_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (spoolss_NotifyInfo)",hf_spoolss_spoolss_ReplyPrinterInfo_info0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_ReplyPrinterInfo_val0_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (spoolss_NotifyInfo)",hf_spoolss_spoolss_ReplyPrinterInfo_val0_info0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_ReplyPrinterInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_ReplyPrinterInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_NotifyInfo(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_ReplyPrinterInfo_info0,0);
+       offset = spoolss_dissect_struct_NotifyInfo(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_ReplyPrinterInfo_val0_info0,0);
 
        return offset;
 }
@@ -24817,7 +24824,7 @@ spoolss_dissect_ReplyPrinterInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case 0:
-                       offset = spoolss_dissect_element_ReplyPrinterInfo_info0(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_ReplyPrinterInfo_val0_info0(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -25229,49 +25236,49 @@ spoolss_dissect_struct_UserLevel3(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-spoolss_dissect_element_UserLevel_level1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_UserLevel_val1_level1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_UserLevel_level1_, NDR_POINTER_UNIQUE, "Pointer to Level1 (spoolss_UserLevel1)",hf_spoolss_spoolss_UserLevel_level1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_UserLevel_val1_level1_, NDR_POINTER_UNIQUE, "Pointer to Level1 (spoolss_UserLevel1)",hf_spoolss_spoolss_UserLevel_val1_level1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_UserLevel_level1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_UserLevel_val1_level1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_UserLevel1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_UserLevel_level1,0);
+       offset = spoolss_dissect_struct_UserLevel1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_UserLevel_val1_level1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_UserLevel_level2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_UserLevel_val2_level2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_UserLevel_level2_, NDR_POINTER_UNIQUE, "Pointer to Level2 (spoolss_UserLevel2)",hf_spoolss_spoolss_UserLevel_level2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_UserLevel_val2_level2_, NDR_POINTER_UNIQUE, "Pointer to Level2 (spoolss_UserLevel2)",hf_spoolss_spoolss_UserLevel_val2_level2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_UserLevel_level2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_UserLevel_val2_level2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_UserLevel2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_UserLevel_level2,0);
+       offset = spoolss_dissect_struct_UserLevel2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_UserLevel_val2_level2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_UserLevel_level3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_UserLevel_val3_level3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_UserLevel_level3_, NDR_POINTER_UNIQUE, "Pointer to Level3 (spoolss_UserLevel3)",hf_spoolss_spoolss_UserLevel_level3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_UserLevel_val3_level3_, NDR_POINTER_UNIQUE, "Pointer to Level3 (spoolss_UserLevel3)",hf_spoolss_spoolss_UserLevel_val3_level3);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_UserLevel_level3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_UserLevel_val3_level3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_UserLevel3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_UserLevel_level3,0);
+       offset = spoolss_dissect_struct_UserLevel3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_UserLevel_val3_level3,0);
 
        return offset;
 }
@@ -25295,15 +25302,15 @@ spoolss_dissect_UserLevel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_UserLevel_level1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_UserLevel_val1_level1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_UserLevel_level2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_UserLevel_val2_level2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_UserLevel_level3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_UserLevel_val3_level3(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -25583,9 +25590,9 @@ spoolss_dissect_struct_PrinterEnumValues(tvbuff_t *tvb _U_, int offset _U_, pack
 /* IDL: } */
 
 static int
-spoolss_dissect_element_KeyNames_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_KeyNames_valdefault_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_string_array(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_KeyNames_string_array,0);
+       offset = spoolss_dissect_struct_string_array(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_KeyNames_valdefault_string_array,0);
 
        return offset;
 }
@@ -25612,7 +25619,7 @@ spoolss_dissect_KeyNames(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
                break;
 
                default:
-                       offset = spoolss_dissect_element_KeyNames_string_array(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_KeyNames_valdefault_string_array(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -26479,90 +26486,90 @@ spoolss_dissect_struct_RPC_BINARY_CONTAINER(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_NULL_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_BIDI_DATA_u_bData, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_BIDI_DATA_u_valBIDI_NULL_bData, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_BOOL_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_BIDI_DATA_u_bData, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_BIDI_DATA_u_valBIDI_BOOL_bData, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_iData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_INT_iData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_BIDI_DATA_u_iData, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_BIDI_DATA_u_valBIDI_INT_iData, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_STRING_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_RPC_BIDI_DATA_u_sData_, NDR_POINTER_UNIQUE, "Pointer to Sdata (uint16)",hf_spoolss_RPC_BIDI_DATA_u_sData);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_STRING_sData_, NDR_POINTER_UNIQUE, "Pointer to Sdata (uint16)",hf_spoolss_RPC_BIDI_DATA_u_valBIDI_STRING_sData);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_STRING_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        char *data;
 
-       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_spoolss_RPC_BIDI_DATA_u_sData, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_spoolss_RPC_BIDI_DATA_u_valBIDI_STRING_sData, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_TEXT_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_RPC_BIDI_DATA_u_sData_, NDR_POINTER_UNIQUE, "Pointer to Sdata (uint16)",hf_spoolss_RPC_BIDI_DATA_u_sData);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_TEXT_sData_, NDR_POINTER_UNIQUE, "Pointer to Sdata (uint16)",hf_spoolss_RPC_BIDI_DATA_u_valBIDI_TEXT_sData);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_TEXT_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        char *data;
 
-       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_spoolss_RPC_BIDI_DATA_u_sData, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_spoolss_RPC_BIDI_DATA_u_valBIDI_TEXT_sData, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_ENUM_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_RPC_BIDI_DATA_u_sData_, NDR_POINTER_UNIQUE, "Pointer to Sdata (uint16)",hf_spoolss_RPC_BIDI_DATA_u_sData);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_ENUM_sData_, NDR_POINTER_UNIQUE, "Pointer to Sdata (uint16)",hf_spoolss_RPC_BIDI_DATA_u_valBIDI_ENUM_sData);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_ENUM_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        char *data;
 
-       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_spoolss_RPC_BIDI_DATA_u_sData, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_spoolss_RPC_BIDI_DATA_u_valBIDI_ENUM_sData, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_biData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_BLOB_biData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_RPC_BINARY_CONTAINER(tvb,offset,pinfo,tree,drep,hf_spoolss_RPC_BIDI_DATA_u_biData,0);
+       offset = spoolss_dissect_struct_RPC_BINARY_CONTAINER(tvb,offset,pinfo,tree,drep,hf_spoolss_RPC_BIDI_DATA_u_valBIDI_BLOB_biData,0);
 
        return offset;
 }
@@ -26586,31 +26593,31 @@ spoolss_dissect_RPC_BIDI_DATA_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
        switch(level) {
                case BIDI_NULL:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_bData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_NULL_bData(tvb, offset, pinfo, tree, drep);
                break;
 
                case BIDI_BOOL:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_bData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_BOOL_bData(tvb, offset, pinfo, tree, drep);
                break;
 
                case BIDI_INT:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_iData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_INT_iData(tvb, offset, pinfo, tree, drep);
                break;
 
                case BIDI_STRING:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_STRING_sData(tvb, offset, pinfo, tree, drep);
                break;
 
                case BIDI_TEXT:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_TEXT_sData(tvb, offset, pinfo, tree, drep);
                break;
 
                case BIDI_ENUM:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_ENUM_sData(tvb, offset, pinfo, tree, drep);
                break;
 
                case BIDI_BLOB:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_biData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_BLOB_biData(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -27211,52 +27218,52 @@ spoolss_dissect_struct_propertyBlob(tvbuff_t *tvb _U_, int offset _U_, packet_in
 /* IDL: } */
 
 static int
-spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyString_, NDR_POINTER_UNIQUE, "Pointer to Propertystring (uint16)",hf_spoolss_RPC_PrintPropertyValueUnion_propertyString);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString_, NDR_POINTER_UNIQUE, "Pointer to Propertystring (uint16)",hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        char *data;
 
-       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_spoolss_RPC_PrintPropertyValueUnion_propertyString, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyInt32(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32_propertyInt32(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_PrintPropertyValueUnion_propertyInt32, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32_propertyInt32, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyInt64(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64_propertyInt64(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_PrintPropertyValueUnion_propertyInt64, NULL);
+       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64_propertyInt64, NULL);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyByte(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte_propertyByte(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_PrintPropertyValueUnion_propertyByte, 0);
+       offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte_propertyByte, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer_propertyBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_propertyBlob(tvb,offset,pinfo,tree,drep,hf_spoolss_RPC_PrintPropertyValueUnion_propertyBlob,0);
+       offset = spoolss_dissect_struct_propertyBlob(tvb,offset,pinfo,tree,drep,hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer_propertyBlob,0);
 
        return offset;
 }
@@ -27280,23 +27287,23 @@ spoolss_dissect_RPC_PrintPropertyValueUnion(tvbuff_t *tvb _U_, int offset _U_, p
 
        switch(level) {
                case kRpcPropertyTypeString:
-                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyString(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString(tvb, offset, pinfo, tree, drep);
                break;
 
                case kRpcPropertyTypeInt32:
-                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyInt32(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32_propertyInt32(tvb, offset, pinfo, tree, drep);
                break;
 
                case kRpcPropertyTypeInt64:
-                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyInt64(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64_propertyInt64(tvb, offset, pinfo, tree, drep);
                break;
 
                case kRpcPropertyTypeByte:
-                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyByte(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte_propertyByte(tvb, offset, pinfo, tree, drep);
                break;
 
                case kRpcPropertyTypeBuffer:
-                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyBlob(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer_propertyBlob(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -38818,12 +38825,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Driver Path", "spoolss.spoolss_DriverInfo5.driver_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_drivername,
          { "Drivername", "spoolss.spoolss_SetPrinterInfo2.drivername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DocumentInfo_info1,
-         { "Info1", "spoolss.spoolss_DocumentInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfo2_ressource_id,
          { "Ressource Id", "spoolss.spoolss_AddFormInfo2.ressource_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UserLevel3_reserved,
          { "Reserved", "spoolss.spoolss_UserLevel3.reserved", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_TIME_time,
+         { "Time", "spoolss.spoolss_NotifyData_valNOTIFY_TABLE_TIME.time", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_FormInfo2_keyword,
          { "Keyword", "spoolss.spoolss_FormInfo2.keyword", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_NOT_SHAREABLE,
@@ -38842,8 +38849,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Data File", "spoolss.spoolss_DriverInfo8.data_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPortInfo2_monitor_name,
          { "Monitor Name", "spoolss.spoolss_SetPortInfo2.monitor_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PortInfo_infoFF,
-         { "Infoff", "spoolss.spoolss_PortInfo.infoFF", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo2_submitted,
          { "Submitted", "spoolss.spoolss_JobInfo2.submitted", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo6_architecture,
@@ -38872,10 +38877,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Location", "spoolss.spoolss_SetPrinterInfo2.location", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterData_data_needed,
          { "Data Needed", "spoolss.spoolss_EnumPrinterData.data_needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_NotifyData_integer,
-         { "Integer", "spoolss.spoolss_NotifyData.integer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo2_architecture,
          { "Architecture", "spoolss.spoolss_AddDriverInfo2.architecture", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterData_valREG_SZ_string,
+         { "String", "spoolss.spoolss_PrinterData_valREG_SZ.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinter_devmode_ctr,
          { "Devmode Ctr", "spoolss.spoolss_SetPrinter.devmode_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_RESPONSE_DATA_pSchema,
@@ -38888,16 +38893,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Command", "spoolss.spoolss_SetPrinter.command", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_PrinterControl_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_CONNECTIONS,
          { "Printer Enum Connections", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_CONNECTIONS", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_CONNECTIONS_tfs), ( 0x00000004 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_info2,
-         { "Info2", "spoolss.spoolss_SetPrinterInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RpcGetJobNamedPropertyValue_JobId,
          { "Jobid", "spoolss.spoolss_RpcGetJobNamedPropertyValue.JobId", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode___driverextra_length,
          { "  Driverextra Length", "spoolss.spoolss_DeviceMode.__driverextra_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_XcvData_function_name,
          { "Function Name", "spoolss.spoolss_XcvData.function_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddDriverInfo_info1,
-         { "Info1", "spoolss.spoolss_AddDriverInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_position,
          { "Position", "spoolss.spoolss_SetJobInfo2.position", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_sepfile,
@@ -38908,6 +38909,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Count", "spoolss.__spoolss_EnumPrinterDataEx.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2__devmode_ptr,
          { " Devmode Ptr", "spoolss.spoolss_SetJobInfo2._devmode_ptr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_Field_valdefault_field,
+         { "Field", "spoolss.spoolss_Field_valdefault.field", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_val9_info9,
+         { "Info9", "spoolss.spoolss_SetPrinterInfo_val9.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_submitted,
          { "Submitted", "spoolss.spoolss_JobInfo1.submitted", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo5_driver_attributes,
@@ -38916,6 +38921,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Monitor Name", "spoolss.spoolss_AddDriverInfo8.monitor_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_size,
          { "Size", "spoolss.spoolss_PortData2.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_FormInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_FormInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumPrintProcDataTypes_count,
          { "Count", "spoolss.__spoolss_EnumPrintProcDataTypes.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PORT,
@@ -38930,6 +38937,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Until Time", "spoolss.spoolss_JobInfo4.until_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_SOFT_RESET_REQUIRED,
          { "Printer Driver Soft Reset Required", "spoolss.spoolss_DriverAttributes.PRINTER_DRIVER_SOFT_RESET_REQUIRED", FT_BOOLEAN, 32, TFS(&spoolss_DriverAttributes_PRINTER_DRIVER_SOFT_RESET_REQUIRED_tfs), ( 0x00000400 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_val5_info5,
+         { "Info5", "spoolss.spoolss_PrinterInfo_val5.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_config_file,
          { "Config File", "spoolss.spoolss_AddDriverInfo8.config_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_wFeedDirection,
@@ -38940,6 +38949,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Provider", "spoolss.spoolss_AddDriverInfo6.provider", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_text_status,
          { "Text Status", "spoolss.spoolss_SetJobInfo2.text_status", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_JobInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_JobInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPorts_level,
          { "Level", "spoolss.spoolss_EnumPorts.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumForms_count,
@@ -39028,6 +39039,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Subcontext length", "spoolss.spoolss_PrinterInfo2.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_Notify_variable_type,
          { "Variable Type", "spoolss.spoolss_Notify.variable_type", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_NotifyTable_vals), 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString,
+         { "Propertystring", "spoolss.RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString.propertyString", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo1_description,
          { "Description", "spoolss.spoolss_SetPrinterInfo1.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_number_of_processors,
@@ -39092,26 +39105,28 @@ void proto_register_dcerpc_spoolss(void)
          { "Pages Printed", "spoolss.spoolss_JobInfo1.pages_printed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA351_caColorfulness,
          { "Cacolorfulness", "spoolss.spoolss_PSDRVEXTRA351.caColorfulness", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddFormInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_AddFormInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterDrivers_buffer,
          { "Buffer", "spoolss.spoolss_EnumPrinterDrivers.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriverPackagePath_language,
          { "Language", "spoolss.spoolss_GetPrinterDriverPackagePath.language", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo8_dependent_files,
          { "Dependent Files", "spoolss.spoolss_DriverInfo8.dependent_files", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_FormInfo_info1,
-         { "Info1", "spoolss.spoolss_FormInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetJobInfo_info3,
-         { "Info3", "spoolss.spoolss_SetJobInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_dwReserved3,
          { "Dwreserved3", "spoolss.spoolss_PSDRVEXTRA500.dwReserved3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_wReserved1,
          { "Wreserved1", "spoolss.spoolss_PSDRVEXTRA500.wReserved1", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_MonitorInfo_val2_info2,
+         { "Info2", "spoolss.spoolss_MonitorInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo5_config_version,
          { "Config Version", "spoolss.spoolss_AddDriverInfo5.config_version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo2_status,
          { "Status", "spoolss.spoolss_JobInfo2.status", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON2,
          { "Printer Enum Icon2", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_ICON2", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON2_tfs), ( 0x00020000 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_val0_info0,
+         { "Info0", "spoolss.spoolss_PrinterInfo_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_bReversePrint,
          { "Breverseprint", "spoolss.spoolss_PSDRVEXTRA500.bReversePrint", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrintProcessorDirectory_offered,
@@ -39134,8 +39149,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Info", "spoolss.spoolss_GetPrinterDriver2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_JOB,
          { "Printer Change Add Job", "spoolss.spoolss_PrinterChangeFlags.PRINTER_CHANGE_ADD_JOB", FT_BOOLEAN, 32, TFS(&spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_JOB_tfs), ( 0x00000100 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_info9,
-         { "Info9", "spoolss.spoolss_SetPrinterInfo.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo4_driver_name,
          { "Driver Name", "spoolss.spoolss_SetJobInfo4.driver_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_sharename,
@@ -39156,12 +39169,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Session Counter", "spoolss.spoolss_SetPrinterInfo0.session_counter", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DocumentInfo1_output_file,
          { "Output File", "spoolss.spoolss_DocumentInfo1.output_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_STRING_sData,
+         { "Sdata", "spoolss.RPC_BIDI_DATA_u_valBIDI_STRING.sData", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UserLevel3_user,
          { "User", "spoolss.spoolss_UserLevel3.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_info7,
-         { "Info7", "spoolss.spoolss_DriverInfo.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UserLevel1_minor,
          { "Minor", "spoolss.spoolss_UserLevel1.minor", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_MinorVersion_vals), 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_JobInfo_val3_info3,
+         { "Info3", "spoolss.spoolss_JobInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterDataEx_info,
          { "Info", "spoolss.spoolss_EnumPrinterDataEx.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver_handle,
@@ -39174,6 +39189,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Access Mask", "spoolss.spoolss_OpenPrinterEx.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfo1_form_name,
          { "Form Name", "spoolss.spoolss_AddFormInfo1.form_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_UserLevel_val3_level3,
+         { "Level3", "spoolss.spoolss_UserLevel_val3.level3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_version,
          { "Version", "spoolss.spoolss_PortData2.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_ORIENTATION,
@@ -39182,6 +39199,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Handle", "spoolss.spoolss_OpenPrinter.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AccessRights_JOB_ACCESS_READ,
          { "Job Access Read", "spoolss.spoolss_AccessRights.JOB_ACCESS_READ", FT_BOOLEAN, 32, TFS(&spoolss_AccessRights_JOB_ACCESS_READ_tfs), ( 0x00000020 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0600_unidrvextra,
+         { "Unidrvextra", "spoolss.spoolss_DeviceModeExtraDataUniDriver_val0x0600.unidrvextra", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_RESPONSE_DATA_dwResult,
          { "Dwresult", "spoolss.RPC_BIDI_RESPONSE_DATA.dwResult", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePerMachineConnection_server,
@@ -39212,6 +39231,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Reserved", "spoolss.spoolss_PortData2.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_location,
          { "Location", "spoolss.spoolss_PrinterInfo2.location", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_val3_info3,
+         { "Info3", "spoolss.spoolss_SetPrinterInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PELSHEIGHT,
          { "Devmode Pelsheight", "spoolss.spoolss_DeviceModeFields.DEVMODE_PELSHEIGHT", FT_BOOLEAN, 32, TFS(&spoolss_DeviceModeFields_DEVMODE_PELSHEIGHT_tfs), ( 0x00100000 ), NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcDataTypes_servername,
@@ -39232,16 +39253,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Month", "spoolss.spoolss_Time.month", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OpenPrinter_datatype,
          { "Datatype", "spoolss.spoolss_OpenPrinter.datatype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_info0,
-         { "Info0", "spoolss.spoolss_SetPrinterInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrinterDataEx_needed,
          { "Needed", "spoolss._spoolss_EnumPrinterDataEx.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcDataTypes_buffer,
          { "Buffer", "spoolss._spoolss_EnumPrintProcDataTypes.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_hostaddress,
          { "Hostaddress", "spoolss.spoolss_PortData2.hostaddress", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_UserLevel_level2,
-         { "Level2", "spoolss.spoolss_UserLevel.level2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_min_inbox_driver_ver_date,
          { "Min Inbox Driver Ver Date", "spoolss.spoolss_AddDriverInfo8.min_inbox_driver_ver_date", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo3_config_file,
@@ -39250,6 +39267,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Version", "spoolss.spoolss_NotifyInfo.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver2_needed,
          { "Needed", "spoolss.spoolss_GetPrinterDriver2.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddDriverInfo_val4_info4,
+         { "Info4", "spoolss.spoolss_AddDriverInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_scale,
          { "Scale", "spoolss.spoolss_DeviceMode.scale", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePrinterData_handle,
@@ -39292,6 +39311,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Version", "spoolss.spoolss_DriverInfo3.version", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DriverOSVersion_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetJob_handle,
          { "Handle", "spoolss.spoolss_GetJob.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_val4_info4,
+         { "Info4", "spoolss.spoolss_PrinterInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinter_secdesc_ctr,
          { "Secdesc Ctr", "spoolss.spoolss_AddPrinter.secdesc_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_duplex,
@@ -39300,8 +39321,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Color", "spoolss.spoolss_RouterReplyPrinterEx.color", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePort_port_name,
          { "Port Name", "spoolss.spoolss_DeletePort.port_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddDriverInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_AddDriverInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumForms_handle,
          { "Handle", "spoolss._spoolss_EnumForms.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_UserLevel_val2_level2,
+         { "Level2", "spoolss.spoolss_UserLevel_val2.level2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_FormInfo2_flags,
          { "Flags", "spoolss.spoolss_FormInfo2.flags", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_FormFlags_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_status,
@@ -39338,6 +39363,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Millisecond", "spoolss.spoolss_Time.millisecond", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumForms_needed,
          { "Needed", "spoolss.spoolss_EnumForms.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_val9_info9,
+         { "Info9", "spoolss.spoolss_PrinterInfo_val9.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_dwNupDirection,
          { "Dwnupdirection", "spoolss.spoolss_UNIDRVEXTRA.dwNupDirection", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DM_NupDirection_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_min_inbox_driver_ver_version,
@@ -39350,22 +39377,18 @@ void proto_register_dcerpc_spoolss(void)
          { "Architecture", "spoolss.spoolss_GetPrinterDriver2.architecture", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinter_buffer,
          { "Buffer", "spoolss.spoolss_GetPrinter.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterData_string,
-         { "String", "spoolss.spoolss_PrinterData.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo4_print_processor,
          { "Print Processor", "spoolss.spoolss_JobInfo4.print_processor", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobStatus_JOB_STATUS_DELETED,
          { "Job Status Deleted", "spoolss.spoolss_JobStatus.JOB_STATUS_DELETED", FT_BOOLEAN, 32, TFS(&spoolss_JobStatus_JOB_STATUS_DELETED_tfs), ( 0x00000100 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_OEM_DMEXTRA_dwVersion,
          { "Dwversion", "spoolss.spoolss_OEM_DMEXTRA.dwVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPortInfo_info2,
-         { "Info2", "spoolss.spoolss_SetPortInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_JobInfo_info3,
-         { "Info3", "spoolss.spoolss_JobInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo4_architecture,
          { "Architecture", "spoolss.spoolss_AddDriverInfo4.architecture", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_PUBLISHED,
          { "Printer Attribute Published", "spoolss.spoolss_PrinterAttributes.PRINTER_ATTRIBUTE_PUBLISHED", FT_BOOLEAN, 32, TFS(&spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_PUBLISHED_tfs), ( 0x00002000 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_val8_info8,
+         { "Info8", "spoolss.spoolss_DriverInfo_val8.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterKey__ndr_size,
          { " Ndr Size", "spoolss.spoolss_EnumPrinterKey._ndr_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterDataEx_count,
@@ -39404,8 +39427,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Apd Dont Copy Files To Cluster", "spoolss.spoolss_AddPrinterDriverExFlags.APD_DONT_COPY_FILES_TO_CLUSTER", FT_BOOLEAN, 32, TFS(&spoolss_AddPrinterDriverExFlags_APD_DONT_COPY_FILES_TO_CLUSTER_tfs), ( 0x00001000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_UserLevel3_client,
          { "Client", "spoolss.spoolss_UserLevel3.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psblob,
-         { "Psblob", "spoolss.spoolss_DeviceModeExtraDataPostScript.psblob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PlayGDIScriptOnPrinterIC_cOut,
          { "Cout", "spoolss.spoolss_PlayGDIScriptOnPrinterIC.cOut", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo4_status,
@@ -39426,6 +39447,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Devmode Ptr", "spoolss.spoolss_SetPrinterInfo2.devmode_ptr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_status,
          { "Status", "spoolss.spoolss_SetJobInfo2.status", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterData_valdefault_data,
+         { "Data", "spoolss.spoolss_PrinterData_valdefault.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_NAME,
          { "Printer Enum Name", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_NAME", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_NAME_tfs), ( 0x00000008 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_RpcSendRecvBidiData_pReqData,
@@ -39450,6 +39473,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Caredgamma", "spoolss.spoolss_PSDRVEXTRA351.caRedGamma", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_priority,
          { "Priority", "spoolss.spoolss_JobInfo1.priority", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0501_psdrvextra500,
+         { "Psdrvextra500", "spoolss.spoolss_DeviceModeExtraDataPostScript_val0x0501.psdrvextra500", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo1_name,
          { "Name", "spoolss.spoolss_SetPrinterInfo1.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_OUT_OF_MEMORY,
@@ -39458,12 +39483,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Data Type", "spoolss.spoolss_JobInfo1.data_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON5,
          { "Printer Enum Icon5", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_ICON5", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON5_tfs), ( 0x00100000 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_ReplyPrinterInfo_val0_info0,
+         { "Info0", "spoolss.spoolss_ReplyPrinterInfo_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_bitsperpel,
          { "Bitsperpel", "spoolss.spoolss_DeviceMode.bitsperpel", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersionEx_extra_string,
          { "Extra String", "spoolss.spoolss_OSVersionEx.extra_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_info0,
-         { "Info0", "spoolss.spoolss_PrinterInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_val2_info2,
+         { "Info2", "spoolss.spoolss_SetPrinterInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_dwOptions,
          { "Dwoptions", "spoolss.spoolss_PSDRVEXTRA500.dwOptions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_caRedGreenTint,
@@ -39484,8 +39511,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Level", "spoolss._spoolss_EnumPrintProcDataTypes.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DevmodeContainer_devmode,
          { "Devmode", "spoolss.spoolss_DevmodeContainer.devmode", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_BIDI_DATA_u_sData,
-         { "Sdata", "spoolss.RPC_BIDI_DATA_u.sData", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_dwNupBorderFlags,
          { "Dwnupborderflags", "spoolss.spoolss_PSDRVEXTRA.dwNupBorderFlags", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DM_NupBorderFlags_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo3_reserved,
@@ -39558,22 +39583,20 @@ void proto_register_dcerpc_spoolss(void)
          { "Flags", "spoolss.spoolss_SetPrinterInfo1.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfo2_form_name,
          { "Form Name", "spoolss.spoolss_AddFormInfo2.form_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_MonitorInfo_info2,
-         { "Info2", "spoolss.spoolss_MonitorInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetJobInfo_info4,
-         { "Info4", "spoolss.spoolss_SetJobInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_PrintPropertyValueUnion_propertyInt64,
-         { "Propertyint64", "spoolss.RPC_PrintPropertyValueUnion.propertyInt64", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JTEXP_wCoreMFOSize,
          { "Wcoremfosize", "spoolss.spoolss_JTEXP.wCoreMFOSize", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePrinterKey_handle,
          { "Handle", "spoolss.spoolss_DeletePrinterKey.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverDirectoryInfo_valdefault_info1,
+         { "Info1", "spoolss.spoolss_DriverDirectoryInfo_valdefault.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_reserved2,
          { "Reserved2", "spoolss.spoolss_PrinterInfo0.reserved2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_SERVER,
          { "Printer Change Server", "spoolss.spoolss_PrinterChangeFlags.PRINTER_CHANGE_SERVER", FT_BOOLEAN, 32, TFS(&spoolss_PrinterChangeFlags_PRINTER_CHANGE_SERVER_tfs), ( 0x08000000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo8_print_processor,
          { "Print Processor", "spoolss.spoolss_DriverInfo8.print_processor", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_val2_info2,
+         { "Info2", "spoolss.spoolss_PrinterInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinters_server,
          { "Server", "spoolss.spoolss_EnumPrinters.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumMonitors_count,
@@ -39608,8 +39631,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Free Build", "spoolss.spoolss_PrinterInfo0.free_build", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_Build_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver2_buffer,
          { "Buffer", "spoolss.spoolss_GetPrinterDriver2.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddDriverInfo_info3,
-         { "Info3", "spoolss.spoolss_AddDriverInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_hardware_id,
          { "Hardware Id", "spoolss.spoolss_AddDriverInfo8.hardware_id", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumPrinters_info,
@@ -39618,10 +39639,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Install Source Root", "spoolss.spoolss_DriverInfo7.install_source_root", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo4_position,
          { "Position", "spoolss.spoolss_SetJobInfo4.position", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_MonitorInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_MonitorInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PRINTQUALITY,
          { "Devmode Printquality", "spoolss.spoolss_DeviceModeFields.DEVMODE_PRINTQUALITY", FT_BOOLEAN, 32, TFS(&spoolss_DeviceModeFields_DEVMODE_PRINTQUALITY_tfs), ( 0x00000400 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterData_string_array,
-         { "String Array", "spoolss.spoolss_PrinterData.string_array", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfoCtr_info,
          { "Info", "spoolss.spoolss_AddFormInfoCtr.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriverPackagePath_driver_package_cab,
@@ -39680,8 +39701,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Driver Attributes", "spoolss.spoolss_AddDriverInfo8.printer_driver_attributes", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_DOOR_OPEN,
          { "Printer Status Door Open", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_DOOR_OPEN", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_DOOR_OPEN_tfs), ( 0x00400000 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_MonitorInfo_info1,
-         { "Info1", "spoolss.spoolss_MonitorInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumPrinterDrivers_info,
          { "Info", "spoolss.__spoolss_EnumPrinterDrivers.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_previous_names,
@@ -39698,10 +39717,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Change Delete Printer", "spoolss.spoolss_PrinterChangeFlags.PRINTER_CHANGE_DELETE_PRINTER", FT_BOOLEAN, 32, TFS(&spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PRINTER_tfs), ( 0x00000004 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_high_part_total_bytes,
          { "High Part Total Bytes", "spoolss.spoolss_SetPrinterInfo0.high_part_total_bytes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_val0_info0,
+         { "Info0", "spoolss.spoolss_SetPrinterInfo_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_time,
          { "Time", "spoolss.spoolss_SetJobInfo2.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumForms_level,
          { "Level", "spoolss._spoolss_EnumForms.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrintProcessorDirectoryInfo_valdefault_info1,
+         { "Info1", "spoolss.spoolss_PrintProcessorDirectoryInfo_valdefault.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_manufacturer_url,
          { "Manufacturer Url", "spoolss.spoolss_AddDriverInfo8.manufacturer_url", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddForm_info_ctr,
@@ -39710,6 +39733,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Cjobs", "spoolss.spoolss_PrinterInfo2.cjobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetForm_needed,
          { "Needed", "spoolss.spoolss_GetForm.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_BLOB_biData,
+         { "Bidata", "spoolss.RPC_BIDI_DATA_u_valBIDI_BLOB.biData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_wCoreFullSize,
          { "Wcorefullsize", "spoolss.spoolss_UNIDRVEXTRA.wCoreFullSize", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver2_info_,
@@ -39734,8 +39759,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Data Type", "spoolss.spoolss_JobInfo4.data_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumJobs_firstjob,
          { "Firstjob", "spoolss.spoolss_EnumJobs.firstjob", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_info4,
-         { "Info4", "spoolss.spoolss_DriverInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_valdefault_psblob,
+         { "Psblob", "spoolss.spoolss_DeviceModeExtraDataPostScript_valdefault.psblob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_enumerate_network_printers,
          { "Enumerate Network Printers", "spoolss.spoolss_SetPrinterInfo0.enumerate_network_printers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrinterDrivers_needed,
@@ -39748,6 +39773,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Offered", "spoolss.spoolss_EnumPrinterKey.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPorts_offered,
          { "Offered", "spoolss._spoolss_EnumPorts.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddDriverInfo_val3_info3,
+         { "Info3", "spoolss.spoolss_AddDriverInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_yresolution,
          { "Yresolution", "spoolss.spoolss_DeviceMode.yresolution", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinters_info,
@@ -39772,6 +39799,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Previous Names", "spoolss.spoolss_AddDriverInfo4.previous_names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePrinterData_value_name,
          { "Value Name", "spoolss.spoolss_DeletePrinterData.value_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetJobInfo_val2_info2,
+         { "Info2", "spoolss.spoolss_SetJobInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_dwSignature,
          { "Dwsignature", "spoolss.spoolss_PSDRVEXTRA.dwSignature", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DM_Signature_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_ERROR,
@@ -39790,6 +39819,8 @@ void proto_register_dcerpc_spoolss(void)
          { "U3", "spoolss.spoolss_NotifyOptionType.u3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_server_name,
          { "Server Name", "spoolss.spoolss_JobInfo1.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_val8_info8,
+         { "Info8", "spoolss.spoolss_SetPrinterInfo_val8.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_caColorfulness,
          { "Cacolorfulness", "spoolss.spoolss_PSDRVEXTRA400.caColorfulness", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA500_dwOptions,
@@ -39802,6 +39833,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Status User Intervention", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_USER_INTERVENTION", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_USER_INTERVENTION_tfs), ( 0x00100000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriverDirectory_server,
          { "Server", "spoolss.spoolss_GetPrinterDriverDirectory.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_SetPrinterInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_notify_name,
          { "Notify Name", "spoolss.spoolss_SetJobInfo2.notify_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumPrintProcDataTypes_info,
@@ -39834,6 +39867,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Offered", "spoolss.spoolss_EnumPrinterDrivers.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobStatus_JOB_STATUS_SPOOLING,
          { "Job Status Spooling", "spoolss.spoolss_JobStatus.JOB_STATUS_SPOOLING", FT_BOOLEAN, 32, TFS(&spoolss_JobStatus_JOB_STATUS_SPOOLING_tfs), ( 0x00000008 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_JobInfo_val4_info4,
+         { "Info4", "spoolss.spoolss_JobInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_RESPONSE_CONTAINER_Count,
          { "Count", "spoolss.RPC_BIDI_RESPONSE_CONTAINER.Count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo4_parameters,
@@ -39844,6 +39879,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Level", "spoolss.spoolss_GetPrinter.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_papersize,
          { "Papersize", "spoolss.spoolss_DeviceMode.papersize", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_DeviceModePaperSize_vals), 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_Field_valPRINTER_NOTIFY_TYPE_field,
+         { "Field", "spoolss.spoolss_Field_valPRINTER_NOTIFY_TYPE.field", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_JobNotifyField_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePrinterKey_key_name,
          { "Key Name", "spoolss.spoolss_DeletePrinterKey.key_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA351_caContrast,
@@ -39852,14 +39889,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Apd Copy New Files", "spoolss.spoolss_AddPrinterDriverExFlags.APD_COPY_NEW_FILES", FT_BOOLEAN, 32, TFS(&spoolss_AddPrinterDriverExFlags_APD_COPY_NEW_FILES_tfs), ( 0x00000008 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2__secdesc_ptr,
          { " Secdesc Ptr", "spoolss.spoolss_SetJobInfo2._secdesc_ptr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_val7_info7,
+         { "Info7", "spoolss.spoolss_DriverInfo_val7.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPerMachineConnection_printername,
          { "Printername", "spoolss.spoolss_AddPerMachineConnection.printername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrintProcessorDirectory_server,
          { "Server", "spoolss.spoolss_GetPrintProcessorDirectory.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterDataEx_value_name,
          { "Value Name", "spoolss.spoolss_SetPrinterDataEx.value_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_info5,
-         { "Info5", "spoolss.spoolss_PrinterInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_wReserved,
          { "Wreserved", "spoolss.spoolss_UNIDRVEXTRA.wReserved", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo1_pages_printed,
@@ -39884,8 +39921,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Job Status User Intervention", "spoolss.spoolss_JobStatus.JOB_STATUS_USER_INTERVENTION", FT_BOOLEAN, 32, TFS(&spoolss_JobStatus_JOB_STATUS_USER_INTERVENTION_tfs), ( 0x00000400 ), NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcessors_needed,
          { "Needed", "spoolss._spoolss_EnumPrintProcessors.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrintProcDataTypesInfo_info1,
-         { "Info1", "spoolss.spoolss_PrintProcDataTypesInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddDriverInfo_val8_info8,
+         { "Info8", "spoolss.spoolss_AddDriverInfo_val8.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON6,
          { "Printer Enum Icon6", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_ICON6", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON6_tfs), ( 0x00200000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_SERVICE,
@@ -39926,6 +39963,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Status Warming Up", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_WARMING_UP", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_WARMING_UP_tfs), ( 0x00010000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinterEx_devmode_ctr,
          { "Devmode Ctr", "spoolss.spoolss_AddPrinterEx.devmode_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_val2_info2,
+         { "Info2", "spoolss.spoolss_DriverInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_JobInfo_val2_info2,
+         { "Info2", "spoolss.spoolss_JobInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterDataEx_data,
          { "Data", "spoolss.spoolss_SetPrinterDataEx.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_CreatePrinterIC_handle,
@@ -39936,12 +39977,8 @@ void proto_register_dcerpc_spoolss(void)
          { " Ndr Size Color Profiles", "spoolss.spoolss_AddDriverInfo8._ndr_size_color_profiles", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrinters_flags,
          { "Flags", "spoolss._spoolss_EnumPrinters.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra500,
-         { "Psdrvextra500", "spoolss.spoolss_DeviceModeExtraDataPostScript.psdrvextra500", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_info2,
-         { "Info2", "spoolss.spoolss_PrinterInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_info6,
-         { "Info6", "spoolss.spoolss_SetPrinterInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddDriverInfo_val2_info2,
+         { "Info2", "spoolss.spoolss_AddDriverInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrintProcessors_environment,
          { "Environment", "spoolss.spoolss_EnumPrintProcessors.environment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersion_build,
@@ -39958,10 +39995,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Size", "spoolss.spoolss_DriverInfo7.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_caIlluminantIndex,
          { "Cailluminantindex", "spoolss.spoolss_PSDRVEXTRA400.caIlluminantIndex", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_FormInfo_val2_info2,
+         { "Info2", "spoolss.spoolss_FormInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPorts_offered,
          { "Offered", "spoolss.spoolss_EnumPorts.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData1_ip_address,
          { "Ip Address", "spoolss.spoolss_PortData1.ip_address", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PortInfo_val2_info2,
+         { "Info2", "spoolss.spoolss_PortInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_Time_minute,
          { "Minute", "spoolss.spoolss_Time.minute", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPortEx_monitor_name,
@@ -40002,6 +40043,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Cacontrast", "spoolss.spoolss_PSDRVEXTRA400.caContrast", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinterEx_info_ctr,
          { "Info Ctr", "spoolss.spoolss_AddPrinterEx.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrintProcessorInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_PrintProcessorInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_wFeedDirection,
          { "Wfeeddirection", "spoolss.spoolss_PSDRVEXTRA.wFeedDirection", FT_UINT1632, BASE_DEC, VALS(spoolss_spoolss_DMPS_FeedDirection_vals), 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcessors_buffer,
@@ -40012,8 +40055,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Size", "spoolss.spoolss_NotifyString.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_status,
          { "Status", "spoolss.spoolss_PrinterInfo0.status", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_info3,
-         { "Info3", "spoolss.spoolss_SetPrinterInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_c_setprinter,
          { "C Setprinter", "spoolss.spoolss_PrinterInfo0.c_setprinter", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcessors_environment,
@@ -40066,18 +40107,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Snmpcommunity", "spoolss.spoolss_PortData1.snmpcommunity", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UserLevel1_client,
          { "Client", "spoolss.spoolss_UserLevel1.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_KeyNames_string_array,
-         { "String Array", "spoolss.spoolss_KeyNames.string_array", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriverPackagePath_architecture,
          { "Architecture", "spoolss.spoolss_GetPrinterDriverPackagePath.architecture", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumMonitors_servername,
          { "Servername", "spoolss._spoolss_EnumMonitors.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddMonitorInfo_info2,
-         { "Info2", "spoolss.spoolss_AddMonitorInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_sharename,
          { "Sharename", "spoolss.spoolss_SetPrinterInfo2.sharename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_info4,
-         { "Info4", "spoolss.spoolss_SetPrinterInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumForms_level,
          { "Level", "spoolss.spoolss_EnumForms.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_ReadPrinter_handle,
@@ -40086,8 +40121,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Inf Path", "spoolss.spoolss_DriverInfo8.inf_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo6_driver_version,
          { "Driver Version", "spoolss.spoolss_AddDriverInfo6.driver_version", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetJobInfo_info2,
-         { "Info2", "spoolss.spoolss_SetJobInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriverDirectory_environment,
          { "Environment", "spoolss.spoolss_GetPrinterDriverDirectory.environment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_DERIVED,
@@ -40110,12 +40143,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Lang Id", "spoolss.spoolss_AddFormInfo2.lang_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_FormStringType_SPOOLSS_FORM_STRING_TYPE_LANG_PAIR,
          { "Spoolss Form String Type Lang Pair", "spoolss.spoolss_FormStringType.SPOOLSS_FORM_STRING_TYPE_LANG_PAIR", FT_BOOLEAN, 32, TFS(&spoolss_FormStringType_SPOOLSS_FORM_STRING_TYPE_LANG_PAIR_tfs), ( 0x00000004 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_JobInfo_info2,
-         { "Info2", "spoolss.spoolss_JobInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrinterDrivers_count,
          { "Count", "spoolss._spoolss_EnumPrinterDrivers.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PortInfo_info1,
-         { "Info1", "spoolss.spoolss_PortInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_DWORD_integer,
+         { "Integer", "spoolss.spoolss_NotifyData_valNOTIFY_TABLE_DWORD.integer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumForms_buffer,
          { "Buffer", "spoolss.spoolss_EnumForms.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData1_snmp_enabled,
@@ -40128,6 +40159,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Buffer", "spoolss.spoolss_EnumMonitors.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_parameters,
          { "Parameters", "spoolss.spoolss_PrinterInfo2.parameters", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0600_psdrvextra,
+         { "Psdrvextra", "spoolss.spoolss_DeviceModeExtraDataPostScript_val0x0600.psdrvextra", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_CorePrinterDriver_driver_date,
          { "Driver Date", "spoolss.spoolss_CorePrinterDriver.driver_date", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinters_flags,
@@ -40140,8 +40173,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Dwchecksum32", "spoolss.spoolss_UNIDRVEXTRA500.dwChecksum32", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_ReadPrinter_data,
          { "Data", "spoolss.spoolss_ReadPrinter.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_info2,
-         { "Info2", "spoolss.spoolss_DriverInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo5_version,
          { "Version", "spoolss.spoolss_DriverInfo5.version", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DriverOSVersion_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo4_start_time,
@@ -40196,6 +40227,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Type", "spoolss.spoolss_Notify.type", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_NotifyType_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_port_number,
          { "Port Number", "spoolss.spoolss_PortData2.port_number", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_DriverInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_max_spooling,
          { "Max Spooling", "spoolss.spoolss_PrinterInfo0.max_spooling", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_caColorfulness,
@@ -40222,8 +40255,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Woemextra", "spoolss.spoolss_UNIDRVEXTRA500.wOEMExtra", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverFileInfo_file_type,
          { "File Type", "spoolss.spoolss_DriverFileInfo.file_type", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DriverFileType_vals), 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_BIDI_DATA_u_iData,
-         { "Idata", "spoolss.RPC_BIDI_DATA_u.iData", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddMonitorInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_AddMonitorInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo8_driver_path,
          { "Driver Path", "spoolss.spoolss_DriverInfo8.driver_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_XPS,
@@ -40232,6 +40265,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Idialect", "spoolss.spoolss_PSDRVEXTRA500.iDialect", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DMPS_Dialect_vals), 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumMonitors_info,
          { "Info", "spoolss._spoolss_EnumMonitors.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_val4_info4,
+         { "Info4", "spoolss.spoolss_DriverInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinterEx_handle,
          { "Handle", "spoolss.spoolss_AddPrinterEx.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_status,
@@ -40242,6 +40277,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Secdesc", "spoolss.spoolss_JobInfo4.secdesc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfo1_size,
          { "Size", "spoolss.spoolss_AddFormInfo1.size", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetJobInfo_val3_info3,
+         { "Info3", "spoolss.spoolss_SetJobInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8__ndr_size_core_driver_dependencies,
          { " Ndr Size Core Driver Dependencies", "spoolss.spoolss_AddDriverInfo8._ndr_size_core_driver_dependencies", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrinterDrivers_server,
@@ -40258,18 +40295,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Fields", "spoolss.spoolss_NotifyOptionType.fields", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_FAX,
          { "Printer Driver Category Fax", "spoolss.spoolss_DriverAttributes.PRINTER_DRIVER_CATEGORY_FAX", FT_BOOLEAN, 32, TFS(&spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_FAX_tfs), ( 0x00000040 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra351,
-         { "Psdrvextra351", "spoolss.spoolss_DeviceModeExtraDataPostScript.psdrvextra351", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_dwX,
          { "Dwx", "spoolss.spoolss_PSDRVEXTRA500.dwX", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DevmodeContainer_devmode_,
          { "Subcontext length", "spoolss.spoolss_DevmodeContainer.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinter_info,
          { "Info", "spoolss.spoolss_GetPrinter.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_PrintPropertyValueUnion_propertyInt32,
-         { "Propertyint32", "spoolss.RPC_PrintPropertyValueUnion.propertyInt32", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_NotifyData_devmode,
-         { "Devmode", "spoolss.spoolss_NotifyData.devmode", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo8_config_file,
          { "Config File", "spoolss.spoolss_DriverInfo8.config_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterDataEx_key_name,
@@ -40308,14 +40339,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Ilayout", "spoolss.spoolss_PSDRVEXTRA.iLayout", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DM_Layout_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetForm_info_ctr,
          { "Info Ctr", "spoolss.spoolss_SetForm.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddFormInfo_info1,
-         { "Info1", "spoolss.spoolss_AddFormInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_Time_year,
          { "Year", "spoolss.spoolss_Time.year", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPorts_servername,
          { "Servername", "spoolss.spoolss_EnumPorts.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_DRV_ERROR_HANDLER,
          { "Spoolss Dm Ps Flags Drv Error Handler", "spoolss.spoolss_DMPS_Flags.SPOOLSS_DM_PS_FLAGS_DRV_ERROR_HANDLER", FT_BOOLEAN, 32, TFS(&spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_DRV_ERROR_HANDLER_tfs), ( 0x00000002 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetJobInfo_val4_info4,
+         { "Info4", "spoolss.spoolss_SetJobInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo4_data_file,
          { "Data File", "spoolss.spoolss_AddDriverInfo4.data_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON4,
@@ -40326,8 +40357,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Info", "spoolss._spoolss_EnumPorts.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_REQUEST_CONTAINER_Version,
          { "Version", "spoolss.RPC_BIDI_REQUEST_CONTAINER.Version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_info7,
-         { "Info7", "spoolss.spoolss_PrinterInfo.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_caContrast,
          { "Cacontrast", "spoolss.spoolss_PSDRVEXTRA500.caContrast", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersionEx_suite_mask,
@@ -40336,6 +40365,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Wcutsheet", "spoolss.spoolss_PSDRVEXTRA.wCutSheet", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RouterReplyPrinter_handle,
          { "Handle", "spoolss.spoolss_RouterReplyPrinter.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_DEVMODE_devmode,
+         { "Devmode", "spoolss.spoolss_NotifyData_valNOTIFY_TABLE_DEVMODE.devmode", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo7_version,
          { "Version", "spoolss.spoolss_DriverInfo7.version", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DriverOSVersion_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_COPY_ALL_FILES,
@@ -40348,6 +40379,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Printername", "spoolss.spoolss_OpenPrinterEx.printername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePrinterDataEx_value_name,
          { "Value Name", "spoolss.spoolss_DeletePrinterDataEx.value_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddMonitorInfo_val2_info2,
+         { "Info2", "spoolss.spoolss_AddMonitorInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrintProcDataTypes_count,
          { "Count", "spoolss.spoolss_EnumPrintProcDataTypes.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_UNIVERSAL_FONT_ID_Index,
@@ -40362,8 +40395,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Major", "spoolss.spoolss_OSVersion.major", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PAPERLENGTH,
          { "Devmode Paperlength", "spoolss.spoolss_DeviceModeFields.DEVMODE_PAPERLENGTH", FT_BOOLEAN, 32, TFS(&spoolss_DeviceModeFields_DEVMODE_PAPERLENGTH_tfs), ( 0x00000004 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_NotifyData_string,
-         { "String", "spoolss.spoolss_NotifyData.string", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_NETWORK,
          { "Printer Enum Network", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_NETWORK", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_NETWORK_tfs), ( 0x00000040 ), NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumMonitors_level,
@@ -40386,6 +40417,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Cagreengamma", "spoolss.spoolss_PSDRVEXTRA351.caGreenGamma", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumPorts_count,
          { "Count", "spoolss.__spoolss_EnumPorts.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_KeyNames_valdefault_string_array,
+         { "String Array", "spoolss.spoolss_KeyNames_valdefault.string_array", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinters_needed,
          { "Needed", "spoolss.spoolss_EnumPrinters.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINTER,
@@ -40408,6 +40441,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Driver Name", "spoolss.spoolss_JobInfo4.driver_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_iDialect,
          { "Idialect", "spoolss.spoolss_PSDRVEXTRA.iDialect", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DMPS_Dialect_vals), 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_val6_info6,
+         { "Info6", "spoolss.spoolss_SetPrinterInfo_val6.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo4_time,
          { "Time", "spoolss.spoolss_JobInfo4.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_SET_PRINTER_DRIVER,
@@ -40416,14 +40451,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Form Name", "spoolss.spoolss_GetForm.form_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA351_caReferenceBlack,
          { "Careferenceblack", "spoolss.spoolss_PSDRVEXTRA351.caReferenceBlack", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_info1,
-         { "Info1", "spoolss.spoolss_PrinterInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_logpixels,
          { "Logpixels", "spoolss.spoolss_DeviceMode.logpixels", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo3_default_datatype,
          { "Default Datatype", "spoolss.spoolss_AddDriverInfo3.default_datatype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePort_ptr,
          { "Ptr", "spoolss.spoolss_DeletePort.ptr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_ENUM_sData,
+         { "Sdata", "spoolss.RPC_BIDI_DATA_u_valBIDI_ENUM.sData", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterEnumValues_data_length,
          { "Data Length", "spoolss.spoolss_PrinterEnumValues.data_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_REQUEST_DATA_pSchema,
@@ -40462,8 +40497,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Dpd Delete Specific Version", "spoolss.spoolss_DeleteDriverFlags.DPD_DELETE_SPECIFIC_VERSION", FT_BOOLEAN, 32, TFS(&spoolss_DeleteDriverFlags_DPD_DELETE_SPECIFIC_VERSION_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo6_driver_path,
          { "Driver Path", "spoolss.spoolss_AddDriverInfo6.driver_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddFormInfo_info2,
-         { "Info2", "spoolss.spoolss_AddFormInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_val3_info3,
+         { "Info3", "spoolss.spoolss_PrinterInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_printername,
          { "Printername", "spoolss.spoolss_SetPrinterInfo2.printername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_XcvData_in_data,
@@ -40530,10 +40565,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Wreserved", "spoolss.spoolss_UNIDRVEXTRA3_4.wReserved", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinter_info_ctr,
          { "Info Ctr", "spoolss.spoolss_AddPrinter.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra3_4,
-         { "Unidrvextra3 4", "spoolss.spoolss_DeviceModeExtraDataUniDriver.unidrvextra3_4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterData_value,
-         { "Value", "spoolss.spoolss_PrinterData.value", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_inf_path,
          { "Inf Path", "spoolss.spoolss_AddDriverInfo8.inf_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_wCoreJTExpSize,
@@ -40550,6 +40581,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Device Not Selected Timeout", "spoolss.spoolss_PrinterInfo5.device_not_selected_timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeInfo_devmode,
          { "Devmode", "spoolss.spoolss_DeviceModeInfo.devmode", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterData_valREG_BINARY_binary,
+         { "Binary", "spoolss.spoolss_PrinterData_valREG_BINARY.binary", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersion_extra_string,
          { "Extra String", "spoolss.spoolss_OSVersion.extra_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_SCALE,
@@ -40560,14 +40593,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Wchepsfile", "spoolss.spoolss_PSDRVEXTRA.wchEPSFile", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo101_previous_names,
          { "Previous Names", "spoolss.spoolss_DriverInfo101.previous_names", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPortInfo_info1,
-         { "Info1", "spoolss.spoolss_SetPortInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrintProcessor_print_processor_name,
          { "Print Processor Name", "spoolss.spoolss_AddPrintProcessor.print_processor_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_reserved3,
          { "Reserved3", "spoolss.spoolss_SetPrinterInfo0.reserved3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_info8,
-         { "Info8", "spoolss.spoolss_DriverInfo.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_drivername,
          { "Drivername", "spoolss.spoolss_PrinterInfo2.drivername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RemoteFindFirstPrinterChangeNotifyEx_flags,
@@ -40602,12 +40631,20 @@ void proto_register_dcerpc_spoolss(void)
          { "Environment", "spoolss.spoolss_MonitorInfo2.environment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo3_data_file,
          { "Data File", "spoolss.spoolss_DriverInfo3.data_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0350_psdrvextra351,
+         { "Psdrvextra351", "spoolss.spoolss_DeviceModeExtraDataPostScript_val0x0350.psdrvextra351", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_LOCAL,
          { "Printer Attribute Local", "spoolss.spoolss_PrinterAttributes.PRINTER_ATTRIBUTE_LOCAL", FT_BOOLEAN, 32, TFS(&spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_LOCAL_tfs), ( 0x00000040 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_CorePrinterDriver_formname,
          { "Formname", "spoolss.spoolss_CorePrinterDriver.formname", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcDataTypes_count,
          { "Count", "spoolss._spoolss_EnumPrintProcDataTypes.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte_propertyByte,
+         { "Propertybyte", "spoolss.RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte.propertyByte", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverDirectoryInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_DriverDirectoryInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_val7_info7,
+         { "Info7", "spoolss.spoolss_SetPrinterInfo_val7.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPortEx_port_ctr,
          { "Port Ctr", "spoolss.spoolss_AddPortEx.port_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriverPackagePath_package_id,
@@ -40618,14 +40655,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Size", "spoolss.spoolss_TimeCtr.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_iQuality,
          { "Iquality", "spoolss.spoolss_UNIDRVEXTRA.iQuality", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DMUNI_Quality_vals), 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_info8,
-         { "Info8", "spoolss.spoolss_SetPrinterInfo.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_Field_valJOB_NOTIFY_TYPE_field,
+         { "Field", "spoolss.spoolss_Field_valJOB_NOTIFY_TYPE.field", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_PrintNotifyField_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterEnumValues_value_name_len,
          { "Value Name Len", "spoolss.spoolss_PrinterEnumValues.value_name_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrinterDrivers_info,
          { "Info", "spoolss._spoolss_EnumPrinterDrivers.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrintProcessorDirectoryInfo_info1,
-         { "Info1", "spoolss.spoolss_PrintProcessorDirectoryInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumForms_info,
          { "Info", "spoolss.__spoolss_EnumForms.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterDataEx_handle,
@@ -40686,6 +40721,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Version", "spoolss.spoolss_DriverInfo4.version", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DriverOSVersion_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo4_size_high,
          { "Size High", "spoolss.spoolss_SetJobInfo4.size_high", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrintProcessorDirectoryInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_PrintProcessorDirectoryInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_STRICT_UPGRADE,
          { "Apd Strict Upgrade", "spoolss.spoolss_AddPrinterDriverExFlags.APD_STRICT_UPGRADE", FT_BOOLEAN, 32, TFS(&spoolss_AddPrinterDriverExFlags_APD_STRICT_UPGRADE_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_ReplyClosePrinter_handle,
@@ -40696,6 +40733,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Dsprint Unpublish", "spoolss.spoolss_DsPrintAction.DSPRINT_UNPUBLISH", FT_BOOLEAN, 32, TFS(&spoolss_DsPrintAction_DSPRINT_UNPUBLISH_tfs), ( 0x00000004 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo8_monitor_name,
          { "Monitor Name", "spoolss.spoolss_DriverInfo8.monitor_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_val6_info6,
+         { "Info6", "spoolss.spoolss_DriverInfo_val6.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_devicename,
          { "Devicename", "spoolss.spoolss_DeviceMode.devicename", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_driver_name,
@@ -40718,12 +40757,16 @@ void proto_register_dcerpc_spoolss(void)
          { "Servername", "spoolss.spoolss_PrinterInfo4.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RpcDeleteJobNamedProperty_pszName,
          { "Pszname", "spoolss.spoolss_RpcDeleteJobNamedProperty.pszName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPortInfo_val2_info2,
+         { "Info2", "spoolss.spoolss_SetPortInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPorts_servername,
          { "Servername", "spoolss._spoolss_EnumPorts.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_COMPRESS_BITMAP,
          { "Spoolss Dm Ps Flags Compress Bitmap", "spoolss.spoolss_DMPS_Flags.SPOOLSS_DM_PS_FLAGS_COMPRESS_BITMAP", FT_BOOLEAN, 32, TFS(&spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_COMPRESS_BITMAP_tfs), ( 0x00000040 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_GetJob_needed,
          { "Needed", "spoolss.spoolss_GetJob.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_INT_iData,
+         { "Idata", "spoolss.RPC_BIDI_DATA_u_valBIDI_INT.iData", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData1_reserved,
          { "Reserved", "spoolss.spoolss_PortData1.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo1_status,
@@ -40740,6 +40783,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Status Busy", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_BUSY", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_BUSY_tfs), ( 0x00000200 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_NETWORK,
          { "Printer Attribute Network", "spoolss.spoolss_PrinterAttributes.PRINTER_ATTRIBUTE_NETWORK", FT_BOOLEAN, 32, TFS(&spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_NETWORK_tfs), ( 0x00000010 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_STRING_string,
+         { "String", "spoolss.spoolss_NotifyData_valNOTIFY_TABLE_STRING.string", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo6_dependent_files,
          { "Dependent Files", "spoolss.spoolss_DriverInfo6.dependent_files", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_FormSize_height,
@@ -40772,16 +40817,18 @@ void proto_register_dcerpc_spoolss(void)
          { "Keyword", "spoolss.spoolss_AddFormInfo2.keyword", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo4_monitor_name,
          { "Monitor Name", "spoolss.spoolss_DriverInfo4.monitor_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_val5_info5,
+         { "Info5", "spoolss.spoolss_SetPrinterInfo_val5.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DocumentInfo1_datatype,
          { "Datatype", "spoolss.spoolss_DocumentInfo1.datatype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo5_driver_name,
          { "Driver Name", "spoolss.spoolss_AddDriverInfo5.driver_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32_propertyInt32,
+         { "Propertyint32", "spoolss.RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32.propertyInt32", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RpcSetJobNamedProperty_hPrinter,
          { "Hprinter", "spoolss.spoolss_RpcSetJobNamedProperty.hPrinter", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrintProcessor_architecture,
          { "Architecture", "spoolss.spoolss_AddPrintProcessor.architecture", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_UserLevel_level3,
-         { "Level3", "spoolss.spoolss_UserLevel.level3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PROCESSING,
          { "Printer Status Processing", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_PROCESSING", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_PROCESSING_tfs), ( 0x00004000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_snmp_enabled,
@@ -40794,8 +40841,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Status Paper Out", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_PAPER_OUT", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_PAPER_OUT_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_FormInfo1_area,
          { "Area", "spoolss.spoolss_FormInfo1.area", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_PrintPropertyValueUnion_propertyByte,
-         { "Propertybyte", "spoolss.RPC_PrintPropertyValueUnion.propertyByte", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_protocol,
          { "Protocol", "spoolss.spoolss_PortData2.protocol", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_PortProtocol_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_wOEMExtra,
@@ -40818,8 +40863,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Cabrightness", "spoolss.spoolss_PSDRVEXTRA400.caBrightness", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_EXPAND,
          { "Printer Enum Expand", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_EXPAND", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_EXPAND_tfs), ( 0x00004000 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra,
-         { "Psdrvextra", "spoolss.spoolss_DeviceModeExtraDataPostScript.psdrvextra", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JTEXP_dwVersion,
          { "Dwversion", "spoolss.spoolss_JTEXP.dwVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo4_driver_name,
@@ -40838,18 +40881,20 @@ void proto_register_dcerpc_spoolss(void)
          { "Data Type", "spoolss.spoolss_SetJobInfo1.data_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterKey_key_name,
          { "Key Name", "spoolss.spoolss_EnumPrinterKey.key_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_info3,
-         { "Info3", "spoolss.spoolss_PrinterInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_printer_name,
          { "Printer Name", "spoolss.spoolss_JobInfo1.printer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo4_start_time,
          { "Start Time", "spoolss.spoolss_SetJobInfo4.start_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddDriverInfo_info4,
-         { "Info4", "spoolss.spoolss_AddDriverInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PortInfo_val3_info3,
+         { "Info3", "spoolss.spoolss_PortInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RemoteFindFirstPrinterChangeNotifyEx_notify_options,
          { "Notify Options", "spoolss.spoolss_RemoteFindFirstPrinterChangeNotifyEx.notify_options", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PAUSED,
          { "Printer Status Paused", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_PAUSED", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_PAUSED_tfs), ( 0x00000001 ), NULL, HFILL }},
+       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_BOOL_bData,
+         { "Bdata", "spoolss.RPC_BIDI_DATA_u_valBIDI_BOOL.bData", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetJobInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_SetJobInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_fields,
          { "Fields", "spoolss.spoolss_DeviceMode.fields", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_RESPONSE_CONTAINER_Version,
@@ -40862,8 +40907,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Wreserved", "spoolss.spoolss_UNIDRVEXTRA500.wReserved", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_job_error,
          { "Job Error", "spoolss.spoolss_SetPrinterInfo0.job_error", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_info1,
-         { "Info1", "spoolss.spoolss_DriverInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_StartDocPrinter_info_ctr,
          { "Info Ctr", "spoolss.spoolss_StartDocPrinter.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_MonitorUi_dll_name,
@@ -40882,6 +40925,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Datatype", "spoolss.spoolss_PrinterInfo2.datatype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DsPrintAction_DSPRINT_PUBLISH,
          { "Dsprint Publish", "spoolss.spoolss_DsPrintAction.DSPRINT_PUBLISH", FT_BOOLEAN, 32, TFS(&spoolss_DsPrintAction_DSPRINT_PUBLISH_tfs), ( 0x00000001 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_valdefault_uniblob,
+         { "Uniblob", "spoolss.spoolss_DeviceModeExtraDataUniDriver_valdefault.uniblob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfoContainer_info,
          { "Info", "spoolss.spoolss_JobInfoContainer.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_XcvData_needed,
@@ -40890,12 +40935,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Position", "spoolss.spoolss_SetJobInfo1.position", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo4_notify_name,
          { "Notify Name", "spoolss.spoolss_SetJobInfo4.notify_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPortInfo_val3_info3,
+         { "Info3", "spoolss.spoolss_SetPortInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDataEx_needed,
          { "Needed", "spoolss.spoolss_GetPrinterDataEx.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePrinterDriver_driver,
          { "Driver", "spoolss.spoolss_DeletePrinterDriver.driver", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra500,
-         { "Unidrvextra500", "spoolss.spoolss_DeviceModeExtraDataUniDriver.unidrvextra500", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_caReferenceBlack,
          { "Careferenceblack", "spoolss.spoolss_PSDRVEXTRA.caReferenceBlack", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPort_unknown,
@@ -40920,8 +40965,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Info", "spoolss.__spoolss_EnumPrinterDataEx.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersionEx_extra_string_,
          { "Subcontext length", "spoolss.spoolss_OSVersionEx.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_info7,
-         { "Info7", "spoolss.spoolss_SetPrinterInfo.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddDriverInfo_val6_info6,
+         { "Info6", "spoolss.spoolss_AddDriverInfo_val6.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo6_monitor_name,
          { "Monitor Name", "spoolss.spoolss_DriverInfo6.monitor_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersion__ndr_size,
@@ -40930,12 +40975,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Hardware Id", "spoolss.spoolss_DriverInfo8.hardware_id", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumJobs_handle,
          { "Handle", "spoolss.spoolss_EnumJobs.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_info6,
-         { "Info6", "spoolss.spoolss_DriverInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterKey_handle,
          { "Handle", "spoolss.spoolss_EnumPrinterKey.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPortInfo_infoFF,
-         { "Infoff", "spoolss.spoolss_SetPortInfo.infoFF", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo6__ndr_size_dependent_files,
          { " Ndr Size Dependent Files", "spoolss.spoolss_AddDriverInfo6._ndr_size_dependent_files", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver_offered,
@@ -40954,12 +40995,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Servername", "spoolss.spoolss_AddPortEx.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_fxScrAngle,
          { "Fxscrangle", "spoolss.spoolss_PSDRVEXTRA.fxScrAngle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_info8,
-         { "Info8", "spoolss.spoolss_PrinterInfo.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo8_manufacturer_url,
          { "Manufacturer Url", "spoolss.spoolss_DriverInfo8.manufacturer_url", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra,
-         { "Unidrvextra", "spoolss.spoolss_DeviceModeExtraDataUniDriver.unidrvextra", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo4_position,
          { "Position", "spoolss.spoolss_JobInfo4.position", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumJobs_handle,
@@ -40968,12 +41005,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Defaultpriority", "spoolss.spoolss_PrinterInfo2.defaultpriority", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo7_action,
          { "Action", "spoolss.spoolss_SetPrinterInfo7.action", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterData_data,
-         { "Data", "spoolss.spoolss_PrinterData.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AbortPrinter_handle,
          { "Handle", "spoolss.spoolss_AbortPrinter.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_BIDI_DATA_u_bData,
-         { "Bdata", "spoolss.RPC_BIDI_DATA_u.bData", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_FormInfo1_flags,
          { "Flags", "spoolss.spoolss_FormInfo1.flags", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_FormFlags_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData1_portname,
@@ -40996,6 +41029,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Status Page Punt", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_PAGE_PUNT", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_PAGE_PUNT_tfs), ( 0x00080000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo6_version,
          { "Version", "spoolss.spoolss_AddDriverInfo6.version", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DriverOSVersion_vals), 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_val5_info5,
+         { "Info5", "spoolss.spoolss_DriverInfo_val5.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersionEx_minor,
          { "Minor", "spoolss.spoolss_OSVersionEx.minor", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_REQUEST_CONTAINER_aData,
@@ -41018,8 +41053,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Port Name", "spoolss.spoolss_SetPortInfoFF.port_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPerMachineConnection_provider,
          { "Provider", "spoolss.spoolss_AddPerMachineConnection.provider", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_UserLevel_level1,
-         { "Level1", "spoolss.spoolss_UserLevel.level1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AccessRights_JOB_ACCESS_ADMINISTER,
          { "Job Access Administer", "spoolss.spoolss_AccessRights.JOB_ACCESS_ADMINISTER", FT_BOOLEAN, 32, TFS(&spoolss_AccessRights_JOB_ACCESS_ADMINISTER_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_DITHERTYPE,
@@ -41030,8 +41063,6 @@ void proto_register_dcerpc_spoolss(void)
          { " Secdesc Ptr", "spoolss.spoolss_SetJobInfo4._secdesc_ptr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PANNINGWIDTH,
          { "Devmode Panningwidth", "spoolss.spoolss_DeviceModeFields.DEVMODE_PANNINGWIDTH", FT_BOOLEAN, 32, TFS(&spoolss_DeviceModeFields_DEVMODE_PANNINGWIDTH_tfs), ( 0x08000000 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPortInfo_info3,
-         { "Info3", "spoolss.spoolss_SetPortInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_total_bytes,
          { "Total Bytes", "spoolss.spoolss_PrinterInfo0.total_bytes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_driver_name,
@@ -41088,8 +41119,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Spoolss Dm Ps Flags Print Negative", "spoolss.spoolss_DMPS_Flags.SPOOLSS_DM_PS_FLAGS_PRINT_NEGATIVE", FT_BOOLEAN, 32, TFS(&spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_PRINT_NEGATIVE_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_FindClosePrinterNotify_handle,
          { "Handle", "spoolss.spoolss_FindClosePrinterNotify.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_info1,
-         { "Info1", "spoolss.spoolss_SetPrinterInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo2_driver_name,
          { "Driver Name", "spoolss.spoolss_AddDriverInfo2.driver_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumForms_handle,
@@ -41136,10 +41165,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Enumerate Network Printers", "spoolss.spoolss_PrinterInfo0.enumerate_network_printers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinter_needed,
          { "Needed", "spoolss.spoolss_GetPrinter.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_JobInfo_info4,
-         { "Info4", "spoolss.spoolss_JobInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_info5,
-         { "Info5", "spoolss.spoolss_DriverInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_job_id,
          { "Job Id", "spoolss.spoolss_JobInfo1.job_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_FORMNAME,
@@ -41158,10 +41183,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Job Id", "spoolss.spoolss_SetJobInfo2.job_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RouterRefreshPrinterChangeNotify_options,
          { "Options", "spoolss.spoolss_RouterRefreshPrinterChangeNotify.options", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PortInfo_info3,
-         { "Info3", "spoolss.spoolss_PortInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_BIDI_DATA_u_biData,
-         { "Bidata", "spoolss.RPC_BIDI_DATA_u.biData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_dwSignature,
          { "Dwsignature", "spoolss.spoolss_UNIDRVEXTRA.dwSignature", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DM_Signature_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_caReferenceBlack,
@@ -41178,6 +41199,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Level", "spoolss.spoolss_GetPrinterDriverDirectory.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OpenPrinter_printername,
          { "Printername", "spoolss.spoolss_OpenPrinter.printername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PortInfo_val0xff_infoFF,
+         { "Infoff", "spoolss.spoolss_PortInfo_val0xff.infoFF", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_total_pages,
          { "Total Pages", "spoolss.spoolss_SetPrinterInfo0.total_pages", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo5_driver_version,
@@ -41202,8 +41225,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Second", "spoolss.spoolss_Time.second", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_FILE,
          { "Printer Driver Category File", "spoolss.spoolss_DriverAttributes.PRINTER_DRIVER_CATEGORY_FILE", FT_BOOLEAN, 32, TFS(&spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_FILE_tfs), ( 0x00000080 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverDirectoryInfo_info1,
-         { "Info1", "spoolss.spoolss_DriverDirectoryInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_cjobs,
          { "Cjobs", "spoolss.spoolss_SetPrinterInfo2.cjobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DsPrintAction_DSPRINT_UPDATE,
@@ -41240,6 +41261,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Help File", "spoolss.spoolss_DriverInfo3.help_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo4_dependent_files,
          { "Dependent Files", "spoolss.spoolss_DriverInfo4.dependent_files", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PortInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_PortInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo5_config_file,
          { "Config File", "spoolss.spoolss_AddDriverInfo5.config_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_DATA_dwBidiType,
@@ -41268,8 +41291,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Ittdlfmt", "spoolss.spoolss_PSDRVEXTRA500.iTTDLFmt", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DMPS_TTDLFmt_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo101_manufacturer_name,
          { "Manufacturer Name", "spoolss.spoolss_DriverInfo101.manufacturer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_NotifyData_sd,
-         { "Sd", "spoolss.spoolss_NotifyData.sd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_printprocessor,
          { "Printprocessor", "spoolss.spoolss_SetPrinterInfo2.printprocessor", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_CreatePrinterIC_gdi_handle,
@@ -41278,6 +41299,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Buffer", "spoolss.spoolss_EnumJobs.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AccessRights_SERVER_ACCESS_ENUMERATE,
          { "Server Access Enumerate", "spoolss.spoolss_AccessRights.SERVER_ACCESS_ENUMERATE", FT_BOOLEAN, 32, TFS(&spoolss_AccessRights_SERVER_ACCESS_ENUMERATE_tfs), ( 0x00000002 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_val6_info6,
+         { "Info6", "spoolss.spoolss_PrinterInfo_val6.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DMUNI_Flags_SPOOLSS_DM_UNI_FLAGS_PRINT_TEXT_AS_GRAPHICS,
          { "Spoolss Dm Uni Flags Print Text As Graphics", "spoolss.spoolss_DMUNI_Flags.SPOOLSS_DM_UNI_FLAGS_PRINT_TEXT_AS_GRAPHICS", FT_BOOLEAN, 32, TFS(&spoolss_DMUNI_Flags_SPOOLSS_DM_UNI_FLAGS_PRINT_TEXT_AS_GRAPHICS_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_servername,
@@ -41286,8 +41309,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Size2", "spoolss.spoolss_UserLevel3.size2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfoCtr_info,
          { "Info", "spoolss.spoolss_SetPrinterInfoCtr.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_info4,
-         { "Info4", "spoolss.spoolss_PrinterInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_TEXT_sData,
+         { "Sdata", "spoolss.RPC_BIDI_DATA_u_valBIDI_TEXT.sData", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_NotifyOption_count,
          { "Count", "spoolss.spoolss_NotifyOption.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetJob_offered,
@@ -41296,12 +41319,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Guid", "spoolss.spoolss_SetPrinterInfo7.guid", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_total_jobs,
          { "Total Jobs", "spoolss.spoolss_PrinterInfo0.total_jobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_UserLevel_val1_level1,
+         { "Level1", "spoolss.spoolss_UserLevel_val1.level1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0500_unidrvextra500,
+         { "Unidrvextra500", "spoolss.spoolss_DeviceModeExtraDataUniDriver_val0x0500.unidrvextra500", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_parameters,
          { "Parameters", "spoolss.spoolss_SetPrinterInfo2.parameters", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePort_server_name,
          { "Server Name", "spoolss.spoolss_DeletePort.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_info5,
-         { "Info5", "spoolss.spoolss_SetPrinterInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfo2_string_type,
          { "String Type", "spoolss.spoolss_AddFormInfo2.string_type", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_NUP,
@@ -41336,6 +41361,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Driver Date", "spoolss.spoolss_DriverInfo101.driver_date", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetForm_handle,
          { "Handle", "spoolss.spoolss_SetForm.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64_propertyInt64,
+         { "Propertyint64", "spoolss.RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64.propertyInt64", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo4_architecture,
          { "Architecture", "spoolss.spoolss_DriverInfo4.architecture", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_num_error_out_of_paper,
@@ -41364,6 +41391,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Handle", "spoolss.spoolss_EnumPrinterData.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_job_error,
          { "Job Error", "spoolss.spoolss_PrinterInfo0.job_error", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPortInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_SetPortInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_PACKAGE_AWARE,
          { "Printer Driver Package Aware", "spoolss.spoolss_DriverAttributes.PRINTER_DRIVER_PACKAGE_AWARE", FT_BOOLEAN, 32, TFS(&spoolss_DriverAttributes_PRINTER_DRIVER_PACKAGE_AWARE_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PAPER_PROBLEM,
@@ -41382,8 +41411,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Handle", "spoolss.spoolss_SetPrinter.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_caRedGamma,
          { "Caredgamma", "spoolss.spoolss_PSDRVEXTRA500.caRedGamma", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_PrintPropertyValueUnion_propertyString,
-         { "Propertystring", "spoolss.RPC_PrintPropertyValueUnion.propertyString", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_portname,
          { "Portname", "spoolss.spoolss_SetPrinterInfo2.portname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterData_data,
@@ -41392,8 +41419,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Info", "spoolss._spoolss_EnumPrintProcessors.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DocumentInfoCtr_info,
          { "Info", "spoolss.spoolss_DocumentInfoCtr.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterData_binary,
-         { "Binary", "spoolss.spoolss_PrinterData.binary", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_caRedGreenTint,
          { "Caredgreentint", "spoolss.spoolss_PSDRVEXTRA400.caRedGreenTint", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_RAW_ONLY,
@@ -41452,6 +41477,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Attribute Default", "spoolss.spoolss_PrinterAttributes.PRINTER_ATTRIBUTE_DEFAULT", FT_BOOLEAN, 32, TFS(&spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_DEFAULT_tfs), ( 0x00000004 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo3__ndr_size_dependent_files,
          { " Ndr Size Dependent Files", "spoolss.spoolss_AddDriverInfo3._ndr_size_dependent_files", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_val101_info101,
+         { "Info101", "spoolss.spoolss_DriverInfo_val101.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetForm_form_name,
          { "Form Name", "spoolss.spoolss_SetForm.form_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrintProcessorDirectory_level,
@@ -41462,14 +41489,16 @@ void proto_register_dcerpc_spoolss(void)
          { "Port Monitor Mib Index", "spoolss.spoolss_PortData2.port_monitor_mib_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo4_driver_path,
          { "Driver Path", "spoolss.spoolss_AddDriverInfo4.driver_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddDriverInfo_info6,
-         { "Info6", "spoolss.spoolss_AddDriverInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo4_help_file,
          { "Help File", "spoolss.spoolss_DriverInfo4.help_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumJobs_count,
          { "Count", "spoolss.__spoolss_EnumJobs.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_val8_info8,
+         { "Info8", "spoolss.spoolss_PrinterInfo_val8.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_caReferenceWhite,
          { "Careferencewhite", "spoolss.spoolss_PSDRVEXTRA500.caReferenceWhite", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_val4_info4,
+         { "Info4", "spoolss.spoolss_SetPrinterInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetCorePrinterDrivers_core_printer_driver_count,
          { "Core Printer Driver Count", "spoolss.spoolss_GetCorePrinterDrivers.core_printer_driver_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_ReplyOpenPrinter_handle,
@@ -41496,14 +41525,16 @@ void proto_register_dcerpc_spoolss(void)
          { "Ttoption", "spoolss.spoolss_DeviceMode.ttoption", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_DeviceModeTTOption_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver_info_,
          { "Subcontext length", "spoolss.spoolss_GetPrinterDriver.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_PrinterInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_aOptions,
          { "Aoptions", "spoolss.spoolss_UNIDRVEXTRA.aOptions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RpcGetJobNamedPropertyValue_pValue,
          { "Pvalue", "spoolss.spoolss_RpcGetJobNamedPropertyValue.pValue", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_info3,
-         { "Info3", "spoolss.spoolss_DriverInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA500_wVer,
          { "Wver", "spoolss.spoolss_UNIDRVEXTRA500.wVer", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterData_valREG_DWORD_value,
+         { "Value", "spoolss.spoolss_PrinterData_valREG_DWORD.value", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA500_iLayout,
          { "Ilayout", "spoolss.spoolss_UNIDRVEXTRA500.iLayout", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DM_Layout_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData1_device_type,
@@ -41514,10 +41545,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Displayflags", "spoolss.spoolss_DeviceMode.displayflags", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DeviceModeNUp_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA351_wchEPSFile,
          { "Wchepsfile", "spoolss.spoolss_PSDRVEXTRA351.wchEPSFile", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_info9,
-         { "Info9", "spoolss.spoolss_PrinterInfo.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_Time_day_of_week,
          { "Day Of Week", "spoolss.spoolss_Time.day_of_week", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_NULL_bData,
+         { "Bdata", "spoolss.RPC_BIDI_DATA_u_valBIDI_NULL.bData", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_text_status,
          { "Text Status", "spoolss.spoolss_JobInfo1.text_status", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_servername,
@@ -41530,8 +41561,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Processor Type", "spoolss.spoolss_PrinterInfo0.processor_type", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_ProcessorType_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo5_transmission_retry_timeout,
          { "Transmission Retry Timeout", "spoolss.spoolss_SetPrinterInfo5.transmission_retry_timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_FormInfo_info2,
-         { "Info2", "spoolss.spoolss_FormInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobStatus_JOB_STATUS_ERROR,
          { "Job Status Error", "spoolss.spoolss_JobStatus.JOB_STATUS_ERROR", FT_BOOLEAN, 32, TFS(&spoolss_JobStatus_JOB_STATUS_ERROR_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterDrivers_needed,
@@ -41576,14 +41605,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Until Time", "spoolss.spoolss_SetJobInfo4.until_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumForms_count,
          { "Count", "spoolss.__spoolss_EnumForms.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_info101,
-         { "Info101", "spoolss.spoolss_DriverInfo.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINTER_DRIVER,
          { "Printer Change Add Printer Driver", "spoolss.spoolss_PrinterChangeFlags.PRINTER_CHANGE_ADD_PRINTER_DRIVER", FT_BOOLEAN, 32, TFS(&spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINTER_DRIVER_tfs), ( 0x10000000 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetJobInfo_info1,
-         { "Info1", "spoolss.spoolss_SetJobInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_MonitorInfo2_dll_name,
          { "Dll Name", "spoolss.spoolss_MonitorInfo2.dll_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0400_psdrvextra400,
+         { "Psdrvextra400", "spoolss.spoolss_DeviceModeExtraDataPostScript_val0x0400.psdrvextra400", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RouterReplyPrinter_flags,
          { "Flags", "spoolss.spoolss_RouterReplyPrinter.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver2_client_minor_version,
@@ -41622,6 +41649,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Numjobs", "spoolss.spoolss_EnumJobs.numjobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumJobs_firstjob,
          { "Firstjob", "spoolss._spoolss_EnumJobs.firstjob", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer_propertyBlob,
+         { "Propertyblob", "spoolss.RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer.propertyBlob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_XcvData__in_data_length,
          { " In Data Length", "spoolss.spoolss_XcvData._in_data_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinter_info_ctr,
@@ -41642,6 +41671,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Dwoptions", "spoolss.spoolss_UNIDRVEXTRA.dwOptions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_dwX,
          { "Dwx", "spoolss.spoolss_PSDRVEXTRA.dwX", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterData_valREG_MULTI_SZ_string_array,
+         { "String Array", "spoolss.spoolss_PrinterData_valREG_MULTI_SZ.string_array", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_cjobs,
          { "Cjobs", "spoolss.spoolss_SetPrinterInfo0.cjobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_JOB,
@@ -41660,6 +41691,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Level", "spoolss.spoolss_AddJob.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AccessRights_PRINTER_ACCESS_USE,
          { "Printer Access Use", "spoolss.spoolss_AccessRights.PRINTER_ACCESS_USE", FT_BOOLEAN, 32, TFS(&spoolss_AccessRights_PRINTER_ACCESS_USE_tfs), ( 0x00000008 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrintProcDataTypesInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_PrintProcDataTypesInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_data_type,
          { "Data Type", "spoolss.spoolss_SetJobInfo2.data_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddMonitorInfo2_environment,
@@ -41708,14 +41741,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Pcproperties", "spoolss.spoolss_RpcEnumJobNamedProperties.pcProperties", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JTEXP_ModelName,
          { "Modelname", "spoolss.spoolss_JTEXP.ModelName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_val7_info7,
+         { "Info7", "spoolss.spoolss_PrinterInfo_val7.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_caFlags,
          { "Caflags", "spoolss.spoolss_PSDRVEXTRA400.caFlags", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_SHARED,
          { "Printer Enum Shared", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_SHARED", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_SHARED_tfs), ( 0x00000020 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_RouterReplyPrinterEx_handle,
          { "Handle", "spoolss.spoolss_RouterReplyPrinterEx.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrintProcessorInfo_info1,
-         { "Info1", "spoolss.spoolss_PrintProcessorInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_DEFAULT,
          { "Printer Enum Default", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_DEFAULT", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_DEFAULT_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver2_server_minor_version,
@@ -41728,8 +41761,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Devmode Collate", "spoolss.spoolss_DeviceModeFields.DEVMODE_COLLATE", FT_BOOLEAN, 32, TFS(&spoolss_DeviceModeFields_DEVMODE_COLLATE_tfs), ( 0x00008000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumMonitors_offered,
          { "Offered", "spoolss.spoolss_EnumMonitors.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_uniblob,
-         { "Uniblob", "spoolss.spoolss_DeviceModeExtraDataUniDriver.uniblob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_WritePrinter_handle,
          { "Handle", "spoolss.spoolss_WritePrinter.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_dwSignature,
@@ -41738,12 +41769,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Driver Path", "spoolss.spoolss_AddDriverInfo5.driver_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo5_portname,
          { "Portname", "spoolss.spoolss_SetPrinterInfo5.portname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_Field_field,
-         { "Field", "spoolss.spoolss_Field.field", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddDriverInfo_info2,
-         { "Info2", "spoolss.spoolss_AddDriverInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddMonitorInfo_info1,
-         { "Info1", "spoolss.spoolss_AddMonitorInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersionEx_major,
          { "Major", "spoolss.spoolss_OSVersionEx.major", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfo2_mui_dll,
@@ -41780,10 +41805,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Handle", "spoolss.spoolss_RouterRefreshPrinterChangeNotify.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobStatus_JOB_STATUS_COMPLETE,
          { "Job Status Complete", "spoolss.spoolss_JobStatus.JOB_STATUS_COMPLETE", FT_BOOLEAN, 32, TFS(&spoolss_JobStatus_JOB_STATUS_COMPLETE_tfs), ( 0x00001000 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddDriverInfo_info8,
-         { "Info8", "spoolss.spoolss_AddDriverInfo.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_collate,
          { "Collate", "spoolss.spoolss_DeviceMode.collate", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_DeviceModeCollate_vals), 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0301_unidrvextra3_4,
+         { "Unidrvextra3 4", "spoolss.spoolss_DeviceModeExtraDataUniDriver_val0x0301.unidrvextra3_4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeleteForm_form_name,
          { "Form Name", "spoolss.spoolss_DeleteForm.form_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_Time_day,
@@ -41792,8 +41817,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Directory Name", "spoolss.spoolss_DriverDirectoryInfo1.directory_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_start_time,
          { "Start Time", "spoolss.spoolss_SetJobInfo2.start_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_info6,
-         { "Info6", "spoolss.spoolss_PrinterInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_printprocessor,
          { "Printprocessor", "spoolss.spoolss_PrinterInfo2.printprocessor", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_dwWidthOffset,
@@ -41830,6 +41853,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Name", "spoolss.spoolss_PrinterInfo1.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_portname,
          { "Portname", "spoolss.spoolss_PortData2.portname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DocumentInfo_val1_info1,
+         { "Info1", "spoolss.spoolss_DocumentInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PORT,
          { "Printer Change Delete Port", "spoolss.spoolss_PrinterChangeFlags.PRINTER_CHANGE_DELETE_PORT", FT_BOOLEAN, 32, TFS(&spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PORT_tfs), ( 0x00400000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_OEM_DMEXTRA_dwSize,
@@ -41860,8 +41885,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Server Name", "spoolss.spoolss_SetJobInfo1.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_color,
          { "Color", "spoolss.spoolss_DeviceMode.color", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_DeviceModeColor_vals), 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_ReplyPrinterInfo_info0,
-         { "Info0", "spoolss.spoolss_ReplyPrinterInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_OFFLINE,
          { "Printer Status Offline", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_OFFLINE", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_OFFLINE_tfs), ( 0x00000080 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterData_needed,
@@ -41874,18 +41897,16 @@ void proto_register_dcerpc_spoolss(void)
          { "Buffer", "spoolss.spoolss_ReplyOpenPrinter.buffer", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AccessRights_SERVER_ACCESS_ADMINISTER,
          { "Server Access Administer", "spoolss.spoolss_AccessRights.SERVER_ACCESS_ADMINISTER", FT_BOOLEAN, 32, TFS(&spoolss_AccessRights_SERVER_ACCESS_ADMINISTER_tfs), ( 0x00000001 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_JobInfo_info1,
-         { "Info1", "spoolss.spoolss_JobInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrintProcessorDirectory_environment,
          { "Environment", "spoolss.spoolss_GetPrintProcessorDirectory.environment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_caReferenceWhite,
          { "Careferencewhite", "spoolss.spoolss_PSDRVEXTRA400.caReferenceWhite", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_MonitorContainer_info,
          { "Info", "spoolss.spoolss_MonitorContainer.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra400,
-         { "Psdrvextra400", "spoolss.spoolss_DeviceModeExtraDataPostScript.psdrvextra400", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo5_data_file,
          { "Data File", "spoolss.spoolss_DriverInfo5.data_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR_sd,
+         { "Sd", "spoolss.spoolss_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR.sd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo2_total_pages,
          { "Total Pages", "spoolss.spoolss_JobInfo2.total_pages", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo1_priority,
@@ -41922,8 +41943,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Status No Toner", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_NO_TONER", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_NO_TONER_tfs), ( 0x00040000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_dwOptions,
          { "Dwoptions", "spoolss.spoolss_PSDRVEXTRA.dwOptions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_NotifyData_time,
-         { "Time", "spoolss.spoolss_NotifyData.time", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinter_devmode_ctr,
          { "Devmode Ctr", "spoolss.spoolss_AddPrinter.devmode_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_caFlags,
@@ -41936,6 +41955,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Parameters", "spoolss.spoolss_SetJobInfo2.parameters", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_ENABLE_DEVQ,
          { "Printer Attribute Enable Devq", "spoolss.spoolss_PrinterAttributes.PRINTER_ATTRIBUTE_ENABLE_DEVQ", FT_BOOLEAN, 32, TFS(&spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_ENABLE_DEVQ_tfs), ( 0x00000080 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_val3_info3,
+         { "Info3", "spoolss.spoolss_DriverInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPorts_info,
          { "Info", "spoolss.spoolss_EnumPorts.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_paperlength,
@@ -41952,14 +41973,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Data File", "spoolss.spoolss_AddDriverInfo2.data_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_specversion,
          { "Specversion", "spoolss.spoolss_DeviceMode.specversion", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_DeviceModeSpecVersion_vals), 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PortInfo_info2,
-         { "Info2", "spoolss.spoolss_PortInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON1,
          { "Printer Enum Icon1", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_ICON1", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON1_tfs), ( 0x00010000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_WritePrinter__data_size,
          { " Data Size", "spoolss.spoolss_WritePrinter._data_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_PrintPropertyValueUnion_propertyBlob,
-         { "Propertyblob", "spoolss.RPC_PrintPropertyValueUnion.propertyBlob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_SANDBOX_ENABLED,
          { "Printer Driver Sandbox Enabled", "spoolss.spoolss_DriverAttributes.PRINTER_DRIVER_SANDBOX_ENABLED", FT_BOOLEAN, 32, TFS(&spoolss_DriverAttributes_PRINTER_DRIVER_SANDBOX_ENABLED_tfs), ( 0x00000004 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_GetCorePrinterDrivers_core_printer_drivers,
@@ -41986,6 +42003,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Defaultpriority", "spoolss.spoolss_SetPrinterInfo2.defaultpriority", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_printername,
          { "Printername", "spoolss.spoolss_PrinterInfo0.printername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddFormInfo_val2_info2,
+         { "Info2", "spoolss.spoolss_AddFormInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcDataTypes_offered,
          { "Offered", "spoolss._spoolss_EnumPrintProcDataTypes.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_dwNupDirection,
@@ -42000,6 +42019,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Status", "spoolss.spoolss_PrinterInfo2.status", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetForm_info_,
          { "Subcontext length", "spoolss.spoolss_GetForm.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPortInfo_val0xff_infoFF,
+         { "Infoff", "spoolss.spoolss_SetPortInfo_val0xff.infoFF", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_wChecksum,
          { "Wchecksum", "spoolss.spoolss_PSDRVEXTRA400.wChecksum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_PrintNamedProperty_propertyName,