diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-05-07 18:35:28 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-05-07 18:35:28 +0000 |
| commit | e19938fb0b5fed00c134c809770a9a5808ebdbfe (patch) | |
| tree | c9f7c9cb5c06f5c6bd2aa031be27e881a6c45473 /epan | |
| parent | cf56e76be90d3541155b4d5fea4c335701f1de3a (diff) | |
| download | wireshark-e19938fb0b5fed00c134c809770a9a5808ebdbfe.tar.gz | |
using latest version of pidl, which includes the required pragmas and
which also handles TYPE and PARAM_VALUE for strings, regenerate winreg
after using hte conformance file to prettify how and where strings are
to be used to decorate the summary line and the dissection tree
svn path=/trunk/; revision=21717
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-winreg.c | 17 | ||||
| -rw-r--r-- | epan/dissectors/pidl/winreg.cnf | 8 |
2 files changed, 17 insertions, 8 deletions
diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c index 4bd7877c38..8f6a91c2e8 100644 --- a/epan/dissectors/packet-dcerpc-winreg.c +++ b/epan/dissectors/packet-dcerpc-winreg.c @@ -13,8 +13,11 @@ #include "config.h" #endif -#ifdef _MSC_VER - #pragma warning(disable:4005) +#ifdef _MSC_VER +#pragma warning(disable:4005) +#pragma warning(disable:4013) +#pragma warning(disable:4018) +#pragma warning(disable:4101) #endif #include <glib.h> @@ -1437,7 +1440,7 @@ winreg_dissect_element_CreateKey_handle_(tvbuff_t *tvb _U_, int offset _U_, pack static int winreg_dissect_element_CreateKey_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_) { - offset=cnf_dissect_winreg_String(tvb, offset, pinfo, tree, drep, 0, hf_winreg_winreg_CreateKey_name); + offset=cnf_dissect_winreg_String(tvb, offset, pinfo, tree, drep, 2|PIDL_SET_COL_INFO, hf_winreg_winreg_CreateKey_name); return offset; } @@ -1585,7 +1588,7 @@ winreg_dissect_element_DeleteKey_handle_(tvbuff_t *tvb _U_, int offset _U_, pack static int winreg_dissect_element_DeleteKey_key(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_) { - offset=cnf_dissect_winreg_String(tvb, offset, pinfo, tree, drep, 0, hf_winreg_winreg_DeleteKey_key); + offset=cnf_dissect_winreg_String(tvb, offset, pinfo, tree, drep, 2|PIDL_SET_COL_INFO, hf_winreg_winreg_DeleteKey_key); return offset; } @@ -2294,7 +2297,7 @@ winreg_dissect_element_OpenKey_parent_handle_(tvbuff_t *tvb _U_, int offset _U_, static int winreg_dissect_element_OpenKey_keyname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_) { - offset=cnf_dissect_winreg_String(tvb, offset, pinfo, tree, drep, 0, hf_winreg_winreg_OpenKey_keyname); + offset=cnf_dissect_winreg_String(tvb, offset, pinfo, tree, drep, 2|PIDL_SET_COL_INFO, hf_winreg_winreg_OpenKey_keyname); return offset; } @@ -2615,7 +2618,7 @@ winreg_dissect_element_QueryValue_handle_(tvbuff_t *tvb _U_, int offset _U_, pac static int winreg_dissect_element_QueryValue_value_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_) { - offset=cnf_dissect_winreg_String(tvb, offset, pinfo, tree, drep, 0, hf_winreg_winreg_QueryValue_value_name); + offset=cnf_dissect_winreg_String(tvb, offset, pinfo, tree, drep, 2|PIDL_SET_COL_INFO, hf_winreg_winreg_QueryValue_value_name); return offset; } @@ -3017,7 +3020,7 @@ winreg_dissect_element_SetValue_handle_(tvbuff_t *tvb _U_, int offset _U_, packe static int winreg_dissect_element_SetValue_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_) { - offset=cnf_dissect_winreg_String(tvb, offset, pinfo, tree, drep, 0, hf_winreg_winreg_SetValue_name); + offset=cnf_dissect_winreg_String(tvb, offset, pinfo, tree, drep, 2|PIDL_SET_COL_INFO, hf_winreg_winreg_SetValue_name); return offset; } diff --git a/epan/dissectors/pidl/winreg.cnf b/epan/dissectors/pidl/winreg.cnf index 8284edb481..4e337436bf 100644 --- a/epan/dissectors/pidl/winreg.cnf +++ b/epan/dissectors/pidl/winreg.cnf @@ -103,7 +103,13 @@ TYPE winreg_String "offset=cnf_dissect_winreg_String(tvb, offset, pinfo, tree, d # # # -PARAM_VALUE winreg_dissect_element_OpenKey_keyname 2 +PARAM_VALUE winreg_dissect_element_CreateKey_name 2|PIDL_SET_COL_INFO +PARAM_VALUE winreg_dissect_element_DeleteKey_key 2|PIDL_SET_COL_INFO +PARAM_VALUE winreg_dissect_element_LoadKey_keyname 2|PIDL_SET_COL_INFO +PARAM_VALUE winreg_dissect_element_OpenKey_keyname 2|PIDL_SET_COL_INFO +PARAM_VALUE winreg_dissect_element_QueryValue_value_name 2|PIDL_SET_COL_INFO +PARAM_VALUE winreg_dissect_element_SaveKey_filename 2|PIDL_SET_COL_INFO +PARAM_VALUE winreg_dissect_element_SetValue_name 2|PIDL_SET_COL_INFO # # Override the generation of dissectors of the security descriptor and the |