From 3b7347ce43dc2b0ae8e5d996e2141ede5977a282 Mon Sep 17 00:00:00 2001
From: Ulf Lamping <ulf.lamping@web.de>
Date: Sun, 13 Apr 2008 11:55:20 +0000
Subject: [PATCH] sort entries, update Visual Studio (ghost) project

svn path=/trunk/; revision=24971
---
 gtk/Makefile.common |  30 +--
 gtk/libui.vcproj    | 594 +++++++++++++++++++++++---------------------
 2 files changed, 320 insertions(+), 304 deletions(-)

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index b2d92b1eb7..ca5147f72e 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -40,8 +40,8 @@ WIRESHARK_GTK_SRC = \
 	airpcap_gui_utils.c \
 	capture_dlg.c	\
 	capture_file_dlg.c	\
-	capture_if_dlg.c	\
 	capture_if_details_dlg.c	\
+	capture_if_dlg.c	\
 	capture_info_dlg.c	\
 	capture_prefs.c	\
 	cfilter_combo_utils.c	\
@@ -52,12 +52,11 @@ WIRESHARK_GTK_SRC = \
 	column_prefs.c	\
 	conversations_table.c	\
 	decode_as_ber.c	\
-	decode_as_dlg.c	\
 	decode_as_dcerpc.c	\
+	decode_as_dlg.c	\
 	dfilter_expr_dlg.c	\
 	dlg_utils.c	\
 	drag_and_drop.c 	\
-	wireshark-tap-register.c	\
 	expert_comp_table.c    \
 	export_object.c	       \
 	export_object_http.c   \
@@ -74,8 +73,8 @@ WIRESHARK_GTK_SRC = \
 	goto_dlg.c	\
 	graph_analysis.c \
 	gtkvumeter.c	\
-	gui_stat_util.c	\
 	gui_prefs.c	\
+	gui_stat_util.c	\
 	gui_utils.c	\
 	help_dlg.c	\
 	hostlist_table.c \
@@ -90,6 +89,7 @@ WIRESHARK_GTK_SRC = \
 	main_statusbar.c		\
 	main_toolbar.c	\
 	main_welcome.c		\
+	mcast_stream.c	\
 	nameres_prefs.c	\
 	packet_history.c	\
 	packet_win.c	\
@@ -107,11 +107,10 @@ WIRESHARK_GTK_SRC = \
 	rtp_player.c	\
 	rtp_player_prefs.c	\
 	rtp_stream.c	\
-	mcast_stream.c	\
-	sctp_stat.c	\
-	sctp_graph_dlg.c	\
 	sctp_byte_graph_dlg.c	\
 	sctp_error_dlg.c	\
+	sctp_graph_dlg.c	\
+	sctp_stat.c	\
 	service_response_time_table.c	\
 	simple_dialog.c	\
 	stock_icons.c	\
@@ -123,7 +122,8 @@ WIRESHARK_GTK_SRC = \
 	u3.c		\
 	uat_gui.c	\
 	voip_calls.c	\
-	webbrowser.c
+	webbrowser.c	\
+	wireshark-tap-register.c
 
 about_dlg.c: ../image/wssplash.xpm
 
@@ -175,6 +175,7 @@ WIRESHARK_TAP_SRC = \
 	hostlist_wlan.c \
 	io_stat.c	\
 	ldap_stat.c	\
+	mcast_stream_dlg.c	\
 	mgcp_stat.c	\
 	mtp3_stat.c	\
 	mtp3_summary.c	\
@@ -184,16 +185,15 @@ WIRESHARK_TAP_SRC = \
 	rpc_stat.c	\
 	rtp_analysis.c	\
 	rtp_stream_dlg.c	\
-	mcast_stream_dlg.c	\
-	stats_tree_stat.c	\
 	scsi_stat.c	\
 	sctp_assoc_analyse.c	\
-	sctp_chunk_stat_dlg.c	\
 	sctp_chunk_stat.c	\
+	sctp_chunk_stat_dlg.c	\
 	sctp_stat_dlg.c	\
 	sip_stat.c	\
 	smb_stat.c	\
 	smb2_stat.c	\
+	stats_tree_stat.c	\
 	t38_analysis.c  \
 	tcp_graph.c	\
 	voip_calls_dlg.c \
@@ -238,8 +238,9 @@ noinst_HEADERS = \
 	gsm_map_stat.h	\
 	gtkglobals.h	\
 	gtkvumeter.h \
-	gui_stat_util.h \
 	gui_prefs.h	\
+	gui_stat_menu.h	\
+	gui_stat_util.h \
 	gui_utils.h	\
 	help_dlg.h	\
 	hostlist_table.h \
@@ -256,6 +257,8 @@ noinst_HEADERS = \
 	main_statusbar.h		\
 	main_toolbar.h	\
 	main_welcome.h		\
+	mcast_stream.h  \
+	mcast_stream_dlg.h \
 	mtp3_stat.h	\
 	nameres_prefs.h	\
 	packet_history.h	\
@@ -274,12 +277,9 @@ noinst_HEADERS = \
 	rtp_player_prefs.h 	\
 	rtp_stream.h	\
 	rtp_stream_dlg.h \
-	mcast_stream.h  \
-	mcast_stream_dlg.h \
 	sat.h		\
 	sctp_stat.h	\
 	service_response_time_table.h	\
-	gui_stat_menu.h	\
 	stock_icons.h	\
 	stream_prefs.h	\
 	summary_dlg.h   \
diff --git a/gtk/libui.vcproj b/gtk/libui.vcproj
index 71f5db57c6..8781876a2e 100644
--- a/gtk/libui.vcproj
+++ b/gtk/libui.vcproj
@@ -46,7 +46,7 @@
 				ReBuildCommandLine=""
 				CleanCommandLine=""
 				Output="libui.exe"
-				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LIBPCAP"
+				PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LIBPCAP;HAVE_LIBPORTAUDIO"
 				IncludeSearchPath=""
 				ForcedIncludes=""
 				AssemblySearchPath=""
@@ -67,10 +67,6 @@
 				RelativePath=".\about_dlg.c"
 				>
 			</File>
-			<File
-				RelativePath=".\afp_stat.c"
-				>
-			</File>
 			<File
 				RelativePath=".\airpcap_dlg.c"
 				>
@@ -79,26 +75,6 @@
 				RelativePath=".\airpcap_gui_utils.c"
 				>
 			</File>
-			<File
-				RelativePath=".\ansi_a_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ansi_map_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\bootp_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\camel_counter.c"
-				>
-			</File>
-			<File
-				RelativePath=".\camel_srt.c"
-				>
-			</File>
 			<File
 				RelativePath=".\capture_dlg.c"
 				>
@@ -147,70 +123,10 @@
 				RelativePath=".\column_prefs.c"
 				>
 			</File>
-			<File
-				RelativePath=".\conversations_eth.c"
-				>
-			</File>
-			<File
-				RelativePath=".\conversations_fc.c"
-				>
-			</File>
-			<File
-				RelativePath=".\conversations_fddi.c"
-				>
-			</File>
-			<File
-				RelativePath=".\conversations_ip.c"
-				>
-			</File>
-			<File
-				RelativePath=".\conversations_ipx.c"
-				>
-			</File>
-			<File
-				RelativePath=".\conversations_jxta.c"
-				>
-			</File>
-			<File
-				RelativePath=".\conversations_ncp.c"
-				>
-			</File>
-			<File
-				RelativePath=".\conversations_rsvp.c"
-				>
-			</File>
-			<File
-				RelativePath=".\conversations_sctp.c"
-				>
-			</File>
 			<File
 				RelativePath=".\conversations_table.c"
 				>
 			</File>
-			<File
-				RelativePath=".\conversations_tcpip.c"
-				>
-			</File>
-			<File
-				RelativePath=".\conversations_tr.c"
-				>
-			</File>
-			<File
-				RelativePath=".\conversations_udpip.c"
-				>
-			</File>
-			<File
-				RelativePath=".\conversations_usb.c"
-				>
-			</File>
-			<File
-				RelativePath=".\conversations_wlan.c"
-				>
-			</File>
-			<File
-				RelativePath=".\dcerpc_stat.c"
-				>
-			</File>
 			<File
 				RelativePath=".\decode_as_ber.c"
 				>
@@ -235,18 +151,10 @@
 				RelativePath=".\drag_and_drop.c"
 				>
 			</File>
-			<File
-				RelativePath=".\expert_comp_dlg.c"
-				>
-			</File>
 			<File
 				RelativePath=".\expert_comp_table.c"
 				>
 			</File>
-			<File
-				RelativePath=".\expert_dlg.c"
-				>
-			</File>
 			<File
 				RelativePath=".\export_object.c"
 				>
@@ -255,10 +163,6 @@
 				RelativePath=".\export_object_http.c"
 				>
 			</File>
-			<File
-				RelativePath=".\fc_stat.c"
-				>
-			</File>
 			<File
 				RelativePath=".\file_dlg.c"
 				>
@@ -279,10 +183,6 @@
 				RelativePath=".\firewall_dlg.c"
 				>
 			</File>
-			<File
-				RelativePath=".\flow_graph.c"
-				>
-			</File>
 			<File
 				RelativePath=".\follow_ssl.c"
 				>
@@ -303,10 +203,6 @@
 				RelativePath=".\font_utils.c"
 				>
 			</File>
-			<File
-				RelativePath=".\funnel_stat.c"
-				>
-			</File>
 			<File
 				RelativePath=".\goto_dlg.c"
 				>
@@ -315,18 +211,6 @@
 				RelativePath=".\graph_analysis.c"
 				>
 			</File>
-			<File
-				RelativePath=".\gsm_a_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\gsm_map_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\gsm_map_summary.c"
-				>
-			</File>
 			<File
 				RelativePath=".\gtkvumeter.c"
 				>
@@ -343,90 +227,18 @@
 				RelativePath=".\gui_utils.c"
 				>
 			</File>
-			<File
-				RelativePath=".\h225_counter.c"
-				>
-			</File>
-			<File
-				RelativePath=".\h225_ras_srt.c"
-				>
-			</File>
 			<File
 				RelativePath=".\help_dlg.c"
 				>
 			</File>
-			<File
-				RelativePath=".\hostlist_eth.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hostlist_fc.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hostlist_fddi.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hostlist_ip.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hostlist_ipx.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hostlist_jxta.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hostlist_ncp.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hostlist_rsvp.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hostlist_sctp.c"
-				>
-			</File>
 			<File
 				RelativePath=".\hostlist_table.c"
 				>
 			</File>
-			<File
-				RelativePath=".\hostlist_tcpip.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hostlist_tr.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hostlist_udpip.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hostlist_usb.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hostlist_wlan.c"
-				>
-			</File>
-			<File
-				RelativePath=".\io_stat.c"
-				>
-			</File>
 			<File
 				RelativePath=".\layout_prefs.c"
 				>
 			</File>
-			<File
-				RelativePath=".\ldap_stat.c"
-				>
-			</File>
 			<File
 				RelativePath=".\macros_dlg.c"
 				>
@@ -435,6 +247,14 @@
 				RelativePath=".\main.c"
 				>
 			</File>
+			<File
+				RelativePath=".\main_airpcap_toolbar.c"
+				>
+			</File>
+			<File
+				RelativePath=".\main_filter_toolbar.c"
+				>
+			</File>
 			<File
 				RelativePath=".\main_menu.c"
 				>
@@ -463,30 +283,10 @@
 				RelativePath=".\mcast_stream.c"
 				>
 			</File>
-			<File
-				RelativePath=".\mcast_stream_dlg.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mgcp_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mtp3_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mtp3_summary.c"
-				>
-			</File>
 			<File
 				RelativePath=".\nameres_prefs.c"
 				>
 			</File>
-			<File
-				RelativePath=".\ncp_stat.c"
-				>
-			</File>
 			<File
 				RelativePath=".\packet_history.c"
 				>
@@ -535,10 +335,6 @@
 				RelativePath=".\proto_hier_stats_dlg.c"
 				>
 			</File>
-			<File
-				RelativePath=".\radius_stat.c"
-				>
-			</File>
 			<File
 				RelativePath=".\range_utils.c"
 				>
@@ -547,18 +343,6 @@
 				RelativePath=".\recent.c"
 				>
 			</File>
-			<File
-				RelativePath=".\rpc_progs.c"
-				>
-			</File>
-			<File
-				RelativePath=".\rpc_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\rtp_analysis.c"
-				>
-			</File>
 			<File
 				RelativePath=".\rtp_player.c"
 				>
@@ -571,30 +355,10 @@
 				RelativePath=".\rtp_stream.c"
 				>
 			</File>
-			<File
-				RelativePath=".\rtp_stream_dlg.c"
-				>
-			</File>
-			<File
-				RelativePath=".\scsi_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\sctp_assoc_analyse.c"
-				>
-			</File>
 			<File
 				RelativePath=".\sctp_byte_graph_dlg.c"
 				>
 			</File>
-			<File
-				RelativePath=".\sctp_chunk_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\sctp_chunk_stat_dlg.c"
-				>
-			</File>
 			<File
 				RelativePath=".\sctp_error_dlg.c"
 				>
@@ -607,10 +371,6 @@
 				RelativePath=".\sctp_stat.c"
 				>
 			</File>
-			<File
-				RelativePath=".\sctp_stat_dlg.c"
-				>
-			</File>
 			<File
 				RelativePath=".\service_response_time_table.c"
 				>
@@ -619,22 +379,6 @@
 				RelativePath=".\simple_dialog.c"
 				>
 			</File>
-			<File
-				RelativePath=".\sip_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\smb2_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\smb_stat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\stats_tree_stat.c"
-				>
-			</File>
 			<File
 				RelativePath=".\stock_icons.c"
 				>
@@ -651,18 +395,10 @@
 				RelativePath=".\supported_protos_dlg.c"
 				>
 			</File>
-			<File
-				RelativePath=".\t38_analysis.c"
-				>
-			</File>
 			<File
 				RelativePath=".\tap_dfilter_dlg.c"
 				>
 			</File>
-			<File
-				RelativePath=".\tcp_graph.c"
-				>
-			</File>
 			<File
 				RelativePath=".\text_page.c"
 				>
@@ -679,10 +415,6 @@
 				RelativePath=".\voip_calls.c"
 				>
 			</File>
-			<File
-				RelativePath=".\voip_calls_dlg.c"
-				>
-			</File>
 			<File
 				RelativePath=".\webbrowser.c"
 				>
@@ -695,14 +427,294 @@
 				RelativePath=".\wireshark-tap-register.c"
 				>
 			</File>
-			<File
-				RelativePath=".\wlan_stat_dlg.c"
+			<Filter
+				Name="Taps"
 				>
-			</File>
-			<File
-				RelativePath=".\wsp_stat.c"
-				>
-			</File>
+				<File
+					RelativePath=".\afp_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\ansi_a_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\ansi_map_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\bootp_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\camel_counter.c"
+					>
+				</File>
+				<File
+					RelativePath=".\camel_srt.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_eth.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_fc.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_fddi.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_ip.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_ipx.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_jxta.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_ncp.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_rsvp.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_sctp.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_tcpip.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_tr.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_udpip.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_usb.c"
+					>
+				</File>
+				<File
+					RelativePath=".\conversations_wlan.c"
+					>
+				</File>
+				<File
+					RelativePath=".\dcerpc_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\expert_comp_dlg.c"
+					>
+				</File>
+				<File
+					RelativePath=".\expert_dlg.c"
+					>
+				</File>
+				<File
+					RelativePath=".\fc_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\flow_graph.c"
+					>
+				</File>
+				<File
+					RelativePath=".\funnel_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\gsm_a_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\gsm_map_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\gsm_map_summary.c"
+					>
+				</File>
+				<File
+					RelativePath=".\h225_counter.c"
+					>
+				</File>
+				<File
+					RelativePath=".\h225_ras_srt.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_eth.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_fc.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_fddi.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_ip.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_ipx.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_jxta.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_ncp.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_rsvp.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_sctp.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_tcpip.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_tr.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_udpip.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_usb.c"
+					>
+				</File>
+				<File
+					RelativePath=".\hostlist_wlan.c"
+					>
+				</File>
+				<File
+					RelativePath=".\io_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\ldap_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\mcast_stream_dlg.c"
+					>
+				</File>
+				<File
+					RelativePath=".\mgcp_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\mtp3_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\mtp3_summary.c"
+					>
+				</File>
+				<File
+					RelativePath=".\ncp_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\radius_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\rpc_progs.c"
+					>
+				</File>
+				<File
+					RelativePath=".\rpc_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\rtp_analysis.c"
+					>
+				</File>
+				<File
+					RelativePath=".\rtp_stream_dlg.c"
+					>
+				</File>
+				<File
+					RelativePath=".\scsi_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\sctp_assoc_analyse.c"
+					>
+				</File>
+				<File
+					RelativePath=".\sctp_chunk_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\sctp_chunk_stat_dlg.c"
+					>
+				</File>
+				<File
+					RelativePath=".\sctp_stat_dlg.c"
+					>
+				</File>
+				<File
+					RelativePath=".\sip_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\smb2_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\smb_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\stats_tree_stat.c"
+					>
+				</File>
+				<File
+					RelativePath=".\t38_analysis.c"
+					>
+				</File>
+				<File
+					RelativePath=".\tcp_graph.c"
+					>
+				</File>
+				<File
+					RelativePath=".\voip_calls_dlg.c"
+					>
+				</File>
+				<File
+					RelativePath=".\wlan_stat_dlg.c"
+					>
+				</File>
+				<File
+					RelativePath=".\wsp_stat.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -790,7 +802,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\ethclist.h"
+				RelativePath=".\expert_comp_dlg.h"
 				>
 			</File>
 			<File
@@ -905,6 +917,14 @@
 				RelativePath=".\main.h"
 				>
 			</File>
+			<File
+				RelativePath=".\main_airpcap_toolbar.h"
+				>
+			</File>
+			<File
+				RelativePath=".\main_filter_toolbar.h"
+				>
+			</File>
 			<File
 				RelativePath=".\main_menu.h"
 				>
@@ -1025,10 +1045,6 @@
 				RelativePath=".\service_response_time_table.h"
 				>
 			</File>
-			<File
-				RelativePath=".\ssl-dlg.h"
-				>
-			</File>
 			<File
 				RelativePath=".\stock_icons.h"
 				>