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

fix:issue #13 #23

Browse Source
This commit is contained in:
CJK_mkp
2025-06-17 13:20:06 +08:00
parent 35fa062cc3
commit 58028ea95c
5 changed files with 151 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/App.xaml.cs
+136
View File
@@ -4,10 +4,13 @@ using iNKORE.UI.WPF.Modern.Controls;
using System;
using System.Diagnostics;
using System.Threading;
using Microsoft.Win32;
using System.Security; // 添加SecurityException所需命名空间
using System.IO;
using System.Linq;
using System.Reflection;
using System.Windows;
using System.Windows.Threading;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
using MessageBox = System.Windows.MessageBox;
using Window = System.Windows.Window;
@@ -86,6 +89,110 @@ namespace Ink_Canvas
_taskbar = (TaskbarIcon)FindResource("TaskbarTrayIcon");
StartArgs = e.Args;
// 新增：Office注册表检测
try
{
LogHelper.WriteLogToFile("开始Office注册表检测");
// 检查Office安装
if (!IsOfficeInstalled())
{
LogHelper.WriteLogToFile("未检测到Office安装", LogHelper.LogType.Warning);
return;
}
var pptApplication = new Microsoft.Office.Interop.PowerPoint.Application();
string officeVersion = pptApplication.Version;
LogHelper.WriteLogToFile($"检测到Office版本: {officeVersion}");
string regPath = $"Software\\Microsoft\\Office\\{officeVersion}\\Common\\Security";
LogHelper.WriteLogToFile($"注册表路径: {regPath}");
using (Microsoft.Win32.RegistryKey baseKey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(regPath))
{
if (baseKey == null)
{
LogHelper.WriteLogToFile($"注册表路径不存在: {regPath}", LogHelper.LogType.Warning);
return;
}
Settings settingsInstance = new Settings();
string backupPath = Path.Combine(settingsInstance.Automation.AutoSavedStrokesLocation, "RegistryBackups");
LogHelper.WriteLogToFile($"备份路径: {backupPath}");
if (!Directory.Exists(backupPath))
{
Directory.CreateDirectory(backupPath);
LogHelper.WriteLogToFile($"创建备份目录: {backupPath}");
}
string backupFile = Path.Combine(backupPath, $"SecurityBackup_{DateTime.Now:yyyyMMddHHmmss}.reg");
LogHelper.WriteLogToFile($"创建备份文件: {backupFile}");
// 使用UTF8编码写入注册表文件
using (StreamWriter sw = new StreamWriter(backupFile, false, System.Text.Encoding.UTF8))
{
sw.WriteLine("Windows Registry Editor Version 5.00\n");
sw.WriteLine();
sw.WriteLine($"[{Microsoft.Win32.Registry.CurrentUser.Name}\\{regPath}]");
foreach (string valueName in baseKey.GetValueNames())
{
object value = baseKey.GetValue(valueName);
sw.WriteLine($"\"{valueName}\"=dword:{((int)value):x8}");
LogHelper.WriteLogToFile($"备份注册表值: {valueName} = {value}");
}
}
using (Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(regPath, true))
{
// 仅在值不存在或不等于1时更新
object currentValue = key.GetValue("DisableProtectedView");
if (currentValue == null || (int)currentValue != 1)
{
key.SetValue("DisableProtectedView", 1, Microsoft.Win32.RegistryValueKind.DWord);
LogHelper.WriteLogToFile("注册表值已设置: DisableProtectedView = 1");
}
else
{
LogHelper.WriteLogToFile("注册表值已存在且无需更改: DisableProtectedView = 1");
}
}
}
}
catch (System.Runtime.InteropServices.COMException comEx) when (comEx.ErrorCode == -2147221040)
{
// 处理特定的COM错误（如Office未安装）
LogHelper.WriteLogToFile($"Office COM错误: 未安装PowerPoint (HRESULT: 0x{comEx.ErrorCode:x8})", LogHelper.LogType.Error);
}
catch (System.Runtime.InteropServices.COMException comEx)
{
LogHelper.WriteLogToFile($"Office COM错误: {comEx.Message} (HRESULT: 0x{comEx.ErrorCode:x8})", LogHelper.LogType.Error);
}
catch (SecurityException secEx)
{
LogHelper.WriteLogToFile($"安全异常: {secEx.Message}", LogHelper.LogType.Error);
ShowPermissionError();
}
catch (UnauthorizedAccessException authEx)
{
LogHelper.WriteLogToFile($"访问被拒绝: {authEx.Message}", LogHelper.LogType.Error);
ShowPermissionError();
}
catch (DirectoryNotFoundException dirEx)
{
LogHelper.WriteLogToFile($"目录未找到: {dirEx.Message}", LogHelper.LogType.Error);
}
catch (IOException ioEx)
{
LogHelper.WriteLogToFile($"IO错误: {ioEx.Message}", LogHelper.LogType.Error);
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"未知错误: {ex.GetType().FullName} - {ex.Message}", LogHelper.LogType.Error);
LogHelper.WriteLogToFile(ex.StackTrace, LogHelper.LogType.Info);
}
}
private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
@@ -207,5 +314,34 @@ namespace Ink_Canvas
}
catch { }
}
/// <summary>
/// 检查Office是否安装
/// </summary>
private bool IsOfficeInstalled()
{
try
{
// 检查注册表判断Office是否存在
using (Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\Office"))
{
return key?.GetValueNames().Any(name => name.Contains(".0")) ?? false;
}
}
catch
{
return false;
}
}
/// <summary>
/// 显示权限不足的错误提示
/// </summary>
private void ShowPermissionError()
{
const string message = "需要管理员权限才能完成此操作\n请以管理员身份重新启动应用程序";
LogHelper.WriteLogToFile(message, LogHelper.LogType.Error);
System.Windows.MessageBox.Show(message, "权限错误", MessageBoxButton.OK, MessageBoxImage.Error);
}
}
}
Ink Canvas/MainWindow.xaml.cs
+8 -2
View File
@@ -365,9 +365,15 @@ namespace Ink_Canvas {
private void inkCanvas_TouchDown(object sender, TouchEventArgs e)
{
// 修改：根据用户设置决定是否强制显示自定义光标
if (Settings.Canvas.IsShowCursor) {
if (Settings.Canvas.IsShowCursor)
{
inkCanvas.ForceCursor = true;
} else {
// 新增：当处于套索选择模式时保持光标可见
if (inkCanvas.EditingMode == InkCanvasEditingMode.Select)
inkCanvas.Cursor = Cursors.Cross;
}
else
{
inkCanvas.ForceCursor = false;
System.Windows.Forms.Cursor.Show();
}
Ink Canvas/MainWindow_cs/MW_PPT.cs
-40
View File
@@ -69,46 +69,6 @@ namespace Ink_Canvas {
}
}
if (pptApplication == null) throw new Exception();
// Office安装检测及注册表操作
try {
// 获取Office版本
string officeVersion = pptApplication.Version;
string regPath = $"Software\\Microsoft\\Office\\{officeVersion}\\Common\\Security";
// 验证注册表路径有效性
using (RegistryKey baseKey = Registry.CurrentUser.OpenSubKey(regPath)) {
if (baseKey == null) {
LogHelper.WriteLogToFile("注册表路径不存在: " + regPath, LogHelper.LogType.Warning);
return;
}
// 备份注册表项
string backupPath = Path.Combine(Settings.Automation.AutoSavedStrokesLocation, "RegistryBackups");
if (!Directory.Exists(backupPath)) Directory.CreateDirectory(backupPath);
string backupFile = Path.Combine(backupPath, $"SecurityBackup_{DateTime.Now:yyyyMMddHHmmss}.reg");
using (StreamWriter sw = new StreamWriter(backupFile)) {
sw.WriteLine($"Windows Registry Editor Version 5.00\n\n[{Registry.CurrentUser.Name}\\{regPath}]");
foreach (string valueName in baseKey.GetValueNames()) {
object value = baseKey.GetValue(valueName);
sw.WriteLine($"\"{valueName}\"=dword:{((int)value):x8}");
}
}
// 处理DisableProtectedView值
using (RegistryKey key = Registry.CurrentUser.CreateSubKey(regPath, true)) {
if (key.GetValue("DisableProtectedView") == null) {
key.CreateSubKey(regPath, RegistryKeyPermissionCheck.ReadWriteSubTree);
key.SetValue("DisableProtectedView", 1, RegistryValueKind.DWord);
} else {
key.SetValue("DisableProtectedView", 1, RegistryValueKind.DWord);
}
}
}
} catch (Exception regEx) {
LogHelper.WriteLogToFile("注册表操作失败: " + regEx.ToString(), LogHelper.LogType.Error);
}
StackPanelPPTControls.Visibility = Visibility.Visible;
}
catch (Exception ex) {
Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs
+6 -1
View File
@@ -1,4 +1,4 @@
using iNKORE.UI.WPF.Modern.Controls;
using iNKORE.UI.WPF.Modern.Controls;
using System;
using System.Collections.Generic;
using System.Windows;
@@ -380,6 +380,11 @@ namespace Ink_Canvas {
isProgramChangeStrokeSelection = false;
inkCanvas.Strokes.Add(StrokesSelectionClone);
}
else {
// 新增：启动套索选择模式
inkCanvas.EditingMode = InkCanvasEditingMode.Select;
inkCanvas.Select(new StrokeCollection());
}
}
}
Ink Canvas/obj/InkCanvasForClass.csproj.nuget.g.props
+1 -1
View File
@@ -7,7 +7,7 @@
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;E:\Program Files\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.13.2</NuGetToolVersion>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.14.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />