CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve:PPT联动模块

Browse Source
This commit is contained in:
CJKmkp
2026-02-06 21:49:11 +08:00
parent 13b24aeb7c
commit 15a6799d7b
1 changed files with 31 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/Helpers/ROTPPTManager.cs
+12 -26
View File
@@ -1284,37 +1284,35 @@ namespace Ink_Canvas.Helpers
private void DisconnectFromPPT()
{
if (PPTApplication == null && _pptActivePresentation == null)
if (PPTApplication == null && _pptActivePresentation == null && _pptSlideShowWindow == null &&
CurrentPresentation == null && CurrentSlides == null && CurrentSlide == null)
{
return;
}
_isModuleUnloading = true;
try
{
UnbindEvents();
// 安全释放所有COM对象，即使它们已失效也不会抛出异常
SafeReleaseComObject(_pptSlideShowWindow, "_pptSlideShowWindow");
SafeReleaseComObject(_pptActivePresentation, "_pptActivePresentation");
SafeReleaseComObject(CurrentSlide, "CurrentSlide");
SafeReleaseComObject(CurrentSlides, "CurrentSlides");
SafeReleaseComObject(CurrentPresentation, "CurrentPresentation");
// 释放PPTApplication
if (PPTApplication != null)
{
try
{
// 检查是否为有效的COM对象
if (Marshal.IsComObject(PPTApplication))
{
// 检查COM对象是否仍然有效
try
{
var _ = Marshal.GetIUnknownForObject(PPTApplication);
Marshal.Release(_);
var unk = Marshal.GetIUnknownForObject(PPTApplication);
Marshal.Release(unk);
// 对象有效，尝试释放
try
{
Marshal.FinalReleaseComObject(PPTApplication);
@@ -1329,19 +1327,19 @@ namespace Ink_Canvas.Helpers
refCount = Marshal.ReleaseComObject(PPTApplication);
}
}
catch { }
catch
{
}
}
}
catch (InvalidComObjectException)
{
// COM对象已失效，直接设置为null
LogHelper.WriteLogToFile("PPTApplication COM对象已失效，跳过释放", LogHelper.LogType.Trace);
}
}
}
catch (InvalidComObjectException)
{
// COM对象已失效，这是正常的
LogHelper.WriteLogToFile("PPTApplication COM对象已失效，跳过释放", LogHelper.LogType.Trace);
}
catch (Exception ex)
@@ -1350,7 +1348,6 @@ namespace Ink_Canvas.Helpers
}
}
// 清空所有引用
PPTApplication = null;
_pptActivePresentation = null;
_pptSlideShowWindow = null;
@@ -1362,33 +1359,22 @@ namespace Ink_Canvas.Helpers
_forcePolling = true;
_bindingEvents = false;
GC.Collect();
GC.WaitForPendingFinalizers();
GC.Collect();
PPTConnectionChanged?.Invoke(false);
LogHelper.WriteLogToFile("已断开PPT连接，暂时卸载模块以确保COM完全释放", LogHelper.LogType.Event);
LogHelper.WriteLogToFile("已断开PPT连接，并显式释放所有COM对象", LogHelper.LogType.Event);
ThreadPool.QueueUserWorkItem(_ =>
{
try
{
Thread.Sleep(2000);
GC.Collect();
GC.WaitForPendingFinalizers();
GC.Collect();
Thread.Sleep(1000);
_isModuleUnloading = false;
LogHelper.WriteLogToFile("PPT联动模块已重新加载", LogHelper.LogType.Trace);
LogHelper.WriteLogToFile("PPT联动模块已允许重新连接", LogHelper.LogType.Trace);
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"重新加载PPT联动模块失败: {ex}", LogHelper.LogType.Error);
LogHelper.WriteLogToFile($"重新启用PPT联动模块失败: {ex}", LogHelper.LogType.Error);
_isModuleUnloading = false;
}
});