From 457c3f13c0f03cadf7fe0e6ce6b7f177b8970f67 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Thu, 7 Sep 2006 10:53:32 +0000 Subject: pidl now handles empty bitmaps properly so no need for the dummy (dont trigger empty bitmapbug entry) svn path=/trunk/; revision=19170 --- epan/dissectors/packet-dcerpc-winreg.c | 13 ++----------- epan/dissectors/packet-dcerpc-winreg.h | 4 ++-- epan/dissectors/pidl/packet-dcerpc-winreg.c | 9 --------- epan/dissectors/pidl/winreg.cnf | 1 - epan/dissectors/pidl/winreg.idl | 1 - 5 files changed, 4 insertions(+), 24 deletions(-) diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c index bad44dc9c6..e8566dc5c9 100644 --- a/epan/dissectors/packet-dcerpc-winreg.c +++ b/epan/dissectors/packet-dcerpc-winreg.c @@ -3,9 +3,9 @@ from winreg.idl and winreg.cnf. Pidl is a perl based IDL compiler for DCE/RPC idl files. - It is maintained by the Samba team, not the Ethereal team. + 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.ethereal.com/Pidl + found at http://wiki.wireshark.org/Pidl */ @@ -76,7 +76,6 @@ static gint hf_winreg_winreg_QueryInfoKey_num_values = -1; static gint hf_winreg_winreg_InitiateSystemShutdown_reboot = -1; static gint hf_winreg_winreg_CreateKey_new_handle = -1; static gint hf_winreg_winreg_QueryValue_type = -1; -static gint hf_winreg_winreg_AccessMask_CANT_HAVE_EMPTY_BITMAP_PIDL_BUG = -1; static gint hf_winreg_KeySecurityData_data = -1; static gint hf_winreg_QueryMultipleValue_length = -1; static gint hf_winreg_winreg_LoadKey_keyname = -1; @@ -141,10 +140,6 @@ static e_uuid_t uuid_dcerpc_winreg = { }; static guint16 ver_dcerpc_winreg = 1; -static const true_false_string winreg_AccessMask_CANT_HAVE_EMPTY_BITMAP_PIDL_BUG_tfs = { - "CANT_HAVE_EMPTY_BITMAP_PIDL_BUG is SET", - "CANT_HAVE_EMPTY_BITMAP_PIDL_BUG is NOT SET", -}; const value_string winreg_winreg_Type_vals[] = { { REG_NONE, "REG_NONE" }, { REG_SZ, "REG_SZ" }, @@ -375,7 +370,6 @@ static int winreg_dissect_element_OpenHKPN_handle_(tvbuff_t *tvb, int offset, pa static void winreg_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - proto_tree_add_boolean(tree, hf_winreg_winreg_AccessMask_CANT_HAVE_EMPTY_BITMAP_PIDL_BUG, tvb, offset, 4, access); } struct access_mask_info winreg_access_mask_info = { "WINREG", /* Name of specific rights */ @@ -415,7 +409,6 @@ winreg_dissect_bitmap_AccessMask(tvbuff_t *tvb, int offset, packet_info *pinfo, } /* IDL: typedef bitmap { */ -/* IDL: CANT_HAVE_EMPTY_BITMAP_PIDL_BUG = 0x00000001 , */ /* IDL: } winreg_AccessMask; */ /* IDL: typedef enum { */ @@ -3624,8 +3617,6 @@ void proto_register_dcerpc_winreg(void) { "New Handle", "winreg.winreg_CreateKey.new_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }}, { &hf_winreg_winreg_QueryValue_type, { "Type", "winreg.winreg_QueryValue.type", FT_UINT32, BASE_DEC, VALS(winreg_winreg_Type_vals), 0, "", HFILL }}, - { &hf_winreg_winreg_AccessMask_CANT_HAVE_EMPTY_BITMAP_PIDL_BUG, - { "Cant Have Empty Bitmap Pidl Bug", "winreg.winreg_AccessMask.CANT_HAVE_EMPTY_BITMAP_PIDL_BUG", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_CANT_HAVE_EMPTY_BITMAP_PIDL_BUG_tfs), ( 0x00000001 ), "", HFILL }}, { &hf_winreg_KeySecurityData_data, { "Data", "winreg.KeySecurityData.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_winreg_QueryMultipleValue_length, diff --git a/epan/dissectors/packet-dcerpc-winreg.h b/epan/dissectors/packet-dcerpc-winreg.h index 774fb38210..f2387c1130 100644 --- a/epan/dissectors/packet-dcerpc-winreg.h +++ b/epan/dissectors/packet-dcerpc-winreg.h @@ -5,9 +5,9 @@ from winreg.idl and winreg.cnf. Pidl is a perl based IDL compiler for DCE/RPC idl files. - It is maintained by the Samba team, not the Ethereal team. + 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.ethereal.com/Pidl + found at http://wiki.wireshark.org/Pidl */ diff --git a/epan/dissectors/pidl/packet-dcerpc-winreg.c b/epan/dissectors/pidl/packet-dcerpc-winreg.c index edb7d76c3e..e8566dc5c9 100644 --- a/epan/dissectors/pidl/packet-dcerpc-winreg.c +++ b/epan/dissectors/pidl/packet-dcerpc-winreg.c @@ -76,7 +76,6 @@ static gint hf_winreg_winreg_QueryInfoKey_num_values = -1; static gint hf_winreg_winreg_InitiateSystemShutdown_reboot = -1; static gint hf_winreg_winreg_CreateKey_new_handle = -1; static gint hf_winreg_winreg_QueryValue_type = -1; -static gint hf_winreg_winreg_AccessMask_CANT_HAVE_EMPTY_BITMAP_PIDL_BUG = -1; static gint hf_winreg_KeySecurityData_data = -1; static gint hf_winreg_QueryMultipleValue_length = -1; static gint hf_winreg_winreg_LoadKey_keyname = -1; @@ -141,10 +140,6 @@ static e_uuid_t uuid_dcerpc_winreg = { }; static guint16 ver_dcerpc_winreg = 1; -static const true_false_string winreg_AccessMask_CANT_HAVE_EMPTY_BITMAP_PIDL_BUG_tfs = { - "CANT_HAVE_EMPTY_BITMAP_PIDL_BUG is SET", - "CANT_HAVE_EMPTY_BITMAP_PIDL_BUG is NOT SET", -}; const value_string winreg_winreg_Type_vals[] = { { REG_NONE, "REG_NONE" }, { REG_SZ, "REG_SZ" }, @@ -375,7 +370,6 @@ static int winreg_dissect_element_OpenHKPN_handle_(tvbuff_t *tvb, int offset, pa static void winreg_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - proto_tree_add_boolean(tree, hf_winreg_winreg_AccessMask_CANT_HAVE_EMPTY_BITMAP_PIDL_BUG, tvb, offset, 4, access); } struct access_mask_info winreg_access_mask_info = { "WINREG", /* Name of specific rights */ @@ -415,7 +409,6 @@ winreg_dissect_bitmap_AccessMask(tvbuff_t *tvb, int offset, packet_info *pinfo, } /* IDL: typedef bitmap { */ -/* IDL: CANT_HAVE_EMPTY_BITMAP_PIDL_BUG = 0x00000001 , */ /* IDL: } winreg_AccessMask; */ /* IDL: typedef enum { */ @@ -3624,8 +3617,6 @@ void proto_register_dcerpc_winreg(void) { "New Handle", "winreg.winreg_CreateKey.new_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }}, { &hf_winreg_winreg_QueryValue_type, { "Type", "winreg.winreg_QueryValue.type", FT_UINT32, BASE_DEC, VALS(winreg_winreg_Type_vals), 0, "", HFILL }}, - { &hf_winreg_winreg_AccessMask_CANT_HAVE_EMPTY_BITMAP_PIDL_BUG, - { "Cant Have Empty Bitmap Pidl Bug", "winreg.winreg_AccessMask.CANT_HAVE_EMPTY_BITMAP_PIDL_BUG", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_CANT_HAVE_EMPTY_BITMAP_PIDL_BUG_tfs), ( 0x00000001 ), "", HFILL }}, { &hf_winreg_KeySecurityData_data, { "Data", "winreg.KeySecurityData.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }}, { &hf_winreg_QueryMultipleValue_length, diff --git a/epan/dissectors/pidl/winreg.cnf b/epan/dissectors/pidl/winreg.cnf index f44cc742c5..28c2cdf12e 100644 --- a/epan/dissectors/pidl/winreg.cnf +++ b/epan/dissectors/pidl/winreg.cnf @@ -122,7 +122,6 @@ CODE START static void winreg_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - proto_tree_add_boolean(tree, hf_winreg_winreg_AccessMask_CANT_HAVE_EMPTY_BITMAP_PIDL_BUG, tvb, offset, 4, access); } struct access_mask_info winreg_access_mask_info = { diff --git a/epan/dissectors/pidl/winreg.idl b/epan/dissectors/pidl/winreg.idl index bdfeaa5c2d..978529d142 100644 --- a/epan/dissectors/pidl/winreg.idl +++ b/epan/dissectors/pidl/winreg.idl @@ -16,7 +16,6 @@ declare bitmap security_secinfo; typedef [bitmap32bit] bitmap { - CANT_HAVE_EMPTY_BITMAP_PIDL_BUG = 0x00000001 } winreg_AccessMask; typedef [v1_enum] enum { -- cgit v1.2.3