sean-m
/
Vanara
mirror of https://github.com/dahall/Vanara.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed ComLocalServer and included functionality in ComObject

pull/38/head
David Hall 2019-01-29 14:50:19 -07:00
parent 971a8247ca
commit b07bcbad48
2 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Windows.Shell/ComLocalServer.cs
View File

@ -1,18 +0,0 @@
using System;
namespace Vanara.Windows.Shell
{
/// <summary>Implements a COM Local Server. Use similarly to Application with Windows.Forms in the Main method of your executable.</summary>
public static partial class ComLocalServer
{
/// <summary>Runs the specified COM Local Server object.</summary>
/// <param name="punk">The COM object to run as a local server.</param>
public static void Run(ComObject punk)
{
using (var cf = new ComClassFactory(punk ?? throw new ArgumentNullException(nameof(punk))))
{
punk.RunMessageLoop();
}
}
}
}

19
Windows.Shell/ComObject.cs
View File

@ -17,10 +17,15 @@ namespace Vanara.Windows.Shell
public abstract class ComObject : IDisposable, IObjectWithSite
{
private bool disposedValue = false;
private ComMessageLoop msgLoop;
private ComMessageLoop msgLoop = new ComMessageLoop();
private ComClassFactory classFactory;
/// <summary>Initializes a new instance of the <see cref="ComObject"/> class.</summary>
public ComObject() => CoAddRefServerProcess();
public ComObject()
{
CoAddRefServerProcess();
classFactory = new ComClassFactory(this);
}
/// <summary>Gets or sets the site exposed by <see cref="IObjectWithSite"/>.</summary>
/// <value>The site object.</value>
@ -40,17 +45,16 @@ namespace Vanara.Windows.Shell
/// <summary>Queues a non-blocking callback. This is useful in situations where a method cannot block an implemented method but further processing is needed. For example, IDropTarget::DragDrop and IExecuteCommand::Execute.</summary>
/// <param name="callback">The callback method.</param>
/// <param name="tag">An optional object that will be passed to the callback.</param>
public void QueueNonBlockingCallback(Action<object> callback, [Optional] object tag) => msgLoop?.QueueAppCallback(callback, tag);
public void QueueNonBlockingCallback(Action<object> callback, [Optional] object tag) => msgLoop.QueueAppCallback(callback, tag);
/// <summary>Quits the message loop by sending PostQuitMessage.</summary>
/// <param name="exitCode">The exit code.</param>
public void QuitMessageLoop(int exitCode = 0) => msgLoop?.Quit(exitCode);
public void QuitMessageLoop(int exitCode = 0) => msgLoop.Quit(exitCode);
/// <summary>Runs the message loop.</summary>
public void RunMessageLoop()
public void Run()
{
if (msgLoop == null || msgLoop.Running) return;
msgLoop = new ComMessageLoop();
if (msgLoop.Running) return;
msgLoop.RunMessageLoop();
}
@ -80,6 +84,7 @@ namespace Vanara.Windows.Shell
if (disposing)
{
QuitMessageLoop();
classFactory.Dispose();
CoReleaseServerProcess();
}
disposedValue = true;