diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-05-03 17:24:41 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-05-05 21:44:49 +0000 |
| commit | 5956556aceb1f59387a081a6e8898a7e40730936 (patch) | |
| tree | a01e11a982d7ce5b22be1a912c7975bf0d6f2c05 | |
| parent | c1880e3095acd7541076bb89bfae5d5bd348a3d2 (diff) | |
mapi: fix conflicting entry in its value_string
Field 'Value' (mapi.SPropValue.value) has a conflicting entry in its value_string: 4126 is at indices 24 (PT_MV_STRING8) and 25 (PT_MV_TSTRING))
Field 'Value' (nspi.SPropValue.value) has a conflicting entry in its value_string: 4126 is at indices 24 (PT_MV_STRING8) and 25 (PT_MV_TSTRING))
Change-Id: Icc1060804ced2887a34ffe81cf473fbe8154ce18
Reviewed-on: https://code.wireshark.org/review/21510
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-dcerpc-mapi.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcerpc-mapi.h | 1 | ||||
| -rw-r--r-- | epan/dissectors/pidl/mapi/mapi.idl | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c index 4806da9ae9..c0ecf59f08 100644 --- a/epan/dissectors/packet-dcerpc-mapi.c +++ b/epan/dissectors/packet-dcerpc-mapi.c @@ -3777,7 +3777,6 @@ const value_string mapi_property_types_vals[] = { { PT_MV_APPTIME, "PT_MV_APPTIME" }, { PT_MV_I8, "PT_MV_I8" }, { PT_MV_STRING8, "PT_MV_STRING8" }, - { PT_MV_TSTRING, "PT_MV_TSTRING" }, { PT_MV_UNICODE, "PT_MV_UNICODE" }, { PT_MV_SYSTIME, "PT_MV_SYSTIME" }, { PT_MV_CLSID, "PT_MV_CLSID" }, @@ -8243,7 +8242,6 @@ mapi_dissect_struct_LPSTR(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo /* IDL: PT_MV_APPTIME=0x1007, */ /* IDL: PT_MV_I8=0x1014, */ /* IDL: PT_MV_STRING8=0x101e, */ -/* IDL: PT_MV_TSTRING=0x101e, */ /* IDL: PT_MV_UNICODE=0x101f, */ /* IDL: PT_MV_SYSTIME=0x1040, */ /* IDL: PT_MV_CLSID=0x1048, */ diff --git a/epan/dissectors/packet-dcerpc-mapi.h b/epan/dissectors/packet-dcerpc-mapi.h index 54ddc4f136..bf0bdca26e 100644 --- a/epan/dissectors/packet-dcerpc-mapi.h +++ b/epan/dissectors/packet-dcerpc-mapi.h @@ -3601,7 +3601,6 @@ int mapi_dissect_struct_LPSTR(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi #define PT_MV_APPTIME (0x1007) #define PT_MV_I8 (0x1014) #define PT_MV_STRING8 (0x101e) -#define PT_MV_TSTRING (0x101e) #define PT_MV_UNICODE (0x101f) #define PT_MV_SYSTIME (0x1040) #define PT_MV_CLSID (0x1048) diff --git a/epan/dissectors/pidl/mapi/mapi.idl b/epan/dissectors/pidl/mapi/mapi.idl index 9de3360c5d..345724043b 100644 --- a/epan/dissectors/pidl/mapi/mapi.idl +++ b/epan/dissectors/pidl/mapi/mapi.idl @@ -238,7 +238,7 @@ PT_MV_APPTIME = 0x1007, PT_MV_I8 = 0x1014, PT_MV_STRING8 = 0x101e, - PT_MV_TSTRING = 0x101e, +// PT_MV_TSTRING = 0x101e, PT_MV_UNICODE = 0x101f, PT_MV_SYSTIME = 0x1040, PT_MV_CLSID = 0x1048, |