github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 13:33:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improvement logging of the COMWrapper, this might help when working on bugs like BUG-1616 [skip ci]

Browse source
This commit is contained in:
RKrom 2014-06-27 12:56:07 +02:00
commit 49f788c3d6
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
GreenshotPlugin/Interop/COMWrapper.cs
View file

@ -38,6 +38,8 @@ namespace Greenshot.Interop {
private const int CO_E_CLASSSTRING = -2147221005; private const int CO_E_CLASSSTRING = -2147221005;
public const int RPC_E_CALL_REJECTED = unchecked((int)0x80010001); public const int RPC_E_CALL_REJECTED = unchecked((int)0x80010001);
public const int RPC_E_FAIL = unchecked((int)0x80004005); public const int RPC_E_FAIL = unchecked((int)0x80004005);
public const int RPC_E_COM_SEPARATED_RCW = unchecked((int)0x80131527);
#region Private Data #region Private Data
@ -357,11 +359,17 @@ namespace Greenshot.Interop {
LOG.DebugFormat("Disposing {0}", _InterceptType.ToString()); LOG.DebugFormat("Disposing {0}", _InterceptType.ToString());
if (Marshal.IsComObject(_COMObject)) { if (Marshal.IsComObject(_COMObject)) {
try { try {
while (Marshal.ReleaseComObject(_COMObject) > 0) ; int count;
do {
count = Marshal.ReleaseComObject(_COMObject);
LOG.DebugFormat("RCW count for {0} now is {1}", _InterceptType.ToString(), count);
} while (count > 0);
} catch (Exception ex) { } catch (Exception ex) {
LOG.WarnFormat("Problem releasing {0}", _COMType); LOG.WarnFormat("Problem releasing COM object {0}", _COMType);
LOG.Warn("Error: ", ex); LOG.Warn("Error: ", ex);
} }
} else {
LOG.WarnFormat("{0} is not a COM object", _COMType);
} }
_COMObject = null; _COMObject = null;
@ -685,6 +693,9 @@ namespace Greenshot.Interop {
continue; continue;
} }
} }
if (comEx != null && comEx.ErrorCode == RPC_E_COM_SEPARATED_RCW) {
LOG.WarnFormat("COM object {0} has been separated from its underlying RCW cannot be used. The COM object was released while it was still in use on another thread.", _InterceptType.FullName);
}
// Not rejected OR pressed cancel // Not rejected OR pressed cancel
return new ReturnMessage(ex, callMessage); return new ReturnMessage(ex, callMessage);
} }