From f4dca9cd1711f47cd90e3b7d3cd1797e9d2822a4 Mon Sep 17 00:00:00 2001
From: Robert Dickenson <robd@reactos.org>
Date: Fri, 23 Aug 2002 08:24:13 +0000
Subject: [PATCH] Added entries for new network applications.

svn path=/trunk/; revision=3377
---
 rosapps/Makefile           | 27 ++++++++++++++++++++++++---
 rosapps/installapps.bat    |  8 ++++++++
 rosapps/winfile/drivebar.c |  3 ++-
 rosapps/winfile/main.c     |  2 ++
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/rosapps/Makefile b/rosapps/Makefile
index 2980b35ed17..b4080e7a945 100644
--- a/rosapps/Makefile
+++ b/rosapps/Makefile
@@ -13,9 +13,30 @@ include rules.mak
 #
 # Available applications
 #
-APPS = cmd cmdutils cmdutils\touch dflat32 hcalc mc notevil sysutils \
-	sysutils\regexpl sysutils\tlist net\finger net\ncftp net\niclist \
-	net\ping net\telnet net\whois regedit regedt32 taskmgr winfile calc
+APPS = 	calc \
+	cmd \
+	cmdutils \
+	cmdutils\touch \
+	dflat32 \
+	hcalc \
+	mc \
+	notevil \
+	sysutils \
+	sysutils\regexpl \
+	sysutils\tlist \
+	net\arp \
+	net\finger \
+	net\ipconfig \
+	net\ncftp \
+	net\netstat \
+	net\niclist \
+	net\ping \
+	net\telnet \
+	net\whois \
+	regedit \
+	regedt32 \
+	taskmgr \
+	winfile
 
 all: $(APPS)
 .PHONY: all
diff --git a/rosapps/installapps.bat b/rosapps/installapps.bat
index 33e5869b1a0..8d860364e4e 100644
--- a/rosapps/installapps.bat
+++ b/rosapps/installapps.bat
@@ -14,13 +14,21 @@ copy cmdutils\tee.exe			%ROS_INSTALL%\bin
 copy cmdutils\more.exe			%ROS_INSTALL%\bin
 copy cmdutils\y.exe			%ROS_INSTALL%\bin
 copy cmdutils\touch\touch.exe		%ROS_INSTALL%\bin
+copy control\control.exe		%ROS_INSTALL%\bin
+copy ctlpanel\roscfg\roscfg.cpl		%ROS_INSTALL%\system32
+copy ctlpanel\rospower\rospower.cpl	%ROS_INSTALL%\system32
 copy dflat32\edit.exe			%ROS_INSTALL%\bin
 copy hcalc\hcalc.exe			%ROS_INSTALL%\bin
 copy mc\release\mc.exe			%ROS_INSTALL%\bin
+copy net\arp\arp.exe	 		%ROS_INSTALL%\bin
+copy net\echo\echo.exe	 		%ROS_INSTALL%\bin
 copy net\finger\finger.exe 		%ROS_INSTALL%\bin
+copy net\ipconfig\ipconfig.exe 		%ROS_INSTALL%\bin
 copy net\ncftp\ncftp.exe 		%ROS_INSTALL%\bin
+copy net\netstat\netstat.exe 		%ROS_INSTALL%\bin
 copy net\niclist\niclist.exe 		%ROS_INSTALL%\bin
 copy net\ping\ping.exe			%ROS_INSTALL%\bin
+copy net\route\route.exe 		%ROS_INSTALL%\bin
 copy net\telnet\telnet.exe 		%ROS_INSTALL%\bin
 copy net\telnet\telnet.cfg 		%ROS_INSTALL%\bin
 copy net\telnet\telnet.ini 		%ROS_INSTALL%\bin
diff --git a/rosapps/winfile/drivebar.c b/rosapps/winfile/drivebar.c
index 695a78e5fb8..754e420a44d 100644
--- a/rosapps/winfile/drivebar.c
+++ b/rosapps/winfile/drivebar.c
@@ -51,7 +51,7 @@ void ConfigureDriveBar(HWND hDriveBar)
     DWORD dwLogicalDrives = GetLogicalDrives();
 
     if (!hDriveBar) return;
-
+#ifndef __GNUC__
     if (dwLogicalDrives != dwLogicalDrivesSaved) {
 	    TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP};
         COMBOBOXEXITEM cbei;
@@ -118,6 +118,7 @@ void ConfigureDriveBar(HWND hDriveBar)
         dwLogicalDrivesSaved = dwLogicalDrives;
 //        SendMessage(Globals.hDriveCombo, CB_SHOWDROPDOWN, (WPARAM)TRUE, (LPARAM)0);
     }
+#endif
 }
 /*
 #ifndef __GNUC__
diff --git a/rosapps/winfile/main.c b/rosapps/winfile/main.c
index ddc6c0c8858..6fb11979652 100644
--- a/rosapps/winfile/main.c
+++ b/rosapps/winfile/main.c
@@ -276,6 +276,7 @@ typedef struct _TBBUTTON {
                 WS_CHILD | WS_BORDER | WS_VISIBLE | CBS_DROPDOWNLIST | ES_LEFT | ES_AUTOVSCROLL | ES_MULTILINE, 
                 10, 0, DRIVEBOX_WIDTH, DRIVEBOX_HEIGHT, Globals.hMainWnd, (HMENU)IDW_DRIVEBOX, hInstance, 0);
 #else
+#ifndef __GNUC__
     Globals.hDriveCombo = CreateWindowEx(0, WC_COMBOBOXEX, NULL,
 					WS_CHILD | WS_BORDER | WS_VISIBLE | CBS_DROPDOWN,
 					// No size yet--resize after setting image list.
@@ -287,6 +288,7 @@ typedef struct _TBBUTTON {
 					(HMENU)IDW_DRIVEBOX,
 					hInstance,
 					NULL);
+#endif
 #endif
             // Set the toolbar window as the parent of the edit control
             // window. You must set the toolbar as the parent of the edit