--- sbbs/sbbs3/ctrl/sbbsctrl.cpp	2018/04/24 16:39:34	1.1.1.1
+++ sbbs/sbbs3/ctrl/sbbsctrl.cpp	2018/04/24 16:40:49	1.1.1.2
@@ -1,12 +1,12 @@
 /* Synchronet Control Panel (GUI Borland C++ Builder Project for Win32) */
 
-/* $Id: sbbsctrl.cpp,v 1.1.1.1 2018/04/24 16:39:34 root Exp $ */
+/* $Id: sbbsctrl.cpp,v 1.1.1.2 2018/04/24 16:40:49 root Exp $ */
 
 /****************************************************************************
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2000 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -36,15 +36,8 @@
 //---------------------------------------------------------------------------
 #include <vcl.h>
 #pragma hdrstop
-USERES("sbbsctrl.res");
 USEFORM("MainFormUnit.cpp", MainForm);
 USEFORM("CtrlPathDialogUnit.cpp", CtrlPathDialog);
-USEFORM("TelnetCfgDlgUnit.cpp", TelnetCfgDlg);
-USELIB("sbbs.lib");
-USELIB("mailsrvr.lib");
-USELIB("ftpsrvr.lib");
-USEFORM("MailCfgDlgUnit.cpp", MailCfgDlg);
-USEFORM("FtpCfgDlgUnit.cpp", FtpCfgDlg);
 USEFORM("TextFileEditUnit.cpp", TextFileEditForm);
 USEFORM("TelnetFormUnit.cpp", TelnetForm);
 USEFORM("FtpFormUnit.cpp", FtpForm);
@@ -56,17 +49,27 @@ USEFORM("StatsLogFormUnit.cpp", StatsLog
 USEFORM("CodeInputFormUnit.cpp", CodeInputForm);
 USEFORM("ClientFormUnit.cpp", ClientForm);
 USEFORM("SpyFormUnit.cpp", SpyForm);
-USEUNIT("..\ringbuf.c");
-USEUNIT("emulvt.pas");
 USEFORM("UserListFormUnit.cpp", UserListForm);
 USEFORM("UserMsgFormUnit.cpp", UserMsgForm);
+USEFORM("PropertiesDlgUnit.cpp", PropertiesDlg);
+USEFORM("EventsFormUnit.cpp", EventsForm);
+USEFORM("ConfigWizardUnit.cpp", ConfigWizardForm);
+USEFORM("ServicesFormUnit.cpp", ServicesForm);
+USEFORM("TelnetCfgDlgUnit.cpp", TelnetCfgDlg);
+USEFORM("MailCfgDlgUnit.cpp", MailCfgDlg);
+USEFORM("FtpCfgDlgUnit.cpp", FtpCfgDlg);
+USEFORM("ServicesCfgDlgUnit.cpp", ServicesCfgDlg);
+USEFORM("PreviewFormUnit.cpp", PreviewForm);
+USEFORM("WebFormUnit.cpp", WebForm);
+USEFORM("WebCfgDlgUnit.cpp", WebCfgDlg);
 //---------------------------------------------------------------------------
 #include "MainFormUnit.h"
 #include "SpyFormUnit.h"
 #include "CtrlPathDialogUnit.h"
+#include "sbbs_ini.h"   // sbbs_get_ini_fname
 TSpyForm *SpyForms[MAX_NODES];
 //---------------------------------------------------------------------------
-WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR cmd, int)
 {
     memset(SpyForms,0,sizeof(SpyForms));
     try
@@ -76,12 +79,18 @@ WINAPI WinMain(HINSTANCE, HINSTANCE, LPS
 		Application->CreateForm(__classid(TMainForm), &MainForm);
          Application->CreateForm(__classid(TTelnetForm), &TelnetForm);
          Application->CreateForm(__classid(TFtpForm), &FtpForm);
+         Application->CreateForm(__classid(TWebForm), &WebForm);
          Application->CreateForm(__classid(TMailForm), &MailForm);
          Application->CreateForm(__classid(TNodeForm), &NodeForm);
          Application->CreateForm(__classid(TStatsForm), &StatsForm);
          Application->CreateForm(__classid(TClientForm), &ClientForm);
          Application->CreateForm(__classid(TUserListForm), &UserListForm);
-         Application->Run();
+         Application->CreateForm(__classid(TEventsForm), &EventsForm);
+         Application->CreateForm(__classid(TServicesForm), &ServicesForm);
+         if(cmd[0] && isdir(cmd))
+            SAFECOPY(MainForm->global.ctrl_dir,cmd);
+         sbbs_get_ini_fname(MainForm->ini_file, MainForm->global.ctrl_dir, NULL /* auto-hostname */);
+		Application->Run();
     }
     catch (Exception &exception)
     {