With the updated pidl it is now possible to generate several

of the dcerpc dissectors again. Commit those of the generated
onces that actually compile.

svn path=/trunk/; revision=53122

8 files changed, 266 insertions, 267 deletions

diff --git a/epan/dissectors/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c
index deafa3f649..401fb9e4b4 100644
--- a/epan/dissectors/packet-dcerpc-atsvc.c
+++ b/epan/dissectors/packet-dcerpc-atsvc.c
@@ -2,9 +2,9 @@
 	This filter was automatically generated
 	from atsvc.idl and atsvc.cnf.
 	
-	Pidl is a perl based IDL compiler for DCE/RPC idl files. 
+	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 
+	Instructions on how to download and install Pidl can be
 	found at http://wiki.wireshark.org/Pidl
 
 	$Id$
@@ -1458,137 +1458,137 @@ static dcerpc_sub_dissector atsvc_dissectors[] = {
 void proto_register_dcerpc_atsvc(void)
 {
 	static hf_register_info hf[] = {
-	{ &hf_atsvc_atsvc_JobEnumInfo_days_of_month, 
+	{ &hf_atsvc_atsvc_JobEnumInfo_days_of_month,
 	  { "Days Of Month", "atsvc.atsvc_JobEnumInfo.days_of_month", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobEnum_resume_handle, 
+	{ &hf_atsvc_atsvc_JobEnum_resume_handle,
 	  { "Resume Handle", "atsvc.atsvc_JobEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_THURSDAY, 
+	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_THURSDAY,
 	  { "Daysofweek Thursday", "atsvc.atsvc_DaysOfWeek.DAYSOFWEEK_THURSDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_THURSDAY_tfs), ( 0x08 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Eight, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Eight,
 	  { "Eight", "atsvc.atsvc_DaysOfMonth.Eight", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Eight_tfs), ( 0x00000080 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Third, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Third,
 	  { "Third", "atsvc.atsvc_DaysOfMonth.Third", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Third_tfs), ( 0x00000004 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobInfo_days_of_week, 
+	{ &hf_atsvc_atsvc_JobInfo_days_of_week,
 	  { "Days Of Week", "atsvc.atsvc_JobInfo.days_of_week", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyseventh, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyseventh,
 	  { "Twentyseventh", "atsvc.atsvc_DaysOfMonth.Twentyseventh", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyseventh_tfs), ( 0x04000000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyth,
 	  { "Twentyth", "atsvc.atsvc_DaysOfMonth.Twentyth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyth_tfs), ( 0x00080000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Seventeenth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Seventeenth,
 	  { "Seventeenth", "atsvc.atsvc_DaysOfMonth.Seventeenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Seventeenth_tfs), ( 0x00010000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_Flags_JOB_RUN_PERIODICALLY, 
+	{ &hf_atsvc_atsvc_Flags_JOB_RUN_PERIODICALLY,
 	  { "Job Run Periodically", "atsvc.atsvc_Flags.JOB_RUN_PERIODICALLY", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_RUN_PERIODICALLY_tfs), ( 0x01 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Fifth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Fifth,
 	  { "Fifth", "atsvc.atsvc_DaysOfMonth.Fifth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Fifth_tfs), ( 0x00000010 ), NULL, HFILL }},
-	{ &hf_atsvc_job_info, 
+	{ &hf_atsvc_job_info,
 	  { "JobInfo", "atcvs.job_info", FT_NONE, BASE_NONE, NULL, 0, "JobInfo structure", HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Thitteenth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Thitteenth,
 	  { "Thitteenth", "atsvc.atsvc_DaysOfMonth.Thitteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Thitteenth_tfs), ( 0x00001000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_enum_ctr_entries_read, 
+	{ &hf_atsvc_atsvc_enum_ctr_entries_read,
 	  { "Entries Read", "atsvc.atsvc_enum_ctr.entries_read", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_enum_ctr_first_entry, 
+	{ &hf_atsvc_atsvc_enum_ctr_first_entry,
 	  { "First Entry", "atsvc.atsvc_enum_ctr.first_entry", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_Flags_JOB_EXEC_ERROR, 
+	{ &hf_atsvc_atsvc_Flags_JOB_EXEC_ERROR,
 	  { "Job Exec Error", "atsvc.atsvc_Flags.JOB_EXEC_ERROR", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_EXEC_ERROR_tfs), ( 0x02 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_Flags_JOB_NONINTERACTIVE, 
+	{ &hf_atsvc_atsvc_Flags_JOB_NONINTERACTIVE,
 	  { "Job Noninteractive", "atsvc.atsvc_Flags.JOB_NONINTERACTIVE", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_NONINTERACTIVE_tfs), ( 0x10 ), NULL, HFILL }},
-	{ &hf_atsvc_opnum, 
+	{ &hf_atsvc_opnum,
 	  { "Operation", "atsvc.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_Flags_JOB_RUNS_TODAY, 
+	{ &hf_atsvc_atsvc_Flags_JOB_RUNS_TODAY,
 	  { "Job Runs Today", "atsvc.atsvc_Flags.JOB_RUNS_TODAY", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_RUNS_TODAY_tfs), ( 0x04 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Eighteenth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Eighteenth,
 	  { "Eighteenth", "atsvc.atsvc_DaysOfMonth.Eighteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Eighteenth_tfs), ( 0x00020000 ), NULL, HFILL }},
-	{ &hf_atsvc_job_id, 
+	{ &hf_atsvc_job_id,
 	  { "Job Id", "atsvc.job_id", FT_UINT32, BASE_DEC, NULL, 0, "Identifier of the scheduled job", HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_SATURDAY, 
+	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_SATURDAY,
 	  { "Daysofweek Saturday", "atsvc.atsvc_DaysOfWeek.DAYSOFWEEK_SATURDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_SATURDAY_tfs), ( 0x20 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Ninteenth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Ninteenth,
 	  { "Ninteenth", "atsvc.atsvc_DaysOfMonth.Ninteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Ninteenth_tfs), ( 0x00040000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_MONDAY, 
+	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_MONDAY,
 	  { "Daysofweek Monday", "atsvc.atsvc_DaysOfWeek.DAYSOFWEEK_MONDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_MONDAY_tfs), ( 0x01 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Twentysecond, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Twentysecond,
 	  { "Twentysecond", "atsvc.atsvc_DaysOfMonth.Twentysecond", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentysecond_tfs), ( 0x00200000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_FRIDAY, 
+	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_FRIDAY,
 	  { "Daysofweek Friday", "atsvc.atsvc_DaysOfWeek.DAYSOFWEEK_FRIDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_FRIDAY_tfs), ( 0x10 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Second, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Second,
 	  { "Second", "atsvc.atsvc_DaysOfMonth.Second", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Second_tfs), ( 0x00000002 ), NULL, HFILL }},
-	{ &hf_atsvc_status, 
+	{ &hf_atsvc_status,
 	  { "NT Error", "atsvc.status", FT_UINT32, BASE_HEX, VALS(NT_errors), 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobEnum_ctr, 
+	{ &hf_atsvc_atsvc_JobEnum_ctr,
 	  { "Ctr", "atsvc.atsvc_JobEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobInfo_command, 
+	{ &hf_atsvc_atsvc_JobInfo_command,
 	  { "Command", "atsvc.atsvc_JobInfo.command", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Sixteenth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Sixteenth,
 	  { "Sixteenth", "atsvc.atsvc_DaysOfMonth.Sixteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Sixteenth_tfs), ( 0x00008000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobEnumInfo_command, 
+	{ &hf_atsvc_atsvc_JobEnumInfo_command,
 	  { "Command", "atsvc.atsvc_JobEnumInfo.command", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_Flags_JOB_ADD_CURRENT_DATE, 
+	{ &hf_atsvc_atsvc_Flags_JOB_ADD_CURRENT_DATE,
 	  { "Job Add Current Date", "atsvc.atsvc_Flags.JOB_ADD_CURRENT_DATE", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_ADD_CURRENT_DATE_tfs), ( 0x08 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Thirtyfirst, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Thirtyfirst,
 	  { "Thirtyfirst", "atsvc.atsvc_DaysOfMonth.Thirtyfirst", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Thirtyfirst_tfs), ( 0x40000000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Fourth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Fourth,
 	  { "Fourth", "atsvc.atsvc_DaysOfMonth.Fourth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Fourth_tfs), ( 0x00000008 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobEnumInfo_days_of_week, 
+	{ &hf_atsvc_atsvc_JobEnumInfo_days_of_week,
 	  { "Days Of Week", "atsvc.atsvc_JobEnumInfo.days_of_week", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_First, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_First,
 	  { "First", "atsvc.atsvc_DaysOfMonth.First", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_First_tfs), ( 0x00000001 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobEnumInfo_job_time, 
+	{ &hf_atsvc_atsvc_JobEnumInfo_job_time,
 	  { "Job Time", "atsvc.atsvc_JobEnumInfo.job_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobEnum_total_entries, 
+	{ &hf_atsvc_atsvc_JobEnum_total_entries,
 	  { "Total Entries", "atsvc.atsvc_JobEnum.total_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyninth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyninth,
 	  { "Twentyninth", "atsvc.atsvc_DaysOfMonth.Twentyninth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyninth_tfs), ( 0x10000000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobDel_max_job_id, 
+	{ &hf_atsvc_atsvc_JobDel_max_job_id,
 	  { "Max Job Id", "atsvc.atsvc_JobDel.max_job_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_TUESDAY, 
+	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_TUESDAY,
 	  { "Daysofweek Tuesday", "atsvc.atsvc_DaysOfWeek.DAYSOFWEEK_TUESDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_TUESDAY_tfs), ( 0x02 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Twentythird, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Twentythird,
 	  { "Twentythird", "atsvc.atsvc_DaysOfMonth.Twentythird", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentythird_tfs), ( 0x00400000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Fifteenth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Fifteenth,
 	  { "Fifteenth", "atsvc.atsvc_DaysOfMonth.Fifteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Fifteenth_tfs), ( 0x00004000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyeighth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyeighth,
 	  { "Twentyeighth", "atsvc.atsvc_DaysOfMonth.Twentyeighth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyeighth_tfs), ( 0x08000000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Twelfth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Twelfth,
 	  { "Twelfth", "atsvc.atsvc_DaysOfMonth.Twelfth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twelfth_tfs), ( 0x00000800 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_WEDNESDAY, 
+	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_WEDNESDAY,
 	  { "Daysofweek Wednesday", "atsvc.atsvc_DaysOfWeek.DAYSOFWEEK_WEDNESDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_WEDNESDAY_tfs), ( 0x04 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobInfo_flags, 
+	{ &hf_atsvc_atsvc_JobInfo_flags,
 	  { "Flags", "atsvc.atsvc_JobInfo.flags", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Seventh, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Seventh,
 	  { "Seventh", "atsvc.atsvc_DaysOfMonth.Seventh", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Seventh_tfs), ( 0x00000040 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyfirst, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyfirst,
 	  { "Twentyfirst", "atsvc.atsvc_DaysOfMonth.Twentyfirst", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyfirst_tfs), ( 0x00100000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Tenth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Tenth,
 	  { "Tenth", "atsvc.atsvc_DaysOfMonth.Tenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Tenth_tfs), ( 0x00000200 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Fourteenth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Fourteenth,
 	  { "Fourteenth", "atsvc.atsvc_DaysOfMonth.Fourteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Fourteenth_tfs), ( 0x00002000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobEnum_preferred_max_len, 
+	{ &hf_atsvc_atsvc_JobEnum_preferred_max_len,
 	  { "Preferred Max Len", "atsvc.atsvc_JobEnum.preferred_max_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyfourth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyfourth,
 	  { "Twentyfourth", "atsvc.atsvc_DaysOfMonth.Twentyfourth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyfourth_tfs), ( 0x00800000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyfifth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyfifth,
 	  { "Twentyfifth", "atsvc.atsvc_DaysOfMonth.Twentyfifth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyfifth_tfs), ( 0x01000000 ), NULL, HFILL }},
-	{ &hf_atsvc_servername, 
+	{ &hf_atsvc_servername,
 	  { "Server", "atsvc.server", FT_STRING, BASE_NONE, NULL, 0, "Name of the server", HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Thirtieth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Thirtieth,
 	  { "Thirtieth", "atsvc.atsvc_DaysOfMonth.Thirtieth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Thirtieth_tfs), ( 0x20000000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_SUNDAY, 
+	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_SUNDAY,
 	  { "Daysofweek Sunday", "atsvc.atsvc_DaysOfWeek.DAYSOFWEEK_SUNDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_SUNDAY_tfs), ( 0x40 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Sixth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Sixth,
 	  { "Sixth", "atsvc.atsvc_DaysOfMonth.Sixth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Sixth_tfs), ( 0x00000020 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobDel_min_job_id, 
+	{ &hf_atsvc_atsvc_JobDel_min_job_id,
 	  { "Min Job Id", "atsvc.atsvc_JobDel.min_job_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobInfo_job_time, 
+	{ &hf_atsvc_atsvc_JobInfo_job_time,
 	  { "Job Time", "atsvc.atsvc_JobInfo.job_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Ninth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Ninth,
 	  { "Ninth", "atsvc.atsvc_DaysOfMonth.Ninth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Ninth_tfs), ( 0x00000100 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Eleventh, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Eleventh,
 	  { "Eleventh", "atsvc.atsvc_DaysOfMonth.Eleventh", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Eleventh_tfs), ( 0x00000400 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_DaysOfMonth_Twentysixth, 
+	{ &hf_atsvc_atsvc_DaysOfMonth_Twentysixth,
 	  { "Twentysixth", "atsvc.atsvc_DaysOfMonth.Twentysixth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentysixth_tfs), ( 0x02000000 ), NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobInfo_days_of_month, 
+	{ &hf_atsvc_atsvc_JobInfo_days_of_month,
 	  { "Days Of Month", "atsvc.atsvc_JobInfo.days_of_month", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_atsvc_atsvc_JobEnumInfo_flags, 
+	{ &hf_atsvc_atsvc_JobEnumInfo_flags,
 	  { "Flags", "atsvc.atsvc_JobEnumInfo.flags", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 	};
 
diff --git a/epan/dissectors/packet-dcerpc-atsvc.h b/epan/dissectors/packet-dcerpc-atsvc.h
index f4eda67f23..c2675f70d3 100644
--- a/epan/dissectors/packet-dcerpc-atsvc.h
+++ b/epan/dissectors/packet-dcerpc-atsvc.h
@@ -4,9 +4,9 @@
 	This filter was automatically generated
 	from atsvc.idl and atsvc.cnf.
 	
-	Pidl is a perl based IDL compiler for DCE/RPC idl files. 
+	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 
+	Instructions on how to download and install Pidl can be
 	found at http://wiki.wireshark.org/Pidl
 
 	$Id$
@@ -16,10 +16,10 @@
 #ifndef __PACKET_DCERPC_ATSVC_H
 #define __PACKET_DCERPC_ATSVC_H
 
-int atsvc_dissect_bitmap_DaysOfMonth(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_);
-int atsvc_dissect_bitmap_Flags(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_);
-int atsvc_dissect_bitmap_DaysOfWeek(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_);
-int atsvc_dissect_struct_JobInfo(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_);
-int atsvc_dissect_struct_JobEnumInfo(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_);
-int atsvc_dissect_struct_enum_ctr(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_);
+int atsvc_dissect_bitmap_DaysOfMonth(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_);
+int atsvc_dissect_bitmap_Flags(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_);
+int atsvc_dissect_bitmap_DaysOfWeek(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_);
+int atsvc_dissect_struct_JobInfo(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_);
+int atsvc_dissect_struct_JobEnumInfo(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_);
+int atsvc_dissect_struct_enum_ctr(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_);
 #endif /* __PACKET_DCERPC_ATSVC_H */
diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c
index 1413f323fa..0f954b397f 100644
--- a/epan/dissectors/packet-dcerpc-initshutdown.c
+++ b/epan/dissectors/packet-dcerpc-initshutdown.c
@@ -2,9 +2,9 @@
 	This filter was automatically generated
 	from initshutdown.idl and initshutdown.cnf.
 	
-	Pidl is a perl based IDL compiler for DCE/RPC idl files. 
+	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 
+	Instructions on how to download and install Pidl can be
 	found at http://wiki.wireshark.org/Pidl
 
 	$Id$
@@ -506,37 +506,37 @@ static dcerpc_sub_dissector initshutdown_dissectors[] = {
 void proto_register_dcerpc_initshutdown(void)
 {
 	static hf_register_info hf[] = {
-	{ &hf_initshutdown_initshutdown_InitEx_do_reboot, 
+	{ &hf_initshutdown_initshutdown_InitEx_do_reboot,
 	  { "Do Reboot", "initshutdown.initshutdown_InitEx.do_reboot", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_InitEx_force_apps, 
+	{ &hf_initshutdown_initshutdown_InitEx_force_apps,
 	  { "Force Apps", "initshutdown.initshutdown_InitEx.force_apps", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_ReasonFlags_SHTDN_REASON_FLAG_PLANNED, 
+	{ &hf_initshutdown_initshutdown_ReasonFlags_SHTDN_REASON_FLAG_PLANNED,
 	  { "Shtdn Reason Flag Planned", "initshutdown.initshutdown_ReasonFlags.SHTDN_REASON_FLAG_PLANNED", FT_BOOLEAN, 32, TFS(&initshutdown_ReasonFlags_SHTDN_REASON_FLAG_PLANNED_tfs), ( 0x80000000 ), NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_ReasonFlags_SHTDN_REASON_FLAG_USER_DEFINED, 
+	{ &hf_initshutdown_initshutdown_ReasonFlags_SHTDN_REASON_FLAG_USER_DEFINED,
 	  { "Shtdn Reason Flag User Defined", "initshutdown.initshutdown_ReasonFlags.SHTDN_REASON_FLAG_USER_DEFINED", FT_BOOLEAN, 32, TFS(&initshutdown_ReasonFlags_SHTDN_REASON_FLAG_USER_DEFINED_tfs), ( 0x40000000 ), NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_InitEx_timeout, 
+	{ &hf_initshutdown_initshutdown_InitEx_timeout,
 	  { "Timeout", "initshutdown.initshutdown_InitEx.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_InitEx_hostname, 
+	{ &hf_initshutdown_initshutdown_InitEx_hostname,
 	  { "Hostname", "initshutdown.initshutdown_InitEx.hostname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_initshutdown_werror, 
+	{ &hf_initshutdown_werror,
 	  { "Windows Error", "initshutdown.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_Abort_server, 
+	{ &hf_initshutdown_initshutdown_Abort_server,
 	  { "Server", "initshutdown.initshutdown_Abort.server", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_initshutdown_opnum, 
+	{ &hf_initshutdown_opnum,
 	  { "Operation", "initshutdown.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_Init_hostname, 
+	{ &hf_initshutdown_initshutdown_Init_hostname,
 	  { "Hostname", "initshutdown.initshutdown_Init.hostname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_InitEx_reason, 
+	{ &hf_initshutdown_initshutdown_InitEx_reason,
 	  { "Reason", "initshutdown.initshutdown_InitEx.reason", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_Init_timeout, 
+	{ &hf_initshutdown_initshutdown_Init_timeout,
 	  { "Timeout", "initshutdown.initshutdown_Init.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_Init_force_apps, 
+	{ &hf_initshutdown_initshutdown_Init_force_apps,
 	  { "Force Apps", "initshutdown.initshutdown_Init.force_apps", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_Init_do_reboot, 
+	{ &hf_initshutdown_initshutdown_Init_do_reboot,
 	  { "Do Reboot", "initshutdown.initshutdown_Init.do_reboot", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_Init_message, 
+	{ &hf_initshutdown_initshutdown_Init_message,
 	  { "Message", "initshutdown.initshutdown_Init.message", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_initshutdown_initshutdown_InitEx_message, 
+	{ &hf_initshutdown_initshutdown_InitEx_message,
 	  { "Message", "initshutdown.initshutdown_InitEx.message", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	};
 
diff --git a/epan/dissectors/packet-dcerpc-initshutdown.h b/epan/dissectors/packet-dcerpc-initshutdown.h
index c7194b3aea..586fb01dfe 100644
--- a/epan/dissectors/packet-dcerpc-initshutdown.h
+++ b/epan/dissectors/packet-dcerpc-initshutdown.h
@@ -4,9 +4,9 @@
 	This filter was automatically generated
 	from initshutdown.idl and initshutdown.cnf.
 	
-	Pidl is a perl based IDL compiler for DCE/RPC idl files. 
+	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 
+	Instructions on how to download and install Pidl can be
 	found at http://wiki.wireshark.org/Pidl
 
 	$Id$
diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c
index 676193c978..8a04160991 100644
--- a/epan/dissectors/packet-dcerpc-winreg.c
+++ b/epan/dissectors/packet-dcerpc-winreg.c
@@ -2,9 +2,9 @@
 	This filter was automatically generated
 	from winreg.idl and winreg.cnf.
 	
-	Pidl is a perl based IDL compiler for DCE/RPC idl files. 
+	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 
+	Instructions on how to download and install Pidl can be
 	found at http://wiki.wireshark.org/Pidl
 
 	$Id$
@@ -590,20 +590,19 @@ struct access_mask_info winreg_access_mask_info = {
 	NULL			/* Standard mapping table */
 };
 static int
-winreg_dissect_element_KeySecurityData_data_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep)
+winreg_dissect_element_KeySecurityData_data_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
 {
 	guint32 len;
-
-    if(di->conformant_run){
+	if(di->conformant_run){
 		/*just a run to handle conformant arrays, nothing to dissect */
 		return offset;
 	}
 	/* this is a varying and conformant array */
-        offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep,
+        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, di, drep,
                                      hf_winreg_sd_max_size, NULL);
-        offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep,
+        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, di, drep,
                                      hf_winreg_sd_offset, NULL);
-        offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep,
+        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, di, drep,
                                      hf_winreg_sd_actual_size, &len);
 	dissect_nt_sec_desc(tvb, offset, pinfo, tree, drep, TRUE, len,
 		&winreg_access_mask_info);
@@ -611,7 +610,7 @@ winreg_dissect_element_KeySecurityData_data_(tvbuff_t *tvb, int offset, packet_i
 	return offset;
 }
 int
-winreg_dissect_bitmap_AccessMask(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, int hf_index _U_, guint32 param _U_)
+winreg_dissect_bitmap_AccessMask(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep, int hf_index _U_, guint32 param _U_)
 {
 	offset = dissect_nt_access_mask(
 		tvb, offset, pinfo, tree, di, drep, hf_winreg_access_mask,
@@ -626,7 +625,7 @@ winreg_dissect_bitmap_AccessMask(tvbuff_t *tvb, int offset, packet_info *pinfo,
  *	} winreg_String;
  */
 static int
-cnf_dissect_winreg_String(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, dcerpc_info *di, guint8 *drep, guint32 param, int hfindex)
+cnf_dissect_winreg_String(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, dcerpc_info* di, guint8 *drep, guint32 param, int hfindex)
 {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
@@ -4876,303 +4875,303 @@ static dcerpc_sub_dissector winreg_dissectors[] = {
 void proto_register_dcerpc_winreg(void)
 {
 	static hf_register_info hf[] = {
-	{ &hf_winreg_winreg_AccessMask_KEY_ENUMERATE_SUB_KEYS, 
+	{ &hf_winreg_winreg_AccessMask_KEY_ENUMERATE_SUB_KEYS,
 	  { "Key Enumerate Sub Keys", "winreg.winreg_AccessMask.KEY_ENUMERATE_SUB_KEYS", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_ENUMERATE_SUB_KEYS_tfs), ( 0x00008 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_NotifyChangeKeyValue_string2, 
+	{ &hf_winreg_winreg_NotifyChangeKeyValue_string2,
 	  { "String2", "winreg.winreg_NotifyChangeKeyValue.string2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_InitiateSystemShutdown_message, 
+	{ &hf_winreg_winreg_InitiateSystemShutdown_message,
 	  { "Message", "winreg.winreg_InitiateSystemShutdown.message", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_String_name, 
+	{ &hf_winreg_winreg_String_name,
 	  { "Name", "winreg.winreg_String.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_InitiateSystemShutdownEx_message, 
+	{ &hf_winreg_winreg_InitiateSystemShutdownEx_message,
 	  { "Message", "winreg.winreg_InitiateSystemShutdownEx.message", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_EnumValue_enum_index, 
+	{ &hf_winreg_winreg_EnumValue_enum_index,
 	  { "Enum Index", "winreg.winreg_EnumValue.enum_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_access_mask, 
+	{ &hf_winreg_access_mask,
 	  { "Access Mask", "winreg.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_CreateKey_options, 
+	{ &hf_winreg_winreg_CreateKey_options,
 	  { "Options", "winreg.winreg_CreateKey.options", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_InitiateSystemShutdownEx_timeout, 
+	{ &hf_winreg_winreg_InitiateSystemShutdownEx_timeout,
 	  { "Timeout", "winreg.winreg_InitiateSystemShutdownEx.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_handle, 
+	{ &hf_winreg_handle,
 	  { "Handle", "winreg.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryInfoKey_max_valnamelen, 
+	{ &hf_winreg_winreg_QueryInfoKey_max_valnamelen,
 	  { "Max Valnamelen", "winreg.winreg_QueryInfoKey.max_valnamelen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_SecBuf_length, 
+	{ &hf_winreg_winreg_SecBuf_length,
 	  { "Length", "winreg.winreg_SecBuf.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_InitiateSystemShutdown_do_reboot, 
+	{ &hf_winreg_winreg_InitiateSystemShutdown_do_reboot,
 	  { "Do Reboot", "winreg.winreg_InitiateSystemShutdown.do_reboot", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_DeleteKeyEx_handle, 
+	{ &hf_winreg_winreg_DeleteKeyEx_handle,
 	  { "Handle", "winreg.winreg_DeleteKeyEx.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues_buffer_size, 
+	{ &hf_winreg_winreg_QueryMultipleValues_buffer_size,
 	  { "Buffer Size", "winreg.winreg_QueryMultipleValues.buffer_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_CreateKey_new_handle, 
+	{ &hf_winreg_winreg_CreateKey_new_handle,
 	  { "New Handle", "winreg.winreg_CreateKey.new_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues2_needed, 
+	{ &hf_winreg_winreg_QueryMultipleValues2_needed,
 	  { "Needed", "winreg.winreg_QueryMultipleValues2.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_QueryMultipleValue_ve_valuelen, 
+	{ &hf_winreg_QueryMultipleValue_ve_valuelen,
 	  { "Ve Valuelen", "winreg.QueryMultipleValue.ve_valuelen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_KeySecurityAttribute_sec_data, 
+	{ &hf_winreg_KeySecurityAttribute_sec_data,
 	  { "Sec Data", "winreg.KeySecurityAttribute.sec_data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_GetKeySecurity_sec_info, 
+	{ &hf_winreg_winreg_GetKeySecurity_sec_info,
 	  { "Sec Info", "winreg.winreg_GetKeySecurity.sec_info", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_SaveKeyEx_handle, 
+	{ &hf_winreg_winreg_SaveKeyEx_handle,
 	  { "Handle", "winreg.winreg_SaveKeyEx.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_KeyOptions_REG_OPTION_VOLATILE, 
+	{ &hf_winreg_winreg_KeyOptions_REG_OPTION_VOLATILE,
 	  { "Reg Option Volatile", "winreg.winreg_KeyOptions.REG_OPTION_VOLATILE", FT_BOOLEAN, 32, TFS(&winreg_KeyOptions_REG_OPTION_VOLATILE_tfs), ( 0x00000001 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues2_num_values, 
+	{ &hf_winreg_winreg_QueryMultipleValues2_num_values,
 	  { "Num Values", "winreg.winreg_QueryMultipleValues2.num_values", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_SetKeySecurity_sec_info, 
+	{ &hf_winreg_winreg_SetKeySecurity_sec_info,
 	  { "Sec Info", "winreg.winreg_SetKeySecurity.sec_info", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_StringBuf_size, 
+	{ &hf_winreg_winreg_StringBuf_size,
 	  { "Size", "winreg.winreg_StringBuf.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_SecBuf_sd, 
+	{ &hf_winreg_winreg_SecBuf_sd,
 	  { "Sd", "winreg.winreg_SecBuf.sd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryInfoKey_secdescsize, 
+	{ &hf_winreg_winreg_QueryInfoKey_secdescsize,
 	  { "Secdescsize", "winreg.winreg_QueryInfoKey.secdescsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_SECURITY, 
+	{ &hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_SECURITY,
 	  { "Reg Notify Change Security", "winreg.winreg_NotifyChangeType.REG_NOTIFY_CHANGE_SECURITY", FT_BOOLEAN, 32, TFS(&winreg_NotifyChangeType_REG_NOTIFY_CHANGE_SECURITY_tfs), ( 0x00000008 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_SetValue_name, 
+	{ &hf_winreg_winreg_SetValue_name,
 	  { "Name", "winreg.winreg_SetValue.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_RestoreKey_flags, 
+	{ &hf_winreg_winreg_RestoreKey_flags,
 	  { "Flags", "winreg.winreg_RestoreKey.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_QueryMultipleValue_ve_type, 
+	{ &hf_winreg_QueryMultipleValue_ve_type,
 	  { "Ve Type", "winreg.QueryMultipleValue.ve_type", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_CreateKey_secdesc, 
+	{ &hf_winreg_winreg_CreateKey_secdesc,
 	  { "Secdesc", "winreg.winreg_CreateKey.secdesc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_DeleteKeyEx_reserved, 
+	{ &hf_winreg_winreg_DeleteKeyEx_reserved,
 	  { "Reserved", "winreg.winreg_DeleteKeyEx.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_InitiateSystemShutdownEx_force_apps, 
+	{ &hf_winreg_winreg_InitiateSystemShutdownEx_force_apps,
 	  { "Force Apps", "winreg.winreg_InitiateSystemShutdownEx.force_apps", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_SetValue_type, 
+	{ &hf_winreg_winreg_SetValue_type,
 	  { "Type", "winreg.winreg_SetValue.type", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_opnum, 
+	{ &hf_winreg_opnum,
 	  { "Operation", "winreg.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_EnumValue_name, 
+	{ &hf_winreg_winreg_EnumValue_name,
 	  { "Name", "winreg.winreg_EnumValue.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_LoadKey_filename, 
+	{ &hf_winreg_winreg_LoadKey_filename,
 	  { "Filename", "winreg.winreg_LoadKey.filename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_AccessMask_KEY_CREATE_LINK, 
+	{ &hf_winreg_winreg_AccessMask_KEY_CREATE_LINK,
 	  { "Key Create Link", "winreg.winreg_AccessMask.KEY_CREATE_LINK", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_CREATE_LINK_tfs), ( 0x00020 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_DeleteValue_value, 
+	{ &hf_winreg_winreg_DeleteValue_value,
 	  { "Value", "winreg.winreg_DeleteValue.value", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues2_offered, 
+	{ &hf_winreg_winreg_QueryMultipleValues2_offered,
 	  { "Offered", "winreg.winreg_QueryMultipleValues2.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues_values_in, 
+	{ &hf_winreg_winreg_QueryMultipleValues_values_in,
 	  { "Values In", "winreg.winreg_QueryMultipleValues.values_in", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_AccessMask_KEY_NOTIFY, 
+	{ &hf_winreg_winreg_AccessMask_KEY_NOTIFY,
 	  { "Key Notify", "winreg.winreg_AccessMask.KEY_NOTIFY", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_NOTIFY_tfs), ( 0x00010 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_OpenKey_parent_handle, 
+	{ &hf_winreg_winreg_OpenKey_parent_handle,
 	  { "Parent Handle", "winreg.winreg_OpenKey.parent_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryInfoKey_num_subkeys, 
+	{ &hf_winreg_winreg_QueryInfoKey_num_subkeys,
 	  { "Num Subkeys", "winreg.winreg_QueryInfoKey.num_subkeys", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_AccessMask_KEY_WOW64_32KEY, 
+	{ &hf_winreg_winreg_AccessMask_KEY_WOW64_32KEY,
 	  { "Key Wow64 32key", "winreg.winreg_AccessMask.KEY_WOW64_32KEY", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_WOW64_32KEY_tfs), ( 0x00200 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_SaveKeyEx_sec_attrib, 
+	{ &hf_winreg_winreg_SaveKeyEx_sec_attrib,
 	  { "Sec Attrib", "winreg.winreg_SaveKeyEx.sec_attrib", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryInfoKey_last_changed_time, 
+	{ &hf_winreg_winreg_QueryInfoKey_last_changed_time,
 	  { "Last Changed Time", "winreg.winreg_QueryInfoKey.last_changed_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_KeyOptions_REG_OPTION_OPEN_LINK, 
+	{ &hf_winreg_winreg_KeyOptions_REG_OPTION_OPEN_LINK,
 	  { "Reg Option Open Link", "winreg.winreg_KeyOptions.REG_OPTION_OPEN_LINK", FT_BOOLEAN, 32, TFS(&winreg_KeyOptions_REG_OPTION_OPEN_LINK_tfs), ( 0x00000008 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_OpenHKPD_access_mask, 
+	{ &hf_winreg_winreg_OpenHKPD_access_mask,
 	  { "Access Mask", "winreg.winreg_OpenHKPD.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_AbortSystemShutdown_server, 
+	{ &hf_winreg_winreg_AbortSystemShutdown_server,
 	  { "Server", "winreg.winreg_AbortSystemShutdown.server", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryValue_type, 
+	{ &hf_winreg_winreg_QueryValue_type,
 	  { "Type", "winreg.winreg_QueryValue.type", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_sd_actual_size, 
+	{ &hf_winreg_sd_actual_size,
 	  { "Actual Size", "winreg.sd.actual_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_RestoreKeyFlags_REG_FORCE_RESTORE, 
+	{ &hf_winreg_winreg_RestoreKeyFlags_REG_FORCE_RESTORE,
 	  { "Reg Force Restore", "winreg.winreg_RestoreKeyFlags.REG_FORCE_RESTORE", FT_BOOLEAN, 32, TFS(&winreg_RestoreKeyFlags_REG_FORCE_RESTORE_tfs), ( 0x00000008 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_SecBuf_inherit, 
+	{ &hf_winreg_winreg_SecBuf_inherit,
 	  { "Inherit", "winreg.winreg_SecBuf.inherit", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_SetValue_size, 
+	{ &hf_winreg_winreg_SetValue_size,
 	  { "Size", "winreg.winreg_SetValue.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_SaveKey_handle, 
+	{ &hf_winreg_winreg_SaveKey_handle,
 	  { "Handle", "winreg.winreg_SaveKey.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_LAST_SET, 
+	{ &hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_LAST_SET,
 	  { "Reg Notify Change Last Set", "winreg.winreg_NotifyChangeType.REG_NOTIFY_CHANGE_LAST_SET", FT_BOOLEAN, 32, TFS(&winreg_NotifyChangeType_REG_NOTIFY_CHANGE_LAST_SET_tfs), ( 0x00000004 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_ReplaceKey_handle, 
+	{ &hf_winreg_winreg_ReplaceKey_handle,
 	  { "Handle", "winreg.winreg_ReplaceKey.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_GetVersion_version, 
+	{ &hf_winreg_winreg_GetVersion_version,
 	  { "Version", "winreg.winreg_GetVersion.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_ReplaceKey_old_file, 
+	{ &hf_winreg_winreg_ReplaceKey_old_file,
 	  { "Old File", "winreg.winreg_ReplaceKey.old_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_AccessMask_KEY_QUERY_VALUE, 
+	{ &hf_winreg_winreg_AccessMask_KEY_QUERY_VALUE,
 	  { "Key Query Value", "winreg.winreg_AccessMask.KEY_QUERY_VALUE", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_QUERY_VALUE_tfs), ( 0x00001 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_CreateKey_action_taken, 
+	{ &hf_winreg_winreg_CreateKey_action_taken,
 	  { "Action Taken", "winreg.winreg_CreateKey.action_taken", FT_UINT32, BASE_DEC, VALS(winreg_winreg_CreateAction_vals), 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryInfoKey_num_values, 
+	{ &hf_winreg_winreg_QueryInfoKey_num_values,
 	  { "Num Values", "winreg.winreg_QueryInfoKey.num_values", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_RestoreKeyFlags_REG_WHOLE_HIVE_VOLATILE, 
+	{ &hf_winreg_winreg_RestoreKeyFlags_REG_WHOLE_HIVE_VOLATILE,
 	  { "Reg Whole Hive Volatile", "winreg.winreg_RestoreKeyFlags.REG_WHOLE_HIVE_VOLATILE", FT_BOOLEAN, 32, TFS(&winreg_RestoreKeyFlags_REG_WHOLE_HIVE_VOLATILE_tfs), ( 0x00000001 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_NAME, 
+	{ &hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_NAME,
 	  { "Reg Notify Change Name", "winreg.winreg_NotifyChangeType.REG_NOTIFY_CHANGE_NAME", FT_BOOLEAN, 32, TFS(&winreg_NotifyChangeType_REG_NOTIFY_CHANGE_NAME_tfs), ( 0x00000001 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_AccessMask_KEY_SET_VALUE, 
+	{ &hf_winreg_winreg_AccessMask_KEY_SET_VALUE,
 	  { "Key Set Value", "winreg.winreg_AccessMask.KEY_SET_VALUE", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_SET_VALUE_tfs), ( 0x00002 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_EnumKey_enum_index, 
+	{ &hf_winreg_winreg_EnumKey_enum_index,
 	  { "Enum Index", "winreg.winreg_EnumKey.enum_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_RestoreKey_handle, 
+	{ &hf_winreg_winreg_RestoreKey_handle,
 	  { "Handle", "winreg.winreg_RestoreKey.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_SetValue_data, 
+	{ &hf_winreg_winreg_SetValue_data,
 	  { "Data", "winreg.winreg_SetValue.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_InitiateSystemShutdown_force_apps, 
+	{ &hf_winreg_winreg_InitiateSystemShutdown_force_apps,
 	  { "Force Apps", "winreg.winreg_InitiateSystemShutdown.force_apps", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_NotifyChangeKeyValue_string1, 
+	{ &hf_winreg_winreg_NotifyChangeKeyValue_string1,
 	  { "String1", "winreg.winreg_NotifyChangeKeyValue.string1", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_SaveKeyEx_flags, 
+	{ &hf_winreg_winreg_SaveKeyEx_flags,
 	  { "Flags", "winreg.winreg_SaveKeyEx.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues_buffer, 
+	{ &hf_winreg_winreg_QueryMultipleValues_buffer,
 	  { "Buffer", "winreg.winreg_QueryMultipleValues.buffer", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryInfoKey_classname, 
+	{ &hf_winreg_winreg_QueryInfoKey_classname,
 	  { "Classname", "winreg.winreg_QueryInfoKey.classname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_AccessMask_KEY_WOW64_64KEY, 
+	{ &hf_winreg_winreg_AccessMask_KEY_WOW64_64KEY,
 	  { "Key Wow64 64key", "winreg.winreg_AccessMask.KEY_WOW64_64KEY", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_WOW64_64KEY_tfs), ( 0x00100 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_ReplaceKey_subkey, 
+	{ &hf_winreg_winreg_ReplaceKey_subkey,
 	  { "Subkey", "winreg.winreg_ReplaceKey.subkey", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_sd_max_size, 
+	{ &hf_winreg_sd_max_size,
 	  { "Max Size", "winreg.sd.max_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryInfoKey_max_classlen, 
+	{ &hf_winreg_winreg_QueryInfoKey_max_classlen,
 	  { "Max Classlen", "winreg.winreg_QueryInfoKey.max_classlen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_ValNameBuf_length, 
+	{ &hf_winreg_winreg_ValNameBuf_length,
 	  { "Length", "winreg.winreg_ValNameBuf.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_NotifyChangeKeyValue_notify_filter, 
+	{ &hf_winreg_winreg_NotifyChangeKeyValue_notify_filter,
 	  { "Notify Filter", "winreg.winreg_NotifyChangeKeyValue.notify_filter", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_UnLoadKey_subkey, 
+	{ &hf_winreg_winreg_UnLoadKey_subkey,
 	  { "Subkey", "winreg.winreg_UnLoadKey.subkey", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_ReplaceKey_new_file, 
+	{ &hf_winreg_winreg_ReplaceKey_new_file,
 	  { "New File", "winreg.winreg_ReplaceKey.new_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_SaveKeyEx_filename, 
+	{ &hf_winreg_winreg_SaveKeyEx_filename,
 	  { "Filename", "winreg.winreg_SaveKeyEx.filename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_QueryMultipleValue_ve_valuename, 
+	{ &hf_winreg_QueryMultipleValue_ve_valuename,
 	  { "Ve Valuename", "winreg.QueryMultipleValue.ve_valuename", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues2_key_handle, 
+	{ &hf_winreg_winreg_QueryMultipleValues2_key_handle,
 	  { "Key Handle", "winreg.winreg_QueryMultipleValues2.key_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_KeySecurityData_size, 
+	{ &hf_winreg_KeySecurityData_size,
 	  { "Size", "winreg.KeySecurityData.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_KeyOptions_REG_OPTION_BACKUP_RESTORE, 
+	{ &hf_winreg_winreg_KeyOptions_REG_OPTION_BACKUP_RESTORE,
 	  { "Reg Option Backup Restore", "winreg.winreg_KeyOptions.REG_OPTION_BACKUP_RESTORE", FT_BOOLEAN, 32, TFS(&winreg_KeyOptions_REG_OPTION_BACKUP_RESTORE_tfs), ( 0x00000004 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_EnumKey_name, 
+	{ &hf_winreg_winreg_EnumKey_name,
 	  { "Name", "winreg.winreg_EnumKey.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_LoadKey_keyname, 
+	{ &hf_winreg_winreg_LoadKey_keyname,
 	  { "Keyname", "winreg.winreg_LoadKey.keyname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues_key_handle, 
+	{ &hf_winreg_winreg_QueryMultipleValues_key_handle,
 	  { "Key Handle", "winreg.winreg_QueryMultipleValues.key_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_EnumValue_type, 
+	{ &hf_winreg_winreg_EnumValue_type,
 	  { "Type", "winreg.winreg_EnumValue.type", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_EnumKey_last_changed_time, 
+	{ &hf_winreg_winreg_EnumKey_last_changed_time,
 	  { "Last Changed Time", "winreg.winreg_EnumKey.last_changed_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_EnumValue_size, 
+	{ &hf_winreg_winreg_EnumValue_size,
 	  { "Size", "winreg.winreg_EnumValue.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_SaveKey_sec_attrib, 
+	{ &hf_winreg_winreg_SaveKey_sec_attrib,
 	  { "Sec Attrib", "winreg.winreg_SaveKey.sec_attrib", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_sd, 
+	{ &hf_winreg_sd,
 	  { "KeySecurityData", "winreg.sd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_KeyOptions_REG_OPTION_CREATE_LINK, 
+	{ &hf_winreg_winreg_KeyOptions_REG_OPTION_CREATE_LINK,
 	  { "Reg Option Create Link", "winreg.winreg_KeyOptions.REG_OPTION_CREATE_LINK", FT_BOOLEAN, 32, TFS(&winreg_KeyOptions_REG_OPTION_CREATE_LINK_tfs), ( 0x00000002 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_OpenKey_options, 
+	{ &hf_winreg_winreg_OpenKey_options,
 	  { "Options", "winreg.winreg_OpenKey.options", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_SaveKey_filename, 
+	{ &hf_winreg_winreg_SaveKey_filename,
 	  { "Filename", "winreg.winreg_SaveKey.filename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryValue_data, 
+	{ &hf_winreg_winreg_QueryValue_data,
 	  { "Data", "winreg.winreg_QueryValue.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues2_buffer, 
+	{ &hf_winreg_winreg_QueryMultipleValues2_buffer,
 	  { "Buffer", "winreg.winreg_QueryMultipleValues2.buffer", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_InitiateSystemShutdown_hostname, 
+	{ &hf_winreg_winreg_InitiateSystemShutdown_hostname,
 	  { "Hostname", "winreg.winreg_InitiateSystemShutdown.hostname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_UnLoadKey_handle, 
+	{ &hf_winreg_winreg_UnLoadKey_handle,
 	  { "Handle", "winreg.winreg_UnLoadKey.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues_values_out, 
+	{ &hf_winreg_winreg_QueryMultipleValues_values_out,
 	  { "Values Out", "winreg.winreg_QueryMultipleValues.values_out", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_KeySecurityData_data, 
+	{ &hf_winreg_KeySecurityData_data,
 	  { "Data", "winreg.KeySecurityData.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_OpenKey_access_mask, 
+	{ &hf_winreg_winreg_OpenKey_access_mask,
 	  { "Access Mask", "winreg.winreg_OpenKey.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_OpenKey_keyname, 
+	{ &hf_winreg_winreg_OpenKey_keyname,
 	  { "Keyname", "winreg.winreg_OpenKey.keyname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_InitiateSystemShutdownEx_do_reboot, 
+	{ &hf_winreg_winreg_InitiateSystemShutdownEx_do_reboot,
 	  { "Do Reboot", "winreg.winreg_InitiateSystemShutdownEx.do_reboot", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_NotifyChangeKeyValue_watch_subtree, 
+	{ &hf_winreg_winreg_NotifyChangeKeyValue_watch_subtree,
 	  { "Watch Subtree", "winreg.winreg_NotifyChangeKeyValue.watch_subtree", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_DeleteKeyEx_access_mask, 
+	{ &hf_winreg_winreg_DeleteKeyEx_access_mask,
 	  { "Access Mask", "winreg.winreg_DeleteKeyEx.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_DeleteKeyEx_key, 
+	{ &hf_winreg_winreg_DeleteKeyEx_key,
 	  { "Key", "winreg.winreg_DeleteKeyEx.key", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryValue_data_length, 
+	{ &hf_winreg_winreg_QueryValue_data_length,
 	  { "Data Length", "winreg.winreg_QueryValue.data_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_KeySecurityData_len, 
+	{ &hf_winreg_KeySecurityData_len,
 	  { "Len", "winreg.KeySecurityData.len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_ValNameBuf_size, 
+	{ &hf_winreg_winreg_ValNameBuf_size,
 	  { "Size", "winreg.winreg_ValNameBuf.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_CreateKey_name, 
+	{ &hf_winreg_winreg_CreateKey_name,
 	  { "Name", "winreg.winreg_CreateKey.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_ATTRIBUTES, 
+	{ &hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_ATTRIBUTES,
 	  { "Reg Notify Change Attributes", "winreg.winreg_NotifyChangeType.REG_NOTIFY_CHANGE_ATTRIBUTES", FT_BOOLEAN, 32, TFS(&winreg_NotifyChangeType_REG_NOTIFY_CHANGE_ATTRIBUTES_tfs), ( 0x00000002 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_String_name_len, 
+	{ &hf_winreg_winreg_String_name_len,
 	  { "Name Len", "winreg.winreg_String.name_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_DeleteKey_key, 
+	{ &hf_winreg_winreg_DeleteKey_key,
 	  { "Key", "winreg.winreg_DeleteKey.key", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryValue_data_size, 
+	{ &hf_winreg_winreg_QueryValue_data_size,
 	  { "Data Size", "winreg.winreg_QueryValue.data_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_system_name, 
+	{ &hf_winreg_system_name,
 	  { "System Name", "winreg.system_name", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_QueryMultipleValue_ve_valueptr, 
+	{ &hf_winreg_QueryMultipleValue_ve_valueptr,
 	  { "Ve Valueptr", "winreg.QueryMultipleValue.ve_valueptr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_KeySecurityAttribute_data_size, 
+	{ &hf_winreg_KeySecurityAttribute_data_size,
 	  { "Data Size", "winreg.KeySecurityAttribute.data_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues_num_values, 
+	{ &hf_winreg_winreg_QueryMultipleValues_num_values,
 	  { "Num Values", "winreg.winreg_QueryMultipleValues.num_values", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_StringBuf_name, 
+	{ &hf_winreg_winreg_StringBuf_name,
 	  { "Name", "winreg.winreg_StringBuf.name", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_NotifyChangeKeyValue_unknown2, 
+	{ &hf_winreg_winreg_NotifyChangeKeyValue_unknown2,
 	  { "Unknown2", "winreg.winreg_NotifyChangeKeyValue.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_sd_offset, 
+	{ &hf_winreg_sd_offset,
 	  { "Offset", "winreg.sd.offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_ValNameBuf_name, 
+	{ &hf_winreg_winreg_ValNameBuf_name,
 	  { "Name", "winreg.winreg_ValNameBuf.name", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_StringBuf_length, 
+	{ &hf_winreg_winreg_StringBuf_length,
 	  { "Length", "winreg.winreg_StringBuf.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues2_values_in, 
+	{ &hf_winreg_winreg_QueryMultipleValues2_values_in,
 	  { "Values In", "winreg.winreg_QueryMultipleValues2.values_in", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_String_name_size, 
+	{ &hf_winreg_winreg_String_name_size,
 	  { "Name Size", "winreg.winreg_String.name_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_NotifyChangeKeyValue_unknown, 
+	{ &hf_winreg_winreg_NotifyChangeKeyValue_unknown,
 	  { "Unknown", "winreg.winreg_NotifyChangeKeyValue.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_AccessMask_KEY_CREATE_SUB_KEY, 
+	{ &hf_winreg_winreg_AccessMask_KEY_CREATE_SUB_KEY,
 	  { "Key Create Sub Key", "winreg.winreg_AccessMask.KEY_CREATE_SUB_KEY", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_CREATE_SUB_KEY_tfs), ( 0x00004 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_RestoreKey_filename, 
+	{ &hf_winreg_winreg_RestoreKey_filename,
 	  { "Filename", "winreg.winreg_RestoreKey.filename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_RestoreKeyFlags_REG_REFRESH_HIVE, 
+	{ &hf_winreg_winreg_RestoreKeyFlags_REG_REFRESH_HIVE,
 	  { "Reg Refresh Hive", "winreg.winreg_RestoreKeyFlags.REG_REFRESH_HIVE", FT_BOOLEAN, 32, TFS(&winreg_RestoreKeyFlags_REG_REFRESH_HIVE_tfs), ( 0x00000002 ), NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryInfoKey_max_valbufsize, 
+	{ &hf_winreg_winreg_QueryInfoKey_max_valbufsize,
 	  { "Max Valbufsize", "winreg.winreg_QueryInfoKey.max_valbufsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_InitiateSystemShutdownEx_reason, 
+	{ &hf_winreg_winreg_InitiateSystemShutdownEx_reason,
 	  { "Reason", "winreg.winreg_InitiateSystemShutdownEx.reason", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_EnumValue_length, 
+	{ &hf_winreg_winreg_EnumValue_length,
 	  { "Length", "winreg.winreg_EnumValue.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryInfoKey_max_subkeylen, 
+	{ &hf_winreg_winreg_QueryInfoKey_max_subkeylen,
 	  { "Max Subkeylen", "winreg.winreg_QueryInfoKey.max_subkeylen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_InitiateSystemShutdown_timeout, 
+	{ &hf_winreg_winreg_InitiateSystemShutdown_timeout,
 	  { "Timeout", "winreg.winreg_InitiateSystemShutdown.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_InitiateSystemShutdownEx_hostname, 
+	{ &hf_winreg_winreg_InitiateSystemShutdownEx_hostname,
 	  { "Hostname", "winreg.winreg_InitiateSystemShutdownEx.hostname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_KeySecurityAttribute_inherit, 
+	{ &hf_winreg_KeySecurityAttribute_inherit,
 	  { "Inherit", "winreg.KeySecurityAttribute.inherit", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_werror, 
+	{ &hf_winreg_werror,
 	  { "Windows Error", "winreg.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryMultipleValues2_values_out, 
+	{ &hf_winreg_winreg_QueryMultipleValues2_values_out,
 	  { "Values Out", "winreg.winreg_QueryMultipleValues2.values_out", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_EnumKey_keyclass, 
+	{ &hf_winreg_winreg_EnumKey_keyclass,
 	  { "Keyclass", "winreg.winreg_EnumKey.keyclass", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_CreateKey_keyclass, 
+	{ &hf_winreg_winreg_CreateKey_keyclass,
 	  { "Keyclass", "winreg.winreg_CreateKey.keyclass", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_EnumValue_value, 
+	{ &hf_winreg_winreg_EnumValue_value,
 	  { "Value", "winreg.winreg_EnumValue.value", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_OpenHKCU_access_mask, 
+	{ &hf_winreg_winreg_OpenHKCU_access_mask,
 	  { "Access Mask", "winreg.winreg_OpenHKCU.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_QueryValue_value_name, 
+	{ &hf_winreg_winreg_QueryValue_value_name,
 	  { "Value Name", "winreg.winreg_QueryValue.value_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_winreg_winreg_RestoreKeyFlags_REG_NO_LAZY_FLUSH, 
+	{ &hf_winreg_winreg_RestoreKeyFlags_REG_NO_LAZY_FLUSH,
 	  { "Reg No Lazy Flush", "winreg.winreg_RestoreKeyFlags.REG_NO_LAZY_FLUSH", FT_BOOLEAN, 32, TFS(&winreg_RestoreKeyFlags_REG_NO_LAZY_FLUSH_tfs), ( 0x00000004 ), NULL, HFILL }},
 	};
 
diff --git a/epan/dissectors/packet-dcerpc-winreg.h b/epan/dissectors/packet-dcerpc-winreg.h
index fa421c4508..49cf16eee6 100644
--- a/epan/dissectors/packet-dcerpc-winreg.h
+++ b/epan/dissectors/packet-dcerpc-winreg.h
@@ -4,9 +4,9 @@
 	This filter was automatically generated
 	from winreg.idl and winreg.cnf.
 	
-	Pidl is a perl based IDL compiler for DCE/RPC idl files. 
+	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 
+	Instructions on how to download and install Pidl can be
 	found at http://wiki.wireshark.org/Pidl
 
 	$Id$
@@ -28,12 +28,12 @@
 
 #define REG_OPTION_NON_VOLATILE	( 0x00000000 )
 
-int winreg_dissect_bitmap_security_secinfo(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_);
-int winreg_dissect_bitmap_AccessMask(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_);
+int winreg_dissect_bitmap_security_secinfo(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_);
+int winreg_dissect_bitmap_AccessMask(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_);
 int winreg_dissect_struct_String(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_);
 int winreg_dissect_struct_KeySecurityData(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_);
 int winreg_dissect_struct_SecBuf(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_);
-int winreg_dissect_bitmap_KeyOptions(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_);
+int winreg_dissect_bitmap_KeyOptions(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_);
 #define REG_ACTION_NONE (0)
 #define REG_CREATED_NEW_KEY (1)
 #define REG_OPENED_EXISTING_KEY (2)
@@ -41,8 +41,8 @@ extern const value_string winreg_winreg_CreateAction_vals[];
 int winreg_dissect_enum_CreateAction(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_);
 int winreg_dissect_struct_StringBuf(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_);
 int winreg_dissect_struct_ValNameBuf(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_);
-int winreg_dissect_bitmap_NotifyChangeType(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_);
-int winreg_dissect_bitmap_RestoreKeyFlags(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_);
+int winreg_dissect_bitmap_NotifyChangeType(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_);
+int winreg_dissect_bitmap_RestoreKeyFlags(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_);
 int winreg_dissect_struct_KeySecurityAttribute(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_);
 int winreg_dissect_struct_QueryMultipleValue(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_);
 #endif /* __PACKET_DCERPC_WINREG_H */
diff --git a/epan/dissectors/packet-dcerpc-wzcsvc.c b/epan/dissectors/packet-dcerpc-wzcsvc.c
index 45b503d864..42fac9067f 100644
--- a/epan/dissectors/packet-dcerpc-wzcsvc.c
+++ b/epan/dissectors/packet-dcerpc-wzcsvc.c
@@ -2,9 +2,9 @@
 	This filter was automatically generated
 	from wzcsvc.idl and wzcsvc.cnf.
 	
-	Pidl is a perl based IDL compiler for DCE/RPC idl files. 
+	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 
+	Instructions on how to download and install Pidl can be
 	found at http://wiki.wireshark.org/Pidl
 
 	$Id$
@@ -414,7 +414,7 @@ static dcerpc_sub_dissector wzcsvc_dissectors[] = {
 void proto_register_dcerpc_wzcsvc(void)
 {
 	static hf_register_info hf[] = {
-	{ &hf_wzcsvc_opnum, 
+	{ &hf_wzcsvc_opnum,
 	  { "Operation", "wzcsvc.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	};
 
diff --git a/epan/dissectors/packet-dcerpc-wzcsvc.h b/epan/dissectors/packet-dcerpc-wzcsvc.h
index a1fa6660c5..b5204b1bfb 100644
--- a/epan/dissectors/packet-dcerpc-wzcsvc.h
+++ b/epan/dissectors/packet-dcerpc-wzcsvc.h
@@ -4,9 +4,9 @@
 	This filter was automatically generated
 	from wzcsvc.idl and wzcsvc.cnf.
 	
-	Pidl is a perl based IDL compiler for DCE/RPC idl files. 
+	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 
+	Instructions on how to download and install Pidl can be
 	found at http://wiki.wireshark.org/Pidl
 
 	$Id$