merge -r 60439:60440

[mono.git] / mcs / class / System.ServiceProcess / System.ServiceProcess / ServiceBase.cs

diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceBase.cs b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceBase.cs
index 5d6bb703454542a0b0d1d910b030b8a2fa58ee33..82758996bed8268cb24d3183383c16c6a0a872bc 100644 (file)
--- a/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceBase.cs
+++ b/mcs/class/System.ServiceProcess/System.ServiceProcess/ServiceBase.cs
@@ -40,21 +40,23 @@ namespace System.ServiceProcess
 {
        public class ServiceBase : System.ComponentModel.Component
        {
-               // This member is used for interoperation with monod
-               internal static ServiceBase [] RegisteredServices = null;
+               internal delegate void RunServiceCallback (ServiceBase [] services);
+               
+               // This member is used for interoperation with mono-service
+               internal static RunServiceCallback RunService = null;
                
                public ServiceBase() { }
 
                 public const int MaxNameLength = 80;
 
-                bool hasStarted;
+                bool hasStarted = false;
                 
-                bool auto_log;
-                bool can_handle_power_event;
-                bool can_pause_and_continue;
-                bool can_shutdown;
-                bool can_stop;
-                EventLog event_log;
+                bool auto_log = true;
+                bool can_handle_power_event = false;
+                bool can_pause_and_continue = false;
+                bool can_shutdown = false;
+                bool can_stop = true;
+                EventLog event_log = null;
                 string service_name;
 
                 public bool AutoLog {
@@ -121,7 +123,11 @@ namespace System.ServiceProcess
                 }
                 
                 public virtual EventLog EventLog {
-                        get { return event_log; }
+                        get { 
+                                                       if (event_log == null)
+                                                               event_log = new EventLog ("Application", ".", service_name);
+                                                       return event_log; 
+                                               }
                 }
 
                 public string ServiceName {
@@ -161,7 +167,8 @@ namespace System.ServiceProcess
 
                public static void Run (ServiceBase [] servicesToRun) 
                {
-                       RegisteredServices = servicesToRun;
+                       if (RunService != null)
+                               RunService (servicesToRun);
                }
 
        }