修改策略、修复Bugs - 20241004

Author: cjhdevact

Assets/SettingUI.png

@@ -6,6 +6,7 @@ md "%~dp0TimeControl-Bin"
 copy "%~dp0TimeControl\files\1-安装.bat" "%~dp0TimeControl-Bin\1-安装.bat"
 copy "%~dp0TimeControl\files\2-卸载.bat" "%~dp0TimeControl-Bin\2-卸载.bat"
 copy "%~dp0TimeControl\files\TimeControlAdmxs.exe" "%~dp0TimeControl-Bin\TimeControlAdmxs.exe"
+copy "%~dp0TimeControl\files\TimeControl.adm" "%~dp0TimeControl-Bin\TimeControl.adm"
 copy "%~dp0TimeControl\files\UserinitBootInstall.bat" "%~dp0TimeControl-Bin\UserinitBootInstall.bat"
 copy "%~dp0TimeControl\files\UserinitBootUnInstall.bat" "%~dp0TimeControl-Bin\UserinitBootUnInstall.bat"
 copy "%~dp0TimeControl\bin\Release\TimeControl.exe" "%~dp0TimeControl-Bin\TimeControl.exe"

Src/PackOut.bat

@@ -381,7 +381,7 @@ Public Class Form1
         Dim unloadfut As Integer = 0
         Try
 
-            Dim plkeycr As RegistryKey = Registry.CurrentUser.OpenSubKey("SOFTWARE\CJH\Policies\TimeControl", True)
+            Dim plkeycr As RegistryKey = Registry.LocalMachine.OpenSubKey("SOFTWARE\Policies\CJH\TimeControl", True)
 
             Dim disfucrt As Integer = -1
             If (Not plkeycr Is Nothing) Then
@@ -450,7 +450,7 @@ Public Class Form1
         End Try
 
         Try
-            Dim plkey As RegistryKey = Registry.LocalMachine.OpenSubKey("SOFTWARE\CJH\Policies\TimeControl", True)
+            Dim plkey As RegistryKey = Registry.CurrentUser.OpenSubKey("SOFTWARE\Policies\CJH\TimeControl", True)
             Dim disfu As Integer
 
             If cdisbfut = 0 Then
@@ -707,22 +707,14 @@ Public Class Form1
                 If (Not mykey Is Nothing) Then
                     Me.UseMoveV = mykey.GetValue("EnableDrag", -1)
                     If Me.UseMoveV = -1 Then
-
                         RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "EnableDrag", 1, RegistryValueKind.DWord, "HKCU")
-
-
                         Me.UseMoveV = 1
                     ElseIf Me.UseMoveV > 1 Then
-
                         RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "EnableDrag", 1, RegistryValueKind.DWord, "HKCU")
-
                         Me.UseMoveV = 1
                     End If
                 Else
-
                     RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "EnableDrag", 1, RegistryValueKind.DWord, "HKCU")
-
-
                     Me.UseMoveV = 1
                 End If
 
@@ -795,6 +787,9 @@ Public Class Form1
                         Me.TopMost = False
                     ElseIf UseTop = 1 Then
                         Me.TopMost = True
+                    ElseIf UseTop > 1 Then
+                        RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "AllowTopMost", 1, RegistryValueKind.DWord, "HKCU")
+                        Me.TopMost = True
                     End If
                 Else
                     RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "AllowTopMost", 1, RegistryValueKind.DWord, "HKCU")
@@ -1313,7 +1308,7 @@ Public Class Form1
                     RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "TimeFontG", Label1.ForeColor.G, RegistryValueKind.DWord, "HKCU")
                     RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "TimeFontB", Label1.ForeColor.B, RegistryValueKind.DWord, "HKCU")
                 End If
-
+                Form2.ColorDialog1.Color = Color.White
             End If
             Me.ContextMenuStrip1.BackColor = Color.FromArgb(32, 32, 32)
             Me.ContextMenuStrip1.ForeColor = Color.White
@@ -1363,6 +1358,7 @@ Public Class Form1
                     RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "TimeFontG", Label1.ForeColor.G, RegistryValueKind.DWord, "HKCU")
                     RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "TimeFontB", Label1.ForeColor.B, RegistryValueKind.DWord, "HKCU")
                 End If
+                Form2.ColorDialog1.Color = Color.Black
             End If
             Me.ContextMenuStrip1.BackColor = Color.White
             Me.ContextMenuStrip1.ForeColor = Color.Black

Src/TimeControl.suo

@@ -127,7 +127,7 @@
   <data name="PictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1
-        MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAADsIAAA7CARUoSoAAAAB7SURBVDhPxZHRCYAwDAU7jiM4
+        MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAADsEAAA7BAbiRa+0AAAB7SURBVDhPxZHRCYAwDAU7jiM4
         mFO4kXM4UPQhD8xL0ip+WDiwIXcUbGYWmJbNMnQPhAEW53VPySJO7MmEe2lAl3l0HgKVnH0TRoZyNXsV
         0DuBmwaUT4FKBv8G4J2n/o0jXKAXwdEZZeACT17CvRAgVUhF4i53KFTihbUD0860AyUhweoAAAAASUVO
         RK5CYII=
@@ -139,7 +139,7 @@
   <data name="PictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1
-        MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAzwSURBVHhe1ZvZdhXVFobzCL6B
+        MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAAzwSURBVHhe1ZvZdhXVFobzCL6B
         vMnhDQ5vcHLlpeFOuUruvIQ77DAqYIcYbLAZQ40iDFCUOGyGDcIWxF6zsW9ZdeY3mf9y1tq1Q5CAWGN8
         Y85VCcn+5lxVtapSzFztbWlpaZMx+8QTT2w3lh5//PEVY2R0RonYHThwYGSsGPbtSwv2vf/l38aP+Xdt
         9uH/gzCiFl1QMUDcMeE6JgcTr9h4ZHHR2Bw//vrc7APe8OSTT86byNhka2czEsy5CNmaNxTiY489Ntq/

Src/TimeControl/Form1.vb

@@ -142,7 +142,7 @@ errcode:
                 TextBox4.Enabled = True
                 Button9.Enabled = True
             End If
-          
+
         Else
             Me.CheckBox4.Checked = False
             If Form1.DisbFuState = 0 Then
@@ -208,7 +208,7 @@ errcode:
             ComboBox4.SelectedText = "自定义背景"
         End If
 
-        Label1.Text = "时间小工具 版本：" & My.Application.Info.Version.ToString & vbCrLf & "版权所有 © 2022-2024 CJH。"
+        Label1.Text = "时钟小工具 版本：" & My.Application.Info.Version.ToString & vbCrLf & "版权所有 © 2022-2024 CJH。"
         Call formatcolorcurset()
     End Sub
     Private Sub TextBox1_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles TextBox1.KeyPress
@@ -537,7 +537,7 @@ errcode:
                     'ElseIf disi.DpiY > 160 Then
                     '    Form1.SetTimeFormSize(aa.Height - 30 * disi.DpiY * 0.01, aa.Width - 120 - 800 * disi.DpiY * 0.01)
                     'End If
-                   
+
                     'If disi.DpiY < 100 Then
                     '    If aa.Width <= 42 Then
                     '        Form1.SetTimeFormSize(Form1.Label1.Font.Size * disi.DpiY * 0.01 + disi.DpiY * 0.01 * 20, aa.Width + 8)
@@ -871,7 +871,7 @@ errcode:
                     TextBox2.Enabled = False
                     Button4.Enabled = False
                 End If
-             
+
                 'Form1.GetTimeFormSize(38, 300)
                 'a = Form1.Width - Form1.CaW
                 'If a <> 0 Then
@@ -984,7 +984,7 @@ errcode:
                 c = 0
                 Form1.SetTimeFormSize(a.Height + 3, a.Width + 3)
             End If
-            
+
             'Form1.Label1.AutoSize = False
             If Form1.UnSaveData = 0 Then
                 RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "CustomFormat", TextBox2.Text, RegistryValueKind.String, "HKCU")
@@ -1004,7 +1004,7 @@ errcode:
             'RemoveHandler CheckBox3.CheckedChanged, AddressOf CheckBox3_CheckedChanged
             'RemoveHandler CheckBox4.CheckedChanged, AddressOf CheckBox4_CheckedChanged
             Try
-                    AddReg("Software\CJH\TimeControl\Settings", "ColorMode", 0, Microsoft.Win32.RegistryValueKind.DWord, "HKCU")
+                AddReg("Software\CJH\TimeControl\Settings", "ColorMode", 0, Microsoft.Win32.RegistryValueKind.DWord, "HKCU")
 
 
                 If Form1.UnSupportDarkSys = 1 Then
@@ -1133,30 +1133,30 @@ errcode:
                 Form1.Location = New Size((System.Windows.Forms.SystemInformation.PrimaryMonitorSize.Width - Form1.Width) / 2, 5)
 
 
-        RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "TimeFormOpacity", 100, RegistryValueKind.DWord, "HKCU")
+                RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "TimeFormOpacity", 100, RegistryValueKind.DWord, "HKCU")
 
 
-        Form1.CustOpacity = 100
-        Label17.Text = "99%"
-        Form1.Opacity = 0.99
-        TrackBar1.Value = 99
+                Form1.CustOpacity = 100
+                Label17.Text = "99%"
+                Form1.Opacity = 0.99
+                TrackBar1.Value = 99
 
-        CheckBox5.Checked = False
+                CheckBox5.Checked = False
 
-        Call Form1.formatcolorcur()
-        Call formatcolorcurset()
-        Call MsgForm.formatcolorcursetmsg()
-        Call GPLForm.formatcolorcursetmsg()
+                Call Form1.formatcolorcur()
+                Call formatcolorcurset()
+                Call MsgForm.formatcolorcursetmsg()
+                Call GPLForm.formatcolorcursetmsg()
 
 
-        '如果预先关联事件， Me.CheckBox1.Checked = Ture / Flase 操作会触发事件，导致操作相反
-        'AddHandler CheckBox1.CheckedChanged, AddressOf CheckBox1_CheckedChanged
-        'AddHandler CheckBox2.CheckedChanged, AddressOf CheckBox2_CheckedChanged
-        'AddHandler CheckBox3.CheckedChanged, AddressOf CheckBox3_CheckedChanged
-        'AddHandler CheckBox4.CheckedChanged, AddressOf CheckBox4_CheckedChanged
+                '如果预先关联事件， Me.CheckBox1.Checked = Ture / Flase 操作会触发事件，导致操作相反
+                'AddHandler CheckBox1.CheckedChanged, AddressOf CheckBox1_CheckedChanged
+                'AddHandler CheckBox2.CheckedChanged, AddressOf CheckBox2_CheckedChanged
+                'AddHandler CheckBox3.CheckedChanged, AddressOf CheckBox3_CheckedChanged
+                'AddHandler CheckBox4.CheckedChanged, AddressOf CheckBox4_CheckedChanged
             Catch ex As Exception
-            MsgBox("恢复默认设置失败。" & vbCrLf & ex.Message, MsgBoxStyle.Critical, "错误")
-        End Try
+                MsgBox("恢复默认设置失败。" & vbCrLf & ex.Message, MsgBoxStyle.Critical, "错误")
+            End Try
         End If
     End Sub
 
@@ -1613,35 +1613,35 @@ errcode:
                 End If
             End If
         Else
-                If Form1.MySize = 0 Then
+            If Form1.MySize = 0 Then
                 Form1.Label1.Text = Format(Now(), Form1.TimeF)
                 Form1.Timer1.Interval = 1000
-                    Dim aa As SizeF
-                    Dim b As Graphics = Graphics.FromImage(New Bitmap(1, 1))
+                Dim aa As SizeF
+                Dim b As Graphics = Graphics.FromImage(New Bitmap(1, 1))
                 aa = TextRenderer.MeasureText(Form1.Label1.Text, Form1.Label1.Font)
-                    Dim c As Integer
-                    If aa.Width <= 42 Then
-                        Form1.GetTimeFormSize(38, aa.Width + 8)
-                    ElseIf 400 <= aa.Width Then
+                Dim c As Integer
+                If aa.Width <= 42 Then
+                    Form1.GetTimeFormSize(38, aa.Width + 8)
+                ElseIf 400 <= aa.Width Then
                     Form1.GetTimeFormSize(aa.Height, aa.Width + 10)
-                    Else
-                        Form1.GetTimeFormSize(38, aa.Width + 6)
-                    End If
-                    c = Form1.Width - Form1.CaW
-                    If c <> 0 Then
-                        Form1.Location = New Point(Form1.Location.X + c / 2, Form1.Location.Y)
+                Else
+                    Form1.GetTimeFormSize(38, aa.Width + 6)
+                End If
+                c = Form1.Width - Form1.CaW
+                If c <> 0 Then
+                    Form1.Location = New Point(Form1.Location.X + c / 2, Form1.Location.Y)
                     If Form1.SaveLoc = 1 Then
                         If Form1.UnSaveData = 0 Then
                             RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "TimeFormX", Form1.Location.X, RegistryValueKind.DWord, "HKCU")
                             RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "TimeFormY", Form1.Location.Y, RegistryValueKind.DWord, "HKCU")
                         End If
 
                     End If
-                    End If
-                    c = 0
-                Form1.SetTimeFormSize(aa.Height, aa.Width)
                 End If
+                c = 0
+                Form1.SetTimeFormSize(aa.Height, aa.Width)
             End If
+        End If
     End Sub
 
     Private Sub LinkLabel3_LinkClicked(sender As System.Object, e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles LinkLabel3.LinkClicked
@@ -1658,7 +1658,7 @@ errcode:
     End Sub
 
     Private Sub LinkLabel5_LinkClicked(sender As System.Object, e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles LinkLabel5.LinkClicked
-        MessageBox.Show("当前支持的命令行：" & vbCrLf & "/safemode 以安全模式加载，不读取设置也不保存设置。当程序由于配置原因无法正常启动，可以使用该命令行启动后恢复默认设置。" & vbCrLf & "/noproflie 不使用配置文件。" & vbCrLf & "/nosaveprofile 读取设置但不保存设置" & vbCrLf & vbCrLf & "部分功能可能因为策略设置而不可用。命令行的内容要优先于策略设置，为单一用户设置的策略优先级高于针对所有用户设置的策略（需要以管理员身份启动本程序以应用针对所有用户设置的策略）。", "帮助", MessageBoxButtons.YesNo, MessageBoxIcon.Information)
+        MessageBox.Show("当前支持的命令行：" & vbCrLf & "/safemode 以安全模式加载，不读取设置也不保存设置。当程序由于配置原因无法正常启动，可以使用该命令行启动后恢复默认设置。" & vbCrLf & "/noproflie 不使用配置文件。" & vbCrLf & "/nosaveprofile 读取设置但不保存设置" & vbCrLf & vbCrLf & "部分功能可能因为策略设置而不可用。命令行的内容要优先于策略设置，为所有用户设置的策略优先级高于针对单一用户设置的策略。", "帮助", MessageBoxButtons.OK, MessageBoxIcon.Information)
     End Sub
 
     Private Sub Button12_Click(sender As System.Object, e As System.EventArgs) Handles Button12.Click

Src/TimeControl/Form2.Designer.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' 方法是按如下所示使用“*”:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.1.17.24091")> 
-<Assembly: AssemblyFileVersion("1.1.17.24091")> 
+<Assembly: AssemblyVersion("1.1.18.24101")> 
+<Assembly: AssemblyFileVersion("1.1.18.24101")> 

Src/TimeControl/Form2.resx

@@ -152,10 +152,12 @@ if "%ab%" == "1" echo.
 if "%ab%" == "1" call "%~dp0UserinitBootUnInstall.bat" "%programfiles%\CJH\TimeControl\TimeControl.exe"
 if "%ab%" == "1" call "%~dp0UserinitBootInstall.bat" "%programfiles%\CJH\TimeControl\TimeControl.exe"
 echo.
-choice /C YN /T 5 /D Y /M "是(Y)否(N)要安装策略到当前系统（安装后可以使用组策略编辑时钟小工具的策略）（仅Windows Vista以上版本支持）（5秒后自动选择Y）"
+choice /C YN /T 5 /D Y /M "是(Y)否(N)要安装策略到当前系统（安装后可以使用组策略编辑时钟小工具的策略）（5秒后自动选择Y）"
 if errorlevel 1 set ac=1
 if errorlevel 2 set ac=2
 if "%ac%" == "1" if exist "%windir%\PolicyDefinitions\*.admx" call "%~dp0TimeControlAdmxs.exe"
+if "%ac%" == "1" if exist "%windir%\inf\*.adm" copy "%~dp0TimeControl.adm" "%windir%\inf\TimeControl.adm" /y
+::if "%ac%" == "1" if exist "%windir%\inf\*.adm" Reg add "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy" /v OnlyUseLocalAdminFiles /t REG_DWORD /d 1 /f
 
 echo.
 choice /C YN /T 5 /D Y /M "是(Y)否(N)要创建快捷方式到开始菜单（5秒后自动选择Y）"
@@ -187,6 +189,8 @@ echo ====================================================
 echo                   时钟小工具安装程序
 echo ====================================================
 echo.
+if "%ac%" == "1" if exist "%windir%\inf\*.adm" echo Windows XP 系统请手动在gpedit.msc（组策略）里的计算机管理-管理模板右键里的添加/删除模板里手动添加 %windir%\inf\TimeControl.adm 策略文件。
+if "%ac%" == "1" if exist "%windir%\inf\*.adm" echo.
 echo 安装完成！任意键退出... & pause > nul
 goto enda
 
@@ -244,10 +248,12 @@ if "%ab%" == "1" echo.
 if "%ab%" == "1" call "%~dp0UserinitBootUnInstall.bat" "%programfiles%\CJH\TimeControl\TimeControl.exe"
 if "%ab%" == "1" call "%~dp0UserinitBootInstall.bat" "%programfiles%\CJH\TimeControl\TimeControl.exe"
 echo.
-choice /C YN /T 5 /D Y /M "是(Y)否(N)要安装策略到当前系统（安装后可以使用组策略编辑时钟小工具的策略）（仅Windows Vista以上版本支持）（5秒后自动选择Y）"
+choice /C YN /T 5 /D Y /M "是(Y)否(N)要安装策略到当前系统（安装后可以使用组策略编辑时钟小工具的策略）（5秒后自动选择Y）"
 if errorlevel 1 set ac=1
 if errorlevel 2 set ac=2
 if "%ac%" == "1" if exist "%windir%\PolicyDefinitions\*.admx" call "%~dp0TimeControlAdmxs.exe"
+if "%ac%" == "1" if exist "%windir%\inf\*.adm" copy "%~dp0TimeControl.adm" "%windir%\inf\TimeControl.adm" /y
+::if "%ac%" == "1" if exist "%windir%\inf\*.adm" Reg add "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\Group Policy" /v OnlyUseLocalAdminFiles /t REG_DWORD /d 1 /f
 
 echo.
 choice /C YN /T 5 /D Y /M "是(Y)否(N)要创建快捷方式到开始菜单（5秒后自动选择Y）"
@@ -281,6 +287,8 @@ echo ====================================================
 echo                   时钟小工具安装程序
 echo ====================================================
 echo.
+if "%ac%" == "1" if exist "%windir%\inf\*.adm" echo Windows XP 系统请手动在gpedit.msc（组策略）里的计算机管理-管理模板右键里的添加/删除模板里手动添加 %windir%\inf\TimeControl.adm 策略文件。
+if "%ac%" == "1" if exist "%windir%\inf\*.adm" echo.
 echo 安装完成！任意键退出... & pause > nul
 goto enda