diff --git a/.gitignore b/.gitignore index a5fbb0cd..0d512725 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ node_modules /public/* /cmonitor.volume/x64/* /cmonitor.killer/x64/* -/x64/* +/x64/* \ No newline at end of file diff --git a/README.md b/README.md index a02812d8..5460a016 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ - [x] 发送命令，执行cmd命令，等等 ###### 互动 - [x] 互动答题 **winform** -- [x] 屏幕共享，以某一设备为主机，向其它设备共享屏幕，用于演示 **sharpDX** **第一次成功连接服务端后自动恢复** +- [x] 屏幕共享，以某一设备为主机，向其它设备共享屏幕，用于演示 **RDPSession+RDPViewer** **第一次成功连接服务端后自动恢复** ###### 壁纸 - [x] 壁纸程序，为所有设备设置统一壁纸，以程序的方式 **winform** **第一次成功连接服务端后自动恢复** - [x] 键盘按键，显示键盘按键(当前键盘按键由壁纸程序提供) **win api** @@ -97,7 +97,7 @@ 1. **【--server】** 服务器ip **192.168.1.18** 2. **【--service】** 服务端口 **1802** 3. **【--share-key】** 自定数据共享 **cmonitor/share** -4. **【--share-len】** 数量 **10**，默认10项位置，0保留，1键盘、2壁纸、3锁屏，4 SendSAS +4. **【--share-len】** 数量 **100**，默认100项位置，0保留，1键盘、2壁纸、3锁屏，4 SendSAS， 5 抢答问题， 6 抢答答案， 7 屏幕共享， 8 剪贴板 4. **【--share-item-len】** 每项数据长度 **1024**，attr(1)+version(8)+klen(4)+key(klen)+vlen(4)+value(vallen) ###### 服务端 diff --git a/cmonitor.clipboard.win/MainForm.Designer.cs b/cmonitor.clipboard.win/MainForm.Designer.cs new file mode 100644 index 00000000..fe0b3ecc --- /dev/null +++ b/cmonitor.clipboard.win/MainForm.Designer.cs @@ -0,0 +1,60 @@ +namespace cmonitor.clipboard.win +{ + partial class MainForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); + textBox1 = new TextBox(); + SuspendLayout(); + // + // textBox1 + // + textBox1.Location = new Point(12, 12); + textBox1.Multiline = true; + textBox1.Name = "textBox1"; + textBox1.Size = new Size(261, 287); + textBox1.TabIndex = 0; + // + // MainForm + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(285, 450); + Controls.Add(textBox1); + Icon = (Icon)resources.GetObject("$this.Icon"); + Name = "MainForm"; + Text = "剪贴板"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private TextBox textBox1; + } +} diff --git a/cmonitor.clipboard.win/MainForm.cs b/cmonitor.clipboard.win/MainForm.cs new file mode 100644 index 00000000..db23c46d --- /dev/null +++ b/cmonitor.clipboard.win/MainForm.cs @@ -0,0 +1,138 @@ +using System.Runtime.InteropServices; + +namespace cmonitor.clipboard.win +{ + public partial class MainForm : Form + { + protected override CreateParams CreateParams + { + get + { + const int WS_EX_APPWINDOW = 0x40000; + const int WS_EX_TOOLWINDOW = 0x80; + CreateParams cp = base.CreateParams; + cp.ExStyle &= (~WS_EX_APPWINDOW); + cp.ExStyle |= WS_EX_TOOLWINDOW; + return cp; + } + } + + private IntPtr nextClipboardViewer; + const int WM_DRAWCLIPBOARD = 0x0308; + const uint CF_TEXT = 1; + const uint CF_HDROP = 15; + public MainForm() + { + StartPosition = FormStartPosition.CenterScreen; + MaximizeBox = false; + MinimizeBox = false; + + InitializeComponent(); + nextClipboardViewer = SetClipboardViewer(this.Handle); + } + + protected override void WndProc(ref Message m) + { + base.WndProc(ref m); + + if (m.Msg == WM_DRAWCLIPBOARD) + { + OnClipboardChanged(); + } + } + private void OnClipboardChanged() + { + if (OpenClipboard(IntPtr.Zero)) + { + uint format = 0; + while ((format = EnumClipboardFormats(format)) != 0) + { + switch (format) + { + case CF_TEXT: + HandleTextData(); + break; + case CF_HDROP: + HandleFileListData(); + break; + } + } + CloseClipboard(); + } + } + private void HandleTextData() + { + IntPtr clipboardData = GetClipboardData(CF_TEXT); + if (clipboardData != IntPtr.Zero) + { + string text = Marshal.PtrToStringAnsi(clipboardData); + this.Invoke(() => + { + textBox1.Text = text; + }); + } + } + private void HandleFileListData() + { + IntPtr clipboardData = GetClipboardData(CF_HDROP); + if (clipboardData != IntPtr.Zero) + { + IntPtr fileDropHandle = Marshal.ReadIntPtr(clipboardData); + uint fileCount = DragQueryFile(fileDropHandle, 0xFFFFFFFF, null, 0); + + List fileList = new List(); + for (uint i = 0; i < fileCount; i++) + { + uint bufferSize = DragQueryFile(fileDropHandle, i, null, 0) + 1; + char[] fileName = new char[bufferSize]; + + DragQueryFile(fileDropHandle, i, fileName, bufferSize); + string filePath = new string(fileName); + + fileList.Add(filePath); + } + + DragFinish(fileDropHandle); + + this.Invoke(() => + { + textBox1.Text = string.Join("\r\n", fileList); + }); + } + } + + + + [DllImport("user32.dll", SetLastError = true)] + static extern IntPtr SetClipboardViewer(IntPtr hWndNewViewer); + + [DllImport("user32.dll", SetLastError = true)] + static extern bool ChangeClipboardChain(IntPtr hWndRemove, IntPtr hWndNewNext); + + [DllImport("user32.dll", SetLastError = true)] + static extern IntPtr GetClipboardData(uint uFormat); + + [DllImport("user32.dll", SetLastError = true)] + static extern bool IsClipboardFormatAvailable(uint format); + [DllImport("user32.dll", SetLastError = true)] + static extern uint EnumClipboardFormats(uint format); + [DllImport("shell32.dll")] + static extern uint DragQueryFile(IntPtr hDrop, uint iFile, char[] lpszFile, uint cch); + + [DllImport("shell32.dll")] + static extern void DragFinish(IntPtr hDrop); + + [DllImport("user32.dll", SetLastError = true)] + static extern bool OpenClipboard(IntPtr hWndNewOwner); + + [DllImport("user32.dll", SetLastError = true)] + static extern bool CloseClipboard(); + + [DllImport("kernel32.dll")] + static extern IntPtr GlobalLock(IntPtr hMem); + + [DllImport("kernel32.dll")] + static extern bool GlobalUnlock(IntPtr hMem); + + } +} diff --git a/cmonitor.share.win/MainForm.resx b/cmonitor.clipboard.win/MainForm.resx similarity index 100% rename from cmonitor.share.win/MainForm.resx rename to cmonitor.clipboard.win/MainForm.resx diff --git a/cmonitor.clipboard.win/Program.cs b/cmonitor.clipboard.win/Program.cs new file mode 100644 index 00000000..33b81f43 --- /dev/null +++ b/cmonitor.clipboard.win/Program.cs @@ -0,0 +1,17 @@ +namespace cmonitor.clipboard.win +{ + internal static class Program + { + /// + /// The main entry point for the application. + /// + [STAThread] + static void Main() + { + // To customize application configuration such as set high DPI settings or default font, + // see https://aka.ms/applicationconfiguration. + ApplicationConfiguration.Initialize(); + Application.Run(new MainForm()); + } + } +} \ No newline at end of file diff --git a/cmonitor.share.win/app.manifest b/cmonitor.clipboard.win/app.manifest similarity index 100% rename from cmonitor.share.win/app.manifest rename to cmonitor.clipboard.win/app.manifest diff --git a/cmonitor.clipboard.win/cmonitor.clipboard.win.csproj b/cmonitor.clipboard.win/cmonitor.clipboard.win.csproj new file mode 100644 index 00000000..ceb9624d --- /dev/null +++ b/cmonitor.clipboard.win/cmonitor.clipboard.win.csproj @@ -0,0 +1,17 @@ + + + + WinExe + net7.0-windows;net8.0-windows + disable + true + enable + favicon.ico + app.manifest + + + + + + + \ No newline at end of file diff --git a/cmonitor.share.win/cmonitor.share.win.csproj.user b/cmonitor.clipboard.win/cmonitor.clipboard.win.csproj.user similarity index 100% rename from cmonitor.share.win/cmonitor.share.win.csproj.user rename to cmonitor.clipboard.win/cmonitor.clipboard.win.csproj.user diff --git a/cmonitor.share.win/favicon.ico b/cmonitor.clipboard.win/favicon.ico similarity index 100% rename from cmonitor.share.win/favicon.ico rename to cmonitor.clipboard.win/favicon.ico diff --git a/cmonitor.install.win/MainForm.Designer.cs b/cmonitor.install.win/MainForm.Designer.cs index de0c48af..2d0a8094 100644 --- a/cmonitor.install.win/MainForm.Designer.cs +++ b/cmonitor.install.win/MainForm.Designer.cs @@ -43,14 +43,6 @@ shareLen = new TextBox(); label6 = new Label(); shareKey = new TextBox(); - label7 = new Label(); - wallpaperIndex = new TextBox(); - label8 = new Label(); - keyboardIndex = new TextBox(); - label9 = new Label(); - llockIndex = new TextBox(); - label10 = new Label(); - sasIndex = new TextBox(); label11 = new Label(); machineName = new TextBox(); label12 = new Label(); @@ -60,7 +52,6 @@ label14 = new Label(); screenScale = new TextBox(); installBtn = new Button(); - label15 = new Label(); runBtn = new Button(); checkStateBtn = new Button(); label16 = new Label(); @@ -139,46 +130,6 @@ resources.ApplyResources(shareKey, "shareKey"); shareKey.Name = "shareKey"; // - // label7 - // - resources.ApplyResources(label7, "label7"); - label7.Name = "label7"; - // - // wallpaperIndex - // - resources.ApplyResources(wallpaperIndex, "wallpaperIndex"); - wallpaperIndex.Name = "wallpaperIndex"; - // - // label8 - // - resources.ApplyResources(label8, "label8"); - label8.Name = "label8"; - // - // keyboardIndex - // - resources.ApplyResources(keyboardIndex, "keyboardIndex"); - keyboardIndex.Name = "keyboardIndex"; - // - // label9 - // - resources.ApplyResources(label9, "label9"); - label9.Name = "label9"; - // - // llockIndex - // - resources.ApplyResources(llockIndex, "llockIndex"); - llockIndex.Name = "llockIndex"; - // - // label10 - // - resources.ApplyResources(label10, "label10"); - label10.Name = "label10"; - // - // sasIndex - // - resources.ApplyResources(sasIndex, "sasIndex"); - sasIndex.Name = "sasIndex"; - // // label11 // resources.ApplyResources(label11, "label11"); @@ -226,11 +177,6 @@ installBtn.UseVisualStyleBackColor = true; installBtn.Click += OnInstallClick; // - // label15 - // - resources.ApplyResources(label15, "label15"); - label15.Name = "label15"; - // // runBtn // resources.ApplyResources(runBtn, "runBtn"); @@ -263,7 +209,6 @@ Controls.Add(shareItemLen); Controls.Add(checkStateBtn); Controls.Add(runBtn); - Controls.Add(label15); Controls.Add(installBtn); Controls.Add(label14); Controls.Add(screenScale); @@ -273,14 +218,6 @@ Controls.Add(reportDelay); Controls.Add(label11); Controls.Add(machineName); - Controls.Add(label10); - Controls.Add(sasIndex); - Controls.Add(label9); - Controls.Add(llockIndex); - Controls.Add(label7); - Controls.Add(wallpaperIndex); - Controls.Add(label8); - Controls.Add(keyboardIndex); Controls.Add(label5); Controls.Add(shareLen); Controls.Add(label6); @@ -315,14 +252,6 @@ private System.Windows.Forms.TextBox shareLen; private System.Windows.Forms.Label label6; private System.Windows.Forms.TextBox shareKey; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.TextBox wallpaperIndex; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.TextBox keyboardIndex; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.TextBox llockIndex; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.TextBox sasIndex; private System.Windows.Forms.Label label11; private System.Windows.Forms.TextBox machineName; private System.Windows.Forms.Label label12; @@ -332,7 +261,6 @@ private System.Windows.Forms.Label label14; private System.Windows.Forms.TextBox screenScale; private System.Windows.Forms.Button installBtn; - private System.Windows.Forms.Label label15; private System.Windows.Forms.Button runBtn; private System.Windows.Forms.Button checkStateBtn; diff --git a/cmonitor.install.win/MainForm.cs b/cmonitor.install.win/MainForm.cs index cb337e9a..52b1b6d6 100644 --- a/cmonitor.install.win/MainForm.cs +++ b/cmonitor.install.win/MainForm.cs @@ -1,8 +1,8 @@ using common.libs; +using common.libs.extends; using Microsoft.Win32; using System.Diagnostics; using System.Net; -using System.Text; namespace cmonitor.install.win { @@ -18,11 +18,6 @@ namespace cmonitor.install.win private void OnLoad(object sender, EventArgs e) { - keyboardIndex.ReadOnly = true; - wallpaperIndex.ReadOnly = true; - llockIndex.ReadOnly = true; - sasIndex.ReadOnly = true; - LoadConfig(); SaveConfig(); @@ -33,61 +28,50 @@ namespace cmonitor.install.win private void SaveConfig() { RegistryKey key = CheckRegistryKey(); - key.SetValue("modeClient", modeClient.Checked ? "1" : "0"); - key.SetValue("modeServer", modeServer.Checked ? "1" : "0"); - - key.SetValue("machineName", machineName.Text); - - key.SetValue("serverIP", serverIP.Text); - key.SetValue("serverPort", serverPort.Text); - key.SetValue("apiPort", apiPort.Text); - key.SetValue("webPort", webPort.Text); - - key.SetValue("reportDelay", reportDelay.Text); - key.SetValue("screenDelay", screenDelay.Text); - key.SetValue("screenScale", screenScale.Text); - - key.SetValue("shareKey", shareKey.Text); - key.SetValue("shareLen", shareLen.Text); - key.SetValue("shareItemLen", shareItemLen.Text); - - key.SetValue("keyboardIndex", keyboardIndex.Text); - key.SetValue("wallpaperIndex", wallpaperIndex.Text); - key.SetValue("llockIndex", llockIndex.Text); - key.SetValue("sasIndex", sasIndex.Text); - + key.SetValue("installParams", new ConfigInfo + { + Client = modeClient.Checked, + Server = modeServer.Checked, + MachineName = machineName.Text, + ServerEndpoint = new IPEndPoint(IPAddress.Parse(serverIP.Text), int.Parse(serverPort.Text)).ToString(), + ApiPort = int.Parse(apiPort.Text), + WebPort = int.Parse(webPort.Text), + ReportDelay = int.Parse(reportDelay.Text), + ScreenDelay = int.Parse(screenDelay.Text), + ScreenScale = double.Parse(screenScale.Text), + ShareKey = shareKey.Text, + ShareLen = int.Parse(shareLen.Text), + ShareSize = int.Parse(shareItemLen.Text), + }.ToJson()); } private void LoadConfig() { RegistryKey key = CheckRegistryKey(); - string hostname = Dns.GetHostName(); - modeClient.Checked = key.GetValue("modeClient", "0").ToString() == "1"; - modeServer.Checked = key.GetValue("modeServer", "0").ToString() == "1"; + ConfigInfo config = key.GetValue("installParams", "{}").ToString().DeJson(); - machineName.Text = key.GetValue("machineName", hostname).ToString(); + modeClient.Checked = config.Client; + modeServer.Checked = config.Server; - serverIP.Text = key.GetValue("serverIP", "127.0.0.1").ToString(); - serverPort.Text = key.GetValue("serverPort", "1802").ToString(); - apiPort.Text = key.GetValue("apiPort", "1801").ToString(); - webPort.Text = key.GetValue("webPort", "1800").ToString(); + machineName.Text = config.MachineName; - reportDelay.Text = key.GetValue("reportDelay", "30").ToString(); - screenDelay.Text = key.GetValue("screenDelay", "200").ToString(); - screenScale.Text = key.GetValue("screenScale", "0.2").ToString(); + IPEndPoint ep = IPEndPoint.Parse(config.ServerEndpoint); + serverIP.Text = ep.Address.ToString(); + serverPort.Text = ep.Port.ToString(); + apiPort.Text = config.ApiPort.ToString(); + webPort.Text = config.WebPort.ToString(); - shareKey.Text = key.GetValue("shareKey", "cmonitor/share").ToString(); - shareLen.Text = key.GetValue("shareLen", "10").ToString(); - shareItemLen.Text = key.GetValue("shareItemLen", "1024").ToString(); + reportDelay.Text = config.ReportDelay.ToString(); + screenDelay.Text = config.ScreenDelay.ToString(); + screenScale.Text = config.ScreenScale.ToString(); + + shareKey.Text = config.ShareKey; + shareLen.Text = config.ShareLen.ToString(); + shareItemLen.Text = config.ShareSize.ToString(); - keyboardIndex.Text = "1"; - wallpaperIndex.Text = "2"; - llockIndex.Text = "3"; - sasIndex.Text = "4"; } - private RegistryKey CheckRegistryKey() { Registry.SetValue("HKEY_CURRENT_USER\\SOFTWARE\\cmonitor", "test", 1); @@ -129,7 +113,7 @@ namespace cmonitor.install.win string dir = Path.GetDirectoryName(filename); string sasPath = Path.Combine(dir, exeName); - string sasIndexStr = sasIndex.Text; + string sasIndexStr = "4"; string shareKeyStr = shareKey.Text; string shareLenStr = shareLen.Text; @@ -255,26 +239,7 @@ namespace cmonitor.install.win MessageBox.Show("共享每项数据长度必填"); return false; } - if (string.IsNullOrWhiteSpace(keyboardIndex.Text)) - { - MessageBox.Show("键盘键下标必填"); - return false; - } - if (string.IsNullOrWhiteSpace(wallpaperIndex.Text)) - { - MessageBox.Show("壁纸键下标必填"); - return false; - } - if (string.IsNullOrWhiteSpace(llockIndex.Text)) - { - MessageBox.Show("锁屏键下标必填"); - return false; - } - if (string.IsNullOrWhiteSpace(sasIndex.Text)) - { - MessageBox.Show("sas键下标必填"); - return false; - } + installParams.Add($"--share-key {shareKey.Text}"); installParams.Add($"--share-len {shareLen.Text}"); installParams.Add($"--share-item-len {shareItemLen.Text}"); @@ -392,5 +357,22 @@ namespace cmonitor.install.win CheckInstall(); CheckRunning(); } + + public sealed class ConfigInfo + { + public bool Client { get; set; } + public bool Server { get; set; } + public string MachineName { get; set; } = Dns.GetHostName(); + public string ServerEndpoint { get; set; } = new IPEndPoint(IPAddress.Loopback, 1802).ToString(); + public int ApiPort { get; set; } = 1801; + public int WebPort { get; set; } = 1800; + public int ReportDelay { get; set; } = 30; + public int ScreenDelay { get; set; } = 200; + public double ScreenScale { get; set; } = 0.2; + public string ShareKey { get; set; } = "cmonitor/share"; + public int ShareLen { get; set; } = 100; + public int ShareSize { get; set; } = 1024; + + } } } diff --git a/cmonitor.install.win/MainForm.resx b/cmonitor.install.win/MainForm.resx index bedebe2b..f11cce8e 100644 --- a/cmonitor.install.win/MainForm.resx +++ b/cmonitor.install.win/MainForm.resx @@ -117,425 +117,284 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this - - - - 18 - - - 检查状态 - - - 23 - - - True - - - - 63, 21 - - - 25 - - - $this - - - 7 - - - 27, 226 - - - serverIP - - - 34 - - - $this - - - 29 - - - 机器名 - - - 36, 53 - - - True - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - shareItemLen - - - 键盘键下标 - - - 9 - - - apiPort - - - 331, 378 - - - 32, 80 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - label6 - - - 27 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - label13 - - - 73, 17 - - - 8 - - - $this - - - 100, 23 - - - 7, 17 - - - 100, 23 - - - True - - - 4 - - - 63, 21 - - - 68, 17 - - - 223, 80 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 73, 17 - - - 36 - - - 35 - - - 100, 23 - - - label16 - - - 数据数量 - - - webPort - - - 11 - - - 294, 302 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 截屏间隔ms - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 共享数据键 - - - machineName - - - label11 - - - 68, 17 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 100, 23 - - - $this - - - $this - - - 壁纸键下标 - - - 100, 23 - - - 11 - - - $this - - - 0 - - - label5 - - - 56, 17 - - - 80, 17 - - - System.Windows.Forms.Form, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 294, 102 - - - True - - - 服务端端口 - - - 219, 22 - - - 32 - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17 - - - 5 - - - 14 - - - 27, 307 - - - 294, 276 - - - 0 - - - $this - - - label14 - - - 15 - - - checkStateBtn - - - reportDelay - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 100, 23 - - - 100, 23 - - - SAS键下标 - - - sasIndex - - - 3 - - - $this - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + 22 - - 100, 23 - - - 294, 150 - - - 21 - - - 100, 23 - - - shareLen - - - 100, 23 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 201, 372 - - - label2 - - - 27 - - - 106, 102 - - - 16 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 372, 23 - - - label1 - - - 12 - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 服务端IP + + + 100, 23 - - label7 - - - 报告间隔ms - - + $this - - 30 - - - True + + 22, 337 + 23 - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label4 - - 106, 222 + + True - - 23, 106 + + 3 - - runBtn + + 20 - + + 8 + + + 219, 22 + + + 15 + + + 21 + + 100, 23 - - 114, 372 + + 213, 333 - - 32 + + 56, 17 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 7 + + + web端口 + + + machineName + + + 壁纸键下标 + + + label17 + + + 27, 154 + + + label5 + + + 36, 53 + + + 19 + + + True + + + 24 + + + $this + + + 331, 378 + + + label14 + + + $this + + + 锁屏键下标 + + + 80, 17 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + label2 + + + 停止运行 + + + $this + + + 22 + + + 3 + + + $this + + + $this True - + + 19 + + + label10 + + + 156, 21 + + + 372, 23 + + + 21 + + + 15, 334 + + + 220, 154 + + + SAS键下标 + + + 3 + + + 4 + + + 106, 49 + + + 294, 102 + + + 100, 23 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + + + reportDelay + + $this + + label9 + + + 25 + + + $this + + + 39 + + + 16 + + + $this + + + 106, 222 + + + 68, 17 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 40 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + cmonitor安装工具 + + + wallpaperIndex + + + $this + + + 294, 76 + + + 32, 80 + + + 34 + + + 6 + + + $this + + + 201, 372 + + + $this + + + label15 + + + $this + + + 66, 17 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + 服务端IP + AAABAAEAAAAAAAEAIABdQAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAEAAAABAAgGAAAAXHKoZgAAQCRJ @@ -815,476 +674,695 @@ lbj4VzZ7T6Ce2eKyfeTF92Tj/y+1yov7XH58jUaj0Wg0Gk2v5P8D5M/bzdE8cNIAAAAASUVORK5CYII= - - 81, 35 - - - keyboardIndex - - - 9 - - - 管理接口端口 - - - 20 - - - $this - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 1 - - - 80, 17 - - - 106, 276 - - - 安装自启动 + + 63, 21 55, 17 - - 33 + + 56, 17 + + + 41, 253 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + $this + + + modeClient + + + 106, 177 + + + $this + + + 2 + + + $this + + + 22 + + + runBtn + + + 截屏间隔ms + + + 100, 23 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 26 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 100, 23 + + + 20, 181 + + + $this + + + $this + + + 106, 76 installBtn - - screenDelay + + 100, 23 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + keyboardIndex + + + 0 $this - - True + + 管理接口端口 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 21 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 232, 106 + + + 客户端 + + + serverIP + + + 294, 276 19 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 156, 21 - - - 服务端 + + 10 75, 23 - + + 4 + + + 共享数据键 + + + 27, 226 + + $this - - 68, 17 + + 106, 249 - - label3 + + 7, 17 - - 18 + + 服务端端口 - - 227, 306 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 13 + + 24 - + $this - + + 23 + + + sasIndex + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + apiPort + + + 80, 17 + + + modeServer + + + 0 + + + 8 + + + 106, 331 + + + 5 + + + 100, 23 + + + serverPort + + + label1 + + + 13 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + llockIndex + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 29 - - 17 + + label3 - - label15 + + 294, 330 - - modeClient - - + $this - + + 211, 253 + + + 11 + + + MiddleCenter + + + 每项255长度，0项保留不可用 + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 44, 17 + + + 14 + + + True + + + 100, 23 + + + label7 + + + MainForm + + + 2 + + + 25 + + + 18 + + + 17 + + + True + + + 机器名 + + + shareLen + + + $this + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this + + + checkStateBtn + + + label11 + + + 安装自启动 + + + 检查状态 + + + 100, 23 + + + 服务端 + + + $this + + + 30 + True - - 25 + + 15 - + $this - - 3 + + 17 - - 16 + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 20 + + 18 - - 2 + + True - - 8 + + 294, 249 - - 68, 17 + + $this - - 20, 181 + + 81, 35 - - 106, 177 + + 63, 21 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 18 $this - + + 294, 302 + + True + + 33 + + + 5 + + + True + + + 81, 35 + + + 23 + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + System.Windows.Forms.Form, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 12 + + + 223, 80 + 截屏缩放比例 - - 106, 76 + + 80, 17 - - 68, 17 + + 100, 23 - + + questionIndex + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 每项数据长度 + + 26 - + + 13 + + + 7 + + 6 31 - - $this - - - 每项255长度，0项保留不可用 - - - 客户端 - - - 35 - - - True - - - 106, 49 - - - 232, 106 - - - web端口 - - - 28 - - - cmonitor安装工具 - - - 211, 253 - - - $this - - - 1 - - - 21 - - - 34 - - - label10 - - - 4 - - - 106, 249 - - - 5 - - - label4 - - - 22 - - - 24 - - - True - - - 12 - - - 22, 337 - - - modeServer - - - 停止运行 - - - $this - - - 26 - - - 33 - - - 294, 249 - - - 28 - - - $this - - + 100, 23 - - 80, 17 + + 27 - + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - $this + + 106, 102 - - $this + + 20 - - $this + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label12 + + 68, 17 - - 10 + + 14 - - 30 - - - 27, 154 - - - 41, 253 + + 1 27, 280 - - wallpaperIndex + + True + + + 100, 23 + + + 报告间隔ms + + + $this + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 73, 17 + + + 16 + + + 11 + + + 106, 276 + + + 100, 23 + + + 68, 17 + + + shareKey System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + 68, 17 - - 7 + + 418, 420 - - 44, 17 + + answerIndex - - 锁屏键下标 + + 73, 17 - - 14 + + 23, 106 - - llockIndex - - - 2 - - - $this - - - 100, 23 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - serverPort - - - True - - + 100, 23 225, 280 - - $this + + 20 - - 66, 17 + + 1 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label6 - - $this + + 28 - - label8 + + shareItemLen - - 24 + + True - - $this - - - screenScale - - - 418, 420 - - - MainForm - - - 81, 35 - - - $this - - - 106, 303 - - - 26 - - - 19 - - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 100, 23 System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label9 + + 27, 307 + + + $this 106, 150 - - $this + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 12 + + + 106, 303 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 键盘键下标 + + + screenDelay + + + 294, 150 + + + 1 + + + label8 + + + 114, 372 + + + 25 + + + webPort + + + label16 + + + 38 + + + label18 + + + 2 + + + 37 + + + 8 System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleCenter + + screenScale - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 32 - + $this - - 220, 154 + + 数据数量 - - 15 + + $this - + + label13 + + 100, 23 - - shareKey + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 68, 17 + + + 36 + + + $this + + + $this + + + 每项数据长度 + + + label12 + + + $this + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - 13 + + 35 - - 6 + + $this - - 56, 17 + + $this - - 294, 76 + + 24 - - 31 + + 9 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 227, 306 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 100, 23 + + + 9 True diff --git a/cmonitor.install.win/MainForm.zh-Hans.resx b/cmonitor.install.win/MainForm.zh-Hans.resx index f19539c4..b44e218a 100644 --- a/cmonitor.install.win/MainForm.zh-Hans.resx +++ b/cmonitor.install.win/MainForm.zh-Hans.resx @@ -117,10 +117,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 每项1024长度，0项保留不可用 - + + 193, 290 + + + 106, 290 + + + 323, 296 + + + 418, 334 + AAABAAEAAAAAAAEAIABdQAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAEAAAABAAgGAAAAXHKoZgAAQCRJ diff --git a/cmonitor.libs/IShareMemory.cs b/cmonitor.libs/IShareMemory.cs index 37ce7d9b..94a9fc5a 100644 --- a/cmonitor.libs/IShareMemory.cs +++ b/cmonitor.libs/IShareMemory.cs @@ -2,6 +2,7 @@ namespace cmonitor.libs { + //1 attr + 8 version + 4 klen + key + 4 vlen + val internal interface IShareMemory { public bool Init(); diff --git a/cmonitor.libs/ShareMemory.cs b/cmonitor.libs/ShareMemory.cs index 7752d249..d15e2a4f 100644 --- a/cmonitor.libs/ShareMemory.cs +++ b/cmonitor.libs/ShareMemory.cs @@ -2,6 +2,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; +using System.Runtime.InteropServices; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -71,7 +72,7 @@ namespace cmonitor.libs { try { - if (OperatingSystem.IsWindows() && accessorGlobal == null) + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && accessorGlobal == null) { gloablBytes = new byte[bytes.Length]; accessorGlobal = ShareMemoryFactory.Create($"Global\\{key}", length, itemSize); @@ -462,11 +463,13 @@ namespace cmonitor.libs IncrementVersion(accessor, index); } + private DateTime startTime = new DateTime(1970, 1, 1); private void IncrementVersion(IShareMemory accessor, int index) { if (accessor == null || index >= length) return; - long version = accessor.ReadInt64(index * itemSize + shareMemoryVersionIndex); - accessor.WriteInt64(index * itemSize + shareMemoryVersionIndex, version + 1); + + long version = (long)(DateTime.UtcNow.Subtract(startTime)).TotalMilliseconds; + accessor.WriteInt64(index * itemSize + shareMemoryVersionIndex, version); } private long ReadVersion(IShareMemory accessor, int index) { @@ -548,9 +551,36 @@ namespace cmonitor.libs Closed = 0b0000_0010, Running = 0b0000_0100, HiddenForList = 0b0000_1000, + Error = 0b0001_0000, All = 0b1111_1111 } + [StructLayout(LayoutKind.Sequential, Pack = 1)] + public struct ShareItem + { + public byte Attr; + + public ulong Version; + + public ulong Time; + + public byte KeyLength; + + /// + /// 255长度 + /// + [MarshalAs(UnmanagedType.ByValArray, SizeConst = 255)] + public byte[] Key; + + public byte ValLength; + + /// + /// 9966长度 + /// + [MarshalAs(UnmanagedType.ByValArray, SizeConst = 9966)] + public byte[] Value; + } + public sealed class ShareItemAttributeChanged { public Action Action { get; set; } diff --git a/cmonitor.libs/ShareMemoryFactory.cs b/cmonitor.libs/ShareMemoryFactory.cs index 852aafb3..0f4205e0 100644 --- a/cmonitor.libs/ShareMemoryFactory.cs +++ b/cmonitor.libs/ShareMemoryFactory.cs @@ -1,4 +1,5 @@ using System; +using System.Runtime.InteropServices; namespace cmonitor.libs { @@ -6,15 +7,15 @@ namespace cmonitor.libs { public static IShareMemory Create(string key, int length, int itemSize) { - if (OperatingSystem.IsWindows()) + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { return new ShareMemoryWindows(key, length, itemSize); } - else if (OperatingSystem.IsLinux()) + else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { return new ShareMemoryLinux(key, length, itemSize); } - else if (OperatingSystem.IsMacOS()) + else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) { return new ShareMemoryMacOS(key, length, itemSize); } diff --git a/cmonitor.libs/ShareMemoryWindows.cs b/cmonitor.libs/ShareMemoryWindows.cs index 0c9ab521..623bce8c 100644 --- a/cmonitor.libs/ShareMemoryWindows.cs +++ b/cmonitor.libs/ShareMemoryWindows.cs @@ -2,7 +2,6 @@ using System.IO; using System.IO.MemoryMappedFiles; using System.Runtime.InteropServices; -using static System.Runtime.InteropServices.JavaScript.JSType; namespace cmonitor.libs { @@ -25,7 +24,7 @@ namespace cmonitor.libs { try { - if (accessorLocal == null && OperatingSystem.IsWindows()) + if (accessorLocal == null && RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { mmfLocal = MemoryMappedFile.CreateOrOpen($"{key}", length * itemSize, MemoryMappedFileAccess.ReadWriteExecute, MemoryMappedFileOptions.None, HandleInheritability.None); diff --git a/cmonitor.libs/cmonitor.libs.csproj b/cmonitor.libs/cmonitor.libs.csproj index b832ba5f..6cabcf5f 100644 --- a/cmonitor.libs/cmonitor.libs.csproj +++ b/cmonitor.libs/cmonitor.libs.csproj @@ -2,7 +2,7 @@ Library - net7.0;net8.0 + net7;net8 false true Debug;Release diff --git a/cmonitor.llock.win/Hook.cs b/cmonitor.llock.win/Hook.cs deleted file mode 100644 index fed51672..00000000 --- a/cmonitor.llock.win/Hook.cs +++ /dev/null @@ -1,175 +0,0 @@ -using common.libs; -using Microsoft.Win32; -using System.Runtime.InteropServices; - -namespace cmonitor.llock.win -{ - internal class Hook : IDisposable - { - private delegate int HookProc(int nCode, int wParam, IntPtr lParam); - private static int hHook = 0; - private const int WH_KEYBOARD_LL = 13; - HookProc KeyBoardHookProcedure; - [StructLayout(LayoutKind.Sequential)] - private class KeyBoardHookStruct - { - public int vkCode; - public int scanCode; - public int flags; - public int time; - public int dwExtraInfo; - } - [DllImport("user32.dll")] - private static extern int SetWindowsHookEx(int idHook, HookProc lpfn, IntPtr hInstance, int threadId); - [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)] - private static extern bool UnhookWindowsHookEx(int idHook); - [DllImport("user32.dll")] - private static extern int CallNextHookEx(int idHook, int nCode, int wParam, IntPtr lParam); - [DllImport("kernel32.dll")] - private static extern IntPtr GetModuleHandle(string name); - - public void Start() - { - // 安装键盘钩子 - if (hHook == 0) - { - KeyBoardHookProcedure = new HookProc(KeyBoardHookProc); - hHook = SetWindowsHookEx(WH_KEYBOARD_LL, KeyBoardHookProcedure, GetModuleHandle(null), 0); - //如果设置钩子失败. - if (hHook == 0) - Close(); - else - { - try - { - foreach (string user in Registry.Users.GetSubKeyNames()) - { - RegistryKey key = Registry.Users.OpenSubKey(user, true).OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\System", true); - if (key == null) - key = Registry.Users.OpenSubKey(user, true).CreateSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\System"); - - RegistryKey key1 = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\System", true); - if (key1 == null) - key1 = Registry.LocalMachine.CreateSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\System"); - - //任务管理器 - key.SetValue("DisableTaskMgr", 1, RegistryValueKind.DWord); - key1.SetValue("DisableTaskMgr", 1, RegistryValueKind.DWord); - //锁定 - key.SetValue("DisableLockWorkstation", 1, RegistryValueKind.DWord); - key1.SetValue("DisableLockWorkstation", 1, RegistryValueKind.DWord); - //切换用户 - key.SetValue("HideFastUserSwitching", 1, RegistryValueKind.DWord); - key1.SetValue("HideFastUserSwitching", 1, RegistryValueKind.DWord); - //修改密码 - key.SetValue("DisableChangePassword", 1, RegistryValueKind.DWord); - key1.SetValue("DisableChangePassword", 1, RegistryValueKind.DWord); - //关机 - key.SetValue("ShutdownWithoutLogon", 0, RegistryValueKind.DWord); - key1.SetValue("ShutdownWithoutLogon", 0, RegistryValueKind.DWord); - //注销 - key.SetValue("StartMenuLogOff", 1, RegistryValueKind.DWord); - key1.SetValue("StartMenuLogOff", 1, RegistryValueKind.DWord); - - - - key.Close(); - key1.Close(); - - //注销 - RegistryKey zxKey = Registry.Users.OpenSubKey(user, true).OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\Explorer", true); - if (zxKey == null) - zxKey = Registry.Users.OpenSubKey(user, true).CreateSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\Explorer"); - zxKey.SetValue("NoLogOff", 1, RegistryValueKind.DWord); - zxKey.SetValue("NoClose", 1, RegistryValueKind.DWord); - zxKey.SetValue("StartMenuLogOff", 1, RegistryValueKind.DWord); - zxKey.Close(); - } - } - catch (Exception) - { - } - Task.Run(() => - { - CommandHelper.Windows(string.Empty, new string[] { "gpupdate /force" }); - }); - } - } - } - public void Close() - { - if (hHook != 0) - { - UnhookWindowsHookEx(hHook); - hHook = 0; - } - try - { - foreach (string user in Registry.Users.GetSubKeyNames()) - { - RegistryKey key = Registry.Users.OpenSubKey(user, true).OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\System", true); - RegistryKey key1 = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\System", true); - if (key != null) - { - key.DeleteValue("DisableTaskMgr", false); - key1.DeleteValue("DisableTaskMgr", false); - key.DeleteValue("DisableLockWorkstation", false); - key1.DeleteValue("DisableLockWorkstation", false); - key.DeleteValue("HideFastUserSwitching", false); - key1.DeleteValue("HideFastUserSwitching", false); - key.DeleteValue("DisableChangePassword", false); - key1.DeleteValue("DisableChangePassword", false); - key.DeleteValue("ShutdownWithoutLogon", false); - key1.DeleteValue("ShutdownWithoutLogon", false); - key.DeleteValue("StartMenuLogoff", false); - key1.DeleteValue("StartMenuLogoff", false); - - - key.Close(); - key1.Close(); - } - - RegistryKey zxKey = Registry.Users.OpenSubKey(user, true).OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\Explorer", true); - if (zxKey != null) - { - zxKey.DeleteValue("NoLogOff", false); - zxKey.DeleteValue("NoClose", false); - zxKey.DeleteValue("StartMenuLogoff", false); - zxKey.Close(); - } - } - } - catch (Exception) - { - } - CommandHelper.Windows(string.Empty, new string[] { "gpupdate /force" }, false); - } - private int KeyBoardHookProc(int nCode, int wParam, IntPtr lParam) - { - if (nCode >= 0) - { - return 1; - } - return CallNextHookEx(hHook, nCode, wParam, lParam); - } - - #region IDisposable 成员 - public void Dispose() - { - Close(); - } - - private struct tagMSG - { - public int hwnd; - public uint message; - public int wParam; - public long lParam; - public uint time; - public int pt; - } - [DllImport("user32.dll")] - private static extern int GetMessage(ref tagMSG lpMsg, int a, int hwnd, int wMsgFilterMax); - #endregion - } -} diff --git a/cmonitor.llock.win/MainForm.cs b/cmonitor.llock.win/MainForm.cs index d53cfa73..6e025bd0 100644 --- a/cmonitor.llock.win/MainForm.cs +++ b/cmonitor.llock.win/MainForm.cs @@ -1,4 +1,5 @@ using cmonitor.libs; +using common.libs; using System.Diagnostics; using System.Runtime.InteropServices; using System.Text; @@ -24,7 +25,7 @@ namespace cmonitor.llock.win return cp; } } - + public MainForm(string shareMkey, int shareMLength, int shareItemMLength, int shareIndex) { this.shareIndex = shareIndex; @@ -61,7 +62,7 @@ namespace cmonitor.llock.win private void OnLoad(object sender, EventArgs e) { - hook.Start(); + hook.Start((code) => { return true; }); #if RELEASE this.WindowState = FormWindowState.Maximized; #endif @@ -119,7 +120,6 @@ namespace cmonitor.llock.win private void CloseClear() { shareMemory.RemoveAttribute(shareIndex, ShareMemoryAttribute.Running); - shareMemory.Update(this.shareIndex, keyBytes, BitConverter.GetBytes((long)0)); cancellationTokenSource.Cancel(); hook.Close(); @@ -132,14 +132,13 @@ namespace cmonitor.llock.win } private DateTime startTime = new DateTime(1970, 1, 1); - private byte[] keyBytes = Encoding.UTF8.GetBytes("LLock"); private long lastTime = 0; private void WriteLLock() { long time = (long)(DateTime.UtcNow.Subtract(startTime)).TotalMilliseconds; if (time - lastTime >= 800) { - shareMemory.Update(this.shareIndex, keyBytes, BitConverter.GetBytes(time)); + shareMemory.IncrementVersion(shareIndex); lastTime = time; } } diff --git a/cmonitor.llock.win/Program.cs b/cmonitor.llock.win/Program.cs index 248140eb..11901b89 100644 --- a/cmonitor.llock.win/Program.cs +++ b/cmonitor.llock.win/Program.cs @@ -1,3 +1,8 @@ +using System.ComponentModel; +using System.Diagnostics; +using System.Runtime.InteropServices; +using System.Security.AccessControl; + namespace cmonitor.llock.win { internal static class Program @@ -13,15 +18,16 @@ namespace cmonitor.llock.win { Environment.Exit(1); } + //ProcessProtection.ProtectProcess(); AppDomain.CurrentDomain.UnhandledException += (a, b) => { }; - string shareMkey = arg[0]; - int shareMLength = int.Parse(arg[1]); - int shareItemMLength = int.Parse(arg[2]); - int shareIndex = int.Parse(arg[3]); + string shareMkey = "cmonitor/share"; + int shareMLength = 100; + int shareItemMLength = 10240; + int shareIndex = 3; if (arg.Length > 0) { @@ -36,4 +42,82 @@ namespace cmonitor.llock.win Application.Run(new MainForm(shareMkey, shareMLength, shareItemMLength, shareIndex)); } } + + class ProcessProtection + { + [DllImport("ntdll.dll", SetLastError = true)] + private static extern int NtSetInformationProcess(IntPtr hProcess, int processInformationClass, ref int processInformation, int processInformationLength); + + [DllImport("ntdll.dll", SetLastError = true)] + private static extern IntPtr RtlAdjustPrivilege(int Privilege, bool bEnablePrivilege, bool IsThreadPrivilege, out bool PreviousValue); + + [DllImport("ntdll.dll")] + private static extern uint NtRaiseHardError( + uint ErrorStatus, + uint NumberOfParameters, + uint UnicodeStringParameterMask, + IntPtr Parameters, + uint ValidResponseOption, + out uint Response + ); + + private static bool IsDebugMode = false; + + public static void ProtectProcess() + { + int isCritical = 1; + int BreakOnTermination = 0x1D; + if (!IsDebugMode) + { + Process.EnterDebugMode(); + IsDebugMode = true; + } + NtSetInformationProcess(Process.GetCurrentProcess().Handle, BreakOnTermination, ref isCritical, sizeof(int)); + } + + public static void ProtectProcess(Process target) + { + int isCritical = 1; + int BreakOnTermination = 0x1D; + if (!IsDebugMode) + { + Process.EnterDebugMode(); + IsDebugMode = true; + } + NtSetInformationProcess(target.Handle, BreakOnTermination, ref isCritical, sizeof(int)); + } + + public static void UnprotectProcess() + { + int isCritical = 0; + int BreakOnTermination = 0x1D; + if (!IsDebugMode) + { + Process.EnterDebugMode(); + IsDebugMode = true; + } + NtSetInformationProcess(Process.GetCurrentProcess().Handle, BreakOnTermination, ref isCritical, sizeof(int)); + } + + public static void UnprotectProcess(Process target) + { + int isCritical = 0; + int BreakOnTermination = 0x1D; + if (!IsDebugMode) + { + Process.EnterDebugMode(); + IsDebugMode = true; + } + NtSetInformationProcess(target.Handle, BreakOnTermination, ref isCritical, sizeof(int)); + } + + public static void BSOD() + { + bool b; + uint response; + uint STATUS_ASSERTION_FAILURE = 0xC0000420; + RtlAdjustPrivilege(19, true, false, out b); + NtRaiseHardError(STATUS_ASSERTION_FAILURE, 0, 0, IntPtr.Zero, 6, out response); + } + } } \ No newline at end of file diff --git a/cmonitor.share.win/Hook.cs b/cmonitor.share.win/Hook.cs deleted file mode 100644 index d3aa6b29..00000000 --- a/cmonitor.share.win/Hook.cs +++ /dev/null @@ -1,175 +0,0 @@ -using common.libs; -using Microsoft.Win32; -using System.Runtime.InteropServices; - -namespace cmonitor.share.win -{ - internal class Hook : IDisposable - { - private delegate int HookProc(int nCode, int wParam, IntPtr lParam); - private static int hHook = 0; - private const int WH_KEYBOARD_LL = 13; - HookProc KeyBoardHookProcedure; - [StructLayout(LayoutKind.Sequential)] - private class KeyBoardHookStruct - { - public int vkCode; - public int scanCode; - public int flags; - public int time; - public int dwExtraInfo; - } - [DllImport("user32.dll")] - private static extern int SetWindowsHookEx(int idHook, HookProc lpfn, IntPtr hInstance, int threadId); - [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)] - private static extern bool UnhookWindowsHookEx(int idHook); - [DllImport("user32.dll")] - private static extern int CallNextHookEx(int idHook, int nCode, int wParam, IntPtr lParam); - [DllImport("kernel32.dll")] - private static extern IntPtr GetModuleHandle(string name); - - public void Start() - { - // 安装键盘钩子 - if (hHook == 0) - { - KeyBoardHookProcedure = new HookProc(KeyBoardHookProc); - hHook = SetWindowsHookEx(WH_KEYBOARD_LL, KeyBoardHookProcedure, GetModuleHandle(null), 0); - //如果设置钩子失败. - if (hHook == 0) - Close(); - else - { - try - { - foreach (string user in Registry.Users.GetSubKeyNames()) - { - RegistryKey key = Registry.Users.OpenSubKey(user, true).OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\System", true); - if (key == null) - key = Registry.Users.OpenSubKey(user, true).CreateSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\System"); - - RegistryKey key1 = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\System", true); - if (key1 == null) - key1 = Registry.LocalMachine.CreateSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\System"); - - //任务管理器 - key.SetValue("DisableTaskMgr", 1, RegistryValueKind.DWord); - key1.SetValue("DisableTaskMgr", 1, RegistryValueKind.DWord); - //锁定 - key.SetValue("DisableLockWorkstation", 1, RegistryValueKind.DWord); - key1.SetValue("DisableLockWorkstation", 1, RegistryValueKind.DWord); - //切换用户 - key.SetValue("HideFastUserSwitching", 1, RegistryValueKind.DWord); - key1.SetValue("HideFastUserSwitching", 1, RegistryValueKind.DWord); - //修改密码 - key.SetValue("DisableChangePassword", 1, RegistryValueKind.DWord); - key1.SetValue("DisableChangePassword", 1, RegistryValueKind.DWord); - //关机 - key.SetValue("ShutdownWithoutLogon", 0, RegistryValueKind.DWord); - key1.SetValue("ShutdownWithoutLogon", 0, RegistryValueKind.DWord); - //注销 - key.SetValue("StartMenuLogOff", 1, RegistryValueKind.DWord); - key1.SetValue("StartMenuLogOff", 1, RegistryValueKind.DWord); - - - - key.Close(); - key1.Close(); - - //注销 - RegistryKey zxKey = Registry.Users.OpenSubKey(user, true).OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\Explorer", true); - if (zxKey == null) - zxKey = Registry.Users.OpenSubKey(user, true).CreateSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\Explorer"); - zxKey.SetValue("NoLogOff", 1, RegistryValueKind.DWord); - zxKey.SetValue("NoClose", 1, RegistryValueKind.DWord); - zxKey.SetValue("StartMenuLogOff", 1, RegistryValueKind.DWord); - zxKey.Close(); - } - } - catch (Exception) - { - } - Task.Run(() => - { - CommandHelper.Windows(string.Empty, new string[] { "gpupdate /force" }); - }); - } - } - } - public void Close() - { - if (hHook != 0) - { - UnhookWindowsHookEx(hHook); - hHook = 0; - } - try - { - foreach (string user in Registry.Users.GetSubKeyNames()) - { - RegistryKey key = Registry.Users.OpenSubKey(user, true).OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\System", true); - RegistryKey key1 = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\System", true); - if (key != null) - { - key.DeleteValue("DisableTaskMgr", false); - key1.DeleteValue("DisableTaskMgr", false); - key.DeleteValue("DisableLockWorkstation", false); - key1.DeleteValue("DisableLockWorkstation", false); - key.DeleteValue("HideFastUserSwitching", false); - key1.DeleteValue("HideFastUserSwitching", false); - key.DeleteValue("DisableChangePassword", false); - key1.DeleteValue("DisableChangePassword", false); - key.DeleteValue("ShutdownWithoutLogon", false); - key1.DeleteValue("ShutdownWithoutLogon", false); - key.DeleteValue("StartMenuLogoff", false); - key1.DeleteValue("StartMenuLogoff", false); - - - key.Close(); - key1.Close(); - } - - RegistryKey zxKey = Registry.Users.OpenSubKey(user, true).OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Policies\Explorer", true); - if (zxKey != null) - { - zxKey.DeleteValue("NoLogOff", false); - zxKey.DeleteValue("NoClose", false); - zxKey.DeleteValue("StartMenuLogoff", false); - zxKey.Close(); - } - } - } - catch (Exception) - { - } - CommandHelper.Windows(string.Empty, new string[] { "gpupdate /force" }, false); - } - private int KeyBoardHookProc(int nCode, int wParam, IntPtr lParam) - { - if (nCode >= 0) - { - return 1; - } - return CallNextHookEx(hHook, nCode, wParam, lParam); - } - - #region IDisposable 成员 - public void Dispose() - { - Close(); - } - - private struct tagMSG - { - public int hwnd; - public uint message; - public int wParam; - public long lParam; - public uint time; - public int pt; - } - [DllImport("user32.dll")] - private static extern int GetMessage(ref tagMSG lpMsg, int a, int hwnd, int wMsgFilterMax); - #endregion - } -} diff --git a/cmonitor.share.win/Interop.RDPCOMAPILib.dll b/cmonitor.share.win/Interop.RDPCOMAPILib.dll deleted file mode 100644 index da44ee70..00000000 Binary files a/cmonitor.share.win/Interop.RDPCOMAPILib.dll and /dev/null differ diff --git a/cmonitor.share.win/MainForm.cs b/cmonitor.share.win/MainForm.cs deleted file mode 100644 index 4b7df77b..00000000 --- a/cmonitor.share.win/MainForm.cs +++ /dev/null @@ -1,100 +0,0 @@ -using cmonitor.libs; -using RDPCOMAPILib; -using System.Diagnostics; - -namespace cmonitor.share.win -{ - public partial class MainForm : Form - { - protected override CreateParams CreateParams - { - get - { - const int WS_EX_APPWINDOW = 0x40000; - const int WS_EX_TOOLWINDOW = 0x80; - CreateParams cp = base.CreateParams; - cp.ExStyle &= (~WS_EX_APPWINDOW); - cp.ExStyle |= WS_EX_TOOLWINDOW; - return cp; - } - } - - private readonly Hook hook = new Hook(); - private readonly ShareMemory shareMemory; - private readonly byte[] bytes; - private long version = 0; - public MainForm(string key, int size) - { - InitializeComponent(); - - bytes = new byte[size]; - shareMemory = new ShareMemory(key, 1, size); - shareMemory.InitLocal(); - } - - private void OnLoad(object sender, EventArgs e) - { -#if RELEASE - this.FormBorderStyle = FormBorderStyle.None; - this.ShowInTaskbar = false; - this.WindowState = FormWindowState.Maximized; -#endif - TopMost = true; - CheckRunning(); - } - - private void CheckRunning() - { - hook.Start(); - shareMemory.AddAttribute(0, ShareMemoryAttribute.Running); - Task.Run(async () => - { - while (true) - { - try - { - if (shareMemory.ReadAttributeEqual(0, ShareMemoryAttribute.Closed)) - { - shareMemory.RemoveAttribute(0, ShareMemoryAttribute.Running); - hook.Close(); - Application.ExitThread(); - Application.Exit(); - Process.GetCurrentProcess().Kill(); - } - } - catch (Exception) - { - } - await Task.Delay(1000); - } - - }); - } - - private void OpenShareDesktop() - { - RDPSession session = new RDPSession(); - session.OnAttendeeConnected += Session_OnAttendeeConnected; - // 湲 - session.Open(); - - IRDPSRAPIInvitation invitation = session.Invitations.CreateInvitation("Ȩ", "ҵĹỰ", "123", 1024); - string invitationString = invitation.ConnectionString; - - Console.WriteLine("뽫ַṩԶ̿ͻˣ"); - Console.WriteLine(invitationString); - - // ȴرմ - Console.WriteLine("ر..."); - Console.ReadKey(); - - session.Close(); - } - private void Session_OnAttendeeConnected(object pAttendee) - { - IRDPSRAPIAttendee attendee = (IRDPSRAPIAttendee)pAttendee; - // ÿͻ˷ȨΪ ViewOnly - attendee.ControlLevel = CTRL_LEVEL.CTRL_LEVEL_VIEW; - } - } -} diff --git a/cmonitor.sln b/cmonitor.sln index d97db013..de5e85cc 100644 --- a/cmonitor.sln +++ b/cmonitor.sln @@ -23,10 +23,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cmonitor.message.win", "cmo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cmonitor.snatch.win", "cmonitor.snatch.win\cmonitor.snatch.win.csproj", "{5267B401-6818-407C-8323-E6C8A3CC01D6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cmonitor.share.win", "cmonitor.share.win\cmonitor.share.win.csproj", "{AB10024E-9307-4231-872E-3564A57BA035}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cmonitor.viewer.server.win", "cmonitor.viewer.server.win\cmonitor.viewer.server.win.csproj", "{AB10024E-9307-4231-872E-3564A57BA035}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmonitor.killer", "cmonitor.killer\cmonitor.killer.vcxproj", "{E19B86AC-AC42-417A-8536-C2FFF1FB7FDC}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cmonitor.clipboard.win", "cmonitor.clipboard.win\cmonitor.clipboard.win.csproj", "{2A23EA37-3EAC-4B60-8576-84607ADB0256}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -181,6 +183,18 @@ Global {E19B86AC-AC42-417A-8536-C2FFF1FB7FDC}.Release|x64.Build.0 = Release|x64 {E19B86AC-AC42-417A-8536-C2FFF1FB7FDC}.Release|x86.ActiveCfg = Release|Win32 {E19B86AC-AC42-417A-8536-C2FFF1FB7FDC}.Release|x86.Build.0 = Release|Win32 + {2A23EA37-3EAC-4B60-8576-84607ADB0256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A23EA37-3EAC-4B60-8576-84607ADB0256}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A23EA37-3EAC-4B60-8576-84607ADB0256}.Debug|x64.ActiveCfg = Debug|Any CPU + {2A23EA37-3EAC-4B60-8576-84607ADB0256}.Debug|x64.Build.0 = Debug|Any CPU + {2A23EA37-3EAC-4B60-8576-84607ADB0256}.Debug|x86.ActiveCfg = Debug|Any CPU + {2A23EA37-3EAC-4B60-8576-84607ADB0256}.Debug|x86.Build.0 = Debug|Any CPU + {2A23EA37-3EAC-4B60-8576-84607ADB0256}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A23EA37-3EAC-4B60-8576-84607ADB0256}.Release|Any CPU.Build.0 = Release|Any CPU + {2A23EA37-3EAC-4B60-8576-84607ADB0256}.Release|x64.ActiveCfg = Release|Any CPU + {2A23EA37-3EAC-4B60-8576-84607ADB0256}.Release|x64.Build.0 = Release|Any CPU + {2A23EA37-3EAC-4B60-8576-84607ADB0256}.Release|x86.ActiveCfg = Release|Any CPU + {2A23EA37-3EAC-4B60-8576-84607ADB0256}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/cmonitor.viewer.client.win/.build/default.Manifest.xml b/cmonitor.viewer.client.win/.build/default.Manifest.xml new file mode 100644 index 00000000..3c8a7348 --- /dev/null +++ b/cmonitor.viewer.client.win/.build/default.Manifest.xml @@ -0,0 +1,61 @@ + + + + cmonitor.share.screen.client.win + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True/PM + PerMonitorV2, PerMonitor + + + \ No newline at end of file diff --git a/cmonitor.viewer.client.win/.build/default.init.aardio b/cmonitor.viewer.client.win/.build/default.init.aardio new file mode 100644 index 00000000..11c61af2 --- /dev/null +++ b/cmonitor.viewer.client.win/.build/default.init.aardio @@ -0,0 +1,2 @@ +//发布前触发 +import ide; \ No newline at end of file diff --git a/cmonitor.viewer.client.win/.build/default.main.aardio b/cmonitor.viewer.client.win/.build/default.main.aardio new file mode 100644 index 00000000..f2f1b0a7 --- /dev/null +++ b/cmonitor.viewer.client.win/.build/default.main.aardio @@ -0,0 +1,6 @@ +//此触发器在生成EXE以后执行 +import ide; +import fsys; + +//获取生成的EXE文件路径 +var publishFile = ide.getPublishPath(); \ No newline at end of file diff --git a/cmonitor.viewer.client.win/default.aproj b/cmonitor.viewer.client.win/default.aproj new file mode 100644 index 00000000..0b86a998 --- /dev/null +++ b/cmonitor.viewer.client.win/default.aproj @@ -0,0 +1,6 @@ + + + + + + diff --git a/cmonitor.viewer.client.win/dist/cmonitor.viewer.client.win.exe b/cmonitor.viewer.client.win/dist/cmonitor.viewer.client.win.exe new file mode 100644 index 00000000..39f49f74 Binary files /dev/null and b/cmonitor.viewer.client.win/dist/cmonitor.viewer.client.win.exe differ diff --git a/cmonitor.viewer.client.win/lib/config.aardio b/cmonitor.viewer.client.win/lib/config.aardio new file mode 100644 index 00000000..5da06a0a --- /dev/null +++ b/cmonitor.viewer.client.win/lib/config.aardio @@ -0,0 +1,17 @@ +//config 配置文件 +import fsys.config; +config = fsys.config("/config/"); +//config = fsys.config( io.appData("/软件作者/应用程序名/") ); + +//不需要序列化的配置名字前请添加下划线 +namespace config { + __appName = "应用程序名"; + __website = "http://www.aardio.com/"; +} + +/**intellisense(config) +__appName = 应用程序名 +__website = 官方网站 +saveAll() = 写入所有配置到文件 +? = 获取值时指定不以下划线开始的配置表名称，\n返回一个可自动序列化到同名配置文件的表对象。\n如果此对象名以下划线开始，则可以正常读写值不会序列化为配置文件。\n否则不能对此对象直接赋值，只能对配置表对象的成员赋值。\n\n配置表可自动自文件加载,退出线程前自动序列化并存入文件。\n仅序列化以字符串、数值为键的元素，\n仅序列化值为字符串、数值、buffer 以及定义了 _serialize 元方法的成员。\n循环引用的值转换为 null，序列化时忽略成员函数\n!fsys_table. +end intellisense**/ \ No newline at end of file diff --git a/cmonitor.viewer.client.win/main.aardio b/cmonitor.viewer.client.win/main.aardio new file mode 100644 index 00000000..b9dad40c --- /dev/null +++ b/cmonitor.viewer.client.win/main.aardio @@ -0,0 +1,63 @@ +import win.ui; +/*DSG{{*/ +mainForm = win.form(text="cmonitor.viewer.client.win";right=757;bottom=467;border="thin";max=false;min=false;mode="popup";sysmenu=false;title=false) +mainForm.add() +/*}}*/ + +import win.ui.atom; +var atom,hwndConflict = mainForm.atom("C71CEE67-B4CA-4759-8608-8B2B917B0D54"); +if(!atom){ + win.quitMessage(); return; +}; + +mainForm.connecting = false; + +import com.lite; +import thread; +var dll = com.lite("rdpviewerax.dll"); +mainForm.tsc = dll.createEmbedEx(mainForm,"{32be5ed2-5c86-480f-a914-0ff8885a1b3f}"); +mainForm.tsc.SmartSizing = true; +mainForm.tsc.DisconnectedText = "正在连接至共享桌面...."; + +mainForm.tsc.OnConnectionFailed = function(){ + mainForm.connecting = false; +} +mainForm.tsc.OnConnectionTerminated = function(){ + mainForm.connecting = false; +} +mainForm.connect = function(){ + import win.reg; + import console; + if(mainForm.connecting === false){ + try{ + var reg = win.reg("HKEY_CURRENT_USER\Software\Cmonitor"); + mainForm.connecting = true; + var invitationString = reg.queryValue("viewerConnectStr"); + if(string.len(invitationString)>0) + { + mainForm.tsc.Connect(invitationString,"snltty","snltty"); + }else{ + mainForm.connecting = false; + } + }catch(e){ + console.log(e); + } + } + +} + +mainForm.show(); +if(!_STUDIO_INVOKED) +{ + mainForm.fullscreen(); + mainForm.modifyStyleEx(0x40000/*_WS_EX_APPWINDOW*/,0x80/*_WS_EX_TOOLWINDOW*/); + ::SetWindowPos(mainForm.hwnd,-1/*_HWND_TOPMOST*/,0,0,0,0,0x2/*_SWP_NOMOVE*/ + 0x1/*_SWP_NOSIZE*/); +} + +mainForm.setInterval( + function(){ + mainForm.connect(); + },1000 +); + +return win.loopMessage(); \ No newline at end of file diff --git a/cmonitor.share.win/MainForm.Designer.cs b/cmonitor.viewer.server.win/MainForm.Designer.cs similarity index 97% rename from cmonitor.share.win/MainForm.Designer.cs rename to cmonitor.viewer.server.win/MainForm.Designer.cs index 5c888520..a29b532e 100644 --- a/cmonitor.share.win/MainForm.Designer.cs +++ b/cmonitor.viewer.server.win/MainForm.Designer.cs @@ -1,4 +1,4 @@ -namespace cmonitor.share.win +namespace cmonitor.viewer.server.win { partial class MainForm { @@ -44,5 +44,7 @@ } #endregion + + } } diff --git a/cmonitor.viewer.server.win/MainForm.cs b/cmonitor.viewer.server.win/MainForm.cs new file mode 100644 index 00000000..c04368cd --- /dev/null +++ b/cmonitor.viewer.server.win/MainForm.cs @@ -0,0 +1,192 @@ +using cmonitor.libs; +using cmonitor.viewer.server.win.Properties; +using common.libs; +using Microsoft.Win32; +using RDPCOMAPILib; +using System.Diagnostics; +using System.Resources; +using System.Text; +using System.Windows.Forms; + +namespace cmonitor.viewer.server.win +{ + public partial class MainForm : Form + { + protected override CreateParams CreateParams + { + get + { + const int WS_EX_APPWINDOW = 0x40000; + const int WS_EX_TOOLWINDOW = 0x80; + CreateParams cp = base.CreateParams; + cp.ExStyle &= (~WS_EX_APPWINDOW); + cp.ExStyle |= WS_EX_TOOLWINDOW; + return cp; + } + } + + private readonly Hook hook = new Hook(); + private readonly ShareMemory shareMemory; + private int shareIndex = 0; + private Mode shareMode = Mode.Client; + private const string shareClientExe = "cmonitor.viewer.client.win"; + private byte[] shareKeyBytes = Encoding.UTF8.GetBytes(shareClientExe); + + public MainForm(string key, int length, int size, int index, Mode mode) + { + InitializeComponent(); + + shareMode = mode; + shareIndex = index; + shareMemory = new ShareMemory(key, length, size); + shareMemory.InitLocal(); + } + + private void OnLoad(object sender, EventArgs e) + { +#if RELEASE + this.FormBorderStyle = FormBorderStyle.None; + this.ShowInTaskbar = false; + this.WindowState = FormWindowState.Minimized; + this.Visible = false; +#endif + + CheckRunning(); + + if (shareMode == Mode.Client) + { + OpenShareClient(); + } + else + { + OpenShareDesktop(); + } + } + private void CheckRunning() + { + hook.Close(); + shareMemory.AddAttribute(shareIndex, ShareMemoryAttribute.Running); + shareMemory.RemoveAttribute(shareIndex, ShareMemoryAttribute.Closed); + Task.Run(async () => + { + while (true) + { + try + { + if (shareMemory.ReadAttributeEqual(shareIndex, ShareMemoryAttribute.Closed)) + { + CloseServer(); + } + else + { + shareMemory.IncrementVersion(shareIndex); + } + if (Process.GetProcessesByName(shareClientExe).Length == 0) + { + shareMemory.AddAttribute(shareIndex, ShareMemoryAttribute.Error); + } + } + catch (Exception) + { + } + await Task.Delay(30); + } + + }); + } + private void CloseServer() + { + shareMemory.RemoveAttribute(shareIndex, ShareMemoryAttribute.Running); + CloseShareClient(); + CloseShareDesktop(); + Application.ExitThread(); + Application.Exit(); + Process.GetCurrentProcess().Kill(); + } + + private void OpenShareClient() + { + hook.Start((code) => { return true; }); + + CommandHelper.Windows(string.Empty, new string[] { $"start {shareClientExe}.exe" },false); + } + private void CloseShareClient() + { + hook.Close(); + CommandHelper.Windows(string.Empty, new string[] { $"taskkill /f /im {shareClientExe}.exe" }); + } + + + RDPSession session; + private NotifyIcon notifyIcon; + private void OpenShareDesktop() + { + notifyIcon = new NotifyIcon(); + notifyIcon.Visible = true; + notifyIcon.ContextMenuStrip = new ContextMenuStrip(); + notifyIcon.ContextMenuStrip.Items.Add("ˢ¹"); + notifyIcon.ContextMenuStrip.Items.Add("˳"); + notifyIcon.ContextMenuStrip.ItemClicked += (object sender, ToolStripItemClickedEventArgs e) => + { + if (e.ClickedItem.Text == "˳") + { + CloseServer(); + } + else if (e.ClickedItem.Text == "ˢ¹") + { + NewShare(); + } + }; + NewShare(); + } + private void NewShare() + { + Task.Run(() => + { + try + { + CloseShareDesktop(); + session = new RDPSession(); + session.OnAttendeeConnected += Session_OnAttendeeConnected; + session.Open(); + IRDPSRAPIInvitation invitation = session.Invitations.CreateInvitation(Guid.NewGuid().ToString(), "snltty", "snltty", 1024); + string invitationString = invitation.ConnectionString; + + Registry.SetValue("HKEY_CURRENT_USER\\SOFTWARE\\Cmonitor", "viewerConnectStr", invitationString); + + notifyIcon.Icon = Icon.FromHandle(Resources.logo_share_green.GetHicon()); + notifyIcon.Text = "ڹ"; + } + catch (Exception) + { + notifyIcon.Icon = Icon.FromHandle(Resources.logo_share_gray.GetHicon()); + notifyIcon.Text = "ʧ"; + } + }); + } + + + private void Session_OnAttendeeConnected(object pAttendee) + { + IRDPSRAPIAttendee attendee = (IRDPSRAPIAttendee)pAttendee; + attendee.ControlLevel = CTRL_LEVEL.CTRL_LEVEL_VIEW; + } + private void CloseShareDesktop() + { + try + { + session?.Close(); + Registry.SetValue("HKEY_CURRENT_USER\\SOFTWARE\\Cmonitor", "viewerConnectStr", string.Empty); + } + catch (Exception) + { + } + } + } + + public enum Mode : byte + { + Client = 0, + Server = 1, + } +} diff --git a/cmonitor.viewer.server.win/MainForm.resx b/cmonitor.viewer.server.win/MainForm.resx new file mode 100644 index 00000000..5a23e01d --- /dev/null +++ b/cmonitor.viewer.server.win/MainForm.resx @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 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 + + + \ No newline at end of file diff --git a/cmonitor.share.win/Program.cs b/cmonitor.viewer.server.win/Program.cs similarity index 54% rename from cmonitor.share.win/Program.cs rename to cmonitor.viewer.server.win/Program.cs index be7c3b88..c540f7d3 100644 --- a/cmonitor.share.win/Program.cs +++ b/cmonitor.viewer.server.win/Program.cs @@ -1,4 +1,4 @@ -namespace cmonitor.share.win +namespace cmonitor.viewer.server.win { internal static class Program { @@ -16,18 +16,25 @@ namespace cmonitor.share.win AppDomain.CurrentDomain.UnhandledException += (a, b) => { + MessageBox.Show(b.ExceptionObject.ToString()); }; - string shareMkey = "cmonitor/share/screen"; - int shareItemMLength = 2 * 1024 * 1024; + string shareMkey = "cmonitor/share"; + int shareMLength = 10; + int shareItemMLength = 1024; + int shareIndex = 5; + Mode mode = Mode.Server; if (arg.Length > 0) { shareMkey = arg[0]; - shareItemMLength = int.Parse(arg[1]); + shareMLength = int.Parse(arg[1]); + shareItemMLength = int.Parse(arg[2]); + shareIndex = int.Parse(arg[3]); + mode = (Mode)byte.Parse(arg[4]); } ApplicationConfiguration.Initialize(); - Application.Run(new MainForm(shareMkey, shareItemMLength)); + Application.Run(new MainForm(shareMkey, shareMLength, shareItemMLength, shareIndex, mode)); } } } \ No newline at end of file diff --git a/cmonitor.viewer.server.win/Properties/PublishProfiles/FolderProfile.pubxml b/cmonitor.viewer.server.win/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 00000000..de010932 --- /dev/null +++ b/cmonitor.viewer.server.win/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,18 @@ + + + + + Release + Any CPU + bin\Release\net7.0-windows\publish\win-x86\ + FileSystem + <_TargetId>Folder + net7.0-windows + win-x86 + false + true + false + + \ No newline at end of file diff --git a/cmonitor.viewer.server.win/Properties/PublishProfiles/FolderProfile.pubxml.user b/cmonitor.viewer.server.win/Properties/PublishProfiles/FolderProfile.pubxml.user new file mode 100644 index 00000000..56618814 --- /dev/null +++ b/cmonitor.viewer.server.win/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -0,0 +1,10 @@ + + + + + True|2024-03-21T01:26:40.1376911Z;True|2024-03-21T09:24:13.2312644+08:00;True|2024-03-21T09:22:59.0517639+08:00; + + + \ No newline at end of file diff --git a/cmonitor.viewer.server.win/Properties/Resources.Designer.cs b/cmonitor.viewer.server.win/Properties/Resources.Designer.cs new file mode 100644 index 00000000..0b1834b2 --- /dev/null +++ b/cmonitor.viewer.server.win/Properties/Resources.Designer.cs @@ -0,0 +1,83 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace cmonitor.viewer.server.win.Properties { + using System; + + + /// + /// 一个强类型的资源类，用于查找本地化的字符串等。 + /// + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen + // (以 /str 作为命令选项)，或重新生成 VS 项目。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// 返回此类使用的缓存的 ResourceManager 实例。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("cmonitor.viewer.server.win.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap logo_share_gray { + get { + object obj = ResourceManager.GetObject("logo-share-gray", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap logo_share_green { + get { + object obj = ResourceManager.GetObject("logo-share-green", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/cmonitor.viewer.server.win/Properties/Resources.resx b/cmonitor.viewer.server.win/Properties/Resources.resx new file mode 100644 index 00000000..7ed1022e --- /dev/null +++ b/cmonitor.viewer.server.win/Properties/Resources.resx @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + ..\logo-share-gray.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\logo-share-green.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/cmonitor.viewer.server.win/app.manifest b/cmonitor.viewer.server.win/app.manifest new file mode 100644 index 00000000..75867c29 --- /dev/null +++ b/cmonitor.viewer.server.win/app.manifest @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cmonitor.share.win/cmonitor.share.win.csproj b/cmonitor.viewer.server.win/cmonitor.viewer.server.win.csproj similarity index 60% rename from cmonitor.share.win/cmonitor.share.win.csproj rename to cmonitor.viewer.server.win/cmonitor.viewer.server.win.csproj index fe48a877..e4e5929a 100644 --- a/cmonitor.share.win/cmonitor.share.win.csproj +++ b/cmonitor.viewer.server.win/cmonitor.viewer.server.win.csproj @@ -26,13 +26,25 @@ embedded + + + tlbimp + 0 + 1 + cc802d05-ae07-4c15-b496-db9d22aa0a84 + 0 + false + true + + + - - + + @@ -41,9 +53,18 @@ - - Interop.RDPCOMAPILib.dll - + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + \ No newline at end of file diff --git a/cmonitor.viewer.server.win/cmonitor.viewer.server.win.csproj.user b/cmonitor.viewer.server.win/cmonitor.viewer.server.win.csproj.user new file mode 100644 index 00000000..67d5f3df --- /dev/null +++ b/cmonitor.viewer.server.win/cmonitor.viewer.server.win.csproj.user @@ -0,0 +1,11 @@ + + + + <_LastSelectedProfileId>D:\desktop\cmonitor\cmonitor.share.win\Properties\PublishProfiles\FolderProfile.pubxml + + + + Form + + + \ No newline at end of file diff --git a/cmonitor.viewer.server.win/favicon.ico b/cmonitor.viewer.server.win/favicon.ico new file mode 100644 index 00000000..91b5da80 Binary files /dev/null and b/cmonitor.viewer.server.win/favicon.ico differ diff --git a/cmonitor.viewer.server.win/logo-share-gray.ico b/cmonitor.viewer.server.win/logo-share-gray.ico new file mode 100644 index 00000000..a0668ecc Binary files /dev/null and b/cmonitor.viewer.server.win/logo-share-gray.ico differ diff --git a/cmonitor.viewer.server.win/logo-share-gray.png b/cmonitor.viewer.server.win/logo-share-gray.png new file mode 100644 index 00000000..4856dbb2 Binary files /dev/null and b/cmonitor.viewer.server.win/logo-share-gray.png differ diff --git a/cmonitor.viewer.server.win/logo-share-green.ico b/cmonitor.viewer.server.win/logo-share-green.ico new file mode 100644 index 00000000..738f4359 Binary files /dev/null and b/cmonitor.viewer.server.win/logo-share-green.ico differ diff --git a/cmonitor.viewer.server.win/logo-share-green.png b/cmonitor.viewer.server.win/logo-share-green.png new file mode 100644 index 00000000..d995fbd4 Binary files /dev/null and b/cmonitor.viewer.server.win/logo-share-green.png differ diff --git a/cmonitor.wallpaper.win/MainForm.cs b/cmonitor.wallpaper.win/MainForm.cs index f390f54e..664c17be 100644 --- a/cmonitor.wallpaper.win/MainForm.cs +++ b/cmonitor.wallpaper.win/MainForm.cs @@ -1,4 +1,5 @@ using cmonitor.libs; +using common.libs; using System.Diagnostics; using System.Text; @@ -129,7 +130,8 @@ namespace cmonitor.wallpaper.win { try { - if (hook.CurrentKeys == Keys.None) + Keys currentKeys = (Keys)hook.CurrentKeys; + if (currentKeys == Keys.None) { if (lastKey != Keys.None) { @@ -151,11 +153,11 @@ namespace cmonitor.wallpaper.win { sb.Append("Alt+"); } - sb.Append(hook.CurrentKeys.ToString()); + sb.Append(currentKeys.ToString()); shareMemory.Update(shareKeyBoardIndex, keyBytes, Encoding.UTF8.GetBytes(sb.ToString())); } - lastKey = hook.CurrentKeys; + lastKey = currentKeys; WriteWallpaper(); } catch (Exception) @@ -165,13 +167,26 @@ namespace cmonitor.wallpaper.win await Task.Delay(30); } }); + + Task.Run(async () => + { + while (cancellationTokenSource.Token.IsCancellationRequested == false) + { + if ((DateTime.Now - hook.LastDateTime).TotalMilliseconds > 1000) + { + hook.CurrentKeys = 0; + } + + await Task.Delay(1000); + } + }); } private void WriteWallpaper() { long time = (long)(DateTime.UtcNow.Subtract(startTime)).TotalMilliseconds; if (time - lastTime >= 800) { - shareMemory.Update(shareWallpaperIndex, wallpaperBytes, BitConverter.GetBytes(time)); + shareMemory.IncrementVersion(shareWallpaperIndex); lastTime = time; } if (shareMemory.ReadAttributeEqual(shareWallpaperIndex, ShareMemoryAttribute.Closed)) diff --git a/cmonitor.wallpaper.win/cmonitor.wallpaper.win.csproj b/cmonitor.wallpaper.win/cmonitor.wallpaper.win.csproj index 0c9461d3..614ee815 100644 --- a/cmonitor.wallpaper.win/cmonitor.wallpaper.win.csproj +++ b/cmonitor.wallpaper.win/cmonitor.wallpaper.win.csproj @@ -39,6 +39,7 @@ + \ No newline at end of file diff --git a/cmonitor.web/src/apis/display.js b/cmonitor.web/src/apis/display.js new file mode 100644 index 00000000..d81330a5 --- /dev/null +++ b/cmonitor.web/src/apis/display.js @@ -0,0 +1,7 @@ +import { sendWebsocketMsg } from './request' + +export const screenDisplay = (names, state) => { + return sendWebsocketMsg('display/update', { + names, state + }, false, 1000); +} \ No newline at end of file diff --git a/cmonitor.web/src/apis/screen.js b/cmonitor.web/src/apis/screen.js index 66f6d648..445d5659 100644 --- a/cmonitor.web/src/apis/screen.js +++ b/cmonitor.web/src/apis/screen.js @@ -14,9 +14,3 @@ export const screenClip = (name, data) => { clip: data }, false, 1000); } - -export const screenDisplay = (names, state) => { - return sendWebsocketMsg('screen/display', { - names, state - }, false, 1000); -} \ No newline at end of file diff --git a/cmonitor.web/src/apis/viewer.js b/cmonitor.web/src/apis/viewer.js new file mode 100644 index 00000000..580bded5 --- /dev/null +++ b/cmonitor.web/src/apis/viewer.js @@ -0,0 +1,5 @@ +import { sendWebsocketMsg } from './request' + +export const viewerUpdate = (data) => { + return sendWebsocketMsg('viewer/update', data); +} \ No newline at end of file diff --git a/cmonitor.web/src/views/device/boxs/CheckBoxWrap.vue b/cmonitor.web/src/views/device/boxs/CheckBoxWrap.vue index dc8bb20c..f77ac9d3 100644 --- a/cmonitor.web/src/views/device/boxs/CheckBoxWrap.vue +++ b/cmonitor.web/src/views/device/boxs/CheckBoxWrap.vue @@ -1,14 +1,14 @@