diff --git a/Meade.net/ClassFactory.cs b/Meade.net/ClassFactory.cs index f67ae9f..7380021 100644 --- a/Meade.net/ClassFactory.cs +++ b/Meade.net/ClassFactory.cs @@ -160,22 +160,19 @@ namespace ASCOM.Meade.net return i == 0; } - public bool RevokeClassObject() + public void RevokeClassObject() { - int i = CoRevokeClassObject(_mCookie); - return i == 0; + CoRevokeClassObject(_mCookie); } - public static bool ResumeClassObjects() + public static void ResumeClassObjects() { - int i = CoResumeClassObjects(); - return i == 0; + CoResumeClassObjects(); } - public static bool SuspendClassObjects() + public static void SuspendClassObjects() { - int i = CoSuspendClassObjects(); - return i == 0; + CoSuspendClassObjects(); } #endregion diff --git a/Meade.net/LocalServer.cs b/Meade.net/LocalServer.cs index 98b178a..f523ddc 100644 --- a/Meade.net/LocalServer.cs +++ b/Meade.net/LocalServer.cs @@ -92,17 +92,17 @@ namespace ASCOM.Meade.net } // This method performs a thread-safe incrementation of the objects count. - public static int CountObject() + public static void CountObject() { // Increment the global count of objects. - return Interlocked.Increment(ref _objsInUse); + Interlocked.Increment(ref _objsInUse); } // This method performs a thread-safe decrementation the objects count. - public static int UncountObject() + public static void UncountObject() { // Decrement the global count of objects. - return Interlocked.Decrement(ref _objsInUse); + Interlocked.Decrement(ref _objsInUse); } // Returns the current server lock count. @@ -119,18 +119,18 @@ namespace ASCOM.Meade.net // This method performs a thread-safe incrementation the // server lock count. - public static int CountLock() + public static void CountLock() { // Increment the global lock count of this server. - return Interlocked.Increment(ref _serverLocks); + Interlocked.Increment(ref _serverLocks); } // This method performs a thread-safe decrementation the // server lock count. - public static int UncountLock() + public static void UncountLock() { // Decrement the global lock count of this server. - return Interlocked.Decrement(ref _serverLocks); + Interlocked.Decrement(ref _serverLocks); } // AttemptToTerminateServer() will check to see if the objects count and the server @@ -456,7 +456,7 @@ namespace ASCOM.Meade.net // that we serve. This requires the class facgtory name to be // equal to the served class name + "ClassFactory". // - private static bool RegisterClassFactories() + private static void RegisterClassFactories() { _sClassFactories = new ArrayList(); foreach (Type type in _sComObjectTypes) @@ -467,11 +467,10 @@ namespace ASCOM.Meade.net { MessageBox.Show(string.Format(Resources.Server_RegisterClassFactories_Failed_to_register_class_factory_for__0_, type.Name), DriverName, MessageBoxButtons.OK, MessageBoxIcon.Stop); - return false; + return; } } ClassFactory.ResumeClassObjects(); // Served objects now go live - return true; } private static void RevokeClassFactories() diff --git a/Meade.net/Wrapper/SharedResourcesWrapper.cs b/Meade.net/Wrapper/SharedResourcesWrapper.cs index edb1232..8220fbe 100644 --- a/Meade.net/Wrapper/SharedResourcesWrapper.cs +++ b/Meade.net/Wrapper/SharedResourcesWrapper.cs @@ -24,7 +24,7 @@ namespace ASCOM.Meade.net.Wrapper void SetupDialog(); void WriteProfile(ProfileProperties profileProperties); - string ReadCharacters(int throwAwayCharacters); + void ReadCharacters(int throwAwayCharacters); } public class SharedResourcesWrapper : ISharedResourcesWrapper @@ -73,9 +73,9 @@ namespace ASCOM.Meade.net.Wrapper return SharedResources.ReadTerminated(); } - public string ReadCharacters(int throwAwayCharacters) + public void ReadCharacters(int throwAwayCharacters) { - return SharedResources.ReadCharacters(throwAwayCharacters); + SharedResources.ReadCharacters(throwAwayCharacters); } public ProfileProperties ReadProfile()