Removed SCM function main ISS file

Author: texhex

src/HackWindowsInstaller.iss

@@ -15,7 +15,7 @@
 
 
 //Update this when releasing a new version
-#define public Version '1.2.0'
+#define public Version '1.2.1'
 
 //This defines in which sub folder of this project the current files are located
 #define public HackMonospaced_Sourcefolder 'Hack_v2_020'
@@ -269,47 +269,10 @@ Type: files; Name: "{app}\Log*.txt"
 
 
 [Code]
-type
-	SERVICE_STATUS = record
-    	dwServiceType				: cardinal;
-    	dwCurrentState				: cardinal;
-    	dwControlsAccepted			: cardinal;
-    	dwWin32ExitCode				: cardinal;
-    	dwServiceSpecificExitCode	: cardinal;
-    	dwCheckPoint				: cardinal;
-    	dwWaitHint					: cardinal;
-	end;
-	HANDLE = cardinal;
-
-const
-	SERVICE_QUERY_CONFIG		= $1;
-	SERVICE_CHANGE_CONFIG		= $2;
-	SERVICE_QUERY_STATUS		= $4;
-	SERVICE_START				= $10;
-	SERVICE_STOP				= $20;
-	SERVICE_ALL_ACCESS			= $f01ff;
-	SC_MANAGER_ALL_ACCESS		= $f003f;
-	SERVICE_WIN32_OWN_PROCESS	= $10;
-	SERVICE_WIN32_SHARE_PROCESS	= $20;
-	SERVICE_WIN32				= $30;
-	SERVICE_INTERACTIVE_PROCESS = $100;
-	SERVICE_BOOT_START          = $0;
-	SERVICE_SYSTEM_START        = $1;
-	SERVICE_AUTO_START          = $2;
-	SERVICE_DEMAND_START        = $3;
-	SERVICE_DISABLED            = $4;
-	SERVICE_DELETE              = $10000;
-	SERVICE_CONTROL_STOP		= $1;
-	SERVICE_CONTROL_PAUSE		= $2;
-	SERVICE_CONTROL_CONTINUE	= $3;
-	SERVICE_CONTROL_INTERROGATE = $4;
-	SERVICE_STOPPED				= $1;
-	SERVICE_START_PENDING       = $2;
-	SERVICE_STOP_PENDING        = $3;
-	SERVICE_RUNNING             = $4;
-	SERVICE_CONTINUE_PENDING    = $5;
-	SERVICE_PAUSE_PENDING       = $6;
-	SERVICE_PAUSED              = $7;
+
+//Include type definition for Service Control Manager
+#include "incl_ServiceControlManager-definition.pas";
+
 
   
 var
@@ -340,115 +303,8 @@ var
   FontStateBuffer: array of string;
 
 
-// #######################################################################################
-// Service control code  from http://www.vincenzo.net/isxkb/index.php?title=Service_-_Functions_to_Start%2C_Stop%2C_Install%2C_Remove_a_Service
-function OpenSCManager(lpMachineName, lpDatabaseName: string; dwDesiredAccess :cardinal): HANDLE;
-external 'OpenSCManagerA@advapi32.dll stdcall';
-
-function OpenService(hSCManager :HANDLE;lpServiceName: string; dwDesiredAccess :cardinal): HANDLE;
-external 'OpenServiceA@advapi32.dll stdcall';
-
-function CloseServiceHandle(hSCObject :HANDLE): boolean;
-external 'CloseServiceHandle@advapi32.dll stdcall';
-
-function StartNTService(hService :HANDLE;dwNumServiceArgs : cardinal;lpServiceArgVectors : cardinal) : boolean;
-external 'StartServiceA@advapi32.dll stdcall';
-
-function ControlService(hService :HANDLE; dwControl :cardinal;var ServiceStatus :SERVICE_STATUS) : boolean;
-external 'ControlService@advapi32.dll stdcall';
-
-function QueryServiceStatus(hService :HANDLE;var ServiceStatus :SERVICE_STATUS) : boolean;
-external 'QueryServiceStatus@advapi32.dll stdcall';
-
-function OpenServiceManager() : HANDLE;
-begin
-	if UsingWinNT() = true then begin
-		Result := OpenSCManager('','ServicesActive',SC_MANAGER_ALL_ACCESS);
-		if Result = 0 then
-			MsgBox('the servicemanager is not available', mbError, MB_OK)
-	end
-	else begin
-			MsgBox('only nt based systems support services', mbError, MB_OK)
-			Result := 0;
-	end
-end;
-
-function IsServiceInstalled(ServiceName: string) : boolean;
-var
-	hSCM	: HANDLE;
-	hService: HANDLE;
-begin
-	hSCM := OpenServiceManager();
-	Result := false;
-	if hSCM <> 0 then begin
-		hService := OpenService(hSCM,ServiceName,SERVICE_QUERY_CONFIG);
-        if hService <> 0 then begin
-            Result := true;
-            CloseServiceHandle(hService)
-		end;
-        CloseServiceHandle(hSCM)
-	end
-end;
-
-
-
-function StartService(ServiceName: string) : boolean;
-var
-	hSCM	: HANDLE;
-	hService: HANDLE;
-begin
-	hSCM := OpenServiceManager();
-	Result := false;
-	if hSCM <> 0 then begin
-		hService := OpenService(hSCM,ServiceName,SERVICE_START);
-        if hService <> 0 then begin
-        	Result := StartNTService(hService,0,0);
-            CloseServiceHandle(hService)
-		end;
-        CloseServiceHandle(hSCM)
-	end;
-end;
-
-function StopService(ServiceName: string) : boolean;
-var
-	hSCM	: HANDLE;
-	hService: HANDLE;
-	Status	: SERVICE_STATUS;
-begin
-	hSCM := OpenServiceManager();
-	Result := false;
-	if hSCM <> 0 then begin
-		hService := OpenService(hSCM,ServiceName,SERVICE_STOP);
-        if hService <> 0 then begin
-        	Result := ControlService(hService,SERVICE_CONTROL_STOP,Status);
-            CloseServiceHandle(hService)
-		end;
-        CloseServiceHandle(hSCM)
-	end;
-end;
-
-function IsServiceRunning(ServiceName: string) : boolean;
-var
-	hSCM	: HANDLE;
-	hService: HANDLE;
-	Status	: SERVICE_STATUS;
-begin
-	hSCM := OpenServiceManager();
-	Result := false;
-	if hSCM <> 0 then begin
-		hService := OpenService(hSCM,ServiceName,SERVICE_QUERY_STATUS);
-    	if hService <> 0 then begin
-			if QueryServiceStatus(hService,Status) then begin
-				Result :=(Status.dwCurrentState = SERVICE_RUNNING)
-        	end;
-            CloseServiceHandle(hService)
-		    end;
-        CloseServiceHandle(hSCM)
-	end
-end;
-
-// #######################################################################################
-
+//Include functions for Service Control Manager
+#include "incl_ServiceControlManager-functions.pas";
 
 
 
@@ -655,31 +511,6 @@ end;
 
 
 
-//Returns TRUE if a service was started 
-function StartNTService2(serviceName:string):boolean;
-begin
-   if IsServiceInstalled(serviceName) then begin
-      if IsServiceRunning(serviceName)=false then begin
-         log('Starting service ' + serviceName);
-         StartService(serviceName);
-         sleep(1500); //give the service some seconds
-         result:=true;
-      end; 
-   end;
-end;
-
-//Stops a service and returns TRUE if it was stopped
-function StopNTService2(serviceName:string):boolean;
-begin
-   if IsServiceInstalled(serviceName) then begin
-      if IsServiceRunning(serviceName) then begin
-         log('Stopping service ' + serviceName);
-         StopService(serviceName);
-         sleep(1500);
-         result:=true;
-      end; 
-   end;
-end;
 
 
 //Show a custom prepare to install page in order to give the user output what we are doing