X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Fwin32service.cpp;h=59a06b7097dd6ebf2af7bd664137b42fafce1379;hb=33f4713fbdb53a22abec11bf78d192447f66b5e7;hp=5923c1458cf2660f9ee0738343710105b0b8fb65;hpb=a6cf47a2cd96c459bfc241c6dce8ca8454140484;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/win32service.cpp b/win/win32service.cpp
index 5923c1458..59a06b709 100644
--- a/win/win32service.cpp
+++ b/win/win32service.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -12,6 +12,7 @@
  */
 #include "inspircd_config.h"
 #include "inspircd.h"
+#include "exitcodes.h"
 #include <windows.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27,6 +28,9 @@ static int serviceCurrentStatus;
  */
 typedef BOOL (CALLBACK* SETSERVDESC)(SC_HANDLE,DWORD,LPVOID);
 
+BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, DWORD dwServiceSpecificExitCode, DWORD dwCheckPoint, DWORD dwWaitHint);
+void terminateService(int code, int wincode);
+
 /* A commandline parameter handler for service specific commandline parameters */
 typedef void (*CommandlineParameterHandler)(void);
 
@@ -40,7 +44,8 @@ struct Commandline
 /* A function pointer for dynamic linking tricks */
 SETSERVDESC ChangeServiceConf;
 
-bool IsAService();
+/* Returns true if this program is running as a service, false if it is running interactive */
+bool IsAService()
 {
 	USEROBJECTFLAGS uoflags;
 	HWINSTA winstation = GetProcessWindowStation();
@@ -65,8 +70,8 @@ DWORD WINAPI WorkerThread(LPDWORD param)
 {
 	char modname[MAX_PATH];
 	GetModuleFileName(NULL, modname, sizeof(modname));
-	char* argv[] = { modname, "--nofork", "--debug" };
-	smain(3, argv);
+	char* argv[] = { modname, "--nofork" };
+	smain(2, argv);
 	KillService();
 	return 0;
 }
@@ -78,10 +83,10 @@ void SetServiceRunning()
 		return;
 
 	serviceCurrentStatus = SERVICE_RUNNING;
-	success = UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0, 0, 0);
+	BOOL success = UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0, 0, 0);
 	if (!success)
 	{
-		terminateService(6, GetLastError());
+		terminateService(EXIT_STATUS_UPDATESCM_FAILED, GetLastError());
 		return;
 	}
 }
@@ -97,7 +102,7 @@ void StartServiceThread()
 /** This function updates the status of the service in the SCM
  * (service control manager, the services.msc applet)
  */
-BOOL UpdateSCMStatus (DWORD dwCurrentState, DWORD dwWin32ExitCode, DWORD dwServiceSpecificExitCode, DWORD dwCheckPoint, DWORD dwWaitHint)
+BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, DWORD dwServiceSpecificExitCode, DWORD dwCheckPoint, DWORD dwWaitHint)
 {
 	BOOL success;
 	SERVICE_STATUS serviceStatus;
@@ -134,14 +139,14 @@ BOOL UpdateSCMStatus (DWORD dwCurrentState, DWORD dwWin32ExitCode, DWORD dwServi
 }
 
 /** This function is called by us when the service is being shut down or when it can't be started */
-void terminateService (int code, int wincode)
+void terminateService(int code, int wincode)
 {
 	UpdateSCMStatus(SERVICE_STOPPED, wincode ? wincode : ERROR_SERVICE_SPECIFIC_ERROR, wincode ? 0 : code, 0, 0);
 	return;
 }
 
-/* In windows we hook this to exit() */
-void newexit(int status)
+/* In windows we hook this to InspIRCd::Exit() */
+void SetServiceStopped(int status)
 {
 	if (!IsAService())
 		exit(status);
@@ -153,7 +158,7 @@ void newexit(int status)
 }
 
 /** This callback is called by windows when the state of the service has been changed */
-VOID ServiceCtrlHandler (DWORD controlCode)
+VOID ServiceCtrlHandler(DWORD controlCode)
 {
 	switch(controlCode)
 	{
@@ -176,19 +181,18 @@ VOID ServiceCtrlHandler (DWORD controlCode)
 VOID ServiceMain(DWORD argc, LPTSTR *argv)
 {
 	BOOL success;
-	DWORD type=0, size=0;
 
 	serviceStatusHandle = RegisterServiceCtrlHandler("InspIRCd", (LPHANDLER_FUNCTION)ServiceCtrlHandler);
 	if (!serviceStatusHandle)
 	{
-		terminateService(1, GetLastError());
+		terminateService(EXIT_STATUS_RSCH_FAILED, GetLastError());
 		return;
 	}
 
 	success = UpdateSCMStatus(SERVICE_START_PENDING, NO_ERROR, 0, 1, 1000);
 	if (!success)
 	{
-		terminateService(2, GetLastError());
+		terminateService(EXIT_STATUS_UPDATESCM_FAILED, GetLastError());
 		return;
 	}
 
@@ -197,14 +201,14 @@ VOID ServiceMain(DWORD argc, LPTSTR *argv)
 
 	if (!killServiceEvent || !hThreadEvent)
 	{
-		terminateService(99, GetLastError());
+		terminateService(EXIT_STATUS_CREATE_EVENT_FAILED, GetLastError());
 		return;
 	}
 
 	success = UpdateSCMStatus(SERVICE_START_PENDING, NO_ERROR, 0, 2, 1000);
 	if (!success)
 	{
-		terminateService(2, GetLastError());
+		terminateService(EXIT_STATUS_UPDATESCM_FAILED, GetLastError());
 		return;
 	}
 
@@ -355,7 +359,7 @@ int main(int argc, char** argv)
 	 * as a service so if this is true, we just run the non-service inspircd.
 	 */
 	if (!IsAService())
-		return smain(argv, argc);
+		return smain(argc, argv);
 
 	/* If we get here, we know the service is installed so we can start it */