DCERPC: regenerate dissector after change on generator

Fix mapi/nspi/rfc dissector
Don't forget when regenerate to go on mapi/nspi/rfc and use make for regenerate

Change-Id: I74b98bf84e7786f51d4f693379186b289913ca1b
Reviewed-on: https://code.wireshark.org/review/11476
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

6 files changed, 760 insertions, 749 deletions

diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c
index 1d0af2a8c1..e6d26090b3 100644
--- a/epan/dissectors/packet-dcerpc-mapi.c
+++ b/epan/dissectors/packet-dcerpc-mapi.c
@@ -5,7 +5,7 @@
 	Pidl is a perl based IDL compiler for DCE/RPC idl files.
 	It is maintained by the Samba team, not the Wireshark team.
 	Instructions on how to download and install Pidl can be
-	found at http://wiki.wireshark.org/Pidl
+	found at https://wiki.wireshark.org/Pidl
 */
 
 
@@ -54,118 +54,118 @@ static gint ett_mapi_EcDoRpc_MAPI_REPL_UNION = -1;
 
 
 /* Header field declarations */
+static gint hf_mapi_DATA_BLOB_data = -1;
+static gint hf_mapi_DATA_BLOB_length = -1;
+static gint hf_mapi_EcDoConnect_alloc_space = -1;
+static gint hf_mapi_EcDoConnect_code_page = -1;
+static gint hf_mapi_EcDoConnect_emsmdb_client_version = -1;
+static gint hf_mapi_EcDoConnect_input_locale = -1;
+static gint hf_mapi_EcDoConnect_name = -1;
+static gint hf_mapi_EcDoConnect_org_group = -1;
+static gint hf_mapi_EcDoConnect_session_nb = -1;
+static gint hf_mapi_EcDoConnect_store_version = -1;
 static gint hf_mapi_EcDoConnect_unknown1 = -1;
-static gint hf_mapi_SPropValue_CTR_i = -1;
+static gint hf_mapi_EcDoConnect_unknown2 = -1;
+static gint hf_mapi_EcDoConnect_unknown3 = -1;
+static gint hf_mapi_EcDoConnect_unknown4 = -1;
+static gint hf_mapi_EcDoConnect_user = -1;
+static gint hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps = -1;
+static gint hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder = -1;
+static gint hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_Release = -1;
+static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps = -1;
+static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder = -1;
+static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore = -1;
+static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_Release = -1;
+static gint hf_mapi_EcDoRpc_codepage = -1;
+static gint hf_mapi_EcDoRpc_folder_id = -1;
+static gint hf_mapi_EcDoRpc_handle_index = -1;
+static gint hf_mapi_EcDoRpc_layout = -1;
+static gint hf_mapi_EcDoRpc_length = -1;
+static gint hf_mapi_EcDoRpc_mailbox = -1;
+static gint hf_mapi_EcDoRpc_mapi_flags = -1;
+static gint hf_mapi_EcDoRpc_mapi_request = -1;
 static gint hf_mapi_EcDoRpc_mapi_request_ = -1;
+static gint hf_mapi_EcDoRpc_mapi_response = -1;
 static gint hf_mapi_EcDoRpc_mapi_response_ = -1;
-static gint hf_mapi_EcDoConnect_emsmdb_client_version = -1;
-static gint hf_mapi_EcDoConnect_name = -1;
-static gint hf_mapi_SPropValue_CTR_lpszW = -1;
+static gint hf_mapi_EcDoRpc_mapi_tag = -1;
+static gint hf_mapi_EcDoRpc_max_data = -1;
 static gint hf_mapi_EcDoRpc_offset = -1;
-static gint hf_mapi_EcDoConnect_alloc_space = -1;
-static gint hf_mapi_ulEventType_fnevCriticalError = -1;
-static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder = -1;
-static gint hf_mapi_SRow_ulRowFlags = -1;
+static gint hf_mapi_EcDoRpc_padding = -1;
+static gint hf_mapi_EcDoRpc_prop_count = -1;
+static gint hf_mapi_EcDoRpc_row = -1;
+static gint hf_mapi_EcDoRpc_size = -1;
+static gint hf_mapi_EcDoRpc_str_length = -1;
+static gint hf_mapi_EcDoRpc_subcontext_size = -1;
+static gint hf_mapi_EcDoRpc_unknown1 = -1;
+static gint hf_mapi_EcDoRpc_unknown2 = -1;
+static gint hf_mapi_EcDoRpc_unknown3 = -1;
+static gint hf_mapi_EcRRegisterPushNotification_notif_len = -1;
 static gint hf_mapi_EcRRegisterPushNotification_notifkey = -1;
-static gint hf_mapi_EcRUnregisterPushNotification_unknown = -1;
-static gint hf_mapi_EcDoRpc_codepage = -1;
-static gint hf_mapi_recipients_headers_username = -1;
-static gint hf_mapi_mapi_request_mapi_req = -1;
 static gint hf_mapi_EcRRegisterPushNotification_retval = -1;
-static gint hf_mapi_ulEventType_fnevObjectDeleted = -1;
-static gint hf_mapi_SPropValue_CTR_lpszA = -1;
-static gint hf_mapi_DATA_BLOB_data = -1;
-static gint hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps = -1;
-static gint hf_mapi_recipient_type_SMTP = -1;
 static gint hf_mapi_EcRRegisterPushNotification_sockaddr = -1;
-static gint hf_mapi_LPSTR_lppszA = -1;
-static gint hf_mapi_EcDoRpc_max_data = -1;
-static gint hf_mapi_OpenMessage_recipients_codepage = -1;
-static gint hf_mapi_ulEventType_fnevObjectCopied = -1;
+static gint hf_mapi_EcRRegisterPushNotification_sockaddr_len = -1;
+static gint hf_mapi_EcRRegisterPushNotification_ulEventMask = -1;
 static gint hf_mapi_EcRRegisterPushNotification_unknown2 = -1;
-static gint hf_mapi_recipients_headers_prop_count = -1;
-static gint hf_mapi_recipients_headers_bitmask = -1;
+static gint hf_mapi_EcRUnregisterPushNotification_unknown = -1;
+static gint hf_mapi_FILETIME_dwHighDateTime = -1;
 static gint hf_mapi_FILETIME_dwLowDateTime = -1;
-static gint hf_mapi_EcDoRpc_unknown3 = -1;
+static gint hf_mapi_LPSTR_lppszA = -1;
 static gint hf_mapi_MAPISTATUS_status = -1;
-static gint hf_mapi_recipient_type_EXCHANGE = -1;
-static gint hf_mapi_SPropValue_CTR_lpguid = -1;
-static gint hf_mapi_EcDoConnect_unknown2 = -1;
-static gint hf_mapi_ulEventType_fnevSearchComplete = -1;
+static gint hf_mapi_MAPI_OPNUM = -1;
+static gint hf_mapi_MAPI_handle = -1;
+static gint hf_mapi_OpenMessage_recipients_RecipClass = -1;
+static gint hf_mapi_OpenMessage_recipients_codepage = -1;
+static gint hf_mapi_OpenMessage_recipients_recipients_headers = -1;
 static gint hf_mapi_OpenMessage_recipients_recipients_headers_ = -1;
-static gint hf_mapi_ulEventType_fnevStatusObjectModified = -1;
-static gint hf_mapi_ulEventType_fnevObjectCreated = -1;
+static gint hf_mapi_OpenMessage_req_folder_handle_idx = -1;
+static gint hf_mapi_OpenMessage_req_folder_id = -1;
 static gint hf_mapi_OpenMessage_req_max_data = -1;
-static gint hf_mapi_DATA_BLOB_length = -1;
-static gint hf_mapi_EcDoConnect_input_locale = -1;
+static gint hf_mapi_OpenMessage_req_message_id = -1;
+static gint hf_mapi_OpenMessage_req_message_permissions = -1;
 static gint hf_mapi_RecipExchange_addr_type = -1;
-static gint hf_mapi_EcDoRpc_mapi_request = -1;
-static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_Release = -1;
-static gint hf_mapi_EcDoRpc_layout = -1;
-static gint hf_mapi_decrypted_data = -1;
-static gint hf_mapi_ulEventType_fnevNewMail = -1;
-static gint hf_mapi_EcDoRpc_mapi_tag = -1;
-static gint hf_mapi_EcDoRpc_mapi_flags = -1;
-static gint hf_mapi_SPropValue_CTR_b = -1;
-static gint hf_mapi_mapi_response_mapi_repl = -1;
-static gint hf_mapi_EcDoRpc_prop_count = -1;
-static gint hf_mapi_recipients_headers_layout = -1;
-static gint hf_mapi_EcDoRpc_length = -1;
 static gint hf_mapi_RecipExchange_organization_length = -1;
-static gint hf_mapi_EcDoRpc_unknown2 = -1;
-static gint hf_mapi_EcDoRpc_handle_index = -1;
-static gint hf_mapi_OpenMessage_recipients_recipients_headers = -1;
-static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps = -1;
+static gint hf_mapi_SPropValue_CTR_b = -1;
+static gint hf_mapi_SPropValue_CTR_d = -1;
 static gint hf_mapi_SPropValue_CTR_dbl = -1;
-static gint hf_mapi_OpenMessage_req_message_id = -1;
-static gint hf_mapi_EcDoRpc_size = -1;
-static gint hf_mapi_EcDoConnect_session_nb = -1;
-static gint hf_mapi_MAPI_handle = -1;
-static gint hf_mapi_pdu_len = -1;
+static gint hf_mapi_SPropValue_CTR_err = -1;
 static gint hf_mapi_SPropValue_CTR_ft = -1;
-static gint hf_mapi_SPropValue_ulPropTag = -1;
-static gint hf_mapi_OpenMessage_recipients_RecipClass = -1;
-static gint hf_mapi_EcRRegisterPushNotification_ulEventMask = -1;
-static gint hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder = -1;
-static gint hf_mapi_EcDoRpc_unknown1 = -1;
-static gint hf_mapi_FILETIME_dwHighDateTime = -1;
-static gint hf_mapi_OpenMessage_req_message_permissions = -1;
-static gint hf_mapi_EcDoRpc_padding = -1;
-static gint hf_mapi_ulEventType_fnevReservedForMapi = -1;
+static gint hf_mapi_SPropValue_CTR_i = -1;
 static gint hf_mapi_SPropValue_CTR_l = -1;
-static gint hf_mapi_EcDoConnect_user = -1;
-static gint hf_mapi_EcDoConnect_unknown4 = -1;
-static gint hf_mapi_EcDoRpc_folder_id = -1;
-static gint hf_mapi_MAPI_OPNUM = -1;
-static gint hf_mapi_EcDoConnect_code_page = -1;
+static gint hf_mapi_SPropValue_CTR_lpguid = -1;
+static gint hf_mapi_SPropValue_CTR_lpszA = -1;
+static gint hf_mapi_SPropValue_CTR_lpszW = -1;
+static gint hf_mapi_SPropValue_ulPropTag = -1;
+static gint hf_mapi_SRow_ulRowFlags = -1;
+static gint hf_mapi_decrypted_data = -1;
 static gint hf_mapi_handle = -1;
-static gint hf_mapi_input_locale_method = -1;
 static gint hf_mapi_input_locale_language = -1;
-static gint hf_mapi_EcDoRpc_mapi_response = -1;
-static gint hf_mapi_EcDoConnect_store_version = -1;
-static gint hf_mapi_ulEventType_fnevObjectMoved = -1;
-static gint hf_mapi_SPropValue_CTR_err = -1;
-static gint hf_mapi_ulEventType_fnevTableModified = -1;
-static gint hf_mapi_recipient_type = -1;
-static gint hf_mapi_ulEventType_fnevExtended = -1;
-static gint hf_mapi_recipients_headers_prop_values = -1;
-static gint hf_mapi_EcDoRpc_subcontext_size = -1;
+static gint hf_mapi_input_locale_method = -1;
+static gint hf_mapi_mapi_request_mapi_req = -1;
+static gint hf_mapi_mapi_response_mapi_repl = -1;
 static gint hf_mapi_opnum = -1;
-static gint hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_Release = -1;
-static gint hf_mapi_EcDoRpc_row = -1;
+static gint hf_mapi_pdu_len = -1;
 static gint hf_mapi_property_types = -1;
-static gint hf_mapi_EcDoRpc_str_length = -1;
 static gint hf_mapi_recipient_displayname_7bit_lpszA = -1;
-static gint hf_mapi_EcRRegisterPushNotification_sockaddr_len = -1;
-static gint hf_mapi_EcDoRpc_mailbox = -1;
-static gint hf_mapi_EcRRegisterPushNotification_notif_len = -1;
-static gint hf_mapi_EcDoConnect_unknown3 = -1;
-static gint hf_mapi_OpenMessage_req_folder_handle_idx = -1;
-static gint hf_mapi_SPropValue_CTR_d = -1;
-static gint hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore = -1;
-static gint hf_mapi_EcDoConnect_org_group = -1;
-static gint hf_mapi_OpenMessage_req_folder_id = -1;
+static gint hf_mapi_recipient_type = -1;
+static gint hf_mapi_recipient_type_EXCHANGE = -1;
+static gint hf_mapi_recipient_type_SMTP = -1;
+static gint hf_mapi_recipients_headers_bitmask = -1;
+static gint hf_mapi_recipients_headers_layout = -1;
+static gint hf_mapi_recipients_headers_prop_count = -1;
+static gint hf_mapi_recipients_headers_prop_values = -1;
+static gint hf_mapi_recipients_headers_username = -1;
+static gint hf_mapi_ulEventType_fnevCriticalError = -1;
+static gint hf_mapi_ulEventType_fnevExtended = -1;
+static gint hf_mapi_ulEventType_fnevNewMail = -1;
+static gint hf_mapi_ulEventType_fnevObjectCopied = -1;
+static gint hf_mapi_ulEventType_fnevObjectCreated = -1;
+static gint hf_mapi_ulEventType_fnevObjectDeleted = -1;
 static gint hf_mapi_ulEventType_fnevObjectModified = -1;
+static gint hf_mapi_ulEventType_fnevObjectMoved = -1;
+static gint hf_mapi_ulEventType_fnevReservedForMapi = -1;
+static gint hf_mapi_ulEventType_fnevSearchComplete = -1;
+static gint hf_mapi_ulEventType_fnevStatusObjectModified = -1;
+static gint hf_mapi_ulEventType_fnevTableModified = -1;
 
 static gint proto_dcerpc_mapi = -1;
 /* Version information */
@@ -3794,7 +3794,7 @@ static int mapi_dissect_element_SPropValue_CTR_lpszA(tvbuff_t *tvb _U_, int offs
 static int mapi_dissect_element_SPropValue_CTR_lpszW(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int mapi_dissect_element_SPropValue_CTR_ft(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int mapi_dissect_element_SPropValue_CTR_lpguid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
-static int mapi_dissect_element_SPropValue_ulPropTag(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint32 *ulPropTag);
+static int mapi_dissect_element_SPropValue_ulPropTag(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int mapi_dissect_element_SPropValue_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 const value_string mapi_ulRowFlags_vals[] = {
 	{ ROW_ADD, "ROW_ADD" },
@@ -7749,12 +7749,12 @@ int
 mapi_dissect_enum_MAPITAGS(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
 	guint32 parameter=0;
-	if(param){
-		parameter=(guint32)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -7838,12 +7838,12 @@ int
 mapi_dissect_enum_MAPISTATUS(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
 	guint32 parameter=0;
-	if(param){
-		parameter=(guint32)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -7893,7 +7893,7 @@ mapi_dissect_struct_DATA_BLOB(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_mapi_DATA_BLOB);
 	}
-	
+
 	offset = mapi_dissect_element_DATA_BLOB_data(tvb, offset, pinfo, tree, di, drep);
 
 	offset = mapi_dissect_element_DATA_BLOB_length(tvb, offset, pinfo, tree, di, drep);
@@ -7946,7 +7946,7 @@ mapi_dissect_struct_input_locale(tvbuff_t *tvb _U_, int offset _U_, packet_info
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_mapi_input_locale);
 	}
-	
+
 	offset = mapi_dissect_element_input_locale_language(tvb, offset, pinfo, tree, di, drep);
 
 	offset = mapi_dissect_element_input_locale_method(tvb, offset, pinfo, tree, di, drep);
@@ -7982,12 +7982,12 @@ int
 mapi_dissect_enum_MAPI_OBJTYPE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint8 *param _U_)
 {
 	guint8 parameter=0;
-	if(param){
-		parameter=(guint8)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -8020,12 +8020,12 @@ int
 mapi_dissect_enum_ACLRIGHTS(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
 	guint32 parameter=0;
-	if(param){
-		parameter=(guint32)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -8093,12 +8093,12 @@ int
 mapi_dissect_enum_MAPI_OPNUM(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint8 *param _U_)
 {
 	guint8 parameter=0;
-	if(param){
-		parameter=(guint8)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -8140,7 +8140,7 @@ mapi_dissect_struct_FILETIME(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_mapi_FILETIME);
 	}
-	
+
 	offset = mapi_dissect_element_FILETIME_dwLowDateTime(tvb, offset, pinfo, tree, di, drep);
 
 	offset = mapi_dissect_element_FILETIME_dwHighDateTime(tvb, offset, pinfo, tree, di, drep);
@@ -8190,7 +8190,7 @@ mapi_dissect_struct_LPSTR(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_mapi_LPSTR);
 	}
-	
+
 	offset = mapi_dissect_element_LPSTR_lppszA(tvb, offset, pinfo, tree, di, drep);
 
 
@@ -8254,12 +8254,12 @@ int
 mapi_dissect_enum_property_types(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
 	guint32 parameter=0;
-	if(param){
-		parameter=(guint32)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -8272,8 +8272,8 @@ mapi_dissect_enum_property_types(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: [case(PT_ERROR)] [case(PT_ERROR)] uint32 err; */
 /* IDL: [case(PT_BOOLEAN)] [case(PT_BOOLEAN)] uint8 b; */
 /* IDL: [case(PT_I8)] [case(PT_I8)] dlong d; */
-/* IDL: [case(PT_STRING8)] [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] [case(PT_STRING8)] string lpszA; */
-/* IDL: [case(PT_UNICODE)] [flag(LIBNDR_FLAG_STR_NULLTERM)] [case(PT_UNICODE)] string lpszW; */
+/* IDL: [case(PT_STRING8)] [case(PT_STRING8)] [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] string lpszA; */
+/* IDL: [case(PT_UNICODE)] [case(PT_UNICODE)] [flag(LIBNDR_FLAG_STR_NULLTERM)] string lpszW; */
 /* IDL: [case(PT_SYSTIME)] [case(PT_SYSTIME)] FILETIME ft; */
 /* IDL: [case(PT_CLSID)] [case(PT_CLSID)] GUID lpguid; */
 /* IDL: } */
@@ -8427,9 +8427,9 @@ mapi_dissect_SPropValue_CTR(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 /* IDL: } */
 
 static int
-mapi_dissect_element_SPropValue_ulPropTag(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint32 *ulPropTag)
+mapi_dissect_element_SPropValue_ulPropTag(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
-	offset = mapi_dissect_enum_MAPITAGS(tvb, offset, pinfo, tree, di, drep, hf_mapi_SPropValue_ulPropTag, ulPropTag);
+	offset = mapi_dissect_enum_MAPITAGS(tvb, offset, pinfo, tree, di, drep, hf_mapi_SPropValue_ulPropTag, 0);
 
 	return offset;
 }
@@ -8445,11 +8445,12 @@ mapi_dissect_element_SPropValue_value(tvbuff_t *tvb _U_, int offset _U_, packet_
 int
 mapi_dissect_struct_SPropValue(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-	guint32 ulPropTag = 0;
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
+	gboolean oldalign = di->no_align;
 	int old_offset;
 
+	di->no_align = TRUE;
 
 	old_offset = offset;
 
@@ -8457,8 +8458,8 @@ mapi_dissect_struct_SPropValue(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_mapi_SPropValue);
 	}
-	
-	offset = mapi_dissect_element_SPropValue_ulPropTag(tvb, offset, pinfo, tree, di, drep, &ulPropTag);
+
+	offset = mapi_dissect_element_SPropValue_ulPropTag(tvb, offset, pinfo, tree, di, drep);
 
 	offset = mapi_dissect_element_SPropValue_value(tvb, offset, pinfo, tree, di, drep);
 
@@ -8466,9 +8467,7 @@ mapi_dissect_struct_SPropValue(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 	proto_item_set_len(item, offset-old_offset);
 
 
-	if (di->call_data->flags & DCERPC_IS_NDR64) {
-		ALIGN_TO_4_BYTES;
-	}
+	di->no_align = oldalign;
 
 	return offset;
 }
@@ -8496,12 +8495,12 @@ int
 mapi_dissect_enum_ulRowFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint8 *param _U_)
 {
 	guint8 parameter=0;
-	if(param){
-		parameter=(guint8)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -8524,8 +8523,10 @@ mapi_dissect_struct_SRow(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
 {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
+	gboolean oldalign = di->no_align;
 	int old_offset;
 
+	di->no_align = TRUE;
 
 	old_offset = offset;
 
@@ -8533,13 +8534,15 @@ mapi_dissect_struct_SRow(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_mapi_SRow);
 	}
-	
+
 	offset = mapi_dissect_element_SRow_ulRowFlags(tvb, offset, pinfo, tree, di, drep);
 
 
 	proto_item_set_len(item, offset-old_offset);
 
 
+	di->no_align = oldalign;
+
 	return offset;
 }
 
@@ -8558,19 +8561,23 @@ int
 mapi_dissect_struct_Release_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
 	proto_item *item = NULL;
+	gboolean oldalign = di->no_align;
 	int old_offset;
 
+	di->no_align = TRUE;
 
 	old_offset = offset;
 
 	if (parent_tree) {
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 	}
-	
+
 
 	proto_item_set_len(item, offset-old_offset);
 
 
+	di->no_align = oldalign;
+
 	return offset;
 }
 
@@ -8582,19 +8589,23 @@ int
 mapi_dissect_struct_Release_repl(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
 	proto_item *item = NULL;
+	gboolean oldalign = di->no_align;
 	int old_offset;
 
+	di->no_align = TRUE;
 
 	old_offset = offset;
 
 	if (parent_tree) {
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 	}
-	
+
 
 	proto_item_set_len(item, offset-old_offset);
 
 
+	di->no_align = oldalign;
+
 	return offset;
 }
 
@@ -8664,8 +8675,10 @@ mapi_dissect_struct_OpenMessage_req(tvbuff_t *tvb _U_, int offset _U_, packet_in
 {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
+	gboolean oldalign = di->no_align;
 	int old_offset;
 
+	di->no_align = TRUE;
 
 	old_offset = offset;
 
@@ -8673,7 +8686,7 @@ mapi_dissect_struct_OpenMessage_req(tvbuff_t *tvb _U_, int offset _U_, packet_in
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_mapi_OpenMessage_req);
 	}
-	
+
 	offset = mapi_dissect_element_OpenMessage_req_folder_handle_idx(tvb, offset, pinfo, tree, di, drep);
 
 	offset = mapi_dissect_element_OpenMessage_req_max_data(tvb, offset, pinfo, tree, di, drep);
@@ -8688,9 +8701,7 @@ mapi_dissect_struct_OpenMessage_req(tvbuff_t *tvb _U_, int offset _U_, packet_in
 	proto_item_set_len(item, offset-old_offset);
 
 
-	if (di->call_data->flags & DCERPC_IS_NDR64) {
-		ALIGN_TO_8_BYTES;
-	}
+	di->no_align = oldalign;
 
 	return offset;
 }
@@ -8709,12 +8720,12 @@ int
 mapi_dissect_enum_CODEPAGEID(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
 	guint32 parameter=0;
-	if(param){
-		parameter=(guint32)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -8731,12 +8742,12 @@ int
 mapi_dissect_enum_ulRecipClass(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint8 *param _U_)
 {
 	guint8 parameter=0;
-	if(param){
-		parameter=(guint8)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -8751,12 +8762,12 @@ int
 mapi_dissect_enum_addr_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint8 *param _U_)
 {
 	guint8 parameter=0;
-	if(param){
-		parameter=(guint8)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -8788,8 +8799,10 @@ mapi_dissect_struct_RecipExchange(tvbuff_t *tvb _U_, int offset _U_, packet_info
 {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
+	gboolean oldalign = di->no_align;
 	int old_offset;
 
+	di->no_align = TRUE;
 
 	old_offset = offset;
 
@@ -8797,7 +8810,7 @@ mapi_dissect_struct_RecipExchange(tvbuff_t *tvb _U_, int offset _U_, packet_info
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_mapi_RecipExchange);
 	}
-	
+
 	offset = mapi_dissect_element_RecipExchange_organization_length(tvb, offset, pinfo, tree, di, drep);
 
 	offset = mapi_dissect_element_RecipExchange_addr_type(tvb, offset, pinfo, tree, di, drep);
@@ -8806,6 +8819,8 @@ mapi_dissect_struct_RecipExchange(tvbuff_t *tvb _U_, int offset _U_, packet_info
 	proto_item_set_len(item, offset-old_offset);
 
 
+	di->no_align = oldalign;
+
 	return offset;
 }
 
@@ -8817,19 +8832,23 @@ int
 mapi_dissect_struct_RecipSMTP(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
 	proto_item *item = NULL;
+	gboolean oldalign = di->no_align;
 	int old_offset;
 
+	di->no_align = TRUE;
 
 	old_offset = offset;
 
 	if (parent_tree) {
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 	}
-	
+
 
 	proto_item_set_len(item, offset-old_offset);
 
 
+	di->no_align = oldalign;
+
 	return offset;
 }
 
@@ -8843,12 +8862,12 @@ int
 mapi_dissect_enum_OM_recipient_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint16 *param _U_)
 {
 	guint16 parameter=0;
-	if(param){
-		parameter=(guint16)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -8916,19 +8935,19 @@ int
 mapi_dissect_enum_OM_recipient_displayname_7bit(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint16 *param _U_)
 {
 	guint16 parameter=0;
-	if(param){
-		parameter=(guint16)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
 
 
 /* IDL: [flag(LIBNDR_FLAG_NOALIGN)] [switch_type(OM_recipient_displayname_7bit)] union { */
-/* IDL: [case(0x400)] [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] [case(0x400)] string lpszA; */
+/* IDL: [case(0x400)] [case(0x400)] [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] string lpszA; */
 /* IDL: [default] ; */
 /* IDL: } */
 
@@ -9032,8 +9051,10 @@ mapi_dissect_struct_recipients_headers(tvbuff_t *tvb _U_, int offset _U_, packet
 {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
+	gboolean oldalign = di->no_align;
 	int old_offset;
 
+	di->no_align = TRUE;
 
 	old_offset = offset;
 
@@ -9041,7 +9062,7 @@ mapi_dissect_struct_recipients_headers(tvbuff_t *tvb _U_, int offset _U_, packet
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_mapi_recipients_headers);
 	}
-	
+
 	offset = mapi_dissect_element_recipients_headers_bitmask(tvb, offset, pinfo, tree, di, drep);
 
 	offset = mapi_dissect_element_recipients_headers_type(tvb, offset, pinfo, tree, di, drep);
@@ -9058,9 +9079,7 @@ mapi_dissect_struct_recipients_headers(tvbuff_t *tvb _U_, int offset _U_, packet
 	proto_item_set_len(item, offset-old_offset);
 
 
-	if (di->call_data->flags & DCERPC_IS_NDR64) {
-		ALIGN_TO_4_BYTES;
-	}
+	di->no_align = oldalign;
 
 	return offset;
 }
@@ -9121,8 +9140,10 @@ mapi_dissect_struct_OpenMessage_recipients(tvbuff_t *tvb _U_, int offset _U_, pa
 {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
+	gboolean oldalign = di->no_align;
 	int old_offset;
 
+	di->no_align = TRUE;
 
 	old_offset = offset;
 
@@ -9130,7 +9151,7 @@ mapi_dissect_struct_OpenMessage_recipients(tvbuff_t *tvb _U_, int offset _U_, pa
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_mapi_OpenMessage_recipients);
 	}
-	
+
 	offset = mapi_dissect_element_OpenMessage_recipients_RecipClass(tvb, offset, pinfo, tree, di, drep);
 
 	offset = mapi_dissect_element_OpenMessage_recipients_codepage(tvb, offset, pinfo, tree, di, drep);
@@ -9141,9 +9162,7 @@ mapi_dissect_struct_OpenMessage_recipients(tvbuff_t *tvb _U_, int offset _U_, pa
 	proto_item_set_len(item, offset-old_offset);
 
 
-	if (di->call_data->flags & DCERPC_IS_NDR64) {
-		ALIGN_TO_4_BYTES;
-	}
+	di->no_align = oldalign;
 
 	return offset;
 }
@@ -9314,7 +9333,7 @@ mapi_dissect_bitmap_ulEventType(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 /* IDL: 	uint32 padding; */
 /* IDL: 	uint8 row; */
 /* IDL: 	uint16 mailbox_str_size; */
-/* IDL: 	[unique(1)] [charset(DOS)] uint8 *mailbox; */
+/* IDL: 	[charset(DOS)] [unique(1)] uint8 *mailbox; */
 /* IDL: } */
 
 
@@ -9597,11 +9616,11 @@ mapi_dissect_element_EcDoConnect_alloc_space_(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: [in] uint16 unknown3, */
 /* IDL: [out] uint32 unknown4[3], */
 /* IDL: [out] [ref] uint16 *session_nb, */
-/* IDL: [unique(1)] [out] uint8 *org_group, */
-/* IDL: [unique(1)] [out] uint8 *user, */
+/* IDL: [out] [unique(1)] uint8 *org_group, */
+/* IDL: [out] [unique(1)] uint8 *user, */
 /* IDL: [out] uint16 store_version[3], */
-/* IDL: [out] [in] uint16 emsmdb_client_version[3], */
-/* IDL: [out] [ref] [in] uint32 *alloc_space */
+/* IDL: [in] [out] uint16 emsmdb_client_version[3], */
+/* IDL: [in] [out] [ref] uint32 *alloc_space */
 /* IDL: ); */
 
 static int
@@ -9681,7 +9700,7 @@ mapi_dissect_element_EcDoDisconnect_handle_(tvbuff_t *tvb _U_, int offset _U_, p
 }
 
 /* IDL: MAPISTATUS EcDoDisconnect( */
-/* IDL: [out] [ref] [in] policy_handle *handle */
+/* IDL: [in] [out] [ref] policy_handle *handle */
 /* IDL: ); */
 
 static int
@@ -9766,12 +9785,12 @@ mapi_dissect_element_EcDoRpc_max_data(tvbuff_t *tvb _U_, int offset _U_, packet_
 }
 
 /* IDL: MAPISTATUS EcDoRpc( */
-/* IDL: [out] [ref] [in] policy_handle *handle, */
-/* IDL: [out] [in] uint32 size, */
-/* IDL: [out] [in] uint32 offset, */
-/* IDL: [ref] [subcontext(4)] [in] [flag(LIBNDR_FLAG_REMAINING|LIBNDR_FLAG_NOALIGN)] mapi_request *mapi_request, */
-/* IDL: [out] [ref] [subcontext(4)] [flag(LIBNDR_FLAG_REMAINING|LIBNDR_FLAG_NOALIGN)] mapi_response *mapi_response, */
-/* IDL: [out] [ref] [in] uint16 *length, */
+/* IDL: [in] [out] [ref] policy_handle *handle, */
+/* IDL: [in] [out] uint32 size, */
+/* IDL: [in] [out] uint32 offset, */
+/* IDL: [flag(LIBNDR_FLAG_REMAINING|LIBNDR_FLAG_NOALIGN)] [in] [ref] [subcontext(4)] mapi_request *mapi_request, */
+/* IDL: [flag(LIBNDR_FLAG_REMAINING|LIBNDR_FLAG_NOALIGN)] [out] [ref] [subcontext(4)] mapi_response *mapi_response, */
+/* IDL: [in] [out] [ref] uint16 *length, */
 /* IDL: [in] uint16 max_data */
 /* IDL: ); */
 
@@ -9937,7 +9956,7 @@ mapi_dissect_element_EcRRegisterPushNotification_retval_(tvbuff_t *tvb _U_, int
 }
 
 /* IDL: MAPISTATUS EcRRegisterPushNotification( */
-/* IDL: [out] [ref] [in] policy_handle *handle, */
+/* IDL: [in] [out] [ref] policy_handle *handle, */
 /* IDL: [in] ulEventType ulEventMask, */
 /* IDL: [in] [size_is(notif_len)] uint8 notifkey[*], */
 /* IDL: [in] uint16 notif_len, */
@@ -10022,7 +10041,7 @@ mapi_dissect_element_EcRUnregisterPushNotification_unknown_(tvbuff_t *tvb _U_, i
 }
 
 /* IDL: MAPISTATUS EcRUnregisterPushNotification( */
-/* IDL: [out] [ref] [in] policy_handle *handle, */
+/* IDL: [in] [out] [ref] policy_handle *handle, */
 /* IDL: [in] uint32 unknown[2] */
 /* IDL: ); */
 
@@ -10153,230 +10172,230 @@ static dcerpc_sub_dissector mapi_dissectors[] = {
 void proto_register_dcerpc_mapi(void)
 {
 	static hf_register_info hf[] = {
+	{ &hf_mapi_DATA_BLOB_data,
+		{ "Data", "mapi.DATA_BLOB.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_DATA_BLOB_length,
+		{ "Length", "mapi.DATA_BLOB.length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoConnect_alloc_space,
+		{ "Alloc Space", "mapi.EcDoConnect.alloc_space", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoConnect_code_page,
+		{ "Code Page", "mapi.EcDoConnect.code_page", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoConnect_emsmdb_client_version,
+		{ "Emsmdb Client Version", "mapi.EcDoConnect.emsmdb_client_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoConnect_input_locale,
+		{ "Input Locale", "mapi.EcDoConnect.input_locale", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoConnect_name,
+		{ "Name", "mapi.EcDoConnect.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoConnect_org_group,
+		{ "Org Group", "mapi.EcDoConnect.org_group", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoConnect_session_nb,
+		{ "Session Nb", "mapi.EcDoConnect.session_nb", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoConnect_store_version,
+		{ "Store Version", "mapi.EcDoConnect.store_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_unknown1,
 		{ "Unknown1", "mapi.EcDoConnect.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_SPropValue_CTR_i,
-		{ "I", "mapi.SPropValue_CTR.i", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoConnect_unknown2,
+		{ "Unknown2", "mapi.EcDoConnect.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoConnect_unknown3,
+		{ "Unknown3", "mapi.EcDoConnect.unknown3", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoConnect_unknown4,
+		{ "Unknown4", "mapi.EcDoConnect.unknown4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoConnect_user,
+		{ "User", "mapi.EcDoConnect.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps,
+		{ "Mapi Getprops", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_GetProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder,
+		{ "Mapi Openfolder", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_OpenFolder", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_Release,
+		{ "Mapi Release", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_Release", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps,
+		{ "Mapi Getprops", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_GetProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder,
+		{ "Mapi Openfolder", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_OpenFolder", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore,
+		{ "Mapi Openmsgstore", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_OpenMsgStore", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_Release,
+		{ "Mapi Release", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_Release", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_codepage,
+		{ "Codepage", "mapi.EcDoRpc.codepage", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_folder_id,
+		{ "Folder ID", "mapi.EcDoRpc.folder_id", FT_UINT64, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_handle_index,
+		{ "Handle index", "mapi.EcDoRpc.handle_index", FT_UINT8, BASE_DEC, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_layout,
+		{ "Layout", "mapi.EcDoRpc.layout", FT_UINT8, BASE_DEC, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_length,
+		{ "Length", "mapi.EcDoRpc.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_mailbox,
+		{ "Mailbox", "mapi.EcDoRpc.mailbox", FT_STRING, BASE_NONE, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_mapi_flags,
+		{ "mapi_flags", "mapi.EcDoRpc.mapi_flags", FT_UINT8, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_mapi_request,
+		{ "Mapi Request", "mapi.EcDoRpc.mapi_request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_mapi_request_,
 		{ "Subcontext length", "mapi.EcDoRpc.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_mapi_response,
+		{ "Mapi Response", "mapi.EcDoRpc.mapi_response", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_mapi_response_,
 		{ "Subcontext length", "mapi.EcDoRpc.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoConnect_emsmdb_client_version,
-		{ "Emsmdb Client Version", "mapi.EcDoConnect.emsmdb_client_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoConnect_name,
-		{ "Name", "mapi.EcDoConnect.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_SPropValue_CTR_lpszW,
-		{ "Lpszw", "mapi.SPropValue_CTR.lpszW", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_mapi_tag,
+		{ "MAPI tag", "mapi.EcDoRpc.mapi_tag", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_max_data,
+		{ "Max Data", "mapi.EcDoRpc.max_data", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_offset,
 		{ "Offset", "mapi.EcDoRpc.offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoConnect_alloc_space,
-		{ "Alloc Space", "mapi.EcDoConnect.alloc_space", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_ulEventType_fnevCriticalError,
-		{ "Fnevcriticalerror", "mapi.ulEventType.fnevCriticalError", FT_BOOLEAN, 16, TFS(&ulEventType_fnevCriticalError_tfs), ( 0x00000001 ), NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder,
-		{ "Mapi Openfolder", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_OpenFolder", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_SRow_ulRowFlags,
-		{ "Ulrowflags", "mapi.SRow.ulRowFlags", FT_UINT8, BASE_DEC, VALS(mapi_ulRowFlags_vals), 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_padding,
+		{ "Padding", "mapi.EcDoRpc.padding", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_prop_count,
+		{ "Prop count", "mapi.EcDoRpc.prop_count", FT_UINT16, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_row,
+		{ "Row", "mapi.EcDoRpc.row", FT_UINT8, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_size,
+		{ "Size", "mapi.EcDoRpc.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcDoRpc_str_length,
+		{ "Length", "mapi.EcDoRpc.str_length", FT_UINT16, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_subcontext_size,
+		{ "Subcontext size", "mapi.EcDoRpc.subcontext_size", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_unknown1,
+		{ "Unknown1", "mapi.EcDoRpc.unknown1", FT_UINT16, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_unknown2,
+		{ "Unknown2", "mapi.EcDoRpc.unknown2", FT_UINT8, BASE_DEC, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcDoRpc_unknown3,
+		{ "Unknown3", "mapi.EcDoRpc.unknown3", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_EcRRegisterPushNotification_notif_len,
+		{ "Notif Len", "mapi.EcRRegisterPushNotification.notif_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcRRegisterPushNotification_notifkey,
 		{ "Notifkey", "mapi.EcRRegisterPushNotification.notifkey", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcRUnregisterPushNotification_unknown,
-		{ "Unknown", "mapi.EcRUnregisterPushNotification.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_codepage,
-		{ "Codepage", "mapi.EcDoRpc.codepage", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_recipients_headers_username,
-		{ "Username", "mapi.recipients_headers.username", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_mapi_request_mapi_req,
-		{ "Mapi Req", "mapi.mapi_request.mapi_req", FT_NONE, BASE_NONE, NULL, 0, "HFILL", HFILL }},
 	{ &hf_mapi_EcRRegisterPushNotification_retval,
 		{ "Retval", "mapi.EcRRegisterPushNotification.retval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_ulEventType_fnevObjectDeleted,
-		{ "Fnevobjectdeleted", "mapi.ulEventType.fnevObjectDeleted", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectDeleted_tfs), ( 0x00000008 ), NULL, HFILL }},
-	{ &hf_mapi_SPropValue_CTR_lpszA,
-		{ "Lpsza", "mapi.SPropValue_CTR.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_DATA_BLOB_data,
-		{ "Data", "mapi.DATA_BLOB.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps,
-		{ "Mapi Getprops", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_GetProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_recipient_type_SMTP,
-		{ "Smtp", "mapi.recipient_type.SMTP", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcRRegisterPushNotification_sockaddr,
 		{ "Sockaddr", "mapi.EcRRegisterPushNotification.sockaddr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_LPSTR_lppszA,
-		{ "Lppsza", "mapi.LPSTR.lppszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_max_data,
-		{ "Max Data", "mapi.EcDoRpc.max_data", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_OpenMessage_recipients_codepage,
-		{ "Codepage", "mapi.OpenMessage_recipients.codepage", FT_UINT32, BASE_DEC, VALS(mapi_CODEPAGEID_vals), 0, NULL, HFILL }},
-	{ &hf_mapi_ulEventType_fnevObjectCopied,
-		{ "Fnevobjectcopied", "mapi.ulEventType.fnevObjectCopied", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectCopied_tfs), ( 0x00000040 ), NULL, HFILL }},
+	{ &hf_mapi_EcRRegisterPushNotification_sockaddr_len,
+		{ "Sockaddr Len", "mapi.EcRRegisterPushNotification.sockaddr_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcRRegisterPushNotification_ulEventMask,
+		{ "Uleventmask", "mapi.EcRRegisterPushNotification.ulEventMask", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcRRegisterPushNotification_unknown2,
 		{ "Unknown2", "mapi.EcRRegisterPushNotification.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_recipients_headers_prop_count,
-		{ "Prop Count", "mapi.recipients_headers.prop_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_recipients_headers_bitmask,
-		{ "Bitmask", "mapi.recipients_headers.bitmask", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_EcRUnregisterPushNotification_unknown,
+		{ "Unknown", "mapi.EcRUnregisterPushNotification.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_FILETIME_dwHighDateTime,
+		{ "Dwhighdatetime", "mapi.FILETIME.dwHighDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_FILETIME_dwLowDateTime,
 		{ "Dwlowdatetime", "mapi.FILETIME.dwLowDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_unknown3,
-		{ "Unknown3", "mapi.EcDoRpc.unknown3", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_LPSTR_lppszA,
+		{ "Lppsza", "mapi.LPSTR.lppszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_MAPISTATUS_status,
 		{ "MAPISTATUS", "mapi.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(mapi_MAPISTATUS_vals), 0, NULL, HFILL }},
-	{ &hf_mapi_recipient_type_EXCHANGE,
-		{ "Exchange", "mapi.recipient_type.EXCHANGE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_SPropValue_CTR_lpguid,
-		{ "Lpguid", "mapi.SPropValue_CTR.lpguid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoConnect_unknown2,
-		{ "Unknown2", "mapi.EcDoConnect.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_ulEventType_fnevSearchComplete,
-		{ "Fnevsearchcomplete", "mapi.ulEventType.fnevSearchComplete", FT_BOOLEAN, 16, TFS(&ulEventType_fnevSearchComplete_tfs), ( 0x00000080 ), NULL, HFILL }},
+	{ &hf_mapi_MAPI_OPNUM,
+		{ "Opnum", "mapi.EcDoRpc_MAPI_REPL.opnum", FT_UINT8, BASE_HEX, VALS(mapi_MAPI_OPNUM_vals), 0, "NULL", HFILL }},
+	{ &hf_mapi_MAPI_handle,
+		{ "MAPI handle", "mapi.mapi_handle", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_OpenMessage_recipients_RecipClass,
+		{ "Recipclass", "mapi.OpenMessage_recipients.RecipClass", FT_UINT8, BASE_DEC, VALS(mapi_ulRecipClass_vals), 0, NULL, HFILL }},
+	{ &hf_mapi_OpenMessage_recipients_codepage,
+		{ "Codepage", "mapi.OpenMessage_recipients.codepage", FT_UINT32, BASE_DEC, VALS(mapi_CODEPAGEID_vals), 0, NULL, HFILL }},
+	{ &hf_mapi_OpenMessage_recipients_recipients_headers,
+		{ "Recipients Headers", "mapi.OpenMessage_recipients.recipients_headers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_OpenMessage_recipients_recipients_headers_,
 		{ "Subcontext length", "mapi.OpenMessage_recipients.subcontext", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_ulEventType_fnevStatusObjectModified,
-		{ "Fnevstatusobjectmodified", "mapi.ulEventType.fnevStatusObjectModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevStatusObjectModified_tfs), ( 0x00000200 ), NULL, HFILL }},
-	{ &hf_mapi_ulEventType_fnevObjectCreated,
-		{ "Fnevobjectcreated", "mapi.ulEventType.fnevObjectCreated", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectCreated_tfs), ( 0x00000004 ), NULL, HFILL }},
+	{ &hf_mapi_OpenMessage_req_folder_handle_idx,
+		{ "Folder Handle Idx", "mapi.OpenMessage_req.folder_handle_idx", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_OpenMessage_req_folder_id,
+		{ "Folder Id", "mapi.OpenMessage_req.folder_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_OpenMessage_req_max_data,
 		{ "Max Data", "mapi.OpenMessage_req.max_data", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_DATA_BLOB_length,
-		{ "Length", "mapi.DATA_BLOB.length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoConnect_input_locale,
-		{ "Input Locale", "mapi.EcDoConnect.input_locale", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_OpenMessage_req_message_id,
+		{ "Message Id", "mapi.OpenMessage_req.message_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_OpenMessage_req_message_permissions,
+		{ "Message Permissions", "mapi.OpenMessage_req.message_permissions", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_RecipExchange_addr_type,
 		{ "Addr Type", "mapi.RecipExchange.addr_type", FT_UINT8, BASE_DEC, VALS(mapi_addr_type_vals), 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_mapi_request,
-		{ "Mapi Request", "mapi.EcDoRpc.mapi_request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_Release,
-		{ "Mapi Release", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_Release", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_layout,
-		{ "Layout", "mapi.EcDoRpc.layout", FT_UINT8, BASE_DEC, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_decrypted_data,
-		{ "Decrypted data", "mapi.decrypted.data", FT_BYTES, BASE_NONE, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_ulEventType_fnevNewMail,
-		{ "Fnevnewmail", "mapi.ulEventType.fnevNewMail", FT_BOOLEAN, 16, TFS(&ulEventType_fnevNewMail_tfs), ( 0x00000002 ), NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_mapi_tag,
-		{ "MAPI tag", "mapi.EcDoRpc.mapi_tag", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_EcDoRpc_mapi_flags,
-		{ "mapi_flags", "mapi.EcDoRpc.mapi_flags", FT_UINT8, BASE_HEX, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_SPropValue_CTR_b,
-		{ "B", "mapi.SPropValue_CTR.b", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_mapi_response_mapi_repl,
-		{ "Mapi Repl", "mapi.mapi_response.mapi_repl", FT_NONE, BASE_NONE, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_EcDoRpc_prop_count,
-		{ "Prop count", "mapi.EcDoRpc.prop_count", FT_UINT16, BASE_HEX, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_recipients_headers_layout,
-		{ "Layout", "mapi.recipients_headers.layout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_length,
-		{ "Length", "mapi.EcDoRpc.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_RecipExchange_organization_length,
 		{ "Organization Length", "mapi.RecipExchange.organization_length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_unknown2,
-		{ "Unknown2", "mapi.EcDoRpc.unknown2", FT_UINT8, BASE_DEC, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_EcDoRpc_handle_index,
-		{ "Handle index", "mapi.EcDoRpc.handle_index", FT_UINT8, BASE_DEC, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_OpenMessage_recipients_recipients_headers,
-		{ "Recipients Headers", "mapi.OpenMessage_recipients.recipients_headers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps,
-		{ "Mapi Getprops", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_GetProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_SPropValue_CTR_b,
+		{ "B", "mapi.SPropValue_CTR.b", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_SPropValue_CTR_d,
+		{ "D", "mapi.SPropValue_CTR.d", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_SPropValue_CTR_dbl,
 		{ "Dbl", "mapi.SPropValue_CTR.dbl", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_OpenMessage_req_message_id,
-		{ "Message Id", "mapi.OpenMessage_req.message_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_size,
-		{ "Size", "mapi.EcDoRpc.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoConnect_session_nb,
-		{ "Session Nb", "mapi.EcDoConnect.session_nb", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_MAPI_handle,
-		{ "MAPI handle", "mapi.mapi_handle", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_pdu_len,
-		{ "Length", "mapi.pdu.len", FT_UINT16, BASE_HEX, NULL, 0x0, "Size of the command PDU", HFILL }},
+	{ &hf_mapi_SPropValue_CTR_err,
+		{ "Err", "mapi.SPropValue_CTR.err", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_SPropValue_CTR_ft,
 		{ "Ft", "mapi.SPropValue_CTR.ft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_SPropValue_ulPropTag,
-		{ "Ulproptag", "mapi.SPropValue.ulPropTag", FT_UINT32, BASE_DEC, VALS(mapi_MAPITAGS_vals), 0, NULL, HFILL }},
-	{ &hf_mapi_OpenMessage_recipients_RecipClass,
-		{ "Recipclass", "mapi.OpenMessage_recipients.RecipClass", FT_UINT8, BASE_DEC, VALS(mapi_ulRecipClass_vals), 0, NULL, HFILL }},
-	{ &hf_mapi_EcRRegisterPushNotification_ulEventMask,
-		{ "Uleventmask", "mapi.EcRRegisterPushNotification.ulEventMask", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder,
-		{ "Mapi Openfolder", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_OpenFolder", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_unknown1,
-		{ "Unknown1", "mapi.EcDoRpc.unknown1", FT_UINT16, BASE_HEX, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_FILETIME_dwHighDateTime,
-		{ "Dwhighdatetime", "mapi.FILETIME.dwHighDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_OpenMessage_req_message_permissions,
-		{ "Message Permissions", "mapi.OpenMessage_req.message_permissions", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_padding,
-		{ "Padding", "mapi.EcDoRpc.padding", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_ulEventType_fnevReservedForMapi,
-		{ "Fnevreservedformapi", "mapi.ulEventType.fnevReservedForMapi", FT_BOOLEAN, 16, TFS(&ulEventType_fnevReservedForMapi_tfs), ( 0x40000000 ), NULL, HFILL }},
+	{ &hf_mapi_SPropValue_CTR_i,
+		{ "I", "mapi.SPropValue_CTR.i", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_SPropValue_CTR_l,
 		{ "L", "mapi.SPropValue_CTR.l", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoConnect_user,
-		{ "User", "mapi.EcDoConnect.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoConnect_unknown4,
-		{ "Unknown4", "mapi.EcDoConnect.unknown4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_folder_id,
-		{ "Folder ID", "mapi.EcDoRpc.folder_id", FT_UINT64, BASE_HEX, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_MAPI_OPNUM,
-		{ "Opnum", "mapi.EcDoRpc_MAPI_REPL.opnum", FT_UINT8, BASE_HEX, VALS(mapi_MAPI_OPNUM_vals), 0, "NULL", HFILL }},
-	{ &hf_mapi_EcDoConnect_code_page,
-		{ "Code Page", "mapi.EcDoConnect.code_page", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_SPropValue_CTR_lpguid,
+		{ "Lpguid", "mapi.SPropValue_CTR.lpguid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_SPropValue_CTR_lpszA,
+		{ "Lpsza", "mapi.SPropValue_CTR.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_SPropValue_CTR_lpszW,
+		{ "Lpszw", "mapi.SPropValue_CTR.lpszW", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_SPropValue_ulPropTag,
+		{ "Ulproptag", "mapi.SPropValue.ulPropTag", FT_UINT32, BASE_DEC, VALS(mapi_MAPITAGS_vals), 0, NULL, HFILL }},
+	{ &hf_mapi_SRow_ulRowFlags,
+		{ "Ulrowflags", "mapi.SRow.ulRowFlags", FT_UINT8, BASE_DEC, VALS(mapi_ulRowFlags_vals), 0, NULL, HFILL }},
+	{ &hf_mapi_decrypted_data,
+		{ "Decrypted data", "mapi.decrypted.data", FT_BYTES, BASE_NONE, NULL, 0, "NULL", HFILL }},
 	{ &hf_mapi_handle,
 		{ "Handle", "mapi.handle", FT_BYTES, BASE_NONE, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_input_locale_method,
-		{ "Method", "mapi.input_locale.method", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_input_locale_language,
 		{ "Language", "mapi.input_locale.language", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_mapi_response,
-		{ "Mapi Response", "mapi.EcDoRpc.mapi_response", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoConnect_store_version,
-		{ "Store Version", "mapi.EcDoConnect.store_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_ulEventType_fnevObjectMoved,
-		{ "Fnevobjectmoved", "mapi.ulEventType.fnevObjectMoved", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectMoved_tfs), ( 0x00000020 ), NULL, HFILL }},
-	{ &hf_mapi_SPropValue_CTR_err,
-		{ "Err", "mapi.SPropValue_CTR.err", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_ulEventType_fnevTableModified,
-		{ "Fnevtablemodified", "mapi.ulEventType.fnevTableModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevTableModified_tfs), ( 0x00000100 ), NULL, HFILL }},
-	{ &hf_mapi_recipient_type,
-		{ "Recipient Type", "mapi.recipients_headers.type", FT_UINT16, BASE_HEX, VALS(mapi_OM_recipient_type_vals), 0, "NULL", HFILL }},
-	{ &hf_mapi_ulEventType_fnevExtended,
-		{ "Fnevextended", "mapi.ulEventType.fnevExtended", FT_BOOLEAN, 16, TFS(&ulEventType_fnevExtended_tfs), ( 0x80000000 ), NULL, HFILL }},
-	{ &hf_mapi_recipients_headers_prop_values,
-		{ "Prop Values", "mapi.recipients_headers.prop_values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_subcontext_size,
-		{ "Subcontext size", "mapi.EcDoRpc.subcontext_size", FT_UINT32, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_input_locale_method,
+		{ "Method", "mapi.input_locale.method", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_mapi_request_mapi_req,
+		{ "Mapi Req", "mapi.mapi_request.mapi_req", FT_NONE, BASE_NONE, NULL, 0, "HFILL", HFILL }},
+	{ &hf_mapi_mapi_response_mapi_repl,
+		{ "Mapi Repl", "mapi.mapi_response.mapi_repl", FT_NONE, BASE_NONE, NULL, 0, "NULL", HFILL }},
 	{ &hf_mapi_opnum,
 		{ "Operation", "mapi.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_Release,
-		{ "Mapi Release", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_Release", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_row,
-		{ "Row", "mapi.EcDoRpc.row", FT_UINT8, BASE_HEX, NULL, 0, "NULL", HFILL }},
+	{ &hf_mapi_pdu_len,
+		{ "Length", "mapi.pdu.len", FT_UINT16, BASE_HEX, NULL, 0x0, "Size of the command PDU", HFILL }},
 	{ &hf_mapi_property_types,
 		{ "Value", "mapi.SPropValue.value", FT_UINT32, BASE_HEX, VALS(mapi_property_types_vals), 0, "NULL", HFILL }},
-	{ &hf_mapi_EcDoRpc_str_length,
-		{ "Length", "mapi.EcDoRpc.str_length", FT_UINT16, BASE_HEX, NULL, 0, "NULL", HFILL }},
 	{ &hf_mapi_recipient_displayname_7bit_lpszA,
 		{ "Lpsza", "mapi.recipient_displayname_7bit.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcRRegisterPushNotification_sockaddr_len,
-		{ "Sockaddr Len", "mapi.EcRRegisterPushNotification.sockaddr_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_mailbox,
-		{ "Mailbox", "mapi.EcDoRpc.mailbox", FT_STRING, BASE_NONE, NULL, 0, "NULL", HFILL }},
-	{ &hf_mapi_EcRRegisterPushNotification_notif_len,
-		{ "Notif Len", "mapi.EcRRegisterPushNotification.notif_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoConnect_unknown3,
-		{ "Unknown3", "mapi.EcDoConnect.unknown3", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_OpenMessage_req_folder_handle_idx,
-		{ "Folder Handle Idx", "mapi.OpenMessage_req.folder_handle_idx", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_SPropValue_CTR_d,
-		{ "D", "mapi.SPropValue_CTR.d", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore,
-		{ "Mapi Openmsgstore", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_OpenMsgStore", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_EcDoConnect_org_group,
-		{ "Org Group", "mapi.EcDoConnect.org_group", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_mapi_OpenMessage_req_folder_id,
-		{ "Folder Id", "mapi.OpenMessage_req.folder_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_recipient_type,
+		{ "Recipient Type", "mapi.recipients_headers.type", FT_UINT16, BASE_HEX, VALS(mapi_OM_recipient_type_vals), 0, "NULL", HFILL }},
+	{ &hf_mapi_recipient_type_EXCHANGE,
+		{ "Exchange", "mapi.recipient_type.EXCHANGE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_recipient_type_SMTP,
+		{ "Smtp", "mapi.recipient_type.SMTP", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_recipients_headers_bitmask,
+		{ "Bitmask", "mapi.recipients_headers.bitmask", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_recipients_headers_layout,
+		{ "Layout", "mapi.recipients_headers.layout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_recipients_headers_prop_count,
+		{ "Prop Count", "mapi.recipients_headers.prop_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_recipients_headers_prop_values,
+		{ "Prop Values", "mapi.recipients_headers.prop_values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_recipients_headers_username,
+		{ "Username", "mapi.recipients_headers.username", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_mapi_ulEventType_fnevCriticalError,
+		{ "Fnevcriticalerror", "mapi.ulEventType.fnevCriticalError", FT_BOOLEAN, 16, TFS(&ulEventType_fnevCriticalError_tfs), ( 0x00000001 ), NULL, HFILL }},
+	{ &hf_mapi_ulEventType_fnevExtended,
+		{ "Fnevextended", "mapi.ulEventType.fnevExtended", FT_BOOLEAN, 16, TFS(&ulEventType_fnevExtended_tfs), ( 0x80000000 ), NULL, HFILL }},
+	{ &hf_mapi_ulEventType_fnevNewMail,
+		{ "Fnevnewmail", "mapi.ulEventType.fnevNewMail", FT_BOOLEAN, 16, TFS(&ulEventType_fnevNewMail_tfs), ( 0x00000002 ), NULL, HFILL }},
+	{ &hf_mapi_ulEventType_fnevObjectCopied,
+		{ "Fnevobjectcopied", "mapi.ulEventType.fnevObjectCopied", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectCopied_tfs), ( 0x00000040 ), NULL, HFILL }},
+	{ &hf_mapi_ulEventType_fnevObjectCreated,
+		{ "Fnevobjectcreated", "mapi.ulEventType.fnevObjectCreated", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectCreated_tfs), ( 0x00000004 ), NULL, HFILL }},
+	{ &hf_mapi_ulEventType_fnevObjectDeleted,
+		{ "Fnevobjectdeleted", "mapi.ulEventType.fnevObjectDeleted", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectDeleted_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevObjectModified,
 		{ "Fnevobjectmodified", "mapi.ulEventType.fnevObjectModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectModified_tfs), ( 0x00000010 ), NULL, HFILL }},
+	{ &hf_mapi_ulEventType_fnevObjectMoved,
+		{ "Fnevobjectmoved", "mapi.ulEventType.fnevObjectMoved", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectMoved_tfs), ( 0x00000020 ), NULL, HFILL }},
+	{ &hf_mapi_ulEventType_fnevReservedForMapi,
+		{ "Fnevreservedformapi", "mapi.ulEventType.fnevReservedForMapi", FT_BOOLEAN, 16, TFS(&ulEventType_fnevReservedForMapi_tfs), ( 0x40000000 ), NULL, HFILL }},
+	{ &hf_mapi_ulEventType_fnevSearchComplete,
+		{ "Fnevsearchcomplete", "mapi.ulEventType.fnevSearchComplete", FT_BOOLEAN, 16, TFS(&ulEventType_fnevSearchComplete_tfs), ( 0x00000080 ), NULL, HFILL }},
+	{ &hf_mapi_ulEventType_fnevStatusObjectModified,
+		{ "Fnevstatusobjectmodified", "mapi.ulEventType.fnevStatusObjectModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevStatusObjectModified_tfs), ( 0x00000200 ), NULL, HFILL }},
+	{ &hf_mapi_ulEventType_fnevTableModified,
+		{ "Fnevtablemodified", "mapi.ulEventType.fnevTableModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevTableModified_tfs), ( 0x00000100 ), NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-mapi.h b/epan/dissectors/packet-dcerpc-mapi.h
index 16d0b7fe61..54ddc4f136 100644
--- a/epan/dissectors/packet-dcerpc-mapi.h
+++ b/epan/dissectors/packet-dcerpc-mapi.h
@@ -5,7 +5,7 @@
 	Pidl is a perl based IDL compiler for DCE/RPC idl files.
 	It is maintained by the Samba team, not the Wireshark team.
 	Instructions on how to download and install Pidl can be
-	found at http://wiki.wireshark.org/Pidl
+	found at https://wiki.wireshark.org/Pidl
 */
 
 #ifndef __PACKET_DCERPC_MAPI_H
diff --git a/epan/dissectors/packet-dcerpc-nspi.c b/epan/dissectors/packet-dcerpc-nspi.c
index 51ef4a3af2..0101592b9f 100644
--- a/epan/dissectors/packet-dcerpc-nspi.c
+++ b/epan/dissectors/packet-dcerpc-nspi.c
@@ -5,18 +5,11 @@
 	Pidl is a perl based IDL compiler for DCE/RPC idl files.
 	It is maintained by the Samba team, not the Wireshark team.
 	Instructions on how to download and install Pidl can be
-	found at http://wiki.wireshark.org/Pidl
+	found at https://wiki.wireshark.org/Pidl
 */
 
 
 #include "config.h"
-#ifdef _MSC_VER
-#pragma warning(disable:4005)
-#pragma warning(disable:4013)
-#pragma warning(disable:4018)
-#pragma warning(disable:4101)
-#endif
-
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
@@ -60,116 +53,116 @@ static gint ett_nspi_SRowSet = -1;
 
 
 /* Header field declarations */
-static gint hf_nspi_NspiGetHierarchyInfo_unknown1 = -1;
-static gint hf_nspi_SPropValue_CTR_ft = -1;
-static gint hf_nspi_SPropValue_CTR_object = -1;
-static gint hf_nspi_input_locale_language = -1;
-static gint hf_nspi_SPropValue_CTR_MVft = -1;
-static gint hf_nspi_SDateTimeArray_lpft = -1;
-static gint hf_nspi_SSortOrderSet_aSort = -1;
-static gint hf_nspi_SGuidArray_lpguid = -1;
-static gint hf_nspi_SPropValue_dwAlignPad = -1;
-static gint hf_nspi_NspiQueryRows_instance_key = -1;
-static gint hf_nspi_SSortOrderSet_cCategories = -1;
+static gint hf_nspi_FILETIME_dwHighDateTime = -1;
+static gint hf_nspi_FILETIME_dwLowDateTime = -1;
+static gint hf_nspi_LPSTR_lppszA = -1;
+static gint hf_nspi_MAPINAMEID_lID = -1;
+static gint hf_nspi_MAPINAMEID_lpguid = -1;
 static gint hf_nspi_MAPINAMEID_ulKind = -1;
-static gint hf_nspi_NspiDNToEph_server_dn = -1;
+static gint hf_nspi_MAPISTATUS_status = -1;
 static gint hf_nspi_MAPIUID_ab = -1;
-static gint hf_nspi_SPropValue_CTR_b = -1;
-static gint hf_nspi_SRow_ulAdrEntryPad = -1;
-static gint hf_nspi_SPropValue_CTR_null = -1;
-static gint hf_nspi_SBinary_cb = -1;
-static gint hf_nspi_SBinaryArray_lpbin = -1;
-static gint hf_nspi_SShortArray_cValues = -1;
-static gint hf_nspi_SRowSet_aRow = -1;
-static gint hf_nspi_NspiBind_mapiuid = -1;
-static gint hf_nspi_SGuidArray_cValues = -1;
-static gint hf_nspi_instance_key_cValues = -1;
-static gint hf_nspi_SRestriction_CTR_resProperty = -1;
-static gint hf_nspi_NspiQueryRows_lRows = -1;
+static gint hf_nspi_MAPI_SETTINGS_codepage = -1;
+static gint hf_nspi_MAPI_SETTINGS_flag = -1;
+static gint hf_nspi_MAPI_SETTINGS_handle = -1;
+static gint hf_nspi_MAPI_SETTINGS_input_locale = -1;
+static gint hf_nspi_MAPI_SETTINGS_service_provider = -1;
+static gint hf_nspi_MV_LONG_STRUCT_cValues = -1;
+static gint hf_nspi_MV_LONG_STRUCT_lpl = -1;
 static gint hf_nspi_MV_UNICODE_STRUCT_cValues = -1;
-static gint hf_nspi_SSortOrder_ulOrder = -1;
+static gint hf_nspi_MV_UNICODE_STRUCT_lpi = -1;
+static gint hf_nspi_NAME_STRING_str = -1;
+static gint hf_nspi_NspiBind_mapiuid = -1;
+static gint hf_nspi_NspiBind_settings = -1;
+static gint hf_nspi_NspiBind_unknown = -1;
+static gint hf_nspi_NspiDNToEph_flag = -1;
+static gint hf_nspi_NspiDNToEph_instance_key = -1;
+static gint hf_nspi_NspiDNToEph_server_dn = -1;
+static gint hf_nspi_NspiDNToEph_size = -1;
 static gint hf_nspi_NspiGetHierarchyInfo_RowSet = -1;
-static gint hf_nspi_MAPINAMEID_lID = -1;
-static gint hf_nspi_NspiQueryRows_settings = -1;
-static gint hf_nspi_SBinaryArray_cValues = -1;
+static gint hf_nspi_NspiGetHierarchyInfo_settings = -1;
+static gint hf_nspi_NspiGetHierarchyInfo_unknown1 = -1;
+static gint hf_nspi_NspiGetHierarchyInfo_unknown2 = -1;
+static gint hf_nspi_NspiGetMatches_PropTagArray = -1;
+static gint hf_nspi_NspiGetMatches_REQ_properties = -1;
+static gint hf_nspi_NspiGetMatches_RowSet = -1;
+static gint hf_nspi_NspiGetMatches_instance_key = -1;
+static gint hf_nspi_NspiGetMatches_restrictions = -1;
+static gint hf_nspi_NspiGetMatches_settings = -1;
+static gint hf_nspi_NspiGetMatches_unknown1 = -1;
 static gint hf_nspi_NspiGetMatches_unknown2 = -1;
-static gint hf_nspi_SLPSTRArray_strings = -1;
-static gint hf_nspi_FILETIME_dwHighDateTime = -1;
+static gint hf_nspi_NspiGetMatches_unknown3 = -1;
 static gint hf_nspi_NspiGetProps_REPL_values = -1;
-static gint hf_nspi_SRow_cValues = -1;
-static gint hf_nspi_SPropValue_ulPropTag = -1;
+static gint hf_nspi_NspiGetProps_REQ_properties = -1;
+static gint hf_nspi_NspiGetProps_flag = -1;
 static gint hf_nspi_NspiGetProps_settings = -1;
-static gint hf_nspi_NspiDNToEph_instance_key = -1;
-static gint hf_nspi_SRestriction_CTR_resAnd = -1;
-static gint hf_nspi_NspiGetMatches_RowSet = -1;
-static gint hf_nspi_MV_UNICODE_STRUCT_lpi = -1;
-static gint hf_nspi_SSortOrderSet_cSorts = -1;
-static gint hf_nspi_SSortOrder_ulPropTag = -1;
-static gint hf_nspi_SPropValue_CTR_MVbin = -1;
-static gint hf_nspi_opnum = -1;
+static gint hf_nspi_NspiQueryRows_REQ_properties = -1;
+static gint hf_nspi_NspiQueryRows_RowSet = -1;
+static gint hf_nspi_NspiQueryRows_flag = -1;
+static gint hf_nspi_NspiQueryRows_instance_key = -1;
+static gint hf_nspi_NspiQueryRows_lRows = -1;
+static gint hf_nspi_NspiQueryRows_settings = -1;
+static gint hf_nspi_NspiQueryRows_unknown = -1;
 static gint hf_nspi_NspiUnbind_status = -1;
+static gint hf_nspi_SAndRestriction_cRes = -1;
 static gint hf_nspi_SAndRestriction_lpRes = -1;
-static gint hf_nspi_NspiDNToEph_size = -1;
+static gint hf_nspi_SBinaryArray_cValues = -1;
+static gint hf_nspi_SBinaryArray_lpbin = -1;
+static gint hf_nspi_SBinary_cb = -1;
+static gint hf_nspi_SBinary_lpb = -1;
+static gint hf_nspi_SDateTimeArray_cValues = -1;
+static gint hf_nspi_SDateTimeArray_lpft = -1;
+static gint hf_nspi_SGuidArray_cValues = -1;
+static gint hf_nspi_SGuidArray_lpguid = -1;
+static gint hf_nspi_SLPSTRArray_cValues = -1;
+static gint hf_nspi_SLPSTRArray_strings = -1;
+static gint hf_nspi_SPropTagArray_aulPropTag = -1;
+static gint hf_nspi_SPropTagArray_cValues = -1;
+static gint hf_nspi_SPropValue_CTR_MVbin = -1;
+static gint hf_nspi_SPropValue_CTR_MVft = -1;
+static gint hf_nspi_SPropValue_CTR_MVguid = -1;
 static gint hf_nspi_SPropValue_CTR_MVi = -1;
-static gint hf_nspi_SPropertyRestriction_lpProp = -1;
-static gint hf_nspi_NspiGetMatches_unknown3 = -1;
-static gint hf_nspi_MAPI_SETTINGS_flag = -1;
-static gint hf_nspi_instance_key_value = -1;
-static gint hf_nspi_NspiGetMatches_settings = -1;
-static gint hf_nspi_MV_LONG_STRUCT_cValues = -1;
-static gint hf_nspi_SRowSet_cRows = -1;
-static gint hf_nspi_MAPI_SETTINGS_service_provider = -1;
-static gint hf_nspi_SPropValue_CTR_l = -1;
-static gint hf_nspi_SAndRestriction_cRes = -1;
-static gint hf_nspi_NspiQueryRows_flag = -1;
-static gint hf_nspi_NspiQueryRows_REQ_properties = -1;
 static gint hf_nspi_SPropValue_CTR_MVl = -1;
-static gint hf_nspi_NspiGetProps_flag = -1;
-static gint hf_nspi_MAPISTATUS_status = -1;
-static gint hf_nspi_SPropValue_CTR_MVszW = -1;
-static gint hf_nspi_LPSTR_lppszA = -1;
 static gint hf_nspi_SPropValue_CTR_MVszA = -1;
-static gint hf_nspi_property_type = -1;
-static gint hf_nspi_handle = -1;
-static gint hf_nspi_NspiGetMatches_restrictions = -1;
-static gint hf_nspi_NspiQueryRows_RowSet = -1;
-static gint hf_nspi_SRow_lpProps = -1;
-static gint hf_nspi_MAPI_SETTINGS_input_locale = -1;
-static gint hf_nspi_SPropertyRestriction_ulPropTag = -1;
-static gint hf_nspi_SPropTagArray_aulPropTag = -1;
-static gint hf_nspi_NspiGetHierarchyInfo_unknown2 = -1;
-static gint hf_nspi_SBinary_lpb = -1;
-static gint hf_nspi_NspiGetHierarchyInfo_settings = -1;
-static gint hf_nspi_SSortOrderSet_cExpanded = -1;
-static gint hf_nspi_NspiQueryRows_unknown = -1;
-static gint hf_nspi_input_locale_method = -1;
-static gint hf_nspi_NspiGetMatches_instance_key = -1;
-static gint hf_nspi_SPropValue_CTR_lpszA = -1;
+static gint hf_nspi_SPropValue_CTR_MVszW = -1;
+static gint hf_nspi_SPropValue_CTR_b = -1;
 static gint hf_nspi_SPropValue_CTR_bin = -1;
-static gint hf_nspi_SShortArray_lpi = -1;
-static gint hf_nspi_SPropValue_CTR_lpszW = -1;
-static gint hf_nspi_NspiGetMatches_PropTagArray = -1;
-static gint hf_nspi_SLPSTRArray_cValues = -1;
 static gint hf_nspi_SPropValue_CTR_err = -1;
-static gint hf_nspi_SRestriction_PTTYPE = -1;
-static gint hf_nspi_NAME_STRING_str = -1;
-static gint hf_nspi_SPropertyRestriction_relop = -1;
-static gint hf_nspi_SPropValue_CTR_MVguid = -1;
-static gint hf_nspi_MAPINAMEID_lpguid = -1;
-static gint hf_nspi_FILETIME_dwLowDateTime = -1;
-static gint hf_nspi_NspiGetMatches_REQ_properties = -1;
-static gint hf_nspi_SPropTagArray_cValues = -1;
-static gint hf_nspi_SPropValue_CTR_lpguid = -1;
+static gint hf_nspi_SPropValue_CTR_ft = -1;
 static gint hf_nspi_SPropValue_CTR_i = -1;
-static gint hf_nspi_MAPI_SETTINGS_codepage = -1;
-static gint hf_nspi_NspiDNToEph_flag = -1;
-static gint hf_nspi_NspiBind_unknown = -1;
-static gint hf_nspi_MAPI_SETTINGS_handle = -1;
-static gint hf_nspi_NspiGetProps_REQ_properties = -1;
-static gint hf_nspi_MV_LONG_STRUCT_lpl = -1;
-static gint hf_nspi_NspiGetMatches_unknown1 = -1;
-static gint hf_nspi_SDateTimeArray_cValues = -1;
-static gint hf_nspi_NspiBind_settings = -1;
+static gint hf_nspi_SPropValue_CTR_l = -1;
+static gint hf_nspi_SPropValue_CTR_lpguid = -1;
+static gint hf_nspi_SPropValue_CTR_lpszA = -1;
+static gint hf_nspi_SPropValue_CTR_lpszW = -1;
+static gint hf_nspi_SPropValue_CTR_null = -1;
+static gint hf_nspi_SPropValue_CTR_object = -1;
+static gint hf_nspi_SPropValue_dwAlignPad = -1;
+static gint hf_nspi_SPropValue_ulPropTag = -1;
+static gint hf_nspi_SPropertyRestriction_lpProp = -1;
+static gint hf_nspi_SPropertyRestriction_relop = -1;
+static gint hf_nspi_SPropertyRestriction_ulPropTag = -1;
+static gint hf_nspi_SRestriction_CTR_resAnd = -1;
+static gint hf_nspi_SRestriction_CTR_resProperty = -1;
+static gint hf_nspi_SRestriction_PTTYPE = -1;
+static gint hf_nspi_SRowSet_aRow = -1;
+static gint hf_nspi_SRowSet_cRows = -1;
+static gint hf_nspi_SRow_cValues = -1;
+static gint hf_nspi_SRow_lpProps = -1;
+static gint hf_nspi_SRow_ulAdrEntryPad = -1;
+static gint hf_nspi_SShortArray_cValues = -1;
+static gint hf_nspi_SShortArray_lpi = -1;
+static gint hf_nspi_SSortOrderSet_aSort = -1;
+static gint hf_nspi_SSortOrderSet_cCategories = -1;
+static gint hf_nspi_SSortOrderSet_cExpanded = -1;
+static gint hf_nspi_SSortOrderSet_cSorts = -1;
+static gint hf_nspi_SSortOrder_ulOrder = -1;
+static gint hf_nspi_SSortOrder_ulPropTag = -1;
+static gint hf_nspi_handle = -1;
+static gint hf_nspi_input_locale_language = -1;
+static gint hf_nspi_input_locale_method = -1;
+static gint hf_nspi_instance_key_cValues = -1;
+static gint hf_nspi_instance_key_value = -1;
+static gint hf_nspi_opnum = -1;
+static gint hf_nspi_property_type = -1;
 
 static gint proto_dcerpc_nspi = -1;
 /* Version information */
@@ -3798,7 +3791,7 @@ static int nspi_dissect_element_SPropValue_CTR_MVszW(tvbuff_t *tvb _U_, int offs
 static int nspi_dissect_element_SPropValue_CTR_MVft(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int nspi_dissect_element_SPropValue_CTR_null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int nspi_dissect_element_SPropValue_CTR_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
-static int nspi_dissect_element_SPropValue_ulPropTag(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint32 *ulPropTag);
+static int nspi_dissect_element_SPropValue_ulPropTag(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int nspi_dissect_element_SPropValue_dwAlignPad(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int nspi_dissect_element_SPropValue_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
 static int nspi_dissect_element_SRow_ulAdrEntryPad(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_);
@@ -7283,12 +7276,12 @@ int
 nspi_dissect_enum_MAPITAGS(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
 	guint32 parameter=0;
-	if(param){
-		parameter=(guint32)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -7372,12 +7365,12 @@ int
 nspi_dissect_enum_MAPISTATUS(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
 	guint32 parameter=0;
-	if(param){
-		parameter=(guint32)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -7420,7 +7413,7 @@ nspi_dissect_struct_MAPIUID(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_MAPIUID);
 	}
-	
+
 	offset = nspi_dissect_element_MAPIUID_ab(tvb, offset, pinfo, tree, di, drep);
 
 
@@ -7471,7 +7464,7 @@ nspi_dissect_struct_input_locale(tvbuff_t *tvb _U_, int offset _U_, packet_info
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_input_locale);
 	}
-	
+
 	offset = nspi_dissect_element_input_locale_language(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_input_locale_method(tvb, offset, pinfo, tree, di, drep);
@@ -7541,8 +7534,10 @@ nspi_dissect_struct_MAPI_SETTINGS(tvbuff_t *tvb _U_, int offset _U_, packet_info
 {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
+	gboolean oldalign = di->no_align;
 	int old_offset;
 
+	di->no_align = TRUE;
 
 	old_offset = offset;
 
@@ -7550,7 +7545,7 @@ nspi_dissect_struct_MAPI_SETTINGS(tvbuff_t *tvb _U_, int offset _U_, packet_info
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_MAPI_SETTINGS);
 	}
-	
+
 	offset = nspi_dissect_element_MAPI_SETTINGS_handle(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_MAPI_SETTINGS_flag(tvb, offset, pinfo, tree, di, drep);
@@ -7565,16 +7560,14 @@ nspi_dissect_struct_MAPI_SETTINGS(tvbuff_t *tvb _U_, int offset _U_, packet_info
 	proto_item_set_len(item, offset-old_offset);
 
 
-	if (di->call_data->flags & DCERPC_IS_NDR64) {
-		ALIGN_TO_4_BYTES;
-	}
+	di->no_align = oldalign;
 
 	return offset;
 }
 
 
 /* IDL: struct { */
-/* IDL: 	[unique(1)] [length_is(cValues-1)] [size_is(cValues-1)] MAPITAGS *aulPropTag; */
+/* IDL: 	[length_is(cValues-1)] [size_is(cValues-1)] [unique(1)] MAPITAGS *aulPropTag; */
 /* IDL: 	uint32 cValues; */
 /* IDL: } */
 
@@ -7625,7 +7618,7 @@ nspi_dissect_struct_SPropTagArray(tvbuff_t *tvb _U_, int offset _U_, packet_info
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SPropTagArray);
 	}
-	
+
 	offset = nspi_dissect_element_SPropTagArray_aulPropTag(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SPropTagArray_cValues(tvb, offset, pinfo, tree, di, drep);
@@ -7643,7 +7636,7 @@ nspi_dissect_struct_SPropTagArray(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 
 /* IDL: struct { */
-/* IDL: 	[unique(1)] [length_is(cValues-1)] [size_is(cValues-1)] uint32 *value; */
+/* IDL: 	[length_is(cValues-1)] [size_is(cValues-1)] [unique(1)] uint32 *value; */
 /* IDL: 	uint32 cValues; */
 /* IDL: } */
 
@@ -7694,7 +7687,7 @@ nspi_dissect_struct_instance_key(tvbuff_t *tvb _U_, int offset _U_, packet_info
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_instance_key);
 	}
-	
+
 	offset = nspi_dissect_element_instance_key_value(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_instance_key_cValues(tvb, offset, pinfo, tree, di, drep);
@@ -7764,7 +7757,7 @@ nspi_dissect_struct_MAPINAMEID(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_MAPINAMEID);
 	}
-	
+
 	offset = nspi_dissect_element_MAPINAMEID_lpguid(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_MAPINAMEID_ulKind(tvb, offset, pinfo, tree, di, drep);
@@ -7801,12 +7794,12 @@ int
 nspi_dissect_enum_RestrictionType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
 	guint32 parameter=0;
-	if(param){
-		parameter=(guint32)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -7865,7 +7858,7 @@ nspi_dissect_struct_SPropertyRestriction(tvbuff_t *tvb _U_, int offset _U_, pack
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SPropertyRestriction);
 	}
-	
+
 	offset = nspi_dissect_element_SPropertyRestriction_relop(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SPropertyRestriction_ulPropTag(tvb, offset, pinfo, tree, di, drep);
@@ -7886,7 +7879,7 @@ nspi_dissect_struct_SPropertyRestriction(tvbuff_t *tvb _U_, int offset _U_, pack
 
 /* IDL: struct { */
 /* IDL: 	uint32 cRes; */
-/* IDL: 	[unique(1)] [size_is(cRes)] SRestriction *lpRes; */
+/* IDL: 	[size_is(cRes)] [unique(1)] SRestriction *lpRes; */
 /* IDL: } */
 
 static int
@@ -7936,7 +7929,7 @@ nspi_dissect_struct_SAndRestriction(tvbuff_t *tvb _U_, int offset _U_, packet_in
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SAndRestriction);
 	}
-	
+
 	offset = nspi_dissect_element_SAndRestriction_cRes(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SAndRestriction_lpRes(tvb, offset, pinfo, tree, di, drep);
@@ -8042,7 +8035,7 @@ nspi_dissect_struct_SRestriction(tvbuff_t *tvb _U_, int offset _U_, packet_info
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SRestriction);
 	}
-	
+
 	offset = nspi_dissect_element_SRestriction_rt(tvb, offset, pinfo, tree, di, drep, &rt);
 
 	offset = nspi_dissect_element_SRestriction_res(tvb, offset, pinfo, tree, di, drep, &rt);
@@ -8095,7 +8088,7 @@ nspi_dissect_struct_SSortOrder(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SSortOrder);
 	}
-	
+
 	offset = nspi_dissect_element_SSortOrder_ulPropTag(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SSortOrder_ulOrder(tvb, offset, pinfo, tree, di, drep);
@@ -8116,7 +8109,7 @@ nspi_dissect_struct_SSortOrder(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 /* IDL: 	uint32 cSorts; */
 /* IDL: 	uint32 cCategories; */
 /* IDL: 	uint32 cExpanded; */
-/* IDL: 	[unique(1)] [size_is(cSorts)] SSortOrder *aSort; */
+/* IDL: 	[size_is(cSorts)] [unique(1)] SSortOrder *aSort; */
 /* IDL: } */
 
 static int
@@ -8182,7 +8175,7 @@ nspi_dissect_struct_SSortOrderSet(tvbuff_t *tvb _U_, int offset _U_, packet_info
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SSortOrderSet);
 	}
-	
+
 	offset = nspi_dissect_element_SSortOrderSet_cSorts(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SSortOrderSet_cCategories(tvb, offset, pinfo, tree, di, drep);
@@ -8204,7 +8197,7 @@ nspi_dissect_struct_SSortOrderSet(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 
 /* IDL: struct { */
-/* IDL: 	[unique(1)] [charset(DOS)] uint8 *str; */
+/* IDL: 	[charset(DOS)] [unique(1)] uint8 *str; */
 /* IDL: } */
 
 static int
@@ -8241,7 +8234,7 @@ nspi_dissect_struct_NAME_STRING(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_NAME_STRING);
 	}
-	
+
 	offset = nspi_dissect_element_NAME_STRING_str(tvb, offset, pinfo, tree, di, drep);
 
 
@@ -8293,12 +8286,12 @@ int
 nspi_dissect_enum_property_types(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
 	guint32 parameter=0;
-	if(param){
-		parameter=(guint32)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -8306,7 +8299,7 @@ nspi_dissect_enum_property_types(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 /* IDL: struct { */
 /* IDL: 	uint32 cb; */
-/* IDL: 	[unique(1)] [size_is(cb)] uint8 *lpb; */
+/* IDL: 	[size_is(cb)] [unique(1)] uint8 *lpb; */
 /* IDL: } */
 
 static int
@@ -8356,7 +8349,7 @@ nspi_dissect_struct_SBinary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SBinary);
 	}
-	
+
 	offset = nspi_dissect_element_SBinary_cb(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SBinary_lpb(tvb, offset, pinfo, tree, di, drep);
@@ -8409,7 +8402,7 @@ nspi_dissect_struct_FILETIME(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_FILETIME);
 	}
-	
+
 	offset = nspi_dissect_element_FILETIME_dwLowDateTime(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_FILETIME_dwHighDateTime(tvb, offset, pinfo, tree, di, drep);
@@ -8428,7 +8421,7 @@ nspi_dissect_struct_FILETIME(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 
 /* IDL: struct { */
 /* IDL: 	uint32 cValues; */
-/* IDL: 	[unique(1)] [size_is(cValues)] uint16 *lpi; */
+/* IDL: 	[size_is(cValues)] [unique(1)] uint16 *lpi; */
 /* IDL: } */
 
 static int
@@ -8478,7 +8471,7 @@ nspi_dissect_struct_SShortArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SShortArray);
 	}
-	
+
 	offset = nspi_dissect_element_SShortArray_cValues(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SShortArray_lpi(tvb, offset, pinfo, tree, di, drep);
@@ -8497,7 +8490,7 @@ nspi_dissect_struct_SShortArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
 /* IDL: struct { */
 /* IDL: 	uint32 cValues; */
-/* IDL: 	[unique(1)] [size_is(cValues)] uint32 *lpl; */
+/* IDL: 	[size_is(cValues)] [unique(1)] uint32 *lpl; */
 /* IDL: } */
 
 static int
@@ -8547,7 +8540,7 @@ nspi_dissect_struct_MV_LONG_STRUCT(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_MV_LONG_STRUCT);
 	}
-	
+
 	offset = nspi_dissect_element_MV_LONG_STRUCT_cValues(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_MV_LONG_STRUCT_lpl(tvb, offset, pinfo, tree, di, drep);
@@ -8594,7 +8587,7 @@ nspi_dissect_struct_LPSTR(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_LPSTR);
 	}
-	
+
 	offset = nspi_dissect_element_LPSTR_lppszA(tvb, offset, pinfo, tree, di, drep);
 
 
@@ -8611,7 +8604,7 @@ nspi_dissect_struct_LPSTR(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
 /* IDL: struct { */
 /* IDL: 	uint32 cValues; */
-/* IDL: 	[unique(1)] [size_is(cValues)] LPSTR **strings; */
+/* IDL: 	[size_is(cValues)] [unique(1)] LPSTR **strings; */
 /* IDL: } */
 
 static int
@@ -8669,7 +8662,7 @@ nspi_dissect_struct_SLPSTRArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SLPSTRArray);
 	}
-	
+
 	offset = nspi_dissect_element_SLPSTRArray_cValues(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SLPSTRArray_strings(tvb, offset, pinfo, tree, di, drep);
@@ -8688,7 +8681,7 @@ nspi_dissect_struct_SLPSTRArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
 /* IDL: struct { */
 /* IDL: 	uint32 cValues; */
-/* IDL: 	[unique(1)] [size_is(cValues)] SBinary *lpbin; */
+/* IDL: 	[size_is(cValues)] [unique(1)] SBinary *lpbin; */
 /* IDL: } */
 
 static int
@@ -8738,7 +8731,7 @@ nspi_dissect_struct_SBinaryArray(tvbuff_t *tvb _U_, int offset _U_, packet_info
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SBinaryArray);
 	}
-	
+
 	offset = nspi_dissect_element_SBinaryArray_cValues(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SBinaryArray_lpbin(tvb, offset, pinfo, tree, di, drep);
@@ -8757,7 +8750,7 @@ nspi_dissect_struct_SBinaryArray(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 /* IDL: struct { */
 /* IDL: 	uint32 cValues; */
-/* IDL: 	[unique(1)] [size_is(cValues)] uint32 *lpguid; */
+/* IDL: 	[size_is(cValues)] [unique(1)] uint32 *lpguid; */
 /* IDL: } */
 
 static int
@@ -8797,8 +8790,10 @@ nspi_dissect_struct_SGuidArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
+	gboolean oldalign = di->no_align;
 	int old_offset;
 
+	di->no_align = TRUE;
 
 	old_offset = offset;
 
@@ -8806,7 +8801,7 @@ nspi_dissect_struct_SGuidArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SGuidArray);
 	}
-	
+
 	offset = nspi_dissect_element_SGuidArray_cValues(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SGuidArray_lpguid(tvb, offset, pinfo, tree, di, drep);
@@ -8815,9 +8810,7 @@ nspi_dissect_struct_SGuidArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 	proto_item_set_len(item, offset-old_offset);
 
 
-	if (di->call_data->flags & DCERPC_IS_NDR64) {
-		ALIGN_TO_5_BYTES;
-	}
+	di->no_align = oldalign;
 
 	return offset;
 }
@@ -8825,7 +8818,7 @@ nspi_dissect_struct_SGuidArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 
 /* IDL: struct { */
 /* IDL: 	uint32 cValues; */
-/* IDL: 	[unique(1)] [size_is(cValues)] uint32 *lpi; */
+/* IDL: 	[size_is(cValues)] [unique(1)] uint32 *lpi; */
 /* IDL: } */
 
 static int
@@ -8875,7 +8868,7 @@ nspi_dissect_struct_MV_UNICODE_STRUCT(tvbuff_t *tvb _U_, int offset _U_, packet_
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_MV_UNICODE_STRUCT);
 	}
-	
+
 	offset = nspi_dissect_element_MV_UNICODE_STRUCT_cValues(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_MV_UNICODE_STRUCT_lpi(tvb, offset, pinfo, tree, di, drep);
@@ -8894,7 +8887,7 @@ nspi_dissect_struct_MV_UNICODE_STRUCT(tvbuff_t *tvb _U_, int offset _U_, packet_
 
 /* IDL: struct { */
 /* IDL: 	uint32 cValues; */
-/* IDL: 	[unique(1)] [size_is(cValues)] FILETIME *lpft; */
+/* IDL: 	[size_is(cValues)] [unique(1)] FILETIME *lpft; */
 /* IDL: } */
 
 static int
@@ -8944,7 +8937,7 @@ nspi_dissect_struct_SDateTimeArray(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SDateTimeArray);
 	}
-	
+
 	offset = nspi_dissect_element_SDateTimeArray_cValues(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SDateTimeArray_lpft(tvb, offset, pinfo, tree, di, drep);
@@ -8965,10 +8958,10 @@ nspi_dissect_struct_SDateTimeArray(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 /* IDL: [case(PT_I2)] [case(PT_I2)] uint16 i; */
 /* IDL: [case(PT_LONG)] [case(PT_LONG)] uint32 l; */
 /* IDL: [case(PT_BOOLEAN)] [case(PT_BOOLEAN)] uint16 b; */
-/* IDL: [case(PT_STRING8)] [unique(1)] [charset(DOS)] [case(PT_STRING8)] uint8 *lpszA; */
+/* IDL: [case(PT_STRING8)] [case(PT_STRING8)] [charset(DOS)] [unique(1)] uint8 *lpszA; */
 /* IDL: [case(PT_BINARY)] [case(PT_BINARY)] SBinary bin; */
-/* IDL: [case(PT_UNICODE)] [unique(1)] [charset(UTF16)] [case(PT_UNICODE)] uint16 *lpszW; */
-/* IDL: [case(PT_CLSID)] [unique(1)] [case(PT_CLSID)] MAPIUID *lpguid; */
+/* IDL: [case(PT_UNICODE)] [case(PT_UNICODE)] [charset(UTF16)] [unique(1)] uint16 *lpszW; */
+/* IDL: [case(PT_CLSID)] [case(PT_CLSID)] [unique(1)] MAPIUID *lpguid; */
 /* IDL: [case(PT_SYSTIME)] [case(PT_SYSTIME)] FILETIME ft; */
 /* IDL: [case(PT_ERROR)] [case(PT_ERROR)] MAPISTATUS err; */
 /* IDL: [case(PT_MV_I2)] [case(PT_MV_I2)] SShortArray MVi; */
@@ -9258,9 +9251,9 @@ nspi_dissect_SPropValue_CTR(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 /* IDL: } */
 
 static int
-nspi_dissect_element_SPropValue_ulPropTag(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, guint32 *ulPropTag)
+nspi_dissect_element_SPropValue_ulPropTag(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
-	offset = nspi_dissect_enum_MAPITAGS(tvb, offset, pinfo, tree, di, drep, hf_nspi_SPropValue_ulPropTag, ulPropTag);
+	offset = nspi_dissect_enum_MAPITAGS(tvb, offset, pinfo, tree, di, drep, hf_nspi_SPropValue_ulPropTag, 0);
 
 	return offset;
 }
@@ -9284,7 +9277,6 @@ nspi_dissect_element_SPropValue_value(tvbuff_t *tvb _U_, int offset _U_, packet_
 int
 nspi_dissect_struct_SPropValue(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-	guint32 ulPropTag = 0;
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
 	int old_offset;
@@ -9297,8 +9289,8 @@ nspi_dissect_struct_SPropValue(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SPropValue);
 	}
-	
-	offset = nspi_dissect_element_SPropValue_ulPropTag(tvb, offset, pinfo, tree, di, drep, &ulPropTag);
+
+	offset = nspi_dissect_element_SPropValue_ulPropTag(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SPropValue_dwAlignPad(tvb, offset, pinfo, tree, di, drep);
 
@@ -9319,7 +9311,7 @@ nspi_dissect_struct_SPropValue(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 /* IDL: struct { */
 /* IDL: 	uint32 ulAdrEntryPad; */
 /* IDL: 	uint32 cValues; */
-/* IDL: 	[unique(1)] [size_is(cValues)] SPropValue *lpProps; */
+/* IDL: 	[size_is(cValues)] [unique(1)] SPropValue *lpProps; */
 /* IDL: } */
 
 static int
@@ -9377,7 +9369,7 @@ nspi_dissect_struct_SRow(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SRow);
 	}
-	
+
 	offset = nspi_dissect_element_SRow_ulAdrEntryPad(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SRow_cValues(tvb, offset, pinfo, tree, di, drep);
@@ -9440,7 +9432,7 @@ nspi_dissect_struct_SRowSet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 		item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);
 		tree = proto_item_add_subtree(item, ett_nspi_SRowSet);
 	}
-	
+
 	offset = nspi_dissect_element_SRowSet_cRows(tvb, offset, pinfo, tree, di, drep);
 
 	offset = nspi_dissect_element_SRowSet_aRow(tvb, offset, pinfo, tree, di, drep);
@@ -9514,8 +9506,8 @@ nspi_dissect_element_NspiBind_handle_(tvbuff_t *tvb _U_, int offset _U_, packet_
 
 /* IDL: MAPISTATUS NspiBind( */
 /* IDL: [in] uint32 unknown, */
-/* IDL: [ref] [in] MAPI_SETTINGS *settings, */
-/* IDL: [out] [unique(1)] [in] GUID *mapiuid, */
+/* IDL: [in] [ref] MAPI_SETTINGS *settings, */
+/* IDL: [in] [out] [unique(1)] GUID *mapiuid, */
 /* IDL: [out] [ref] policy_handle *handle */
 /* IDL: ); */
 
@@ -9576,7 +9568,7 @@ nspi_dissect_element_NspiUnbind_status(tvbuff_t *tvb _U_, int offset _U_, packet
 }
 
 /* IDL: MAPISTATUS NspiUnbind( */
-/* IDL: [out] [ref] [in] policy_handle *handle, */
+/* IDL: [in] [out] [ref] policy_handle *handle, */
 /* IDL: [in] uint32 status */
 /* IDL: ); */
 
@@ -9746,13 +9738,13 @@ nspi_dissect_element_NspiQueryRows_RowSet__(tvbuff_t *tvb _U_, int offset _U_, p
 }
 
 /* IDL: MAPISTATUS NspiQueryRows( */
-/* IDL: [ref] [in] policy_handle *handle, */
+/* IDL: [in] [ref] policy_handle *handle, */
 /* IDL: [in] uint32 flag, */
-/* IDL: [out] [ref] [in] MAPI_SETTINGS *settings, */
+/* IDL: [in] [out] [ref] MAPI_SETTINGS *settings, */
 /* IDL: [in] uint32 lRows, */
-/* IDL: [unique(1)] [in] [size_is(lRows)] uint32 *instance_key, */
+/* IDL: [in] [size_is(lRows)] [unique(1)] uint32 *instance_key, */
 /* IDL: [in] uint32 unknown, */
-/* IDL: [ref] [in] SPropTagArray *REQ_properties, */
+/* IDL: [in] [ref] SPropTagArray *REQ_properties, */
 /* IDL: [out] [ref] SRowSet **RowSet */
 /* IDL: ); */
 
@@ -9959,15 +9951,15 @@ nspi_dissect_element_NspiGetMatches_RowSet__(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 /* IDL: MAPISTATUS NspiGetMatches( */
-/* IDL: [ref] [in] policy_handle *handle, */
+/* IDL: [in] [ref] policy_handle *handle, */
 /* IDL: [in] uint32 unknown1, */
-/* IDL: [out] [ref] [in] MAPI_SETTINGS *settings, */
-/* IDL: [unique(1)] [in] SPropTagArray *PropTagArray, */
+/* IDL: [in] [out] [ref] MAPI_SETTINGS *settings, */
+/* IDL: [in] [unique(1)] SPropTagArray *PropTagArray, */
 /* IDL: [in] uint32 unknown2, */
-/* IDL: [unique(1)] [in] SRestriction *restrictions, */
+/* IDL: [in] [unique(1)] SRestriction *restrictions, */
 /* IDL: [in] uint32 unknown3, */
 /* IDL: [out] [ref] instance_key *instance_key, */
-/* IDL: [unique(1)] [in] SPropTagArray *REQ_properties, */
+/* IDL: [in] [unique(1)] SPropTagArray *REQ_properties, */
 /* IDL: [out] [ref] SRowSet **RowSet */
 /* IDL: ); */
 
@@ -10107,10 +10099,10 @@ nspi_dissect_element_NspiDNToEph_instance_key_(tvbuff_t *tvb _U_, int offset _U_
 }
 
 /* IDL: MAPISTATUS NspiDNToEph( */
-/* IDL: [ref] [in] policy_handle *handle, */
+/* IDL: [in] [ref] policy_handle *handle, */
 /* IDL: [in] uint32 flag, */
 /* IDL: [in] uint32 size, */
-/* IDL: [ref] [in] [size_is(size)] NAME_STRING *server_dn, */
+/* IDL: [in] [ref] [size_is(size)] NAME_STRING *server_dn, */
 /* IDL: [out] [ref] instance_key *instance_key */
 /* IDL: ); */
 
@@ -10244,10 +10236,10 @@ nspi_dissect_element_NspiGetProps_REPL_values__(tvbuff_t *tvb _U_, int offset _U
 }
 
 /* IDL: MAPISTATUS NspiGetProps( */
-/* IDL: [ref] [in] policy_handle *handle, */
+/* IDL: [in] [ref] policy_handle *handle, */
 /* IDL: [in] uint32 flag, */
-/* IDL: [ref] [in] MAPI_SETTINGS *settings, */
-/* IDL: [ref] [in] SPropTagArray *REQ_properties, */
+/* IDL: [in] [ref] MAPI_SETTINGS *settings, */
+/* IDL: [in] [ref] SPropTagArray *REQ_properties, */
 /* IDL: [out] [ref] SRow **REPL_values */
 /* IDL: ); */
 
@@ -10399,10 +10391,10 @@ nspi_dissect_element_NspiGetHierarchyInfo_RowSet__(tvbuff_t *tvb _U_, int offset
 }
 
 /* IDL: MAPISTATUS NspiGetHierarchyInfo( */
-/* IDL: [ref] [in] policy_handle *handle, */
+/* IDL: [in] [ref] policy_handle *handle, */
 /* IDL: [in] uint32 unknown1, */
-/* IDL: [ref] [in] MAPI_SETTINGS *settings, */
-/* IDL: [out] [ref] [in] uint32 *unknown2, */
+/* IDL: [in] [ref] MAPI_SETTINGS *settings, */
+/* IDL: [in] [out] [ref] uint32 *unknown2, */
 /* IDL: [out] [ref] SRowSet **RowSet */
 /* IDL: ); */
 
@@ -10634,226 +10626,226 @@ static dcerpc_sub_dissector nspi_dissectors[] = {
 void proto_register_dcerpc_nspi(void)
 {
 	static hf_register_info hf[] = {
-	{ &hf_nspi_NspiGetHierarchyInfo_unknown1,
-		{ "Unknown1", "nspi.NspiGetHierarchyInfo.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_CTR_ft,
-		{ "Ft", "nspi.SPropValue_CTR.ft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_CTR_object,
-		{ "Object", "nspi.SPropValue_CTR.object", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_input_locale_language,
-		{ "Language", "nspi.input_locale.language", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_CTR_MVft,
-		{ "Mvft", "nspi.SPropValue_CTR.MVft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SDateTimeArray_lpft,
-		{ "Lpft", "nspi.SDateTimeArray.lpft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SSortOrderSet_aSort,
-		{ "Asort", "nspi.SSortOrderSet.aSort", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SGuidArray_lpguid,
-		{ "Lpguid", "nspi.SGuidArray.lpguid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_dwAlignPad,
-		{ "Dwalignpad", "nspi.SPropValue.dwAlignPad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiQueryRows_instance_key,
-		{ "Instance Key", "nspi.NspiQueryRows.instance_key", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SSortOrderSet_cCategories,
-		{ "Ccategories", "nspi.SSortOrderSet.cCategories", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_FILETIME_dwHighDateTime,
+		{ "Dwhighdatetime", "nspi.FILETIME.dwHighDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_FILETIME_dwLowDateTime,
+		{ "Dwlowdatetime", "nspi.FILETIME.dwLowDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_LPSTR_lppszA,
+		{ "Lppsza", "nspi.LPSTR.lppszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_MAPINAMEID_lID,
+		{ "Lid", "nspi.MAPINAMEID.lID", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_MAPINAMEID_lpguid,
+		{ "Lpguid", "nspi.MAPINAMEID.lpguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MAPINAMEID_ulKind,
 		{ "Ulkind", "nspi.MAPINAMEID.ulKind", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiDNToEph_server_dn,
-		{ "Server Dn", "nspi.NspiDNToEph.server_dn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_MAPISTATUS_status,
+		{ "MAPISTATUS", "nspi.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(nspi_MAPISTATUS_vals), 0, NULL, HFILL }},
 	{ &hf_nspi_MAPIUID_ab,
 		{ "Ab", "nspi.MAPIUID.ab", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_CTR_b,
-		{ "B", "nspi.SPropValue_CTR.b", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SRow_ulAdrEntryPad,
-		{ "Uladrentrypad", "nspi.SRow.ulAdrEntryPad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_CTR_null,
-		{ "Null", "nspi.SPropValue_CTR.null", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SBinary_cb,
-		{ "Cb", "nspi.SBinary.cb", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SBinaryArray_lpbin,
-		{ "Lpbin", "nspi.SBinaryArray.lpbin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SShortArray_cValues,
-		{ "Cvalues", "nspi.SShortArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SRowSet_aRow,
-		{ "Arow", "nspi.SRowSet.aRow", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiBind_mapiuid,
-		{ "Mapiuid", "nspi.NspiBind.mapiuid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SGuidArray_cValues,
-		{ "Cvalues", "nspi.SGuidArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_instance_key_cValues,
-		{ "Cvalues", "nspi.instance_key.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SRestriction_CTR_resProperty,
-		{ "Resproperty", "nspi.SRestriction_CTR.resProperty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiQueryRows_lRows,
-		{ "Lrows", "nspi.NspiQueryRows.lRows", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_MAPI_SETTINGS_codepage,
+		{ "Codepage", "nspi.MAPI_SETTINGS.codepage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_MAPI_SETTINGS_flag,
+		{ "Flag", "nspi.MAPI_SETTINGS.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_MAPI_SETTINGS_handle,
+		{ "Handle", "nspi.MAPI_SETTINGS.handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_MAPI_SETTINGS_input_locale,
+		{ "Input Locale", "nspi.MAPI_SETTINGS.input_locale", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_MAPI_SETTINGS_service_provider,
+		{ "Service Provider", "nspi.MAPI_SETTINGS.service_provider", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_MV_LONG_STRUCT_cValues,
+		{ "Cvalues", "nspi.MV_LONG_STRUCT.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_MV_LONG_STRUCT_lpl,
+		{ "Lpl", "nspi.MV_LONG_STRUCT.lpl", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MV_UNICODE_STRUCT_cValues,
 		{ "Cvalues", "nspi.MV_UNICODE_STRUCT.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SSortOrder_ulOrder,
-		{ "Ulorder", "nspi.SSortOrder.ulOrder", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_MV_UNICODE_STRUCT_lpi,
+		{ "Lpi", "nspi.MV_UNICODE_STRUCT.lpi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NAME_STRING_str,
+		{ "Str", "nspi.NAME_STRING.str", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiBind_mapiuid,
+		{ "Mapiuid", "nspi.NspiBind.mapiuid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiBind_settings,
+		{ "Settings", "nspi.NspiBind.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiBind_unknown,
+		{ "Unknown", "nspi.NspiBind.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiDNToEph_flag,
+		{ "Flag", "nspi.NspiDNToEph.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiDNToEph_instance_key,
+		{ "Instance Key", "nspi.NspiDNToEph.instance_key", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiDNToEph_server_dn,
+		{ "Server Dn", "nspi.NspiDNToEph.server_dn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiDNToEph_size,
+		{ "Size", "nspi.NspiDNToEph.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetHierarchyInfo_RowSet,
 		{ "Rowset", "nspi.NspiGetHierarchyInfo.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_MAPINAMEID_lID,
-		{ "Lid", "nspi.MAPINAMEID.lID", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiQueryRows_settings,
-		{ "Settings", "nspi.NspiQueryRows.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SBinaryArray_cValues,
-		{ "Cvalues", "nspi.SBinaryArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetHierarchyInfo_settings,
+		{ "Settings", "nspi.NspiGetHierarchyInfo.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetHierarchyInfo_unknown1,
+		{ "Unknown1", "nspi.NspiGetHierarchyInfo.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetHierarchyInfo_unknown2,
+		{ "Unknown2", "nspi.NspiGetHierarchyInfo.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetMatches_PropTagArray,
+		{ "Proptagarray", "nspi.NspiGetMatches.PropTagArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetMatches_REQ_properties,
+		{ "Req Properties", "nspi.NspiGetMatches.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetMatches_RowSet,
+		{ "Rowset", "nspi.NspiGetMatches.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetMatches_instance_key,
+		{ "Instance Key", "nspi.NspiGetMatches.instance_key", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetMatches_restrictions,
+		{ "Restrictions", "nspi.NspiGetMatches.restrictions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetMatches_settings,
+		{ "Settings", "nspi.NspiGetMatches.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetMatches_unknown1,
+		{ "Unknown1", "nspi.NspiGetMatches.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetMatches_unknown2,
 		{ "Unknown2", "nspi.NspiGetMatches.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SLPSTRArray_strings,
-		{ "Strings", "nspi.SLPSTRArray.strings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_FILETIME_dwHighDateTime,
-		{ "Dwhighdatetime", "nspi.FILETIME.dwHighDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetMatches_unknown3,
+		{ "Unknown3", "nspi.NspiGetMatches.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetProps_REPL_values,
 		{ "Repl Values", "nspi.NspiGetProps.REPL_values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SRow_cValues,
-		{ "Cvalues", "nspi.SRow.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_ulPropTag,
-		{ "Ulproptag", "nspi.SPropValue.ulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetProps_REQ_properties,
+		{ "Req Properties", "nspi.NspiGetProps.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiGetProps_flag,
+		{ "Flag", "nspi.NspiGetProps.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetProps_settings,
 		{ "Settings", "nspi.NspiGetProps.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiDNToEph_instance_key,
-		{ "Instance Key", "nspi.NspiDNToEph.instance_key", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SRestriction_CTR_resAnd,
-		{ "Resand", "nspi.SRestriction_CTR.resAnd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiGetMatches_RowSet,
-		{ "Rowset", "nspi.NspiGetMatches.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_MV_UNICODE_STRUCT_lpi,
-		{ "Lpi", "nspi.MV_UNICODE_STRUCT.lpi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SSortOrderSet_cSorts,
-		{ "Csorts", "nspi.SSortOrderSet.cSorts", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SSortOrder_ulPropTag,
-		{ "Ulproptag", "nspi.SSortOrder.ulPropTag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_CTR_MVbin,
-		{ "Mvbin", "nspi.SPropValue_CTR.MVbin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_opnum,
-		{ "Operation", "nspi.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiQueryRows_REQ_properties,
+		{ "Req Properties", "nspi.NspiQueryRows.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiQueryRows_RowSet,
+		{ "Rowset", "nspi.NspiQueryRows.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiQueryRows_flag,
+		{ "Flag", "nspi.NspiQueryRows.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiQueryRows_instance_key,
+		{ "Instance Key", "nspi.NspiQueryRows.instance_key", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiQueryRows_lRows,
+		{ "Lrows", "nspi.NspiQueryRows.lRows", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiQueryRows_settings,
+		{ "Settings", "nspi.NspiQueryRows.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_NspiQueryRows_unknown,
+		{ "Unknown", "nspi.NspiQueryRows.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiUnbind_status,
 		{ "Status", "nspi.NspiUnbind.status", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SAndRestriction_cRes,
+		{ "Cres", "nspi.SAndRestriction.cRes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SAndRestriction_lpRes,
 		{ "Lpres", "nspi.SAndRestriction.lpRes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiDNToEph_size,
-		{ "Size", "nspi.NspiDNToEph.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SBinaryArray_cValues,
+		{ "Cvalues", "nspi.SBinaryArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SBinaryArray_lpbin,
+		{ "Lpbin", "nspi.SBinaryArray.lpbin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SBinary_cb,
+		{ "Cb", "nspi.SBinary.cb", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SBinary_lpb,
+		{ "Lpb", "nspi.SBinary.lpb", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SDateTimeArray_cValues,
+		{ "Cvalues", "nspi.SDateTimeArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SDateTimeArray_lpft,
+		{ "Lpft", "nspi.SDateTimeArray.lpft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SGuidArray_cValues,
+		{ "Cvalues", "nspi.SGuidArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SGuidArray_lpguid,
+		{ "Lpguid", "nspi.SGuidArray.lpguid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SLPSTRArray_cValues,
+		{ "Cvalues", "nspi.SLPSTRArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SLPSTRArray_strings,
+		{ "Strings", "nspi.SLPSTRArray.strings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropTagArray_aulPropTag,
+		{ "Aulproptag", "nspi.SPropTagArray.aulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }},
+	{ &hf_nspi_SPropTagArray_cValues,
+		{ "Cvalues", "nspi.SPropTagArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_CTR_MVbin,
+		{ "Mvbin", "nspi.SPropValue_CTR.MVbin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_CTR_MVft,
+		{ "Mvft", "nspi.SPropValue_CTR.MVft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_CTR_MVguid,
+		{ "Mvguid", "nspi.SPropValue_CTR.MVguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_MVi,
 		{ "Mvi", "nspi.SPropValue_CTR.MVi", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropertyRestriction_lpProp,
-		{ "Lpprop", "nspi.SPropertyRestriction.lpProp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiGetMatches_unknown3,
-		{ "Unknown3", "nspi.NspiGetMatches.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_MAPI_SETTINGS_flag,
-		{ "Flag", "nspi.MAPI_SETTINGS.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_instance_key_value,
-		{ "Value", "nspi.instance_key.value", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiGetMatches_settings,
-		{ "Settings", "nspi.NspiGetMatches.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_MV_LONG_STRUCT_cValues,
-		{ "Cvalues", "nspi.MV_LONG_STRUCT.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SRowSet_cRows,
-		{ "Crows", "nspi.SRowSet.cRows", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_MAPI_SETTINGS_service_provider,
-		{ "Service Provider", "nspi.MAPI_SETTINGS.service_provider", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_CTR_l,
-		{ "L", "nspi.SPropValue_CTR.l", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SAndRestriction_cRes,
-		{ "Cres", "nspi.SAndRestriction.cRes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiQueryRows_flag,
-		{ "Flag", "nspi.NspiQueryRows.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiQueryRows_REQ_properties,
-		{ "Req Properties", "nspi.NspiQueryRows.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_MVl,
 		{ "Mvl", "nspi.SPropValue_CTR.MVl", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiGetProps_flag,
-		{ "Flag", "nspi.NspiGetProps.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_MAPISTATUS_status,
-		{ "MAPISTATUS", "nspi.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(nspi_MAPISTATUS_vals), 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_CTR_MVszW,
-		{ "Mvszw", "nspi.SPropValue_CTR.MVszW", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_LPSTR_lppszA,
-		{ "Lppsza", "nspi.LPSTR.lppszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_MVszA,
 		{ "Mvsza", "nspi.SPropValue_CTR.MVszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_property_type,
-		{ "Value", "nspi.SPropValue.value", FT_UINT32, BASE_HEX, VALS(nspi_property_types_vals), 0, NULL, HFILL }},
-	{ &hf_nspi_handle,
-		{ "Handle", "nspi.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiGetMatches_restrictions,
-		{ "Restrictions", "nspi.NspiGetMatches.restrictions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiQueryRows_RowSet,
-		{ "Rowset", "nspi.NspiQueryRows.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SRow_lpProps,
-		{ "Lpprops", "nspi.SRow.lpProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_MAPI_SETTINGS_input_locale,
-		{ "Input Locale", "nspi.MAPI_SETTINGS.input_locale", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropertyRestriction_ulPropTag,
-		{ "Ulproptag", "nspi.SPropertyRestriction.ulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }},
-	{ &hf_nspi_SPropTagArray_aulPropTag,
-		{ "Aulproptag", "nspi.SPropTagArray.aulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }},
-	{ &hf_nspi_NspiGetHierarchyInfo_unknown2,
-		{ "Unknown2", "nspi.NspiGetHierarchyInfo.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SBinary_lpb,
-		{ "Lpb", "nspi.SBinary.lpb", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiGetHierarchyInfo_settings,
-		{ "Settings", "nspi.NspiGetHierarchyInfo.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SSortOrderSet_cExpanded,
-		{ "Cexpanded", "nspi.SSortOrderSet.cExpanded", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiQueryRows_unknown,
-		{ "Unknown", "nspi.NspiQueryRows.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_input_locale_method,
-		{ "Method", "nspi.input_locale.method", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiGetMatches_instance_key,
-		{ "Instance Key", "nspi.NspiGetMatches.instance_key", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_CTR_lpszA,
-		{ "Lpsza", "nspi.SPropValue_CTR.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_CTR_MVszW,
+		{ "Mvszw", "nspi.SPropValue_CTR.MVszW", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_CTR_b,
+		{ "B", "nspi.SPropValue_CTR.b", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_bin,
 		{ "Bin", "nspi.SPropValue_CTR.bin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SShortArray_lpi,
-		{ "Lpi", "nspi.SShortArray.lpi", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_CTR_lpszW,
-		{ "Lpszw", "nspi.SPropValue_CTR.lpszW", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiGetMatches_PropTagArray,
-		{ "Proptagarray", "nspi.NspiGetMatches.PropTagArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SLPSTRArray_cValues,
-		{ "Cvalues", "nspi.SLPSTRArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_err,
 		{ "Err", "nspi.SPropValue_CTR.err", FT_UINT32, BASE_DEC, VALS(nspi_MAPISTATUS_vals), 0, NULL, HFILL }},
-	{ &hf_nspi_SRestriction_PTTYPE,
-		{ "Restriction Type", "nspi.property_type", FT_UINT32, BASE_HEX, VALS(nspi_nspi_RestrictionType_vals), 0, NULL, HFILL }},
-	{ &hf_nspi_NAME_STRING_str,
-		{ "Str", "nspi.NAME_STRING.str", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropertyRestriction_relop,
-		{ "Relop", "nspi.SPropertyRestriction.relop", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_CTR_MVguid,
-		{ "Mvguid", "nspi.SPropValue_CTR.MVguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_MAPINAMEID_lpguid,
-		{ "Lpguid", "nspi.MAPINAMEID.lpguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_FILETIME_dwLowDateTime,
-		{ "Dwlowdatetime", "nspi.FILETIME.dwLowDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiGetMatches_REQ_properties,
-		{ "Req Properties", "nspi.NspiGetMatches.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropTagArray_cValues,
-		{ "Cvalues", "nspi.SPropTagArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SPropValue_CTR_lpguid,
-		{ "Lpguid", "nspi.SPropValue_CTR.lpguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_CTR_ft,
+		{ "Ft", "nspi.SPropValue_CTR.ft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_i,
 		{ "I", "nspi.SPropValue_CTR.i", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_MAPI_SETTINGS_codepage,
-		{ "Codepage", "nspi.MAPI_SETTINGS.codepage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiDNToEph_flag,
-		{ "Flag", "nspi.NspiDNToEph.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiBind_unknown,
-		{ "Unknown", "nspi.NspiBind.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_MAPI_SETTINGS_handle,
-		{ "Handle", "nspi.MAPI_SETTINGS.handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiGetProps_REQ_properties,
-		{ "Req Properties", "nspi.NspiGetProps.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_MV_LONG_STRUCT_lpl,
-		{ "Lpl", "nspi.MV_LONG_STRUCT.lpl", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiGetMatches_unknown1,
-		{ "Unknown1", "nspi.NspiGetMatches.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_SDateTimeArray_cValues,
-		{ "Cvalues", "nspi.SDateTimeArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_nspi_NspiBind_settings,
-		{ "Settings", "nspi.NspiBind.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_CTR_l,
+		{ "L", "nspi.SPropValue_CTR.l", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_CTR_lpguid,
+		{ "Lpguid", "nspi.SPropValue_CTR.lpguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_CTR_lpszA,
+		{ "Lpsza", "nspi.SPropValue_CTR.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_CTR_lpszW,
+		{ "Lpszw", "nspi.SPropValue_CTR.lpszW", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_CTR_null,
+		{ "Null", "nspi.SPropValue_CTR.null", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_CTR_object,
+		{ "Object", "nspi.SPropValue_CTR.object", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_dwAlignPad,
+		{ "Dwalignpad", "nspi.SPropValue.dwAlignPad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropValue_ulPropTag,
+		{ "Ulproptag", "nspi.SPropValue.ulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }},
+	{ &hf_nspi_SPropertyRestriction_lpProp,
+		{ "Lpprop", "nspi.SPropertyRestriction.lpProp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropertyRestriction_relop,
+		{ "Relop", "nspi.SPropertyRestriction.relop", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SPropertyRestriction_ulPropTag,
+		{ "Ulproptag", "nspi.SPropertyRestriction.ulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }},
+	{ &hf_nspi_SRestriction_CTR_resAnd,
+		{ "Resand", "nspi.SRestriction_CTR.resAnd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SRestriction_CTR_resProperty,
+		{ "Resproperty", "nspi.SRestriction_CTR.resProperty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SRestriction_PTTYPE,
+		{ "Restriction Type", "nspi.property_type", FT_UINT32, BASE_HEX, VALS(nspi_nspi_RestrictionType_vals), 0, NULL, HFILL }},
+	{ &hf_nspi_SRowSet_aRow,
+		{ "Arow", "nspi.SRowSet.aRow", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SRowSet_cRows,
+		{ "Crows", "nspi.SRowSet.cRows", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SRow_cValues,
+		{ "Cvalues", "nspi.SRow.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SRow_lpProps,
+		{ "Lpprops", "nspi.SRow.lpProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SRow_ulAdrEntryPad,
+		{ "Uladrentrypad", "nspi.SRow.ulAdrEntryPad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SShortArray_cValues,
+		{ "Cvalues", "nspi.SShortArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SShortArray_lpi,
+		{ "Lpi", "nspi.SShortArray.lpi", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SSortOrderSet_aSort,
+		{ "Asort", "nspi.SSortOrderSet.aSort", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SSortOrderSet_cCategories,
+		{ "Ccategories", "nspi.SSortOrderSet.cCategories", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SSortOrderSet_cExpanded,
+		{ "Cexpanded", "nspi.SSortOrderSet.cExpanded", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SSortOrderSet_cSorts,
+		{ "Csorts", "nspi.SSortOrderSet.cSorts", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SSortOrder_ulOrder,
+		{ "Ulorder", "nspi.SSortOrder.ulOrder", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_SSortOrder_ulPropTag,
+		{ "Ulproptag", "nspi.SSortOrder.ulPropTag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_handle,
+		{ "Handle", "nspi.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_input_locale_language,
+		{ "Language", "nspi.input_locale.language", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_input_locale_method,
+		{ "Method", "nspi.input_locale.method", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_instance_key_cValues,
+		{ "Cvalues", "nspi.instance_key.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_instance_key_value,
+		{ "Value", "nspi.instance_key.value", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_opnum,
+		{ "Operation", "nspi.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_nspi_property_type,
+		{ "Value", "nspi.SPropValue.value", FT_UINT32, BASE_HEX, VALS(nspi_property_types_vals), 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-nspi.h b/epan/dissectors/packet-dcerpc-nspi.h
index c84592bab4..913bd1d4e5 100644
--- a/epan/dissectors/packet-dcerpc-nspi.h
+++ b/epan/dissectors/packet-dcerpc-nspi.h
@@ -5,7 +5,7 @@
 	Pidl is a perl based IDL compiler for DCE/RPC idl files.
 	It is maintained by the Samba team, not the Wireshark team.
 	Instructions on how to download and install Pidl can be
-	found at http://wiki.wireshark.org/Pidl
+	found at https://wiki.wireshark.org/Pidl
 */
 
 #ifndef __PACKET_DCERPC_NSPI_H
diff --git a/epan/dissectors/packet-dcerpc-rfr.c b/epan/dissectors/packet-dcerpc-rfr.c
index e04d527533..b0370885ec 100644
--- a/epan/dissectors/packet-dcerpc-rfr.c
+++ b/epan/dissectors/packet-dcerpc-rfr.c
@@ -1,6 +1,6 @@
 /* DO NOT EDIT
 	This file was automatically generated by Pidl
-	from rfr/rfr.idl and rfr/rfr.cnf.
+	from rfr.idl and rfr.cnf.
 
 	Pidl is a perl based IDL compiler for DCE/RPC idl files.
 	It is maintained by the Samba team, not the Wireshark team.
diff --git a/epan/dissectors/packet-dcerpc-rfr.h b/epan/dissectors/packet-dcerpc-rfr.h
index b3c36a0809..e519536c59 100644
--- a/epan/dissectors/packet-dcerpc-rfr.h
+++ b/epan/dissectors/packet-dcerpc-rfr.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT
 	This file was automatically generated by Pidl
-	from rfr/rfr.idl and rfr/rfr.cnf.
+	from rfr.idl and rfr.cnf.
 
 	Pidl is a perl based IDL compiler for DCE/RPC idl files.
 	It is maintained by the Samba team, not the Wireshark team.